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

Merge remote-tracking branch 'origin/master' into ieee802154

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-21 14:19:04 -06:00
commit 874553ee59
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netutils/netlib/netlib_getpanid.c
View File

@ -46,12 +46,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <netinet/in.h>
#include <net/if.h>
#include <nuttx/net/sixlowpan.h>
#include <nuttx/wireless/wireless.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0 #if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0
@ -86,20 +80,13 @@ int netlib_getpanid(FAR const char *ifname, FAR uint16_t *panid)
int sockfd = socket(PF_INET6, NETLIB_SOCK_IOCTL, 0); int sockfd = socket(PF_INET6, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0) if (sockfd >= 0)
{ {
struct sixlowpan_req_s req;
/* Put the driver name into the request */ /* Put the driver name into the request */
#warning Missing logic
strncpy(req.ifr_name, ifname, IFNAMSIZ);
/* Perform the ioctl to get the current PAN ID */ /* Perform the ioctl to get the current PAN ID */
ret = ioctl(sockfd, SIOCGWPANID, (unsigned long)((uintptr_t)&req));
close(sockfd); close(sockfd);
/* Reuturn the current PAN ID */ /* Reuturn the current PAN ID */
*panid = req.u.panid.panid;
} }
} }

15
netutils/netlib/netlib_setpanid.c
View File

@ -46,12 +46,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <netinet/in.h>
#include <net/if.h>
#include <nuttx/net/sixlowpan.h>
#include <nuttx/wireless/wireless.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0 #if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0
@ -86,19 +80,12 @@ int netlib_setpanid(FAR const char *ifname, uint16_t panid)
int sockfd = socket(PF_INET6, NETLIB_SOCK_IOCTL, 0); int sockfd = socket(PF_INET6, NETLIB_SOCK_IOCTL, 0);
if (sockfd >= 0) if (sockfd >= 0)
{ {
struct sixlowpan_req_s req;
/* Put the driver name into the request */ /* Put the driver name into the request */
# warning Missing Logic
strncpy(req.ifr_name, ifname, IFNAMSIZ);
/* Put the new PAN ID into the request */ /* Put the new PAN ID into the request */
req.u.panid.panid = panid;
/* Perform the ioctl to set the new PAN ID */ /* Perform the ioctl to set the new PAN ID */
ret = ioctl(sockfd, SIOCSWPANID, (unsigned long)((uintptr_t)&req));
close(sockfd); close(sockfd);
} }
} }