Review corrections

-Add unit tests
-Ignore extra debugs
-Move unused parameter voiding to right place

Author: Arto Kinnunen

source/6LoWPAN/Thread/thread_management_if.c

@@ -1378,11 +1378,6 @@ int8_t thread_management_get_request_full_nwk_data(int8_t interface_id, bool *fu
 
 int thread_management_device_certificate_set(int8_t interface_id, const unsigned char *device_certificate_ptr, uint16_t device_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len)
 {
-    (void) interface_id;
-    (void) device_certificate_ptr;
-    (void) device_certificate_len;
-    (void) priv_key_ptr;
-    (void) priv_key_len;
 #ifdef HAVE_THREAD
     protocol_interface_info_entry_t *cur;
 
@@ -1395,16 +1390,16 @@ int thread_management_device_certificate_set(int8_t interface_id, const unsigned
     return thread_extension_bootstrap_device_certificate_set(cur, device_certificate_ptr, device_certificate_len, priv_key_ptr, priv_key_len);
 
 #else
+    (void) interface_id;
+    (void) device_certificate_ptr;
+    (void) device_certificate_len;
+    (void) priv_key_ptr;
+    (void) priv_key_len;
     return -1;
 #endif
 }
 int thread_management_network_certificate_set(int8_t interface_id, const unsigned char *network_certificate_ptr, uint16_t network_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len)
 {
-    (void) interface_id;
-    (void) network_certificate_ptr;
-    (void) network_certificate_len;
-    (void) priv_key_ptr;
-    (void) priv_key_len;
 #ifdef HAVE_THREAD
     protocol_interface_info_entry_t *cur;
 
@@ -1420,14 +1415,17 @@ int thread_management_network_certificate_set(int8_t interface_id, const unsigne
 
     return thread_extension_bootstrap_network_private_key_set(cur, priv_key_ptr, priv_key_len);
 #else
+    (void) interface_id;
+    (void) network_certificate_ptr;
+    (void) network_certificate_len;
+    (void) priv_key_ptr;
+    (void) priv_key_len;
     return -1;
 #endif
 }
 
 int thread_management_partition_weighting_set(int8_t interface_id, uint8_t partition_weighting)
 {
-    (void) interface_id;
-    (void) partition_weighting;
 #ifdef HAVE_THREAD
     protocol_interface_info_entry_t *cur;
 
@@ -1449,15 +1447,14 @@ int thread_management_partition_weighting_set(int8_t interface_id, uint8_t parti
 
     return 0;
 #else
+    (void) interface_id;
+    (void) partition_weighting;
     return -1;
 #endif
 }
 
 int thread_management_sed_parent_buffer_size_set(int8_t interface_id, uint16_t small_packets_per_child_count, uint16_t big_packets_total_count)
 {
-    (void) interface_id;
-    (void) small_packets_per_child_count;
-    (void) big_packets_total_count;
 #ifdef HAVE_THREAD
     protocol_interface_info_entry_t *cur;
 
@@ -1473,6 +1470,9 @@ int thread_management_sed_parent_buffer_size_set(int8_t interface_id, uint16_t s
         small_packets_per_child_count);
 
 #else
+    (void) interface_id;
+    (void) small_packets_per_child_count;
+    (void) big_packets_total_count;
     return -1;
 #endif
 }

source/6LoWPAN/adaptation_interface.c

@@ -45,7 +45,7 @@
 
 #define TRACE_GROUP "6lAd"
 
-#define EXTRA_DEBUG_EXTRA
+// #define EXTRA_DEBUG_EXTRA
 #ifdef EXTRA_DEBUG_EXTRA
 #define tr_debug_extra(...) tr_debug(__VA_ARGS__)
 #else

test/nanostack/unittest/6LoWPAN/adaptation_interface/adaptation_interfacetest.cpp

@@ -60,6 +60,11 @@ TEST(adaptation_interface, test_lowpan_adaptation_interface_tx)
     CHECK(test_lowpan_adaptation_interface_tx());
 }
 
+TEST(adaptation_interface, test_lowpan_adaptation_interface_indirect_tx)
+{
+    CHECK(test_lowpan_adaptation_interface_indirect_tx());
+}
+
 TEST(adaptation_interface, test_lowpan_adaptation_interface_tx_confirm)
 {
     CHECK(test_lowpan_adaptation_interface_tx_confirm());

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

@@ -36,9 +36,20 @@
 #include "buffer_dyn_stub.h"
 #include "common_functions_stub.h"
 
+static int mcps_data_req_cnt = 0;
+static int mcps_purge_req_cnt = 0;
+
 static void mcps_data_req_cb(const mac_api_t* api, const mcps_data_req_t *data)
 {
+    mcps_data_req_cnt++;
+}
 
+static void tester_mcps_purge_request(const mac_api_t* api,
+                                      const mcps_purge_t *data)
+{
+    (void) api;
+    (void) data;
+    mcps_purge_req_cnt++;
 }
 
 bool test_lowpan_adaptation_interface_init()
@@ -235,13 +246,6 @@ bool test_lowpan_adapatation_data_process_tx_preprocess()
     return true;
 }
 
-static void tester_mcps_purge_request(const mac_api_t* api,
-                                      const mcps_purge_t *data)
-{
-    (void) api;
-    (void) data;
-}
-
 bool test_lowpan_adaptation_indirect_purge()
 {
     mac_api_t api;
@@ -552,6 +556,188 @@ bool test_lowpan_adaptation_interface_tx()
     return true;
 }
 
+bool test_lowpan_adaptation_interface_indirect_tx()
+{
+    mac_api_t api;
+    protocol_interface_info_entry_t entry;
+    arm_15_4_mac_parameters_t params;
+    int data_request_count = mcps_data_req_cnt;
+    int data_purge_count = mcps_purge_req_cnt;
+
+    params.mac_next_key_index = 1;
+    params.mac_channel = 11;
+
+    entry.mac_parameters = &params;
+    entry.mac_api = &api;
+    entry.id = 0;
+
+    api.mcps_data_req = &mcps_data_req_cb;
+    api.mcps_purge_req = &tester_mcps_purge_request;
+
+    buffer_t *test_buf = malloc(sizeof(buffer_t) + 2100);
+    memset(test_buf, 0, sizeof(buffer_t) + 2100);
+
+    test_buf->dst_sa.addr_type = ADDR_802_15_4_SHORT;
+    test_buf->dst_sa.address[0] = 1;
+    test_buf->buf_ptr = 10;
+    test_buf->buf_end = 210;
+    test_buf->link_specific.ieee802_15_4.indirectTxProcess = true;
+    buffer_dyn_stub.buffer_ptr = test_buf;
+
+    protocol_core_stub.entry_ptr = &entry;
+    mle_stub.mle_neigh_table_entry_ptr = NULL;
+
+    nsdynmemlib_stub.returnCounter = 1000;
+
+    socket_stub.buffer_ptr = NULL;
+
+    entry.mac_api = &api;
+    api.mcps_data_req = NULL;
+    socket_stub.buffer_ptr = NULL;
+
+    entry.id = 0;
+    api.mcps_data_req = &mcps_data_req_cb;
+    
+    lowpan_adaptation_interface_init(0, 127);
+
+    // Set small and big buffer size to 2
+    if (0 != lowpan_adaptation_indirect_queue_params_set(&entry, 106, 2, 2)) {
+        return false;
+    }
+
+    /*
+     * Test#1, 
+     * Send 3 big packets to one destination and 3 big packets to another
+     * destination:
+     * Verify that packets are delivered to mac and purging works.
+     */
+
+    // first packet will be sent to mac
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf)) {
+        return false;
+    } else if (++data_request_count != mcps_data_req_cnt) {
+        // error, no mac request sent
+        return false;
+    }
+
+    // 2nd packet will be cached (no sending/purge)
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf)) {
+        return false;
+    } else if (data_request_count != mcps_data_req_cnt) {
+        // error, mac data request sent as it should have been cached
+        return false;
+    }
+
+    // 3rd packet will purge 1st, will sent 2nd packet
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf)) {
+        return false;
+    } else if ((++data_request_count != mcps_data_req_cnt) ||
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error, either mac request was not sent or purge did not happen
+        return false;
+    }
+
+    // Create buffer for different destination
+    buffer_t *test_buf2 = malloc(sizeof(buffer_t) + 2100);
+    memset(test_buf2, 0, sizeof(buffer_t) + 2100);
+
+    test_buf2->dst_sa.addr_type = ADDR_802_15_4_SHORT;
+    test_buf2->dst_sa.address[0] = 2;
+
+    test_buf2->link_specific.ieee802_15_4.requestAck = true;
+    test_buf2->buf_end = 200;
+    test_buf2->link_specific.ieee802_15_4.indirectTxProcess = true;
+    
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf2)) {
+        return false;
+    } else if ((++data_request_count != mcps_data_req_cnt) || 
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error if no previous data purge or no mac request made
+        return false;
+    }
+
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf2)) {
+        return false;
+    } else if ((data_request_count != mcps_data_req_cnt) || 
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error if mac data request sent or no purging
+        return false;
+    }
+
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf2)) {
+        return false;
+    } else if ((++data_request_count != mcps_data_req_cnt) || 
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error if no mac request and no purge
+        return false;
+    }
+
+    /*
+     * Test#2, 
+     * Send 3 small packets to previous destination
+     * Verify that big packets are purged and small packets sent
+     */
+    test_buf2->buf_end = 20;
+    mle_neigh_table_entry_t mle;
+    mle_stub.mle_neigh_table_entry_ptr = &mle;
+    // first packet will be sent to mac
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf2)) {
+        return false;
+    } else if ((++data_request_count != mcps_data_req_cnt) && 
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error if no data request not made or purging didn't happen
+        return false;
+    }
+
+    // 2nd packet will be cached (no sending/purge)
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf2)) {
+        return false;
+    } else if ((++data_request_count != mcps_data_req_cnt) &&
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error if no data request not made or purging didn't happen
+        return false;
+    }
+
+    // 3rd packet will purge 1st, will sent 2nd packet
+    if (0 != lowpan_adaptation_interface_tx(&entry, test_buf2)) {
+        return false;
+    } else if ((++data_request_count != mcps_data_req_cnt) &&
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error if no data request not made or purging didn't happen
+        return false;
+    }
+
+    /*
+     * Test #3, 
+     * Confirm data request
+     */
+    mcps_data_conf_t data_confirm;
+    data_confirm.msduHandle = test_buf2->seq;
+    data_confirm.status = MLME_SUCCESS;
+    if (0 != lowpan_adaptation_interface_tx_confirm(&entry, &data_confirm)) {
+        return false;
+    } else if ((++data_request_count != mcps_data_req_cnt) &&
+               (++data_purge_count != mcps_purge_req_cnt)) {
+        // error if no data request not made or purging didn't happen
+        return false;
+    }
+
+    data_confirm.status = MLME_SUCCESS;
+    if (0 != lowpan_adaptation_interface_tx_confirm(&entry, &data_confirm)) {
+        return false;
+    } else if ((data_request_count != mcps_data_req_cnt) &&
+               (data_purge_count != mcps_purge_req_cnt)) {
+        // error if no data request is made or purge happens
+        return false;
+    }
+
+    lowpan_adaptation_interface_free(0);
+    nsdynmemlib_stub.returnCounter = 0;
+    free(test_buf);
+    free(test_buf2);
+    return true;
+}
+
 bool test_lowpan_adaptation_interface_tx_confirm()
 {
     mac_api_t api;

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

@@ -33,6 +33,8 @@ bool test_lowpan_adapatation_data_process_tx_preprocess();
 
 bool test_lowpan_adaptation_interface_tx();
 
+bool test_lowpan_adaptation_interface_indirect_tx();
+
 bool test_lowpan_adaptation_interface_tx_confirm();
 
 bool test_lowpan_adaptation_tx_active();