sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

6loWPAN: Replace some Rime address naming with more consistent short/exended address terminology

Browse Source
This commit is contained in:
Gregory Nutt 2017-05-04 08:21:12 -06:00
parent 67fb7183cb
commit 44ace8e1cc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netutils/netlib/netlib_nodeaddrconv.c
View File

@ -62,14 +62,14 @@ bool netlib_nodeaddrconv(FAR const char *hwstr, FAR uint8_t *hw)
/* Form xx:xx or xx:xx:xx:xx:xx:xx:xx:xx for extended Rime address */ /* 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) if (strlen(hwstr) != 3 * NET_6LOWPAN_ADDRSIZE - 1)
{ {
return false; return false;
} }
tmp = 0; tmp = 0;
for (i = 0; i < NET_6LOWPAN_RIMEADDR_SIZE; ++i) for (i = 0; i < NET_6LOWPAN_ADDRSIZE; ++i)
{ {
j = 0; j = 0;
do do

4
netutils/netlib/netlib_setnodeaddr.c
View File

@ -67,7 +67,7 @@
* *
* Parameters: * Parameters:
* ifname The name of the interface to use * ifname The name of the interface to use
* nodeaddr Node address to set, size must be NET_6LOWPAN_RIMEADDR_SIZE * nodeaddr Node address to set, size must be NET_6LOWPAN_ADDRSIZE
* *
* Return: * Return:
* 0 on success; -1 on failure * 0 on success; -1 on failure
@ -94,7 +94,7 @@ int netlib_setnodeaddr(FAR const char *ifname, FAR const uint8_t *nodeaddr)
/* Put the new MAC address into the request */ /* Put the new MAC address into the request */
req.ifr_hwaddr.sa_family = AF_INET6; req.ifr_hwaddr.sa_family = AF_INET6;
memcpy(&req.ifr_hwaddr.sa_data, nodeaddr, NET_6LOWPAN_RIMEADDR_SIZE); memcpy(&req.ifr_hwaddr.sa_data, nodeaddr, NET_6LOWPAN_ADDRSIZE);
/* Perform the ioctl to set the node address */ /* Perform the ioctl to set the node address */

2
nshlib/nsh_netcmds.c
View File

@ -762,7 +762,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
uint8_t mac[IFHWADDRLEN]; uint8_t mac[IFHWADDRLEN];
#endif #endif
#ifdef CONFIG_NET_6LOWPAN #ifdef CONFIG_NET_6LOWPAN
uint8_t nodeaddr[NET_6LOWPAN_RIMEADDR_SIZE]; uint8_t nodeaddr[NET_6LOWPAN_ADDRSIZE];
#endif #endif
#if defined(CONFIG_NSH_DHCPC) #if defined(CONFIG_NSH_DHCPC)
FAR void *handle; FAR void *handle;

2
nshlib/nsh_netinit.c
View File

@ -260,7 +260,7 @@ static void nsh_netinit_configure(void)
#if defined(CONFIG_NET_ETHERNET) #if defined(CONFIG_NET_ETHERNET)
uint8_t mac[IFHWADDRLEN]; uint8_t mac[IFHWADDRLEN];
#elif defined(CONFIG_NET_6LOWPAN) #elif defined(CONFIG_NET_6LOWPAN)
uint8_t nodeaddr[NET_6LOWPAN_RIMEADDR_SIZE]; uint8_t nodeaddr[NET_6LOWPAN_ADDRSIZE];
#endif #endif
#endif #endif