Merge pull request ARMmbed#1983 from ARMmbed/iothhd-2950

wi-sun Address select fix's

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bbr_api.c

@@ -170,12 +170,13 @@ static int ws_bbr_static_ula_create(protocol_interface_info_entry_t *cur)
     tr_info("BBR generate ula prefix");
 
     // This address is only used if no other address available.
-    if_address_entry_t *add_entry = icmpv6_slaac_address_add(cur, static_dodag_prefix, 64, 0xffffffff, 0, true, SLAAC_IID_FIXED);
+    if_address_entry_t *add_entry = icmpv6_slaac_address_add(cur, static_dodag_prefix, 64, 0xffffffff, 0xffffffff, true, SLAAC_IID_FIXED);
     if (!add_entry) {
         return -1;
     }
     memcpy(static_ula_address, add_entry->address, 16);
     tr_info("BBR generate ula prefix addr %s", trace_ipv6(static_ula_address));
+    addr_policy_table_add_entry(static_dodag_prefix, 64, 2, WS_NON_PREFFRED_LABEL);
 
     return 0;
 }
@@ -322,7 +323,7 @@ static void ws_bbr_rpl_status_check(protocol_interface_info_entry_t *cur)
             ws_dhcp_client_address_request(cur, global_id, ll);
 
             rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, NULL, 0, 0, 7200, false);
-            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, static_dodag_id, 64, PIO_A, 7200, 0, false);
+            rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, static_dodag_id, 64, PIO_A, 7200, 7200, false);
             rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, static_dodag_id, 64, 0x18, 7200, false);
             rpl_control_update_dodag_prefix(protocol_6lowpan_rpl_root_dodag, global_id, 64, 0, 7200, 7200, false);
             rpl_control_update_dodag_route(protocol_6lowpan_rpl_root_dodag, global_id, 64, 0, 7200, false);

source/6LoWPAN/ws/ws_bootstrap.c

@@ -144,6 +144,9 @@ static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_
     } else if (reason == ADDR_CALLBACK_DELETED) {
         // What to do?
         // Go through address list and check if there is global address still available
+        //Discover prefix policy
+        addr_policy_remove_by_label(WS_NON_PREFFRED_LABEL);
+
         interface->global_address_available = false;
         ns_list_foreach(if_address_entry_t, addr_str, &interface->ip_addresses) {
             if (addr_ipv6_scope(addr_str->address, interface) > IPV6_SCOPE_LINK_LOCAL) {
@@ -1786,6 +1789,14 @@ static void ws_rpl_prefix_callback(prefix_entry_t *prefix, void *handle, uint8_t
     if (prefix->options & PIO_A) {
         if (icmpv6_slaac_prefix_update(cur, prefix->prefix, prefix->prefix_len, prefix->lifetime, prefix->preftime) != 0) {
             ipv6_interface_slaac_handler(cur, prefix->prefix, prefix->prefix_len, prefix->lifetime, prefix->preftime);
+            /*
+             * Give SLAAC addresses a different label and low precedence to indicate that
+             * they probably shouldn't be used for external traffic. SLAAC use in Wi-SUN is non-standard,
+             * and we use it for mesh-local traffic we should prefer any DHCP-assigned addresses
+             * for talking to the outside world
+             *
+             */
+            addr_policy_table_add_entry(prefix->prefix, prefix->prefix_len, 2, WS_NON_PREFFRED_LABEL);
         }
     } else if (prefix->prefix_len) {
         if (prefix->preftime == 0) {

source/6LoWPAN/ws/ws_common_defines.h

@@ -198,6 +198,12 @@ typedef struct ws_bs_ie {
 
 #define WS_NUD_RANDOM_COMPARE (WS_NUD_RAND_PROBABILITY*WS_NUD_RANDOM_SAMPLE_LENGTH) / 100
 
+/**
+ * Wi-sun spesific non-preferred prefix policy label
+ */
+
+#define WS_NON_PREFFRED_LABEL 36
+
 /*
  * Threshold (referenced to DEVICE_MIN_SENS) above which a neighbor node may be considered for inclusion into candidate parent set
  */

source/Common_Protocols/icmpv6.c

@@ -325,12 +325,12 @@ static buffer_t *icmpv6_echo_request_handler(buffer_t *buf)
 
     if (addr_is_ipv6_multicast(buf->dst_sa.address)) {
         const uint8_t *ipv6_ptr;
+        memcpy(buf->dst_sa.address, buf->src_sa.address, 16);
         ipv6_ptr = addr_select_source(cur, buf->dst_sa.address, 0);
         if (!ipv6_ptr) {
             tr_debug("No address");
             return buffer_free(buf);
         }
-        memcpy(buf->dst_sa.address, buf->src_sa.address, 16);
         memcpy(buf->src_sa.address, ipv6_ptr, 16);
     } else {
         memswap(buf->dst_sa.address, buf->src_sa.address, 16);

source/Core/include/ns_address_internal.h

@@ -178,6 +178,8 @@ struct if_address_entry *addr_get_entry(const struct protocol_interface_info_ent
 bool addr_is_assigned_to_interface(const struct protocol_interface_info_entry *interface, const uint8_t addr[__static 16]);
 bool addr_is_tentative_for_interface(const struct protocol_interface_info_entry *interface, const uint8_t addr[__static 16]);
 
+void addr_policy_remove_by_label(uint8_t label);
+
 void addr_duplicate_detected(struct protocol_interface_info_entry *interface, const uint8_t addr[__static 16]);
 
 struct if_group_entry *addr_add_group(struct protocol_interface_info_entry *interface, const uint8_t group[__static 16]);

source/Core/ns_address_internal.c

@@ -690,6 +690,13 @@ const uint8_t *addr_select_source(protocol_interface_info_entry_t *interface, co
             }
         }
 
+        /* Rule 9 select most precated one  */
+        if (policy_SA->precedence > policy_SB->precedence) {
+            PREFER_SA;
+        } else if (policy_SB->precedence > policy_SA->precedence) {
+            PREFER_SB;
+        }
+
         /* Tie */
         PREFER_SA;
     }
@@ -1398,6 +1405,21 @@ int8_t addr_interface_select_source(protocol_interface_info_entry_t *cur, uint8_
     return ret_val;
 }
 
+void addr_policy_remove_by_label(uint8_t label)
+{
+    ns_list_foreach_safe(addr_policy_table_entry_t, entry, &addr_policy_table) {
+        if (entry->label == label) {
+            /*
+             * Remove label policy if no local address matches"
+             */
+            if (!protocol_interface_any_address_match(entry->prefix, entry->prefix_len)) {
+                ns_list_remove(&addr_policy_table, entry);
+                ns_dyn_mem_free(entry);
+            }
+        }
+    }
+}
+
 // This last function must always be compiled with tracing enabled
 #ifndef FEA_TRACE_SUPPORT
 #define FEA_TRACE_SUPPORT 1

source/NWK_INTERFACE/Include/protocol.h

@@ -514,4 +514,5 @@ extern void protocol_core_dhcpv6_allocated_address_remove(protocol_interface_inf
 extern void nwk_bootsrap_state_update(arm_nwk_interface_status_type_e posted_event, protocol_interface_info_entry_t *cur);
 void bootsrap_next_state_kick(icmp_state_t new_state, protocol_interface_info_entry_t *cur);
 int8_t protocol_interface_address_compare(const uint8_t *addr);
+bool protocol_interface_any_address_match(const uint8_t *prefix, uint8_t prefix_len);
 #endif /* _NS_PROTOCOL_H */

source/NWK_INTERFACE/protocol_core.c

@@ -1135,3 +1135,27 @@ int8_t protocol_interface_address_compare(const uint8_t *addr)
     return -1;
 }
 
+static bool protocol_address_prefix_cmp(protocol_interface_info_entry_t *interface, const uint8_t *prefix, uint8_t prefix_len)
+{
+    ns_list_foreach(if_address_entry_t, adr, &interface->ip_addresses) {
+        if (bitsequal(adr->address, prefix, prefix_len)) {
+            /* Prefix  stil used at list so stop checking */
+            return true;
+        }
+    }
+    return false;
+}
+
+bool protocol_interface_any_address_match(const uint8_t *prefix, uint8_t prefix_len)
+{
+    ns_list_foreach(protocol_interface_info_entry_t, cur, &protocol_interface_info_list) {
+
+        if (protocol_address_prefix_cmp(cur, prefix, prefix_len)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+

source/libDHCPv6/dhcp_service_api.c

@@ -441,7 +441,7 @@ void recv_dhcp_relay_msg(void *cb_res)
         }
         uint8_t gp_address[16];
         //Get blobal address from interface
-        if (arm_net_address_get(sckt_data->interface_id, ADDR_IPV6_GP, gp_address) != 0) {
+        if (addr_interface_select_source(interface_ptr, gp_address, relay_srv->server_address, 0) != 0) {
             // No global prefix available
             tr_error("No GP address");
             goto cleanup;

test/nanostack/unittest/libDHCPv6/dhcp_service_api/Makefile

@@ -21,6 +21,7 @@ TEST_SRC_FILES = \
         ../../stub/system_timer_stub.c \
         ../../stub/libDHCPv6_stub.c \
         ../../stub/protocol_core_stub.c \
+        ../../stub/address_stub.c \
         ../../stub/net_stub.c \
 
 include ../../MakefileWorker.mk

test/nanostack/unittest/stub/address_stub.c

@@ -345,3 +345,7 @@ int8_t addr_interface_select_source(protocol_interface_info_entry_t *cur, uint8_
 void addr_multicast_fwd_set_forwarding(struct protocol_interface_info_entry *interface, bool enable)
 {
 }
+
+void addr_policy_remove_by_label(uint8_t label)
+{
+}

test/nanostack/unittest/stub/protocol_core_stub.c

@@ -239,3 +239,8 @@ int8_t protocol_interface_address_compare(const uint8_t *addr)
     return protocol_core_stub.int8_value;
 }
 
+bool protocol_interface_any_address_match(const uint8_t *prefix, uint8_t prefix_len)
+{
+    return protocol_core_stub.bool_value;
+}
+