Fix for pr #1984 (#1987)

Fixed functions that made space for indirect packets. 
Reverted unit test changes.

Author: deepakvenugopal

source/6LoWPAN/adaptation_interface.c

@@ -823,7 +823,8 @@ static bool lowpan_adaptation_is_priority_message(buffer_t *buf)
 static bool lowpan_adaptation_make_room_for_small_packet(protocol_interface_info_entry_t *cur, fragmenter_interface_t *interface_ptr, mac_neighbor_table_entry_t *neighbour_to_count, fragmenter_tx_entry_t *new_entry)
 {
     if (interface_ptr->max_indirect_small_packets_per_child == 0) {
-        return false;
+        // this means there is always space for small packets - no need to check further
+        return true;
     }
 
     uint_fast16_t count = 0;
@@ -861,7 +862,8 @@ static bool lowpan_adaptation_make_room_for_small_packet(protocol_interface_info
 static bool lowpan_adaptation_make_room_for_big_packet(struct protocol_interface_info_entry *cur, fragmenter_interface_t *interface_ptr, fragmenter_tx_entry_t *new_entry)
 {
     if (interface_ptr->max_indirect_big_packets_total == 0) {
-        return false;
+        // this means there is always space for big packets - no need to check further
+        return true;
     }
 
     uint_fast16_t count = 0;

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

@@ -134,19 +134,13 @@ bool test_lowpan_adaptation_interface_reset()
     buf.buf_ptr = 10;
     buf.buf_end = 80;
 
-
     if (-1 != lowpan_adaptation_interface_reset(0)) {
         return false;
     }
 
     nsdynmemlib_stub.returnCounter = 2;
     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;
-    }
-
     //Set 2 direct and 2 indirect buffer
     buf.link_specific.ieee802_15_4.indirectTxProcess = false;
     lowpan_adaptation_interface_tx(&entry, &buf);
@@ -303,17 +297,10 @@ bool test_lowpan_adaptation_indirect_purge()
     entry.id = 0;
     api.mcps_data_req = &mcps_data_req_cb;
 
-
-
     //Test Indirect data allocation fail
     nsdynmemlib_stub.returnCounter = 2;
     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_buf->link_specific.ieee802_15_4.indirectTxProcess = true;
     nsdynmemlib_stub.returnCounter = 2;
     if (0 != lowpan_adaptation_interface_tx(&entry, test_buf)) {
@@ -797,7 +784,6 @@ bool test_lowpan_adaptation_interface_tx_confirm()
     buffer_t *test_buf = malloc(sizeof(buffer_t) + 2100);
     memset(test_buf, 0, sizeof(buffer_t) + 2100);
 
-
     entry.mac_parameters->mac_in_direct_entry_timeout = 14000;
     test_buf->link_specific.ieee802_15_4.useDefaultPanId = true;
     test_buf->dst_sa.addr_type = ADDR_802_15_4_SHORT;
@@ -833,7 +819,6 @@ bool test_lowpan_adaptation_interface_tx_confirm()
     entry.id = 0;
     api.mcps_data_req = &mcps_data_req_cb;
 
-
     if (-1 != lowpan_adaptation_interface_tx_confirm(NULL, &data_confirm)) {
         lowpan_adaptation_interface_free(0);
         free(test_buf);
@@ -868,10 +853,6 @@ bool test_lowpan_adaptation_interface_tx_confirm()
         return false;
     }
     test_buf2->ip_routed_up = true;
-    // Set small and big buffer size to 2
-    if (0 != lowpan_adaptation_indirect_queue_params_set(&entry, 106, 2, 2)) {
-        return false;
-    }
 
     lowpan_adaptation_interface_tx(&entry, test_buf);
     lowpan_adaptation_interface_tx(&entry, test_buf2);
@@ -887,7 +868,6 @@ bool test_lowpan_adaptation_interface_tx_confirm()
         return false;
     }
 
-
     data_confirm.msduHandle = test_buf->seq;
     data_confirm.status = MLME_SUCCESS;
     if (0 != lowpan_adaptation_interface_tx_confirm(&entry, &data_confirm)) {
@@ -918,7 +898,6 @@ bool test_lowpan_adaptation_interface_tx_confirm()
         return false;
     }
 
-
     data_confirm.msduHandle = test_buf3->seq;
     data_confirm.status = MLME_TRANSACTION_EXPIRED;
     if (0 != lowpan_adaptation_interface_tx_confirm(&entry, &data_confirm)) {
@@ -1345,11 +1324,6 @@ bool test_lowpan_adaptation_interface_mpx_register()
     entry.id = 0;
     api.mcps_data_req = &mcps_data_req_cb;
 
-    // Set small and big buffer size to 2
-    if (0 != lowpan_adaptation_indirect_queue_params_set(&entry, 106, 2, 2)) {
-        return false;
-    }
-
     test_buf2->ip_routed_up = true;
     protocol_core_stub.entry_ptr = &entry;
     lowpan_adaptation_interface_tx(&entry, test_buf);