From fcf5723f415c81fcb2c93094cdcc39b35a316ff2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 9 Feb 2010 15:59:13 +0100 Subject: Lift restrictions on interface names The kernel has few restrictions. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy --- xtables.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'xtables.c') diff --git a/xtables.c b/xtables.c index 63c5db77..f3baf84d 100644 --- a/xtables.c +++ b/xtables.c @@ -450,7 +450,7 @@ u_int16_t xtables_parse_port(const char *port, const char *proto) void xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask) { - int vialen = strlen(arg); + unsigned int vialen = strlen(arg); unsigned int i; memset(mask, 0, IFNAMSIZ); @@ -462,7 +462,7 @@ void xtables_parse_interface(const char *arg, char *vianame, " (%i)", arg, IFNAMSIZ-1); strcpy(vianame, arg); - if ((vialen == 0) || (vialen == 1 && vianame[0] == '+')) + if (vialen == 0) memset(mask, 0, IFNAMSIZ); else if (vianame[vialen - 1] == '+') { memset(mask, 0xFF, vialen - 1); @@ -473,12 +473,11 @@ void xtables_parse_interface(const char *arg, char *vianame, memset(mask, 0xFF, vialen + 1); memset(mask + vialen + 1, 0, IFNAMSIZ - vialen - 1); for (i = 0; vianame[i]; i++) { - if (vianame[i] == ':' || - vianame[i] == '!' || - vianame[i] == '*') { + if (vianame[i] == '/' || + vianame[i] == ' ') { fprintf(stderr, "Warning: weird character in interface" - " `%s' (No aliases, :, ! or *).\n", + " `%s' ('/' and ' ' are not allowed by the kernel).\n", vianame); break; } -- cgit v1.2.3