Moved DAD enabled check to Ipv6 SLAAC handler

Corrected also review defects.

Author: Mika Leppänen

nanostack/ethernet_mac_api.h

@@ -134,7 +134,7 @@ typedef int8_t eth_mac_iid64_address_set(const eth_mac_api_t *api, const uint8_t
 /**
  * @brief Read 64 bit interface identifier
  * @param api API to handle the request
- * @paramiid64_buf Pointer where IID64 can be written
+ * @param iid64_buf Pointer where IID64 can be written
  * @return 0 if successful, -1 otherwise
  */
 typedef int8_t eth_mac_iid64_address_get(const eth_mac_api_t *api, uint8_t *iid64_buf);

source/NWK_INTERFACE/protocol_core.c

@@ -868,93 +868,80 @@ protocol_interface_info_entry_t *protocol_stack_interface_generate_ethernet(eth_
     if (!api) {
         return NULL;
     }
-    protocol_interface_info_entry_t *new_entry = NULL;
 
     ns_list_foreach(protocol_interface_info_entry_t, cur, &protocol_interface_info_list) {
         if (cur->eth_mac_api == api) {
             return cur;
         }
     }
 
-    if (api) {
-        new_entry = protocol_core_interface_ethernet_entry_get(api);
-
-        if (new_entry) {
-            neighbor_cache_init(&(new_entry->neigh_cache));
-            pan_blacklist_cache_init(&(new_entry->pan_blaclist_cache));
-            pan_coordinator_blacklist_cache_init(&(new_entry->pan_cordinator_black_list));
-            ipv6_neighbour_cache_init(&new_entry->ipv6_neighbour_cache, new_entry->id);
-            addr_max_slaac_entries_set(new_entry, 16);
-            uint8_t mac[6];
-            int8_t error = api->mac48_get(api, mac);
-            if (error) {
-                tr_error("mac_ext_mac64_address_get failed: %d", error);
-                ns_dyn_mem_free(new_entry);
-                return NULL;
-            }
-
-            protocol_stack_interface_iid_eui64_generate(new_entry, mac);
-            ns_list_add_to_start(&protocol_interface_info_list, new_entry);
-
-            (void) ipv6_route_table_set_max_entries(new_entry->id, ROUTE_RADV, 16);
+    protocol_interface_info_entry_t *new_entry = protocol_core_interface_ethernet_entry_get(api);
 
-            return new_entry;
-        }
+    if (!new_entry) {
+        return NULL;
     }
-    return NULL;
-}
 
-void protocol_stack_interface_ppp_addr_notification(struct protocol_interface_info_entry *interface, const struct if_address_entry *addr, if_address_callback_t reason)
-{
-    if (interface->dup_addr_detect_transmits == 0 && !addr_is_ipv6_link_local(addr->address) && reason == ADDR_CALLBACK_DAD_COMPLETE && addr->source == ADDR_SOURCE_SLAAC) {
-        interface->global_address_available = true;
+    neighbor_cache_init(&(new_entry->neigh_cache));
+    pan_blacklist_cache_init(&(new_entry->pan_blaclist_cache));
+    pan_coordinator_blacklist_cache_init(&(new_entry->pan_cordinator_black_list));
+    ipv6_neighbour_cache_init(&new_entry->ipv6_neighbour_cache, new_entry->id);
+    addr_max_slaac_entries_set(new_entry, 16);
+    uint8_t mac[6];
+    int8_t error = api->mac48_get(api, mac);
+    if (error) {
+        tr_error("mac_ext_mac64_address_get failed: %d", error);
+        ns_dyn_mem_free(new_entry);
+        return NULL;
     }
+
+    protocol_stack_interface_iid_eui64_generate(new_entry, mac);
+    ns_list_add_to_start(&protocol_interface_info_list, new_entry);
+
+    (void) ipv6_route_table_set_max_entries(new_entry->id, ROUTE_RADV, 16);
+
+    return new_entry;
 }
 
 protocol_interface_info_entry_t *protocol_stack_interface_generate_ppp(eth_mac_api_t *api)
 {
     if (!api) {
         return NULL;
     }
-    protocol_interface_info_entry_t *new_entry = NULL;
 
     ns_list_foreach(protocol_interface_info_entry_t, cur, &protocol_interface_info_list) {
         if (cur->eth_mac_api == api) {
             return cur;
         }
     }
 
-    if (api) {
-        new_entry = protocol_core_interface_ethernet_entry_get(api);
-
-        if (new_entry) {
-            neighbor_cache_init(&(new_entry->neigh_cache));
-            pan_blacklist_cache_init(&(new_entry->pan_blaclist_cache));
-            pan_coordinator_blacklist_cache_init(&(new_entry->pan_cordinator_black_list));
-            ipv6_neighbour_cache_init(&new_entry->ipv6_neighbour_cache, new_entry->id);
-            addr_max_slaac_entries_set(new_entry, 16);
-            uint8_t iid64[8];
-            int8_t error = api->iid64_get(api, iid64);
-            if (error) {
-                tr_error("iid64_get failed: %d", error);
-                ns_dyn_mem_free(new_entry);
-                return NULL;
-            }
-            memcpy(new_entry->iid_slaac, iid64, 8);
-            memcpy(new_entry->iid_eui64, iid64, 8);
-            new_entry->send_mld = false;                 // No mld for PPP
-            new_entry->dup_addr_detect_transmits = 0;    // No duplicate detection for PPP
+    protocol_interface_info_entry_t *new_entry = protocol_core_interface_ethernet_entry_get(api);
+
+    if (!new_entry) {
+        return NULL;
+    }
 
-            ns_list_add_to_start(&protocol_interface_info_list, new_entry);
+    neighbor_cache_init(&(new_entry->neigh_cache));
+    pan_blacklist_cache_init(&(new_entry->pan_blaclist_cache));
+    pan_coordinator_blacklist_cache_init(&(new_entry->pan_cordinator_black_list));
+    ipv6_neighbour_cache_init(&new_entry->ipv6_neighbour_cache, new_entry->id);
+    addr_max_slaac_entries_set(new_entry, 16);
+    uint8_t iid64[8];
+    int8_t error = api->iid64_get(api, iid64);
+    if (error) {
+        tr_error("iid64_get failed: %d", error);
+        ns_dyn_mem_free(new_entry);
+        return NULL;
+    }
+    memcpy(new_entry->iid_slaac, iid64, 8);
+    memcpy(new_entry->iid_eui64, iid64, 8);
+    new_entry->send_mld = false;                 // No mld for PPP
+    new_entry->dup_addr_detect_transmits = 0;    // No duplicate detection for PPP
 
-            (void) ipv6_route_table_set_max_entries(new_entry->id, ROUTE_RADV, 16);
+    ns_list_add_to_start(&protocol_interface_info_list, new_entry);
 
-            addr_notification_register(protocol_stack_interface_ppp_addr_notification);
+    (void) ipv6_route_table_set_max_entries(new_entry->id, ROUTE_RADV, 16);
 
-            return new_entry;
-        }
-    }
-    return NULL;
+    return new_entry;
 }
 
 protocol_interface_info_entry_t *protocol_stack_interface_generate_lowpan(mac_api_t *api)

source/ipv6_stack/protocol_ipv6.c

@@ -246,8 +246,7 @@ static uint8_t ethernet_llao_write(protocol_interface_info_entry_t *cur, uint8_t
     (void) must;
     (void) ip_addr;
 
-    uint8_t mac_not_set[8] = {0,0,0,0,0,0,0,0};
-    if (memcmp(cur->mac, mac_not_set, 8) == 0) {
+    if (memcmp(cur->mac, ADDR_EUI64_ZERO, 8) == 0) {
         return 0;
     }
 
@@ -969,6 +968,10 @@ void ipv6_interface_slaac_handler(protocol_interface_info_entry_t *cur, const ui
         if (cur->ipv6_configure && cur->ipv6_configure->IPv6_ND_state == IPV6_ROUTER_SOLICATION) {
             cur->ipv6_configure->IPv6_ND_state = IPV6_GP_CONFIG;
         }
+        // If DAD not enabled address is valid right away
+        if (cur->dup_addr_detect_transmits == 0) {
+            address_entry->cb(cur, address_entry, ADDR_CALLBACK_DAD_COMPLETE);
+        }
     }
 }