Modified neighbour processing

Create only sinle parent selected for EAPOL target
dont delete learned neighbours during configuration

Author: Mika Tervonen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -92,6 +92,7 @@ static mac_neighbor_table_entry_t * ws_bootstrap_mac_neighbor_add(struct protoco
     if (!neighbor) {
         return NULL;
     }
+    // TODO only call these for new neighbour
     mlme_device_descriptor_t device_desc;
     tr_debug("Added new neighbor %s : index:%u", trace_array(src64, 8), neighbor->index);
     mac_helper_device_description_write(interface, &device_desc, neighbor->mac64, neighbor->mac16,0, false);
@@ -362,16 +363,16 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
         tr_warn("Not supported routing");
         return;
     }
-    //TODO smarter Neighbor allocate system
 
-    ws_neighbor_class_entry_t *neighbor = ws_bootstrap_neighbor_add(cur, data->SrcAddr);
-    if (!neighbor) {
-        return;
-    }
-
-    etx_lqi_dbm_update(cur->id, data->mpduLinkQuality, data->signal_dbm, ws_neighbor_class_entry_index_get(&cur->ws_info->neighbor_storage,neighbor));
-    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor, ws_utt, data->timestamp);
-    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor, ws_us);
+    /* TODO smart neighbour process
+     *
+     * Unsecure packet we cant trust the device?
+     *
+     * This message is received from tens of devices and we must select the best parent
+     *
+     * We save the best parent and create entry when we have selected the EAPOL target
+     *
+     */
 
     // Save the best network parent
 
@@ -385,9 +386,9 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
             }
         }
         // Parent valid store information
-        cur->ws_info->parent_info.ufsi = ws_utt->ufsi;
+        cur->ws_info->parent_info.ws_utt = *ws_utt;
         // Saved from unicast IE
-        cur->ws_info->parent_info.dwell_interval = ws_us->dwell_interval;
+        cur->ws_info->parent_info.ws_us = *ws_us;
 
         // Saved from Pan information
         cur->ws_info->parent_info.pan_configuration = pan_information;
@@ -408,19 +409,15 @@ static void ws_bootstrap_pan_advertisement_analyse(struct protocol_interface_inf
         ws_bootstrap_pan_advertisement_analyse_active(cur, &pan_information);
     }
     // Parent valid store information
-    cur->ws_info->parent_info.ufsi = ws_utt->ufsi;
+    cur->ws_info->parent_info.ws_utt = *ws_utt;
 }
+
 static void ws_bootstrap_pan_advertisement_solicit_analyse(struct protocol_interface_info_entry *cur, const struct mcps_data_ind_s *data, ws_utt_ie_t *ws_utt, ws_us_ie_t *ws_us)
 {
 
-    ws_neighbor_class_entry_t *neighbor = ws_bootstrap_neighbor_add(cur, data->SrcAddr);
-    if (!neighbor) {
-        return;
-    }
-
-    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor, ws_utt, data->timestamp);
-    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor, ws_us);
-
+    (void)data;
+    (void)ws_utt;
+    (void)ws_us;
     /*
      * An inconsistent transmission is defined as:
      * A PAN Advertisement Solicit with NETNAME-IE matching that of the receiving node.
@@ -497,7 +494,6 @@ static void ws_bootstrap_pan_config_analyse(struct protocol_interface_info_entry
     ws_neighbor_class_neighbor_broadcast_time_info_update(neighbor, &ws_bt_ie, data->timestamp);
     ws_neighbor_class_neighbor_broadcast_schedule_set(neighbor, &ws_bs_ie);
 
-
     if (cur->ws_info->configuration_learned &&
         common_serial_number_greater_16(cur->ws_info->pan_configuration.pan_version, pan_version)) {
         // received version is lower se we need to reset the trickle
@@ -551,6 +547,15 @@ static void ws_bootstrap_pan_config_solicit_analyse(struct protocol_interface_in
         return;
     }
 
+    /* TODO smart neighbour process
+     *
+     * Unsecure packet we cant trust the device?
+     *
+     * Question mark in specification also present, now we create neighbour.
+     * this is moved in future to NS/ND processing triggered by RPL
+     *
+     */
+
     ws_neighbor_class_entry_t *neighbor = ws_bootstrap_neighbor_add(cur, data->SrcAddr);
     if (!neighbor) {
         return;
@@ -831,7 +836,7 @@ static void ws_bootstrap_network_information_learn(protocol_interface_info_entry
     tr_debug("learn network information from parent");
 
     // Start following network timing schedules
-    cur->ws_info->hopping_schdule.fhss_uc_dwell_interval = cur->ws_info->parent_info.dwell_interval;
+    cur->ws_info->hopping_schdule.fhss_uc_dwell_interval = cur->ws_info->parent_info.ws_us.dwell_interval;
     // Regulatory domain saving? cant change?
 
     // Save network information
@@ -989,9 +994,6 @@ static void ws_bootstrap_start_configuration_learn(protocol_interface_info_entry
     // Clear all temporary information
     ws_bootstrap_ip_stack_reset(cur);
 
-    // Clear learned neighbours
-    ws_bootstrap_neighbor_list_clean(cur);
-
     // Reset advertisement solicit trickle to start discovering network
     trickle_start(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_configuration);
     trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config_solicit, &trickle_params_pan_configuration);
@@ -1207,13 +1209,23 @@ static void ws_bootstrap_event_handler(arm_event_s *event)
 void ws_bootstrap_network_scan_process(protocol_interface_info_entry_t *cur)
 {
 
-    if (ws_bootstrap_network_found(cur)) {
-        tr_info("select network");
-        ws_bootstrap_network_information_learn(cur);
-        ws_bootstrap_fhss_activate(cur);
-        ws_bootstrap_event_authentication_start(cur);
+    if (!ws_bootstrap_network_found(cur)) {
         return;
     }
+    tr_info("select network");
+
+    // Add EAPOL neighbour
+    ws_neighbor_class_entry_t *neighbor = ws_bootstrap_neighbor_add(cur, cur->ws_info->parent_info.addr);
+    if (!neighbor) {
+        return;
+    }
+
+    ws_neighbor_class_neighbor_unicast_time_info_update(neighbor, &cur->ws_info->parent_info.ws_utt, cur->ws_info->parent_info.timestamp);
+    ws_neighbor_class_neighbor_unicast_schedule_set(neighbor, &cur->ws_info->parent_info.ws_us);
+
+    ws_bootstrap_network_information_learn(cur);
+    ws_bootstrap_fhss_activate(cur);
+    ws_bootstrap_event_authentication_start(cur);
     return;
 }
 

source/6LoWPAN/ws/ws_common.h

@@ -34,8 +34,8 @@ typedef struct parent_info_s {
         uint8_t link_quality;       /**< LQI value measured during reception of the MPDU */
         int8_t signal_dbm;          /**< This extension for normal IEEE 802.15.4 Data indication */
         ws_pan_information_t pan_configuration;
-        uint8_t dwell_interval;        /**< unicast dwell time */
-        uint_fast24_t ufsi;            /**< unicast_fractional_sequence_interval */
+        ws_utt_ie_t ws_utt;
+        ws_us_ie_t ws_us;
         uint32_t timestamp;            /**< Timestamp when packet was received */
 }parent_info_t;