From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 09/10] xtables-arp: Use xtables_parse_interface()
Date: Mon, 28 Oct 2019 15:04:30 +0100 [thread overview]
Message-ID: <20191028140431.13882-10-phil@nwl.cc> (raw)
In-Reply-To: <20191028140431.13882-1-phil@nwl.cc>
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>
---
iptables/xtables-arp.c | 50 +++++-------------------------------------
1 file changed, 6 insertions(+), 44 deletions(-)
diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c
index 11ca7f869730e..d6040e0c73f4b 100644
--- a/iptables/xtables-arp.c
+++ b/iptables/xtables-arp.c
@@ -355,44 +355,6 @@ check_inverse(const char option[], int *invert, int *optidx, int argc)
return false;
}
-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)
@@ -814,18 +776,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':
--
2.23.0
next prev parent reply other threads:[~2019-10-28 14:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 14:04 [iptables PATCH 00/10] Reduce code size around arptables-nft Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 01/10] ip6tables, xtables-arp: Drop unused struct pprot Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 02/10] xshared: Share a common add_command() implementation Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 03/10] xshared: Share a common implementation of parse_rulenumber() Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 04/10] Merge CMD_* defines Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 05/10] xtables-arp: Drop generic_opt_check() Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 06/10] Replace TRUE/FALSE with true/false Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 07/10] xtables-arp: Integrate OPT_* defines into xshared.h Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 08/10] xtables-arp: Drop some unused variables Phil Sutter
2019-10-28 14:04 ` Phil Sutter [this message]
2019-10-28 14:04 ` [iptables PATCH 10/10] nft-arp: Use xtables_print_mac_and_mask() Phil Sutter
2019-10-28 14:17 ` [iptables PATCH 00/10] Reduce code size around arptables-nft Pablo Neira Ayuso
2019-10-28 14:28 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028140431.13882-10-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).