Skip to content

Commit 55c49cd

Browse files
jukkarnashif
jukkar
authored and
nashif
committed
net: Convert wifi drivers to use renamed network APIs
Rename network symbols in wifi drivers to use the renamed network APIs. Signed-off-by: Jukka Rissanen <[email protected]>
1 parent bf5af88 commit 55c49cd

File tree

17 files changed

+211
-206
lines changed

17 files changed

+211
-206
lines changed

‎drivers/wifi/esp32/src/esp_wifi_drv.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static esp_err_t eth_esp32_rx(void *buffer, uint16_t len, void *eb)
138138
return -EIO;
139139
}
140140

141-
pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface, len, AF_UNSPEC, 0, K_MSEC(100));
141+
pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface, len, NET_AF_UNSPEC, 0, K_MSEC(100));
142142
if (!pkt) {
143143
LOG_ERR("Failed to allocate net buffer");
144144
esp_wifi_internal_free_rx_buffer(eb);
@@ -185,7 +185,8 @@ static esp_err_t wifi_esp32_ap_iface_rx(void *buffer, uint16_t len, void *eb)
185185
return -EIO;
186186
}
187187

188-
pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface_ap, len, AF_UNSPEC, 0, K_MSEC(100));
188+
pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface_ap, len,
189+
NET_AF_UNSPEC, 0, K_MSEC(100));
189190
if (!pkt) {
190191
esp_wifi_internal_free_rx_buffer(eb);
191192
LOG_ERR("Failed to get net buffer");

‎drivers/wifi/esp_at/esp.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,8 @@ static void esp_dns_work(struct k_work *work)
516516
#if defined(ESP_MAX_DNS)
517517
struct esp_data *data = CONTAINER_OF(work, struct esp_data, dns_work);
518518
struct dns_resolve_context *dnsctx;
519-
struct sockaddr_in *addrs = data->dns_addresses;
520-
const struct sockaddr *dns_servers[ESP_MAX_DNS + 1] = {};
519+
struct net_sockaddr_in *addrs = data->dns_addresses;
520+
const struct net_sockaddr *dns_servers[ESP_MAX_DNS + 1] = {};
521521
int interfaces[ESP_MAX_DNS];
522522
size_t i;
523523
int err, ifindex;
@@ -528,7 +528,7 @@ static void esp_dns_work(struct k_work *work)
528528
if (!addrs[i].sin_addr.s_addr) {
529529
break;
530530
}
531-
dns_servers[i] = (struct sockaddr *) &addrs[i];
531+
dns_servers[i] = (struct net_sockaddr *) &addrs[i];
532532
interfaces[i] = ifindex;
533533
}
534534

@@ -550,7 +550,7 @@ MODEM_CMD_DEFINE(on_cmd_cipdns)
550550
#if defined(ESP_MAX_DNS)
551551
struct esp_data *dev = CONTAINER_OF(data, struct esp_data,
552552
cmd_handler_data);
553-
struct sockaddr_in *addrs = dev->dns_addresses;
553+
struct net_sockaddr_in *addrs = dev->dns_addresses;
554554
char **servers = (char **)argv + 1;
555555
size_t num_servers = argc - 1;
556556
size_t valid_servers = 0;
@@ -566,15 +566,15 @@ MODEM_CMD_DEFINE(on_cmd_cipdns)
566566
servers[i] = str_unquote(servers[i]);
567567
LOG_DBG("DNS[%zu]: %s", i, servers[i]);
568568

569-
err = net_addr_pton(AF_INET, servers[i], &addrs[i].sin_addr);
569+
err = net_addr_pton(NET_AF_INET, servers[i], &addrs[i].sin_addr);
570570
if (err) {
571571
LOG_ERR("Invalid DNS address: %s",
572572
servers[i]);
573573
addrs[i].sin_addr.s_addr = 0;
574574
break;
575575
}
576576

577-
addrs[i].sin_family = AF_INET;
577+
addrs[i].sin_family = NET_AF_INET;
578578
addrs[i].sin_port = htons(53);
579579

580580
valid_servers++;
@@ -663,11 +663,11 @@ MODEM_CMD_DEFINE(on_cmd_cipsta)
663663
ip = str_unquote(argv[1]);
664664

665665
if (!strcmp(argv[0], "ip")) {
666-
net_addr_pton(AF_INET, ip, &dev->ip);
666+
net_addr_pton(NET_AF_INET, ip, &dev->ip);
667667
} else if (!strcmp(argv[0], "gateway")) {
668-
net_addr_pton(AF_INET, ip, &dev->gw);
668+
net_addr_pton(NET_AF_INET, ip, &dev->gw);
669669
} else if (!strcmp(argv[0], "netmask")) {
670-
net_addr_pton(AF_INET, ip, &dev->nm);
670+
net_addr_pton(NET_AF_INET, ip, &dev->nm);
671671
} else {
672672
LOG_WRN("Unknown IP type %s", argv[0]);
673673
}
@@ -854,8 +854,8 @@ static int cmd_ipd_parse_hdr(struct esp_data *dev,
854854

855855
if (!ESP_PROTO_PASSIVE(esp_socket_ip_proto(*sock)) &&
856856
IS_ENABLED(CONFIG_WIFI_ESP_AT_CIPDINFO_USE)) {
857-
struct sockaddr_in *recv_addr =
858-
(struct sockaddr_in *) &(*sock)->context->remote;
857+
struct net_sockaddr_in *recv_addr =
858+
(struct net_sockaddr_in *) &(*sock)->context->remote;
859859
char *remote_ip;
860860
long port;
861861

@@ -883,14 +883,14 @@ static int cmd_ipd_parse_hdr(struct esp_data *dev,
883883
goto socket_unref;
884884
}
885885

886-
err = net_addr_pton(AF_INET, remote_ip, &recv_addr->sin_addr);
886+
err = net_addr_pton(NET_AF_INET, remote_ip, &recv_addr->sin_addr);
887887
if (err) {
888888
LOG_ERR("Invalid IP address");
889889
err = -EBADMSG;
890890
goto socket_unref;
891891
}
892892

893-
recv_addr->sin_family = AF_INET;
893+
recv_addr->sin_family = NET_AF_INET;
894894
recv_addr->sin_port = htons(port);
895895
}
896896

‎drivers/wifi/esp_at/esp.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ extern "C" {
5050
*/
5151
#if defined(CONFIG_WIFI_ESP_AT_PASSIVE_MODE)
5252
#if defined(CONFIG_WIFI_ESP_AT_VERSION_1_7)
53-
#define ESP_PROTO_PASSIVE(proto) (proto == IPPROTO_TCP)
53+
#define ESP_PROTO_PASSIVE(proto) (proto == NET_IPPROTO_TCP)
5454
#else
5555
#define ESP_PROTO_PASSIVE(proto) \
56-
(proto == IPPROTO_TCP || proto == IPPROTO_UDP)
56+
(proto == NET_IPPROTO_TCP || proto == NET_IPPROTO_UDP)
5757
#endif /* CONFIG_WIFI_ESP_AT_VERSION_1_7 */
5858
#else
5959
#define ESP_PROTO_PASSIVE(proto) 0
@@ -175,8 +175,8 @@ struct esp_socket {
175175
atomic_t flags;
176176

177177
/* socket info */
178-
struct sockaddr src;
179-
struct sockaddr dst;
178+
struct net_sockaddr src;
179+
struct net_sockaddr dst;
180180

181181
/* sem */
182182
union {
@@ -229,7 +229,7 @@ struct esp_data {
229229
struct in_addr nm;
230230
uint8_t mac_addr[6];
231231
#if defined(ESP_MAX_DNS)
232-
struct sockaddr_in dns_addresses[ESP_MAX_DNS];
232+
struct net_sockaddr_in dns_addresses[ESP_MAX_DNS];
233233
#endif
234234

235235
/* modem context */

‎drivers/wifi/esp_at/esp_offload.c‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock)
3737
2 * NET_IPV4_ADDR_LEN)];
3838
char dst_addr_str[NET_IPV4_ADDR_LEN];
3939
char src_addr_str[NET_IPV4_ADDR_LEN];
40-
struct sockaddr src;
41-
struct sockaddr dst;
40+
struct net_sockaddr src;
41+
struct net_sockaddr dst;
4242
int ret;
4343
int mode;
4444

@@ -51,21 +51,21 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock)
5151
dst = sock->dst;
5252
k_mutex_unlock(&sock->lock);
5353

54-
if (dst.sa_family == AF_INET) {
54+
if (dst.sa_family == NET_AF_INET) {
5555
net_addr_ntop(dst.sa_family,
5656
&net_sin(&dst)->sin_addr,
5757
dst_addr_str, sizeof(dst_addr_str));
5858
} else {
5959
strcpy(dst_addr_str, "0.0.0.0");
6060
}
6161

62-
if (esp_socket_ip_proto(sock) == IPPROTO_TCP) {
62+
if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) {
6363
snprintk(connect_msg, sizeof(connect_msg),
6464
"AT+CIPSTART=%d,\"TCP\",\"%s\",%d,7200",
6565
sock->link_id, dst_addr_str,
66-
ntohs(net_sin(&dst)->sin_port));
66+
net_ntohs(net_sin(&dst)->sin_port));
6767
} else {
68-
if (src.sa_family == AF_INET && net_sin(&src)->sin_port != 0) {
68+
if (src.sa_family == NET_AF_INET && net_sin(&src)->sin_port != 0) {
6969
net_addr_ntop(src.sa_family,
7070
&net_sin(&src)->sin_addr,
7171
src_addr_str, sizeof(src_addr_str));
@@ -87,7 +87,7 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock)
8787
* to 2.
8888
*/
8989
if ((net_sin(&dst)->sin_addr.s_addr == 0) &&
90-
(ntohs(net_sin(&dst)->sin_port) == 0)) {
90+
(net_ntohs(net_sin(&dst)->sin_port) == 0)) {
9191
mode = 2;
9292
/* Port 0 is reserved and a valid port needs to be provided when
9393
* connecting.
@@ -100,24 +100,25 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock)
100100
snprintk(connect_msg, sizeof(connect_msg),
101101
"AT+CIPSTART=%d,\"UDP\",\"%s\",%d,%d,%d,\"%s\"",
102102
sock->link_id, dst_addr_str,
103-
ntohs(net_sin(&dst)->sin_port), ntohs(net_sin(&src)->sin_port),
103+
net_ntohs(net_sin(&dst)->sin_port),
104+
net_ntohs(net_sin(&src)->sin_port),
104105
mode, src_addr_str);
105106
} else {
106107
snprintk(connect_msg, sizeof(connect_msg),
107108
"AT+CIPSTART=%d,\"UDP\",\"%s\",%d",
108109
sock->link_id, dst_addr_str,
109-
ntohs(net_sin(&dst)->sin_port));
110+
net_ntohs(net_sin(&dst)->sin_port));
110111
}
111112
}
112113

113114
LOG_DBG("link %d, ip_proto %s, addr %s", sock->link_id,
114-
esp_socket_ip_proto(sock) == IPPROTO_TCP ? "TCP" : "UDP",
115+
esp_socket_ip_proto(sock) == NET_IPPROTO_TCP ? "TCP" : "UDP",
115116
dst_addr_str);
116117

117118
ret = esp_cmd_send(dev, NULL, 0, connect_msg, ESP_CMD_TIMEOUT);
118119
if (ret == 0) {
119120
esp_socket_flags_set(sock, ESP_SOCK_CONNECTED);
120-
if (esp_socket_type(sock) == SOCK_STREAM) {
121+
if (esp_socket_type(sock) == NET_SOCK_STREAM) {
121122
net_context_set_state(sock->context,
122123
NET_CONTEXT_CONNECTED);
123124
}
@@ -149,7 +150,7 @@ void esp_connect_work(struct k_work *work)
149150
k_mutex_unlock(&sock->lock);
150151
}
151152

152-
static int esp_bind(struct net_context *context, const struct sockaddr *addr,
153+
static int esp_bind(struct net_context *context, const struct net_sockaddr *addr,
153154
socklen_t addrlen)
154155
{
155156
struct esp_socket *sock;
@@ -158,11 +159,11 @@ static int esp_bind(struct net_context *context, const struct sockaddr *addr,
158159
sock = (struct esp_socket *)context->offload_context;
159160
dev = esp_socket_to_dev(sock);
160161

161-
if (esp_socket_ip_proto(sock) == IPPROTO_TCP) {
162+
if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) {
162163
return 0;
163164
}
164165

165-
if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) {
166+
if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) {
166167
LOG_DBG("link %d", sock->link_id);
167168

168169
if (esp_socket_connected(sock)) {
@@ -180,7 +181,7 @@ static int esp_bind(struct net_context *context, const struct sockaddr *addr,
180181
}
181182

182183
static int esp_connect(struct net_context *context,
183-
const struct sockaddr *addr,
184+
const struct net_sockaddr *addr,
184185
socklen_t addrlen,
185186
net_context_connect_cb_t cb,
186187
int32_t timeout,
@@ -195,7 +196,7 @@ static int esp_connect(struct net_context *context,
195196

196197
LOG_DBG("link %d, timeout %d", sock->link_id, timeout);
197198

198-
if (!IS_ENABLED(CONFIG_NET_IPV4) || addr->sa_family != AF_INET) {
199+
if (!IS_ENABLED(CONFIG_NET_IPV4) || addr->sa_family != NET_AF_INET) {
199200
return -EAFNOSUPPORT;
200201
}
201202

@@ -275,7 +276,7 @@ static int _sock_send(struct esp_socket *sock, struct net_pkt *pkt)
275276
MODEM_CMD("SEND OK", on_cmd_send_ok, 0U, ""),
276277
MODEM_CMD("SEND FAIL", on_cmd_send_fail, 0U, ""),
277278
};
278-
struct sockaddr dst;
279+
struct net_sockaddr dst;
279280

280281
if (!esp_flags_are_set(dev, EDF_STA_CONNECTED | EDF_AP_ENABLED)) {
281282
return -ENETUNREACH;
@@ -285,7 +286,7 @@ static int _sock_send(struct esp_socket *sock, struct net_pkt *pkt)
285286

286287
LOG_DBG("link %d, len %d", sock->link_id, pkt_len);
287288

288-
if (esp_socket_ip_proto(sock) == IPPROTO_TCP) {
289+
if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) {
289290
snprintk(cmd_buf, sizeof(cmd_buf),
290291
"AT+CIPSEND=%d,%d", sock->link_id, pkt_len);
291292
} else {
@@ -299,7 +300,7 @@ static int _sock_send(struct esp_socket *sock, struct net_pkt *pkt)
299300
snprintk(cmd_buf, sizeof(cmd_buf),
300301
"AT+CIPSEND=%d,%d,\"%s\",%d",
301302
sock->link_id, pkt_len, addr_str,
302-
ntohs(net_sin(&dst)->sin_port));
303+
net_ntohs(net_sin(&dst)->sin_port));
303304
}
304305

305306
k_sem_take(&dev->cmd_handler_data.sem_tx_lock, K_FOREVER);
@@ -333,7 +334,7 @@ static int _sock_send(struct esp_socket *sock, struct net_pkt *pkt)
333334
}
334335

335336
/* Wait for 'SEND OK' or 'SEND FAIL' */
336-
if (esp_socket_ip_proto(sock) == IPPROTO_TCP) {
337+
if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) {
337338
ret = k_sem_take(&dev->sem_response, TCP_SEND_TIMEOUT);
338339
} else {
339340
ret = k_sem_take(&dev->sem_response, ESP_CMD_TIMEOUT);
@@ -392,7 +393,7 @@ static int esp_socket_send_one_pkt(struct esp_socket *sock)
392393
* more to this socket, as there will be a hole in the data
393394
* stream, which application layer is not expecting.
394395
*/
395-
if (esp_socket_type(sock) == SOCK_STREAM) {
396+
if (esp_socket_type(sock) == NET_SOCK_STREAM) {
396397
if (!esp_socket_flags_test_and_set(sock,
397398
ESP_SOCK_CLOSE_PENDING)) {
398399
esp_socket_work_submit(sock, &sock->close_work);
@@ -420,7 +421,7 @@ void esp_send_work(struct k_work *work)
420421
}
421422

422423
static int esp_sendto(struct net_pkt *pkt,
423-
const struct sockaddr *dst_addr,
424+
const struct net_sockaddr *dst_addr,
424425
socklen_t addrlen,
425426
net_context_send_cb_t cb,
426427
int32_t timeout,
@@ -441,7 +442,7 @@ static int esp_sendto(struct net_pkt *pkt,
441442
return -ENETUNREACH;
442443
}
443444

444-
if (esp_socket_type(sock) == SOCK_STREAM) {
445+
if (esp_socket_type(sock) == NET_SOCK_STREAM) {
445446
atomic_val_t flags = esp_socket_flags(sock);
446447

447448
if (!(flags & ESP_SOCK_CONNECTED) ||
@@ -463,7 +464,7 @@ static int esp_sendto(struct net_pkt *pkt,
463464
if (ret < 0) {
464465
return ret;
465466
}
466-
} else if (esp_socket_type(sock) == SOCK_DGRAM) {
467+
} else if (esp_socket_type(sock) == NET_SOCK_DGRAM) {
467468
memcpy(&sock->dst, dst_addr, addrlen);
468469
}
469470
}
@@ -583,11 +584,11 @@ MODEM_CMD_DIRECT_DEFINE(on_cmd_ciprecvdata)
583584
}
584585

585586
#if defined(CONFIG_WIFI_ESP_AT_CIPDINFO_USE) && !defined(CONFIG_WIFI_ESP_AT_VERSION_1_7)
586-
struct sockaddr_in *recv_addr =
587-
(struct sockaddr_in *) &sock->context->remote;
587+
struct net_sockaddr_in *recv_addr =
588+
(struct net_sockaddr_in *) &sock->context->remote;
588589

589-
recv_addr->sin_port = htons(port);
590-
recv_addr->sin_family = AF_INET;
590+
recv_addr->sin_port = net_htons(port);
591+
recv_addr->sin_family = NET_AF_INET;
591592

592593
/* IP addr comes within quotation marks, which is disliked by
593594
* conv function. So we remove them by subtraction 2 from
@@ -601,7 +602,7 @@ MODEM_CMD_DIRECT_DEFINE(on_cmd_ciprecvdata)
601602
strncpy(remote_ip_addr, &raw_remote_ip[1], remote_ip_str_len);
602603
remote_ip_addr[remote_ip_str_len] = '\0';
603604

604-
if (net_addr_pton(AF_INET, remote_ip_addr, &recv_addr->sin_addr) < 0) {
605+
if (net_addr_pton(NET_AF_INET, remote_ip_addr, &recv_addr->sin_addr) < 0) {
605606
LOG_ERR("Invalid src addr %s", remote_ip_addr);
606607
err = -EIO;
607608
goto socket_unref;
@@ -686,8 +687,8 @@ static int esp_recv(struct net_context *context,
686687
* traffic can be received.
687688
*/
688689
if (!esp_socket_connected(sock) &&
689-
esp_socket_ip_proto(sock) == IPPROTO_UDP &&
690-
sock->src.sa_family == AF_INET &&
690+
esp_socket_ip_proto(sock) == NET_IPPROTO_UDP &&
691+
sock->src.sa_family == NET_AF_INET &&
691692
net_sin(&sock->src)->sin_port != 0) {
692693
_sock_connect(dev, sock);
693694
}
@@ -757,7 +758,7 @@ static int esp_get(sa_family_t family,
757758

758759
LOG_DBG("");
759760

760-
if (family != AF_INET) {
761+
if (family != NET_AF_INET) {
761762
return -EAFNOSUPPORT;
762763
}
763764

‎drivers/wifi/esp_at/esp_socket.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static struct net_pkt *esp_socket_prepare_pkt(struct esp_socket *sock,
114114
struct net_pkt *pkt;
115115
size_t to_copy;
116116

117-
pkt = net_pkt_rx_alloc_with_buffer(data->net_iface, len, AF_UNSPEC,
117+
pkt = net_pkt_rx_alloc_with_buffer(data->net_iface, len, NET_AF_UNSPEC,
118118
0, RX_NET_PKT_ALLOC_TIMEOUT);
119119
if (!pkt) {
120120
return NULL;

‎drivers/wifi/esp_hosted/esp_hosted_wifi.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ static int esp_hosted_recv(struct net_if *iface, void *buf, size_t len)
430430
return 0;
431431
}
432432

433-
pkt = net_pkt_rx_alloc_with_buffer(iface, len, AF_UNSPEC, 0, K_MSEC(1000));
433+
pkt = net_pkt_rx_alloc_with_buffer(iface, len, NET_AF_UNSPEC, 0, K_MSEC(1000));
434434
if (pkt == NULL) {
435435
LOG_ERR("Failed to allocate net buffer");
436436
return -ENOMEM;

0 commit comments

Comments
 (0)