extensions: IDLETIMER: Add alarm timer option

Introduce "--alarm" option for idletimer rule.
If it is present, hardidle-timer is used, else default timer.
The default idletimer starts a deferrable timer or in other
words the timer will cease to run when cpu is in suspended
state. This change introduces the option to start a
non-deferrable or alarm timer which will continue to run even
when the cpu is in suspended state.

Signed-off-by: Manoj Basapathi <manojbm@codeaurora.org>
Signed-off-by: Sauvik Saha <ssaha@codeaurora.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/extensions/libxt_IDLETIMER.c b/extensions/libxt_IDLETIMER.c
index 21004a4b151c2e1637dd863ad0fa2a79cdb2a3cd..68b223f42f1380fb2958182acaf44fec14aceea2 100644 (file)
--- a/extensions/libxt_IDLETIMER.c
+++ b/extensions/libxt_IDLETIMER.c
@@ -27,6 +27,7 @@
 enum {
        O_TIMEOUT = 0,
        O_LABEL,
+       O_ALARM,
 };
 
 #define s struct idletimer_tg_info
@@ -39,6 +40,17 @@ static const struct xt_option_entry idletimer_tg_opts[] = {
 };
 #undef s
 
+#define s struct idletimer_tg_info_v1
+static const struct xt_option_entry idletimer_tg_opts_v1[] = {
+       {.name = "timeout", .id = O_TIMEOUT, .type = XTTYPE_UINT32,
+        .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 = "alarm", .id = O_ALARM, .type = XTTYPE_NONE},
+       XTOPT_TABLEEND,
+};
+#undef s
+
 static void idletimer_tg_help(void)
 {
        printf(
@@ -48,6 +60,16 @@ static void idletimer_tg_help(void)
 "\n");
 }
 
+static void idletimer_tg_help_v1(void)
+{
+       printf(
+"IDLETIMER target options:\n"
+" --timeout time       Timeout until the notification is sent (in seconds)\n"
+" --label string       Unique rule identifier\n"
+" --alarm none     Use alarm instead of default timer\n"
+"\n");
+}
+
 static void idletimer_tg_print(const void *ip,
                               const struct xt_entry_target *target,
                               int numeric)
@@ -59,6 +81,20 @@ static void idletimer_tg_print(const void *ip,
        printf(" label:%s", info->label);
 }
 
+static void idletimer_tg_print_v1(const void *ip,
+                              const struct xt_entry_target *target,
+                              int numeric)
+{
+       struct idletimer_tg_info_v1 *info =
+               (struct idletimer_tg_info_v1 *) target->data;
+
+       printf(" timeout:%u", info->timeout);
+       printf(" label:%s", info->label);
+       if (info->timer_type == XT_IDLETIMER_ALARM)
+               printf(" alarm");
+}
+
+
 static void idletimer_tg_save(const void *ip,
                              const struct xt_entry_target *target)
 {
@@ -69,21 +105,58 @@ static void idletimer_tg_save(const void *ip,
        printf(" --label %s", info->label);
 }
 
-static struct xtables_target idletimer_tg_reg = {
-       .family        = NFPROTO_UNSPEC,
-       .name          = "IDLETIMER",
-       .version       = XTABLES_VERSION,
-       .revision      = 0,
-       .size          = XT_ALIGN(sizeof(struct idletimer_tg_info)),
-       .userspacesize = offsetof(struct idletimer_tg_info, timer),
-       .help          = idletimer_tg_help,
-       .x6_parse      = xtables_option_parse,
-       .print         = idletimer_tg_print,
-       .save          = idletimer_tg_save,
-       .x6_options    = idletimer_tg_opts,
+static void idletimer_tg_save_v1(const void *ip,
+                             const struct xt_entry_target *target)
+{
+       struct idletimer_tg_info_v1 *info =
+               (struct idletimer_tg_info_v1 *) target->data;
+
+       printf(" --timeout %u", info->timeout);
+       printf(" --label %s", info->label);
+       if (info->timer_type == XT_IDLETIMER_ALARM)
+               printf(" --alarm");
+}
+
+static void idletimer_tg_parse_v1(struct xt_option_call *cb)
+{
+       struct idletimer_tg_info_v1 *info = cb->data;
+
+       xtables_option_parse(cb);
+       if (cb->entry->id == O_ALARM)
+               info->timer_type = XT_IDLETIMER_ALARM;
+}
+
+static struct xtables_target idletimer_tg_reg[] = {
+       {
+               .family        = NFPROTO_UNSPEC,
+               .name          = "IDLETIMER",
+               .version       = XTABLES_VERSION,
+               .revision      = 0,
+               .size          = XT_ALIGN(sizeof(struct idletimer_tg_info)),
+               .userspacesize = offsetof(struct idletimer_tg_info, timer),
+               .help          = idletimer_tg_help,
+               .x6_parse      = xtables_option_parse,
+               .print         = idletimer_tg_print,
+               .save          = idletimer_tg_save,
+               .x6_options    = idletimer_tg_opts,
+       },
+       {
+               .family        = NFPROTO_UNSPEC,
+               .name          = "IDLETIMER",
+               .version       = XTABLES_VERSION,
+               .revision      = 1,
+               .size          = XT_ALIGN(sizeof(struct idletimer_tg_info_v1)),
+               .userspacesize = offsetof(struct idletimer_tg_info_v1, timer),
+               .help          = idletimer_tg_help_v1,
+               .x6_parse      = idletimer_tg_parse_v1,
+               .print         = idletimer_tg_print_v1,
+               .save          = idletimer_tg_save_v1,
+               .x6_options    = idletimer_tg_opts_v1,
+       },
+
 };
 
 void _init(void)
 {
-       xtables_register_target(&idletimer_tg_reg);
+       xtables_register_targets(idletimer_tg_reg, ARRAY_SIZE(idletimer_tg_reg));
 }

diff --git a/extensions/libxt_IDLETIMER.t b/extensions/libxt_IDLETIMER.t
index 6afd92c1a1c885cc1366b4187d8e7d34e9a041a4..d13b119e98e032c5e28a607ef28954b5c190828f 100644 (file)
--- a/extensions/libxt_IDLETIMER.t
+++ b/extensions/libxt_IDLETIMER.t
@@ -2,3 +2,5 @@
 -j IDLETIMER --timeout;;FAIL
 -j IDLETIMER --timeout 42;;FAIL
 -j IDLETIMER --timeout 42 --label foo;=;OK
+-j IDLETIMER --timeout 42 --label foo --alarm;;OK
+

diff --git a/include/linux/netfilter/xt_IDLETIMER.h b/include/linux/netfilter/xt_IDLETIMER.h
index 208ae938733143ce0ba2117378423d443a3d8312..49ddcdc61c09499909c00c0bd2f5cd91b14c0fed 100644 (file)
--- a/include/linux/netfilter/xt_IDLETIMER.h
+++ b/include/linux/netfilter/xt_IDLETIMER.h
@@ -32,6 +32,7 @@
 #include <linux/types.h>
 
 #define MAX_IDLETIMER_LABEL_SIZE 28
+#define XT_IDLETIMER_ALARM 0x01
 
 struct idletimer_tg_info {
        __u32 timeout;
@@ -42,4 +43,15 @@ struct idletimer_tg_info {
        struct idletimer_tg *timer __attribute__((aligned(8)));
 };
 
+struct idletimer_tg_info_v1 {
+       __u32 timeout;
+
+       char label[MAX_IDLETIMER_LABEL_SIZE];
+
+       __u8 send_nl_msg;   /* unused: for compatibility with Android */
+       __u8 timer_type;
+
+       /* for kernel module internal use only */
+       struct idletimer_tg *timer __attribute__((aligned(8)));
+};
 #endif