libxt_IDLETIMER: use guided option parser

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/extensions/libxt_IDLETIMER.c b/extensions/libxt_IDLETIMER.c
index 847ab180be186c799c388a28a8f40069befaaa27..21004a4b151c2e1637dd863ad0fa2a79cdb2a3cd 100644 (file)
--- a/extensions/libxt_IDLETIMER.c
+++ b/extensions/libxt_IDLETIMER.c
@@ -20,26 +20,24 @@
  * 02110-1301 USA
  *
  */
-#include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <stddef.h>
-
 #include <xtables.h>
 #include <linux/netfilter/xt_IDLETIMER.h>
 
 enum {
-       IDLETIMER_TG_OPT_TIMEOUT = 1 << 0,
-       IDLETIMER_TG_OPT_LABEL   = 1 << 1,
+       O_TIMEOUT = 0,
+       O_LABEL,
 };
 
-static const struct option idletimer_tg_opts[] = {
-       {.name = "timeout", .has_arg = true, .val = 't'},
-       {.name = "label",   .has_arg = true, .val = 'l'},
-       XT_GETOPT_TABLEEND,
+#define s struct idletimer_tg_info
+static const struct xt_option_entry idletimer_tg_opts[] = {
+       {.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)},
+       XTOPT_TABLEEND,
 };
+#undef s
 
 static void idletimer_tg_help(void)
 {
@@ -50,49 +48,6 @@ static void idletimer_tg_help(void)
 "\n");
 }
 
-static int idletimer_tg_parse(int c, char **argv, int invert,
-                             unsigned int *flags,
-                             const void *entry,
-                             struct xt_entry_target **target)
-{
-       struct idletimer_tg_info *info =
-               (struct idletimer_tg_info *)(*target)->data;
-
-       switch (c) {
-       case 't':
-               xtables_param_act(XTF_ONLY_ONCE, "IDLETIMER", "--timeout",
-                                 *flags & IDLETIMER_TG_OPT_TIMEOUT);
-
-               info->timeout = atoi(optarg);
-               *flags |= IDLETIMER_TG_OPT_TIMEOUT;
-               break;
-
-       case 'l':
-               xtables_param_act(XTF_ONLY_ONCE, "IDLETIMER", "--label",
-                                 *flags & IDLETIMER_TG_OPT_TIMEOUT);
-
-               if (strlen(optarg) > MAX_IDLETIMER_LABEL_SIZE - 1)
-                       xtables_param_act(XTF_BAD_VALUE, "IDLETIMER", "--label",
-                                        optarg);
-
-               strcpy(info->label, optarg);
-               *flags |= IDLETIMER_TG_OPT_LABEL;
-               break;
-       }
-
-       return true;
-}
-
-static void idletimer_tg_final_check(unsigned int flags)
-{
-       if (!(flags & IDLETIMER_TG_OPT_TIMEOUT))
-               xtables_error(PARAMETER_PROBLEM, "IDLETIMER target: "
-                             "--timeout parameter required");
-       if (!(flags & IDLETIMER_TG_OPT_LABEL))
-               xtables_error(PARAMETER_PROBLEM, "IDLETIMER target: "
-                             "--label parameter required");
-}
-
 static void idletimer_tg_print(const void *ip,
                               const struct xt_entry_target *target,
                               int numeric)
@@ -122,11 +77,10 @@ static struct xtables_target idletimer_tg_reg = {
        .size          = XT_ALIGN(sizeof(struct idletimer_tg_info)),
        .userspacesize = offsetof(struct idletimer_tg_info, timer),
        .help          = idletimer_tg_help,
-       .parse         = idletimer_tg_parse,
-       .final_check   = idletimer_tg_final_check,
+       .x6_parse      = xtables_option_parse,
        .print         = idletimer_tg_print,
        .save          = idletimer_tg_save,
-       .extra_opts    = idletimer_tg_opts,
+       .x6_options    = idletimer_tg_opts,
 };
 
 void _init(void)