Source route handler call Wi-Sun border router alive function.

Calling at SRC route handling by update border router alive state will help
Wi-SUN to scale at big network and with longer DAO lifetime it will decrease
DAO traffic.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -1758,7 +1758,7 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     // restart PAN version timer
     //Check Here Do we have a selected Primary parent
     if (!cur->ws_info->configuration_learned || cur->ws_info->rpl_state == RPL_EVENT_DAO_DONE) {
-        cur->ws_info->pan_timeout_timer = cur->ws_info->cfg->timing.pan_timeout;
+        ws_common_border_router_alive_update(cur);
     }
 
     cur->ws_info->pan_information.pan_version = pan_version;
@@ -2645,9 +2645,7 @@ static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
             }
 
             // After successful DAO ACK connection to border router is verified
-            cur->ws_info->pan_timeout_timer = cur->ws_info->cfg->timing.pan_timeout;
-
-
+            ws_common_border_router_alive_update(cur);
         }
 
         if (!cur->ws_info->trickle_pa_running || !cur->ws_info->trickle_pc_running) {
@@ -3171,7 +3169,7 @@ static void ws_bootstrap_rpl_scan_start(protocol_interface_info_entry_t *cur)
      * Router for an interval of PAN_TIMEOUT, a node MUST assume failure of the PAN Border Router and MUST
      * Transition to Join State 1
      */
-    cur->ws_info->pan_timeout_timer = cur->ws_info->cfg->timing.pan_timeout;
+    ws_common_border_router_alive_update(cur);
 }
 
 /*

source/6LoWPAN/ws/ws_common.c

@@ -690,4 +690,14 @@ void ws_common_secondary_parent_update(protocol_interface_info_entry_t *interfac
     ws_bootstrap_secondary_parent_update(interface);
 }
 
+void ws_common_border_router_alive_update(protocol_interface_info_entry_t *interface)
+{
+    if (interface->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
+        return;
+    }
+
+    // After successful DAO ACK connection to border router is verified
+    interface->ws_info->pan_timeout_timer = interface->ws_info->cfg->timing.pan_timeout;
+}
+
 #endif // HAVE_WS

source/6LoWPAN/ws/ws_common.h

@@ -173,6 +173,8 @@ void ws_common_primary_parent_update(protocol_interface_info_entry_t *interface,
 void ws_common_secondary_parent_update(protocol_interface_info_entry_t *interface);
 
 uint8_t ws_common_temporary_entry_size(uint8_t mac_table_size);
+void ws_common_border_router_alive_update(protocol_interface_info_entry_t *interface);
+
 #define ws_info(cur) ((cur)->ws_info)
 #else
 #define ws_info(cur) ((ws_info_t *) NULL)
@@ -189,6 +191,7 @@ uint8_t ws_common_temporary_entry_size(uint8_t mac_table_size);
 #define ws_common_network_size_estimate_get(cur) 0
 #define ws_common_primary_parent_update(interface, neighbor)
 #define ws_common_secondary_parent_update(interface)
+#define ws_common_border_router_alive_update(interface) ((void) 0)
 
 
 #endif //HAVE_WS

source/RPL/rpl_data.c

@@ -46,6 +46,7 @@
 #include "RPL/rpl_structures.h"
 #include "RPL/rpl_policy.h"
 #include "RPL/rpl_data.h"
+#include "6LoWPAN/ws/ws_common.h"
 
 #define TRACE_GROUP "RPLa"
 
@@ -1054,6 +1055,11 @@ buffer_t *rpl_data_process_routing_header(buffer_t *buf, protocol_interface_info
 
     buf->options.ip_extflags |= IPEXT_SRH_RPL;
 
+    if (ws_info(cur)) {
+        //Call SRC route header handler hook to Wi-SUN refresh border router alive
+        ws_common_border_router_alive_update(cur);
+    }
+
     uint16_t hlen = (ptr[1] + 1) * 8;
     uint8_t segs_left = ptr[3];
 

test/nanostack/unittest/rpl/rpl_data/Makefile

@@ -25,6 +25,7 @@ TEST_SRC_FILES = \
         ../../stub/ipv6_routing_table_stub.c \
         ../../stub/rpl_downward_stub.c \
         ../../stub/rpl_upward_stub.c \
+        ../../stub/ws_common_stub.c \
 
 include ../../MakefileWorker.mk
 

test/nanostack/unittest/stub/ws_common_stub.c

@@ -124,3 +124,8 @@ void ws_common_primary_parent_update(protocol_interface_info_entry_t *interface,
 void ws_common_secondary_parent_update(protocol_interface_info_entry_t *interface)
 {
 }
+
+void ws_common_border_router_alive_update(protocol_interface_info_entry_t *interface)
+{
+
+}