diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-10-26 21:37:48 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-10-30 10:01:17 +0100 |
| commit | be5672ff8b100a4b5602cb26b2f682a794b7f721 (patch) | |
| tree | 3928d6b513fbc1ce3882f7a83935316955d5198b /iptables | |
| parent | 8f0c4bd1eabe097809359ece7b1e6168ab22108a (diff) | |
xtables-arp: Use xtables_parse_interface()
The local implementation differs just slightly but libxtables version
seems more correct (no needless memsetting of mask, more relevant
illegal character checking) so use that one.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables')
| -rw-r--r-- | iptables/xtables-arp.c | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index bbc1ceb6..9cfad762 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -358,44 +358,6 @@ check_inverse(const char option[], int *invert, int *optidx, int argc) } static void -parse_interface(const char *arg, char *vianame, unsigned char *mask) -{ - int vialen = strlen(arg); - unsigned int i; - - memset(mask, 0, IFNAMSIZ); - memset(vianame, 0, IFNAMSIZ); - - if (vialen + 1 > IFNAMSIZ) - xtables_error(PARAMETER_PROBLEM, - "interface name `%s' must be shorter than IFNAMSIZ" - " (%i)", arg, IFNAMSIZ-1); - - strcpy(vianame, arg); - if (vialen == 0) - memset(mask, 0, IFNAMSIZ); - else if (vianame[vialen - 1] == '+') { - memset(mask, 0xFF, vialen - 1); - memset(mask + vialen - 1, 0, IFNAMSIZ - vialen + 1); - /* Don't remove `+' here! -HW */ - } else { - /* Include nul-terminator in match */ - memset(mask, 0xFF, vialen + 1); - memset(mask + vialen + 1, 0, IFNAMSIZ - vialen - 1); - for (i = 0; vianame[i]; i++) { - if (!isalnum(vianame[i]) - && vianame[i] != '_' - && vianame[i] != '.') { - printf("Warning: weird character in interface" - " `%s' (No aliases, :, ! or *).\n", - vianame); - break; - } - } - } -} - -static void set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, int invert) { @@ -816,18 +778,18 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, check_inverse(optarg, &invert, &optind, argc); set_option(&options, OPT_VIANAMEIN, &cs.arp.arp.invflags, invert); - parse_interface(argv[optind-1], - cs.arp.arp.iniface, - cs.arp.arp.iniface_mask); + xtables_parse_interface(argv[optind-1], + cs.arp.arp.iniface, + cs.arp.arp.iniface_mask); break; case 'o': check_inverse(optarg, &invert, &optind, argc); set_option(&options, OPT_VIANAMEOUT, &cs.arp.arp.invflags, invert); - parse_interface(argv[optind-1], - cs.arp.arp.outiface, - cs.arp.arp.outiface_mask); + xtables_parse_interface(argv[optind-1], + cs.arp.arp.outiface, + cs.arp.arp.outiface_mask); break; case 'v': |