summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-10-16 22:08:25 +0200
committerFlorian Westphal <fw@strlen.de>2016-10-17 11:52:19 +0200
commitf55ccf9ea1061f8e50065c0cc6b3ed93523f0b97 (patch)
tree761e8f85b009c8e57aaacd850880e3d1c6cd9536
parent739a2da1f442c447ffc8151c64fe197a4e58cd16 (diff)
meta: permit numeric interface type
If we can't translate an interface index back to a name we just print the number. This change allows using a number instead of an interface index to make this symmetric. If we can't find an interface with the given name check if its a numeric string and then use it instead. Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/meta.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/meta.c b/src/meta.c
index 87eafeea..34f9ee8e 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -11,6 +11,7 @@
*/
#include <errno.h>
+#include <limits.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
@@ -166,8 +167,18 @@ static struct error_record *ifindex_type_parse(const struct expr *sym,
int ifindex;
ifindex = nft_if_nametoindex(sym->identifier);
- if (ifindex == 0)
- return error(&sym->location, "Interface does not exist");
+ if (ifindex == 0) {
+ char *end;
+ long res;
+
+ errno = 0;
+ res = strtol(sym->identifier, &end, 10);
+
+ if (res < 0 || res > INT_MAX || *end || errno)
+ return error(&sym->location, "Interface does not exist");
+
+ ifindex = (int)res;
+ }
*res = constant_expr_alloc(&sym->location, sym->dtype,
BYTEORDER_HOST_ENDIAN,