From eda1ea9eaab82c4037b6f30cb0eafdcf038fcd47 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 24 Jan 2016 18:01:40 +0000 Subject: iptables: improve iptables listing output of xt_id match Signed-off-by: Jo-Philipp Wich SVN-Revision: 48478 --- .../utils/iptables/patches/500-add-xt_id-match.patch | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'package/network/utils/iptables/patches') diff --git a/package/network/utils/iptables/patches/500-add-xt_id-match.patch b/package/network/utils/iptables/patches/500-add-xt_id-match.patch index 94762f0..0964f01 100644 --- a/package/network/utils/iptables/patches/500-add-xt_id-match.patch +++ b/package/network/utils/iptables/patches/500-add-xt_id-match.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/extensions/libxt_id.c -@@ -0,0 +1,45 @@ +@@ -0,0 +1,55 @@ +/* Shared library add-on to iptables to add id match support. */ + +#include @@ -22,13 +22,22 @@ + XTOPT_TABLEEND, +}; + ++static void ++id_print(const void *ip, const struct xt_entry_match *match, int numeric) ++{ ++ struct xt_id_info *idinfo = (void *)match->data; ++ ++ printf(" ID:%08lx", idinfo->id); ++} ++ ++ +/* Saves the union ipt_matchinfo in parsable form to stdout. */ +static void +id_save(const void *ip, const struct xt_entry_match *match) +{ + struct xt_id_info *idinfo = (void *)match->data; + -+ printf(" --id %lu", idinfo->id); ++ printf(" --id 0x%lx", idinfo->id); +} + +static struct xtables_match id_match = { @@ -37,6 +46,7 @@ + .version = XTABLES_VERSION, + .size = XT_ALIGN(sizeof(struct xt_id_info)), + .userspacesize = XT_ALIGN(sizeof(struct xt_id_info)), ++ .print = id_print, + .save = id_save, + .x6_parse = xtables_option_parse, + .x6_options = id_opts, -- cgit v1.1