Added IID for border router info structure

Get IID from Wi-SUN RF interface using the Global prefix
Added domain check for network size to prevent reset
if Wrong interface ID is used

Author: Mika Tervonen

nanostack/ws_bbr_api.h

@@ -40,6 +40,8 @@ typedef struct bbr_information {
     uint8_t dodag_id[16];
     /** Address prefix given to devices in network  set to 0 if not available*/
     uint8_t prefix[8];
+    /** Address IID of the border router set to 0 if not available*/
+    uint8_t IID[8];
     /** Amount of devices in the network. */
     uint16_t devices_in_network;
     /** Border router instance identifier defined in RPL */

source/6LoWPAN/ws/ws_bbr_api.c

@@ -20,6 +20,7 @@
 #include "ns_types.h"
 #include "ns_trace.h"
 #include "net_interface.h"
+#include "socket_api.h"
 #include "eventOS_event.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan.h"
@@ -641,6 +642,11 @@ uint16_t test_pan_size_override = 0xffff;
 uint16_t ws_bbr_pan_size(protocol_interface_info_entry_t *cur)
 {
     uint16_t result = 0;
+
+    if (!cur || !cur->rpl_domain) {
+        return 0;
+    }
+
     if (test_pan_size_override != 0xffff) {
         return test_pan_size_override;
     }
@@ -773,6 +779,13 @@ int ws_bbr_info_get(int8_t interface_id, bbr_information_t *info_ptr)
     memcpy(info_ptr->dodag_id, current_dodag_id, 16);
     memcpy(info_ptr->prefix, current_global_prefix, 8);
 
+    // Get the Wi-SUN interface generated address that is used in the RF interface.
+    const uint8_t *wisun_if_addr = addr_select_with_prefix(cur, current_global_prefix, 64, SOCKET_IPV6_PREFER_SRC_PUBLIC);
+
+    if (wisun_if_addr) {
+        memcpy(info_ptr->IID, wisun_if_addr + 8, 8);
+    }
+
     info_ptr->devices_in_network = ws_bbr_pan_size(cur);
     info_ptr->instance_id = current_instance_id;
     info_ptr->version = dodag_info.version_num;