WS IE lib update

Added function ws_wp_nested_network_name_read

Fixed WS nested Payload IE types to short
* PAN_IE
* PAN-VER-IE
* GTKHASH-IE
* NET_NAME

Updated Unit test's

Change-Id: If0423c7237bfaddeb0489185e6cf713287f7020a

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -244,20 +244,17 @@ void ws_bootstrap_configuration_reset(protocol_interface_info_entry_t *cur)
 
 static bool ws_bootstrap_network_name_matches(const struct mcps_data_ie_list *ie_ext, const char *network_name_ptr)
 {
-    mac_nested_payload_IE_t nested_payload_ie;
-    nested_payload_ie.id = WP_PAYLOAD_IE_NETNAME_TYPE;
-    nested_payload_ie.type_long = true;
-
     if (!network_name_ptr || !ie_ext ){
         return false;
     }
 
-    if (0 == mac_ie_nested_discover(ie_ext->payloadIeList , ie_ext->payloadIeListLength, &nested_payload_ie)) {
+    ws_wp_network_name_t network_name;
+    if (!ws_wp_nested_network_name_read(ie_ext->payloadIeList , ie_ext->payloadIeListLength, &network_name)) {
         tr_warn("No network name IE");
         return false;
     }
 
-    if (network_name_ptr == NULL || strncmp(network_name_ptr, (char *)nested_payload_ie.content_ptr, nested_payload_ie.length) != 0) {
+    if (network_name_ptr == NULL || strncmp(network_name_ptr, (char *)network_name.network_name, network_name.network_name_length) != 0) {
         return false;
     }
     return true;

source/6LoWPAN/ws/ws_ie_lib.c

@@ -24,6 +24,7 @@
 #include "mac_common_defines.h"
 #include "6LoWPAN/MAC/mac_ie_lib.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
+#include "6LoWPAN/ws/ws_ie_lib.h"
 
 static uint8_t *ws_wh_header_base_write(uint8_t *ptr, uint16_t length, uint8_t type)
 {
@@ -202,9 +203,9 @@ uint8_t *ws_wp_nested_vp_write(uint8_t *ptr, uint8_t * vendor_payload, uint16_t
 uint8_t *ws_wp_nested_pan_info_write(uint8_t *ptr, struct ws_pan_information_s *pan_congiguration)
 {
     if (!pan_congiguration) {
-        return mac_ie_nested_ie_long_base_write(ptr,WP_PAYLOAD_IE_PAN_TYPE, 0);
+        return mac_ie_nested_ie_short_base_write(ptr,WP_PAYLOAD_IE_PAN_TYPE, 0);
     }
-    ptr = mac_ie_nested_ie_long_base_write(ptr,WP_PAYLOAD_IE_PAN_TYPE, 5);
+    ptr = mac_ie_nested_ie_short_base_write(ptr,WP_PAYLOAD_IE_PAN_TYPE, 5);
     ptr = common_write_16_bit_inverse(pan_congiguration->pan_size, ptr);
     ptr = common_write_16_bit_inverse(pan_congiguration->routing_cost, ptr);
     uint8_t temp8 = 0;
@@ -218,7 +219,7 @@ uint8_t *ws_wp_nested_pan_info_write(uint8_t *ptr, struct ws_pan_information_s *
 
 uint8_t *ws_wp_nested_netname_write(uint8_t *ptr, uint8_t *network_name, uint8_t network_name_length)
 {
-    ptr = mac_ie_nested_ie_long_base_write(ptr,WP_PAYLOAD_IE_NETNAME_TYPE, network_name_length);
+    ptr = mac_ie_nested_ie_short_base_write(ptr,WP_PAYLOAD_IE_NETNAME_TYPE, network_name_length);
     if (network_name_length) {
         memcpy(ptr,network_name, network_name_length);
         ptr += network_name_length;
@@ -231,13 +232,13 @@ uint8_t *ws_wp_nested_pan_ver_write(uint8_t *ptr, struct ws_pan_information_s *p
     if (!pan_congiguration) {
         return ptr;
     }
-    ptr = mac_ie_nested_ie_long_base_write(ptr,WP_PAYLOAD_IE_PAN_VER_TYPE, 2);
+    ptr = mac_ie_nested_ie_short_base_write(ptr,WP_PAYLOAD_IE_PAN_VER_TYPE, 2);
     return common_write_16_bit_inverse(pan_congiguration->pan_version, ptr);
 }
 
 uint8_t *ws_wp_nested_gtkhash_write(uint8_t *ptr, uint8_t *gtkhash, uint8_t gtkhash_length)
 {
-    ptr = mac_ie_nested_ie_long_base_write(ptr,WP_PAYLOAD_IE_GTKHASH_TYPE, gtkhash_length);
+    ptr = mac_ie_nested_ie_short_base_write(ptr,WP_PAYLOAD_IE_GTKHASH_TYPE, gtkhash_length);
     if (gtkhash_length) {
         memcpy(ptr, gtkhash, 32);
         ptr += 32;
@@ -450,7 +451,7 @@ bool ws_wp_nested_pan_read(uint8_t *data, uint16_t length, struct ws_pan_informa
 {
     mac_nested_payload_IE_t nested_payload_ie;
     nested_payload_ie.id = WP_PAYLOAD_IE_PAN_TYPE;
-    nested_payload_ie.type_long = true;
+    nested_payload_ie.type_long = false;
     if (mac_ie_nested_discover(data , length, &nested_payload_ie) !=  5) {
         return false;
     }
@@ -468,7 +469,7 @@ bool ws_wp_nested_pan_version_read(uint8_t *data, uint16_t length, uint16_t *pan
 {
     mac_nested_payload_IE_t nested_payload_ie;
     nested_payload_ie.id = WP_PAYLOAD_IE_PAN_VER_TYPE;
-    nested_payload_ie.type_long = true;
+    nested_payload_ie.type_long = false;
     if (mac_ie_nested_discover(data , length, &nested_payload_ie) !=  2) {
         return false;
     }
@@ -481,11 +482,29 @@ uint8_t * ws_wp_nested_gtkhash_read(uint8_t *data, uint16_t length)
 {
     mac_nested_payload_IE_t nested_payload_ie;
     nested_payload_ie.id = WP_PAYLOAD_IE_GTKHASH_TYPE;
-    nested_payload_ie.type_long = true;
+    nested_payload_ie.type_long = false;
     if (mac_ie_nested_discover(data , length, &nested_payload_ie) !=  32) {
         return NULL;
     }
 
     return nested_payload_ie.content_ptr;
 }
 
+
+bool ws_wp_nested_network_name_read(uint8_t *data, uint16_t length, ws_wp_network_name_t *network_name)
+{
+    mac_nested_payload_IE_t nested_payload_ie;
+    nested_payload_ie.id = WP_PAYLOAD_IE_NETNAME_TYPE;
+    nested_payload_ie.type_long = false;
+
+    if (0 == mac_ie_nested_discover(data , length, &nested_payload_ie)) {
+        return false;
+    } else if (nested_payload_ie.length > 32) {
+        //Too long name
+        return false;
+    }
+    network_name->network_name = nested_payload_ie.content_ptr;
+    network_name->network_name_length = nested_payload_ie.length;
+    return true;
+}
+

source/6LoWPAN/ws/ws_ie_lib.h

@@ -22,6 +22,15 @@ struct ws_pan_information_s;
 struct ws_utt_ie;
 struct ws_bt_ie;
 struct ws_us_ie;
+struct ws_hopping_schedule_s;
+
+/**
+ * @brief ws_wp_network_name_t WS nested payload network name
+ */
+typedef struct ws_wp_network_name {
+    uint8_t network_name_length;
+    uint8_t *network_name;
+} ws_wp_network_name_t;
 
 /* WS_WH HEADER IE */
 uint8_t *ws_wh_utt_write(uint8_t *ptr, uint8_t message_type);
@@ -47,6 +56,8 @@ bool ws_wp_nested_us_read(uint8_t *data, uint16_t length, struct ws_us_ie *us_ie
 bool ws_wp_nested_bs_read(uint8_t *data, uint16_t length, struct ws_bs_ie *bs_ie);
 bool ws_wp_nested_pan_read(uint8_t *data, uint16_t length, struct ws_pan_information_s *pan_congiguration);
 bool ws_wp_nested_pan_version_read(uint8_t *data, uint16_t length, uint16_t *pan_version);
+bool ws_wp_nested_network_name_read(uint8_t *data, uint16_t length, ws_wp_network_name_t *network_name);
 uint8_t * ws_wp_nested_gtkhash_read(uint8_t *data, uint16_t length);
 
+
 #endif /* WS_IE_LIB_H_ */

test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.c

@@ -390,3 +390,28 @@ bool test_ws_wp_nested_gtkhash_read()
     return true;
 }
 
+bool test_ws_wp_nested_network_name_read()
+{
+    uint8_t temp_buf[40];
+    ws_wp_network_name_t network_name;
+    mac_ie_lib_stub_def.value_uint16 = 0;
+    if (ws_wp_nested_network_name_read(temp_buf, 40, &network_name)) {
+        return false;
+    }
+
+    mac_ie_lib_stub_def.value_uint16 = 33;
+    if (ws_wp_nested_network_name_read(temp_buf, 20, &network_name)) {
+        return false;
+    }
+
+    mac_ie_lib_stub_def.value_uint16 = 30;
+    if (!ws_wp_nested_network_name_read(temp_buf, 20, &network_name)) {
+        return false;
+    }
+
+    if (network_name.network_name != temp_buf || network_name.network_name_length != 30) {
+        return false;
+    }
+
+    return true;
+}

test/nanostack/unittest/6LoWPAN/ws_ie_lib/test_ws_ie_lib.h

@@ -46,6 +46,8 @@ bool test_ws_wp_nested_pan_version_read();
 
 bool test_ws_wp_nested_gtkhash_read();
 
+bool test_ws_wp_nested_network_name_read();
+
 #ifdef __cplusplus
 }
 #endif

test/nanostack/unittest/6LoWPAN/ws_ie_lib/ws_ie_libtest.cpp

@@ -84,6 +84,11 @@ TEST(ws_ie_lib, test_ws_wp_nested_gtkhash_read)
     CHECK(test_ws_wp_nested_gtkhash_read());
 }
 
+TEST(ws_ie_lib, test_ws_wp_nested_network_name_read)
+{
+    CHECK(test_ws_wp_nested_network_name_read());
+}
+
 
 
 

test/nanostack/unittest/stub/ws_ie_lib_stub.c

@@ -40,6 +40,7 @@
 #include "mac_common_defines.h"
 #include "6LoWPAN/MAC/mac_ie_lib.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
+#include "6LoWPAN/ws/ws_ie_lib.h"
 #include "ws_ie_lib_stub.h"
 
 ws_ie_lib_stub_def ws_ie_lib_stub;
@@ -84,7 +85,7 @@ uint8_t *ws_wp_base_write(uint8_t *ptr, uint16_t length)
     return ptr;
 }
 
-uint8_t *ws_wp_nested_hopping_schedule_write(uint8_t *ptr,struct ws_hoopping_schedule_s *hopping_schedule, bool unicast_schedule)
+uint8_t *ws_wp_nested_hopping_schedule_write(uint8_t *ptr,struct ws_hopping_schedule_s *hopping_schedule, bool unicast_schedule)
 {
     if (unicast_schedule) {
         ptr += 2 + 6;
@@ -142,7 +143,7 @@ uint8_t *ws_wp_nested_gtkhash_write(uint8_t *ptr, uint8_t *gtkhash, uint8_t gtkh
     return ptr;
 }
 
-uint16_t ws_wp_nested_hopping_schedule_length(struct ws_hoopping_schedule_s *hopping_schedule, bool unicast_schedule)
+uint16_t ws_wp_nested_hopping_schedule_length(struct ws_hopping_schedule_s *hopping_schedule, bool unicast_schedule)
 {
     if (unicast_schedule) {
         return 8;
@@ -188,3 +189,8 @@ uint8_t * ws_wp_nested_gtkhash_read(uint8_t *data, uint16_t length)
 {
     return NULL;
 }
+
+bool ws_wp_nested_network_name_read(uint8_t *data, uint16_t length, ws_wp_network_name_t *network_name)
+{
+    return false;
+}