Rename address.h

Arto Kinnunen · Arto Kinnunen · commit 048f14a22288 · 2019-02-04T13:42:18.000+02:00
Rename address.h/c to ns_address_internal.c/h to avoid name collision
diff --git a/source/6LoWPAN/MAC/mac_helper.h b/source/6LoWPAN/MAC/mac_helper.h
@@ -19,7 +19,7 @@
 #define MAC_HELPER_H
 
 #include "mlme.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 
 struct channel_list_s;
 struct nwk_scan_params;
diff --git a/source/6LoWPAN/MAC/mac_response_handler.c b/source/6LoWPAN/MAC/mac_response_handler.c
@@ -22,7 +22,7 @@
 #include "NWK_INTERFACE/Include/protocol_abstract.h"
 #include "NWK_INTERFACE/Include/protocol_timer.h"
 #include "Service_Libs/mle_service/mle_service_api.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_socket.h"
 #include "6LoWPAN/Thread/thread_common.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
diff --git a/source/6LoWPAN/ND/nd_defines.h b/source/6LoWPAN/ND/nd_defines.h
@@ -18,7 +18,7 @@
 #ifndef ND_DEFINES_H_
 #define ND_DEFINES_H_
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "ns_list.h"
 #include "6LoWPAN/IPHC_Decode/lowpan_context.h"
 #include "Common_Protocols/icmpv6_prefix.h"
diff --git a/source/6LoWPAN/Thread/thread_address_registration_client.c b/source/6LoWPAN/Thread/thread_address_registration_client.c
@@ -49,7 +49,7 @@
 #include "6LoWPAN/Thread/thread_management_client.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 
 #ifdef HAVE_THREAD_V2
diff --git a/source/6LoWPAN/Thread/thread_common.c b/source/6LoWPAN/Thread/thread_common.c
@@ -88,7 +88,7 @@
 #include "6LoWPAN/MAC/mac_pairwise_key.h"
 #include "6LoWPAN/MAC/mac_data_poll.h"
 #include "Service_Libs/etx/etx.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "6LoWPAN/Thread/thread_nvm_store.h"
 
 #define TRACE_GROUP "thrd"
diff --git a/source/6LoWPAN/Thread/thread_host_bootstrap.c b/source/6LoWPAN/Thread/thread_host_bootstrap.c
@@ -73,7 +73,7 @@
 #include "Service_Libs/blacklist/blacklist.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "6LoWPAN/MAC/mac_data_poll.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
 
 #define TRACE_GROUP "tebs"
diff --git a/source/6LoWPAN/Thread/thread_management_server.c b/source/6LoWPAN/Thread/thread_management_server.c
@@ -67,7 +67,7 @@
 #include "mac_api.h"
 #include "6LoWPAN/MAC/mac_data_poll.h"
 #include "Common_Protocols/ipv6_constants.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "mlme.h"
 
 #ifdef HAVE_THREAD
diff --git a/source/6LoWPAN/Thread/thread_nvm_store.c b/source/6LoWPAN/Thread/thread_nvm_store.c
@@ -35,7 +35,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "ns_file_system.h"
 #include "thread_config.h"
 #include "thread_common.h"
diff --git a/source/6LoWPAN/Thread/thread_resolution_client.c b/source/6LoWPAN/Thread/thread_resolution_client.c
@@ -33,7 +33,7 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "thread_tmfcop_lib.h"
 
 #include "coap_service_api.h"
diff --git a/source/6LoWPAN/Thread/thread_router_bootstrap.c b/source/6LoWPAN/Thread/thread_router_bootstrap.c
@@ -83,7 +83,7 @@
 #include "mac_api.h"
 #include "6LoWPAN/MAC/mac_data_poll.h"
 #include "thread_border_router_api.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
 
 #ifdef HAVE_THREAD_ROUTER
diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
@@ -23,7 +23,7 @@
 #include "ns_list.h"
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_socket.h"
 #include "mac_api.h"
 #include "mac_mcps.h"
diff --git a/source/6LoWPAN/lowpan_adaptation_interface.h b/source/6LoWPAN/lowpan_adaptation_interface.h
@@ -17,7 +17,7 @@
 
 #ifndef LOWPAN_ADAPTATION_INTERFACE_H_
 #define LOWPAN_ADAPTATION_INTERFACE_H_
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 
 struct protocol_interface_info_entry;
 struct mcps_data_conf_s;
diff --git a/source/Common_Protocols/ipv6_resolution.h b/source/Common_Protocols/ipv6_resolution.h
@@ -19,7 +19,7 @@
 #ifndef IPV6_RESOLUTION_H_
 #define IPV6_RESOLUTION_H_
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 
 struct ipv6_neighbour;
 struct ipv6_neighbour_cache;
diff --git a/source/Core/buffer_dyn.c b/source/Core/buffer_dyn.c
@@ -19,7 +19,7 @@
 #include "string.h"
 #include "ns_types.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_buffer.h"
 #include "Core/include/ns_socket.h"
 #include "ns_trace.h"
diff --git a/source/Core/include/ns_address_internal.h b/source/Core/include/ns_address_internal.h
@@ -16,7 +16,7 @@
  */
 /**
  *
- * \file address.h
+ * \file ns_address_internal.h
  * \brief address type definitions.
  *
  *  nanoStack: supported address types and associated data structures.
diff --git a/source/Core/include/ns_buffer.h b/source/Core/include/ns_buffer.h
@@ -32,7 +32,7 @@
 #endif
 
 #include "ns_types.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "NWK_INTERFACE/Include/protocol_abstract.h"
 #include "ns_list.h"
 #include "ipv6_stack/ipv6_routing_table.h"
diff --git a/source/Core/ns_address_internal.c b/source/Core/ns_address_internal.c
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 /**
- * \file address.c
- * \brief Utility functions concernig addresses
+ * \file ns_address_internal.c
+ * \brief Utility functions concerning addresses
  *
  * This file contains all the utility functions that can be used to
  * check, manipulate etc. addresses.
diff --git a/source/MLE/mle.h b/source/MLE/mle.h
@@ -19,7 +19,7 @@
 #define MLE_H_
 
 #include "nsconfig.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "ns_list.h"
 
 struct buffer;
diff --git a/source/NWK_INTERFACE/Include/protocol.h b/source/NWK_INTERFACE/Include/protocol.h
@@ -33,7 +33,7 @@
 #include "NWK_INTERFACE/Include/protocol_abstract.h"
 
 // Users of protocol.h can assume it includes these headers
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_buffer.h"
 
 // Headers below this are implementation details - users of protocol.h shouldn't rely on them
diff --git a/source/RPL/rpl_policy.c b/source/RPL/rpl_policy.c
@@ -24,7 +24,7 @@
 
 #include "net_interface.h"
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Service_Libs/etx/etx.h"
 #include "Common_Protocols/ipv6_resolution.h"
 #include "ipv6_stack/ipv6_routing_table.h"
diff --git a/source/RPL/rpl_policy.h b/source/RPL/rpl_policy.h
@@ -18,7 +18,7 @@
 #ifndef RPL_POLICY_H_
 #define RPL_POLICY_H_
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "rpl_control.h"
 
 bool rpl_policy_join_instance(rpl_domain_t *domain, uint8_t instance_id, const uint8_t *dodagid);
diff --git a/source/RPL/rpl_upward.c b/source/RPL/rpl_upward.c
@@ -38,7 +38,7 @@
 
 #include "net_interface.h"
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Common_Protocols/icmpv6.h"
 #include "Common_Protocols/icmpv6_prefix.h"
 #include "NWK_INTERFACE/Include/protocol_abstract.h"
diff --git a/source/Security/TLS/tls_lib.c b/source/Security/TLS/tls_lib.c
@@ -18,7 +18,7 @@
 #include "ns_types.h"
 #ifdef PANA
 #include "string.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_buffer.h"
 #ifdef ECC
 #include "libX509_V3.h"
diff --git a/source/Service_Libs/etx/etx.c b/source/Service_Libs/etx/etx.c
@@ -23,7 +23,7 @@
 #include "platform/arm_hal_phy.h"
 #include "net_interface.h"
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "MLE/mle.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
diff --git a/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c b/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c
@@ -23,7 +23,7 @@
 #include "common_functions.h"
 #include "nsdynmemLIB.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "platform/topo_trace.h"
 
 #define TRACE_GROUP "mnei"
diff --git a/source/Service_Libs/mdns/ns_fnet_port.c b/source/Service_Libs/mdns/ns_fnet_port.c
@@ -33,7 +33,7 @@
 #include "socket_api.h"
 #include "net_interface.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 
 #include "ns_fnet_events.h"
 
diff --git a/source/Service_Libs/mle_service/mle_service_frame_counter_table.c b/source/Service_Libs/mle_service/mle_service_frame_counter_table.c
@@ -22,7 +22,7 @@
 #include "common_functions.h"
 #include "ccmLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_buffer.h"
 #include "MLE/mle.h"
 #include "mac_common_defines.h"
diff --git a/source/Service_Libs/mle_service/mle_service_security.c b/source/Service_Libs/mle_service/mle_service_security.c
@@ -28,7 +28,7 @@
 #include "common_functions.h"
 #include "ccmLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_buffer.h"
 #include "MLE/mle.h"
 #include "mac_common_defines.h"
diff --git a/source/ipv6_stack/ipv6_routing_table.c b/source/ipv6_stack/ipv6_routing_table.c
@@ -37,7 +37,7 @@
 #include "randLIB.h"
 #include "ns_trace.h"
 #include "string.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "ipv6_stack/ipv6_routing_table.h"
 #include "Common_Protocols/ipv6_constants.h"
 #include "Common_Protocols/icmpv6.h"
diff --git a/source/ipv6_stack/ipv6_routing_table.h b/source/ipv6_stack/ipv6_routing_table.h
@@ -24,7 +24,7 @@
 #define IPV6_ROUTING_TABLE_H_
 
 #include "ns_list.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 
 /* Address Resolution and Neighbour Unreachablity Detection constants from
  * RFC 4861, updated by RFC 7048.
diff --git a/source/libNET/src/net_ipv6.c b/source/libNET/src/net_ipv6.c
@@ -21,7 +21,7 @@
 #include "ns_types.h"
 #include "nsdynmemLIB.h"
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Common_Protocols/ipv6_flow.h"
 #include "Common_Protocols/ipv6_fragmentation.h"
 #include "NWK_INTERFACE/Include/protocol.h"
diff --git a/source/libNET/src/net_mle.c b/source/libNET/src/net_mle.c
@@ -25,7 +25,7 @@
 #include "string.h"
 #include "ns_trace.h"
 #include "net_mle_api.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "net_interface.h"
 #include "MLE/mle.h"
 #include "NWK_INTERFACE/Include/protocol.h"
diff --git a/source/libNET/src/net_rpl.c b/source/libNET/src/net_rpl.c
@@ -19,7 +19,7 @@
 #include "ns_types.h"
 #include <string.h>
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan.h"
 #include "RPL/rpl_protocol.h"
diff --git a/sources.mk b/sources.mk
@@ -47,7 +47,7 @@ SRCS += \
 	source/Common_Protocols/mld.c \
 	source/Common_Protocols/tcp.c \
 	source/Common_Protocols/udp.c \
-	source/Core/address.c \
+	source/Core/ns_address_internal.c \
 	source/Core/buffer_dyn.c \
 	source/Core/sockbuf.c \
 	source/Core/ns_socket.c \
diff --git a/test/nanostack/unittest/Common_Protocols/udp/test_udp.c b/test/nanostack/unittest/Common_Protocols/udp/test_udp.c
@@ -18,7 +18,7 @@
 #include "test_udp.h"
 #include <string.h>
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_buffer.h"
 
 bool test_udp_down()
diff --git a/test/nanostack/unittest/Core/address/Makefile b/test/nanostack/unittest/Core/address/Makefile
@@ -4,7 +4,7 @@ COMPONENT_NAME = address_unit
 
 #This must be changed manually
 SRC_FILES = \
-        ../../../../../source/Core/address.c
+        ../../../../../source/Core/ns_address_internal.c
 
 TEST_SRC_FILES = \
 	main.cpp \
diff --git a/test/nanostack/unittest/service_libs/blacklist/test_blacklist.c b/test/nanostack/unittest/service_libs/blacklist/test_blacklist.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "address.h"
+#include "ns_address_internal.h"
 #include "mle.h"
 #include "blacklist.h"
 
diff --git a/test/nanostack/unittest/service_libs/etx/test_etx.c b/test/nanostack/unittest/service_libs/etx/test_etx.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "address.h"
+#include "ns_address_internal.h"
 #include "mle.h"
 #include "etx.h"
 #include "NWK_INTERFACE/Include/protocol.h"
diff --git a/test/nanostack/unittest/service_libs/hmac/test_hmac.c b/test/nanostack/unittest/service_libs/hmac/test_hmac.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "address.h"
+#include "ns_address_internal.h"
 #include "Service_Libs/hmac/hmac_sha1.h"
 #include "mbedtls/md.h"
 #include "mbedtls_stub.h"
diff --git a/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.c b/test/nanostack/unittest/service_libs/ieee_802_11/test_ieee_802_11.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "address.h"
+#include "ns_address_internal.h"
 #include "Service_Libs/ieee_802_11/ieee_802_11.h"
 #include "hmac_stub.h"
 
diff --git a/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.c b/test/nanostack/unittest/service_libs/nist_aes_kw/test_nist_aes_kw.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "address.h"
+#include "ns_address_internal.h"
 #include "Service_Libs/nist_aes_kw/nist_aes_kw.h"
 #include "mbedtls/nist_kw.h"
 #include "mbedtls_stub.h"
diff --git a/test/nanostack/unittest/stub/adaptation_interface_stub.c b/test/nanostack/unittest/stub/adaptation_interface_stub.c
@@ -22,7 +22,7 @@
 #include "ns_list.h"
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_socket.h"
 #include "randLIB.h"
 #include "mac_api.h"
diff --git a/test/nanostack/unittest/stub/address_stub.h b/test/nanostack/unittest/stub/address_stub.h
@@ -23,7 +23,7 @@ extern "C" {
 
 #include "inttypes.h"
 #include "NWK_INTERFACE/Include/protocol_abstract.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 
 typedef struct {
     uint8_t uint8_value;
diff --git a/test/nanostack/unittest/stub/buffer_dyn_stub.c b/test/nanostack/unittest/stub/buffer_dyn_stub.c
@@ -19,7 +19,7 @@
 #include "string.h"
 #include "ns_types.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "Core/include/ns_buffer.h"
 #include "platform/arm_hal_interrupt.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
diff --git a/test/nanostack/unittest/stub/cudp_stub.c b/test/nanostack/unittest/stub/cudp_stub.c
diff --git a/test/nanostack/unittest/stub/etx_stub.c b/test/nanostack/unittest/stub/etx_stub.c
diff --git a/test/nanostack/unittest/stub/ipv6_routing_table_stub.c b/test/nanostack/unittest/stub/ipv6_routing_table_stub.c
diff --git a/test/nanostack/unittest/stub/mac_pairwise_key_stub.c b/test/nanostack/unittest/stub/mac_pairwise_key_stub.c
diff --git a/test/nanostack/unittest/stub/mac_response_handler_stub.c b/test/nanostack/unittest/stub/mac_response_handler_stub.c
diff --git a/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c b/test/nanostack/unittest/stub/mle_service_frame_counter_table_stub.c
diff --git a/test/nanostack/unittest/stub/net_mle_stub.c b/test/nanostack/unittest/stub/net_mle_stub.c
diff --git a/test/nanostack/unittest/stub/net_rpl_stub.c b/test/nanostack/unittest/stub/net_rpl_stub.c
diff --git a/test/nanostack/unittest/stub/routing_table_stub.c b/test/nanostack/unittest/stub/routing_table_stub.c
diff --git a/test/nanostack/unittest/stub/rpl_policy_stub.c b/test/nanostack/unittest/stub/rpl_policy_stub.c
diff --git a/test/nanostack/unittest/stub/rpl_upward_stub.c b/test/nanostack/unittest/stub/rpl_upward_stub.c
diff --git a/test/nanostack/unittest/stub/thread_address_registration_client_stub.c b/test/nanostack/unittest/stub/thread_address_registration_client_stub.c
diff --git a/test/nanostack/unittest/stub/thread_router_bootstrap_stub.c b/test/nanostack/unittest/stub/thread_router_bootstrap_stub.c
diff --git a/test/nanostack/unittest/stub/tls_lib_stub.c b/test/nanostack/unittest/stub/tls_lib_stub.c
