libxtables: XTTYPE_UINT8RC support

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

diff --git a/include/xtables.h.in b/include/xtables.h.in
index ae76bb6be8b4513e3d2347da13691c9aac6cc6e9..8f65b0532436ab687dca597f61d481e34a9e482d 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -57,6 +57,7 @@ enum xt_option_type {
        XTTYPE_UINT8,
        XTTYPE_UINT32,
        XTTYPE_UINT64,
+       XTTYPE_UINT8RC,
        XTTYPE_UINT16RC,
        XTTYPE_UINT32RC,
        XTTYPE_STRING,
@@ -115,7 +116,7 @@ struct xt_option_call {
        bool invert;
        uint8_t nvals;
        union {
-               uint8_t u8;
+               uint8_t u8, u8_range[2];
                uint16_t u16_range[2];
                uint32_t u32, u32_range[2];
                uint64_t u64;

diff --git a/xtoptions.c b/xtoptions.c
index ca5bffaba2224980c06ce290a3bd87e683983b89..babc82764c096bc3cf6e8c424fea36d28ae53ef6 100644 (file)
--- a/xtoptions.c
+++ b/xtoptions.c
@@ -139,7 +139,9 @@ static void xtopt_parse_mint(struct xt_option_call *cb)
        char *end = "";
        char sep = ':';
 
-       if (entry->type == XTTYPE_UINT16RC)
+       if (entry->type == XTTYPE_UINT8RC)
+               esize = sizeof(uint8_t);
+       else if (entry->type == XTTYPE_UINT16RC)
                esize = sizeof(uint16_t);
        maxiter = entry->size / esize;
        if (maxiter == 0)
@@ -165,13 +167,17 @@ static void xtopt_parse_mint(struct xt_option_call *cb)
                                "characters.\n", cb->ext_name, entry->name);
                ++cb->nvals;
                if (cb->nvals < ARRAY_SIZE(cb->val.u32_range)) {
-                       if (entry->type == XTTYPE_UINT16RC)
+                       if (entry->type == XTTYPE_UINT8RC)
+                               cb->val.u8_range[cb->nvals] = value;
+                       else if (entry->type == XTTYPE_UINT16RC)
                                cb->val.u16_range[cb->nvals] = value;
                        else if (entry->type == XTTYPE_UINT32RC)
                                cb->val.u32_range[cb->nvals] = value;
                }
                if (entry->flags & XTOPT_PUT) {
-                       if (entry->type == XTTYPE_UINT16RC)
+                       if (entry->type == XTTYPE_UINT8RC)
+                               *(uint8_t *)put = value;
+                       else if (entry->type == XTTYPE_UINT16RC)
                                *(uint16_t *)put = value;
                        else if (entry->type == XTTYPE_UINT32RC)
                                *(uint32_t *)put = value;
@@ -237,6 +243,7 @@ static void (*const xtopt_subparse[])(struct xt_option_call *) = {
        [XTTYPE_UINT8]       = xtopt_parse_int,
        [XTTYPE_UINT32]      = xtopt_parse_int,
        [XTTYPE_UINT64]      = xtopt_parse_int,
+       [XTTYPE_UINT8RC]     = xtopt_parse_mint,
        [XTTYPE_UINT16RC]    = xtopt_parse_mint,
        [XTTYPE_UINT32RC]    = xtopt_parse_mint,
        [XTTYPE_STRING]      = xtopt_parse_string,
@@ -247,6 +254,7 @@ static const size_t xtopt_psize[] = {
        [XTTYPE_UINT8]       = sizeof(uint8_t),
        [XTTYPE_UINT32]      = sizeof(uint32_t),
        [XTTYPE_UINT64]      = sizeof(uint64_t),
+       [XTTYPE_UINT8RC]     = sizeof(uint8_t[2]),
        [XTTYPE_UINT16RC]    = sizeof(uint16_t[2]),
        [XTTYPE_UINT32RC]    = sizeof(uint32_t[2]),
        [XTTYPE_STRING]      = -1,