Skip to content

Commit d313ea8

Browse files
Cristib05Cristib05
committed
openthread: platform: Refactor after network namespace change
This commit aims to refactor the application code after network namespace symbols have been changed zephyrproject-rtos#99169 Signed-off-by: Cristian Bulacu <cristian.bulacu@nxp.com>
1 parent 3daddb8 commit d313ea8

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎modules/openthread/platform/dhcp6_pd.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ void otPlatInfraIfDhcp6PdClientSend(otInstance *aInstance,
6363
VerifyOrExit(dhcpv6_pd_client_sock != -1 && aInfraIfIndex == ail_iface_idx);
6464
uint16_t length = otMessageGetLength(aMessage);
6565
struct net_sockaddr_in6 dest_sock_addr = {.sin6_family = NET_AF_INET6,
66-
.sin6_port = net_htons(DHCPV6_SERVER_PORT),
67-
.sin6_addr = NET_IN6ADDR_ANY_INIT,
68-
.sin6_scope_id = 0};
66+
.sin6_port = net_htons(DHCPV6_SERVER_PORT),
67+
.sin6_addr = NET_IN6ADDR_ANY_INIT,
68+
.sin6_scope_id = 0};
6969

7070
memcpy(&dest_sock_addr.sin6_addr, aDestAddress, sizeof(otIp6Address));
7171

@@ -116,9 +116,9 @@ static void dhcpv6_pd_client_socket_init(uint32_t infra_if_index)
116116
int hop_limit = 255;
117117
int on = 1;
118118
struct net_sockaddr_in6 addr = {.sin6_family = NET_AF_INET6,
119-
.sin6_port = net_htons(DHCPV6_CLIENT_PORT),
120-
.sin6_addr = NET_IN6ADDR_ANY_INIT,
121-
.sin6_scope_id = 0};
119+
.sin6_port = net_htons(DHCPV6_CLIENT_PORT),
120+
.sin6_addr = NET_IN6ADDR_ANY_INIT,
121+
.sin6_scope_id = 0};
122122

123123
dhcpv6_pd_client_sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP);
124124
VerifyOrExit(dhcpv6_pd_client_sock >= 0);

‎modules/openthread/platform/infra_if.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,14 @@ void infra_if_stop_icmp6_listener(void)
280280
otError infra_if_nat64_init(void)
281281
{
282282
otError error = OT_ERROR_NONE;
283-
struct sockaddr_in anyaddr = {.sin_family = AF_INET,
284-
.sin_port = 0,
285-
.sin_addr = INADDR_ANY_INIT};
283+
struct net_sockaddr_in anyaddr = {.sin_family = NET_AF_INET,
284+
.sin_port = 0,
285+
.sin_addr = NET_INADDR_ANY_INIT};
286286

287-
raw_infra_if_sock = zsock_socket(AF_INET, SOCK_RAW, IPPROTO_IP);
287+
raw_infra_if_sock = zsock_socket(NET_AF_INET, NET_SOCK_RAW, NET_IPPROTO_IP);
288288
VerifyOrExit(raw_infra_if_sock >= 0, error = OT_ERROR_FAILED);
289-
VerifyOrExit(zsock_bind(raw_infra_if_sock, (struct sockaddr *)&anyaddr,
290-
sizeof(struct sockaddr_in)) == 0,
289+
VerifyOrExit(zsock_bind(raw_infra_if_sock, (struct net_sockaddr *)&anyaddr,
290+
sizeof(struct net_sockaddr_in)) == 0,
291291
error = OT_ERROR_FAILED);
292292

293293
sockfd_raw[0].fd = raw_infra_if_sock;
@@ -315,7 +315,7 @@ static void raw_receive_handler(struct net_socket_service_event *evt)
315315
len = zsock_recv(raw_infra_if_sock, req->buffer, sizeof(req->buffer), 0);
316316
VerifyOrExit(len >= 0, error = OT_ERROR_FAILED);
317317

318-
ot_pkt = net_pkt_alloc_with_buffer(ail_iface_ptr, len, AF_INET, 0, K_NO_WAIT);
318+
ot_pkt = net_pkt_alloc_with_buffer(ail_iface_ptr, len, NET_AF_INET, 0, K_NO_WAIT);
319319
VerifyOrExit(ot_pkt != NULL, error = OT_ERROR_FAILED);
320320

321321
VerifyOrExit(net_pkt_write(ot_pkt, req->buffer, len) == 0, error = OT_ERROR_FAILED);

‎modules/openthread/platform/mdns_socket.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ static otError mdns_socket_init_v6(uint32_t ail_iface_idx)
110110
int on = 1;
111111

112112
struct net_sockaddr_in6 addr = {.sin6_family = NET_AF_INET6,
113-
.sin6_port = net_htons(MULTICAST_PORT),
114-
.sin6_addr = {{{0}}},
115-
.sin6_scope_id = 0};
113+
.sin6_port = net_htons(MULTICAST_PORT),
114+
.sin6_addr = {{{0}}},
115+
.sin6_scope_id = 0};
116116

117-
mdns_sock_v6 = zsock_socket(NET_AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
117+
mdns_sock_v6 = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP);
118118
VerifyOrExit(mdns_sock_v6 >= 0, error = OT_ERROR_FAILED);
119119
VerifyOrExit(net_if_get_name(net_if_get_by_index(ail_iface_idx), name,
120120
CONFIG_NET_INTERFACE_NAME_LEN) > 0,
@@ -174,8 +174,8 @@ static otError mdns_socket_init_v4(uint32_t ail_iface_idx)
174174
int on = 1;
175175

176176
struct net_sockaddr_in addr = {.sin_family = NET_AF_INET,
177-
.sin_port = net_htons(MULTICAST_PORT),
178-
.sin_addr = {{{0}}}};
177+
.sin_port = net_htons(MULTICAST_PORT),
178+
.sin_addr = {{{0}}}};
179179

180180
mdns_sock_v4 = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP);
181181
VerifyOrExit(mdns_sock_v4 >= 0, error = OT_ERROR_FAILED);
@@ -250,13 +250,13 @@ static void mdns_send_multicast(otMessage *message, uint32_t ail_iface_idx)
250250
uint16_t length = otMessageGetLength(message);
251251
struct otbr_msg_ctx *req = NULL;
252252
struct net_sockaddr_in6 addr_v6 = {.sin6_family = NET_AF_INET6,
253-
.sin6_port = net_htons(MULTICAST_PORT),
254-
.sin6_addr = NET_IN6ADDR_ANY_INIT,
255-
.sin6_scope_id = 0};
253+
.sin6_port = net_htons(MULTICAST_PORT),
254+
.sin6_addr = NET_IN6ADDR_ANY_INIT,
255+
.sin6_scope_id = 0};
256256
#if defined(CONFIG_NET_IPV4)
257257
struct net_sockaddr_in addr_v4 = {.sin_family = NET_AF_INET,
258-
.sin_port = net_htons(MULTICAST_PORT),
259-
.sin_addr = NET_INADDR_ANY_INIT};
258+
.sin_port = net_htons(MULTICAST_PORT),
259+
.sin_addr = NET_INADDR_ANY_INIT};
260260
#endif /* CONFIG_NET_IPV4*/
261261

262262
VerifyOrExit(length <= OTBR_MESSAGE_SIZE);
@@ -271,11 +271,11 @@ static void mdns_send_multicast(otMessage *message, uint32_t ail_iface_idx)
271271

272272
VerifyOrExit(zsock_sendto(mdns_sock_v6, req->buffer, length, 0,
273273
(struct net_sockaddr *)&addr_v6,
274-
sizeof(addr_v6)) > 0);
274+
sizeof(addr_v6)) > 0);
275275
#if defined(CONFIG_NET_IPV4)
276276
VerifyOrExit(zsock_sendto(mdns_sock_v4, req->buffer, length, 0,
277277
(struct net_sockaddr *)&addr_v4,
278-
sizeof(addr_v4)) > 0);
278+
sizeof(addr_v4)) > 0);
279279
#endif /* CONFIG_NET_IPV4 */
280280
exit:
281281
otMessageFree(message);
@@ -294,9 +294,9 @@ static void mdns_send_unicast(otMessage *message, const otPlatMdnsAddressInfo *a
294294
struct net_sockaddr_in addr_v4 = {0};
295295
#endif /* CONFIG_NET_IPV4*/
296296
struct net_sockaddr_in6 addr_v6 = {.sin6_family = NET_AF_INET6,
297-
.sin6_port = net_htons(aAddress->mPort),
298-
.sin6_addr = NET_IN6ADDR_ANY_INIT,
299-
.sin6_scope_id = 0};
297+
.sin6_port = net_htons(aAddress->mPort),
298+
.sin6_addr = NET_IN6ADDR_ANY_INIT,
299+
.sin6_scope_id = 0};
300300

301301
VerifyOrExit(length <= OTBR_MESSAGE_SIZE);
302302
VerifyOrExit(openthread_border_router_allocate_message((void **)&req) == OT_ERROR_NONE);
@@ -314,7 +314,7 @@ static void mdns_send_unicast(otMessage *message, const otPlatMdnsAddressInfo *a
314314

315315
VerifyOrExit(zsock_sendto(mdns_sock_v6, req->buffer, length, 0,
316316
(struct net_sockaddr *)&addr_v6,
317-
sizeof(addr_v6)) > 0);
317+
sizeof(addr_v6)) > 0);
318318
#if defined(CONFIG_NET_IPV4)
319319
if (send_ipv4) {
320320
VerifyOrExit(zsock_sendto(mdns_sock_v4, req->buffer, length, 0,
@@ -349,7 +349,7 @@ static void mdns_receive_handler(struct net_socket_service_event *evt)
349349
if (family == NET_AF_INET) {
350350
addrlen = sizeof(addr_v4);
351351
len = zsock_recvfrom(mdns_sock_v4, req->buffer, sizeof(req->buffer), 0,
352-
(struct net_sockaddr *)&addr_v4, &addrlen);
352+
(struct net_sockaddr *)&addr_v4, &addrlen);
353353
VerifyOrExit(len > 0);
354354
otIp4ToIp4MappedIp6Address((otIp4Address *)&addr_v4.sin_addr.s_addr,
355355
&req->addr_info.mAddress);
@@ -358,7 +358,7 @@ static void mdns_receive_handler(struct net_socket_service_event *evt)
358358
#endif /* CONFIG_NET_IPV4 */
359359
addrlen = sizeof(addr_v6);
360360
len = zsock_recvfrom(mdns_sock_v6, req->buffer, sizeof(req->buffer), 0,
361-
(struct net_sockaddr *)&addr_v6, &addrlen);
361+
(struct net_sockaddr *)&addr_v6, &addrlen);
362362
VerifyOrExit(len > 0);
363363
memcpy(&req->addr_info.mAddress, &addr_v6.sin6_addr,
364364
sizeof(req->addr_info.mAddress));

‎modules/openthread/platform/trel.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(trel_udp_service, trel_receive_handler, MA
3030
void otPlatTrelEnable(otInstance *aInstance, uint16_t *aUdpPort)
3131
{
3232
struct net_sockaddr_in6 addr = {.sin6_family = NET_AF_INET6,
33-
.sin6_port = 0,
34-
.sin6_addr = NET_IN6ADDR_ANY_INIT,
35-
.sin6_scope_id = 0};
33+
.sin6_port = 0,
34+
.sin6_addr = NET_IN6ADDR_ANY_INIT,
35+
.sin6_scope_id = 0};
3636
net_socklen_t len = sizeof(addr);
3737

3838
trel_sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP);
@@ -75,15 +75,15 @@ void otPlatTrelSend(otInstance *aInstance, const uint8_t *aUdpPayload, uint16_t
7575
VerifyOrExit(trel_is_enabled);
7676

7777
struct net_sockaddr_in6 dest_sock_addr = {.sin6_family = NET_AF_INET6,
78-
.sin6_port = net_htons(aDestSockAddr->mPort),
79-
.sin6_addr = {{{0}}},
80-
.sin6_scope_id = 0};
78+
.sin6_port = net_htons(aDestSockAddr->mPort),
79+
.sin6_addr = {{{0}}},
80+
.sin6_scope_id = 0};
8181

8282
memcpy(&dest_sock_addr.sin6_addr, &aDestSockAddr->mAddress, sizeof(otIp6Address));
8383

8484
if (zsock_sendto(trel_sock, aUdpPayload, aUdpPayloadLen, 0,
85-
(struct net_sockaddr *)&dest_sock_addr,
86-
sizeof(dest_sock_addr)) == aUdpPayloadLen) {
85+
(struct net_sockaddr *)&dest_sock_addr,
86+
sizeof(dest_sock_addr)) == aUdpPayloadLen) {
8787
trel_counters.mTxBytes += aUdpPayloadLen;
8888
trel_counters.mTxPackets++;
8989
} else {
@@ -119,7 +119,7 @@ static void trel_receive_handler(struct net_socket_service_event *evt)
119119
VerifyOrExit(openthread_border_router_allocate_message((void **)&req) == OT_ERROR_NONE);
120120

121121
len = zsock_recvfrom(trel_sock, req->buffer, sizeof(req->buffer), 0,
122-
(struct net_sockaddr *)&addr, &addrlen);
122+
(struct net_sockaddr *)&addr, &addrlen);
123123
VerifyOrExit(len > 0);
124124

125125
trel_counters.mRxBytes += len;

0 commit comments

Comments
 (0)