Add Nanostack configuration for WS (ARMmbed#1961)

Arto Kinnunen · web-flow · commit 7ebaa8e47d0f · 2019-02-01T12:14:07.000+02:00
-Add WS configuration files for border_router and router
-Fix compilation warnings
diff --git a/Makefile b/Makefile
@@ -109,7 +109,7 @@ clean-extra: $(CLEANTESTDIRS)
 # 3. TBD: importing to mbed OS
 
 TARGET_DIR:=release
-CONFIGURATIONS_TO_BUILD:=lowpan_border_router lowpan_host lowpan_router nanostack_full thread_border_router thread_router thread_end_device ethernet_host
+CONFIGURATIONS_TO_BUILD:=lowpan_border_router lowpan_host lowpan_router nanostack_full thread_border_router thread_router thread_end_device ethernet_host ws_border_router ws_router
 TOOLCHAINS_TO_BUILD:=GCC ARM ARMC6 IAR
 CORES_TO_BUILD:=Cortex-M0 Cortex-M3
 
diff --git a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
@@ -1408,6 +1408,8 @@ static void lowpan_mle_receive_security_bypass_cb(int8_t interface_id, mle_messa
         pana_reset_client_session();
         bootsrap_next_state_kick(ER_PANA_AUTH_ERROR, interface);
     }
+#else
+    (void)mle_msg;
 #endif
 }
 
diff --git a/source/6LoWPAN/ND/nd_router_object.c b/source/6LoWPAN/ND/nd_router_object.c
@@ -831,6 +831,8 @@ buffer_t *nd_dar_parse(buffer_t *buf, protocol_interface_info_entry_t *cur_inter
     }
 
 drop:
+#else
+    (void)cur_interface;
 #endif
 
     return buffer_free(buf);
diff --git a/source/6LoWPAN/Thread/thread_test_api.c b/source/6LoWPAN/Thread/thread_test_api.c
@@ -634,6 +634,7 @@ int thread_test_version_set(int8_t interface_id, uint8_t version)
     return 0;
 
 #else
+    (void)version;
     (void)interface_id;
     return -1;
 #endif
@@ -1358,6 +1359,8 @@ int thread_test_mle_message_send(int8_t interface_id, uint8_t *dst_address, uint
     (void)msg_id;
     (void)write_src_addr;
     (void)write_leader_data;
+    (void)write_network_data;
+    (void)write_timestamp;
     (void)write_operational_set;
     (void)write_challenge;
     (void)msg_ptr;
diff --git a/source/6LoWPAN/ws/ws_bbr_api.c b/source/6LoWPAN/ws/ws_bbr_api.c
@@ -41,7 +41,7 @@
 
 #define RPL_INSTANCE_ID 1
 
-#ifdef HAVE_WS
+#ifdef HAVE_WS_BORDER_ROUTER
 
 
 /* when creating BBR make ULA dodag ID always and when network becomes available add prefix to DHCP
@@ -426,15 +426,15 @@ uint16_t ws_bbr_pan_size(protocol_interface_info_entry_t *cur)
 }
 
 
-#endif //HAVE_WS
+#endif //HAVE_WS_BORDER_ROUTER
 
 /* Public APIs
  *
  */
 
 int ws_bbr_start(int8_t interface_id, int8_t bb_interface_id)
 {
-#ifdef HAVE_WS
+#ifdef HAVE_WS_BORDER_ROUTER
 
     (void)interface_id;
     protocol_interface_info_entry_t *bb_interface = protocol_stack_interface_info_get_by_id(bb_interface_id);
@@ -448,13 +448,14 @@ int ws_bbr_start(int8_t interface_id, int8_t bb_interface_id)
 
     return 0;
 #else
+    (void)interface_id;
     (void)bb_interface_id;
     return -1;
 #endif
 }
 void ws_bbr_stop(int8_t interface_id)
 {
-#ifdef HAVE_WS
+#ifdef HAVE_WS_BORDER_ROUTER
 
     (void)interface_id;
     backbone_interface_id = -1;
diff --git a/source/6LoWPAN/ws/ws_bbr_api_internal.h b/source/6LoWPAN/ws/ws_bbr_api_internal.h
@@ -19,7 +19,7 @@
 #define WS_BBR_API_PRIVATE_H_
 
 
-#ifdef HAVE_WS
+#ifdef HAVE_WS_BORDER_ROUTER
 
 extern uint16_t test_pan_size_override;
 
@@ -34,9 +34,9 @@ void ws_bbr_rpl_config(uint8_t imin, uint8_t doubling, uint8_t redundancy);
 #else
 
 #define ws_bbr_seconds_timer( cur, seconds)
-#define ws_bbr_pan_size(cur)
+#define ws_bbr_pan_size(cur) 0
 #define ws_bbr_rpl_config( imin, doubling, redundancy);
 
-#endif //HAVE_WS
+#endif //HAVE_WS_BORDER_ROUTER
 
 #endif /* WS_BBR_API_PRIVATE_H_ */
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -681,7 +681,9 @@ static int8_t ws_bootstrap_down(protocol_interface_info_entry_t *cur)
     // Reset WS information
     // ws_common_reset(cur)
     ws_llc_reset(cur);
-    nd_proxy_downstream_interface_unregister(cur->id);
+    if (nd_proxy_downstream_interface_unregister(cur->id) != 0) {
+        tr_warn("nd proxy unregister failed");
+    }
     ws_nud_table_reset(cur);
     dhcp_client_delete(cur->id);
     ws_eapol_relay_delete(cur);
diff --git a/source/6LoWPAN/ws/ws_test_api.c b/source/6LoWPAN/ws/ws_test_api.c
@@ -38,8 +38,13 @@ int ws_test_pan_size_set(int8_t interface_id, uint16_t pan_size)
 {
 
     (void) interface_id;
+#ifdef HAVE_WS_BORDER_ROUTER
     test_pan_size_override = pan_size;
     return 0;
+#else
+    (void) pan_size;
+    return -1;
+#endif
 }
 
 int ws_test_max_child_count_set(int8_t interface_id, uint16_t child_count)
diff --git a/source/Core/address.c b/source/Core/address.c
@@ -176,6 +176,9 @@ static bool addr_is_ipv4_mapped(const uint8_t addr[static 16])
 /* Scope(A), as defined in RFC 6724 plus RFC 4007 */
 uint_fast8_t addr_ipv6_scope(const uint8_t addr[static 16], const protocol_interface_info_entry_t *interface)
 {
+#ifndef HAVE_THREAD
+    (void)interface;
+#endif
     if (addr_is_ipv6_multicast(addr)) {
         return addr_ipv6_multicast_scope(addr);
     }
diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -1600,9 +1600,9 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt
     return 0;
 }
 
-
 int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s *rf_ptr, const mac_fcf_sequence_t *fcf, const uint8_t *data_ptr, const mcps_ack_data_payload_t *ack_payload, uint32_t rx_time)
 {
+    (void)rx_time;
     phy_device_driver_s *dev_driver = rf_ptr->dev_driver->phy_driver;
     dev_driver_tx_buffer_s *tx_buf = &rf_ptr->dev_driver_tx_buffer;
 
diff --git a/source/Security/PANA/pana_server.c b/source/Security/PANA/pana_server.c
@@ -1742,6 +1742,8 @@ int8_t pana_server_restore_from_nvm(uint8_t *nvm_data, int8_t interface_id)
 int8_t pana_server_nvm_callback_set(pana_server_update_cb *update_cb, pana_server_session_get_cb *nvm_get, pana_server_session_get_by_id_cb *nvm_session_get, uint8_t *nvm_static_buffer)
 {
     (void)update_cb;
+    (void)nvm_get;
+    (void)nvm_session_get;
     (void)nvm_static_buffer;
     return -1;
 }
diff --git a/source/Service_Libs/mle_service/mle_service_api.h b/source/Service_Libs/mle_service/mle_service_api.h
@@ -804,6 +804,6 @@ void mle_service_frame_counter_entry_delete(int8_t interface_id, uint8_t attribu
  */
 void mle_service_receive_filter_cb_set(mle_service_filter_cb *filter_cb);
 #else
-#define mle_service_receive_filter_cb_set(filter_cb) ((void) 0)
+#define mle_service_receive_filter_cb_set(filter_cb) ((void) filter_cb)
 #endif /* MLE_TEST */
 #endif /* MLE_SERVICE_API_H_ */
diff --git a/source/Service_Libs/whiteboard/whiteboard.h b/source/Service_Libs/whiteboard/whiteboard.h
@@ -38,6 +38,7 @@ extern uint16_t whiteboard_size_get(void);
 #define whiteboard_table_check_address(address) NULL
 #define whiteboard_table_update(address, eui64, status) NULL
 #define whiteboard_interface_unregister_all_address(nwk_id)
+#define whiteboard_interface_register(address, nwk_id)
 #define whiteboard_interface_address_cmp(address) false
 #endif
 
diff --git a/source/configs/base/cfg_ws_border_router.h b/source/configs/base/cfg_ws_border_router.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Config Flags for WS Border router */
+#include "cfg_ws_router.h"
+
+#define HAVE_RPL_ROOT
+#define HAVE_RPL_DAO_HANDLING
+#define HAVE_6LOWPAN_BORDER_ROUTER
+#define HAVE_WS_BORDER_ROUTER
+#define HAVE_ND_PROXY
+#define MULTICAST_FORWARDING
diff --git a/source/configs/base/cfg_ws_router.h b/source/configs/base/cfg_ws_router.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define HAVE_6LOWPAN_ROUTER
+#define HAVE_WS_ROUTER
+#define HAVE_RPL
+#define HAVE_IPV6_ND
+#define HAVE_6LOWPAN_ND
+#define HAVE_MPL
+#define HAVE_WS
diff --git a/source/configs/cfg_generic.h b/source/configs/cfg_generic.h
@@ -20,6 +20,7 @@
 #include "base/cfg_lowpan_border_router.h"
 #include "base/cfg_local_socket.h"
 #include "base/cfg_rf_tunnel.h"
+#include "base/cfg_ws_border_router.h"
 
 #define FEA_TRACE_SUPPORT
 #define EXTRA_CONSISTENCY_CHECKS
diff --git a/source/configs/cfg_ws_border_router.h b/source/configs/cfg_ws_border_router.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "base/cfg_ethernet.h"
+#include "base/cfg_local_socket.h"
+#include "base/cfg_ws_border_router.h"
+
+#define FEA_TRACE_SUPPORT
+#define HAVE_DHCPV6_SERVER
+#define EXTRA_CONSISTENCY_CHECKS
+
+//#define HAVE_PAE_SUPP
+//#define HAVE_PAE_AUTH
+//#define HAVE_EAPOL_RELAY
diff --git a/source/configs/cfg_ws_router.h b/source/configs/cfg_ws_router.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include "base/cfg_ws_router.h"
+
+#define FEA_TRACE_SUPPORT
+#define EXTRA_CONSISTENCY_CHECKS
+
diff --git a/source/libNET/src/net_load_balance.c b/source/libNET/src/net_load_balance.c
@@ -313,9 +313,13 @@ int8_t net_load_balance_load_level_update_enable(int8_t interface_id, uint16_t e
 
     return load_balance_network_load_monitor_enable(interface_ptr->lb_api, expected_device_count, RPL_DODAG_PREF_MASK + 1, net_load_balance_api_get_node_count_cb, net_load_balance_api_get_set_load_level_cb);
 #else
+    (void)interface_id;
+    (void)expected_device_count;
     return -1;
 #endif
 #else
+    (void)interface_id;
+    (void)expected_device_count;
     return -1;
 #endif
 }
@@ -338,9 +342,11 @@ int8_t net_load_balance_load_level_update_disable(int8_t interface_id)
 
     return load_balance_network_load_monitor_disable(interface_ptr->lb_api);
 #else
+    (void)interface_id;
     return -1;
 #endif
 #else
+    (void)interface_id;
     return -1;
 #endif
 }
diff --git a/source/libNET/src/net_rpl.c b/source/libNET/src/net_rpl.c
@@ -74,6 +74,11 @@ int8_t arm_nwk_6lowpan_rpl_dodag_init(int8_t interface_id, const uint8_t *dodag_
     }
     return 0;
 #else // !HAVE_RPL_ROOT
+    (void)dodag_id;
+    (void)config;
+    (void)instance_id;
+    (void)flags;
+
     return -1;
 #endif
 }
diff --git a/source/libNET/src/ns_net.c b/source/libNET/src/ns_net.c
@@ -693,6 +693,8 @@ int8_t arm_nwk_interface_ethernet_init(eth_mac_api_t *api, const char *interface
     cur->interface_name = interface_name_ptr;
     return cur->id;
 #else
+    (void)api;
+    (void)interface_name_ptr;
     return -2;
 #endif
 }
@@ -1022,11 +1024,20 @@ int8_t arm_pana_client_library_init(int8_t interface_id, net_tls_cipher_e cipher
 
 int8_t arm_nwk_interface_configure_ipv6_bootstrap_set(int8_t interface_id, net_ipv6_mode_e bootstrap_mode, const uint8_t *ipv6_prefix_pointer)
 {
+#ifndef HAVE_ETHERNET
+    (void)interface_id;
+    (void)bootstrap_mode;
+    (void)ipv6_prefix_pointer;
+#endif
     return ipv6_interface_configure_ipv6_bootstrap_set(interface_id, bootstrap_mode, ipv6_prefix_pointer);
 }
 
 int8_t arm_nwk_interface_accept_ipv6_ra(int8_t interface_id, net_ipv6_accept_ra_e accept_ra)
 {
+#ifndef HAVE_ETHERNET
+    (void)interface_id;
+    (void)accept_ra;
+#endif
     return ipv6_interface_accept_ra(interface_id, accept_ra);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1408,6 +1408,8 @@ static void lowpan_mle_receive_security_bypass_cb(int8_t interface_id, mle_messa`
`1408`	`1408`	`pana_reset_client_session();`
`1409`	`1409`	`bootsrap_next_state_kick(ER_PANA_AUTH_ERROR, interface);`
`1410`	`1410`	`}`
	`1411`	`+#else`
	`1412`	`+ (void)mle_msg;`
`1411`	`1413`	`#endif`
`1412`	`1414`	`}`
`1413`	`1415`
Original file line number	Diff line number	Diff line change
`@@ -831,6 +831,8 @@ buffer_t nd_dar_parse(buffer_t buf, protocol_interface_info_entry_t *cur_inter`
`831`	`831`	`}`
`832`	`832`
`833`	`833`	`drop:`
	`834`	`+#else`
	`835`	`+ (void)cur_interface;`
`834`	`836`	`#endif`
`835`	`837`
`836`	`838`	`return buffer_free(buf);`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,13 @@ int ws_test_pan_size_set(int8_t interface_id, uint16_t pan_size)`
`38`	`38`	`{`
`39`	`39`
`40`	`40`	`(void) interface_id;`
	`41`	`+#ifdef HAVE_WS_BORDER_ROUTER`
`41`	`42`	`test_pan_size_override = pan_size;`
`42`	`43`	`return 0;`
	`44`	`+#else`
	`45`	`+ (void) pan_size;`
	`46`	`+ return -1;`
	`47`	`+#endif`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`int ws_test_max_child_count_set(int8_t interface_id, uint16_t child_count)`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,9 @@ static bool addr_is_ipv4_mapped(const uint8_t addr[static 16])`
`176`	`176`	`/* Scope(A), as defined in RFC 6724 plus RFC 4007 */`
`177`	`177`	`uint_fast8_t addr_ipv6_scope(const uint8_t addr[static 16], const protocol_interface_info_entry_t *interface)`
`178`	`178`	`{`
	`179`	`+#ifndef HAVE_THREAD`
	`180`	`+ (void)interface;`
	`181`	`+#endif`
`179`	`182`	`if (addr_is_ipv6_multicast(addr)) {`
`180`	`183`	`return addr_ipv6_multicast_scope(addr);`
`181`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1600,9 +1600,9 @@ static int8_t mcps_generic_packet_build(protocol_interface_rf_mac_setup_s *rf_pt`
`1600`	`1600`	`return 0;`
`1601`	`1601`	`}`
`1602`	`1602`
`1603`		`-`
`1604`	`1603`	`int8_t mcps_generic_ack_build(protocol_interface_rf_mac_setup_s rf_ptr, const mac_fcf_sequence_t fcf, const uint8_t data_ptr, const mcps_ack_data_payload_t ack_payload, uint32_t rx_time)`
`1605`	`1604`	`{`
	`1605`	`+ (void)rx_time;`
`1606`	`1606`	`phy_device_driver_s *dev_driver = rf_ptr->dev_driver->phy_driver;`
`1607`	`1607`	`dev_driver_tx_buffer_s *tx_buf = &rf_ptr->dev_driver_tx_buffer;`
`1608`	`1608`