libxt_cpu: use guided option parser

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

diff --git a/extensions/libxt_cpu.c b/extensions/libxt_cpu.c
index 77efec7f02fa788d8441f4a76456836ad9af223b..404a6a66a5a0c9d7d52ae2de69f658c6a42afe03 100644 (file)
--- a/extensions/libxt_cpu.c
+++ b/extensions/libxt_cpu.c
@@ -1,13 +1,11 @@
-/* Shared library add-on to iptables to add CPU match support. */
-#include <stdbool.h>
 #include <stdio.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
 #include <xtables.h>
 #include <linux/netfilter/xt_cpu.h>
 
+enum {
+       O_CPU = 0,
+};
+
 static void cpu_help(void)
 {
        printf(
@@ -15,50 +13,20 @@ static void cpu_help(void)
 "[!] --cpu number   Match CPU number\n");
 }
 
-static const struct option cpu_opts[] = {
-       {.name = "cpu", .has_arg = true, .val = '1'},
-       XT_GETOPT_TABLEEND,
+static const struct xt_option_entry cpu_opts[] = {
+       {.name = "cpu", .id = O_CPU, .type = XTTYPE_UINT32,
+        .flags = XTOPT_INVERT | XTOPT_MAND | XTOPT_PUT,
+        XTOPT_POINTER(struct xt_cpu_info, cpu)},
+       XTOPT_TABLEEND,
 };
 
-static void
-parse_cpu(const char *s, struct xt_cpu_info *info)
+static void cpu_parse(struct xt_option_call *cb)
 {
-       unsigned int cpu;
-       char *end;
-
-       if (!xtables_strtoui(s, &end, &cpu, 0, UINT32_MAX))
-               xtables_param_act(XTF_BAD_VALUE, "cpu", "--cpu", s);
-
-       if (*end != '\0')
-               xtables_param_act(XTF_BAD_VALUE, "cpu", "--cpu", s);
-
-       info->cpu = cpu;
-}
+       struct xt_cpu_info *cpuinfo = cb->data;
 
-static int
-cpu_parse(int c, char **argv, int invert, unsigned int *flags,
-          const void *entry, struct xt_entry_match **match)
-{
-       struct xt_cpu_info *cpuinfo = (struct xt_cpu_info *)(*match)->data;
-
-       switch (c) {
-       case '1':
-               xtables_check_inverse(optarg, &invert, &optind, 0, argv);
-               parse_cpu(optarg, cpuinfo);
-               if (invert)
-                       cpuinfo->invert = 1;
-               *flags = 1;
-               break;
-       }
-
-       return 1;
-}
-
-static void cpu_check(unsigned int flags)
-{
-       if (!flags)
-               xtables_error(PARAMETER_PROBLEM,
-                             "You must specify `--cpu'");
+       xtables_option_parse(cb);
+       if (cb->invert)
+               cpuinfo->invert = true;
 }
 
 static void
@@ -83,11 +51,10 @@ static struct xtables_match cpu_match = {
        .size           = XT_ALIGN(sizeof(struct xt_cpu_info)),
        .userspacesize  = XT_ALIGN(sizeof(struct xt_cpu_info)),
        .help           = cpu_help,
-       .parse          = cpu_parse,
-       .final_check    = cpu_check,
        .print          = cpu_print,
        .save           = cpu_save,
-       .extra_opts     = cpu_opts,
+       .x6_parse       = cpu_parse,
+       .x6_options     = cpu_opts,
 };
 
 void _init(void)