Merge pull request ARMmbed#1789 from ARMmbed/iotthd-2693

Drop Packet to unknown neighbour before push MAC

source/6LoWPAN/adaptation_interface.c

@@ -43,7 +43,6 @@
 #ifdef HAVE_RPL
 #include "RPL/rpl_data.h"
 #endif
-#include "6LoWPAN/ws/ws_common.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
 #include "6LoWPAN/Thread/thread_common.h"
 #include "6LoWPAN/ws/ws_common.h"
@@ -613,40 +612,35 @@ buffer_t * lowpan_adaptation_data_process_tx_preprocess(protocol_interface_info_
 {
  mac_neighbor_table_entry_t *neigh_entry_ptr = NULL;
 
+
  //Validate is link known and set indirect, datareq and security key id mode
  if (buf->dst_sa.addr_type == ADDR_NONE) {
  goto tx_error_handler;
  }
 
- /* If MLE is enabled, we will talk if we have an MLE association */
- if (buf->dst_sa.addr_type == ADDR_802_15_4_LONG ) {
- neigh_entry_ptr = mac_neighbor_table_address_discover(mac_neighbor_info(cur), buf->dst_sa.address + 2, buf->dst_sa.addr_type);
+ if (addr_check_broadcast(buf->dst_sa.address, buf->dst_sa.addr_type) == eOK ) {
+ buf->dst_sa.addr_type = ADDR_802_15_4_SHORT;
+ buf->dst_sa.address[2] = 0xff;
+ buf->dst_sa.address[3] = 0xff;
+ buf->link_specific.ieee802_15_4.indirectTxProcess = false;
+ buf->link_specific.ieee802_15_4.requestAck = false;
+ } else {
 
- } else if(buf->dst_sa.addr_type == ADDR_802_15_4_SHORT && (common_read_16_bit(buf->dst_sa.address + 2)) != 0xffff) {
  neigh_entry_ptr = mac_neighbor_table_address_discover(mac_neighbor_info(cur), buf->dst_sa.address + 2, buf->dst_sa.addr_type);
- }
 
- //Validate neighbour
- if (!buf->options.ll_security_bypass_tx && neigh_entry_ptr) {
+  //Validate neighbour
+  if (!buf->options.ll_security_bypass_tx && neigh_entry_ptr) {
 
- if (neigh_entry_ptr->connected_device || neigh_entry_ptr->trusted_device) {
+  if (neigh_entry_ptr->connected_device || neigh_entry_ptr->trusted_device) {
 
- } else {
- //tr_warn("Drop TX to unassociated %s", trace_sockaddr(&buf->dst_sa, true));
+ } else {
+ //tr_warn("Drop TX to unassociated %s", trace_sockaddr(&buf->dst_sa, true));
+ goto tx_error_handler;
+ }
+ } else if (ws_info(cur) && !neigh_entry_ptr) {
+ //Do not accept to send unknow device
  goto tx_error_handler;
  }
- }
-
- //Check indirect
-
-
- if (addr_check_broadcast(buf->dst_sa.address, buf->dst_sa.addr_type) == eOK) {
- buf->dst_sa.addr_type = ADDR_802_15_4_SHORT;
- buf->dst_sa.address[2] = 0xff;
- buf->dst_sa.address[3] = 0xff;
- buf->link_specific.ieee802_15_4.indirectTxProcess = false;
- buf->link_specific.ieee802_15_4.requestAck = false;
- } else {
  buf->link_specific.ieee802_15_4.requestAck = true;
  buf->link_specific.ieee802_15_4.indirectTxProcess = lowpan_adaptation_indirect_data_request(neigh_entry_ptr);
  }

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -742,7 +742,6 @@ static int8_t mac_data_sap_rx_handler(mac_pre_parsed_frame_t *buf, protocol_inte
  if (buf->fcf_dsn.securityEnabled) {
  status = mac_data_interface_decrypt_packet(buf, &data_ind->Key);
  if (status != MLME_SUCCESS) {
- tr_debug("Decrypt fail, %d", status);
  mcps_comm_status_indication_generate(status, buf, mac);
  goto DROP_PACKET;
  }

test/nanostack/unittest/6LoWPAN/adaptation_interface/test_adaptation_interface.c

@@ -39,6 +39,7 @@
 #include "common_functions_stub.h"
 #include "thread_common_stub.h"
 #include "mac_neighbor_table_stub.h"
+#include "6LoWPAN/ws/ws_common.h"
 
 
 static int mcps_data_req_cnt = 0;
@@ -183,6 +184,18 @@ bool test_lowpan_adapatation_data_process_tx_preprocess()
  return false;
  }
 
+ //TEST Unknow neighbor and wi-sun stack
+ address_stub.uint8_value = 2;
+ buf.dst_sa.addr_type = ADDR_802_15_4_SHORT;
+ buf.options.ll_security_bypass_tx = false;
+ socket_stub.buffer_ptr = &buf;
+ ws_info_t test_info;
+ entry.ws_info = &test_info;
+ if (lowpan_adaptation_data_process_tx_preprocess(&entry, &buf)) {
+ return false;
+ }
+
+ entry.ws_info = NULL;
  mac_neighbor_table_entry_t neighbor;
  memset(&neighbor, 0, sizeof(mac_neighbor_table_entry_t));
  mac_neighbor_table_stub.test_neigh = &neighbor;