Removed Adaptation interface depency from LLC away.

Removed Adaptation MPX user registration away from sw_llc_create()

Added getter fro MPX API for registration

Added support for un register MPX at adapatation interface.

Updated Unit test.

Author: Juha Heiskanen

source/6LoWPAN/adaptation_interface.c

@@ -382,10 +382,18 @@ int8_t lowpan_adaptation_interface_mpx_register(int8_t interface_id, struct mpx_
     if (!interface_ptr) {
         return -1;
     }
+    if (!mpx_api && interface_ptr->mpx_api) {
+        //Disable Data Callbacks from MPX Class
+        interface_ptr->mpx_api->mpx_user_registration(interface_ptr->mpx_api, NULL, NULL, interface_ptr->mpx_user_id);
+    }
+
     interface_ptr->mpx_api = mpx_api;
     interface_ptr->mpx_user_id = mpx_user_id;
-    //Register MPX callbacks: confirmation and indication
-    interface_ptr->mpx_api->mpx_user_registration(interface_ptr->mpx_api, lowpan_adaptation_mpx_data_confirm, lowpan_adaptation_mpx_data_indication, interface_ptr->mpx_user_id);
+
+    if (interface_ptr->mpx_api) {
+        //Register MPX callbacks: confirmation and indication
+        interface_ptr->mpx_api->mpx_user_registration(interface_ptr->mpx_api, lowpan_adaptation_mpx_data_confirm, lowpan_adaptation_mpx_data_indication, interface_ptr->mpx_user_id);
+    }
     return 0;
 }
 

source/6LoWPAN/ws/ws_common_defines.h

@@ -63,4 +63,9 @@ typedef struct ws_pan_information_s {
     unsigned version:3;         /**< Pan version support. */
 } ws_pan_information_t;
 
+
+#define MPX_KEY_MANAGEMENT_ENC_USER_ID 0x0001   /**< MPX Key management user ID */
+#define MPX_LOWPAN_ENC_USER_ID 0xA0ED           /**< MPX Lowpan User Id */
+
+
 #endif /* WS_COMMON_DEFINES_H_ */

source/6LoWPAN/ws/ws_llc.h

@@ -101,6 +101,16 @@ void ws_llc_reset(struct protocol_interface_info_entry *interface);
  */
 int8_t ws_llc_delete(struct protocol_interface_info_entry *interface);
 
+/**
+ * @brief ws_llc_mpx_api_get Get MPX api for registration purpose.
+ * @param interface Interface pointer
+ *
+ * @return NULL when MPX is not vailabale
+ * @return Pointer to MPX API
+ *
+ */
+mpx_api_t * ws_llc_mpx_api_get(struct protocol_interface_info_entry *interface);
+
 /**
  * @brief ws_llc_asynch_request ws asynch message request to all giving channels
  * @param interface Interface pointer

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -32,15 +32,11 @@
 #include "6LoWPAN/ws/ws_ie_lib.h"
 #include "6LoWPAN/ws/ws_llc.h"
 #include "6LoWPAN/ws/ws_mpx_header.h"
-#include "6LoWPAN/lowpan_adaptation_interface.h"
 
 #define TRACE_GROUP "wllc"
 
 #define LLC_MESSAGE_QUEUE_LIST_SIZE_MAX   16 //Do not config over 30 never
 #define MPX_USER_SIZE 2
-#define MPX_KEY_MANAGEMENT_ENC_USER_ID 0x0001
-#define MPX_LOWPAN_ENC_USER_ID 0xA0ED
-
 
 typedef struct {
     uint16_t                user_id;        /**< User ID for identify MPX User */
@@ -127,7 +123,7 @@ static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data
 static int8_t ws_llc_mpx_data_cb_register(const mpx_api_t* api, mpx_data_confirm *confirm_cb, mpx_data_indication *indication_cb, uint16_t user_id);
 static uint16_t ws_llc_mpx_header_size_get(const mpx_api_t * api, uint16_t user_id);
 static void ws_llc_mpx_data_purge_request(const mpx_api_t *api, struct mcps_purge_s *purge, uint16_t user_id);
-static int8_t ws_llc_mpx_init(mpx_class_t *mpx_class, int8_t interface_id);
+static void ws_llc_mpx_init(mpx_class_t *mpx_class);
 
 /** Discover Message by message handle id */
 static llc_message_t * llc_message_discover_by_mac_handle(uint8_t handle, llc_message_list_t *list)
@@ -326,8 +322,6 @@ static uint16_t ws_wp_nested_message_length(wp_nested_ie_sub_list_t requested_li
     return length;
 }
 
-
-
 static mpx_user_t * ws_llc_mpx_user_discover(mpx_class_t *mpx_class, uint16_t user_id)
 {
     for(int i= 0; i< MPX_USER_SIZE; i++) {
@@ -338,8 +332,6 @@ static mpx_user_t * ws_llc_mpx_user_discover(mpx_class_t *mpx_class, uint16_t us
     return NULL;
 }
 
-
-
 static llc_data_base_t * ws_llc_base_allocate(void)
 {
     llc_data_base_t * base = ns_dyn_mem_temporary_alloc(sizeof(llc_data_base_t));
@@ -625,7 +617,7 @@ static void ws_llc_mpx_data_purge_request(const mpx_api_t *api, struct mcps_purg
 
 }
 
-static int8_t ws_llc_mpx_init(mpx_class_t *mpx_class, int8_t interface_id)
+static void ws_llc_mpx_init(mpx_class_t *mpx_class)
 {
     //Init Mbed Class and API
     mpx_class->mpx_user_table[0].user_id = MPX_LOWPAN_ENC_USER_ID;
@@ -634,8 +626,6 @@ static int8_t ws_llc_mpx_init(mpx_class_t *mpx_class, int8_t interface_id)
     mpx_class->mpx_api.mpx_user_registration = &ws_llc_mpx_data_cb_register;
     mpx_class->mpx_api.mpx_data_request = &ws_llc_mpx_data_request;
     mpx_class->mpx_api.mpx_data_purge = &ws_llc_mpx_data_purge_request;
-    //Register MPX to adaptation layer
-    return lowpan_adaptation_interface_mpx_register(interface_id, &mpx_class->mpx_api, MPX_LOWPAN_ENC_USER_ID);
 }
 
 static void ws_llc_clean(llc_data_base_t *base)
@@ -656,27 +646,23 @@ int8_t ws_llc_create(struct protocol_interface_info_entry *interface, ws_asynch_
 {
     llc_data_base_t *base = ws_llc_discover_by_interface(interface);
     if (base) {
-        return -1;
+        ws_llc_clean(base);
+        return 0;
     }
 
-
     //Allocate Data base
     base =ws_llc_base_allocate();
     if (!base) {
         return -2;
     }
+
     base->interface_ptr = interface;
     base->acynch_ind = asynch_ind_cb;
     base->asynch_confirm = asynch_cnf_cb;
     //Register MAC Extensions
     base->interface_ptr->mac_api->mac_mcps_extension_enable(base->interface_ptr->mac_api, &ws_llc_mac_indication_cb, &ws_llc_mac_confirm_cb);
-    //Init MPX class and register MPX to users
-    if (ws_llc_mpx_init(&base->mpx_data_base, interface->id) != 0) {
-        ns_list_remove(&llc_data_base_list, base);
-        ns_dyn_mem_free(base);
-        return -1;
-    }
-
+    //Init MPX class
+    ws_llc_mpx_init(&base->mpx_data_base);
     return 0;
 }
 
@@ -692,8 +678,6 @@ int8_t ws_llc_delete(struct protocol_interface_info_entry *interface)
     ns_list_remove(&llc_data_base_list, base);
     //Disable Mac extension
     base->interface_ptr->mac_api->mac_mcps_extension_enable(base->interface_ptr->mac_api, NULL, NULL);
-    //Disable Adaptation MPX
-    lowpan_adaptation_interface_mpx_register(base->interface_ptr->id, NULL, 0);
     ns_dyn_mem_free(base);
     return 0;
 }
@@ -709,6 +693,15 @@ void ws_llc_reset(struct protocol_interface_info_entry *interface)
     ws_llc_clean(base);
 }
 
+mpx_api_t * ws_llc_mpx_api_get(struct protocol_interface_info_entry *interface)
+{
+    llc_data_base_t *base = ws_llc_discover_by_interface(interface);
+    if (!base) {
+        return NULL;
+    }
+    return &base->mpx_data_base.mpx_api;
+}
+
 int8_t ws_llc_asynch_request(struct protocol_interface_info_entry *interface, asynch_request_t *request)
 {
     llc_data_base_t *base = ws_llc_discover_by_interface(interface);

test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.c

@@ -33,7 +33,6 @@
 #include "6LoWPAN/ws/ws_mpx_header.h"
 #include "6LoWPAN/lowpan_adaptation_interface.h"
 #include "nsdynmemLIB_stub.h"
-#include "adaptation_interface_stub.h"
 #include "mac_ie_lib_stub.h"
 #include "ws_mpx_header_stub.h"
 
@@ -91,14 +90,9 @@ static int8_t test_mac_api_enable_mcps_ext(mac_api_t *api,
     return 0;
 }
 
-static bool register_mpx_user(void)
+static void register_mpx_user(mpx_api_t *mpx_api)
 {
-
-    if (!adaptation_interface_stub.mpx_api) {
-        return false;
-    }
-    adaptation_interface_stub.mpx_api->mpx_user_registration(adaptation_interface_stub.mpx_api, &test_mpx_data_confirm, &test_mpx_data_indication, 0xA0ED);
-    return true;
+    mpx_api->mpx_user_registration(mpx_api, &test_mpx_data_confirm, &test_mpx_data_indication, 0xA0ED);
 }
 
 static uint8_t test_handle;
@@ -132,22 +126,16 @@ bool test_ws_llc_create()
     if (ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm) != -2) {
         return false;
     }
-    nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.expectedInt8 = -1;
-    if (ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm) != -1) {
+    if (ws_llc_mpx_api_get(&interface)) {
         return false;
     }
+
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.expectedInt8 = 0;
     if (ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm) != 0) {
         return false;
     }
 
-    if (!register_mpx_user()) {
-        return false;
-    }
-
-    if (ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm) != -1) {
+    if (ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm) != 0) {
         return false;
     }
     ws_llc_delete(&interface);
@@ -161,9 +149,9 @@ bool test_ws_llc_reset()
     interface_api_init(&api);
 
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.expectedInt8 = 0;
     ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm);
-    register_mpx_user();
+    mpx_api_t *mpx_api = ws_llc_mpx_api_get(&interface);
+    register_mpx_user(mpx_api);
     ws_llc_reset(NULL);
     //Tri Asynch and MPX to queue
     mcps_data_req_t data_req;
@@ -174,7 +162,7 @@ bool test_ws_llc_reset()
     data_req.msdu = test_data;
     data_req.msduLength = 80;
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.mpx_api->mpx_data_request(adaptation_interface_stub.mpx_api, &data_req,  0xA0ED);
+    mpx_api->mpx_data_request(mpx_api, &data_req,  0xA0ED);
     nsdynmemlib_stub.returnCounter = 1;
     asynch_request_t asynch_request;
     asynch_request.message_type = WS_FT_PAN_ADVERT;
@@ -191,9 +179,9 @@ bool test_asynch_msg_send()
     interface_api_init(&api);
 
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.expectedInt8 = 0;
     ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm);
-    register_mpx_user();
+    mpx_api_t *mpx_api = ws_llc_mpx_api_get(&interface);
+    register_mpx_user(mpx_api);
     asynch_request_t asynch_request;
     asynch_request.message_type = WS_FT_PAN_ADVERT_SOL;
     message_id = WS_FT_PAN_ADVERT_SOL;
@@ -268,9 +256,9 @@ bool test_mpx_msg_send()
     interface_api_init(&api);
 
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.expectedInt8 = 0;
     ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm);
-    register_mpx_user();
+    mpx_api_t *mpx_api = ws_llc_mpx_api_get(&interface);
+    register_mpx_user(mpx_api);
 
     mcps_data_req_t data_req;
     uint8_t test_data[100];
@@ -283,7 +271,7 @@ bool test_mpx_msg_send()
     valid_mpx_conf = false;
     test_status = MLME_TRANSACTION_OVERFLOW;
     mpx_handle_test = 10;
-    adaptation_interface_stub.mpx_api->mpx_data_request(adaptation_interface_stub.mpx_api, &data_req,  0xA0ED);
+    mpx_api->mpx_data_request(mpx_api, &data_req,  0xA0ED);
     if (!valid_mpx_conf) {
         return false;
     }
@@ -294,7 +282,7 @@ bool test_mpx_msg_send()
     test_status = MLME_SUCCESS;
     mpx_handle_test = 11;
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.mpx_api->mpx_data_request(adaptation_interface_stub.mpx_api, &data_req,  0xA0ED);
+    mpx_api->mpx_data_request(mpx_api, &data_req,  0xA0ED);
     if (valid_mpx_conf) {
         return false;
     }
@@ -322,18 +310,18 @@ bool test_mpx_msg_send()
     test_status = MLME_SUCCESS;
     mpx_handle_test = 12;
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.mpx_api->mpx_data_request(adaptation_interface_stub.mpx_api, &data_req,  0xA0ED);
+    mpx_api->mpx_data_request(mpx_api, &data_req,  0xA0ED);
     uint8_t test_1 = test_handle;
     data_req.msduHandle = 13;
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.mpx_api->mpx_data_request(adaptation_interface_stub.mpx_api, &data_req,  0xA0ED);
+    mpx_api->mpx_data_request(mpx_api, &data_req,  0xA0ED);
     uint8_t test_2 = test_handle;
 
     struct mcps_purge_s purge;
     purge.msduHandle = 12;
-    adaptation_interface_stub.mpx_api->mpx_data_purge(adaptation_interface_stub.mpx_api,&purge, 0xA0ED);
+    mpx_api->mpx_data_purge(mpx_api,&purge, 0xA0ED);
     purge.msduHandle = 13;
-    adaptation_interface_stub.mpx_api->mpx_data_purge(adaptation_interface_stub.mpx_api,&purge, 0xA0ED);
+    mpx_api->mpx_data_purge(mpx_api,&purge, 0xA0ED);
     //Purge and after that test confirm
     data_conf.msduHandle = test_handle;
     data_confirmation_cb(&api, &data_conf, &conf_payload);
@@ -342,18 +330,18 @@ bool test_mpx_msg_send()
     }
     uint8_t vendor_test[10];
     //Test OverHead check
-    uint16_t test_length = adaptation_interface_stub.mpx_api->mpx_headroom_size_get(adaptation_interface_stub.mpx_api, 0xA0ED);
+    uint16_t test_length = mpx_api->mpx_headroom_size_get(mpx_api, 0xA0ED);
     if (test_length != 14) {
         return false;
     }
     ws_llc_set_vendor_header_data(&interface, vendor_test, 10);
-    test_length = adaptation_interface_stub.mpx_api->mpx_headroom_size_get(adaptation_interface_stub.mpx_api, 0xA0ED);
+    test_length = mpx_api->mpx_headroom_size_get(mpx_api, 0xA0ED);
     if (test_length != 14 + 13) {
         return false;
     }
 
     ws_llc_set_vendor_payload_data(&interface, vendor_test, 10);
-    test_length = adaptation_interface_stub.mpx_api->mpx_headroom_size_get(adaptation_interface_stub.mpx_api, 0xA0ED);
+    test_length = mpx_api->mpx_headroom_size_get(mpx_api, 0xA0ED);
     if (test_length != 14 + 13 + 14) {
         return false;
     }
@@ -371,9 +359,9 @@ bool test_mpx_msg_rx()
     interface_api_init(&api);
 
     nsdynmemlib_stub.returnCounter = 1;
-    adaptation_interface_stub.expectedInt8 = 0;
     ws_llc_create(&interface, test_ws_asynch_ind, test_ws_asynch_confirm);
-    register_mpx_user();
+    mpx_api_t *mpx_api = ws_llc_mpx_api_get(&interface);
+    register_mpx_user(mpx_api);
 
     mcps_data_ind_t data_ind;
     uint8_t utt_type = 0;