Removed old configuration options from Border router API

Updated trace levels
Removed extra memset

Author: Mika Tervonen

nanostack/ws_bbr_api.h

@@ -49,21 +49,21 @@ 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_C           0x0002 /**< Routable prefix is learned from the backbone */
-#define BBR_GUA_ROUTE       0x0004 /**< More specific route is added for GUA prefix */
-#define BBR_GUA_SLAAC       0x0008 /**< Use SLAAC addressing in routable prefix */
-#define BBR_GUA_WAIT        0x0010 /**< Wait backbone availability before starting RPL dodag */
-#define BBR_BB_WAIT         0x0020 /**< Wait backbone availability before starting Wi-SUN network */
+#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 */
+
 /**
  * Configure border router features.
  *
  * \param interface_id interface ID of the Wi-SUN network
  * \param options Options configured to Border router
- *          BBR_ULA_C     Configure Mesh local ULA prefix with SLAAC address  (default)
- *          BBR_GUA_C     Configure GUA/ULA prefix from backbone to RPL       (default)
- *          BBR_GUA_ROUTE Add more specific route for GUA                     (default)
- *          BBR_GUA_SLAAC Use SLAAC address generation in GUA prefix
- *          BBR_GUA_WAIT  Start RPL root only when GUA is available
+ *          BBR_ULA_C     Configure Mesh local ULA prefix with SLAAC address
+ *          BBR_GUA_ROUTE Add more specific route for GUA
  *          BBR_BB_WAIT   Start Wi-SUN network only when backbone is ready
  *
  * By default Wi-SUN network is started and is treated as separate interface even if backbone is not available.

source/6LoWPAN/ws/ws_bbr_api.c

@@ -306,7 +306,7 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
 
     if (!protocol_6lowpan_rpl_root_dodag) {
         // Failed to start
-        tr_info("BBR failed to start");
+        tr_err("BBR failed to start");
         return;
     }
 
@@ -315,7 +315,7 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
      */
     if (protocol_interface_address_compare(current_dodag_id) != 0) {
         //DODAGID is lost need to restart
-        tr_err("DODAGID lost restart RPL");
+        tr_warn("DODAGID lost restart RPL");
         memset(current_dodag_id, 0, 16);
         ws_bbr_rpl_root_stop();
         return;

source/6LoWPAN/ws/ws_management_api.c

@@ -72,7 +72,6 @@ int ws_management_network_name_set(
         // Network name is the same no further actions required.
         return 0;
     }
-    memset(cur->ws_info->network_name, 0, 33);
     strncpy(cur->ws_info->network_name, network_name_ptr, 32);
     // if settings change reset_restart for the settings needed
     if (cur->lowpan_info & INTERFACE_NWK_ACTIVE) {