Skip to content

Commit fc76d1e

Browse files
author
Arto Kinnunen
authored
Merge pull request ARMmbed#1963 from ARMmbed/rename_socket_h
Rename socket.h to ns_socket.h
2 parents ba3a649 + 048f14a commit fc76d1e

File tree

112 files changed

+122
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+122
-122
lines changed

‎source/6LoWPAN/Bootstraps/Generic/network_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "nsconfig.h"
1919
#include "ns_types.h"
2020
#include <string.h>
21-
#include "Core/include/socket.h"
21+
#include "Core/include/ns_socket.h"
2222
#include "nsdynmemLIB.h"
2323
#include "ns_trace.h"
2424
#include "NWK_INTERFACE/Include/protocol.h"

‎source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "eventOS_scheduler.h"
2323
#include "ns_trace.h"
2424
#include "nsdynmemLIB.h"
25-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_socket.h"
2626
#include "NWK_INTERFACE/Include/protocol.h"
2727
#include "Common_Protocols/udp.h"
2828
#include "Common_Protocols/ipv6.h"

‎source/6LoWPAN/Fragmentation/cipv6_fragmenter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "string.h"
2727
#include "ns_trace.h"
2828
#include "randLIB.h"
29-
#include "Core/include/socket.h"
29+
#include "Core/include/ns_socket.h"
3030
#include "6LoWPAN/IPHC_Decode/cipv6.h"
3131
#include "6LoWPAN/Fragmentation/cipv6_fragmenter.h"
3232
#include "NWK_INTERFACE/Include/protocol.h"

‎source/6LoWPAN/MAC/mac_helper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define MAC_HELPER_H
2020

2121
#include "mlme.h"
22-
#include "Core/include/address.h"
22+
#include "Core/include/ns_address_internal.h"
2323

2424
struct channel_list_s;
2525
struct nwk_scan_params;

‎source/6LoWPAN/MAC/mac_response_handler.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "NWK_INTERFACE/Include/protocol_abstract.h"
2323
#include "NWK_INTERFACE/Include/protocol_timer.h"
2424
#include "Service_Libs/mle_service/mle_service_api.h"
25-
#include "Core/include/address.h"
26-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_address_internal.h"
26+
#include "Core/include/ns_socket.h"
2727
#include "6LoWPAN/Thread/thread_common.h"
2828
#include "6LoWPAN/Thread/thread_management_internal.h"
2929
#include "6LoWPAN/MAC/mac_helper.h"

‎source/6LoWPAN/Mesh/mesh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "NWK_INTERFACE/Include/protocol.h"
3030
#include "NWK_INTERFACE/Include/protocol_stats.h"
3131
#include "6LoWPAN/IPHC_Decode/cipv6.h"
32-
#include "Core/include/socket.h"
32+
#include "Core/include/ns_socket.h"
3333
#include "6LoWPAN/Mesh/mesh.h"
3434
#include "6LoWPAN/MAC/mac_helper.h"
3535

‎source/6LoWPAN/ND/nd_defines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef ND_DEFINES_H_
1919
#define ND_DEFINES_H_
2020

21-
#include "Core/include/address.h"
21+
#include "Core/include/ns_address_internal.h"
2222
#include "ns_list.h"
2323
#include "6LoWPAN/IPHC_Decode/lowpan_context.h"
2424
#include "Common_Protocols/icmpv6_prefix.h"

‎source/6LoWPAN/NVM/nwk_nvm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "string.h"
2323
#include "randLIB.h"
2424
#include "nsdynmemLIB.h"
25-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_socket.h"
2626
#include "NWK_INTERFACE/Include/protocol.h"
2727
#include "6LoWPAN/MAC/mac_helper.h"
2828
#include "6LoWPAN/NVM/nwk_nvm.h"

‎source/6LoWPAN/Thread/thread_address_registration_client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#include "6LoWPAN/Thread/thread_management_client.h"
5050
#include "NWK_INTERFACE/Include/protocol.h"
5151
#include "Common_Protocols/ipv6.h"
52-
#include "Core/include/address.h"
52+
#include "Core/include/ns_address_internal.h"
5353
#include "6LoWPAN/MAC/mac_helper.h"
5454

5555
#ifdef HAVE_THREAD_V2

‎source/6LoWPAN/Thread/thread_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
#include "6LoWPAN/MAC/mac_pairwise_key.h"
8989
#include "6LoWPAN/MAC/mac_data_poll.h"
9090
#include "Service_Libs/etx/etx.h"
91-
#include "Core/include/address.h"
91+
#include "Core/include/ns_address_internal.h"
9292
#include "6LoWPAN/Thread/thread_nvm_store.h"
9393

9494
#define TRACE_GROUP "thrd"

‎source/6LoWPAN/Thread/thread_host_bootstrap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
#include "Service_Libs/blacklist/blacklist.h"
7474
#include "6LoWPAN/MAC/mac_helper.h"
7575
#include "6LoWPAN/MAC/mac_data_poll.h"
76-
#include "Core/include/address.h"
76+
#include "Core/include/ns_address_internal.h"
7777
#include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
7878

7979
#define TRACE_GROUP "tebs"

‎source/6LoWPAN/Thread/thread_management_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#include "mac_api.h"
6868
#include "6LoWPAN/MAC/mac_data_poll.h"
6969
#include "Common_Protocols/ipv6_constants.h"
70-
#include "Core/include/address.h"
70+
#include "Core/include/ns_address_internal.h"
7171
#include "mlme.h"
7272

7373
#ifdef HAVE_THREAD

‎source/6LoWPAN/Thread/thread_nd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include "eventOS_event.h"
4343
#include "common_functions.h"
4444
#include "socket_api.h"
45-
#include "Core/include/socket.h"
45+
#include "Core/include/ns_socket.h"
4646
#include "NWK_INTERFACE/Include/protocol.h"
4747
#include "Common_Protocols/ipv6.h"
4848
#include "6LoWPAN/Bootstraps/protocol_6lowpan.h"

‎source/6LoWPAN/Thread/thread_nvm_store.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
#include <string.h>
3737
#include <stdio.h>
38-
#include "Core/include/address.h"
38+
#include "Core/include/ns_address_internal.h"
3939
#include "ns_file_system.h"
4040
#include "thread_config.h"
4141
#include "thread_common.h"

‎source/6LoWPAN/Thread/thread_resolution_client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "ns_list.h"
3434
#include "ns_trace.h"
3535
#include "nsdynmemLIB.h"
36-
#include "Core/include/address.h"
36+
#include "Core/include/ns_address_internal.h"
3737
#include "thread_tmfcop_lib.h"
3838

3939
#include "coap_service_api.h"

‎source/6LoWPAN/Thread/thread_router_bootstrap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
#include "mac_api.h"
8484
#include "6LoWPAN/MAC/mac_data_poll.h"
8585
#include "thread_border_router_api.h"
86-
#include "Core/include/address.h"
86+
#include "Core/include/ns_address_internal.h"
8787
#include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
8888

8989
#ifdef HAVE_THREAD_ROUTER

‎source/6LoWPAN/adaptation_interface.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "ns_list.h"
2424
#include "randLIB.h"
2525
#include "nsdynmemLIB.h"
26-
#include "Core/include/address.h"
27-
#include "Core/include/socket.h"
26+
#include "Core/include/ns_address_internal.h"
27+
#include "Core/include/ns_socket.h"
2828
#include "mac_api.h"
2929
#include "mac_mcps.h"
3030
#include "mac_common_defines.h"

‎source/6LoWPAN/lowpan_adaptation_interface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#ifndef LOWPAN_ADAPTATION_INTERFACE_H_
1919
#define LOWPAN_ADAPTATION_INTERFACE_H_
20-
#include "Core/include/address.h"
20+
#include "Core/include/ns_address_internal.h"
2121

2222
struct protocol_interface_info_entry;
2323
struct mcps_data_conf_s;

‎source/Common_Protocols/icmpv6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "Common_Protocols/ip.h"
3535
#include "Common_Protocols/ipv6.h"
3636
#include "Common_Protocols/mld.h"
37-
#include "Core/include/socket.h"
37+
#include "Core/include/ns_socket.h"
3838
#include "ipv6_stack/protocol_ipv6.h"
3939
#include "ipv6_stack/ipv6_routing_table.h"
4040
#include "ip_fsc.h"

‎source/Common_Protocols/ipv6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "ns_types.h"
2424
#include "string.h"
2525
#include "nsdynmemLIB.h"
26-
#include "Core/include/socket.h"
26+
#include "Core/include/ns_socket.h"
2727
#include "ns_trace.h"
2828
#include "NWK_INTERFACE/Include/protocol.h"
2929
#include "NWK_INTERFACE/Include/protocol_stats.h"

‎source/Common_Protocols/ipv6_fragmentation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "nsdynmemLIB.h"
3737
#include <string.h>
3838
#include "ns_trace.h"
39-
#include "Core/include/socket.h"
39+
#include "Core/include/ns_socket.h"
4040
#include "NWK_INTERFACE/Include/protocol.h"
4141
#include "Common_Protocols/ip.h"
4242
#include "Common_Protocols/ipv6.h"

‎source/Common_Protocols/ipv6_resolution.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "ns_list.h"
2222
#include "ns_trace.h"
2323
#include "nsdynmemLIB.h"
24-
#include "Core/include/socket.h"
24+
#include "Core/include/ns_socket.h"
2525
#include "NWK_INTERFACE/Include/protocol.h"
2626
#include "Common_Protocols/ipv6.h"
2727
#include "Common_Protocols/icmpv6.h"

‎source/Common_Protocols/ipv6_resolution.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef IPV6_RESOLUTION_H_
2020
#define IPV6_RESOLUTION_H_
2121

22-
#include "Core/include/address.h"
22+
#include "Core/include/ns_address_internal.h"
2323

2424
struct ipv6_neighbour;
2525
struct ipv6_neighbour_cache;

‎source/Common_Protocols/tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "ns_types.h"
2121
#include "ns_trace.h"
2222
#include "eventOS_event.h"
23-
#include "Core/include/socket.h"
23+
#include "Core/include/ns_socket.h"
2424
#include "nsdynmemLIB.h"
2525
#include "ip_fsc.h"
2626
#include "ns_sha256.h"

‎source/Common_Protocols/udp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "Common_Protocols/ipv6_constants.h"
2626
#include "Common_Protocols/icmpv6.h"
2727
#include "Common_Protocols/udp.h"
28-
#include "Core/include/socket.h"
28+
#include "Core/include/ns_socket.h"
2929
#include "common_functions.h"
3030

3131
#define TRACE_GROUP "udp"

‎source/Core/buffer_dyn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#include "string.h"
2020
#include "ns_types.h"
2121
#include "nsdynmemLIB.h"
22-
#include "Core/include/address.h"
22+
#include "Core/include/ns_address_internal.h"
2323
#include "Core/include/ns_buffer.h"
24-
#include "Core/include/socket.h"
24+
#include "Core/include/ns_socket.h"
2525
#include "ns_trace.h"
2626
#include "platform/arm_hal_interrupt.h"
2727
#include "NWK_INTERFACE/Include/protocol_stats.h"

‎source/Core/include/address.h renamed to ‎source/Core/include/ns_address_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
/**
1818
*
19-
* \file address.h
19+
* \file ns_address_internal.h
2020
* \brief address type definitions.
2121
*
2222
* nanoStack: supported address types and associated data structures.

‎source/Core/include/ns_buffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#endif
3333

3434
#include "ns_types.h"
35-
#include "Core/include/address.h"
35+
#include "Core/include/ns_address_internal.h"
3636
#include "NWK_INTERFACE/Include/protocol_abstract.h"
3737
#include "ns_list.h"
3838
#include "ipv6_stack/ipv6_routing_table.h"

‎source/Core/include/socket.h renamed to ‎source/Core/include/ns_socket.h

File renamed without changes.

‎source/Core/address.c renamed to ‎source/Core/ns_address_internal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* limitations under the License.
1616
*/
1717
/**
18-
* \file address.c
19-
* \brief Utility functions concernig addresses
18+
* \file ns_address_internal.c
19+
* \brief Utility functions concerning addresses
2020
*
2121
* This file contains all the utility functions that can be used to
2222
* check, manipulate etc. addresses.

‎source/Core/ns_socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "eventOS_event.h"
3030
#include "eventOS_scheduler.h"
3131
#include "nsdynmemLIB.h"
32-
#include "Core/include/socket.h"
32+
#include "Core/include/ns_socket.h"
3333
#include "socket_api.h"
3434
#include "NWK_INTERFACE/Include/protocol.h"
3535
#include "Common_Protocols/tcp.h"

‎source/MLE/mle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "eventOS_event.h"
2424
#include "eventOS_event_timer.h"
2525
#include "socket_api.h"
26-
#include "Core/include/socket.h"
26+
#include "Core/include/ns_socket.h"
2727
#include "nsdynmemLIB.h"
2828
#include "ns_trace.h"
2929
#include "string.h"

‎source/MLE/mle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define MLE_H_
2020

2121
#include "nsconfig.h"
22-
#include "Core/include/address.h"
22+
#include "Core/include/ns_address_internal.h"
2323
#include "ns_list.h"
2424

2525
struct buffer;

‎source/NWK_INTERFACE/Include/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "NWK_INTERFACE/Include/protocol_abstract.h"
3434

3535
// Users of protocol.h can assume it includes these headers
36-
#include "Core/include/address.h"
36+
#include "Core/include/ns_address_internal.h"
3737
#include "Core/include/ns_buffer.h"
3838

3939
// Headers below this are implementation details - users of protocol.h shouldn't rely on them

‎source/NWK_INTERFACE/protocol_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "eventOS_callback_timer.h"
2424
#include "ns_trace.h"
2525
#include "nsdynmemLIB.h"
26-
#include "Core/include/socket.h"
26+
#include "Core/include/ns_socket.h"
2727
#include "NWK_INTERFACE/Include/protocol.h"
2828
#include "NWK_INTERFACE/Include/protocol_timer.h"
2929
#include "platform/arm_hal_interrupt.h"

‎source/RPL/rpl_policy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "net_interface.h"
2626

27-
#include "Core/include/address.h"
27+
#include "Core/include/ns_address_internal.h"
2828
#include "Service_Libs/etx/etx.h"
2929
#include "Common_Protocols/ipv6_resolution.h"
3030
#include "ipv6_stack/ipv6_routing_table.h"

‎source/RPL/rpl_policy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef RPL_POLICY_H_
1919
#define RPL_POLICY_H_
2020

21-
#include "Core/include/address.h"
21+
#include "Core/include/ns_address_internal.h"
2222
#include "rpl_control.h"
2323

2424
bool rpl_policy_join_instance(rpl_domain_t *domain, uint8_t instance_id, const uint8_t *dodagid);

‎source/RPL/rpl_upward.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
#include "net_interface.h"
4040

41-
#include "Core/include/address.h"
41+
#include "Core/include/ns_address_internal.h"
4242
#include "Common_Protocols/icmpv6.h"
4343
#include "Common_Protocols/icmpv6_prefix.h"
4444
#include "NWK_INTERFACE/Include/protocol_abstract.h"

‎source/Security/Common/security_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "string.h"
2121
#include "eventOS_event.h"
2222
#include "nsdynmemLIB.h"
23-
#include "Core/include/socket.h"
23+
#include "Core/include/ns_socket.h"
2424
#include "NWK_INTERFACE/Include/protocol.h"
2525
#include "shalib.h"
2626
#include "randLIB.h"

‎source/Security/PANA/eap_protocol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "eventOS_event.h"
2323
#include "ns_trace.h"
2424
#include "string.h"
25-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_socket.h"
2626
#include "NWK_INTERFACE/Include/protocol.h"
2727
#include "6LoWPAN/Bootstraps/protocol_6lowpan.h"
2828
#include "6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h"

‎source/Security/PANA/pana.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "string.h"
2323
#include "randLIB.h"
2424
#include "nsdynmemLIB.h"
25-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_socket.h"
2626
#include "NWK_INTERFACE/Include/protocol.h"
2727
#include "ccmLIB.h"
2828
#include "shalib.h"

‎source/Security/PANA/pana_client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "string.h"
2424
#include "randLIB.h"
2525
#include "nsdynmemLIB.h"
26-
#include "Core/include/socket.h"
26+
#include "Core/include/ns_socket.h"
2727
#include "NWK_INTERFACE/Include/protocol.h"
2828
#include "ccmLIB.h"
2929
#include "shalib.h"

‎source/Security/PANA/pana_server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "string.h"
2323
#include "randLIB.h"
2424
#include "nsdynmemLIB.h"
25-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_socket.h"
2626
#include "NWK_INTERFACE/Include/protocol.h"
2727
#include "ccmLIB.h"
2828
#include "shalib.h"

0 commit comments

Comments
 (0)