EAPOL relay agent rx filter from joiner side

Relay agent will drop same mac identifier if it rx in 5 seconds period.

MAC data sequency number is allocated to data request only 1 time now.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_eapol_pdu.c

@@ -31,6 +31,7 @@
 #include "6LoWPAN/MAC/mpx_api.h"
 #include "6LoWPAN/ws/ws_config.h"
 #include "6LoWPAN/ws/ws_eapol_pdu.h"
+#include "6LoWPAN/ws/ws_llc.h"
 
 #ifdef HAVE_WS
 
@@ -49,6 +50,7 @@ typedef NS_LIST_HEAD(eapol_pdu_msdu_t, link) eapol_pdu_msdu_list_t;
 
 typedef struct {
     uint8_t priority;
+    bool filter_requsted: 1;
     ws_eapol_pdu_address_check *addr_check;
     ws_eapol_pdu_receive *receive;
     ns_list_link_t link;
@@ -147,6 +149,7 @@ int8_t ws_eapol_pdu_cb_register(protocol_interface_info_entry_t *interface_ptr,
     new_cb->priority = cb_data->priority;
     new_cb->addr_check = cb_data->addr_check;
     new_cb->receive = cb_data->receive;
+    new_cb->filter_requsted = cb_data->filter_requsted;
 
     ns_list_foreach(eapol_pdu_recv_cb_t, entry, &eapol_pdu_data->recv_cb_list) {
         if (new_cb->priority <= entry->priority) {
@@ -307,6 +310,11 @@ static void ws_eapol_pdu_mpx_data_indication(const mpx_api_t *api, const struct
 
     ns_list_foreach(eapol_pdu_recv_cb_t, entry, &eapol_pdu_data->recv_cb_list) {
         if (entry->addr_check(eapol_pdu_data->interface_ptr, data->SrcAddr) >= 0) {
+            if (entry->filter_requsted && !ws_llc_eapol_relay_forward_filter(eapol_pdu_data->interface_ptr, data->SrcAddr, data->DSN)) {
+                tr_info("EAPOL relay filter drop");
+                return;
+            }
+
             entry->receive(eapol_pdu_data->interface_ptr, data->SrcAddr, data->msdu_ptr, data->msduLength);
             break;
         }

source/6LoWPAN/ws/ws_eapol_pdu.h

@@ -99,6 +99,7 @@ typedef enum {
 
 typedef struct {
     eapol_pdu_recv_prior_t priority;           /**< Priority: high, medium or low */
+    bool filter_requsted: 1;                    /**< True when EAPOL temporary filter requsted, false for normal functionality */
     ws_eapol_pdu_address_check *addr_check;    /**< Address check callback */
     ws_eapol_pdu_receive *receive;             /**< PDU receive callback */
 } eapol_pdu_recv_cb_data_t;

source/6LoWPAN/ws/ws_eapol_relay.c

@@ -53,6 +53,7 @@ static void ws_eapol_relay_socket_cb(void *cb);
 
 static const eapol_pdu_recv_cb_data_t eapol_pdu_recv_cb_data = {
     .priority = EAPOL_PDU_RECV_LOW_PRIORITY,
+    .filter_requsted = true,
     .addr_check = ws_eapol_relay_eapol_pdu_address_check,
     .receive = ws_eapol_relay_eapol_pdu_receive
 };

source/6LoWPAN/ws/ws_llc.h

@@ -78,15 +78,21 @@ typedef struct llc_neighbour_req {
     struct ws_neighbor_class_entry *ws_neighbor;                /**< Wi-sun Neighbor information entry. */
 } llc_neighbour_req_t;
 
+typedef struct eapol_temporary_info_s {
+    uint8_t eapol_rx_relay_filter; /*!< seconds for dropping duplicate id */
+    uint8_t last_rx_mac_sequency; /*!< Only compared when Timer is active */
+    uint16_t eapol_timeout; /*!< EAPOL relay Temporary entry lifetime */
+} eapol_temporary_info_t;
+
 /**
  * Neighbor temporary structure for storage FHSS data before create a real Neighbour info
  */
 typedef struct ws_neighbor_temp_class_s {
     struct ws_neighbor_class_entry neigh_info_list;  /*!< Allocated hopping info array*/
+    eapol_temporary_info_t eapol_temp_info;
     uint8_t mac64[8];
     uint8_t mpduLinkQuality;
     int8_t signal_dbm;
-    uint16_t    eapol_timeout;
     ns_list_link_t link;
 } ws_neighbor_temp_class_t;
 
@@ -220,6 +226,8 @@ void ws_llc_hopping_schedule_config(struct protocol_interface_info_entry *interf
 
 void ws_llc_timer_seconds(struct protocol_interface_info_entry *interface, uint16_t seconds_update);
 
+bool ws_llc_eapol_relay_forward_filter(struct protocol_interface_info_entry *interface, const uint8_t *joiner_eui64, uint8_t mac_sequency);
+
 ws_neighbor_temp_class_t *ws_llc_get_multicast_temp_entry(struct protocol_interface_info_entry *interface, const uint8_t *mac64);
 
 void ws_llc_free_multicast_temp_entry(struct protocol_interface_info_entry *interface, ws_neighbor_temp_class_t *neighbor);

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -431,7 +431,7 @@ static void ws_llc_mac_confirm_cb(const mac_api_t *api, const mcps_data_conf_t *
             ws_neighbor_temp_class_t *temp_entry = ws_llc_discover_eapol_temp_entry(base->temp_entries, message->dst_address);
             if (temp_entry) {
                 //Update Temporary Lifetime
-                temp_entry->eapol_timeout = interface->ws_info->cfg->timing.temp_eapol_min_timeout + 1;
+                temp_entry->eapol_temp_info.eapol_timeout = interface->ws_info->cfg->timing.temp_eapol_min_timeout + 1;
             }
         }
     }
@@ -740,7 +740,7 @@ static void ws_llc_eapol_indication_cb(const mac_api_t *api, const mcps_data_ind
             return;
         }
         //Update Temporary Lifetime
-        temp_entry->eapol_timeout = interface->ws_info->cfg->timing.temp_eapol_min_timeout + 1;
+        temp_entry->eapol_temp_info.eapol_timeout = interface->ws_info->cfg->timing.temp_eapol_min_timeout + 1;
 
         neighbor_info.ws_neighbor = &temp_entry->neigh_info_list;
         //Storage Signal info for future ETX update possibility
@@ -1329,6 +1329,7 @@ static void ws_init_temporary_neigh_data(ws_neighbor_temp_class_t *entry, const
     entry->neigh_info_list.rsl_in = RSL_UNITITIALIZED;
     entry->neigh_info_list.rsl_out = RSL_UNITITIALIZED;
     memcpy(entry->mac64, mac64, 8);
+    entry->eapol_temp_info.eapol_rx_relay_filter = 0;
 }
 
 
@@ -1653,13 +1654,46 @@ void ws_llc_timer_seconds(struct protocol_interface_info_entry *interface, uint1
     }
 
     ns_list_foreach_safe(ws_neighbor_temp_class_t, entry, &base->temp_entries->active_eapol_temp_neigh) {
-        if (entry->eapol_timeout <= seconds_update) {
+        if (entry->eapol_temp_info.eapol_timeout <= seconds_update) {
             ns_list_remove(&base->temp_entries->active_eapol_temp_neigh, entry);
             ns_list_add_to_end(&base->temp_entries->free_temp_neigh, entry);
         } else {
-            entry->eapol_timeout -= seconds_update;
+            entry->eapol_temp_info.eapol_timeout -= seconds_update;
+            if (entry->eapol_temp_info.eapol_rx_relay_filter == 0) {
+                //No active filter period
+                continue;
+            }
+
+            //Update filter time
+            if (entry->eapol_temp_info.eapol_rx_relay_filter <= seconds_update) {
+                entry->eapol_temp_info.eapol_rx_relay_filter = 0;
+            } else {
+                entry->eapol_temp_info.eapol_rx_relay_filter -= seconds_update;
+            }
         }
     }
 }
 
+bool ws_llc_eapol_relay_forward_filter(struct protocol_interface_info_entry *interface, const uint8_t *joiner_eui64, uint8_t mac_sequency)
+{
+    llc_data_base_t *base = ws_llc_discover_by_interface(interface);
+    if (!base) {
+        return false;
+    }
+
+    ws_neighbor_temp_class_t *neighbor = ws_llc_discover_eapol_temp_entry(base->temp_entries, joiner_eui64);
+    if (!neighbor) {
+        return false;
+    }
+
+    if (neighbor->eapol_temp_info.eapol_rx_relay_filter && neighbor->eapol_temp_info.last_rx_mac_sequency == mac_sequency) {
+        return false;
+    }
+    neighbor->eapol_temp_info.last_rx_mac_sequency = mac_sequency;
+    neighbor->eapol_temp_info.eapol_rx_relay_filter = 6; //Activate 5-5.99 seconds filter time
+    return true;
+
+}
+
+
 #endif

source/6LoWPAN/ws/ws_pae_supp.c

@@ -157,6 +157,7 @@ static void ws_pae_supp_kmp_api_finished(kmp_api_t *kmp);
 
 static const eapol_pdu_recv_cb_data_t eapol_pdu_recv_cb_data = {
     .priority = EAPOL_PDU_RECV_HIGH_PRIORITY,
+    .filter_requsted = false,
     .addr_check = ws_pae_supp_eapol_pdu_address_check,
     .receive = kmp_eapol_pdu_if_receive
 };

source/MAC/IEEE802_15_4/mac_data_buffer.h

@@ -97,6 +97,7 @@ typedef struct mac_pre_build_frame {
     bool mac_allocated_payload_ptr: 1;
     bool asynch_request: 1;
     bool message_builded: 1;
+    bool DSN_allocated: 1;
     unsigned security_mic_len: 5;   //Max possible lengths 0, 4, 8, 16 bytes
     unsigned priority: 2;
     struct mac_pre_build_frame *next; //Pointer for queue purpose

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -1226,6 +1226,7 @@ mac_pre_build_frame_t *mcps_sap_prebuild_frame_buffer_get(uint16_t payload_size)
     memset(buffer, 0, sizeof(mac_pre_build_frame_t));
     buffer->initial_tx_channel = 0xffff;
     buffer->aux_header.frameCounter = 0xffffffff;
+    buffer->DSN_allocated = false;
     if (payload_size) {
         //Mac interlnal payload allocate
         buffer->mac_payload = ns_dyn_mem_temporary_alloc(payload_size);
@@ -1502,7 +1503,10 @@ static void mcps_generic_sequence_number_allocate(protocol_interface_rf_mac_setu
         switch (buffer->fcf_dsn.frametype) {
             case MAC_FRAME_CMD:
             case MAC_FRAME_DATA:
-                buffer->fcf_dsn.DSN = mac_mlme_set_new_sqn(rf_ptr);
+                if (!buffer->DSN_allocated) {
+                    buffer->fcf_dsn.DSN = mac_mlme_set_new_sqn(rf_ptr);
+                    buffer->DSN_allocated = true;
+                }
                 break;
             case MAC_FRAME_BEACON:
                 buffer->fcf_dsn.DSN = mac_mlme_set_new_beacon_sqn(rf_ptr);