Added Neighbor connected and trusted state update for wisun

NA message handler automatically added connected state when wisun
bootstrap is enabled.

LLC layer add trusted state to neighbor when received secured message.

Change-Id: Ia950532a3bcbe7bf1238857396fdcf945f8dd1f0

Author: Juha Heiskanen

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c

@@ -167,7 +167,7 @@ void protocol_6lowpan_stack(buffer_t *b)
                 case B_TO_PHY:
                     b = lowpan_adaptation_data_process_tx_preprocess(cur, b);
                     if (lowpan_adaptation_interface_tx(cur, b) != 0) {
-                        tr_error("Adaptaion Layer Data req fail");
+                        tr_error("Adaptation Layer Data req fail");
                     }
                     b = NULL;
                     break;

source/6LoWPAN/MAC/mac_pairwise_key.c

@@ -272,7 +272,7 @@ int mac_pairwise_key_add(int8_t interface_id, uint32_t valid_life_time, const ui
         return -1;
     }
 
-    mac_entry->trusted_device = true;
+    mac_neighbor_table_trusted_neighbor(interface->mac_parameters->mac_neighbor_table, mac_entry, true);
     mac_entry->mac16 = 0xffff;
 
     //Allocate key description

source/6LoWPAN/ws/ws_bootstrap.c

@@ -776,12 +776,10 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
 {
     uint32_t time_from_start = entry_ptr->link_lifetime - entry_ptr->lifetime;
     bool activate_nud = false;
-    if ((WS_NEIGHBOR_NUD_TIMEOUT > entry_ptr->link_lifetime) && (time_from_start > entry_ptr->link_lifetime / 2)) {
-        //Trig allways at middle way
-        activate_nud = true;
-    } else if (time_from_start > WS_NEIGHBOR_NUD_TIMEOUT) {
+    if ((entry_ptr->link_role == PRIORITY_PARENT_NEIGHBOUR || entry_ptr->link_role == SECONDARY_PARENT_NEIGHBOUR)  && time_from_start > WS_NEIGHBOR_NUD_TIMEOUT) {
         activate_nud = true;
     }
+
     if (!activate_nud) {
         return false;
     }
@@ -793,7 +791,7 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
     memcpy(ll_target, ADDR_LINK_LOCAL_PREFIX, 8);
     memcpy(ll_target + 8, entry_ptr->mac64, 8);
     ll_target[8] ^= 2;
-    tr_debug("NUD generate NS");
+    tr_debug("NUD generate NS %u", entry_ptr->index);
     buffer_t * buffer = icmpv6_build_ns(cur, ll_target, NULL, true, false, NULL);
     if (!buffer) {
         return false;

source/6LoWPAN/ws/ws_common.c

@@ -17,6 +17,7 @@
 #include <string.h>
 #include "nsconfig.h"
 #include "ns_types.h"
+#include "ns_trace.h"
 #include "randLIB.h"
 #include <ns_list.h>
 #include <nsdynmemLIB.h>
@@ -25,6 +26,7 @@
 #include "6LoWPAN/ws/ws_common.h"
 #include "6LoWPAN/ws/ws_bootstrap.h"
 #include "6LoWPAN/ws/ws_bbr_api_internal.h"
+#include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
 #include "ws_management_api.h"
 
 #ifdef HAVE_WS
@@ -163,6 +165,20 @@ void ws_common_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seco
     ws_bootstrap_seconds_timer(cur, seconds);
 }
 
+void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
+{
+    //Neighbor connectected update
+    mac_neighbor_table_entry_t *mac_neighbor = mac_neighbor_entry_get_by_ll64(cur->mac_parameters->mac_neighbor_table, ll_address, false, NULL);
+    if (mac_neighbor) {
+        if (mac_neighbor->nud_active) {
+            tr_debug("NUD Response %u", mac_neighbor->index);
+            mac_neighbor_table_neighbor_refresh(cur->mac_parameters->mac_neighbor_table, mac_neighbor, mac_neighbor->link_lifetime);
+        }
+
+        mac_neighbor_table_neighbor_connected(cur->mac_parameters->mac_neighbor_table, mac_neighbor);
+    }
+}
+
 
 #endif // HAVE_WS
 

source/6LoWPAN/ws/ws_common.h

@@ -70,11 +70,13 @@ int8_t ws_common_allocate_and_init(protocol_interface_info_entry_t *cur);
 
 void ws_common_seconds_timer(protocol_interface_info_entry_t *cur, uint32_t seconds);
 
+void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8_t *ll_address);
+
 #define ws_info(cur) ((cur)->ws_info)
 #else
-
 #define ws_info(cur) ((ws_info_t *) NULL)
 #define ws_common_seconds_timer(cur, seconds)
+#define ws_common_neighbor_update(cur, ll_address) ((void) 0)
 
 
 #endif //HAVE_WS

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -383,7 +383,7 @@ static void ws_llc_mac_confirm_cb(const mac_api_t* api, const mcps_data_conf_t *
             case MLME_SUCCESS:
             case MLME_TX_NO_ACK:
             case MLME_NO_DATA:
-                if (data->status == MLME_SUCCESS ) {
+                if (data->status == MLME_SUCCESS || data->status == MLME_NO_DATA) {
                     success = true;
                 }
 
@@ -393,7 +393,10 @@ static void ws_llc_mac_confirm_cb(const mac_api_t* api, const mcps_data_conf_t *
                     ws_utt_ie_t ws_utt;
                     if (ws_wh_utt_read(conf_data->headerIeList, conf_data->headerIeListLength, &ws_utt)) {
                         //UTT header
-                        mac_neighbor_table_neighbor_refresh(interface->mac_parameters->mac_neighbor_table, neighbor_info.neighbor, neighbor_info.neighbor->link_lifetime);
+                        if (success) {
+                            neighbor_info.neighbor->lifetime = neighbor_info.neighbor->link_lifetime;
+                        }
+
                         ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, &ws_utt, data->timestamp);
                     }
 
@@ -436,6 +439,7 @@ static void ws_llc_mac_confirm_cb(const mac_api_t* api, const mcps_data_conf_t *
 
 static void ws_llc_ack_data_req_ext(const mac_api_t* api, mcps_ack_data_payload_t *data, int8_t rssi, uint8_t lqi)
 {
+    (void) lqi;
     llc_data_base_t *base = ws_llc_discover_by_mac(api);
     if (!base) {
         return;
@@ -522,13 +526,17 @@ static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t
 
         //Refresh Neighbor if unicast
         if (ws_utt.message_type == WS_FT_DATA && data->DstAddrMode && addr_check_broadcast(data->DstAddr, data->DstAddrMode)) {
-            //tr_debug("Refresh neigh index %u", neighbor_info.neighbor->index);
-            mac_neighbor_table_neighbor_refresh(interface->mac_parameters->mac_neighbor_table, neighbor_info.neighbor, neighbor_info.neighbor->link_lifetime);
+            neighbor_info.neighbor->lifetime = neighbor_info.neighbor->link_lifetime;
             etx_lqi_dbm_update(interface->id, data->mpduLinkQuality, data->signal_dbm, neighbor_info.neighbor->index);
         }
         if (ws_utt.message_type == WS_FT_DATA) {
             // Calculate RSL for all UDATA packages heard
             ws_neighbor_class_rsl_in_calculate(neighbor_info.ws_neighbor, data->signal_dbm);
+
+            if (data->Key.SecurityLevel) {
+                //SET trusted state
+                mac_neighbor_table_trusted_neighbor(interface->mac_parameters->mac_neighbor_table, neighbor_info.neighbor, true);
+            }
         }
 
         // Discover MPX

source/Common_Protocols/icmpv6.c

@@ -44,6 +44,8 @@
 #include "common_functions.h"
 #include "6LoWPAN/ND/nd_router_object.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan.h"
+#include "6LoWPAN/ws/ws_common_defines.h"
+#include "6LoWPAN/ws/ws_common.h"
 
 #define TRACE_GROUP "icmp"
 
@@ -1588,7 +1590,12 @@ static buffer_t *icmpv6_na_handler(buffer_t *buf)
         buf->dst_sa.addr_type = ADDR_NONE;
     }
 
+
     ipv6_neighbour_update_from_na(&cur->ipv6_neighbour_cache, neighbour_entry, flags, buf->dst_sa.addr_type, buf->dst_sa.address);
+    if (ws_info(cur) && neighbour_entry->state == IP_NEIGHBOUR_REACHABLE) {
+        tr_debug("NA neigh update");
+        ws_common_neighbor_update(cur, target);
+    }
 
 drop:
     return buffer_free(buf);

test/nanostack/unittest/stub/ws_common_stub.c

@@ -41,3 +41,9 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur)
 {
     return ws_common_stub.int8_value;
 }
+
+void ws_common_neighbor_update(protocol_interface_info_entry_t *cur, const uint8_t *ll_address)
+{
+    (void) cur;
+    (void) ll_address;
+}