Distribute and learn network size

added test api to set net size in border router

Author: Mika Tervonen

nanostack/net_ws_test.h

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * 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 of the copyright holder 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 HOLDER 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.
+ */
+
+#ifndef NET_WS_TEST_H_
+#define NET_WS_TEST_H_
+
+/* Prevent this file being inserted in public Doxygen generated file
+ * this is not part of our external API. */
+#ifndef DOXYGEN
+
+/**
+ * \file net_ws_test.h
+ * \brief Wi-SUN Library Test API.
+ *
+ * \warning NOTICE! This is test API must not be used externally.
+ *
+ * \warning This file is not part of the version number control and can change any time.
+ *
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ns_types.h"
+
+/**
+ * \brief Set extension name.
+ *
+ * Pan size is reported to advertisement. Using this function
+ * actual value can be overridden.
+ *
+ * Set pan_size to 0xffff to stop override
+ *
+ * \param interface_id               Network Interface
+ * \param pan_size                   Pan size reported in advertisements
+ *
+ * \return 0                         OK
+ * \return <0                        Failure
+ */
+int ws_test_pan_size_set(int8_t interface_id, uint16_t pan_size);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DOXYGEN */
+#endif /* NET_THREAD_TEST_H_ */

source/6LoWPAN/ws/ws_bbr_api.c

@@ -36,6 +36,8 @@
 
 #define TRACE_GROUP "wsbs"
 
+#define RPL_INSTANCE_ID 1
+
 #ifdef HAVE_WS
 
 static void ws_bbr_rpl_root_activate(uint8_t *dodag_prefix, uint8_t *dodag_id)
@@ -62,7 +64,7 @@ static void ws_bbr_rpl_root_activate(uint8_t *dodag_prefix, uint8_t *dodag_id)
     new_conf.dio_redundancy_constant = WS_RPL_DIO_REDUDANCY;
 
     rpl_data_init_root();
-    protocol_6lowpan_rpl_root_dodag = rpl_control_create_dodag_root(protocol_6lowpan_rpl_domain, 1, dodag_id, &new_conf, new_conf.min_hop_rank_increase, RPL_GROUNDED | RPL_MODE_NON_STORING | RPL_DODAG_PREF(0));
+    protocol_6lowpan_rpl_root_dodag = rpl_control_create_dodag_root(protocol_6lowpan_rpl_domain, RPL_INSTANCE_ID, dodag_id, &new_conf, new_conf.min_hop_rank_increase, RPL_GROUNDED | RPL_MODE_NON_STORING | RPL_DODAG_PREF(0));
     if (!protocol_6lowpan_rpl_root_dodag) {
         tr_err("RPL dodag init failed");
     }
@@ -139,5 +141,17 @@ void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds
    ws_bbr_root_start(cur);
 }
 
+uint16_t test_pan_size_override = 0xffff;
+
+uint16_t ws_bbr_pan_size(protocol_interface_info_entry_t *cur)
+{
+    uint16_t result = 0;
+    if (test_pan_size_override != 0xffff) {
+        return test_pan_size_override;
+    }
+
+    rpl_control_get_instance_dao_target_count(cur->rpl_domain, RPL_INSTANCE_ID, NULL, &result);
+    return result;
+}
 
 #endif //HAVE_WS

source/6LoWPAN/ws/ws_bbr_api_internal.h

@@ -21,11 +21,17 @@
 
 #ifdef HAVE_WS
 
+extern uint16_t test_pan_size_override;
+
 void ws_bbr_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds);
 
+uint16_t ws_bbr_pan_size(protocol_interface_info_entry_t *cur);
+
+
 #else
 
 #define ws_bbr_seconds_timer( cur, seconds)
+#define ws_bbr_pan_size(cur)
 
 #endif //HAVE_WS
 

source/6LoWPAN/ws/ws_bootstrap.c

@@ -38,6 +38,7 @@
 #include "6LoWPAN/ws/ws_config.h"
 #include "6LoWPAN/ws/ws_common.h"
 #include "6LoWPAN/ws/ws_bootstrap.h"
+#include "6LoWPAN/ws/ws_bbr_api_internal.h"
 #include "RPL/rpl_protocol.h"
 #include "RPL/rpl_control.h"
 #include "RPL/rpl_data.h"
@@ -404,12 +405,17 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
         cur->bootsrap_state_machine_cnt = randLIB_get_random_in_range(10 ,30);
 
         tr_info("New possible parent found addr:%s", trace_array(cur->ws_info->parent_info.addr, 8));
-    } else {
-        // Active state processing
-        ws_bootstrap_pan_advertisement_analyse_active(cur, &pan_information);
+        return;
+    }
+    // Active state processing
+    ws_bootstrap_pan_advertisement_analyse_active(cur, &pan_information);
+
+    // TODO Learn routing cost per neighbour
+
+    // Learn latest network information
+    if (cur->bootsrap_mode != ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
+        cur->ws_info->pan_configuration = pan_information;
     }
-    // Parent valid store information
-    cur->ws_info->parent_info.ws_utt = *ws_utt;
 }
 
 static void ws_bootstrap_pan_advertisement_solicit_analyse(struct protocol_interface_info_entry *cur, const struct mcps_data_ind_s *data, ws_utt_ie_t *ws_utt, ws_us_ie_t *ws_us)
@@ -509,7 +515,8 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
         //Border router does not learn network information
         return;
     }
-    if (cur->ws_info->pan_configuration.pan_version == pan_version) {
+    if (cur->ws_info->configuration_learned &&
+        cur->ws_info->pan_configuration.pan_version == pan_version) {
         // No new information
         return;
     }
@@ -1077,6 +1084,11 @@ static void ws_bootstrap_pan_advert(protocol_interface_info_entry_t *cur)
     async_req.channel_list.channel_page = CHANNEL_PAGE_10;
     async_req.security.SecurityLevel = 0;
 
+    if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
+        // Border routers write the NW size
+        cur->ws_info->pan_configuration.pan_size = ws_bbr_pan_size(cur);
+    }
+
     ws_llc_asynch_request(cur, &async_req);
 }
 
@@ -1136,7 +1148,7 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
         if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
             tr_debug("Border router start network");
             cur->ws_info->network_pan_id = randLIB_get_random_in_range(0,0xfffd);
-            cur->ws_info->pan_configuration.pan_size = 3;
+            cur->ws_info->pan_configuration.pan_size = 0;
             cur->ws_info->pan_configuration.pan_version = randLIB_get_random_in_range(0,0xffff);
             cur->ws_info->pan_configuration.routing_cost = 0;
             cur->ws_info->pan_configuration.rpl_routing_method = true;

source/6LoWPAN/ws/ws_test_api.c

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2014-2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * 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 of the copyright holder 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 HOLDER 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.
+ */
+#include "nsconfig.h"
+
+#include <string.h>
+#include <ns_list.h>
+#include <nsdynmemLIB.h>
+#include <net_ws_test.h>
+#include "NWK_INTERFACE/Include/protocol.h"
+#include "6LoWPAN/ws/ws_config.h"
+#include "6LoWPAN/ws/ws_bbr_api_internal.h"
+#include "randLIB.h"
+
+#include "ns_trace.h"
+#include "common_functions.h"
+
+#define TRACE_GROUP "wste"
+
+
+int ws_test_pan_size_set(int8_t interface_id, uint16_t pan_size)
+{
+#ifdef HAVE_WS
+    (void) interface_id;
+    test_pan_size_override = pan_size;
+    return 0;
+#else
+    (void) interface_id;
+    (void) pan_size;
+    return -1;
+#endif
+}

sources.mk

@@ -26,6 +26,7 @@ SRCS += \
 	source/6LoWPAN/ws/ws_common.c \
 	source/6LoWPAN/ws/ws_management_api.c \
 	source/6LoWPAN/ws/ws_bbr_api.c \
+	source/6LoWPAN/ws/ws_test_api.c \
 	source/BorderRouter/border_router.c \
 	source/Common_Protocols/icmpv6.c \
 	source/Common_Protocols/icmpv6_prefix.c \