diff options
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/libipt_realm.c | 21 | ||||
| -rw-r--r-- | extensions/libxt_connmark.c | 18 | ||||
| -rw-r--r-- | extensions/libxt_devgroup.c | 27 | ||||
| -rw-r--r-- | extensions/libxt_mark.c | 17 |
4 files changed, 19 insertions, 64 deletions
diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c index 545b2580..e01d048e 100644 --- a/extensions/libipt_realm.c +++ b/extensions/libipt_realm.c @@ -47,23 +47,6 @@ static void realm_parse(struct xt_option_call *cb) ri->invert = 1; } -static void -print_realm(unsigned long id, unsigned long mask, int numeric) -{ - const char *name = NULL; - - if (mask != 0xffffffff) - printf(" 0x%lx/0x%lx", id, mask); - else { - if (numeric == 0) - name = xtables_lmap_id2name(realms, id); - if (name) - printf(" %s", name); - else - printf(" 0x%lx", id); - } -} - static void realm_print(const void *ip, const struct xt_entry_match *match, int numeric) { @@ -73,7 +56,7 @@ static void realm_print(const void *ip, const struct xt_entry_match *match, printf(" !"); printf(" realm"); - print_realm(ri->id, ri->mask, numeric); + xtables_print_val_mask(ri->id, ri->mask, numeric ? NULL : realms); } static void realm_save(const void *ip, const struct xt_entry_match *match) @@ -84,7 +67,7 @@ static void realm_save(const void *ip, const struct xt_entry_match *match) printf(" !"); printf(" --realm"); - print_realm(ri->id, ri->mask, 0); + xtables_print_val_mask(ri->id, ri->mask, realms); } static void diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c index be3499b6..cb4264e5 100644 --- a/extensions/libxt_connmark.c +++ b/extensions/libxt_connmark.c @@ -69,14 +69,6 @@ static void connmark_parse(struct xt_option_call *cb) markinfo->invert = 1; } -static void print_mark(unsigned int mark, unsigned int mask) -{ - if (mask != 0xffffffffU) - printf(" 0x%x/0x%x", mark, mask); - else - printf(" 0x%x", mark); -} - static void connmark_print(const void *ip, const struct xt_entry_match *match, int numeric) { @@ -85,7 +77,8 @@ connmark_print(const void *ip, const struct xt_entry_match *match, int numeric) printf(" CONNMARK match "); if (info->invert) printf("!"); - print_mark(info->mark, info->mask); + + xtables_print_mark_mask(info->mark, info->mask); } static void @@ -97,7 +90,8 @@ connmark_mt_print(const void *ip, const struct xt_entry_match *match, printf(" connmark match "); if (info->invert) printf("!"); - print_mark(info->mark, info->mask); + + xtables_print_mark_mask(info->mark, info->mask); } static void connmark_save(const void *ip, const struct xt_entry_match *match) @@ -108,7 +102,7 @@ static void connmark_save(const void *ip, const struct xt_entry_match *match) printf(" !"); printf(" --mark"); - print_mark(info->mark, info->mask); + xtables_print_mark_mask(info->mark, info->mask); } static void @@ -120,7 +114,7 @@ connmark_mt_save(const void *ip, const struct xt_entry_match *match) printf(" !"); printf(" --mark"); - print_mark(info->mark, info->mask); + xtables_print_mark_mask(info->mark, info->mask); } static void print_mark_xlate(unsigned int mark, unsigned int mask, diff --git a/extensions/libxt_devgroup.c b/extensions/libxt_devgroup.c index 99a4d502..a88211c5 100644 --- a/extensions/libxt_devgroup.c +++ b/extensions/libxt_devgroup.c @@ -61,38 +61,23 @@ static void devgroup_parse(struct xt_option_call *cb) } } -static void -print_devgroup(unsigned int id, unsigned int mask, int numeric) -{ - const char *name = NULL; - - if (mask != 0xffffffff) - printf("0x%x/0x%x", id, mask); - else { - if (numeric == 0) - name = xtables_lmap_id2name(devgroups, id); - if (name) - printf("%s", name); - else - printf("0x%x", id); - } -} - static void devgroup_show(const char *pfx, const struct xt_devgroup_info *info, int numeric) { if (info->flags & XT_DEVGROUP_MATCH_SRC) { if (info->flags & XT_DEVGROUP_INVERT_SRC) printf(" !"); - printf(" %ssrc-group ", pfx); - print_devgroup(info->src_group, info->src_mask, numeric); + printf(" %ssrc-group", pfx); + xtables_print_val_mask(info->src_group, info->src_mask, + numeric ? NULL : devgroups); } if (info->flags & XT_DEVGROUP_MATCH_DST) { if (info->flags & XT_DEVGROUP_INVERT_DST) printf(" !"); - printf(" %sdst-group ", pfx); - print_devgroup(info->dst_group, info->dst_mask, numeric); + printf(" %sdst-group", pfx); + xtables_print_val_mask(info->dst_group, info->dst_mask, + numeric ? NULL : devgroups); } } diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index e1d00de9..134ad438 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -47,14 +47,6 @@ static void mark_parse(struct xt_option_call *cb) markinfo->mask = cb->val.mask; } -static void print_mark(unsigned int mark, unsigned int mask) -{ - if (mask != 0xffffffffU) - printf(" 0x%x/0x%x", mark, mask); - else - printf(" 0x%x", mark); -} - static void mark_mt_print(const void *ip, const struct xt_entry_match *match, int numeric) { @@ -63,7 +55,8 @@ mark_mt_print(const void *ip, const struct xt_entry_match *match, int numeric) printf(" mark match"); if (info->invert) printf(" !"); - print_mark(info->mark, info->mask); + + xtables_print_mark_mask(info->mark, info->mask); } static void @@ -76,7 +69,7 @@ mark_print(const void *ip, const struct xt_entry_match *match, int numeric) if (info->invert) printf(" !"); - print_mark(info->mark, info->mask); + xtables_print_mark_mask(info->mark, info->mask); } static void mark_mt_save(const void *ip, const struct xt_entry_match *match) @@ -87,7 +80,7 @@ static void mark_mt_save(const void *ip, const struct xt_entry_match *match) printf(" !"); printf(" --mark"); - print_mark(info->mark, info->mask); + xtables_print_mark_mask(info->mark, info->mask); } static void @@ -99,7 +92,7 @@ mark_save(const void *ip, const struct xt_entry_match *match) printf(" !"); printf(" --mark"); - print_mark(info->mark, info->mask); + xtables_print_mark_mask(info->mark, info->mask); } static void |