Add support for bbr configuration that removes default route from DIO

New api bit added to configuration that removes the default route from DIO

Author: Mika Tervonen

nanostack/ws_bbr_api.h

@@ -48,14 +48,10 @@ int ws_bbr_start(int8_t interface_id, int8_t backbone_interface_id);
 /**
  * Border router configuration options
  */
-#define BBR_ULA_C           0x0001 /**< Static ULA prefix created automatically */
-#define BBR_GUA_ROUTE       0x0002 /**< More specific route is added for GUA prefix */
-#define BBR_BB_WAIT         0x0004 /**< Wait backbone availability before starting Wi-SUN network */
-
-/*Deprecated configuration values */
-#define BBR_GUA_C           0x0000 /**< Routable prefix is learned from the backbone */
-#define BBR_GUA_SLAAC       0x0000 /**< Use SLAAC addressing in routable prefix */
-#define BBR_GUA_WAIT        0x0000 /**< Wait backbone availability before startingRPL dodag */
+#define BBR_ULA_C                 0x0001 /**< Static ULA prefix created automatically */
+#define BBR_GUA_ROUTE             0x0002 /**< More specific route is added for GUA prefix */
+#define BBR_BB_WAIT               0x0004 /**< Wait backbone availability before starting Wi-SUN network */
+#define BBR_DEFAULT_ROUTE         0x0008 /**< Add default route parameter to DIO */
 
 /**
  * Configure border router features.

source/6LoWPAN/ws/ws_bbr_api.c

@@ -423,7 +423,9 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
     /*
      * Add default route to RPL
      */
-    rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, NULL, 0, 0, WS_ROUTE_LIFETIME, false);
+    if (configuration & BBR_DEFAULT_ROUTE) {
+        rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, NULL, 0, 0, WS_ROUTE_LIFETIME, false);
+    }
 
     /*
      * Create static ULA configuration or modify if needed

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2257,6 +2257,7 @@ static void ws_bootstrap_rpl_activate(protocol_interface_info_entry_t *cur)
     rpl_control_set_callback(protocol_6lowpan_rpl_domain, ws_bootstrap_rpl_callback, ws_rpl_prefix_callback, ws_rpl_new_parent_callback, cur);
     // If i am router I Do this
     rpl_control_force_leaf(protocol_6lowpan_rpl_domain, leaf);
+    rpl_control_process_routes(protocol_6lowpan_rpl_domain, false); // Wi-SUN assumes that no default route needed
     rpl_control_request_parent_link_confirmation(true);
     rpl_control_set_dio_multicast_min_config_advertisment_count(WS_MIN_DIO_MULTICAST_CONFIG_ADVERTISMENT_COUNT);
     rpl_control_set_dao_retry_count(WS_MAX_DAO_RETRIES);

source/RPL/rpl_control.c

@@ -417,6 +417,7 @@ rpl_domain_t *rpl_control_create_domain(void)
     domain->callback = NULL;
     domain->cb_handle = NULL;
     domain->force_leaf = false;
+    domain->process_routes = true;
     ns_list_add_to_start(&rpl_domains, domain);
 
     addr_notification_register(rpl_control_addr_notifier);
@@ -672,6 +673,10 @@ void rpl_control_force_leaf(rpl_domain_t *domain, bool leaf)
         }
     }
 }
+void rpl_control_process_routes(rpl_domain_t *domain, bool process_routes)
+{
+    domain->process_routes = process_routes;
+}
 
 /* Check whether the options section of a RPL control message is well-formed */
 static bool rpl_control_options_well_formed(const uint8_t *dptr, uint_fast16_t dlen)
@@ -941,7 +946,6 @@ static void rpl_control_process_route_options(rpl_instance_t *instance, rpl_doda
         }
         rpl_dodag_update_dio_route(dodag, prefix, prefix_len, flags, lifetime, true);
     }
-
     /* We do not purge unadvertised routes. Thus if the root wants to purge
      * a route before its lifetime is up, stopping advertising it is not
      * sufficient, it has to advertise it with low or zero lifetime. This fits

source/RPL/rpl_control.h

@@ -55,6 +55,8 @@ typedef struct rpl_domain {
     int8_t non_storing_downstream_interface;
     /* As part of shutdown, we can force entering leaf mode */
     bool force_leaf;
+    /* if false routes are not set to routing table, instead default route is added for DODAGID */
+    bool process_routes;
     rpl_domain_callback_t *callback;
     rpl_prefix_callback_t *prefix_cb;
     rpl_new_parent_callback_t *new_parent_add;
@@ -137,6 +139,8 @@ void rpl_control_increment_dtsn(struct rpl_dodag *dodag);
 
 /* Force leaf behaviour on a domain - useful before shutdown, and in conjunction with poison */
 void rpl_control_force_leaf(rpl_domain_t *domain, bool leaf);
+/*Process routes from DIOs and add those as real routes. if routes are not processed assume DODAGID as default route*/
+void rpl_control_process_routes(rpl_domain_t *domain, bool process_routes);
 
 /* Manually send poison on all existing instances a few times */
 void rpl_control_poison(rpl_domain_t *domain, uint8_t poison_count);

source/RPL/rpl_upward.c

@@ -1364,6 +1364,10 @@ void rpl_dodag_update_implicit_system_routes(rpl_dodag_t *dodag, rpl_neighbour_t
     /* Also add a specific route to the DODAGID */
     ipv6_route_add_metric(dodag->id, 128, parent->interface_id, parent->ll_address, ROUTE_RPL_ROOT, parent, dodag->instance->id, default_lifetime, metric);
 
+    /* Check if we assume default route to DODAGID */
+    if (!dodag->instance->domain->process_routes) {
+        ipv6_route_add_metric(NULL, 0, parent->interface_id, parent->ll_address, ROUTE_RPL_ROOT, parent, dodag->instance->id, default_lifetime, metric);
+    }
 }
 
 /* Called when a DIO RIO route has been updated (but not the parent list) */
@@ -1372,9 +1376,13 @@ static void rpl_dodag_update_system_route(rpl_dodag_t *dodag, rpl_dio_route_t *r
     if (!rpl_dodag_is_current(dodag)) {
         return;
     }
-
     rpl_instance_t *instance = dodag->instance;
 
+    if (!instance->domain->process_routes) {
+        // We dont add actual routes and only create default route throuh DODAGID
+        return;
+    }
+
     ns_list_foreach(rpl_neighbour_t, neighbour, &instance->candidate_neighbours) {
         if (neighbour->dodag_parent) {
             rpl_instance_update_system_dio_route(instance, neighbour, route);
@@ -1389,6 +1397,11 @@ static void rpl_instance_update_system_routes_through_parent(rpl_instance_t *ins
 
     rpl_dodag_update_implicit_system_routes(dodag, parent);
 
+    if (!instance->domain->process_routes) {
+        // We dont add actual routes and only create default route through DODAGID
+        return;
+    }
+
     /* Then add the specific routes listed in the DIO as ROUTE_RPL_DIO */
     ns_list_foreach(rpl_dio_route_t, route, &dodag->routes) {
         rpl_instance_update_system_dio_route(instance, parent, route);

test/nanostack/unittest/stub/rpl_control_stub.c

@@ -164,6 +164,11 @@ void rpl_control_force_leaf(rpl_domain_t *domain, bool leaf)
 
 }
 
+void rpl_control_process_routes(rpl_domain_t *domain, bool process_routes)
+{
+
+}
+
 void rpl_control_transmit(struct rpl_domain *domain, struct protocol_interface_info_entry *cur, uint8_t code, struct buffer *buf, const uint8_t *dst)
 {