From ec6ff2791a31403954b81e4de2b6cf188f79c49c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 8 Apr 2017 12:19:35 -0600 Subject: [PATCH] netutils: Add a helper function to convert a string to a 6loWPAN node address --- include/netutils/netlib.h | 1 + netutils/netlib/Makefile | 2 +- netutils/netlib/netlib_nodeaddrconv.c | 109 ++++++++++++++++++++++++++ netutils/netlib/netlib_setnodeaddr.c | 6 +- 4 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 netutils/netlib/netlib_nodeaddrconv.c diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h index f096e7baf..4e1ff9fa6 100644 --- a/include/netutils/netlib.h +++ b/include/netutils/netlib.h @@ -118,6 +118,7 @@ int netlib_getmacaddr(FAR const char *ifname, FAR uint8_t *macaddr); /* Get IEEE802.15.4 MAC driver node address */ int netlib_setnodeaddr(FAR const char *ifname, FAR const uint8_t *nodeaddr); +bool netlib_nodeaddrconv(FAR const char *hwstr, FAR uint8_t *hw); #endif /* IP address support */ diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile index 35030cab5..01c1e73ab 100644 --- a/netutils/netlib/Makefile +++ b/netutils/netlib/Makefile @@ -87,7 +87,7 @@ CSRCS += netlib_setmacaddr.c netlib_getmacaddr.c endif ifeq ($(CONFIG_NET_6LOWPAN),y) -CSRCS += netlib_setnodeaddr.c +CSRCS += netlib_setnodeaddr.c netlib_nodeaddrconv.c endif # IGMP support diff --git a/netutils/netlib/netlib_nodeaddrconv.c b/netutils/netlib/netlib_nodeaddrconv.c new file mode 100644 index 000000000..02854c516 --- /dev/null +++ b/netutils/netlib/netlib_nodeaddrconv.c @@ -0,0 +1,109 @@ +/**************************************************************************** + * netutils/netlib/netlib_nodeaddrconv.c + * + * Copyright (C) 2017 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +#include + +#include "netutils/netlib.h" + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: netlib_nodeaddrconv + ****************************************************************************/ + +bool netlib_nodeaddrconv(FAR const char *hwstr, FAR uint8_t *hw) +{ + unsigned char tmp; + unsigned char i; + unsigned char j; + char ch; + + /* Form xx:xx or xx:xx:xx:xx:xx:xx:xx:xx for extended Rime address */ + + if (strlen(hwstr) != 3 * NET_6LOWPAN_RIMEADDR_SIZE - 1) + { + return false; + } + + tmp = 0; + + for (i = 0; i < NET_6LOWPAN_RIMEADDR_SIZE; ++i) + { + j = 0; + do + { + ch = *hwstr++; + if (++j > 3) + { + return false; + } + + if (ch == ':' || ch == '\0') + { + *hw++ = tmp; + tmp = 0; + } + else if (ch >= '0' && ch <= '9') + { + tmp = (tmp << 4) + (ch - '0'); + } + else if (ch >= 'a' && ch <= 'f') + { + tmp = (tmp << 4) + (ch - 'a' + 10); + } + else if (ch >= 'A' && ch <= 'F') + { + tmp = (tmp << 4) + (ch - 'A' + 10); + } + else + { + return false; + } + } + while (ch != ':' && ch != 0); + } + + return true; +} diff --git a/netutils/netlib/netlib_setnodeaddr.c b/netutils/netlib/netlib_setnodeaddr.c index 942186070..436591eb9 100644 --- a/netutils/netlib/netlib_setnodeaddr.c +++ b/netutils/netlib/netlib_setnodeaddr.c @@ -49,6 +49,8 @@ #include #include +#include + #include "netutils/netlib.h" #if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0 @@ -65,7 +67,7 @@ * * Parameters: * ifname The name of the interface to use - * nodeaddr Node address to set, size must be CONFIG_NET_6LOWPAN_RIMEADDR_SIZE + * nodeaddr Node address to set, size must be NET_6LOWPAN_RIMEADDR_SIZE * * Return: * 0 on success; -1 on failure @@ -92,7 +94,7 @@ int netlib_setnodeaddr(FAR const char *ifname, FAR const uint8_t *nodeaddr) /* Put the new MAC address into the request */ req.ifr_hwaddr.sa_family = AF_INET6; - memcpy(&req.ifr_hwaddr.sa_data, nodeaddr, CONFIG_NET_6LOWPAN_RIMEADDR_SIZE); + memcpy(&req.ifr_hwaddr.sa_data, nodeaddr, NET_6LOWPAN_RIMEADDR_SIZE); /* Perform the ioctl to set the MAC address */