diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-04-03 00:00:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-03 00:00:56 +0000 |
| commit | d15673a5ece985940f0d11809d97be882ed952af (patch) | |
| tree | ca6c6ef787ff9bce894c75865f24a2bc4ee6bef3 | |
| parent | d3e91632039f15f2060d8c11b099dcedfc8ea6ce (diff) | |
| parent | da0526cc91d6a01c891d6fa1c7054e3f47b5f072 (diff) | |
| download | iptables-d15673a5ece985940f0d11809d97be882ed952af.tar.gz | |
ANDROID: revert to upstream xt_IDLETIMER am: 3d6ee083d6 am: 218fa32d9f am: d10bb0c810 am: da0526cc91
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650932
Change-Id: I9b30b443c331fc0459cb7903fd4ae02fb521218a
| -rw-r--r-- | extensions/libxt_IDLETIMER.c | 9 | ||||
| -rw-r--r-- | extensions/libxt_IDLETIMER.man | 4 | ||||
| -rw-r--r-- | include/linux/netfilter/xt_IDLETIMER.h | 3 |
3 files changed, 1 insertions, 15 deletions
diff --git a/extensions/libxt_IDLETIMER.c b/extensions/libxt_IDLETIMER.c index 5f1b9fe7..21004a4b 100644 --- a/extensions/libxt_IDLETIMER.c +++ b/extensions/libxt_IDLETIMER.c @@ -27,7 +27,6 @@ enum { O_TIMEOUT = 0, O_LABEL, - O_NETLINK, }; #define s struct idletimer_tg_info @@ -36,8 +35,6 @@ static const struct xt_option_entry idletimer_tg_opts[] = { .flags = XTOPT_MAND | XTOPT_PUT, XTOPT_POINTER(s, timeout)}, {.name = "label", .id = O_LABEL, .type = XTTYPE_STRING, .flags = XTOPT_MAND | XTOPT_PUT, XTOPT_POINTER(s, label)}, - {.name = "send_nl_msg", .id = O_NETLINK, .type = XTTYPE_UINT8, - .flags = XTOPT_PUT, XTOPT_POINTER(s, send_nl_msg)}, XTOPT_TABLEEND, }; #undef s @@ -48,8 +45,6 @@ static void idletimer_tg_help(void) "IDLETIMER target options:\n" " --timeout time Timeout until the notification is sent (in seconds)\n" " --label string Unique rule identifier\n" -" --send_nl_msg (0/1) Enable netlink messages," - " and show remaining time in sysfs. Defaults to 0.\n" "\n"); } @@ -62,7 +57,6 @@ static void idletimer_tg_print(const void *ip, printf(" timeout:%u", info->timeout); printf(" label:%s", info->label); - printf(" send_nl_msg:%u", info->send_nl_msg); } static void idletimer_tg_save(const void *ip, @@ -73,14 +67,13 @@ static void idletimer_tg_save(const void *ip, printf(" --timeout %u", info->timeout); printf(" --label %s", info->label); - printf(" --send_nl_msg %u", info->send_nl_msg); } static struct xtables_target idletimer_tg_reg = { .family = NFPROTO_UNSPEC, .name = "IDLETIMER", .version = XTABLES_VERSION, - .revision = 1, + .revision = 0, .size = XT_ALIGN(sizeof(struct idletimer_tg_info)), .userspacesize = offsetof(struct idletimer_tg_info, timer), .help = idletimer_tg_help, diff --git a/extensions/libxt_IDLETIMER.man b/extensions/libxt_IDLETIMER.man index 3b5188d9..e3c91cea 100644 --- a/extensions/libxt_IDLETIMER.man +++ b/extensions/libxt_IDLETIMER.man @@ -18,7 +18,3 @@ This is the time in seconds that will trigger the notification. \fB\-\-label\fP \fIstring\fP This is a unique identifier for the timer. The maximum length for the label string is 27 characters. -.TP -\fB\-\---send_nl_msg\fP \fI(0/1)\fP -Send netlink messages in addition to sysfs notifications and show remaining -time. Defaults to 0. diff --git a/include/linux/netfilter/xt_IDLETIMER.h b/include/linux/netfilter/xt_IDLETIMER.h index ec96e4a3..208ae938 100644 --- a/include/linux/netfilter/xt_IDLETIMER.h +++ b/include/linux/netfilter/xt_IDLETIMER.h @@ -38,9 +38,6 @@ struct idletimer_tg_info { char label[MAX_IDLETIMER_LABEL_SIZE]; - /* Use netlink messages for notification in addition to sysfs */ - __u8 send_nl_msg; - /* for kernel module internal use only */ struct idletimer_tg *timer __attribute__((aligned(8))); }; |