Wi-SUN header and Paylod IE element lenght future proof update.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_ie_lib.c

@@ -319,7 +319,7 @@ bool ws_wh_utt_read(uint8_t *data, uint16_t length, struct ws_utt_ie *utt_ie)
 {
     mac_header_IE_t utt_ie_data;
     utt_ie_data.id = MAC_HEADER_ASSIGNED_EXTERNAL_ORG_IE_ID;
-    if (4 != mac_ie_header_sub_id_discover(data, length, &utt_ie_data, WH_IE_UTT_TYPE)) {
+    if (4 > mac_ie_header_sub_id_discover(data, length, &utt_ie_data, WH_IE_UTT_TYPE)) {
         // NO UTT header
         return false;
     }
@@ -333,7 +333,7 @@ bool ws_wh_bt_read(uint8_t *data, uint16_t length, struct ws_bt_ie *bt_ie)
 {
     mac_header_IE_t btt_ie_data;
     btt_ie_data.id = MAC_HEADER_ASSIGNED_EXTERNAL_ORG_IE_ID;
-    if (5 != mac_ie_header_sub_id_discover(data, length, &btt_ie_data, WH_IE_BT_TYPE)) {
+    if (5 > mac_ie_header_sub_id_discover(data, length, &btt_ie_data, WH_IE_BT_TYPE)) {
         return false;
     }
     data = btt_ie_data.content_ptr;
@@ -346,7 +346,7 @@ bool ws_wh_fc_read(uint8_t *data, uint16_t length, struct ws_fc_ie *fc_ie)
 {
     mac_header_IE_t fc_ie_data;
     fc_ie_data.id = MAC_HEADER_ASSIGNED_EXTERNAL_ORG_IE_ID;
-    if (2 != mac_ie_header_sub_id_discover(data, length, &fc_ie_data, WH_IE_FC_TYPE)) {
+    if (2 > mac_ie_header_sub_id_discover(data, length, &fc_ie_data, WH_IE_FC_TYPE)) {
         return false;
     }
     data = fc_ie_data.content_ptr;
@@ -359,7 +359,7 @@ bool ws_wh_rsl_read(uint8_t *data, uint16_t length, int8_t *rsl)
 {
     mac_header_IE_t rsl_ie_data;
     rsl_ie_data.id = MAC_HEADER_ASSIGNED_EXTERNAL_ORG_IE_ID;
-    if (1 != mac_ie_header_sub_id_discover(data, length, &rsl_ie_data, WH_IE_RSL_TYPE)) {
+    if (1 > mac_ie_header_sub_id_discover(data, length, &rsl_ie_data, WH_IE_RSL_TYPE)) {
         return false;
     }
     *rsl = *rsl_ie_data.content_ptr;
@@ -371,7 +371,7 @@ bool ws_wh_ea_read(uint8_t *data, uint16_t length, uint8_t *eui64)
 {
     mac_header_IE_t rsl_ie_data;
     rsl_ie_data.id = MAC_HEADER_ASSIGNED_EXTERNAL_ORG_IE_ID;
-    if (8 != mac_ie_header_sub_id_discover(data, length, &rsl_ie_data, WH_IE_EA_TYPE)) {
+    if (8 > mac_ie_header_sub_id_discover(data, length, &rsl_ie_data, WH_IE_EA_TYPE)) {
         return false;
     }
     memcpy(eui64, rsl_ie_data.content_ptr, 8);
@@ -415,7 +415,7 @@ bool ws_wp_nested_us_read(uint8_t *data, uint16_t length, struct ws_us_ie *us_ie
     mac_nested_payload_IE_t nested_payload_ie;
     nested_payload_ie.id = WP_PAYLOAD_IE_US_TYPE;
     nested_payload_ie.type_long = true;
-    if (mac_ie_nested_discover(data, length, &nested_payload_ie) < 4) {
+    if (4 > mac_ie_nested_discover(data, length, &nested_payload_ie)) {
         return false;
     }
 
@@ -517,7 +517,7 @@ bool ws_wp_nested_bs_read(uint8_t *data, uint16_t length, struct ws_bs_ie *bs_ie
     mac_nested_payload_IE_t nested_payload_ie;
     nested_payload_ie.id = WP_PAYLOAD_IE_BS_TYPE;
     nested_payload_ie.type_long = true;
-    if (mac_ie_nested_discover(data, length, &nested_payload_ie) < 10) {
+    if (10 > mac_ie_nested_discover(data, length, &nested_payload_ie)) {
         return false;
     }
     data = nested_payload_ie.content_ptr;
@@ -590,7 +590,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 = false;
-    if (mac_ie_nested_discover(data, length, &nested_payload_ie) !=  5) {
+    if (5 > mac_ie_nested_discover(data, length, &nested_payload_ie)) {
         return false;
     }
 
@@ -608,7 +608,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 = false;
-    if (mac_ie_nested_discover(data, length, &nested_payload_ie) !=  2) {
+    if (2 > mac_ie_nested_discover(data, length, &nested_payload_ie)) {
         return false;
     }
     *pan_version = common_read_16_bit_inverse(nested_payload_ie.content_ptr);

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

@@ -193,6 +193,12 @@ bool test_ws_wh_utt_read()
     }
 
     mac_ie_lib_stub_def.value_uint8 = 4;
+    if (!ws_wh_utt_read(temp_buf, 8, &utt_ie)) {
+        return false;
+    }
+
+    //Future proof testing
+    mac_ie_lib_stub_def.value_uint8 = 5;
     return ws_wh_utt_read(temp_buf, 8, &utt_ie);
 }
 
@@ -206,6 +212,12 @@ bool test_ws_wh_bt_read()
     }
 
     mac_ie_lib_stub_def.value_uint8 = 5;
+    if (!ws_wh_bt_read(temp_buf, 8, &bt_ie)) {
+        return false;
+    }
+
+    //Future proof testing
+    mac_ie_lib_stub_def.value_uint8 = 6;
     return ws_wh_bt_read(temp_buf, 8, &bt_ie);
 }
 
@@ -353,14 +365,23 @@ bool test_ws_wp_nested_pan_read()
     }
     mac_ie_lib_stub_def.value_uint16 = 5;
 
+    if (!ws_wp_nested_pan_read(temp_buf, 20, &ws_pan_ie)) {
+        return false;
+    }
+    //This will be par future proof part and 1.1 need to validate if version is 1.1
+    //For LFN Window style 1.0 it is resewrved and this is BR configured
+
+    //Future proof validation
+    mac_ie_lib_stub_def.value_uint16 = 6;
+
     return ws_wp_nested_pan_read(temp_buf, 20, &ws_pan_ie);
 }
 
 bool test_ws_wp_nested_pan_version_read()
 {
     uint16_t ws_pan_version;
     uint8_t temp_buf[20];
-    mac_ie_lib_stub_def.value_uint16 = 4;
+    mac_ie_lib_stub_def.value_uint16 = 1;
     if (ws_wp_nested_pan_version_read(temp_buf, 20, &ws_pan_version)) {
         return false;
     }
@@ -370,7 +391,9 @@ bool test_ws_wp_nested_pan_version_read()
         return false;
     }
 
-    return true;
+    //test future proof accepts
+    mac_ie_lib_stub_def.value_uint16 = 3;
+    return ws_wp_nested_pan_version_read(temp_buf, 20, &ws_pan_version);
 }
 
 bool test_ws_wp_nested_gtkhash_read()