From dfe99f1bf291b4b954d3608dbe95a43e16a8bb49 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Feb 2011 19:03:28 +0100 Subject: libxtables: XTTYPE_UINT8 support Signed-off-by: Jan Engelhardt --- include/xtables.h.in | 2 ++ xtoptions.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/xtables.h.in b/include/xtables.h.in index 14d7b043..dc074bc0 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -51,6 +51,7 @@ struct in_addr; */ enum xt_option_type { XTTYPE_NONE, + XTTYPE_UINT8, XTTYPE_UINT32, }; @@ -104,6 +105,7 @@ struct xt_option_call { unsigned int xflags; bool invert; union { + uint8_t u8; uint32_t u32; } val; }; diff --git a/xtoptions.c b/xtoptions.c index 6a119ec7..693c06d6 100644 --- a/xtoptions.c +++ b/xtoptions.c @@ -89,6 +89,8 @@ static void xtopt_parse_int(struct xt_option_call *cb) unsigned int lmin = 0, lmax = UINT32_MAX; unsigned int value; + if (entry->type == XTTYPE_UINT8) + lmax = UINT8_MAX; if (cb->entry->min != 0) lmin = cb->entry->min; if (cb->entry->max != 0) @@ -100,7 +102,11 @@ static void xtopt_parse_int(struct xt_option_call *cb) "or out of range (%u-%u).\n", cb->ext_name, entry->name, lmin, lmax); - if (entry->type == XTTYPE_UINT32) { + if (entry->type == XTTYPE_UINT8) { + cb->val.u8 = value; + if (entry->flags & XTOPT_PUT) + *(uint8_t *)XTOPT_MKPTR(cb) = cb->val.u8; + } else if (entry->type == XTTYPE_UINT32) { cb->val.u32 = value; if (entry->flags & XTOPT_PUT) *(uint32_t *)XTOPT_MKPTR(cb) = cb->val.u32; @@ -108,10 +114,12 @@ static void xtopt_parse_int(struct xt_option_call *cb) } static void (*const xtopt_subparse[])(struct xt_option_call *) = { + [XTTYPE_UINT8] = xtopt_parse_int, [XTTYPE_UINT32] = xtopt_parse_int, }; static const size_t xtopt_psize[] = { + [XTTYPE_UINT8] = sizeof(uint8_t), [XTTYPE_UINT32] = sizeof(uint32_t), }; -- cgit v1.2.3