ieee802154/i8sak: Adds coordinfo command allowing you to poll various attributes related to the coordinator

include/wireless/ieee802154.h

@@ -98,6 +98,10 @@ int ieee802154_getsaddr(int fd, FAR uint8_t *saddr);
 int ieee802154_seteaddr(int fd, FAR const uint8_t *eaddr);
 int ieee802154_geteaddr(int fd, FAR uint8_t *eaddr);
 
+int ieee802154_getcoordsaddr(int fd, FAR uint8_t *saddr);
+
+int ieee802154_getcoordeaddr(int fd, FAR uint8_t *eaddr);
+
 int ieee802154_setpromisc(int fd, bool promisc);
 int ieee802154_getpromisc(int fd, FAR bool *promisc);
 

wireless/ieee802154/i8sak/Makefile

@@ -48,7 +48,7 @@ STACKSIZE = 4096
 
 ASRCS =
 CSRCS = i8sak_acceptassoc.c i8sak_assoc.c i8sak_scan.c i8sak_blaster.c i8sak_poll.c
-CSRCS += i8sak_sniffer.c i8sak_startpan.c i8sak_tx.c i8sak_chan.c
+CSRCS += i8sak_sniffer.c i8sak_startpan.c i8sak_tx.c i8sak_chan.c i8sak_coordinfo.c
 CSRCS += wpanlistener.c
 MAINSRC = i8sak_main.c
 

wireless/ieee802154/i8sak/i8sak.h

@@ -99,7 +99,14 @@
 /* /dev/ is 5 characters */
 #define I8SAK_DAEMONNAME_FMTLEN (6 + (I8SAK_MAX_DEVNAME-5) + 1)
 
+/* Helper Macros *************************************************************/
 
+#define PRINT_COORDEADDR(eaddr) \
+  printf("    Coordinator EADDR: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", \
+    eaddr[0], eaddr[1], eaddr[2], eaddr[3], eaddr[4], eaddr[5], eaddr[6], eaddr[7]);
+
+#define PRINT_COORDSADDR(saddr) \
+  printf("    Coordinator SADDR: %02X:%02X\n", saddr[0], saddr[1]);
 
 /****************************************************************************
  * Public Types
@@ -183,7 +190,8 @@ void i8sak_tx_cmd          (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[
 void i8sak_poll_cmd        (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
 void i8sak_sniffer_cmd     (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
 void i8sak_blaster_cmd     (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
-void i8sak_chan_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
+void i8sak_chan_cmd        (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
+void i8sak_coordinfo_cmd   (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
 
 /****************************************************************************
  * Inline Functions

wireless/ieee802154/i8sak/i8sak_coordinfo.c

@@ -0,0 +1,141 @@
+/****************************************************************************
+ * apps/wireless/ieee802154/i8sak/i8sak_coordinfo.c
+ * IEEE 802.15.4 Swiss Army Knife
+ *
+ *   Copyright (C) 2017 Verge Inc. All rights reserved.
+ *   Author: Anthony Merlino <anthony@vergeaero.com>
+ *
+ * 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 <nuttx/config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <nuttx/fs/ioctl.h>
+
+#include "i8sak.h"
+
+#include <nuttx/wireless/ieee802154/ieee802154_ioctl.h>
+#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
+#include "wireless/ieee802154.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name : i8sak_coordinfo_cmd
+ *
+ * Description :
+ *   Print various coordinator attributes
+ ****************************************************************************/
+
+void i8sak_coordinfo_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
+{
+  int option;
+  int fd;
+  int argind;
+  bool geteaddr = false;
+  bool getsaddr = false;
+  uint8_t eaddr[IEEE802154_EADDRSIZE];
+  uint8_t saddr[IEEE802154_SADDRSIZE];
+
+  argind = 1;
+  while ((option = getopt(argc, argv, ":haes")) != ERROR)
+    {
+      switch (option)
+        {
+          argind++;
+          case 'h':
+            fprintf(stderr, "Prints coordinator attributes\n"
+                    "Usage: %s [-h]\n"
+                    "    -h = this help menu\n"
+                    , argv[0]);
+            /* Must manually reset optind if we are going to exit early */
+
+            optind = -1;
+            return;
+
+          case 'a':
+            geteaddr = true;
+            getsaddr = true;
+            break;
+
+          case 'e':
+            geteaddr = true;
+            break;
+
+          case 's':
+            getsaddr = true;
+            break;
+
+          case ':':
+            fprintf(stderr, "ERROR: missing argument\n");
+            /* Must manually reset optind if we are going to exit early */
+
+            optind = -1;
+            i8sak_cmd_error(i8sak); /* This exits for us */
+          case '?':
+            fprintf(stderr, "ERROR: unknown argument\n");
+            /* Must manually reset optind if we are going to exit early */
+
+            optind = -1;
+            i8sak_cmd_error(i8sak); /* This exits for us */
+        }
+    }
+
+  fd = open(i8sak->devname, O_RDWR);
+  if (fd < 0)
+    {
+      printf("cannot open %s, errno=%d\n", i8sak->devname, errno);
+      i8sak_cmd_error(i8sak);
+    }
+
+  if (geteaddr)
+    {
+      ieee802154_getcoordeaddr(fd, eaddr);
+      PRINT_COORDEADDR(eaddr);
+    }
+
+  if (getsaddr)
+    {
+      ieee802154_getcoordsaddr(fd, saddr);
+      PRINT_COORDSADDR(saddr);
+    }
+
+  close(fd);
+}

wireless/ieee802154/i8sak/i8sak_main.c

@@ -110,6 +110,7 @@ static const struct i8sak_command_s g_i8sak_commands[] =
   {"sniffer",     (CODE void *)i8sak_sniffer_cmd},
   {"blaster",     (CODE void *)i8sak_blaster_cmd},
   {"chan",        (CODE void *)i8sak_chan_cmd},
+  {"coordinfo",   (CODE void *)i8sak_coordinfo_cmd},
 };
 
 #define NCOMMANDS (sizeof(g_i8sak_commands) / sizeof(struct i8sak_command_s))
@@ -738,7 +739,8 @@ static int i8sak_showusage(FAR const char *progname, int exitcode)
           "    poll [-h]\n"
           "    blaster [-h|q|f <hex payload>|p <period_ms>]\n"
           "    sniffer [-h|q]\n"
-          "    chan [-h|g] [<chan>]"
+          "    chan [-h|g] [<chan>]\n"
+          "    coordinfo [-h|a|e|s]\n"
           , progname);
   exit(exitcode);
 }

wireless/ieee802154/i8sak/i8sak_scan.c

@@ -233,21 +233,11 @@ static void scan_eventcb(FAR struct ieee802154_notif_s *notif, FAR void *arg)
 
       if (scan->pandescs[i].coordaddr.mode == IEEE802154_ADDRMODE_SHORT)
         {
-          printf("    Coordinator saddr: %02X:%02X\n",
+          PRINT_COORDSADDR(scan->pandescs[i].coordaddr.saddr);
-                 scan->pandescs[i].coordaddr.saddr[0],
-                 scan->pandescs[i].coordaddr.saddr[1]);
         }
       else
         {
-          printf("    Coordinator eaddr: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
+          PRINT_COORDEADDR(scan->pandescs[i].coordaddr.eaddr);
-                 scan->pandescs[i].coordaddr.eaddr[0],
-                 scan->pandescs[i].coordaddr.eaddr[1],
-                 scan->pandescs[i].coordaddr.eaddr[2],
-                 scan->pandescs[i].coordaddr.eaddr[3],
-                 scan->pandescs[i].coordaddr.eaddr[4],
-                 scan->pandescs[i].coordaddr.eaddr[5],
-                 scan->pandescs[i].coordaddr.eaddr[6],
-                 scan->pandescs[i].coordaddr.eaddr[7]);
         }
     }
 }

wireless/ieee802154/libmac/Makefile

@@ -54,7 +54,10 @@ CSRCS += ieee802154_seteaddr.c ieee802154_geteaddr.c
 CSRCS += ieee802154_setpromisc.c ieee802154_getpromisc.c
 CSRCS += ieee802154_setrxonidle.c ieee802154_getrxonidle.c
 CSRCS += ieee802154_settxpwr.c ieee802154_gettxpwr.c
-CSRCS += ieee802154_getdevmode.c ieee802154_setassocpermit.c
+CSRCS += ieee802154_getdevmode.c
+CSRCS += ieee802154_setassocpermit.c
+CSRCS += ieee802154_getcoordsaddr.c
+CSRCS += ieee802154_getcoordeaddr.c
 
 ifeq ($(CONFIG_NET_6LOWPAN),y)
 # Add Get/Set Attribute helpers

wireless/ieee802154/libmac/ieee802154_getcoordeaddr.c

@@ -0,0 +1,67 @@
+/****************************************************************************
+ * apps/wireless/ieee802154/libmac/ieee802154_getcoordeaddr.c
+ *
+ *   Copyright (C) 2017 Verge Inc. All rights reserved.
+ *   Author: Anthony Merlino <anthony@vergeaero.com>
+ *
+ * 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 <nuttx/config.h>
+
+#include <sys/ioctl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
+
+#include "wireless/ieee802154.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int ieee802154_getcoordeaddr(int fd, FAR uint8_t *eaddr)
+{
+  struct ieee802154_get_req_s req;
+  int ret;
+
+  req.attr = IEEE802154_ATTR_MAC_COORD_EADDR;
+  ret = ieee802154_get_req(fd, &req);
+
+  IEEE802154_EADDRCOPY(eaddr, req.attrval.mac.eaddr);
+
+  return ret;
+}

wireless/ieee802154/libmac/ieee802154_getcoordsaddr.c

@@ -0,0 +1,66 @@
+/****************************************************************************
+ * apps/wireless/ieee802154/libmac/ieee802154_getcoordsaddr.c
+ *
+ *   Copyright (C) 2017 Verge Inc. All rights reserved.
+ *   Author: Anthony Merlino <anthony@vergeaero.com>
+ *
+ * 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 <nuttx/config.h>
+
+#include <sys/ioctl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
+
+#include "wireless/ieee802154.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int ieee802154_getcoordsaddr(int fd, FAR uint8_t *saddr)
+{
+  struct ieee802154_get_req_s req;
+  int ret;
+
+  req.attr = IEEE802154_ATTR_MAC_COORD_SADDR;
+  ret = ieee802154_get_req(fd, &req);
+
+  IEEE802154_SADDRCOPY(saddr, req.attrval.mac.saddr);
+  return ret;
+}