ip: add support for seg6local End.BPF action

[mirror_iproute2.git] / lib / ipx_pton.c

diff --git a/lib/ipx_pton.c b/lib/ipx_pton.c
index 1a52b7f1a58f9633b9c93eb2d5cda85139df7d8a..a97c1c1bc7bfebfd9e5a5e7357fe669c75cd144d 100644 (file)
--- a/lib/ipx_pton.c
+++ b/lib/ipx_pton.c
@@ -1,22 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 
 #include "utils.h"
 
-static u_int32_t hexget(char c)
-{
-       if (c >= 'A' && c <= 'F')
-               return c - 'A' + 10;
-       if (c >= 'a' && c <= 'f')
-               return c - 'a' + 10;
-       if (c >= '0' && c <= '9')
-               return c - '0';
-
-       return 0xf0;
-}
-
 static int ipx_getnet(u_int32_t *net, const char *str)
 {
        int i;
@@ -24,7 +14,7 @@ static int ipx_getnet(u_int32_t *net, const char *str)
 
        for(i = 0; *str && (i < 8); i++) {
 
-               if ((tmp = hexget(*str)) & 0xf0) {
+               if ((tmp = get_hex(*str)) == -1) {
                        if (*str == '.')
                                return 0;
                        else
@@ -48,11 +38,11 @@ static int ipx_getnode(u_int8_t *node, const char *str)
        u_int32_t tmp;
 
        for(i = 0; i < 6; i++) {
-               if ((tmp = hexget(*str++)) & 0xf0)
+               if ((tmp = get_hex(*str++)) == -1)
                        return -1;
                node[i] = (u_int8_t)tmp;
                node[i] <<= 4;
-               if ((tmp = hexget(*str++)) & 0xf0)
+               if ((tmp = get_hex(*str++)) == -1)
                        return -1;
                node[i] |= (u_int8_t)tmp;
                if (*str == ':')