cmdline (merge-intel): compilation under baremetal environment

[libcmdline.git] / src / lib / cmdline_parse_etheraddr.c

diff --git a/src/lib/cmdline_parse_etheraddr.c b/src/lib/cmdline_parse_etheraddr.c
index cc2a4f4..d718081 100644 (file)
--- a/src/lib/cmdline_parse_etheraddr.c
+++ b/src/lib/cmdline_parse_etheraddr.c
@@ -65,11 +65,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <net/ethernet.h>
-#ifdef __linux__
-#include <netinet/ether.h>
-#endif
 
 #include "cmdline_parse.h"
 #include "cmdline_parse_etheraddr.h"
@@ -84,6 +80,34 @@ struct cmdline_token_ops cmdline_token_etheraddr_ops = {
 
 #define ETHER_ADDRSTRLEN 18
 
+#ifdef __linux__
+#define ea_oct ether_addr_octet
+#else
+#define ea_oct octet
+#endif
+
+static struct ether_addr *
+my_ether_aton(const char *a)
+{
+       int i;
+       static struct ether_addr ether_addr;
+       unsigned int o0, o1, o2, o3, o4, o5;
+
+       i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
+
+       if (i != ETHER_ADDR_LEN)
+               return NULL;
+
+       ether_addr.ea_oct[0] = o0;
+       ether_addr.ea_oct[1] = o1;
+       ether_addr.ea_oct[2] = o2;
+       ether_addr.ea_oct[3] = o3;
+       ether_addr.ea_oct[4] = o4;
+       ether_addr.ea_oct[5] = o5;
+
+       return (struct ether_addr *)&ether_addr;
+}
+
 int
 cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,
                        const char *buf, void *res)
@@ -105,7 +129,7 @@ cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,
 
        snprintf(ether_str, token_len+1, "%s", buf);
 
-       tmp = ether_aton(ether_str);
+       tmp = my_ether_aton(ether_str);
        if (tmp == NULL)
                return -1;