Merge pull request ARMmbed#2062 from ARMmbed/ns_aro_fix

Ns aro fix

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -163,6 +163,14 @@ static void ws_bootstrap_address_notification_cb(struct protocol_interface_info_
                 break;
             }
         }
+    } else if (reason == ADDR_CALLBACK_TIMER) {
+        tr_debug("Address Re registration %s", trace_ipv6(addr->address));
+
+        if (!interface->ws_info->address_registration_event_active) {
+            interface->ws_info->address_registration_event_active = true;
+            tr_info("Register ARO");
+            ws_bootsrap_event_trig(WS_ADDRESS_ADDED, interface->bootStrapId, ARM_LIB_LOW_PRIORITY_EVENT, NULL);
+        }
     } else {
         tr_debug("Address notification addr: %s reason: %d", trace_ipv6(addr->address), reason);
     }

source/Common_Protocols/icmpv6.c

@@ -1432,7 +1432,7 @@ buffer_t *icmpv6_build_ns(protocol_interface_info_entry_t *cur, const uint8_t ta
             buf->ack_receive_cb = rpl_control_address_register_done;
         }
     }
-    if (!aro && cur->ipv6_neighbour_cache.omit_na) {
+    if (unicast && (!aro && cur->ipv6_neighbour_cache.omit_na)) {
         /*MAC ACK is processed as success response*/
         buf->ack_receive_cb = ack_receive_cb;
     }
@@ -1575,7 +1575,7 @@ buffer_t *icmpv6_build_na(protocol_interface_info_entry_t *cur, bool solicited,
         return NULL;
     }
     /* All other than ARO NA messages are omitted and MAC ACK is considered as success */
-    if (!aro && cur->ipv6_neighbour_cache.omit_na) {
+    if (!tllao_required && (!aro && cur->ipv6_neighbour_cache.omit_na)) {
         return NULL;
     }
 

source/Core/ns_address_internal.c

@@ -865,6 +865,7 @@ void addr_fast_timer(protocol_interface_info_entry_t *cur, uint_fast16_t ticks)
             }
 #endif
         } else {
+            addr->addr_reg_done = 0;
             addr_cb(cur, addr, ADDR_CALLBACK_TIMER);
         }