WS LLC data service enabled to WS bootstrap.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -26,12 +26,16 @@
 #include "6LoWPAN/Bootstraps/protocol_6lowpan_interface.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "6LoWPAN/MAC/mac_data_poll.h"
+#include "6LoWPAN/MAC/mpx_api.h"
 #include "6LoWPAN/ws/ws_common.h"
 #include "6LoWPAN/ws/ws_bootstrap.h"
 #include "RPL/rpl_control.h"
 #include "RPL/rpl_data.h"
 #include "Common_Protocols/icmpv6.h"
 #include "Common_Protocols/icmpv6_radv.h"
+#include "6LoWPAN/ws/ws_common_defines.h"
+#include "6LoWPAN/ws/ws_llc.h"
+#include "6LoWPAN/lowpan_adaptation_interface.h"
 
 #include "net_rpl.h"
 #include "mac_api.h"
@@ -111,6 +115,7 @@ static int8_t ws_bootstrap_down(protocol_interface_info_entry_t *cur)
 
     // Reset WS information
     // ws_common_reset(cur)
+    ws_llc_reset(cur);
 
     return nwk_6lowpan_down(cur);
 }
@@ -147,6 +152,32 @@ void ws_bootstrap_configuration_reset(protocol_interface_info_entry_t *cur)
     return;
 }
 
+static void ws_bootstrap_asynch_ind(struct protocol_interface_info_entry *interface, const struct mcps_data_ind_s *data, const struct mcps_data_ie_list *ie_ext, uint8_t message_type)
+{
+    (void)interface;
+    (void)data;
+    (void)ie_ext;
+
+    switch (message_type) {
+        case WS_FT_PAN_ADVERT:
+            break;
+        case WS_FT_PAN_ADVERT_SOL:
+            break;
+        case WS_FT_PAN_CONF:
+            break;
+        case WS_FT_PAN_CONF_SOL:
+            break;
+        default:
+            break;
+    }
+}
+
+static void ws_bootstrap_asynch_confirm(struct protocol_interface_info_entry *interface, uint8_t asynch_message)
+{
+    (void)interface;
+    (void)asynch_message;
+}
+
 int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode)
 {
     (void) bootstrap_mode;
@@ -182,13 +213,30 @@ int ws_bootstrap_init(int8_t interface_id, net_6lowpan_mode_e bootstrap_mode)
         default:
             return -3;
     }
+    //Disable allways by default
+    lowpan_adaptation_interface_mpx_register(interface_id, NULL, 0);
+
+    ws_llc_create(cur, &ws_bootstrap_asynch_ind, &ws_bootstrap_asynch_confirm);
 
+    mpx_api_t *mpx_api = ws_llc_mpx_api_get(cur);
+    if (!mpx_api) {
+        ws_llc_delete(cur);
+        return -4;
+    }
 
     if (ws_common_allocate_and_init(cur) < 0) {
+        ws_llc_delete(cur);
         return -4;
     }
 
     if (ws_bootstrap_tasklet_init(cur) != 0) {
+        ws_llc_delete(cur);
+        return -4;
+    }
+
+    //Register MPXUser to adapatation layer
+    if (lowpan_adaptation_interface_mpx_register(interface_id, mpx_api, MPX_LOWPAN_ENC_USER_ID) != 0) {
+        ws_llc_delete(cur);
         return -4;
     }