[PATCH nft] meta: permit numeric interface type

[PATCH nft] meta: permit numeric interface type

[Florian Westphal]

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>
---
 src/meta.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/meta.c b/src/meta.c
index 87eafeead389..34f9ee8e36e2 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,
-- 
2.7.3

Re: [PATCH nft] meta: permit numeric interface type

[Pablo Neira Ayuso]

On Mon, Oct 17, 2016 at 10:53:37AM +0200, Florian Westphal wrote:
> 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>