Rename socket.h to ns_socket.h

Arto Kinnunen · Arto Kinnunen · commit 887d931a9ba7 · 2019-02-01T15:54:20.000+02:00
Rename socket.h to ns_socket.h to avoid name collisions.
diff --git a/source/6LoWPAN/Bootstraps/Generic/network_lib.c b/source/6LoWPAN/Bootstraps/Generic/network_lib.c
@@ -18,7 +18,7 @@
 #include "nsconfig.h"
 #include "ns_types.h"
 #include <string.h>
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "nsdynmemLIB.h"
 #include "ns_trace.h"
 #include "NWK_INTERFACE/Include/protocol.h"
diff --git a/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c b/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
@@ -22,7 +22,7 @@
 #include "eventOS_scheduler.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/udp.h"
 #include "Common_Protocols/ipv6.h"
diff --git a/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c b/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
@@ -26,7 +26,7 @@
 #include "string.h"
 #include "ns_trace.h"
 #include "randLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/IPHC_Decode/cipv6.h"
 #include "6LoWPAN/Fragmentation/cipv6_fragmenter.h"
 #include "NWK_INTERFACE/Include/protocol.h"
diff --git a/source/6LoWPAN/MAC/mac_response_handler.c b/source/6LoWPAN/MAC/mac_response_handler.c
@@ -23,7 +23,7 @@
 #include "NWK_INTERFACE/Include/protocol_timer.h"
 #include "Service_Libs/mle_service/mle_service_api.h"
 #include "Core/include/address.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/Thread/thread_common.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/MAC/mac_helper.h"
diff --git a/source/6LoWPAN/Mesh/mesh.c b/source/6LoWPAN/Mesh/mesh.c
@@ -29,7 +29,7 @@
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
 #include "6LoWPAN/IPHC_Decode/cipv6.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/Mesh/mesh.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 
diff --git a/source/6LoWPAN/NVM/nwk_nvm.c b/source/6LoWPAN/NVM/nwk_nvm.c
@@ -22,7 +22,7 @@
 #include "string.h"
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "6LoWPAN/NVM/nwk_nvm.h"
diff --git a/source/6LoWPAN/Thread/thread_nd.c b/source/6LoWPAN/Thread/thread_nd.c
@@ -42,7 +42,7 @@
 #include "eventOS_event.h"
 #include "common_functions.h"
 #include "socket_api.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan.h"
diff --git a/source/6LoWPAN/adaptation_interface.c b/source/6LoWPAN/adaptation_interface.c
@@ -24,7 +24,7 @@
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
 #include "Core/include/address.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "mac_api.h"
 #include "mac_mcps.h"
 #include "mac_common_defines.h"
diff --git a/source/Common_Protocols/icmpv6.c b/source/Common_Protocols/icmpv6.c
@@ -34,7 +34,7 @@
 #include "Common_Protocols/ip.h"
 #include "Common_Protocols/ipv6.h"
 #include "Common_Protocols/mld.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "ipv6_stack/protocol_ipv6.h"
 #include "ipv6_stack/ipv6_routing_table.h"
 #include "ip_fsc.h"
diff --git a/source/Common_Protocols/ipv6.c b/source/Common_Protocols/ipv6.c
@@ -23,7 +23,7 @@
 #include "ns_types.h"
 #include "string.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "ns_trace.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
diff --git a/source/Common_Protocols/ipv6_fragmentation.c b/source/Common_Protocols/ipv6_fragmentation.c
@@ -36,7 +36,7 @@
 #include "nsdynmemLIB.h"
 #include <string.h>
 #include "ns_trace.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ip.h"
 #include "Common_Protocols/ipv6.h"
diff --git a/source/Common_Protocols/ipv6_resolution.c b/source/Common_Protocols/ipv6_resolution.c
@@ -21,7 +21,7 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
 #include "Common_Protocols/icmpv6.h"
diff --git a/source/Common_Protocols/tcp.c b/source/Common_Protocols/tcp.c
@@ -20,7 +20,7 @@
 #include "ns_types.h"
 #include "ns_trace.h"
 #include "eventOS_event.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "nsdynmemLIB.h"
 #include "ip_fsc.h"
 #include "ns_sha256.h"
diff --git a/source/Common_Protocols/udp.c b/source/Common_Protocols/udp.c
@@ -25,7 +25,7 @@
 #include "Common_Protocols/ipv6_constants.h"
 #include "Common_Protocols/icmpv6.h"
 #include "Common_Protocols/udp.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "common_functions.h"
 
 #define TRACE_GROUP "udp"
diff --git a/source/Core/buffer_dyn.c b/source/Core/buffer_dyn.c
@@ -21,7 +21,7 @@
 #include "nsdynmemLIB.h"
 #include "Core/include/address.h"
 #include "Core/include/ns_buffer.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "ns_trace.h"
 #include "platform/arm_hal_interrupt.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
diff --git a/source/Core/include/ns_socket.h b/source/Core/include/ns_socket.h
diff --git a/source/Core/ns_socket.c b/source/Core/ns_socket.c
@@ -29,7 +29,7 @@
 #include "eventOS_event.h"
 #include "eventOS_scheduler.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "socket_api.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/tcp.h"
diff --git a/source/MLE/mle.c b/source/MLE/mle.c
@@ -23,7 +23,7 @@
 #include "eventOS_event.h"
 #include "eventOS_event_timer.h"
 #include "socket_api.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "nsdynmemLIB.h"
 #include "ns_trace.h"
 #include "string.h"
diff --git a/source/NWK_INTERFACE/protocol_core.c b/source/NWK_INTERFACE/protocol_core.c
@@ -23,7 +23,7 @@
 #include "eventOS_callback_timer.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "NWK_INTERFACE/Include/protocol_timer.h"
 #include "platform/arm_hal_interrupt.h"
diff --git a/source/Security/Common/security_lib.c b/source/Security/Common/security_lib.c
@@ -20,7 +20,7 @@
 #include "string.h"
 #include "eventOS_event.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "shalib.h"
 #include "randLIB.h"
diff --git a/source/Security/PANA/eap_protocol.c b/source/Security/PANA/eap_protocol.c
@@ -22,7 +22,7 @@
 #include "eventOS_event.h"
 #include "ns_trace.h"
 #include "string.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h"
diff --git a/source/Security/PANA/pana.c b/source/Security/PANA/pana.c
@@ -22,7 +22,7 @@
 #include "string.h"
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "ccmLIB.h"
 #include "shalib.h"
diff --git a/source/Security/PANA/pana_client.c b/source/Security/PANA/pana_client.c
@@ -23,7 +23,7 @@
 #include "string.h"
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "ccmLIB.h"
 #include "shalib.h"
diff --git a/source/Security/PANA/pana_server.c b/source/Security/PANA/pana_server.c
@@ -22,7 +22,7 @@
 #include "string.h"
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "ccmLIB.h"
 #include "shalib.h"
diff --git a/source/Security/TLS/tls_lib.c b/source/Security/TLS/tls_lib.c
@@ -25,7 +25,7 @@
 #include "ecc.h"
 #endif
 #include "randLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 //#include "6LoWPAN/Bootstraps/network_lib.h"
 #include "shalib.h"
 #include "Security/TLS/tls_lib.h"
diff --git a/source/Service_Libs/mle_service/mle_service.c b/source/Service_Libs/mle_service/mle_service.c
@@ -26,7 +26,7 @@
 #include "ns_list.h"
 #include "randLIB.h"
 #include "socket_api.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "net_interface.h"
 #include "common_functions.h"
 #include "Common_Protocols/ipv6_constants.h"
diff --git a/source/ipv6_stack/protocol_ipv6.c b/source/ipv6_stack/protocol_ipv6.c
@@ -20,7 +20,7 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
 #include "Common_Protocols/icmpv6.h"
diff --git a/source/libNET/src/ns_net.c b/source/libNET/src/ns_net.c
@@ -28,7 +28,7 @@
 #include "socket_api.h"
 #include "nsdynmemLIB.h"
 #include "NWK_INTERFACE/Include/protocol.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #ifdef HAVE_RPL
 #include "RPL/rpl_of0.h"
 #include "RPL/rpl_mrhof.h"
diff --git a/source/libNET/src/socket_api.c b/source/libNET/src/socket_api.c
@@ -33,7 +33,7 @@
 #include "ns_trace.h"
 #include "string.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6_constants.h"
 #include "Common_Protocols/ipv6_flow.h"
diff --git a/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.c b/test/nanostack/unittest/6LoWPAN/NVM/test_nwk_nvm.c
@@ -24,7 +24,7 @@
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
 #include "net_nvm_api.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "6LoWPAN/NVM/nwk_nvm.h"
diff --git a/test/nanostack/unittest/mle/mle/test_mle.c b/test/nanostack/unittest/mle/mle/test_mle.c
@@ -22,7 +22,7 @@
 #include "eventOS_event.h"
 #include "eventOS_event_timer.h"
 #include "socket_api.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "nsdynmemLIB.h"
 #include "ns_trace.h"
 #include "string.h"
diff --git a/test/nanostack/unittest/stub/6lowpan_iphc_stub.c b/test/nanostack/unittest/stub/6lowpan_iphc_stub.c
@@ -22,7 +22,7 @@
 #include "ns_types.h"
 #include "string.h"
 #include "ns_trace.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "Common_Protocols/ipv6.h"
 #include "Common_Protocols/icmpv6.h"
 #include "6LoWPAN/IPHC_Decode/cipv6.h"
diff --git a/test/nanostack/unittest/stub/adaptation_interface_stub.c b/test/nanostack/unittest/stub/adaptation_interface_stub.c
@@ -23,7 +23,7 @@
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
 #include "Core/include/address.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "randLIB.h"
 #include "mac_api.h"
 #include "mac_mcps.h"
diff --git a/test/nanostack/unittest/stub/buffer_dyn_stub.c b/test/nanostack/unittest/stub/buffer_dyn_stub.c
@@ -25,7 +25,7 @@
 #include "NWK_INTERFACE/Include/protocol_stats.h"
 #include "ip_fsc.h"
 #include "buffer_dyn_stub.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 
 buffer_dyn_stub_def buffer_dyn_stub;
 
diff --git a/test/nanostack/unittest/stub/cipv6_fragmenter_stub.c b/test/nanostack/unittest/stub/cipv6_fragmenter_stub.c
@@ -26,7 +26,7 @@
 #include "string.h"
 #include "ns_trace.h"
 #include "randLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/IPHC_Decode/cipv6.h"
 #include "6LoWPAN/Fragmentation/cipv6_fragmenter.h"
 #include "NWK_INTERFACE/Include/protocol.h"
diff --git a/test/nanostack/unittest/stub/eap_protocol_stub.c b/test/nanostack/unittest/stub/eap_protocol_stub.c
@@ -22,7 +22,7 @@
 #include "eventOS_event.h"
 #include "ns_trace.h"
 #include "string.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan.h"
 #include "6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h"
diff --git a/test/nanostack/unittest/stub/icmpv6_stub.c b/test/nanostack/unittest/stub/icmpv6_stub.c
@@ -30,7 +30,7 @@
 #include "Common_Protocols/icmpv6_radv.h"
 #include "Common_Protocols/ip.h"
 #include "Common_Protocols/ipv6.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "ipv6_stack/protocol_ipv6.h"
 #include "ip_fsc.h"
 #include "ipv6_stack/ipv6_routing_table.h"
diff --git a/test/nanostack/unittest/stub/ipv6_fragmentation_stub.c b/test/nanostack/unittest/stub/ipv6_fragmentation_stub.c
@@ -23,7 +23,7 @@
 #include "nsdynmemLIB.h"
 #include <string.h>
 #include "ns_trace.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ip.h"
 #include "Common_Protocols/ipv6.h"
diff --git a/test/nanostack/unittest/stub/ipv6_resolution_stub.c b/test/nanostack/unittest/stub/ipv6_resolution_stub.c
@@ -21,7 +21,7 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
 #include "Common_Protocols/icmpv6.h"
diff --git a/test/nanostack/unittest/stub/ipv6_stub.c b/test/nanostack/unittest/stub/ipv6_stub.c
@@ -23,7 +23,7 @@
 #include "ns_types.h"
 #include "string.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "ns_trace.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
diff --git a/test/nanostack/unittest/stub/mac_response_handler_stub.c b/test/nanostack/unittest/stub/mac_response_handler_stub.c
@@ -22,7 +22,7 @@
 #include "NWK_INTERFACE/Include/protocol_abstract.h"
 #include "Service_Libs/mle_service/mle_service_api.h"
 #include "Core/include/address.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/Thread/thread_common.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/MAC/mac_helper.h"
diff --git a/test/nanostack/unittest/stub/mesh_stub.c b/test/nanostack/unittest/stub/mesh_stub.c
@@ -23,7 +23,7 @@
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
 #include "6LoWPAN/IPHC_Decode/cipv6.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/Mesh/mesh.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "mesh_stub.h"
diff --git a/test/nanostack/unittest/stub/mle_service_stub.c b/test/nanostack/unittest/stub/mle_service_stub.c
@@ -26,7 +26,7 @@
 #include "ns_list.h"
 #include "randLIB.h"
 #include "socket_api.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "net_interface.h"
 #include "common_functions.h"
 #include "NWK_INTERFACE/Include/protocol.h" // just for protocol_core_monotonic_time
diff --git a/test/nanostack/unittest/stub/mle_stub.c b/test/nanostack/unittest/stub/mle_stub.c
@@ -24,7 +24,7 @@
 #include "eventOS_event.h"
 #include "eventOS_event_timer.h"
 #include "socket_api.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "nsdynmemLIB.h"
 #include "ns_trace.h"
 #include "string.h"
diff --git a/test/nanostack/unittest/stub/net_stub.c b/test/nanostack/unittest/stub/net_stub.c
@@ -26,7 +26,7 @@
 #include "string.h"
 #include "ns_trace.h"
 #include "socket_api.h"
-#include "socket.h"
+#include "ns_socket.h"
 #include "nsdynmemLIB.h"
 #include "mac_api.h"
 #include "NWK_INTERFACE/Include/protocol.h"
diff --git a/test/nanostack/unittest/stub/network_lib_stub.c b/test/nanostack/unittest/stub/network_lib_stub.c
diff --git a/test/nanostack/unittest/stub/nwk_nvm_stub.c b/test/nanostack/unittest/stub/nwk_nvm_stub.c
diff --git a/test/nanostack/unittest/stub/pana_client_stub.c b/test/nanostack/unittest/stub/pana_client_stub.c
diff --git a/test/nanostack/unittest/stub/pana_server_stub.c b/test/nanostack/unittest/stub/pana_server_stub.c
diff --git a/test/nanostack/unittest/stub/pana_stub.c b/test/nanostack/unittest/stub/pana_stub.c
diff --git a/test/nanostack/unittest/stub/protocol_6lowpan_stub.c b/test/nanostack/unittest/stub/protocol_6lowpan_stub.c
diff --git a/test/nanostack/unittest/stub/protocol_core_stub.c b/test/nanostack/unittest/stub/protocol_core_stub.c
diff --git a/test/nanostack/unittest/stub/protocol_ipv6_stub.c b/test/nanostack/unittest/stub/protocol_ipv6_stub.c
diff --git a/test/nanostack/unittest/stub/rf_driver_storage_stub.c b/test/nanostack/unittest/stub/rf_driver_storage_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/security_lib_stub.c b/test/nanostack/unittest/stub/security_lib_stub.c
diff --git a/test/nanostack/unittest/stub/socket_stub.c b/test/nanostack/unittest/stub/socket_stub.c
diff --git a/test/nanostack/unittest/stub/socket_stub.h b/test/nanostack/unittest/stub/socket_stub.h
diff --git a/test/nanostack/unittest/stub/tcp_stub.c b/test/nanostack/unittest/stub/tcp_stub.c
diff --git a/test/nanostack/unittest/stub/tcp_stub.h b/test/nanostack/unittest/stub/tcp_stub.h
diff --git a/test/nanostack/unittest/stub/thread_nd_stub.c b/test/nanostack/unittest/stub/thread_nd_stub.c
diff --git a/test/nanostack/unittest/stub/tls_lib_stub.c b/test/nanostack/unittest/stub/tls_lib_stub.c
diff --git a/test/nanostack/unittest/stub/udp_stub.c b/test/nanostack/unittest/stub/udp_stub.c
