diff --git a/doc/connectivity/networking/api/coap_client.rst b/doc/connectivity/networking/api/coap_client.rst index ae90eac7ac4e1..eee33a89fc8dd 100644 --- a/doc/connectivity/networking/api/coap_client.rst +++ b/doc/connectivity/networking/api/coap_client.rst @@ -37,7 +37,7 @@ The following is an example of a CoAP client initialization and request sending: req.payload = NULL; req.len = 0; - /* Sock is a file descriptor referencing a socket, address is the sockaddr struct for the + /* Sock is a file descriptor referencing a socket, address is the net_sockaddr struct for the * destination address of the request or NULL if the socket is already connected. */ ret = coap_client_req(&client, sock, &address, &req, -1); diff --git a/doc/connectivity/networking/api/coap_server.rst b/doc/connectivity/networking/api/coap_server.rst index 971e89bab4d50..ce4ec4d36339a 100644 --- a/doc/connectivity/networking/api/coap_server.rst +++ b/doc/connectivity/networking/api/coap_server.rst @@ -74,7 +74,7 @@ The following is an example of a CoAP resource registered with our service: #include static int my_get(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, socklen_t addr_len) { static const char *msg = "Hello, world!"; uint8_t data[CONFIG_COAP_SERVER_MESSAGE_SIZE]; @@ -106,7 +106,7 @@ The following is an example of a CoAP resource registered with our service: } static int my_put(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, socklen_t addr_len) { /* ... Handle the incoming request ... */ @@ -142,7 +142,7 @@ of CoAP services. An example using a temperature sensor can look like: K_WORK_DELAYABLE_DEFINE(temp_work, notify_observers); static int send_temperature(struct coap_resource *resource, - const struct sockaddr *addr, socklen_t addr_len, + const struct net_sockaddr *addr, socklen_t addr_len, uint16_t age, uint16_t id, const uint8_t *token, uint8_t tkl, bool is_response) { @@ -187,7 +187,7 @@ of CoAP services. An example using a temperature sensor can look like: } static int temp_get(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, socklen_t addr_len) { uint8_t token[COAP_TOKEN_MAX_LEN]; uint16_t id; diff --git a/doc/connectivity/networking/api/dns_resolve.rst b/doc/connectivity/networking/api/dns_resolve.rst index 605a26a1f4fd2..43a370e40677d 100644 --- a/doc/connectivity/networking/api/dns_resolve.rst +++ b/doc/connectivity/networking/api/dns_resolve.rst @@ -59,12 +59,12 @@ Example: if (status == DNS_EAI_INPROGRESS && info) { char str[MAX_STR_LEN + 1]; - if (info->ai_family == AF_INET) { - net_addr_ntop(AF_INET, + if (info->ai_family == NET_AF_INET) { + net_addr_ntop(NET_AF_INET, &net_sin(&info->ai_addr)->sin_addr, str, NET_IPV4_ADDR_LEN); - } else if (info->ai_family == AF_INET6) { - net_addr_ntop(AF_INET6, + } else if (info->ai_family == NET_AF_INET6) { + net_addr_ntop(NET_AF_INET6, &net_sin6(&info->ai_addr)->sin6_addr, str, NET_IPV6_ADDR_LEN); } else if (info->ai_family == AF_LOCAL) { diff --git a/doc/connectivity/networking/api/http_server.rst b/doc/connectivity/networking/api/http_server.rst index 0e16f08003bd4..40fe09f0ee18f 100644 --- a/doc/connectivity/networking/api/http_server.rst +++ b/doc/connectivity/networking/api/http_server.rst @@ -166,8 +166,8 @@ To use custom socket creation: The custom socket creation function receives: - ``svc``: Pointer to the service descriptor -- ``af``: Address family (AF_INET or AF_INET6) -- ``proto``: Protocol (IPPROTO_TCP or IPPROTO_TLS_1_2 for HTTPS) +- ``af``: Address family (NET_AF_INET or NET_AF_INET6) +- ``proto``: Protocol (NET_IPPROTO_TCP or NET_IPPROTO_TLS_1_2 for HTTPS) The function should return the socket file descriptor on success, or a negative error code on failure. diff --git a/doc/connectivity/networking/api/mqtt.rst b/doc/connectivity/networking/api/mqtt.rst index 2775d77315b89..8ebaea1268cf8 100644 --- a/doc/connectivity/networking/api/mqtt.rst +++ b/doc/connectivity/networking/api/mqtt.rst @@ -51,7 +51,7 @@ of the MQTT client and can be shared among MQTT clients: .. code-block:: c /* MQTT Broker address information. */ - static struct sockaddr_storage broker; + static struct net_sockaddr_storage broker; An MQTT client library will notify MQTT events to the application through a callback function created to handle respective events: diff --git a/doc/connectivity/networking/api/mqtt_sn.rst b/doc/connectivity/networking/api/mqtt_sn.rst index a7e0c75e772a6..3291fa2cdfe86 100644 --- a/doc/connectivity/networking/api/mqtt_sn.rst +++ b/doc/connectivity/networking/api/mqtt_sn.rst @@ -75,12 +75,12 @@ used. An example configuration for UDP transport is shown below: .. code-block:: c struct mqtt_sn_data client_id = MQTT_SN_DATA_STRING_LITERAL("ZEPHYR"); - struct sockaddr_in gateway = {0}; + struct net_sockaddr_in gateway = {0}; uint8_t tx_buf[256]; uint8_t rx_buf[256]; - mqtt_sn_transport_udp_init(&tp, (struct sockaddr*)&gateway, sizeof((gateway))); + mqtt_sn_transport_udp_init(&tp, (struct net_sockaddr*)&gateway, sizeof((gateway))); mqtt_sn_client_init(&client, &client_id, &tp.tp, evt_cb, tx_buf, sizeof(tx_buf), rx_buf, sizeof(rx_buf)); diff --git a/doc/connectivity/networking/api/net_pkt.rst b/doc/connectivity/networking/api/net_pkt.rst index db95d0cc82a61..3456b47961e58 100644 --- a/doc/connectivity/networking/api/net_pkt.rst +++ b/doc/connectivity/networking/api/net_pkt.rst @@ -109,14 +109,14 @@ bytes: .. code-block:: c - pkt = net_pkt_alloc_with_buffer(iface, 800, AF_INET4, IPPROTO_UDP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, 800, NET_AF_INET4, IPPROTO_UDP, K_FOREVER); will successfully allocate 800 + 20 + 8 bytes of buffer for the new net_pkt where: .. code-block:: c - pkt = net_pkt_alloc_with_buffer(iface, 1600, AF_INET4, IPPROTO_UDP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, 1600, NET_AF_INET4, IPPROTO_UDP, K_FOREVER); will successfully allocate 1500 bytes, and where 20 + 8 bytes (IPv4 + UDP headers) will not be used for the payload. diff --git a/drivers/ethernet/eth_adin2111.c b/drivers/ethernet/eth_adin2111.c index 687ef6e5553a0..da3ec1ffc22fa 100644 --- a/drivers/ethernet/eth_adin2111.c +++ b/drivers/ethernet/eth_adin2111.c @@ -317,7 +317,7 @@ int eth_adin2111_oa_data_read(const struct device *dev, const uint16_t port_idx) if (ftr & ADIN2111_OA_DATA_FTR_EV) { pkt = net_pkt_rx_alloc_with_buffer(iface, CONFIG_ETH_ADIN2111_BUFFER_SIZE, - AF_UNSPEC, 0, + NET_AF_UNSPEC, 0, K_MSEC(CONFIG_ETH_ADIN2111_TIMEOUT)); if (!pkt) { LOG_ERR("OA RX: cannot allcate packet space, skipping."); @@ -439,7 +439,7 @@ static int eth_adin2111_reg_read_generic(const struct device *dev, #endif /* CONFIG_ETH_ADIN2111_SPI_CFG0 */ /* spi header */ - *(uint16_t *)buf = htons((ADIN2111_READ_TXN_CTRL | reg)); + *(uint16_t *)buf = net_htons((ADIN2111_READ_TXN_CTRL | reg)); #if CONFIG_ETH_ADIN2111_SPI_CFG0 buf[2] = crc8_ccitt(0, buf, ADIN2111_SPI_HEADER_SIZE); /* TA */ @@ -471,7 +471,7 @@ static int eth_adin2111_reg_read_generic(const struct device *dev, } #endif /* CONFIG_ETH_ADIN2111_SPI_CFG0 */ - *val = ntohl((*(uint32_t *)(&buf[header_len]))); + *val = net_ntohl((*(uint32_t *)(&buf[header_len]))); return ret; } @@ -490,14 +490,14 @@ static int eth_adin2111_reg_write_generic(const struct device *dev, #endif /* CONFIG_ETH_ADIN2111_SPI_CFG0 */ /* spi header */ - *(uint16_t *)buf = htons((ADIN2111_WRITE_TXN_CTRL | reg)); + *(uint16_t *)buf = net_htons((ADIN2111_WRITE_TXN_CTRL | reg)); #if CONFIG_ETH_ADIN2111_SPI_CFG0 buf[2] = crc8_ccitt(0, buf, header_size); ++header_size; #endif /* CONFIG_ETH_ADIN2111_SPI_CFG0 */ /* reg */ - *(uint32_t *)(buf + header_size) = htonl(val); + *(uint32_t *)(buf + header_size) = net_htonl(val); #if CONFIG_ETH_ADIN2111_SPI_CFG0 buf[header_size + data_size] = crc8_ccitt(0, &buf[header_size], data_size); ++data_size; @@ -576,7 +576,7 @@ static int adin2111_read_fifo(const struct device *dev, const uint16_t port_idx) fsize -= ADIN2111_FRAME_HEADER_SIZE; /* spi header */ - *(uint16_t *)cmd_buf = htons((ADIN2111_READ_TXN_CTRL | rx_reg)); + *(uint16_t *)cmd_buf = net_htons((ADIN2111_READ_TXN_CTRL | rx_reg)); #if CONFIG_ETH_ADIN2111_SPI_CFG0 cmd_buf[2] = crc8_ccitt(0, cmd_buf, ADIN2111_SPI_HEADER_SIZE); /* TA */ @@ -608,7 +608,7 @@ static int adin2111_read_fifo(const struct device *dev, const uint16_t port_idx) /* remove CRC32 and pass to the stack */ fsize_real = fsize - sizeof(uint32_t); - pkt = net_pkt_rx_alloc_with_buffer(iface, fsize_real, AF_UNSPEC, 0, + pkt = net_pkt_rx_alloc_with_buffer(iface, fsize_real, NET_AF_UNSPEC, 0, K_MSEC(CONFIG_ETH_ADIN2111_TIMEOUT)); if (!pkt) { eth_stats_update_errors_rx(iface); @@ -838,7 +838,7 @@ static int adin2111_port_send(const struct device *dev, struct net_pkt *pkt) eth_adin2111_lock(adin, K_FOREVER); } - ret = eth_adin2111_send_oa_frame(cfg->adin, pkt, htons(cfg->port_idx)); + ret = eth_adin2111_send_oa_frame(cfg->adin, pkt, net_htons(cfg->port_idx)); goto end_check; } @@ -887,14 +887,14 @@ static int adin2111_port_send(const struct device *dev, struct net_pkt *pkt) memset(ctx->buf, 0, burst_size + ADIN2111_WRITE_HEADER_SIZE); /* spi header */ - *(uint16_t *)ctx->buf = htons(ADIN2111_TXN_CTRL_TX_REG); + *(uint16_t *)ctx->buf = net_htons(ADIN2111_TXN_CTRL_TX_REG); #if CONFIG_ETH_ADIN2111_SPI_CFG0 ctx->buf[2] = crc8_ccitt(0, ctx->buf, header_size); ++header_size; #endif /* CONFIG_ETH_ADIN2111_SPI_CFG0 */ /* frame header */ - *(uint16_t *)(ctx->buf + header_size) = htons(cfg->port_idx); + *(uint16_t *)(ctx->buf + header_size) = net_htons(cfg->port_idx); /* read pkt into tx buffer */ ret = net_pkt_read(pkt, diff --git a/drivers/ethernet/eth_cyclonev.c b/drivers/ethernet/eth_cyclonev.c index f5f0e80ff9959..33ab5e8223afe 100644 --- a/drivers/ethernet/eth_cyclonev.c +++ b/drivers/ethernet/eth_cyclonev.c @@ -680,7 +680,8 @@ static void eth_cyclonev_receive(struct eth_cyclonev_priv *p) p->rx_current_desc_number = last_desc_index; /* Allocate packet with buffer */ - pkt = net_pkt_rx_alloc_with_buffer(p->iface, frame_length, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(p->iface, frame_length, + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("net_pkt_rx_alloc_with_buffer() failed"); eth_stats_update_errors_rx(p->iface); diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c index 62fad9772f925..2912aac1db7c9 100644 --- a/drivers/ethernet/eth_e1000.c +++ b/drivers/ethernet/eth_e1000.c @@ -157,7 +157,7 @@ static struct net_pkt *e1000_rx(struct e1000_dev *dev) hexdump(buf, len, "%zd byte(s)", len); - pkt = net_pkt_rx_alloc_with_buffer(dev->iface, len, AF_UNSPEC, 0, + pkt = net_pkt_rx_alloc_with_buffer(dev->iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("Out of buffers"); diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c index 0c4cbbf464829..6383f0aa665d6 100644 --- a/drivers/ethernet/eth_enc28j60.c +++ b/drivers/ethernet/eth_enc28j60.c @@ -559,7 +559,7 @@ static void enc28j60_read_packet(const struct device *dev, uint16_t frm_len) /* Get the frame from the buffer */ pkt = net_pkt_rx_alloc_with_buffer(get_iface(context), frm_len, - AF_UNSPEC, 0, K_MSEC(config->timeout)); + NET_AF_UNSPEC, 0, K_MSEC(config->timeout)); if (!pkt) { LOG_ERR("%s: Could not allocate rx buffer", dev->name); eth_stats_update_errors_rx(get_iface(context)); diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c index c5584a3b36511..14fb048aff6e5 100644 --- a/drivers/ethernet/eth_enc424j600.c +++ b/drivers/ethernet/eth_enc424j600.c @@ -387,7 +387,7 @@ static int enc424j600_rx(const struct device *dev) /* Get the frame from the buffer */ pkt = net_pkt_rx_alloc_with_buffer(context->iface, frm_len, - AF_UNSPEC, 0, + NET_AF_UNSPEC, 0, K_MSEC(config->timeout)); if (!pkt) { LOG_ERR("Could not allocate rx buffer"); diff --git a/drivers/ethernet/eth_esp32.c b/drivers/ethernet/eth_esp32.c index eb51cf35f41b0..79ea0604571f3 100644 --- a/drivers/ethernet/eth_esp32.c +++ b/drivers/ethernet/eth_esp32.c @@ -111,7 +111,7 @@ static struct net_pkt *eth_esp32_rx( } struct net_pkt *pkt = net_pkt_rx_alloc_with_buffer( - dev_data->iface, receive_len, AF_UNSPEC, 0, K_MSEC(100)); + dev_data->iface, receive_len, NET_AF_UNSPEC, 0, K_MSEC(100)); if (pkt == NULL) { eth_stats_update_errors_rx(dev_data->iface); LOG_ERR("Could not allocate rx buffer"); diff --git a/drivers/ethernet/eth_gecko.c b/drivers/ethernet/eth_gecko.c index 4f2c70715e8e2..843208872b5fc 100644 --- a/drivers/ethernet/eth_gecko.c +++ b/drivers/ethernet/eth_gecko.c @@ -193,7 +193,7 @@ static struct net_pkt *frame_get(const struct device *dev) if (eofIdx != UINT32_MAX) { /* Allocate room for full frame */ rx_frame = net_pkt_rx_alloc_with_buffer(dev_data->iface, - total_len, AF_UNSPEC, 0, K_NO_WAIT); + total_len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!rx_frame) { LOG_ERR("Failed to obtain RX buffer"); ETH_RX_DISABLE(eth); diff --git a/drivers/ethernet/eth_ivshmem.c b/drivers/ethernet/eth_ivshmem.c index 742d8e6089fe4..4f97a39581332 100644 --- a/drivers/ethernet/eth_ivshmem.c +++ b/drivers/ethernet/eth_ivshmem.c @@ -139,7 +139,7 @@ static struct net_pkt *eth_ivshmem_rx(const struct device *dev) } struct net_pkt *pkt = net_pkt_rx_alloc_with_buffer( - dev_data->iface, rx_len, AF_UNSPEC, 0, K_MSEC(100)); + dev_data->iface, rx_len, NET_AF_UNSPEC, 0, K_MSEC(100)); if (pkt == NULL) { LOG_ERR("Failed to allocate rx buffer"); eth_stats_update_errors_rx(dev_data->iface); diff --git a/drivers/ethernet/eth_lan9250.c b/drivers/ethernet/eth_lan9250.c index f16e2eaac94e1..9aac0052d220a 100644 --- a/drivers/ethernet/eth_lan9250.c +++ b/drivers/ethernet/eth_lan9250.c @@ -486,7 +486,7 @@ static int lan9250_rx(const struct device *dev) } /* Get the frame from the buffer */ - pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, pkt_len, AF_UNSPEC, 0, + pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, pkt_len, NET_AF_UNSPEC, 0, K_MSEC(config->timeout)); if (!pkt) { LOG_ERR("%s: Could not allocate rx buffer", dev->name); diff --git a/drivers/ethernet/eth_litex_liteeth.c b/drivers/ethernet/eth_litex_liteeth.c index cbb5d52587cb1..6542b278fcece 100644 --- a/drivers/ethernet/eth_litex_liteeth.c +++ b/drivers/ethernet/eth_litex_liteeth.c @@ -136,7 +136,7 @@ static void eth_rx(const struct device *port) rxslot = litex_read8(config->rx_slot_addr); /* obtain rx buffer */ - pkt = net_pkt_rx_alloc_with_buffer(context->iface, len, AF_UNSPEC, 0, + pkt = net_pkt_rx_alloc_with_buffer(context->iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (pkt == NULL) { LOG_ERR("Failed to obtain RX buffer of length %u", len); diff --git a/drivers/ethernet/eth_native_tap.c b/drivers/ethernet/eth_native_tap.c index 32b7f1aa32b2c..81c3d2689cd20 100644 --- a/drivers/ethernet/eth_native_tap.c +++ b/drivers/ethernet/eth_native_tap.c @@ -215,7 +215,7 @@ static struct net_pkt *prepare_pkt(struct eth_context *ctx, struct net_pkt *pkt; pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, count, - AF_UNSPEC, 0, NET_BUF_TIMEOUT); + NET_AF_UNSPEC, 0, NET_BUF_TIMEOUT); if (!pkt) { *status = -ENOMEM; return NULL; diff --git a/drivers/ethernet/eth_numaker.c b/drivers/ethernet/eth_numaker.c index 8e6aa6bf2eec4..888f9f43dce16 100644 --- a/drivers/ethernet/eth_numaker.c +++ b/drivers/ethernet/eth_numaker.c @@ -391,7 +391,7 @@ static void m_numaker_gmacdev_packet_rx(const struct device *dev) /* Allocate a memory buffer chain from buffer pool * Using root iface. It will be updated in net_recv_data() */ - pkt = net_pkt_rx_alloc_with_buffer(data->iface, len, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(data->iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("pkt alloc frame-len=%d failed", len); goto next; diff --git a/drivers/ethernet/eth_nxp_enet.c b/drivers/ethernet/eth_nxp_enet.c index 40b2d69f4b237..3b3f712afc943 100644 --- a/drivers/ethernet/eth_nxp_enet.c +++ b/drivers/ethernet/eth_nxp_enet.c @@ -144,9 +144,9 @@ static bool eth_get_ptp_data(struct net_if *iface, struct net_pkt *pkt) bool pkt_is_ptp; if (net_eth_is_vlan_enabled(eth_ctx, iface)) { - pkt_is_ptp = ntohs(hdr_vlan->type) == NET_ETH_PTYPE_PTP; + pkt_is_ptp = net_ntohs(hdr_vlan->type) == NET_ETH_PTYPE_PTP; } else { - pkt_is_ptp = ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP; + pkt_is_ptp = net_ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP; } if (pkt_is_ptp) { @@ -376,7 +376,7 @@ static int eth_nxp_enet_rx(const struct device *dev) /* Using root iface. It will be updated in net_recv_data() */ pkt = net_pkt_rx_alloc_with_buffer(data->iface, frame_length, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { goto flush; } diff --git a/drivers/ethernet/eth_nxp_s32_gmac.c b/drivers/ethernet/eth_nxp_s32_gmac.c index fc64e2263114d..e3b43b2a869fd 100644 --- a/drivers/ethernet/eth_nxp_s32_gmac.c +++ b/drivers/ethernet/eth_nxp_s32_gmac.c @@ -414,7 +414,7 @@ static struct net_pkt *eth_nxp_s32_get_pkt(const struct device *dev, /* Using root iface, it will be updated in net_recv_data() */ pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, rx_info->PktLen, - AF_UNSPEC, 0, ETH_NXP_S32_BUF_TIMEOUT); + NET_AF_UNSPEC, 0, ETH_NXP_S32_BUF_TIMEOUT); if (!pkt) { LOG_ERR("Failed to allocate rx buffer of length %u", rx_info->PktLen); goto exit; diff --git a/drivers/ethernet/eth_nxp_s32_netc.c b/drivers/ethernet/eth_nxp_s32_netc.c index 9a5ddd745d3d6..a2e9bc6ffba80 100644 --- a/drivers/ethernet/eth_nxp_s32_netc.c +++ b/drivers/ethernet/eth_nxp_s32_netc.c @@ -180,7 +180,7 @@ static struct net_pkt *nxp_s32_eth_get_pkt(const struct device *dev, /* Use root iface, it will be updated later in net_recv_data() */ pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, buf->length, - AF_UNSPEC, 0, NETC_TIMEOUT); + NET_AF_UNSPEC, 0, NETC_TIMEOUT); if (!pkt) { goto exit; } diff --git a/drivers/ethernet/eth_renesas_ra.c b/drivers/ethernet/eth_renesas_ra.c index a0fd19e9d811c..e8f94a2d1d966 100644 --- a/drivers/ethernet/eth_renesas_ra.c +++ b/drivers/ethernet/eth_renesas_ra.c @@ -339,7 +339,7 @@ static struct net_pkt *renesas_ra_eth_rx(const struct device *dev) goto out; } - pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, len, AF_UNSPEC, 0, K_MSEC(100)); + pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, len, NET_AF_UNSPEC, 0, K_MSEC(100)); if (!pkt) { LOG_ERR("Failed to obtain RX buffer"); goto out; diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c index defb4639b3006..c5f470d423b37 100644 --- a/drivers/ethernet/eth_sam_gmac.c +++ b/drivers/ethernet/eth_sam_gmac.c @@ -499,7 +499,7 @@ static struct gptp_hdr *check_gptp_msg(struct net_if *iface, struct net_eth_hdr *hdr; hdr = (struct net_eth_hdr *)msg_start; - if (ntohs(hdr->type) != NET_ETH_PTYPE_PTP) { + if (net_ntohs(hdr->type) != NET_ETH_PTYPE_PTP) { return NULL; } diff --git a/drivers/ethernet/eth_sensry_sy1xx_mac.c b/drivers/ethernet/eth_sensry_sy1xx_mac.c index d254bb137343d..e77a77576df44 100644 --- a/drivers/ethernet/eth_sensry_sy1xx_mac.c +++ b/drivers/ethernet/eth_sensry_sy1xx_mac.c @@ -503,7 +503,7 @@ static int sy1xx_mac_receive_data(const struct device *dev, uint8_t *rx, uint16_ struct net_pkt *rx_pkt; int ret; - rx_pkt = net_pkt_alloc_with_buffer(data->iface, len, AF_UNSPEC, 0, K_FOREVER); + rx_pkt = net_pkt_alloc_with_buffer(data->iface, len, NET_AF_UNSPEC, 0, K_FOREVER); if (rx_pkt == NULL) { LOG_ERR("rx packet allocation failed"); return -EINVAL; diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c index 39e93951bba1c..66a63524e4a05 100644 --- a/drivers/ethernet/eth_smsc911x.c +++ b/drivers/ethernet/eth_smsc911x.c @@ -567,7 +567,7 @@ static struct net_pkt *smsc_recv_pkt(const struct device *dev, rem_size -= 4U; pkt = net_pkt_rx_alloc_with_buffer(context->iface, rem_size, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("Failed to obtain RX buffer"); smsc_discard_pkt(); diff --git a/drivers/ethernet/eth_smsc91x.c b/drivers/ethernet/eth_smsc91x.c index eef7dc85a6bce..c150db14c11e4 100644 --- a/drivers/ethernet/eth_smsc91x.c +++ b/drivers/ethernet/eth_smsc91x.c @@ -437,7 +437,7 @@ static void smsc_recv_pkt(struct eth_context *data) rx_buffer[len - 1] = smsc_read_1(sc, DATA0); } - pkt = net_pkt_rx_alloc_with_buffer(data->iface, len, AF_UNSPEC, 0, + pkt = net_pkt_rx_alloc_with_buffer(data->iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("Failed to obtain RX buffer"); diff --git a/drivers/ethernet/eth_stellaris.c b/drivers/ethernet/eth_stellaris.c index dc7503e67af82..c6949d6e9e603 100644 --- a/drivers/ethernet/eth_stellaris.c +++ b/drivers/ethernet/eth_stellaris.c @@ -146,7 +146,7 @@ static struct net_pkt *eth_stellaris_rx_pkt(const struct device *dev, frame_len = reg_val & 0x0000ffff; pkt = net_pkt_rx_alloc_with_buffer(iface, frame_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { return NULL; } diff --git a/drivers/ethernet/eth_stm32_hal_ptp.c b/drivers/ethernet/eth_stm32_hal_ptp.c index 9d6682217650d..7a4ae0574d176 100644 --- a/drivers/ethernet/eth_stm32_hal_ptp.c +++ b/drivers/ethernet/eth_stm32_hal_ptp.c @@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(eth_stm32_hal_ptp, CONFIG_ETHERNET_LOG_LEVEL); bool eth_stm32_is_ptp_pkt(struct net_if *iface, struct net_pkt *pkt) { - if (ntohs(NET_ETH_HDR(pkt)->type) != NET_ETH_PTYPE_PTP) { + if (net_ntohs(NET_ETH_HDR(pkt)->type) != NET_ETH_PTYPE_PTP) { return false; } diff --git a/drivers/ethernet/eth_stm32_hal_v1.c b/drivers/ethernet/eth_stm32_hal_v1.c index 3fa8dfd0a6561..e9e56fefd7b26 100644 --- a/drivers/ethernet/eth_stm32_hal_v1.c +++ b/drivers/ethernet/eth_stm32_hal_v1.c @@ -135,7 +135,7 @@ struct net_pkt *eth_stm32_rx(const struct device *dev) dma_buffer = (uint8_t *)heth->RxFrameInfos.buffer; pkt = net_pkt_rx_alloc_with_buffer(dev_data->iface, - total_len, AF_UNSPEC, 0, K_MSEC(100)); + total_len, NET_AF_UNSPEC, 0, K_MSEC(100)); if (!pkt) { LOG_ERR("Failed to obtain RX buffer"); goto release_desc; diff --git a/drivers/ethernet/eth_stm32_hal_v2.c b/drivers/ethernet/eth_stm32_hal_v2.c index 018131bf1e616..68072863f2d9f 100644 --- a/drivers/ethernet/eth_stm32_hal_v2.c +++ b/drivers/ethernet/eth_stm32_hal_v2.c @@ -432,7 +432,7 @@ struct net_pkt *eth_stm32_rx(const struct device *dev) #endif /* CONFIG_PTP_CLOCK_STM32_HAL */ pkt = net_pkt_rx_alloc_with_buffer(dev_data->iface, - total_len, AF_UNSPEC, 0, K_MSEC(100)); + total_len, NET_AF_UNSPEC, 0, K_MSEC(100)); if (!pkt) { LOG_ERR("Failed to obtain RX buffer"); goto release_desc; diff --git a/drivers/ethernet/eth_virtio_net.c b/drivers/ethernet/eth_virtio_net.c index 19de2d914e5f2..eb3556d1c7805 100644 --- a/drivers/ethernet/eth_virtio_net.c +++ b/drivers/ethernet/eth_virtio_net.c @@ -163,7 +163,7 @@ void virtnet_rx_cb(void *priv, uint32_t len) len -= sizeof(struct _virtio_net_hdr); struct net_pkt *pkt = - net_pkt_rx_alloc_with_buffer(data->iface, len, AF_UNSPEC, 0, K_FOREVER); + net_pkt_rx_alloc_with_buffer(data->iface, len, NET_AF_UNSPEC, 0, K_FOREVER); if (pkt == NULL) { LOG_ERR("received packet, but could not pass it to the operating system"); diff --git a/drivers/ethernet/eth_w5500.c b/drivers/ethernet/eth_w5500.c index 65d2385db49da..0b3febde9bf97 100644 --- a/drivers/ethernet/eth_w5500.c +++ b/drivers/ethernet/eth_w5500.c @@ -232,7 +232,7 @@ static void w5500_rx(const struct device *dev) rx_len = sys_get_be16(header) - 2; pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, rx_len, - AF_UNSPEC, 0, K_MSEC(config->timeout)); + NET_AF_UNSPEC, 0, K_MSEC(config->timeout)); if (!pkt) { eth_stats_update_errors_rx(ctx->iface); return; diff --git a/drivers/ethernet/eth_xilinx_axienet.c b/drivers/ethernet/eth_xilinx_axienet.c index 63b4c55d583fb..e14701519802d 100644 --- a/drivers/ethernet/eth_xilinx_axienet.c +++ b/drivers/ethernet/eth_xilinx_axienet.c @@ -150,7 +150,8 @@ static void xilinx_axienet_rx_callback(const struct device *dma, void *user_data data->rx_completed_buffer_index = next_descriptor; packet_size = dma_xilinx_axi_dma_last_received_frame_length(dma); - pkt = net_pkt_rx_alloc_with_buffer(data->interface, packet_size, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(data->interface, packet_size, + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("Could not allocate a packet!"); diff --git a/drivers/ethernet/eth_xlnx_gem.c b/drivers/ethernet/eth_xlnx_gem.c index 3b15aaf6b1c40..c6b671f438515 100644 --- a/drivers/ethernet/eth_xlnx_gem.c +++ b/drivers/ethernet/eth_xlnx_gem.c @@ -1534,7 +1534,7 @@ static void eth_xlnx_gem_handle_rx_pending(const struct device *dev) * now that the total frame length is known. */ pkt = net_pkt_rx_alloc_with_buffer(dev_data->iface, rx_data_length, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (pkt == NULL) { LOG_ERR("RX packet buffer alloc failed: %u bytes", rx_data_length); diff --git a/drivers/ethernet/eth_xmc4xxx.c b/drivers/ethernet/eth_xmc4xxx.c index 31ca10db9a262..1eb16f7f76c20 100644 --- a/drivers/ethernet/eth_xmc4xxx.c +++ b/drivers/ethernet/eth_xmc4xxx.c @@ -312,7 +312,7 @@ static int eth_xmc4xxx_send(const struct device *dev, struct net_pkt *pkt) #if defined(CONFIG_NET_GPTP) struct net_eth_hdr *hdr = NET_ETH_HDR(pkt); - if (ntohs(hdr->type) == NET_ETH_PTYPE_PTP) { + if (net_ntohs(hdr->type) == NET_ETH_PTYPE_PTP) { dma_desc->status |= ETH_MAC_DMA_TDES0_TTSE; } #endif diff --git a/drivers/ethernet/intel/eth_intel_igc.c b/drivers/ethernet/intel/eth_intel_igc.c index 6a2ee666e15ab..fc5772bdc1e1c 100644 --- a/drivers/ethernet/intel/eth_intel_igc.c +++ b/drivers/ethernet/intel/eth_intel_igc.c @@ -654,11 +654,11 @@ static sa_family_t eth_intel_igc_get_sa_family(uint8_t *rx_buf) { struct net_eth_hdr *eth_hdr = (struct net_eth_hdr *)rx_buf; - switch (ntohs(eth_hdr->type)) { + switch (net_ntohs(eth_hdr->type)) { case NET_ETH_PTYPE_IP: - return AF_INET; + return NET_AF_INET; case NET_ETH_PTYPE_IPV6: - return AF_INET6; + return NET_AF_INET6; default: break; } diff --git a/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc.c b/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc.c index 2562cd427471c..93e02acfaedcd 100644 --- a/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc.c +++ b/drivers/ethernet/nxp_imx_netc/eth_nxp_imx_netc.c @@ -118,7 +118,7 @@ static int netc_eth_rx(const struct device *dev) } #endif /* Copy to pkt */ - pkt = net_pkt_rx_alloc_with_buffer(iface_dst, length, AF_UNSPEC, 0, NETC_TIMEOUT); + pkt = net_pkt_rx_alloc_with_buffer(iface_dst, length, NET_AF_UNSPEC, 0, NETC_TIMEOUT); if (pkt == NULL) { eth_stats_update_errors_rx(iface_dst); ret = -ENOBUFS; @@ -409,7 +409,7 @@ int netc_eth_tx(const struct device *dev, struct net_pkt *pkt) k_mutex_lock(&data->tx_mutex, K_FOREVER); #ifdef CONFIG_PTP_CLOCK_NXP_NETC - pkt_is_gptp = ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP; + pkt_is_gptp = net_ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP; if ((pkt_is_gptp || net_pkt_is_tx_timestamping(pkt)) && (netc_eth_get_ptp_clock(dev) != NULL)) { opt.flags |= kEP_TX_OPT_REQ_TS; diff --git a/drivers/ieee802154/ieee802154_b91.c b/drivers/ieee802154/ieee802154_b91.c index a5d03db3cec49..81104e6d2069b 100644 --- a/drivers/ieee802154/ieee802154_b91.c +++ b/drivers/ieee802154/ieee802154_b91.c @@ -212,7 +212,7 @@ static void b91_handle_ack(void) /* allocate ack packet */ ack_pkt = net_pkt_rx_alloc_with_buffer(data.iface, B91_ACK_FRAME_LEN, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!ack_pkt) { LOG_ERR("No free packet available."); return; @@ -308,7 +308,8 @@ static void b91_rf_rx_isr(void) } /* get packet pointer from NET stack */ - pkt = net_pkt_rx_alloc_with_buffer(data.iface, length, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(data.iface, length, + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No pkt available"); goto exit; diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c index b273c1f0acea0..68e3b3a2109f2 100644 --- a/drivers/ieee802154/ieee802154_cc1200.c +++ b/drivers/ieee802154/ieee802154_cc1200.c @@ -471,7 +471,7 @@ static void cc1200_rx(void *p1, void *p2, void *p3) } pkt = net_pkt_rx_alloc_with_buffer(cc1200->iface, pkt_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No free pkt available"); goto flush; diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c index d5ab993593af1..2ddc73432bd79 100644 --- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c +++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c @@ -424,7 +424,7 @@ static void ieee802154_cc13xx_cc26xx_rx_done( len, seq, rssi, lqi); pkt = net_pkt_rx_alloc_with_buffer( - drv_data->iface, len, AF_UNSPEC, 0, K_NO_WAIT); + drv_data->iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_WRN("Cannot allocate packet"); continue; diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c index 3a9f215ce0e17..f27c694224ccf 100644 --- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c +++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c @@ -353,7 +353,7 @@ static void drv_rx_done(struct ieee802154_cc13xx_cc26xx_subg_data *drv_data) len, rssi, status); pkt = net_pkt_rx_alloc_with_buffer( - drv_data->iface, len, AF_UNSPEC, 0, K_NO_WAIT); + drv_data->iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_WRN("Cannot allocate packet"); continue; diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c index e81de86c099b5..cef023b7e634d 100644 --- a/drivers/ieee802154/ieee802154_cc2520.c +++ b/drivers/ieee802154/ieee802154_cc2520.c @@ -618,7 +618,7 @@ static void cc2520_rx(void *p1, void *p2, void *p3) } pkt = net_pkt_rx_alloc_with_buffer(cc2520->iface, pkt_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No pkt available"); goto flush; diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c index 1f5d01c498ac1..b68fdb1abc4fb 100644 --- a/drivers/ieee802154/ieee802154_dw1000.c +++ b/drivers/ieee802154/ieee802154_dw1000.c @@ -411,7 +411,7 @@ static inline void dwt_irq_handle_rx(const struct device *dev, uint32_t sys_stat } pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, pkt_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No buf available"); goto rx_out_enable_rx; diff --git a/drivers/ieee802154/ieee802154_esp32.c b/drivers/ieee802154/ieee802154_esp32.c index 6bef1720f0f13..2f458a998b97d 100644 --- a/drivers/ieee802154/ieee802154_esp32.c +++ b/drivers/ieee802154/ieee802154_esp32.c @@ -77,7 +77,7 @@ void esp_ieee802154_receive_done(uint8_t *frame, esp_ieee802154_frame_info_t *fr LOG_HEXDUMP_DBG(payload, len, "RX buffer:"); - pkt = net_pkt_rx_alloc_with_buffer(esp32_data.iface, len, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(esp32_data.iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No pkt available"); goto exit; diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c index 244d350b215fb..2b64c19395994 100644 --- a/drivers/ieee802154/ieee802154_kw41z.c +++ b/drivers/ieee802154/ieee802154_kw41z.c @@ -513,7 +513,7 @@ static inline void kw41z_rx(struct kw41z_context *kw41z, uint8_t len) #endif pkt = net_pkt_rx_alloc_with_buffer(kw41z->iface, pkt_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No buf available"); goto out; diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c index 2c82ca7566c5d..6e033d301b379 100644 --- a/drivers/ieee802154/ieee802154_mcr20a.c +++ b/drivers/ieee802154/ieee802154_mcr20a.c @@ -567,7 +567,7 @@ static inline void mcr20a_rx(const struct device *dev, uint8_t len) pkt_len = len - MCR20A_FCS_LENGTH; pkt = net_pkt_rx_alloc_with_buffer(mcr20a->iface, pkt_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No buf available"); goto out; diff --git a/drivers/ieee802154/ieee802154_mcxw.c b/drivers/ieee802154/ieee802154_mcxw.c index 8da51865cb116..7f09313feb4bd 100644 --- a/drivers/ieee802154/ieee802154_mcxw.c +++ b/drivers/ieee802154/ieee802154_mcxw.c @@ -435,7 +435,7 @@ static int handle_ack(struct mcxw_context *mcxw_radio) int err = 0; len = mcxw_radio->rx_ack_frame.length; - pkt = net_pkt_rx_alloc_with_buffer(mcxw_radio->iface, len, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(mcxw_radio->iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No free packet available."); err = -ENOMEM; @@ -641,8 +641,8 @@ void mcxw_rx_thread(void *arg1, void *arg2, void *arg3) continue; } - pkt = net_pkt_rx_alloc_with_buffer(mcxw_radio->iface, rx_frame.length, AF_UNSPEC, 0, - K_FOREVER); + pkt = net_pkt_rx_alloc_with_buffer(mcxw_radio->iface, rx_frame.length, + NET_AF_UNSPEC, 0, K_FOREVER); if (net_pkt_write(pkt, rx_frame.psdu, rx_frame.length)) { goto drop; diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c index 60f45edb9c797..30c03e071d750 100644 --- a/drivers/ieee802154/ieee802154_nrf5.c +++ b/drivers/ieee802154/ieee802154_nrf5.c @@ -196,7 +196,7 @@ static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3) * thus stops acknowledging consecutive frames). */ pkt = net_pkt_rx_alloc_with_buffer(nrf5_radio->iface, pkt_len, - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); if (net_pkt_write(pkt, rx_frame->psdu + 1, pkt_len)) { goto drop; @@ -433,7 +433,7 @@ static int handle_ack(struct nrf5_802154_data *nrf5_radio) } ack_pkt = net_pkt_rx_alloc_with_buffer(nrf5_radio->iface, ack_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!ack_pkt) { LOG_ERR("No free packet available."); err = -ENOMEM; diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c index 79c2412547121..7d50afd483536 100644 --- a/drivers/ieee802154/ieee802154_rf2xx.c +++ b/drivers/ieee802154/ieee802154_rf2xx.c @@ -213,7 +213,7 @@ static void rf2xx_trx_rx(const struct device *dev) } pkt = net_pkt_rx_alloc_with_buffer(ctx->iface, pkt_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("No RX buffer available"); return; diff --git a/drivers/ieee802154/ieee802154_stm32wba.c b/drivers/ieee802154/ieee802154_stm32wba.c index d5738fdb38abe..bab8f61c065a0 100644 --- a/drivers/ieee802154/ieee802154_stm32wba.c +++ b/drivers/ieee802154/ieee802154_stm32wba.c @@ -124,7 +124,7 @@ static void stm32wba_802154_rx_thread(void *arg1, void *arg2, void *arg3) * thus stops acknowledging consecutive frames). */ pkt = net_pkt_rx_alloc_with_buffer(stm32wba_radio->iface, pkt_len, - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); if (net_pkt_write(pkt, rx_frame->psdu, pkt_len) != 0) { LOG_ERR("Failed to write packet data"); @@ -466,7 +466,7 @@ static int handle_ack(struct stm32wba_802154_data_t *stm32wba_radio) } ack_pkt = net_pkt_rx_alloc_with_buffer(stm32wba_radio->iface, ack_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (ack_pkt == NULL) { LOG_ERR("No free packet available."); return -ENOMEM; diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c index 3e006adacd1e5..93c7b78e3e592 100644 --- a/drivers/ieee802154/ieee802154_uart_pipe.c +++ b/drivers/ieee802154/ieee802154_uart_pipe.c @@ -129,7 +129,7 @@ static uint8_t *upipe_rx(uint8_t *buf, size_t *off) if (upipe->rx_len == upipe->rx_off) { pkt = net_pkt_rx_alloc_with_buffer(upipe->iface, upipe->rx_len, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_DBG("No pkt available"); goto flush; diff --git a/drivers/modem/hl7800.c b/drivers/modem/hl7800.c index 8d6dca55ab760..282e2d12fc095 100644 --- a/drivers/modem/hl7800.c +++ b/drivers/modem/hl7800.c @@ -380,8 +380,8 @@ struct hl7800_socket { sa_family_t family; enum net_sock_type type; enum net_ip_protocol ip_proto; - struct sockaddr src; - struct sockaddr dst; + struct net_sockaddr src; + struct net_sockaddr dst; bool created; bool reconfig; @@ -843,27 +843,21 @@ static void socket_put(struct hl7800_socket *sock) sock->error = 0; sock->rx_size = 0; sock->state = SOCK_IDLE; - (void)memset(&sock->src, 0, sizeof(struct sockaddr)); - (void)memset(&sock->dst, 0, sizeof(struct sockaddr)); + (void)memset(&sock->src, 0, sizeof(struct net_sockaddr)); + (void)memset(&sock->dst, 0, sizeof(struct net_sockaddr)); } -char *hl7800_sprint_ip_addr(const struct sockaddr *addr) +char *hl7800_sprint_ip_addr(const struct net_sockaddr *addr) { static char buf[NET_IPV6_ADDR_LEN]; -#if defined(CONFIG_NET_IPV6) - if (addr->sa_family == AF_INET6) { - return net_addr_ntop(AF_INET6, &net_sin6(addr)->sin6_addr, buf, + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { + return net_addr_ntop(NET_AF_INET6, &net_sin6(addr)->sin6_addr, buf, sizeof(buf)); - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (addr->sa_family == AF_INET) { - return net_addr_ntop(AF_INET, &net_sin(addr)->sin_addr, buf, + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { + return net_addr_ntop(NET_AF_INET, &net_sin(addr)->sin_addr, buf, sizeof(buf)); - } else -#endif - { + } else { LOG_ERR("Unknown IP address family:%d", addr->sa_family); return NULL; } @@ -1471,7 +1465,7 @@ static int send_data(struct hl7800_socket *sock, struct net_pkt *pkt) } snprintk(buf, sizeof(buf), "AT+KUDPSND=%d,\"%s\",%u,%zu", sock->socket_id, dst_addr, - ntohs(net_sin(&sock->dst)->sin_port), send_len); + net_ntohs(net_sin(&sock->dst)->sin_port), send_len); } send_at_cmd(sock, buf, K_NO_WAIT, 0, false); @@ -1612,15 +1606,15 @@ static int pkt_setup_ip_data(struct net_pkt *pkt, struct hl7800_socket *sock) #endif #if defined(CONFIG_NET_IPV6) - if (net_pkt_family(pkt) == AF_INET6) { + if (net_pkt_family(pkt) == NET_AF_INET6) { if (net_ipv6_create( pkt, - &((struct sockaddr_in6 *)&sock->dst)->sin6_addr, - &((struct sockaddr_in6 *)&sock->src)->sin6_addr)) { + &((struct net_sockaddr_in6 *)&sock->dst)->sin6_addr, + &((struct net_sockaddr_in6 *)&sock->src)->sin6_addr)) { return -1; } - net_pkt_set_remote_address(pkt, &sock->dst, sizeof(struct sockaddr_in6)); - pkt->remote.sa_family = AF_INET6; + net_pkt_set_remote_address(pkt, &sock->dst, sizeof(struct net_sockaddr_in6)); + pkt->remote.sa_family = NET_AF_INET6; src_port = net_sin6(&sock->src)->sin6_port; dst_port = net_sin6(&sock->dst)->sin6_port; @@ -1628,14 +1622,14 @@ static int pkt_setup_ip_data(struct net_pkt *pkt, struct hl7800_socket *sock) } #endif #if defined(CONFIG_NET_IPV4) - if (net_pkt_family(pkt) == AF_INET) { + if (net_pkt_family(pkt) == NET_AF_INET) { if (net_ipv4_create( - pkt, &((struct sockaddr_in *)&sock->dst)->sin_addr, - &((struct sockaddr_in *)&sock->src)->sin_addr)) { + pkt, &((struct net_sockaddr_in *)&sock->dst)->sin_addr, + &((struct net_sockaddr_in *)&sock->src)->sin_addr)) { return -1; } - net_pkt_set_remote_address(pkt, &sock->dst, sizeof(struct sockaddr_in)); - pkt->remote.sa_family = AF_INET; + net_pkt_set_remote_address(pkt, &sock->dst, sizeof(struct net_sockaddr_in)); + pkt->remote.sa_family = NET_AF_INET; src_port = net_sin(&sock->src)->sin_port; dst_port = net_sin(&sock->dst)->sin_port; @@ -1644,7 +1638,7 @@ static int pkt_setup_ip_data(struct net_pkt *pkt, struct hl7800_socket *sock) #endif #if defined(CONFIG_NET_UDP) - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { if (net_udp_create(pkt, dst_port, src_port)) { return -1; } @@ -1653,7 +1647,7 @@ static int pkt_setup_ip_data(struct net_pkt *pkt, struct hl7800_socket *sock) } #endif #if defined(CONFIG_NET_TCP) - if (sock->ip_proto == IPPROTO_TCP) { + if (sock->ip_proto == NET_IPPROTO_TCP) { NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr); tcp = (struct net_tcp_hdr *)net_pkt_get_data(pkt, &tcp_access); @@ -1922,7 +1916,7 @@ static void dns_work_cb(struct k_work *work) #if defined(CONFIG_DNS_RESOLVER) && !defined(CONFIG_DNS_SERVER_IP_ADDRESSES) int ret; struct dns_resolve_context *dnsCtx; - struct sockaddr temp_addr; + struct net_sockaddr temp_addr; bool valid_address = false; bool retry = false; static const char *const dns_servers_str[] = { @@ -2042,7 +2036,7 @@ static int hl7800_net_addr6_pton(const char *src, struct in6_addr *dst) return -EINVAL; } ipv6_section = (ipv6_section << 8) | (uint16_t)strtol(src, NULL, 10); - UNALIGNED_PUT(htons(ipv6_section), &dst->s6_addr16[i]); + UNALIGNED_PUT(net_htons(ipv6_section), &dst->s6_addr16[i]); src = strchr(src, '.'); if (src) { @@ -2127,7 +2121,7 @@ static bool on_cmd_atcmdinfo_ipaddr(struct net_buf **buf, uint16_t len) temp_addr_str[addr_len] = 0; LOG_DBG("IP addr: %s", temp_addr_str); if (is_ipv4) { - ret = net_addr_pton(AF_INET, temp_addr_str, &new_ipv4_addr); + ret = net_addr_pton(NET_AF_INET, temp_addr_str, &new_ipv4_addr); } else { ret = hl7800_net_addr6_pton(temp_addr_str, &new_ipv6_addr); } @@ -2143,7 +2137,7 @@ static bool on_cmd_atcmdinfo_ipaddr(struct net_buf **buf, uint16_t len) addr_len = delims[3] - sm_start; strncpy(temp_addr_str, sm_start, addr_len); temp_addr_str[addr_len] = 0; - ret = net_addr_pton(AF_INET, temp_addr_str, &iface_ctx.subnet); + ret = net_addr_pton(NET_AF_INET, temp_addr_str, &iface_ctx.subnet); if (ret < 0) { LOG_ERR("Invalid subnet"); return true; @@ -2154,7 +2148,7 @@ static bool on_cmd_atcmdinfo_ipaddr(struct net_buf **buf, uint16_t len) addr_len = delims[4] - addr_start; strncpy(temp_addr_str, addr_start, addr_len); temp_addr_str[addr_len] = 0; - ret = net_addr_pton(AF_INET, temp_addr_str, &iface_ctx.gateway); + ret = net_addr_pton(NET_AF_INET, temp_addr_str, &iface_ctx.gateway); if (ret < 0) { LOG_ERR("Invalid gateway"); return true; @@ -2173,7 +2167,7 @@ static bool on_cmd_atcmdinfo_ipaddr(struct net_buf **buf, uint16_t len) } strncpy(iface_ctx.dns_v4_string, addr_start, addr_len); iface_ctx.dns_v4_string[addr_len] = 0; - ret = net_addr_pton(AF_INET, iface_ctx.dns_v4_string, &iface_ctx.dns_v4); + ret = net_addr_pton(NET_AF_INET, iface_ctx.dns_v4_string, &iface_ctx.dns_v4); LOG_DBG("IPv4 DNS addr: %s", iface_ctx.dns_v4_string); } #ifdef CONFIG_NET_IPV6 @@ -2186,7 +2180,7 @@ static bool on_cmd_atcmdinfo_ipaddr(struct net_buf **buf, uint16_t len) strncpy(iface_ctx.dns_v6_string, addr_start, addr_len); ret = hl7800_net_addr6_pton(iface_ctx.dns_v6_string, &iface_ctx.dns_v6); - net_addr_ntop(AF_INET6, &iface_ctx.dns_v6, iface_ctx.dns_v6_string, + net_addr_ntop(NET_AF_INET6, &iface_ctx.dns_v6, iface_ctx.dns_v6_string, sizeof(iface_ctx.dns_v6_string)); LOG_DBG("IPv6 DNS addr: %s", iface_ctx.dns_v6_string); } @@ -3346,7 +3340,7 @@ static void notify_all_tcp_sockets_closed(void) for (i = 0; i < MDM_MAX_SOCKETS; i++) { sock = &iface_ctx.sockets[i]; - if ((sock->context != NULL) && (sock->type == SOCK_STREAM)) { + if ((sock->context != NULL) && (sock->type == NET_SOCK_STREAM)) { LOG_DBG("Sock %d closed", sock->socket_id); /* signal RX callback with null packet */ if (sock->recv_cb) { @@ -3936,7 +3930,7 @@ static void sock_notif_cb_work(struct k_work *work) k_work_reschedule_for_queue(&hl7800_workq, &sock->notif_work, MDM_SOCK_NOTIF_DELAY); } else { - if (sock->type == SOCK_STREAM) { + if (sock->type == NET_SOCK_STREAM) { LOG_DBG("Sock %d trigger NULL packet", sock->socket_id); k_work_submit_to_queue(&hl7800_workq, &sock->recv_cb_work); } @@ -4020,9 +4014,9 @@ static int delete_socket(struct hl7800_socket *sock, enum net_sock_type type, ui { char cmd[sizeof("AT+KUDPCLOSE=###")]; - if (type == SOCK_STREAM) { + if (type == NET_SOCK_STREAM) { snprintk(cmd, sizeof(cmd), "AT+KTCPDEL=%d", id); - } else if (type == SOCK_DGRAM) { + } else if (type == NET_SOCK_DGRAM) { snprintk(cmd, sizeof(cmd), "AT+KUDPCLOSE=%d", id); } @@ -4058,9 +4052,9 @@ static bool on_cmd_sockcreate(enum net_sock_type type, struct net_buf **buf, uin out_len = net_buf_linearize(value, sizeof(value), *buf, 0, len); value[out_len] = 0; iface_ctx.last_socket_id = strtol(value, NULL, 10); - if (type == SOCK_STREAM) { + if (type == NET_SOCK_STREAM) { LOG_DBG("+KTCPCFG: %d", iface_ctx.last_socket_id); - } else if (type == SOCK_DGRAM) { + } else if (type == NET_SOCK_DGRAM) { LOG_DBG("+KUDPCFG: %d", iface_ctx.last_socket_id); } @@ -4097,13 +4091,13 @@ static bool on_cmd_sockcreate(enum net_sock_type type, struct net_buf **buf, uin /* Handler: +KTCPCFG: */ static bool on_cmd_sock_tcp_create(struct net_buf **buf, uint16_t len) { - return on_cmd_sockcreate(SOCK_STREAM, buf, len); + return on_cmd_sockcreate(NET_SOCK_STREAM, buf, len); } /* Handler: +KUDPCFG: */ static bool on_cmd_sock_udp_create(struct net_buf **buf, uint16_t len) { - return on_cmd_sockcreate(SOCK_DGRAM, buf, len); + return on_cmd_sockcreate(NET_SOCK_DGRAM, buf, len); } static void sockreadrecv_cb_work(struct k_work *work) @@ -4270,7 +4264,7 @@ static void sock_read(struct net_buf **buf) net_pkt_unref(sock->recv_pkt); sock->recv_pkt = NULL; done: - if (sock->type == SOCK_STREAM) { + if (sock->type == NET_SOCK_STREAM) { if (sock->error == 0) { sock->state = SOCK_CONNECTED; } @@ -4317,7 +4311,7 @@ static int start_socket_rx(struct hl7800_socket *sock, uint16_t rx_size) LOG_DBG("Start socket RX ID:%d size:%d", sock->socket_id, rx_size); sock->state = SOCK_RX; - if (sock->type == SOCK_DGRAM) { + if (sock->type == NET_SOCK_DGRAM) { #if defined(CONFIG_NET_IPV4) if (rx_size > (net_if_get_mtu(iface_ctx.iface) - NET_IPV4UDPH_LEN)) { sock->rx_size = @@ -5859,12 +5853,12 @@ static int configure_TCP_socket(struct hl7800_socket *sock) restore_on_boot = true; #endif - if (sock->dst.sa_family == AF_INET6) { + if (sock->dst.sa_family == NET_AF_INET6) { af = MDM_HL7800_SOCKET_AF_IPV6; - dst_port = ntohs(net_sin6(&sock->dst)->sin6_port); - } else if (sock->dst.sa_family == AF_INET) { + dst_port = net_ntohs(net_sin6(&sock->dst)->sin6_port); + } else if (sock->dst.sa_family == NET_AF_INET) { af = MDM_HL7800_SOCKET_AF_IPV4; - dst_port = ntohs(net_sin(&sock->dst)->sin_port); + dst_port = net_ntohs(net_sin(&sock->dst)->sin_port); } else { return -EINVAL; } @@ -5897,9 +5891,9 @@ static int configure_UDP_socket(struct hl7800_socket *sock) sock->socket_id = MDM_CREATE_SOCKET_ID; - if (sock->family == AF_INET) { + if (sock->family == NET_AF_INET) { af = MDM_HL7800_SOCKET_AF_IPV4; - } else if (sock->family == AF_INET6) { + } else if (sock->family == NET_AF_INET6) { af = MDM_HL7800_SOCKET_AF_IPV6; } else { return -EINVAL; @@ -5994,7 +5988,7 @@ static int offload_get(sa_family_t family, enum net_sock_type type, * TCP socket needs to be created later once the * connection IP address is known. */ - if (type == SOCK_DGRAM) { + if (type == NET_SOCK_DGRAM) { wakeup_hl7800(); /* reconfig IP connection if necessary */ @@ -6016,7 +6010,7 @@ static int offload_get(sa_family_t family, enum net_sock_type type, } static int offload_bind(struct net_context *context, - const struct sockaddr *addr, socklen_t addr_len) + const struct net_sockaddr *addr, socklen_t addr_len) { struct hl7800_socket *sock = NULL; @@ -6032,21 +6026,16 @@ static int offload_bind(struct net_context *context, /* save bind address information */ sock->src.sa_family = addr->sa_family; -#if defined(CONFIG_NET_IPV6) - if (addr->sa_family == AF_INET6) { + + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { net_ipaddr_copy(&net_sin6(&sock->src)->sin6_addr, &net_sin6(addr)->sin6_addr); net_sin6(&sock->src)->sin6_port = net_sin6(addr)->sin6_port; - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { net_ipaddr_copy(&net_sin(&sock->src)->sin_addr, &net_sin(addr)->sin_addr); net_sin(&sock->src)->sin_port = net_sin(addr)->sin_port; - } else -#endif - { + } else { return -EPFNOSUPPORT; } @@ -6060,7 +6049,7 @@ static int offload_listen(struct net_context *context, int backlog) } static int offload_connect(struct net_context *context, - const struct sockaddr *addr, socklen_t addr_len, + const struct net_sockaddr *addr, socklen_t addr_len, net_context_connect_cb_t cb, int32_t timeout, void *user_data) { @@ -6086,34 +6075,28 @@ static int offload_connect(struct net_context *context, sock->dst.sa_family = addr->sa_family; -#if defined(CONFIG_NET_IPV6) - if (addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { net_ipaddr_copy(&net_sin6(&sock->dst)->sin6_addr, &net_sin6(addr)->sin6_addr); dst_port = net_sin6(addr)->sin6_port; net_sin6(&sock->dst)->sin6_port = dst_port; - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { net_ipaddr_copy(&net_sin(&sock->dst)->sin_addr, &net_sin(addr)->sin_addr); dst_port = net_sin(addr)->sin_port; net_sin(&sock->dst)->sin_port = dst_port; - } else -#endif - { + } else { return -EINVAL; } if (dst_port < 0) { - LOG_ERR("Invalid port: %d", ntohs(dst_port)); + LOG_ERR("Invalid port: %d", net_ntohs(dst_port)); return -EINVAL; } hl7800_lock(); - if (sock->type == SOCK_STREAM) { + if (sock->type == NET_SOCK_STREAM) { wakeup_hl7800(); reconfigure_IP_connection(); @@ -6152,7 +6135,7 @@ static int offload_accept(struct net_context *context, net_tcp_accept_cb_t cb, return -ENOTSUP; } -static int offload_sendto(struct net_pkt *pkt, const struct sockaddr *dst_addr, +static int offload_sendto(struct net_pkt *pkt, const struct net_sockaddr *dst_addr, socklen_t addr_len, net_context_send_cb_t cb, int32_t timeout, void *user_data) { @@ -6170,21 +6153,15 @@ static int offload_sendto(struct net_pkt *pkt, const struct sockaddr *dst_addr, return -EINVAL; } -#if defined(CONFIG_NET_IPV6) - if (dst_addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && dst_addr->sa_family == NET_AF_INET6) { net_ipaddr_copy(&net_sin6(&sock->dst)->sin6_addr, &net_sin6(dst_addr)->sin6_addr); net_sin6(&sock->dst)->sin6_port = net_sin6(dst_addr)->sin6_port; - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (dst_addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && dst_addr->sa_family == NET_AF_INET) { net_ipaddr_copy(&net_sin(&sock->dst)->sin_addr, &net_sin(dst_addr)->sin_addr); net_sin(&sock->dst)->sin_port = net_sin(dst_addr)->sin_port; - } else -#endif - { + } else { return -EINVAL; } @@ -6218,17 +6195,12 @@ static int offload_send(struct net_pkt *pkt, net_context_send_cb_t cb, socklen_t addr_len; addr_len = 0; -#if defined(CONFIG_NET_IPV6) - if (net_pkt_family(pkt) == AF_INET6) { - addr_len = sizeof(struct sockaddr_in6); - } else -#endif /* CONFIG_NET_IPV6 */ -#if defined(CONFIG_NET_IPV4) - if (net_pkt_family(pkt) == AF_INET) { - addr_len = sizeof(struct sockaddr_in); - } else -#endif /* CONFIG_NET_IPV4 */ - { + + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { + addr_len = sizeof(struct net_sockaddr_in6); + } else if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { + addr_len = sizeof(struct net_sockaddr_in); + } else { return -EPFNOSUPPORT; } @@ -6278,7 +6250,7 @@ static int offload_put(struct net_context *context) hl7800_lock(); /* close connection */ - if (sock->type == SOCK_STREAM) { + if (sock->type == NET_SOCK_STREAM) { snprintk(cmd, sizeof(cmd), "AT+KTCPCLOSE=%d", sock->socket_id); } else { @@ -6288,11 +6260,11 @@ static int offload_put(struct net_context *context) wakeup_hl7800(); - if ((sock->type == SOCK_DGRAM) || (sock->error != -ENOTCONN)) { + if ((sock->type == NET_SOCK_DGRAM) || (sock->error != -ENOTCONN)) { send_at_cmd(sock, cmd, MDM_CMD_SEND_TIMEOUT, 0, false); } - if (sock->type == SOCK_STREAM) { + if (sock->type == NET_SOCK_STREAM) { /* delete session */ delete_socket(sock, sock->type, sock->socket_id); } @@ -6301,7 +6273,7 @@ static int offload_put(struct net_context *context) socket_put(sock); net_context_unref(context); - if (sock->type == SOCK_STREAM) { + if (sock->type == NET_SOCK_STREAM) { /* TCP contexts are referenced twice, * once for the app and once for the stack. * Since TCP stack is not used for offload, diff --git a/drivers/modem/hl78xx/hl78xx.c b/drivers/modem/hl78xx/hl78xx.c index 92542a447abf2..36574cef7aecc 100644 --- a/drivers/modem/hl78xx/hl78xx.c +++ b/drivers/modem/hl78xx/hl78xx.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/modem/hl78xx/hl78xx.h b/drivers/modem/hl78xx/hl78xx.h index d48f5b2d88743..aa5df7ae04d7c 100644 --- a/drivers/modem/hl78xx/hl78xx.h +++ b/drivers/modem/hl78xx/hl78xx.h @@ -349,7 +349,7 @@ struct hl78xx_config { struct socket_read_data { char *recv_buf; size_t recv_buf_len; - struct sockaddr *recv_addr; + struct net_sockaddr *recv_addr; uint16_t recv_read_len; }; diff --git a/drivers/modem/hl78xx/hl78xx_sockets.c b/drivers/modem/hl78xx/hl78xx_sockets.c index 9840ea906a36b..f26d2b2026fb1 100644 --- a/drivers/modem/hl78xx/hl78xx_sockets.c +++ b/drivers/modem/hl78xx/hl78xx_sockets.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -237,15 +236,15 @@ static void modem_pipe_callback(struct modem_pipe *pipe, enum modem_pipe_event e /* Socket I/O helpers */ static int on_cmd_sockread_common(int socket_id, uint16_t socket_data_length, uint16_t len, void *user_data); -static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, int flags, struct sockaddr *from, - socklen_t *fromlen); -static int prepare_send_cmd(const struct modem_socket *sock, const struct sockaddr *dst_addr, +static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, int flags, + struct net_sockaddr *from, net_socklen_t *fromlen); +static int prepare_send_cmd(const struct modem_socket *sock, const struct net_sockaddr *dst_addr, size_t buf_len, char *cmd_buf, size_t cmd_buf_size); static int send_data_buffer(struct hl78xx_socket_data *socket_data, const char *buf, const size_t buf_len, int *sock_written); /* Socket lifecycle */ -static int create_socket(struct modem_socket *sock, const struct sockaddr *addr, +static int create_socket(struct modem_socket *sock, const struct net_sockaddr *addr, struct hl78xx_socket_data *data); static int socket_close(struct hl78xx_socket_data *socket_data, struct modem_socket *sock); static int socket_delete(struct hl78xx_socket_data *socket_data, struct modem_socket *sock); @@ -256,7 +255,7 @@ static void socket_notify_data(int socket_id, int new_total, void *user_data); */ #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS) && defined(CONFIG_MODEM_HL78XX_SOCKETS_SOCKOPT_TLS) static int map_credentials(struct hl78xx_socket_data *socket_data, const void *optval, - socklen_t optlen); + net_socklen_t optlen); static int hl78xx_configure_chipper_suit(struct hl78xx_socket_data *socket_data); #endif /* CONFIG_NET_SOCKETS_SOCKOPT_TLS */ @@ -678,7 +677,7 @@ void hl78xx_on_cgdcontrdp(struct modem_chat *chat, char **argv, uint16_t argc, v */ static bool parse_ip(bool is_ipv4, const char *ip_str, void *out_addr) { - int ret = net_addr_pton(is_ipv4 ? AF_INET : AF_INET6, ip_str, out_addr); + int ret = net_addr_pton(is_ipv4 ? NET_AF_INET : NET_AF_INET6, ip_str, out_addr); LOG_DBG("Parsing %s address: %s -> %s", is_ipv4 ? "IPv4" : "IPv6", ip_str, (ret < 0) ? "FAIL" : "OK"); @@ -728,7 +727,7 @@ static bool update_dns(struct hl78xx_socket_data *socket_data, bool is_ipv4, con return false; } - net_addr_ntop(AF_INET6, &socket_data->dns.v6, socket_data->dns.v6_string, + net_addr_ntop(NET_AF_INET6, &socket_data->dns.v6, socket_data->dns.v6_string, sizeof(socket_data->dns.v6_string)); LOG_DBG("Parsed IPv6 DNS: %s", socket_data->dns.v6_string); } @@ -1195,7 +1194,7 @@ void dns_work_cb(const struct device *dev, bool hard_reset) struct hl78xx_socket_data *socket_data = (struct hl78xx_socket_data *)data->offload_dev->data; struct dns_resolve_context *dnsCtx; - struct sockaddr temp_addr; + struct net_sockaddr temp_addr; bool valid_address = false; bool retry = false; const char *const dns_servers_str[DNS_SERVERS_COUNT] = { @@ -1338,17 +1337,17 @@ int modem_handle_data_capture(size_t target_len, struct hl78xx_data *data) target_len, data); } -static int extract_ip_family_and_port(const struct sockaddr *addr, int *af, uint16_t *port) +static int extract_ip_family_and_port(const struct net_sockaddr *addr, int *af, uint16_t *port) { #if defined(CONFIG_NET_IPV6) - if (addr->sa_family == AF_INET6) { - *port = ntohs(net_sin6(addr)->sin6_port); + if (addr->sa_family == NET_AF_INET6) { + *port = net_ntohs(net_sin6(addr)->sin6_port); *af = MDM_HL78XX_SOCKET_AF_IPV6; } else { #endif /* CONFIG_NET_IPV6 */ #if defined(CONFIG_NET_IPV4) - if (addr->sa_family == AF_INET) { - *port = ntohs(net_sin(addr)->sin_port); + if (addr->sa_family == NET_AF_INET) { + *port = net_ntohs(net_sin(addr)->sin_port); *af = MDM_HL78XX_SOCKET_AF_IPV4; } else { #endif /* CONFIG_NET_IPV4 */ @@ -1364,7 +1363,7 @@ static int extract_ip_family_and_port(const struct sockaddr *addr, int *af, uint } static int format_ip_and_setup_tls(struct hl78xx_socket_data *socket_data, - const struct sockaddr *addr, char *ip_str, size_t ip_str_len, + const struct net_sockaddr *addr, char *ip_str, size_t ip_str_len, struct modem_socket *sock) { int ret = modem_context_sprint_ip_addr(addr, ip_str, ip_str_len); @@ -1374,7 +1373,7 @@ static int format_ip_and_setup_tls(struct hl78xx_socket_data *socket_data, errno = ENOMEM; return -1; } - if (sock->ip_proto == IPPROTO_TCP) { + if (sock->ip_proto == NET_IPPROTO_TCP) { /* Determine actual length of the formatted IP string (it may be * shorter than the provided buffer size). Copy at most * MDM_MAX_HOSTNAME_LEN - 1 bytes and ensure NUL-termination to @@ -1417,7 +1416,7 @@ static int send_tcp_or_tls_config(struct modem_socket *sock, uint16_t dst_port, return 0; } -static int send_udp_config(const struct sockaddr *addr, struct hl78xx_socket_data *socket_data, +static int send_udp_config(const struct net_sockaddr *addr, struct hl78xx_socket_data *socket_data, struct modem_socket *sock) { int ret = 0; @@ -1443,7 +1442,7 @@ static int send_udp_config(const struct sockaddr *addr, struct hl78xx_socket_dat return -1; } -static int create_socket(struct modem_socket *sock, const struct sockaddr *addr, +static int create_socket(struct modem_socket *sock, const struct net_sockaddr *addr, struct hl78xx_socket_data *data) { LOG_DBG("entry fd=%d id=%d", sock->sock_fd, sock->id); @@ -1461,15 +1460,15 @@ static int create_socket(struct modem_socket *sock, const struct sockaddr *addr, if (format_ip_and_setup_tls(data, addr, ip_str, sizeof(ip_str), sock) < 0) { return -1; } - is_udp = (sock->ip_proto == IPPROTO_UDP); + is_udp = (sock->ip_proto == NET_IPPROTO_UDP); if (is_udp) { ret = send_udp_config(addr, data, sock); LOG_DBG("send_udp_config returned %d", ret); return ret; } - mode = (sock->ip_proto == IPPROTO_TLS_1_2) ? 3 : 0; + mode = (sock->ip_proto == NET_IPPROTO_TLS_1_2) ? 3 : 0; /* only TCP and TLS are supported */ - if (sock->ip_proto != IPPROTO_TCP && sock->ip_proto != IPPROTO_TLS_1_2) { + if (sock->ip_proto != NET_IPPROTO_TCP && sock->ip_proto != NET_IPPROTO_TLS_1_2) { LOG_ERR("Unsupported protocol: %d", sock->ip_proto); errno = EPROTONOSUPPORT; return -1; @@ -1487,7 +1486,7 @@ static int socket_close(struct hl78xx_socket_data *socket_data, struct modem_soc char buf[sizeof("AT+KTCPCLOSE=##\r")]; int ret = 0; - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { snprintk(buf, sizeof(buf), "AT+KUDPCLOSE=%d", sock->id); } else { snprintk(buf, sizeof(buf), "AT+KTCPCLOSE=%d", sock->id); @@ -1506,7 +1505,7 @@ static int socket_delete(struct hl78xx_socket_data *socket_data, struct modem_so char buf[sizeof("AT+KTCPDEL=##\r")]; int ret = 0; - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { /** * snprintk(buf, sizeof(buf), "AT+KUDPDEL=%d", sock->id); * No need to delete udp config here according to ref guide. The at UDPCLOSE @@ -1579,7 +1578,7 @@ static int offload_close(void *obj) return 0; } -static int offload_bind(void *obj, const struct sockaddr *addr, socklen_t addrlen) +static int offload_bind(void *obj, const struct net_sockaddr *addr, net_socklen_t addrlen) { struct modem_socket *sock = (struct modem_socket *)obj; struct hl78xx_socket_data *socket_data = hl78xx_socket_data_from_sock(sock); @@ -1606,7 +1605,7 @@ static int offload_bind(void *obj, const struct sockaddr *addr, socklen_t addrle return 0; } -static int offload_connect(void *obj, const struct sockaddr *addr, socklen_t addrlen) +static int offload_connect(void *obj, const struct net_sockaddr *addr, net_socklen_t addrlen) { struct modem_socket *sock = (struct modem_socket *)obj; struct hl78xx_socket_data *socket_data = hl78xx_socket_data_from_sock(sock); @@ -1637,7 +1636,7 @@ static int offload_connect(void *obj, const struct sockaddr *addr, socklen_t add } memcpy(&sock->dst, addr, sizeof(*addr)); /* skip socket connect if UDP */ - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { errno = 0; return 0; } @@ -1709,7 +1708,7 @@ static void prepare_read_command(struct hl78xx_socket_data *socket_data, char *s size_t bufsize, struct modem_socket *sock, size_t read_size) { snprintk(sendbuf, bufsize, "AT+K%sRCV=%d,%zd%s", - sock->ip_proto == IPPROTO_UDP ? "UDP" : "TCP", sock->id, read_size, + sock->ip_proto == NET_IPPROTO_UDP ? "UDP" : "TCP", sock->id, read_size, socket_data->mdata_global->chat.delimiter); } @@ -1754,7 +1753,7 @@ static int hl78xx_perform_receive_transaction(struct hl78xx_socket_data *socket_ static void setup_socket_data(struct hl78xx_socket_data *socket_data, struct modem_socket *sock, struct socket_read_data *sock_data, void *buf, size_t len, - struct sockaddr *from, uint16_t read_size) + struct net_sockaddr *from, uint16_t read_size) { memset(sock_data, 0, sizeof(*sock_data)); sock_data->recv_buf = buf; @@ -1782,15 +1781,15 @@ static void check_tcp_state_if_needed(struct hl78xx_socket_data *socket_data, } if (atomic_test_and_clear_bit(&socket_data->mdata_global->state_leftover, MODEM_SOCKET_DATA_LEFTOVER_STATE_BIT) && - sock && sock->ip_proto == IPPROTO_TCP) { + sock && sock->ip_proto == NET_IPPROTO_TCP) { modem_dynamic_cmd_send(socket_data->mdata_global, NULL, check_ktcp_stat, strlen(check_ktcp_stat), hl78xx_get_ktcp_state_match(), 1, true); } } -static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, int flags, struct sockaddr *from, - socklen_t *fromlen) +static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, int flags, + struct net_sockaddr *from, net_socklen_t *fromlen) { struct modem_socket *sock = (struct modem_socket *)obj; struct hl78xx_socket_data *socket_data = hl78xx_socket_data_from_sock(sock); @@ -1892,12 +1891,12 @@ int check_if_any_socket_connected(const struct device *dev) * Helpers used by sendto/recv paths, preparing commands and transmitting * data over the modem pipe. */ -static int prepare_send_cmd(const struct modem_socket *sock, const struct sockaddr *dst_addr, +static int prepare_send_cmd(const struct modem_socket *sock, const struct net_sockaddr *dst_addr, size_t buf_len, char *cmd_buf, size_t cmd_buf_size) { int ret = 0; - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { char ip_str[NET_IPV6_ADDR_LEN]; uint16_t dst_port = 0; @@ -1952,7 +1951,7 @@ static int send_data_buffer(struct hl78xx_socket_data *socket_data, const char * return 0; } -static int validate_and_prepare(struct modem_socket *sock, const struct sockaddr **dst_addr, +static int validate_and_prepare(struct modem_socket *sock, const struct net_sockaddr **dst_addr, size_t *buf_len, char *cmd_buf, size_t cmd_buf_len) { /* Validate args and prepare send command */ @@ -1964,7 +1963,7 @@ static int validate_and_prepare(struct modem_socket *sock, const struct sockaddr errno = ENOTCONN; return -1; } - if (!*dst_addr && sock->ip_proto == IPPROTO_UDP) { + if (!*dst_addr && sock->ip_proto == NET_IPPROTO_UDP) { *dst_addr = &sock->dst; } if (*buf_len > MDM_MAX_DATA_LENGTH) { @@ -1999,7 +1998,8 @@ static int transmit_regular_data(struct hl78xx_socket_data *socket_data, const c /* send binary data via the +KUDPSND/+KTCPSND commands */ static ssize_t send_socket_data(void *obj, struct hl78xx_socket_data *socket_data, - const struct sockaddr *dst_addr, const char *buf, size_t buf_len, + const struct net_sockaddr *dst_addr, + const char *buf, size_t buf_len, k_timeout_t timeout) { struct modem_socket *sock = (struct modem_socket *)obj; @@ -2045,7 +2045,7 @@ static ssize_t send_socket_data(void *obj, struct hl78xx_socket_data *socket_dat /* ===== TLS implementation (conditional) ================================ * TLS credential upload and chipper settings helper implementations. */ -static int handle_tls_sockopts(void *obj, int optname, const void *optval, socklen_t optlen) +static int handle_tls_sockopts(void *obj, int optname, const void *optval, net_socklen_t optlen) { int ret; struct modem_socket *sock = (struct modem_socket *)obj; @@ -2056,11 +2056,11 @@ static int handle_tls_sockopts(void *obj, int optname, const void *optval, sockl } switch (optname) { - case TLS_SEC_TAG_LIST: + case ZSOCK_TLS_SEC_TAG_LIST: ret = map_credentials(socket_data, optval, optlen); return ret; - case TLS_HOSTNAME: + case ZSOCK_TLS_HOSTNAME: if (optlen >= MDM_MAX_HOSTNAME_LEN) { return -EINVAL; } @@ -2076,13 +2076,13 @@ static int handle_tls_sockopts(void *obj, int optname, const void *optval, sockl LOG_DBG("TLS hostname set to: %s", socket_data->tls.hostname); return 0; - case TLS_PEER_VERIFY: + case ZSOCK_TLS_PEER_VERIFY: if (*(const uint32_t *)optval != TLS_PEER_VERIFY_REQUIRED) { LOG_WRN("Disabling peer verification is not supported"); } return 0; - case TLS_CERT_NOCOPY: + case ZSOCK_TLS_CERT_NOCOPY: return 0; /* No-op, success */ default: @@ -2092,14 +2092,14 @@ static int handle_tls_sockopts(void *obj, int optname, const void *optval, sockl } static int offload_setsockopt(void *obj, int level, int optname, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { int ret = 0; if (!IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS)) { return -EINVAL; } - if (level == SOL_TLS) { + if (level == ZSOCK_SOL_TLS) { ret = handle_tls_sockopts(obj, optname, optval, optlen); if (ret < 0) { hl78xx_set_errno_from_code(ret); @@ -2113,7 +2113,7 @@ static int offload_setsockopt(void *obj, int level, int optname, const void *opt #endif /* CONFIG_MODEM_HL78XX_SOCKETS_SOCKOPT_TLS */ static ssize_t offload_sendto(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *to, socklen_t tolen) + const struct net_sockaddr *to, net_socklen_t tolen) { int ret = 0; struct modem_socket *sock = (struct modem_socket *)obj; @@ -2180,7 +2180,7 @@ static int offload_ioctl(void *obj, unsigned int request, va_list args) pev_end); if (ret == -1 && errno == ENOTSUP && (pfd->events & ZSOCK_POLLOUT) && - sock->ip_proto == IPPROTO_UDP) { + sock->ip_proto == NET_IPPROTO_UDP) { /* Not Implemented */ /* * You can implement this later when needed @@ -2196,10 +2196,10 @@ static int offload_ioctl(void *obj, unsigned int request, va_list args) pev = va_arg(args, struct k_poll_event **); return modem_socket_poll_update(obj, pfd, pev); - case F_GETFL: + case ZVFS_F_GETFL: return 0; - case F_SETFL: { + case ZVFS_F_SETFL: { #ifdef CONFIG_MODEM_HL78XX_LOG_CONTEXT_VERBOSE_DEBUG int flags = va_arg(args, int); @@ -2226,11 +2226,14 @@ static ssize_t offload_write(void *obj, const void *buffer, size_t count) return offload_sendto(obj, buffer, count, 0, NULL, 0); } -static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) +static ssize_t offload_sendmsg(void *obj, const struct net_msghdr *msg, int flags) { ssize_t sent = 0; struct iovec bkp_iovec = {0}; - struct msghdr crafted_msg = {.msg_name = msg->msg_name, .msg_namelen = msg->msg_namelen}; + struct net_msghdr crafted_msg = { + .msg_name = msg->msg_name, + .msg_namelen = msg->msg_namelen + }; struct modem_socket *sock = (struct modem_socket *)obj; struct hl78xx_socket_data *socket_data = hl78xx_socket_data_from_sock(sock); size_t full_len = 0; @@ -2395,12 +2398,12 @@ static ssize_t hl78xx_send_cert(struct hl78xx_socket_data *socket_data, const ch return -EINVAL; } - if (cert_type == TLS_CREDENTIAL_CA_CERTIFICATE || - cert_type == TLS_CREDENTIAL_SERVER_CERTIFICATE) { + if (cert_type == ZSOCK_TLS_CREDENTIAL_CA_CERTIFICATE || + cert_type == ZSOCK_TLS_CREDENTIAL_SERVER_CERTIFICATE) { snprintk(send_buf, sizeof(send_buf), "AT+KCERTSTORE=%d,%d", (cert_type - 1), cert_len); - } else if (cert_type == TLS_CREDENTIAL_PRIVATE_KEY) { + } else if (cert_type == ZSOCK_TLS_CREDENTIAL_PRIVATE_KEY) { snprintk(send_buf, sizeof(send_buf), "AT+KPRIVKSTORE=0,%d", cert_len); } else { @@ -2453,7 +2456,7 @@ static ssize_t hl78xx_send_cert(struct hl78xx_socket_data *socket_data, const ch } static int map_credentials(struct hl78xx_socket_data *socket_data, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { const sec_tag_t *sec_tags = (const sec_tag_t *)optval; int ret = 0; @@ -2472,21 +2475,21 @@ static int map_credentials(struct hl78xx_socket_data *socket_data, const void *o cert = credential_next_get(tag, NULL); while (cert != NULL) { switch (cert->type) { - case TLS_CREDENTIAL_CA_CERTIFICATE: + case ZSOCK_TLS_CREDENTIAL_CA_CERTIFICATE: LOG_DBG("TLS_CREDENTIAL_CA_CERTIFICATE tag: %d", tag); break; - case TLS_CREDENTIAL_SERVER_CERTIFICATE: + case ZSOCK_TLS_CREDENTIAL_SERVER_CERTIFICATE: LOG_DBG("TLS_CREDENTIAL_SERVER_CERTIFICATE tag: %d", tag); break; - case TLS_CREDENTIAL_PRIVATE_KEY: + case ZSOCK_TLS_CREDENTIAL_PRIVATE_KEY: LOG_DBG("TLS_CREDENTIAL_PRIVATE_KEY tag: %d", tag); break; - case TLS_CREDENTIAL_NONE: - case TLS_CREDENTIAL_PSK: - case TLS_CREDENTIAL_PSK_ID: + case ZSOCK_TLS_CREDENTIAL_NONE: + case ZSOCK_TLS_CREDENTIAL_PSK: + case ZSOCK_TLS_CREDENTIAL_PSK_ID: default: /* Not handled */ return -EINVAL; @@ -2560,26 +2563,26 @@ static bool offload_is_supported(int family, int type, int proto) bool fam_ok = false; #ifdef CONFIG_NET_IPV4 - if (family == AF_INET) { + if (family == NET_AF_INET) { fam_ok = true; } #endif #ifdef CONFIG_NET_IPV6 - if (family == AF_INET6) { + if (family == NET_AF_INET6) { fam_ok = true; } #endif if (!fam_ok) { return false; } - if (!(type == SOCK_DGRAM || type == SOCK_STREAM)) { + if (!(type == NET_SOCK_DGRAM || type == NET_SOCK_STREAM)) { return false; } - if (proto == IPPROTO_TCP || proto == IPPROTO_UDP) { + if (proto == NET_IPPROTO_TCP || proto == NET_IPPROTO_UDP) { return true; } #if defined(CONFIG_MODEM_HL78XX_SOCKETS_SOCKOPT_TLS) - if (proto == IPPROTO_TLS_1_2) { + if (proto == NET_IPPROTO_TLS_1_2) { return true; } #endif @@ -2594,7 +2597,7 @@ static bool offload_is_supported(int family, int type, int proto) inst, "hl78xx_dev", hl78xx_socket_init, NULL, &hl78xx_socket_data_##inst, NULL, \ CONFIG_MODEM_HL78XX_OFFLOAD_INIT_PRIORITY, &api_funcs, MDM_MAX_DATA_LENGTH); \ \ - NET_SOCKET_OFFLOAD_REGISTER(inst, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, AF_UNSPEC, \ + NET_SOCKET_OFFLOAD_REGISTER(inst, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, NET_AF_UNSPEC, \ offload_is_supported, offload_socket); #define MODEM_OFFLOAD_DEVICE_SWIR_HL78XX(inst) MODEM_HL78XX_DEFINE_OFFLOAD_INSTANCE(inst) diff --git a/drivers/modem/modem_context.c b/drivers/modem/modem_context.c index 01cd1ced6a5cd..e7807744cb761 100644 --- a/drivers/modem/modem_context.c +++ b/drivers/modem/modem_context.c @@ -20,27 +20,27 @@ LOG_MODULE_REGISTER(modem_context, CONFIG_MODEM_LOG_LEVEL); static struct modem_context *contexts[CONFIG_MODEM_CONTEXT_MAX_NUM]; -int modem_context_sprint_ip_addr(const struct sockaddr *addr, char *buf, size_t buf_size) +int modem_context_sprint_ip_addr(const struct net_sockaddr *addr, char *buf, size_t buf_size) { static const char unknown_str[] = "unk"; - if (addr->sa_family == AF_INET6) { + if (addr->sa_family == NET_AF_INET6) { if (buf_size < NET_IPV6_ADDR_LEN) { return -ENOMEM; } - if (net_addr_ntop(AF_INET6, &net_sin6(addr)->sin6_addr, + if (net_addr_ntop(NET_AF_INET6, &net_sin6(addr)->sin6_addr, buf, buf_size) == NULL) { return -ENOMEM; } return 0; } - if (addr->sa_family == AF_INET) { + if (addr->sa_family == NET_AF_INET) { if (buf_size < NET_IPV4_ADDR_LEN) { return -ENOMEM; } - if (net_addr_ntop(AF_INET, &net_sin(addr)->sin_addr, + if (net_addr_ntop(NET_AF_INET, &net_sin(addr)->sin_addr, buf, buf_size) == NULL) { return -ENOMEM; } @@ -56,17 +56,17 @@ int modem_context_sprint_ip_addr(const struct sockaddr *addr, char *buf, size_t return 0; } -int modem_context_get_addr_port(const struct sockaddr *addr, uint16_t *port) +int modem_context_get_addr_port(const struct net_sockaddr *addr, uint16_t *port) { if (!addr || !port) { return -EINVAL; } - if (addr->sa_family == AF_INET6) { - *port = ntohs(net_sin6(addr)->sin6_port); + if (addr->sa_family == NET_AF_INET6) { + *port = net_ntohs(net_sin6(addr)->sin6_port); return 0; - } else if (addr->sa_family == AF_INET) { - *port = ntohs(net_sin(addr)->sin_port); + } else if (addr->sa_family == NET_AF_INET) { + *port = net_ntohs(net_sin(addr)->sin_port); return 0; } diff --git a/drivers/modem/modem_context.h b/drivers/modem/modem_context.h index 8c75e24aeb1e6..7a6579b0d9b67 100644 --- a/drivers/modem/modem_context.h +++ b/drivers/modem/modem_context.h @@ -75,23 +75,23 @@ struct modem_context { /** * @brief IP address to string * - * @param addr: sockaddr to be converted + * @param addr: net_sockaddr to be converted * @param buf: Buffer to store IP in string form * @param buf_size: buffer size * * @retval 0 if ok, < 0 if error. */ -int modem_context_sprint_ip_addr(const struct sockaddr *addr, char *buf, size_t buf_size); +int modem_context_sprint_ip_addr(const struct net_sockaddr *addr, char *buf, size_t buf_size); /** * @brief Get port from IP address * - * @param addr: sockaddr + * @param addr: net_sockaddr * @param port: store port * * @retval 0 if ok, < 0 if error. */ -int modem_context_get_addr_port(const struct sockaddr *addr, uint16_t *port); +int modem_context_get_addr_port(const struct net_sockaddr *addr, uint16_t *port); /** * @brief Gets modem context by id. diff --git a/drivers/modem/modem_socket.c b/drivers/modem/modem_socket.c index 81c5a5cd31de8..a614777dbc897 100644 --- a/drivers/modem/modem_socket.c +++ b/drivers/modem/modem_socket.c @@ -241,8 +241,8 @@ void modem_socket_put(struct modem_socket_config *cfg, int sock_fd) sock->sock_fd = -1; sock->is_waiting = false; sock->is_connected = false; - (void)memset(&sock->src, 0, sizeof(struct sockaddr)); - (void)memset(&sock->dst, 0, sizeof(struct sockaddr)); + (void)memset(&sock->src, 0, sizeof(struct net_sockaddr)); + (void)memset(&sock->dst, 0, sizeof(struct net_sockaddr)); memset(&sock->packet_sizes, 0, sizeof(sock->packet_sizes)); sock->packet_count = 0; k_sem_reset(&sock->sem_data_ready); diff --git a/drivers/modem/modem_socket.h b/drivers/modem/modem_socket.h index 1c333f818df76..b679076e874b2 100644 --- a/drivers/modem/modem_socket.h +++ b/drivers/modem/modem_socket.h @@ -27,8 +27,8 @@ __net_socket struct modem_socket { sa_family_t family; enum net_sock_type type; int ip_proto; - struct sockaddr src; - struct sockaddr dst; + struct net_sockaddr src; + struct net_sockaddr dst; /** The number identifying the socket handle inside the modem */ int id; diff --git a/drivers/modem/quectel-bg9x.c b/drivers/modem/quectel-bg9x.c index f6f7bcd8d0695..c54ad26a065cf 100644 --- a/drivers/modem/quectel-bg9x.c +++ b/drivers/modem/quectel-bg9x.c @@ -438,7 +438,7 @@ MODEM_CMD_DEFINE(on_cmd_unsol_rdy) * Desc: This function will send "binary" data over the socket object. */ static ssize_t send_socket_data(struct modem_socket *sock, - const struct sockaddr *dst_addr, + const struct net_sockaddr *dst_addr, struct modem_cmd *handler_cmds, size_t handler_cmds_len, const char *buf, size_t buf_len, @@ -518,7 +518,7 @@ static ssize_t send_socket_data(struct modem_socket *sock, * Desc: This function will send data on the socket object. */ static ssize_t offload_sendto(void *obj, const void *buf, size_t len, - int flags, const struct sockaddr *to, + int flags, const struct net_sockaddr *to, socklen_t tolen) { int ret; @@ -549,7 +549,7 @@ static ssize_t offload_sendto(void *obj, const void *buf, size_t len, } /* UDP is not supported. */ - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { errno = ENOTSUP; return -1; } @@ -575,7 +575,7 @@ static ssize_t offload_sendto(void *obj, const void *buf, size_t len, * Desc: This function will receive data on the socket object. */ static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, - int flags, struct sockaddr *from, + int flags, struct net_sockaddr *from, socklen_t *fromlen) { struct modem_socket *sock = (struct modem_socket *)obj; @@ -684,7 +684,7 @@ static int offload_ioctl(void *obj, unsigned int request, va_list args) /* Func: offload_connect * Desc: This function will connect with a provided TCP. */ -static int offload_connect(void *obj, const struct sockaddr *addr, +static int offload_connect(void *obj, const struct net_sockaddr *addr, socklen_t addrlen) { struct modem_socket *sock = (struct modem_socket *) obj; @@ -713,14 +713,14 @@ static int offload_connect(void *obj, const struct sockaddr *addr, } /* Find the correct destination port. */ - if (addr->sa_family == AF_INET6) { - dst_port = ntohs(net_sin6(addr)->sin6_port); - } else if (addr->sa_family == AF_INET) { - dst_port = ntohs(net_sin(addr)->sin_port); + if (addr->sa_family == NET_AF_INET6) { + dst_port = net_ntohs(net_sin6(addr)->sin6_port); + } else if (addr->sa_family == NET_AF_INET) { + dst_port = net_ntohs(net_sin(addr)->sin_port); } /* UDP is not supported. */ - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { errno = ENOTSUP; return -1; } @@ -811,7 +811,7 @@ static int offload_close(void *obj) /* Func: offload_sendmsg * Desc: This function sends messages to the modem. */ -static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) +static ssize_t offload_sendmsg(void *obj, const struct net_msghdr *msg, int flags) { ssize_t sent = 0; int rc; @@ -1129,16 +1129,16 @@ static struct offloaded_if_api api_funcs = { static bool offload_is_supported(int family, int type, int proto) { - if (family != AF_INET && - family != AF_INET6) { + if (family != NET_AF_INET && + family != NET_AF_INET6) { return false; } - if (type != SOCK_STREAM) { + if (type != NET_SOCK_STREAM) { return false; } - if (proto != IPPROTO_TCP) { + if (proto != NET_IPPROTO_TCP) { return false; } @@ -1287,4 +1287,4 @@ NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, modem_init, NULL, /* Register NET sockets. */ NET_SOCKET_OFFLOAD_REGISTER(quectel_bg9x, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, - AF_UNSPEC, offload_is_supported, offload_socket); + NET_AF_UNSPEC, offload_is_supported, offload_socket); diff --git a/drivers/modem/quectel-bg9x.h b/drivers/modem/quectel-bg9x.h index bda84b2e8eb70..d506790e5a5fb 100644 --- a/drivers/modem/quectel-bg9x.h +++ b/drivers/modem/quectel-bg9x.h @@ -123,7 +123,7 @@ struct modem_data { struct socket_read_data { char *recv_buf; size_t recv_buf_len; - struct sockaddr *recv_addr; + struct net_sockaddr *recv_addr; uint16_t recv_read_len; }; diff --git a/drivers/modem/simcom/sim7080/sim7080.c b/drivers/modem/simcom/sim7080/sim7080.c index d3cb6987dc2d5..89fb71ed18cff 100644 --- a/drivers/modem/simcom/sim7080/sim7080.c +++ b/drivers/modem/simcom/sim7080/sim7080.c @@ -102,18 +102,18 @@ static struct offloaded_if_api api_funcs = { static bool offload_is_supported(int family, int type, int proto) { - if (family != AF_INET && - family != AF_INET6) { + if (family != NET_AF_INET && + family != NET_AF_INET6) { return false; } - if (type != SOCK_DGRAM && - type != SOCK_STREAM) { + if (type != NET_SOCK_DGRAM && + type != NET_SOCK_STREAM) { return false; } - if (proto != IPPROTO_TCP && - proto != IPPROTO_UDP) { + if (proto != NET_IPPROTO_TCP && + proto != NET_IPPROTO_UDP) { return false; } @@ -881,4 +881,4 @@ NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, modem_init, NULL, &mdata, NULL, MDM_MAX_DATA_LENGTH); NET_SOCKET_OFFLOAD_REGISTER(simcom_sim7080, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, - AF_UNSPEC, offload_is_supported, sim7080_offload_socket); + NET_AF_UNSPEC, offload_is_supported, sim7080_offload_socket); diff --git a/drivers/modem/simcom/sim7080/sim7080.h b/drivers/modem/simcom/sim7080/sim7080.h index 57ca6c6e8a074..d8b2655c8ede8 100644 --- a/drivers/modem/simcom/sim7080/sim7080.h +++ b/drivers/modem/simcom/sim7080/sim7080.h @@ -177,7 +177,7 @@ struct sim7080_data { struct socket_read_data { char *recv_buf; size_t recv_buf_len; - struct sockaddr *recv_addr; + struct net_sockaddr *recv_addr; uint16_t recv_read_len; }; diff --git a/drivers/modem/simcom/sim7080/sim7080_dns.c b/drivers/modem/simcom/sim7080/sim7080_dns.c index 105de0ce3b294..e5e96cabcb690 100644 --- a/drivers/modem/simcom/sim7080/sim7080_dns.c +++ b/drivers/modem/simcom/sim7080/sim7080_dns.c @@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(modem_simcom_sim7080_dns, CONFIG_MODEM_LOG_LEVEL); #include "sim7080.h" static struct zsock_addrinfo dns_result; -static struct sockaddr dns_result_addr; +static struct net_sockaddr dns_result_addr; static char dns_result_canonname[DNS_MAX_NAME_SIZE + 1]; /* @@ -53,7 +53,7 @@ MODEM_CMD_DEFINE(on_cmd_cdnsgip) *ipv4 = '\0'; net_addr_pton(dns_result.ai_family, ips, - &((struct sockaddr_in *)&dns_result_addr)->sin_addr); + &((struct net_sockaddr_in *)&dns_result_addr)->sin_addr); ret = 0; exit: @@ -83,8 +83,8 @@ static int offload_getaddrinfo(const char *node, const char *service, (void)memset(&dns_result_addr, 0, sizeof(dns_result_addr)); /* Currently only support IPv4. */ - dns_result.ai_family = AF_INET; - dns_result_addr.sa_family = AF_INET; + dns_result.ai_family = NET_AF_INET; + dns_result_addr.sa_family = NET_AF_INET; dns_result.ai_addr = &dns_result_addr; dns_result.ai_addrlen = sizeof(dns_result_addr); dns_result.ai_canonname = dns_result_canonname; @@ -98,14 +98,14 @@ static int offload_getaddrinfo(const char *node, const char *service, } if (port > 0U) { - if (dns_result.ai_family == AF_INET) { + if (dns_result.ai_family == NET_AF_INET) { net_sin(&dns_result_addr)->sin_port = htons(port); } } /* Check if node is an IP address */ if (net_addr_pton(dns_result.ai_family, node, - &((struct sockaddr_in *)&dns_result_addr)->sin_addr) == 0) { + &((struct net_sockaddr_in *)&dns_result_addr)->sin_addr) == 0) { *res = &dns_result; return 0; } diff --git a/drivers/modem/simcom/sim7080/sim7080_sock.c b/drivers/modem/simcom/sim7080/sim7080_sock.c index 66b52d9a141a4..0b6961d051eba 100644 --- a/drivers/modem/simcom/sim7080/sim7080_sock.c +++ b/drivers/modem/simcom/sim7080/sim7080_sock.c @@ -31,7 +31,7 @@ MODEM_CMD_DEFINE(on_cmd_caopen) /* * Connects an modem socket. Protocol can either be TCP or UDP. */ -static int offload_connect(void *obj, const struct sockaddr *addr, socklen_t addrlen) +static int offload_connect(void *obj, const struct net_sockaddr *addr, socklen_t addrlen) { struct modem_socket *sock = (struct modem_socket *)obj; uint16_t dst_port = 0; @@ -60,10 +60,10 @@ static int offload_connect(void *obj, const struct sockaddr *addr, socklen_t add } /* get the destination port */ - if (addr->sa_family == AF_INET6) { - dst_port = ntohs(net_sin6(addr)->sin6_port); - } else if (addr->sa_family == AF_INET) { - dst_port = ntohs(net_sin(addr)->sin_port); + if (addr->sa_family == NET_AF_INET6) { + dst_port = net_ntohs(net_sin6(addr)->sin6_port); + } else if (addr->sa_family == NET_AF_INET) { + dst_port = net_ntohs(net_sin(addr)->sin_port); } /* Get protocol */ @@ -124,7 +124,7 @@ MODEM_CMD_DEFINE(on_cmd_casend) * then send a OK or ERROR. */ static ssize_t offload_sendto(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, net_socklen_t addrlen) { int ret; struct modem_socket *sock = (struct modem_socket *)obj; @@ -304,7 +304,7 @@ MODEM_CMD_DEFINE(on_cmd_carecv) * Read data from a given socket. */ static ssize_t offload_recvfrom(void *obj, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, socklen_t *addrlen) { struct modem_socket *sock = (struct modem_socket *)obj; char sendbuf[sizeof("AT+CARECV=##,####")]; @@ -377,7 +377,7 @@ static ssize_t offload_recvfrom(void *obj, void *buf, size_t max_len, int flags, /* * Sends messages to the modem. */ -static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) +static ssize_t offload_sendmsg(void *obj, const struct net_msghdr *msg, int flags) { struct modem_socket *sock = obj; ssize_t sent = 0; @@ -391,7 +391,7 @@ static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) return -EINVAL; } - if (sock->type == SOCK_DGRAM) { + if (sock->type == NET_SOCK_DGRAM) { /* * Current implementation only handles single contiguous fragment at a time, so * prevent sending multiple datagrams. diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c index d0bf44b0eb662..95fe769e81905 100644 --- a/drivers/modem/ublox-sara-r4.c +++ b/drivers/modem/ublox-sara-r4.c @@ -15,7 +15,6 @@ LOG_MODULE_REGISTER(modem_ublox_sara_r4, CONFIG_MODEM_LOG_LEVEL); #include #include #include -#include #include #include @@ -104,7 +103,7 @@ static struct k_work_q modem_workq; struct socket_read_data { char *recv_buf; size_t recv_buf_len; - struct sockaddr *recv_addr; + struct net_sockaddr *recv_addr; uint16_t recv_read_len; }; @@ -165,7 +164,7 @@ static struct modem_context mctx; #if defined(CONFIG_DNS_RESOLVER) static struct zsock_addrinfo result; -static struct sockaddr result_addr; +static struct net_sockaddr result_addr; static char result_canonname[DNS_MAX_NAME_SIZE + 1]; #endif @@ -287,7 +286,7 @@ MODEM_CMD_DEFINE(on_cmd_sockwrite); /* send binary data via the +USO[ST/WR] commands */ static ssize_t send_socket_data(void *obj, - const struct msghdr *msg, + const struct net_msghdr *msg, k_timeout_t timeout) { int ret; @@ -300,7 +299,7 @@ static ssize_t send_socket_data(void *obj, MODEM_CMD("+USOST: ", on_cmd_sockwrite, 2U, ","), MODEM_CMD("+USOWR: ", on_cmd_sockwrite, 2U, ","), }; - struct sockaddr *dst_addr = msg->msg_name; + struct net_sockaddr *dst_addr = msg->msg_name; size_t buf_len = 0; if (!sock) { @@ -315,12 +314,12 @@ static ssize_t send_socket_data(void *obj, buf_len += msg->msg_iov[i].iov_len; } - if (!sock->is_connected && sock->ip_proto != IPPROTO_UDP) { + if (!sock->is_connected && sock->ip_proto != NET_IPPROTO_UDP) { errno = ENOTCONN; return -1; } - if (!dst_addr && sock->ip_proto == IPPROTO_UDP) { + if (!dst_addr && sock->ip_proto == NET_IPPROTO_UDP) { dst_addr = &sock->dst; } @@ -329,7 +328,7 @@ static ssize_t send_socket_data(void *obj, * the socket in one command */ if (buf_len > MDM_MAX_DATA_LENGTH) { - if (sock->type == SOCK_DGRAM) { + if (sock->type == NET_SOCK_DGRAM) { errno = EMSGSIZE; return -1; } @@ -340,7 +339,7 @@ static ssize_t send_socket_data(void *obj, /* The number of bytes written will be reported by the modem */ mdata.sock_written = 0; - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { char ip_str[NET_IPV6_ADDR_LEN]; ret = modem_context_sprint_ip_addr(dst_addr, ip_str, sizeof(ip_str)); @@ -398,7 +397,7 @@ static ssize_t send_socket_data(void *obj, * if using AT+USOST. This if condition is matched with * the command selection above. */ - if (sock->ip_proto != IPPROTO_UDP) { + if (sock->ip_proto != NET_IPPROTO_UDP) { k_sleep(MDM_PROMPT_CMD_DELAY); } @@ -868,10 +867,10 @@ MODEM_CMD_DEFINE(on_cmd_dns) argv[0][strlen(argv[0]) - 1] = '\0'; /* FIXME: Hard-code DNS on SARA-R4 to return IPv4 */ - result_addr.sa_family = AF_INET; + result_addr.sa_family = NET_AF_INET; /* skip beginning quote when parsing */ (void)net_addr_pton(result.ai_family, &argv[0][1], - &((struct sockaddr_in *)&result_addr)->sin_addr); + &((struct net_sockaddr_in *)&result_addr)->sin_addr); return 0; } #endif @@ -1376,7 +1375,7 @@ static void modem_reset(void) * generic socket creation function * which can be called in bind() or connect() */ -static int create_socket(struct modem_socket *sock, const struct sockaddr *addr) +static int create_socket(struct modem_socket *sock, const struct net_sockaddr *addr) { int ret; static const struct modem_cmd cmd = @@ -1385,14 +1384,14 @@ static int create_socket(struct modem_socket *sock, const struct sockaddr *addr) uint16_t local_port = 0U, proto = 6U; if (addr) { - if (addr->sa_family == AF_INET6) { - local_port = ntohs(net_sin6(addr)->sin6_port); - } else if (addr->sa_family == AF_INET) { - local_port = ntohs(net_sin(addr)->sin_port); + if (addr->sa_family == NET_AF_INET6) { + local_port = net_ntohs(net_sin6(addr)->sin6_port); + } else if (addr->sa_family == NET_AF_INET) { + local_port = net_ntohs(net_sin(addr)->sin_port); } } - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { proto = 17U; } @@ -1410,7 +1409,7 @@ static int create_socket(struct modem_socket *sock, const struct sockaddr *addr) goto error; } - if (sock->ip_proto == IPPROTO_TLS_1_2) { + if (sock->ip_proto == NET_IPPROTO_TLS_1_2) { char atbuf[sizeof("AT+USECPRF=#,#,#######\r")]; /* Enable socket security */ @@ -1492,7 +1491,7 @@ static int offload_close(void *obj) return 0; } - if (sock->is_connected || sock->ip_proto == IPPROTO_UDP) { + if (sock->is_connected || sock->ip_proto == NET_IPPROTO_UDP) { snprintk(buf, sizeof(buf), "AT+USOCL=%d", sock->id); ret = modem_cmd_send(&mctx.iface, &mctx.cmd_handler, @@ -1507,8 +1506,8 @@ static int offload_close(void *obj) return 0; } -static int offload_bind(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int offload_bind(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { struct modem_socket *sock = (struct modem_socket *)obj; @@ -1525,8 +1524,8 @@ static int offload_bind(void *obj, const struct sockaddr *addr, return 0; } -static int offload_connect(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int offload_connect(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { struct modem_socket *sock = (struct modem_socket *)obj; int ret; @@ -1556,17 +1555,17 @@ static int offload_connect(void *obj, const struct sockaddr *addr, } memcpy(&sock->dst, addr, sizeof(*addr)); - if (addr->sa_family == AF_INET6) { - dst_port = ntohs(net_sin6(addr)->sin6_port); - } else if (addr->sa_family == AF_INET) { - dst_port = ntohs(net_sin(addr)->sin_port); + if (addr->sa_family == NET_AF_INET6) { + dst_port = net_ntohs(net_sin6(addr)->sin6_port); + } else if (addr->sa_family == NET_AF_INET) { + dst_port = net_ntohs(net_sin(addr)->sin_port); } else { errno = EAFNOSUPPORT; return -1; } /* skip socket connect if UDP */ - if (sock->ip_proto == IPPROTO_UDP) { + if (sock->ip_proto == NET_IPPROTO_UDP) { errno = 0; return 0; } @@ -1595,8 +1594,8 @@ static int offload_connect(void *obj, const struct sockaddr *addr, } static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, - int flags, struct sockaddr *from, - socklen_t *fromlen) + int flags, struct net_sockaddr *from, + net_socklen_t *fromlen) { struct modem_socket *sock = (struct modem_socket *)obj; int ret, next_packet_size; @@ -1625,7 +1624,7 @@ static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, return -1; } - if (!sock->is_connected && sock->ip_proto != IPPROTO_UDP) { + if (!sock->is_connected && sock->ip_proto != NET_IPPROTO_UDP) { errno = 0; return 0; } @@ -1644,7 +1643,7 @@ static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, } snprintk(sendbuf, sizeof(sendbuf), "AT+USO%s=%d,%zd", - sock->ip_proto == IPPROTO_UDP ? "RF" : "RD", sock->id, + sock->ip_proto == NET_IPPROTO_UDP ? "RF" : "RD", sock->id, len < next_packet_size ? len : next_packet_size); /* socket read settings */ @@ -1680,16 +1679,16 @@ static ssize_t offload_recvfrom(void *obj, void *buf, size_t len, } static ssize_t offload_sendto(void *obj, const void *buf, size_t len, - int flags, const struct sockaddr *to, - socklen_t tolen) + int flags, const struct net_sockaddr *to, + net_socklen_t tolen) { - struct iovec msg_iov = { + struct net_iovec msg_iov = { .iov_base = (void *)buf, .iov_len = len, }; - struct msghdr msg = { + struct net_msghdr msg = { .msg_iovlen = 1, - .msg_name = (struct sockaddr *)to, + .msg_name = (struct net_sockaddr *)to, .msg_namelen = tolen, .msg_iov = &msg_iov, }; @@ -1728,7 +1727,7 @@ static int offload_ioctl(void *obj, unsigned int request, va_list args) return modem_socket_poll_update(obj, pfd, pev); } - case F_GETFL: + case ZVFS_F_GETFL: return 0; default: @@ -1747,12 +1746,12 @@ static ssize_t offload_write(void *obj, const void *buffer, size_t count) return offload_sendto(obj, buffer, count, 0, NULL, 0); } -static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) +static ssize_t offload_sendmsg(void *obj, const struct net_msghdr *msg, int flags) { ssize_t sent = 0; int bkp_iovec_idx; - struct iovec bkp_iovec = {0}; - struct msghdr crafted_msg = { + struct net_iovec bkp_iovec = {0}; + struct net_msghdr crafted_msg = { .msg_name = msg->msg_name, .msg_namelen = msg->msg_namelen, }; @@ -1829,7 +1828,7 @@ static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) } #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS) -static int map_credentials(struct modem_socket *sock, const void *optval, socklen_t optlen) +static int map_credentials(struct modem_socket *sock, const void *optval, net_socklen_t optlen) { sec_tag_t *sec_tags = (sec_tag_t *)optval; int ret = 0; @@ -1850,12 +1849,12 @@ static int map_credentials(struct modem_socket *sock, const void *optval, sockle cert = credential_next_get(tag, NULL); while (cert != NULL) { switch (cert->type) { - case TLS_CREDENTIAL_CA_CERTIFICATE: + case ZSOCK_TLS_CREDENTIAL_CA_CERTIFICATE: id = 0; break; - case TLS_CREDENTIAL_NONE: - case TLS_CREDENTIAL_PSK: - case TLS_CREDENTIAL_PSK_ID: + case ZSOCK_TLS_CREDENTIAL_NONE: + case ZSOCK_TLS_CREDENTIAL_PSK: + case ZSOCK_TLS_CREDENTIAL_PSK_ID: default: /* Not handled */ return -EINVAL; @@ -1875,29 +1874,29 @@ static int map_credentials(struct modem_socket *sock, const void *optval, sockle return 0; } #else -static int map_credentials(struct modem_socket *sock, const void *optval, socklen_t optlen) +static int map_credentials(struct modem_socket *sock, const void *optval, net_socklen_t optlen) { return -EINVAL; } #endif static int offload_setsockopt(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { struct modem_socket *sock = (struct modem_socket *)obj; int ret; - if (IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS) && level == SOL_TLS) { + if (IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS) && level == ZSOCK_SOL_TLS) { switch (optname) { - case TLS_SEC_TAG_LIST: + case ZSOCK_TLS_SEC_TAG_LIST: ret = map_credentials(sock, optval, optlen); break; - case TLS_HOSTNAME: + case ZSOCK_TLS_HOSTNAME: LOG_WRN("TLS_HOSTNAME option is not supported"); return -EINVAL; - case TLS_PEER_VERIFY: - if (*(uint32_t *)optval != TLS_PEER_VERIFY_REQUIRED) { + case ZSOCK_TLS_PEER_VERIFY: + if (*(uint32_t *)optval != ZSOCK_TLS_PEER_VERIFY_REQUIRED) { LOG_WRN("Disabling peer verification is not supported"); return -EINVAL; } @@ -1934,19 +1933,19 @@ static const struct socket_op_vtable offload_socket_fd_op_vtable = { static bool offload_is_supported(int family, int type, int proto) { - if (family != AF_INET && - family != AF_INET6) { + if (family != NET_AF_INET && + family != NET_AF_INET6) { return false; } - if (type != SOCK_DGRAM && - type != SOCK_STREAM) { + if (type != NET_SOCK_DGRAM && + type != NET_SOCK_STREAM) { return false; } - if (proto != IPPROTO_TCP && - proto != IPPROTO_UDP && - proto != IPPROTO_TLS_1_2) { + if (proto != NET_IPPROTO_TCP && + proto != NET_IPPROTO_UDP && + proto != NET_IPPROTO_TLS_1_2) { return false; } @@ -1954,7 +1953,7 @@ static bool offload_is_supported(int family, int type, int proto) } NET_SOCKET_OFFLOAD_REGISTER(ublox_sara_r4, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, - AF_UNSPEC, offload_is_supported, offload_socket); + NET_AF_UNSPEC, offload_is_supported, offload_socket); #if defined(CONFIG_DNS_RESOLVER) /* TODO: This is a bare-bones implementation of DNS handling @@ -1976,8 +1975,8 @@ static int offload_getaddrinfo(const char *node, const char *service, (void)memset(&result, 0, sizeof(result)); (void)memset(&result_addr, 0, sizeof(result_addr)); /* FIXME: Hard-code DNS to return only IPv4 */ - result.ai_family = AF_INET; - result_addr.sa_family = AF_INET; + result.ai_family = NET_AF_INET; + result_addr.sa_family = NET_AF_INET; result.ai_addr = &result_addr; result.ai_addrlen = sizeof(result_addr); result.ai_canonname = result_canonname; @@ -1992,21 +1991,21 @@ static int offload_getaddrinfo(const char *node, const char *service, if (port > 0U) { /* FIXME: DNS is hard-coded to return only IPv4 */ - if (result.ai_family == AF_INET) { - net_sin(&result_addr)->sin_port = htons(port); + if (result.ai_family == NET_AF_INET) { + net_sin(&result_addr)->sin_port = net_htons(port); } } /* check to see if node is an IP address */ if (net_addr_pton(result.ai_family, node, - &((struct sockaddr_in *)&result_addr)->sin_addr) + &((struct net_sockaddr_in *)&result_addr)->sin_addr) == 0) { *res = &result; return 0; } /* user flagged node as numeric host, but we failed net_addr_pton */ - if (hints && hints->ai_flags & AI_NUMERICHOST) { + if (hints && hints->ai_flags & ZSOCK_AI_NUMERICHOST) { return DNS_EAI_NONAME; } diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c index 12b9b4b341a85..bd27e67e5b98c 100644 --- a/drivers/modem/wncm14a2a.c +++ b/drivers/modem/wncm14a2a.c @@ -108,8 +108,8 @@ struct wncm14a2a_socket { sa_family_t family; enum net_sock_type type; enum net_ip_protocol ip_proto; - struct sockaddr src; - struct sockaddr dst; + struct net_sockaddr src; + struct net_sockaddr dst; int socket_id; @@ -277,27 +277,21 @@ static void socket_put(struct wncm14a2a_socket *sock) sock->context = NULL; sock->socket_id = 0; - (void)memset(&sock->src, 0, sizeof(struct sockaddr)); - (void)memset(&sock->dst, 0, sizeof(struct sockaddr)); + (void)memset(&sock->src, 0, sizeof(struct net_sockaddr)); + (void)memset(&sock->dst, 0, sizeof(struct net_sockaddr)); } -char *wncm14a2a_sprint_ip_addr(const struct sockaddr *addr) +char *wncm14a2a_sprint_ip_addr(const struct net_sockaddr *addr) { static char buf[NET_IPV6_ADDR_LEN]; -#if defined(CONFIG_NET_IPV6) - if (addr->sa_family == AF_INET6) { - return net_addr_ntop(AF_INET6, &net_sin6(addr)->sin6_addr, + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { + return net_addr_ntop(NET_AF_INET6, &net_sin6(addr)->sin6_addr, buf, sizeof(buf)); - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (addr->sa_family == AF_INET) { - return net_addr_ntop(AF_INET, &net_sin(addr)->sin_addr, + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { + return net_addr_ntop(NET_AF_INET, &net_sin(addr)->sin_addr, buf, sizeof(buf)); - } else -#endif - { + } else { LOG_ERR("Unknown IP address family:%d", addr->sa_family); return NULL; } @@ -433,49 +427,39 @@ static int pkt_setup_ip_data(struct net_pkt *pkt, int hdr_len = 0; uint16_t src_port = 0U, dst_port = 0U; -#if defined(CONFIG_NET_IPV6) - if (net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { if (net_ipv6_create( pkt, - &((struct sockaddr_in6 *)&sock->dst)->sin6_addr, - &((struct sockaddr_in6 *)&sock->src)->sin6_addr)) { + &((struct net_sockaddr_in6 *)&sock->dst)->sin6_addr, + &((struct net_sockaddr_in6 *)&sock->src)->sin6_addr)) { return -1; } - src_port = ntohs(net_sin6(&sock->src)->sin6_port); - dst_port = ntohs(net_sin6(&sock->dst)->sin6_port); + src_port = net_ntohs(net_sin6(&sock->src)->sin6_port); + dst_port = net_ntohs(net_sin6(&sock->dst)->sin6_port); hdr_len = sizeof(struct net_ipv6_hdr); - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (net_pkt_family(pkt) == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { if (net_ipv4_create( pkt, - &((struct sockaddr_in *)&sock->dst)->sin_addr, - &((struct sockaddr_in *)&sock->src)->sin_addr)) { + &((struct net_sockaddr_in *)&sock->dst)->sin_addr, + &((struct net_sockaddr_in *)&sock->src)->sin_addr)) { return -1; } - src_port = ntohs(net_sin(&sock->src)->sin_port); - dst_port = ntohs(net_sin(&sock->dst)->sin_port); + src_port = net_ntohs(net_sin(&sock->src)->sin_port); + dst_port = net_ntohs(net_sin(&sock->dst)->sin_port); hdr_len = sizeof(struct net_ipv4_hdr); - } else -#endif - { + } else { /* no error here as hdr_len is checked later for 0 value */ } -#if defined(CONFIG_NET_UDP) - if (sock->ip_proto == IPPROTO_UDP) { + if (IS_ENABLED(CONFIG_NET_UDP) && sock->ip_proto == NET_IPPROTO_UDP) { if (net_udp_create(pkt, dst_port, src_port)) { return -1; } hdr_len += NET_UDPH_LEN; - } else -#endif -#if defined(CONFIG_NET_TCP) - if (sock->ip_proto == IPPROTO_TCP) { + } else if (IS_ENABLED(CONFIG_NET_TCP) && sock->ip_proto == NET_IPPROTO_TCP) { NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr); struct net_tcp_hdr *tcp; @@ -495,9 +479,7 @@ static int pkt_setup_ip_data(struct net_pkt *pkt, } hdr_len += NET_TCPH_LEN; - } else -#endif /* CONFIG_NET_TCP */ - { + } else { /* no error here as hdr_len is checked later for 0 value */ } @@ -1471,7 +1453,7 @@ static int offload_get(sa_family_t family, sock->socket_id = MDM_MAX_SOCKETS + 1; /* socket # needs assigning */ snprintk(buf, sizeof(buf), "AT@SOCKCREAT=%d,%d", type, - family == AF_INET ? 0 : 1); + family == NET_AF_INET ? 0 : 1); ret = send_at_cmd(NULL, buf, MDM_CMD_TIMEOUT); if (ret < 0) { LOG_ERR("AT@SOCKCREAT ret:%d", ret); @@ -1482,7 +1464,7 @@ static int offload_get(sa_family_t family, } static int offload_bind(struct net_context *context, - const struct sockaddr *addr, + const struct net_sockaddr *addr, socklen_t addrlen) { struct wncm14a2a_socket *sock = NULL; @@ -1499,21 +1481,16 @@ static int offload_bind(struct net_context *context, /* save bind address information */ sock->src.sa_family = addr->sa_family; -#if defined(CONFIG_NET_IPV6) - if (addr->sa_family == AF_INET6) { + + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { net_ipaddr_copy(&net_sin6(&sock->src)->sin6_addr, &net_sin6(addr)->sin6_addr); net_sin6(&sock->src)->sin6_port = net_sin6(addr)->sin6_port; - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { net_ipaddr_copy(&net_sin(&sock->src)->sin_addr, &net_sin(addr)->sin_addr); net_sin(&sock->src)->sin_port = net_sin(addr)->sin_port; - } else -#endif - { + } else { return -EPFNOSUPPORT; } @@ -1527,7 +1504,7 @@ static int offload_listen(struct net_context *context, int backlog) } static int offload_connect(struct net_context *context, - const struct sockaddr *addr, + const struct net_sockaddr *addr, socklen_t addrlen, net_context_connect_cb_t cb, int32_t timeout, @@ -1560,23 +1537,17 @@ static int offload_connect(struct net_context *context, sock->dst.sa_family = addr->sa_family; -#if defined(CONFIG_NET_IPV6) - if (addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { net_ipaddr_copy(&net_sin6(&sock->dst)->sin6_addr, &net_sin6(addr)->sin6_addr); - dst_port = ntohs(net_sin6(addr)->sin6_port); + dst_port = net_ntohs(net_sin6(addr)->sin6_port); net_sin6(&sock->dst)->sin6_port = dst_port; - } else -#endif -#if defined(CONFIG_NET_IPV4) - if (addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { net_ipaddr_copy(&net_sin(&sock->dst)->sin_addr, &net_sin(addr)->sin_addr); - dst_port = ntohs(net_sin(addr)->sin_port); + dst_port = net_ntohs(net_sin(addr)->sin_port); net_sin(&sock->dst)->sin_port = dst_port; - } else -#endif - { + } else { return -EINVAL; } @@ -1618,7 +1589,7 @@ static int offload_accept(struct net_context *context, } static int offload_sendto(struct net_pkt *pkt, - const struct sockaddr *dst_addr, + const struct net_sockaddr *dst_addr, socklen_t addrlen, net_context_send_cb_t cb, int32_t timeout, @@ -1660,17 +1631,11 @@ static int offload_send(struct net_pkt *pkt, struct net_context *context = net_pkt_context(pkt); socklen_t addrlen; -#if defined(CONFIG_NET_IPV6) - if (net_pkt_family(pkt) == AF_INET6) { - addrlen = sizeof(struct sockaddr_in6); - } else -#endif /* CONFIG_NET_IPV6 */ -#if defined(CONFIG_NET_IPV4) - if (net_pkt_family(pkt) == AF_INET) { - addrlen = sizeof(struct sockaddr_in); - } else -#endif /* CONFIG_NET_IPV4 */ - { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { + addrlen = sizeof(struct net_sockaddr_in6); + } else if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { + addrlen = sizeof(struct net_sockaddr_in); + } else { return -EPFNOSUPPORT; } @@ -1729,7 +1694,7 @@ static int offload_put(struct net_context *context) socket_put(sock); net_context_unref(context); - if (sock->type == SOCK_STREAM) { + if (sock->type == NET_SOCK_STREAM) { /* TCP contexts are referenced twice, * once for the app and once for the stack. * Since TCP stack is not used for offload, diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 465cd1e1f88b0..e7c2c8f0c9ad9 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -51,8 +51,8 @@ static void loopback_init(struct net_if *iface) NET_LINK_DUMMY); if (IS_ENABLED(CONFIG_NET_IPV4)) { - struct in_addr ipv4_loopback = INADDR_LOOPBACK_INIT; - struct in_addr netmask = { { { 255, 0, 0, 0 } } }; + struct net_in_addr ipv4_loopback = NET_INADDR_LOOPBACK_INIT; + struct net_in_addr netmask = { { { 255, 0, 0, 0 } } }; ifaddr = net_if_ipv4_addr_add(iface, &ipv4_loopback, NET_ADDR_AUTOCONF, 0); @@ -64,7 +64,7 @@ static void loopback_init(struct net_if *iface) } if (IS_ENABLED(CONFIG_NET_IPV6)) { - struct in6_addr ipv6_loopback = IN6ADDR_LOOPBACK_INIT; + struct net_in6_addr ipv6_loopback = NET_IN6ADDR_LOOPBACK_INIT; ifaddr = net_if_ipv6_addr_add(iface, &ipv6_loopback, NET_ADDR_AUTOCONF, 0); @@ -147,7 +147,7 @@ static int loopback_send(const struct device *dev, struct net_pkt *pkt) * the test to control this remotely. */ if (!COND_CODE_1(CONFIG_NET_TEST, (loopback_dont_swap_addresses), (false))) { - if (net_pkt_family(pkt) == AF_INET6) { + if (net_pkt_family(pkt) == NET_AF_INET6) { net_ipv6_addr_copy_raw(NET_IPV6_HDR(cloned)->src, NET_IPV6_HDR(pkt)->dst); net_ipv6_addr_copy_raw(NET_IPV6_HDR(cloned)->dst, diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c index e6682a76b43fb..0fa1172d4653b 100644 --- a/drivers/net/ppp.c +++ b/drivers/net/ppp.c @@ -31,7 +31,6 @@ LOG_MODULE_REGISTER(net_ppp, LOG_LEVEL); #include #include #include -#include #include #include @@ -302,7 +301,7 @@ static int ppp_save_byte(struct ppp_driver_context *ppp, uint8_t byte) ppp->pkt = net_pkt_rx_alloc_with_buffer( ppp->iface, CONFIG_NET_BUF_DATA_SIZE, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!ppp->pkt) { LOG_ERR("[%p] cannot allocate pkt", ppp); return -ENOMEM; @@ -326,7 +325,7 @@ static int ppp_save_byte(struct ppp_driver_context *ppp, uint8_t byte) if (ppp->available == 1) { ret = net_pkt_alloc_buffer(ppp->pkt, CONFIG_NET_BUF_DATA_SIZE + ppp->available, - AF_UNSPEC, K_NO_WAIT); + NET_AF_UNSPEC, K_NO_WAIT); if (ret < 0) { LOG_ERR("[%p] cannot allocate new data buffer", ppp); goto out_of_mem; @@ -827,9 +826,9 @@ static int ppp_send(const struct device *dev, struct net_pkt *pkt) * value here. */ if (!net_pkt_is_ppp(pkt)) { - if (net_pkt_family(pkt) == AF_INET) { + if (net_pkt_family(pkt) == NET_AF_INET) { protocol = htons(PPP_IP); - } else if (net_pkt_family(pkt) == AF_INET6) { + } else if (net_pkt_family(pkt) == NET_AF_INET6) { protocol = htons(PPP_IPV6); } else { return -EPROTONOSUPPORT; @@ -1018,7 +1017,7 @@ static void ppp_iface_init(struct net_if *iface) int ret; ret = net_capture_cooked_setup(&ppp_capture_ctx->cooked, - ARPHRD_PPP, + NET_ARPHRD_PPP, sizeof(ppp->mac_addr), ppp->mac_addr); if (ret < 0) { diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 9f46142a32573..620fda3423ee3 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -167,11 +167,11 @@ static void process_msg(struct slip_context *slip) { struct net_eth_hdr *hdr = NET_ETH_HDR(pkt); - if (ntohs(hdr->type) == NET_ETH_PTYPE_VLAN) { + if (net_ntohs(hdr->type) == NET_ETH_PTYPE_VLAN) { struct net_eth_vlan_hdr *hdr_vlan = (struct net_eth_vlan_hdr *)NET_ETH_HDR(pkt); - net_pkt_set_vlan_tci(pkt, ntohs(hdr_vlan->vlan.tci)); + net_pkt_set_vlan_tci(pkt, net_ntohs(hdr_vlan->vlan.tci)); vlan_tag = net_pkt_vlan_tag(pkt); } } diff --git a/drivers/usb/device/usb_dc_native_posix.c b/drivers/usb/device/usb_dc_native_posix.c index d806d3513ef67..e7c547edf3f35 100644 --- a/drivers/usb/device/usb_dc_native_posix.c +++ b/drivers/usb/device/usb_dc_native_posix.c @@ -512,7 +512,7 @@ int usb_dc_ep_mps(const uint8_t ep) int handle_usb_control(struct usbip_header *hdr) { - uint8_t ep_idx = USB_EP_GET_IDX(ntohl(hdr->common.ep)); + uint8_t ep_idx = USB_EP_GET_IDX(net_ntohl(hdr->common.ep)); struct usb_ep_ctrl_prv *ep_ctrl; ep_ctrl = &usbip_ctrl.out_ep_ctrl[ep_idx]; @@ -521,7 +521,7 @@ int handle_usb_control(struct usbip_header *hdr) return -EIO; } - if ((ntohl(hdr->common.direction) == USBIP_DIR_IN) ^ + if ((net_ntohl(hdr->common.direction) == USBIP_DIR_IN) ^ USB_REQTYPE_GET_DIR(hdr->u.submit.bmRequestType)) { LOG_ERR("Failed to verify bmRequestType"); return -EIO; @@ -532,8 +532,8 @@ int handle_usb_control(struct usbip_header *hdr) memcpy(ep_ctrl->buf, &hdr->u.submit.bmRequestType, ep_ctrl->data_len); ep_ctrl->cb(ep_idx, USB_DC_EP_SETUP); - if (ntohl(hdr->common.direction) == USBIP_DIR_OUT) { - uint32_t data_len = ntohl(hdr->u.submit.transfer_buffer_length); + if (net_ntohl(hdr->common.direction) == USBIP_DIR_OUT) { + uint32_t data_len = net_ntohl(hdr->u.submit.transfer_buffer_length); /* Data OUT stage availably */ if (data_len > ARRAY_SIZE(ep_ctrl->buf)) { @@ -556,11 +556,11 @@ int handle_usb_control(struct usbip_header *hdr) int handle_usb_data(struct usbip_header *hdr) { - uint8_t ep_idx = ntohl(hdr->common.ep); + uint8_t ep_idx = net_ntohl(hdr->common.ep); struct usb_ep_ctrl_prv *ep_ctrl; uint8_t ep; - if (ntohl(hdr->common.direction) == USBIP_DIR_OUT) { + if (net_ntohl(hdr->common.direction) == USBIP_DIR_OUT) { uint32_t data_len; if (ep_idx >= USBIP_OUT_EP_NUM) { @@ -569,7 +569,7 @@ int handle_usb_data(struct usbip_header *hdr) ep_ctrl = &usbip_ctrl.out_ep_ctrl[ep_idx]; ep = ep_idx | USB_EP_DIR_OUT; - data_len = ntohl(hdr->u.submit.transfer_buffer_length); + data_len = net_ntohl(hdr->u.submit.transfer_buffer_length); if (data_len > ARRAY_SIZE(ep_ctrl->buf)) { return -EIO; diff --git a/drivers/wifi/esp32/src/esp_wifi_drv.c b/drivers/wifi/esp32/src/esp_wifi_drv.c index 8fc62c8f6a7d7..413d14702b812 100644 --- a/drivers/wifi/esp32/src/esp_wifi_drv.c +++ b/drivers/wifi/esp32/src/esp_wifi_drv.c @@ -138,7 +138,7 @@ static esp_err_t eth_esp32_rx(void *buffer, uint16_t len, void *eb) return -EIO; } - pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface, len, AF_UNSPEC, 0, K_MSEC(100)); + pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface, len, NET_AF_UNSPEC, 0, K_MSEC(100)); if (!pkt) { LOG_ERR("Failed to allocate net buffer"); 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) return -EIO; } - pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface_ap, len, AF_UNSPEC, 0, K_MSEC(100)); + pkt = net_pkt_rx_alloc_with_buffer(esp32_wifi_iface_ap, len, + NET_AF_UNSPEC, 0, K_MSEC(100)); if (!pkt) { esp_wifi_internal_free_rx_buffer(eb); LOG_ERR("Failed to get net buffer"); diff --git a/drivers/wifi/esp_at/esp.c b/drivers/wifi/esp_at/esp.c index f35b046a1ec48..483849a2129a6 100644 --- a/drivers/wifi/esp_at/esp.c +++ b/drivers/wifi/esp_at/esp.c @@ -516,8 +516,8 @@ static void esp_dns_work(struct k_work *work) #if defined(ESP_MAX_DNS) struct esp_data *data = CONTAINER_OF(work, struct esp_data, dns_work); struct dns_resolve_context *dnsctx; - struct sockaddr_in *addrs = data->dns_addresses; - const struct sockaddr *dns_servers[ESP_MAX_DNS + 1] = {}; + struct net_sockaddr_in *addrs = data->dns_addresses; + const struct net_sockaddr *dns_servers[ESP_MAX_DNS + 1] = {}; int interfaces[ESP_MAX_DNS]; size_t i; int err, ifindex; @@ -528,7 +528,7 @@ static void esp_dns_work(struct k_work *work) if (!addrs[i].sin_addr.s_addr) { break; } - dns_servers[i] = (struct sockaddr *) &addrs[i]; + dns_servers[i] = (struct net_sockaddr *) &addrs[i]; interfaces[i] = ifindex; } @@ -550,7 +550,7 @@ MODEM_CMD_DEFINE(on_cmd_cipdns) #if defined(ESP_MAX_DNS) struct esp_data *dev = CONTAINER_OF(data, struct esp_data, cmd_handler_data); - struct sockaddr_in *addrs = dev->dns_addresses; + struct net_sockaddr_in *addrs = dev->dns_addresses; char **servers = (char **)argv + 1; size_t num_servers = argc - 1; size_t valid_servers = 0; @@ -566,7 +566,7 @@ MODEM_CMD_DEFINE(on_cmd_cipdns) servers[i] = str_unquote(servers[i]); LOG_DBG("DNS[%zu]: %s", i, servers[i]); - err = net_addr_pton(AF_INET, servers[i], &addrs[i].sin_addr); + err = net_addr_pton(NET_AF_INET, servers[i], &addrs[i].sin_addr); if (err) { LOG_ERR("Invalid DNS address: %s", servers[i]); @@ -574,7 +574,7 @@ MODEM_CMD_DEFINE(on_cmd_cipdns) break; } - addrs[i].sin_family = AF_INET; + addrs[i].sin_family = NET_AF_INET; addrs[i].sin_port = htons(53); valid_servers++; @@ -663,11 +663,11 @@ MODEM_CMD_DEFINE(on_cmd_cipsta) ip = str_unquote(argv[1]); if (!strcmp(argv[0], "ip")) { - net_addr_pton(AF_INET, ip, &dev->ip); + net_addr_pton(NET_AF_INET, ip, &dev->ip); } else if (!strcmp(argv[0], "gateway")) { - net_addr_pton(AF_INET, ip, &dev->gw); + net_addr_pton(NET_AF_INET, ip, &dev->gw); } else if (!strcmp(argv[0], "netmask")) { - net_addr_pton(AF_INET, ip, &dev->nm); + net_addr_pton(NET_AF_INET, ip, &dev->nm); } else { LOG_WRN("Unknown IP type %s", argv[0]); } @@ -854,8 +854,8 @@ static int cmd_ipd_parse_hdr(struct esp_data *dev, if (!ESP_PROTO_PASSIVE(esp_socket_ip_proto(*sock)) && IS_ENABLED(CONFIG_WIFI_ESP_AT_CIPDINFO_USE)) { - struct sockaddr_in *recv_addr = - (struct sockaddr_in *) &(*sock)->context->remote; + struct net_sockaddr_in *recv_addr = + (struct net_sockaddr_in *) &(*sock)->context->remote; char *remote_ip; long port; @@ -883,14 +883,14 @@ static int cmd_ipd_parse_hdr(struct esp_data *dev, goto socket_unref; } - err = net_addr_pton(AF_INET, remote_ip, &recv_addr->sin_addr); + err = net_addr_pton(NET_AF_INET, remote_ip, &recv_addr->sin_addr); if (err) { LOG_ERR("Invalid IP address"); err = -EBADMSG; goto socket_unref; } - recv_addr->sin_family = AF_INET; + recv_addr->sin_family = NET_AF_INET; recv_addr->sin_port = htons(port); } diff --git a/drivers/wifi/esp_at/esp.h b/drivers/wifi/esp_at/esp.h index 352d5f668291b..c196f87984043 100644 --- a/drivers/wifi/esp_at/esp.h +++ b/drivers/wifi/esp_at/esp.h @@ -50,10 +50,10 @@ extern "C" { */ #if defined(CONFIG_WIFI_ESP_AT_PASSIVE_MODE) #if defined(CONFIG_WIFI_ESP_AT_VERSION_1_7) -#define ESP_PROTO_PASSIVE(proto) (proto == IPPROTO_TCP) +#define ESP_PROTO_PASSIVE(proto) (proto == NET_IPPROTO_TCP) #else #define ESP_PROTO_PASSIVE(proto) \ - (proto == IPPROTO_TCP || proto == IPPROTO_UDP) + (proto == NET_IPPROTO_TCP || proto == NET_IPPROTO_UDP) #endif /* CONFIG_WIFI_ESP_AT_VERSION_1_7 */ #else #define ESP_PROTO_PASSIVE(proto) 0 @@ -175,8 +175,8 @@ struct esp_socket { atomic_t flags; /* socket info */ - struct sockaddr src; - struct sockaddr dst; + struct net_sockaddr src; + struct net_sockaddr dst; /* sem */ union { @@ -229,7 +229,7 @@ struct esp_data { struct in_addr nm; uint8_t mac_addr[6]; #if defined(ESP_MAX_DNS) - struct sockaddr_in dns_addresses[ESP_MAX_DNS]; + struct net_sockaddr_in dns_addresses[ESP_MAX_DNS]; #endif /* modem context */ diff --git a/drivers/wifi/esp_at/esp_offload.c b/drivers/wifi/esp_at/esp_offload.c index 9894a6634c9ca..8cfa4a75c06bb 100644 --- a/drivers/wifi/esp_at/esp_offload.c +++ b/drivers/wifi/esp_at/esp_offload.c @@ -37,8 +37,8 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock) 2 * NET_IPV4_ADDR_LEN)]; char dst_addr_str[NET_IPV4_ADDR_LEN]; char src_addr_str[NET_IPV4_ADDR_LEN]; - struct sockaddr src; - struct sockaddr dst; + struct net_sockaddr src; + struct net_sockaddr dst; int ret; int mode; @@ -51,7 +51,7 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock) dst = sock->dst; k_mutex_unlock(&sock->lock); - if (dst.sa_family == AF_INET) { + if (dst.sa_family == NET_AF_INET) { net_addr_ntop(dst.sa_family, &net_sin(&dst)->sin_addr, dst_addr_str, sizeof(dst_addr_str)); @@ -59,13 +59,13 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock) strcpy(dst_addr_str, "0.0.0.0"); } - if (esp_socket_ip_proto(sock) == IPPROTO_TCP) { + if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) { snprintk(connect_msg, sizeof(connect_msg), "AT+CIPSTART=%d,\"TCP\",\"%s\",%d,7200", sock->link_id, dst_addr_str, - ntohs(net_sin(&dst)->sin_port)); + net_ntohs(net_sin(&dst)->sin_port)); } else { - if (src.sa_family == AF_INET && net_sin(&src)->sin_port != 0) { + if (src.sa_family == NET_AF_INET && net_sin(&src)->sin_port != 0) { net_addr_ntop(src.sa_family, &net_sin(&src)->sin_addr, src_addr_str, sizeof(src_addr_str)); @@ -87,7 +87,7 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock) * to 2. */ if ((net_sin(&dst)->sin_addr.s_addr == 0) && - (ntohs(net_sin(&dst)->sin_port) == 0)) { + (net_ntohs(net_sin(&dst)->sin_port) == 0)) { mode = 2; /* Port 0 is reserved and a valid port needs to be provided when * connecting. @@ -100,24 +100,25 @@ static int _sock_connect(struct esp_data *dev, struct esp_socket *sock) snprintk(connect_msg, sizeof(connect_msg), "AT+CIPSTART=%d,\"UDP\",\"%s\",%d,%d,%d,\"%s\"", sock->link_id, dst_addr_str, - ntohs(net_sin(&dst)->sin_port), ntohs(net_sin(&src)->sin_port), + net_ntohs(net_sin(&dst)->sin_port), + net_ntohs(net_sin(&src)->sin_port), mode, src_addr_str); } else { snprintk(connect_msg, sizeof(connect_msg), "AT+CIPSTART=%d,\"UDP\",\"%s\",%d", sock->link_id, dst_addr_str, - ntohs(net_sin(&dst)->sin_port)); + net_ntohs(net_sin(&dst)->sin_port)); } } LOG_DBG("link %d, ip_proto %s, addr %s", sock->link_id, - esp_socket_ip_proto(sock) == IPPROTO_TCP ? "TCP" : "UDP", + esp_socket_ip_proto(sock) == NET_IPPROTO_TCP ? "TCP" : "UDP", dst_addr_str); ret = esp_cmd_send(dev, NULL, 0, connect_msg, ESP_CMD_TIMEOUT); if (ret == 0) { esp_socket_flags_set(sock, ESP_SOCK_CONNECTED); - if (esp_socket_type(sock) == SOCK_STREAM) { + if (esp_socket_type(sock) == NET_SOCK_STREAM) { net_context_set_state(sock->context, NET_CONTEXT_CONNECTED); } @@ -149,7 +150,7 @@ void esp_connect_work(struct k_work *work) k_mutex_unlock(&sock->lock); } -static int esp_bind(struct net_context *context, const struct sockaddr *addr, +static int esp_bind(struct net_context *context, const struct net_sockaddr *addr, socklen_t addrlen) { struct esp_socket *sock; @@ -158,11 +159,11 @@ static int esp_bind(struct net_context *context, const struct sockaddr *addr, sock = (struct esp_socket *)context->offload_context; dev = esp_socket_to_dev(sock); - if (esp_socket_ip_proto(sock) == IPPROTO_TCP) { + if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) { return 0; } - if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { LOG_DBG("link %d", sock->link_id); if (esp_socket_connected(sock)) { @@ -180,7 +181,7 @@ static int esp_bind(struct net_context *context, const struct sockaddr *addr, } static int esp_connect(struct net_context *context, - const struct sockaddr *addr, + const struct net_sockaddr *addr, socklen_t addrlen, net_context_connect_cb_t cb, int32_t timeout, @@ -195,7 +196,7 @@ static int esp_connect(struct net_context *context, LOG_DBG("link %d, timeout %d", sock->link_id, timeout); - if (!IS_ENABLED(CONFIG_NET_IPV4) || addr->sa_family != AF_INET) { + if (!IS_ENABLED(CONFIG_NET_IPV4) || addr->sa_family != NET_AF_INET) { return -EAFNOSUPPORT; } @@ -275,7 +276,7 @@ static int _sock_send(struct esp_socket *sock, struct net_pkt *pkt) MODEM_CMD("SEND OK", on_cmd_send_ok, 0U, ""), MODEM_CMD("SEND FAIL", on_cmd_send_fail, 0U, ""), }; - struct sockaddr dst; + struct net_sockaddr dst; if (!esp_flags_are_set(dev, EDF_STA_CONNECTED | EDF_AP_ENABLED)) { return -ENETUNREACH; @@ -285,7 +286,7 @@ static int _sock_send(struct esp_socket *sock, struct net_pkt *pkt) LOG_DBG("link %d, len %d", sock->link_id, pkt_len); - if (esp_socket_ip_proto(sock) == IPPROTO_TCP) { + if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) { snprintk(cmd_buf, sizeof(cmd_buf), "AT+CIPSEND=%d,%d", sock->link_id, pkt_len); } else { @@ -299,7 +300,7 @@ static int _sock_send(struct esp_socket *sock, struct net_pkt *pkt) snprintk(cmd_buf, sizeof(cmd_buf), "AT+CIPSEND=%d,%d,\"%s\",%d", sock->link_id, pkt_len, addr_str, - ntohs(net_sin(&dst)->sin_port)); + net_ntohs(net_sin(&dst)->sin_port)); } 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) } /* Wait for 'SEND OK' or 'SEND FAIL' */ - if (esp_socket_ip_proto(sock) == IPPROTO_TCP) { + if (esp_socket_ip_proto(sock) == NET_IPPROTO_TCP) { ret = k_sem_take(&dev->sem_response, TCP_SEND_TIMEOUT); } else { 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) * more to this socket, as there will be a hole in the data * stream, which application layer is not expecting. */ - if (esp_socket_type(sock) == SOCK_STREAM) { + if (esp_socket_type(sock) == NET_SOCK_STREAM) { if (!esp_socket_flags_test_and_set(sock, ESP_SOCK_CLOSE_PENDING)) { esp_socket_work_submit(sock, &sock->close_work); @@ -420,7 +421,7 @@ void esp_send_work(struct k_work *work) } static int esp_sendto(struct net_pkt *pkt, - const struct sockaddr *dst_addr, + const struct net_sockaddr *dst_addr, socklen_t addrlen, net_context_send_cb_t cb, int32_t timeout, @@ -441,7 +442,7 @@ static int esp_sendto(struct net_pkt *pkt, return -ENETUNREACH; } - if (esp_socket_type(sock) == SOCK_STREAM) { + if (esp_socket_type(sock) == NET_SOCK_STREAM) { atomic_val_t flags = esp_socket_flags(sock); if (!(flags & ESP_SOCK_CONNECTED) || @@ -463,7 +464,7 @@ static int esp_sendto(struct net_pkt *pkt, if (ret < 0) { return ret; } - } else if (esp_socket_type(sock) == SOCK_DGRAM) { + } else if (esp_socket_type(sock) == NET_SOCK_DGRAM) { memcpy(&sock->dst, dst_addr, addrlen); } } @@ -583,11 +584,11 @@ MODEM_CMD_DIRECT_DEFINE(on_cmd_ciprecvdata) } #if defined(CONFIG_WIFI_ESP_AT_CIPDINFO_USE) && !defined(CONFIG_WIFI_ESP_AT_VERSION_1_7) - struct sockaddr_in *recv_addr = - (struct sockaddr_in *) &sock->context->remote; + struct net_sockaddr_in *recv_addr = + (struct net_sockaddr_in *) &sock->context->remote; - recv_addr->sin_port = htons(port); - recv_addr->sin_family = AF_INET; + recv_addr->sin_port = net_htons(port); + recv_addr->sin_family = NET_AF_INET; /* IP addr comes within quotation marks, which is disliked by * conv function. So we remove them by subtraction 2 from @@ -601,7 +602,7 @@ MODEM_CMD_DIRECT_DEFINE(on_cmd_ciprecvdata) strncpy(remote_ip_addr, &raw_remote_ip[1], remote_ip_str_len); remote_ip_addr[remote_ip_str_len] = '\0'; - if (net_addr_pton(AF_INET, remote_ip_addr, &recv_addr->sin_addr) < 0) { + if (net_addr_pton(NET_AF_INET, remote_ip_addr, &recv_addr->sin_addr) < 0) { LOG_ERR("Invalid src addr %s", remote_ip_addr); err = -EIO; goto socket_unref; @@ -686,8 +687,8 @@ static int esp_recv(struct net_context *context, * traffic can be received. */ if (!esp_socket_connected(sock) && - esp_socket_ip_proto(sock) == IPPROTO_UDP && - sock->src.sa_family == AF_INET && + esp_socket_ip_proto(sock) == NET_IPPROTO_UDP && + sock->src.sa_family == NET_AF_INET && net_sin(&sock->src)->sin_port != 0) { _sock_connect(dev, sock); } @@ -757,7 +758,7 @@ static int esp_get(sa_family_t family, LOG_DBG(""); - if (family != AF_INET) { + if (family != NET_AF_INET) { return -EAFNOSUPPORT; } diff --git a/drivers/wifi/esp_at/esp_socket.c b/drivers/wifi/esp_at/esp_socket.c index 05f620ab22354..3174e2f177e88 100644 --- a/drivers/wifi/esp_at/esp_socket.c +++ b/drivers/wifi/esp_at/esp_socket.c @@ -114,7 +114,7 @@ static struct net_pkt *esp_socket_prepare_pkt(struct esp_socket *sock, struct net_pkt *pkt; size_t to_copy; - pkt = net_pkt_rx_alloc_with_buffer(data->net_iface, len, AF_UNSPEC, + pkt = net_pkt_rx_alloc_with_buffer(data->net_iface, len, NET_AF_UNSPEC, 0, RX_NET_PKT_ALLOC_TIMEOUT); if (!pkt) { return NULL; diff --git a/drivers/wifi/esp_hosted/esp_hosted_wifi.c b/drivers/wifi/esp_hosted/esp_hosted_wifi.c index 52edfbfdbcb02..9122833e4126c 100644 --- a/drivers/wifi/esp_hosted/esp_hosted_wifi.c +++ b/drivers/wifi/esp_hosted/esp_hosted_wifi.c @@ -430,7 +430,7 @@ static int esp_hosted_recv(struct net_if *iface, void *buf, size_t len) return 0; } - pkt = net_pkt_rx_alloc_with_buffer(iface, len, AF_UNSPEC, 0, K_MSEC(1000)); + pkt = net_pkt_rx_alloc_with_buffer(iface, len, NET_AF_UNSPEC, 0, K_MSEC(1000)); if (pkt == NULL) { LOG_ERR("Failed to allocate net buffer"); return -ENOMEM; diff --git a/drivers/wifi/eswifi/eswifi.h b/drivers/wifi/eswifi/eswifi.h index 54bf00f0f7896..97fd02af6903e 100644 --- a/drivers/wifi/eswifi/eswifi.h +++ b/drivers/wifi/eswifi/eswifi.h @@ -141,7 +141,7 @@ int __eswifi_off_start_client(struct eswifi_dev *eswifi, int __eswifi_listen(struct eswifi_dev *eswifi, struct eswifi_off_socket *socket, int backlog); int __eswifi_accept(struct eswifi_dev *eswifi, struct eswifi_off_socket *socket); int __eswifi_bind(struct eswifi_dev *eswifi, struct eswifi_off_socket *socket, - const struct sockaddr *addr, socklen_t addrlen); + const struct net_sockaddr *addr, socklen_t addrlen); #if defined(CONFIG_NET_SOCKETS_OFFLOAD) int eswifi_socket_offload_init(struct eswifi_dev *leswifi); #endif diff --git a/drivers/wifi/eswifi/eswifi_offload.c b/drivers/wifi/eswifi/eswifi_offload.c index c16d1f75f8215..0e68efe3af011 100644 --- a/drivers/wifi/eswifi/eswifi_offload.c +++ b/drivers/wifi/eswifi/eswifi_offload.c @@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(LOG_MODULE_NAME); static int eswifi_off_bind(struct net_context *context, - const struct sockaddr *addr, + const struct net_sockaddr *addr, socklen_t addrlen) { struct eswifi_off_socket *socket = context->offload_context; @@ -97,7 +97,7 @@ static void eswifi_off_connect_work(struct k_work *work) } static int eswifi_off_connect(struct net_context *context, - const struct sockaddr *addr, + const struct net_sockaddr *addr, socklen_t addrlen, net_context_connect_cb_t cb, int32_t timeout, @@ -109,8 +109,8 @@ static int eswifi_off_connect(struct net_context *context, LOG_DBG("timeout=%d", timeout); - if (addr->sa_family != AF_INET) { - LOG_ERR("Only AF_INET is supported!"); + if (addr->sa_family != NET_AF_INET) { + LOG_ERR("Only NET_AF_INET is supported!"); return -EPFNOSUPPORT; } @@ -294,7 +294,7 @@ static int eswifi_off_send(struct net_pkt *pkt, } static int eswifi_off_sendto(struct net_pkt *pkt, - const struct sockaddr *dst_addr, + const struct net_sockaddr *dst_addr, socklen_t addrlen, net_context_send_cb_t cb, int32_t timeout, @@ -484,19 +484,19 @@ void eswifi_offload_async_msg(struct eswifi_dev *eswifi, char *msg, size_t len) return; } - struct sockaddr_in *peer = net_sin(&socket->peer_addr); + struct net_sockaddr_in *peer = net_sin(&socket->peer_addr); sin_addr = &peer->sin_addr; memcpy(&sin_addr->s4_addr, ip, 4); peer->sin_port = htons(port); - peer->sin_family = AF_INET; + peer->sin_family = NET_AF_INET; socket->state = ESWIFI_SOCKET_STATE_CONNECTED; socket->usage++; /* Save information about remote. */ socket->context->flags |= NET_CONTEXT_REMOTE_ADDR_SET; memcpy(&socket->context->remote, &socket->peer_addr, - sizeof(struct sockaddr)); + sizeof(struct net_sockaddr)); LOG_DBG("%u.%u.%u.%u connected to port %u", ip[0], ip[1], ip[2], ip[3], port); @@ -504,7 +504,7 @@ void eswifi_offload_async_msg(struct eswifi_dev *eswifi, char *msg, size_t len) if (socket->accept_cb) { socket->accept_cb(socket->context, &socket->peer_addr, - sizeof(struct sockaddr_in), 0, + sizeof(struct net_sockaddr_in), 0, socket->accept_data); } diff --git a/drivers/wifi/eswifi/eswifi_offload.h b/drivers/wifi/eswifi/eswifi_offload.h index ebb405d99a719..47891c6d43b4b 100644 --- a/drivers/wifi/eswifi/eswifi_offload.h +++ b/drivers/wifi/eswifi/eswifi_offload.h @@ -43,7 +43,7 @@ struct eswifi_off_socket { struct k_work connect_work; struct k_work send_work; struct k_work_delayable read_work; - struct sockaddr peer_addr; + struct net_sockaddr peer_addr; struct k_sem read_sem; struct k_sem accept_sem; uint16_t port; diff --git a/drivers/wifi/eswifi/eswifi_socket.c b/drivers/wifi/eswifi/eswifi_socket.c index f4c546f0ff0a7..427004034b891 100644 --- a/drivers/wifi/eswifi/eswifi_socket.c +++ b/drivers/wifi/eswifi/eswifi_socket.c @@ -20,11 +20,11 @@ LOG_MODULE_DECLARE(LOG_MODULE_NAME); int eswifi_socket_type_from_zephyr(int proto, enum eswifi_transport_type *type) { if (IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS) && - proto >= IPPROTO_TLS_1_0 && proto <= IPPROTO_TLS_1_2) { + proto >= NET_IPPROTO_TLS_1_0 && proto <= NET_IPPROTO_TLS_1_2) { *type = ESWIFI_TRANSPORT_TCP_SSL; - } else if (proto == IPPROTO_TCP) { + } else if (proto == NET_IPPROTO_TCP) { *type = ESWIFI_TRANSPORT_TCP; - } else if (proto == IPPROTO_UDP) { + } else if (proto == NET_IPPROTO_UDP) { *type = ESWIFI_TRANSPORT_UDP; } else { return -EPFNOSUPPORT; @@ -75,12 +75,12 @@ static int __read_data(struct eswifi_dev *eswifi, size_t len, char **data) } int __eswifi_bind(struct eswifi_dev *eswifi, struct eswifi_off_socket *socket, - const struct sockaddr *addr, socklen_t addrlen) + const struct net_sockaddr *addr, socklen_t addrlen) { int err; - if (addr->sa_family != AF_INET) { - LOG_ERR("Only AF_INET is supported!"); + if (addr->sa_family != NET_AF_INET) { + LOG_ERR("Only NET_AF_INET is supported!"); return -EPFNOSUPPORT; } @@ -135,7 +135,7 @@ static void eswifi_off_read_work(struct k_work *work) /* Verify if we can allocate a rx packet before reading data to prevent leaks */ pkt = net_pkt_rx_alloc_with_buffer(eswifi->iface, 1460, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { LOG_ERR("Cannot allocate rx packet"); goto done; @@ -195,7 +195,7 @@ static void eswifi_off_read_work(struct k_work *work) int __eswifi_off_start_client(struct eswifi_dev *eswifi, struct eswifi_off_socket *socket) { - struct sockaddr *addr = &socket->peer_addr; + struct net_sockaddr *addr = &socket->peer_addr; struct in_addr *sin_addr = &net_sin(addr)->sin_addr; int err; @@ -324,8 +324,8 @@ int __eswifi_socket_new(struct eswifi_dev *eswifi, int family, int type, LOG_DBG(""); - if (family != AF_INET) { - LOG_ERR("Only AF_INET is supported!"); + if (family != NET_AF_INET) { + LOG_ERR("Only NET_AF_INET is supported!"); return -EPFNOSUPPORT; } diff --git a/drivers/wifi/eswifi/eswifi_socket_offload.c b/drivers/wifi/eswifi/eswifi_socket_offload.c index 0e3b6134062ae..0a527d116dd21 100644 --- a/drivers/wifi/eswifi/eswifi_socket_offload.c +++ b/drivers/wifi/eswifi/eswifi_socket_offload.c @@ -52,8 +52,8 @@ static void __process_received(struct net_context *context, k_fifo_put(&socket->fifo, pkt); } -static int eswifi_socket_connect(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int eswifi_socket_connect(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { intptr_t sock = OBJ_TO_SD(obj); struct eswifi_off_socket *socket; @@ -64,8 +64,8 @@ static int eswifi_socket_connect(void *obj, const struct sockaddr *addr, return -EINVAL; } - if (addr->sa_family != AF_INET) { - LOG_ERR("Only AF_INET is supported!"); + if (addr->sa_family != NET_AF_INET) { + LOG_ERR("Only NET_AF_INET is supported!"); return -EPFNOSUPPORT; } @@ -106,16 +106,16 @@ static int eswifi_socket_listen(void *obj, int backlog) return ret; } -static void __eswifi_socket_accept_cb(struct net_context *context, struct sockaddr *addr, - socklen_t len, int val, void *data) +static void __eswifi_socket_accept_cb(struct net_context *context, struct net_sockaddr *addr, + net_socklen_t len, int val, void *data) { - struct sockaddr *addr_target = data; + struct net_sockaddr *addr_target = data; memcpy(addr_target, addr, len); } -static int __eswifi_socket_accept(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int __eswifi_socket_accept(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { intptr_t sock = OBJ_TO_SD(obj); struct eswifi_off_socket *socket; @@ -135,15 +135,15 @@ static int __eswifi_socket_accept(void *obj, struct sockaddr *addr, k_sem_reset(&socket->accept_sem); eswifi_unlock(eswifi); - *addrlen = sizeof(struct sockaddr_in); + *addrlen = sizeof(struct net_sockaddr_in); k_sem_take(&socket->accept_sem, K_FOREVER); return 0; } -static int eswifi_socket_accept(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int eswifi_socket_accept(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int fd = zvfs_reserve_fd(); intptr_t sock; @@ -166,7 +166,7 @@ static int eswifi_socket_accept(void *obj, struct sockaddr *addr, } #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS) -static int map_credentials(int sd, const void *optval, socklen_t optlen) +static int map_credentials(int sd, const void *optval, net_socklen_t optlen) { sec_tag_t *sec_tags = (sec_tag_t *)optval; int ret = 0; @@ -188,18 +188,18 @@ static int map_credentials(int sd, const void *optval, socklen_t optlen) while (cert != NULL) { /* Map Zephyr cert types to Simplelink cert options: */ switch (cert->type) { - case TLS_CREDENTIAL_CA_CERTIFICATE: + case ZSOCK_TLS_CREDENTIAL_CA_CERTIFICATE: id = 0; break; - case TLS_CREDENTIAL_PUBLIC_CERTIFICATE: + case ZSOCK_TLS_CREDENTIAL_PUBLIC_CERTIFICATE: id = 1; break; - case TLS_CREDENTIAL_PRIVATE_KEY: + case ZSOCK_TLS_CREDENTIAL_PRIVATE_KEY: id = 2; break; - case TLS_CREDENTIAL_NONE: - case TLS_CREDENTIAL_PSK: - case TLS_CREDENTIAL_PSK_ID: + case ZSOCK_TLS_CREDENTIAL_NONE: + case ZSOCK_TLS_CREDENTIAL_PSK: + case ZSOCK_TLS_CREDENTIAL_PSK_ID: default: /* Not handled */ return -EINVAL; @@ -231,25 +231,25 @@ static int map_credentials(int sd, const void *optval, socklen_t optlen) return 0; } #else -static int map_credentials(int sd, const void *optval, socklen_t optlen) +static int map_credentials(int sd, const void *optval, net_socklen_t optlen) { return 0; } #endif static int eswifi_socket_setsockopt(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { intptr_t sd = OBJ_TO_SD(obj); int ret; - if (IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS) && level == SOL_TLS) { + if (IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS) && level == ZSOCK_SOL_TLS) { switch (optname) { - case TLS_SEC_TAG_LIST: + case ZSOCK_TLS_SEC_TAG_LIST: ret = map_credentials(sd, optval, optlen); break; - case TLS_HOSTNAME: - case TLS_PEER_VERIFY: + case ZSOCK_TLS_HOSTNAME: + case ZSOCK_TLS_PEER_VERIFY: ret = 0; break; default: @@ -306,8 +306,8 @@ static ssize_t eswifi_socket_send(void *obj, const void *buf, size_t len, } static ssize_t eswifi_socket_sendto(void *obj, const void *buf, size_t len, - int flags, const struct sockaddr *to, - socklen_t tolen) + int flags, const struct net_sockaddr *to, + net_socklen_t tolen) { if (to != NULL) { errno = EOPNOTSUPP; @@ -387,8 +387,8 @@ static ssize_t eswifi_socket_recv(void *obj, void *buf, size_t max_len, } static ssize_t eswifi_socket_recvfrom(void *obj, void *buf, size_t len, - int flags, struct sockaddr *from, - socklen_t *fromlen) + int flags, struct net_sockaddr *from, + net_socklen_t *fromlen) { if (fromlen != NULL) { errno = EOPNOTSUPP; @@ -538,8 +538,8 @@ static int eswifi_socket_poll(struct zsock_pollfd *fds, int nfds, int msecs) return 1; } -static int eswifi_socket_bind(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int eswifi_socket_bind(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { intptr_t sock = OBJ_TO_SD(obj); struct eswifi_off_socket *socket; @@ -563,12 +563,12 @@ static bool eswifi_socket_is_supported(int family, int type, int proto) enum eswifi_transport_type eswifi_socket_type; int err; - if (family != AF_INET) { + if (family != NET_AF_INET) { return false; } - if (type != SOCK_DGRAM && - type != SOCK_STREAM) { + if (type != NET_SOCK_DGRAM && + type != NET_SOCK_STREAM) { return false; } @@ -657,7 +657,7 @@ static const struct socket_op_vtable eswifi_socket_fd_op_vtable = { }; #ifdef CONFIG_NET_SOCKETS_OFFLOAD -NET_SOCKET_OFFLOAD_REGISTER(eswifi, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, AF_UNSPEC, +NET_SOCKET_OFFLOAD_REGISTER(eswifi, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, NET_AF_UNSPEC, eswifi_socket_is_supported, eswifi_socket_create); #endif @@ -665,7 +665,7 @@ static int eswifi_off_getaddrinfo(const char *node, const char *service, const struct zsock_addrinfo *hints, struct zsock_addrinfo **res) { - struct sockaddr_in *ai_addr; + struct net_sockaddr_in *ai_addr; struct zsock_addrinfo *ai; unsigned long port = 0; char *rsp; @@ -686,7 +686,7 @@ static int eswifi_off_getaddrinfo(const char *node, const char *service, return DNS_EAI_NONAME; } - if (hints && hints->ai_family != AF_INET) { + if (hints && hints->ai_family != NET_AF_INET) { return DNS_EAI_FAIL; } @@ -708,7 +708,7 @@ static int eswifi_off_getaddrinfo(const char *node, const char *service, goto done_unlock; } - /* Now, alloc the embedded sockaddr struct: */ + /* Now, alloc the embedded net_sockaddr struct: */ ai_addr = calloc(1, sizeof(*ai_addr)); if (!ai_addr) { free(*res); @@ -716,14 +716,14 @@ static int eswifi_off_getaddrinfo(const char *node, const char *service, goto done_unlock; } - ai->ai_family = AF_INET; - ai->ai_socktype = hints ? hints->ai_socktype : SOCK_STREAM; - ai->ai_protocol = ai->ai_socktype == SOCK_STREAM ? IPPROTO_TCP : IPPROTO_UDP; + ai->ai_family = NET_AF_INET; + ai->ai_socktype = hints ? hints->ai_socktype : NET_SOCK_STREAM; + ai->ai_protocol = ai->ai_socktype == NET_SOCK_STREAM ? NET_IPPROTO_TCP : NET_IPPROTO_UDP; ai_addr->sin_family = ai->ai_family; - ai_addr->sin_port = htons(port); + ai_addr->sin_port = net_htons(port); - if (!net_ipaddr_parse(rsp, strlen(rsp), (struct sockaddr *)ai_addr)) { + if (!net_ipaddr_parse(rsp, strlen(rsp), (struct net_sockaddr *)ai_addr)) { free(ai_addr); free(*res); err = DNS_EAI_FAIL; @@ -731,7 +731,7 @@ static int eswifi_off_getaddrinfo(const char *node, const char *service, } ai->ai_addrlen = sizeof(*ai_addr); - ai->ai_addr = (struct sockaddr *)ai_addr; + ai->ai_addr = (struct net_sockaddr *)ai_addr; err = 0; done_unlock: diff --git a/drivers/wifi/infineon/airoc_wifi.c b/drivers/wifi/infineon/airoc_wifi.c index 7604b82b66ea1..0375c6f41bd44 100644 --- a/drivers/wifi/infineon/airoc_wifi.c +++ b/drivers/wifi/infineon/airoc_wifi.c @@ -390,7 +390,8 @@ static void airoc_wifi_network_process_ethernet_data(whd_interface_t interface, if ((airoc_wifi_iface != NULL) && net_if_flag_is_set(airoc_wifi_iface, NET_IF_UP)) { - pkt = net_pkt_rx_alloc_with_buffer(airoc_wifi_iface, len, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(airoc_wifi_iface, len, + NET_AF_UNSPEC, 0, K_NO_WAIT); if (pkt != NULL) { if (net_pkt_write(pkt, data, len) < 0) { diff --git a/drivers/wifi/nrf_wifi/src/net_if.c b/drivers/wifi/nrf_wifi/src/net_if.c index 2da704e332a9d..8f7750031476c 100644 --- a/drivers/wifi/nrf_wifi/src/net_if.c +++ b/drivers/wifi/nrf_wifi/src/net_if.c @@ -319,7 +319,7 @@ static bool is_eapol(struct net_pkt *pkt) uint16_t ethertype; hdr = NET_ETH_HDR(pkt); - ethertype = ntohs(hdr->type); + ethertype = net_ntohs(hdr->type); return ethertype == NET_ETH_PTYPE_EAPOL; } @@ -515,10 +515,10 @@ static void ip_maddr_event_handler(struct net_if *iface, } switch (addr->family) { - case AF_INET: + case NET_AF_INET: net_eth_ipv4_mcast_to_mac_addr(&addr->in_addr, &mac_addr); break; - case AF_INET6: + case NET_AF_INET6: net_eth_ipv6_mcast_to_mac_addr(&addr->in6_addr, &mac_addr); break; default: diff --git a/drivers/wifi/nxp/nxp_wifi_drv.c b/drivers/wifi/nxp/nxp_wifi_drv.c index 8c5750fe07aae..1c83caaedb059 100644 --- a/drivers/wifi/nxp/nxp_wifi_drv.c +++ b/drivers/wifi/nxp/nxp_wifi_drv.c @@ -260,21 +260,23 @@ int nxp_wifi_wlan_event_callback(enum wlan_event_reason reason, void *data) LOG_DBG("Soft AP \"%s\" started successfully", uap_ssid); #endif - if (net_addr_pton(AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS, &dhcps_addr4) < 0) { + if (net_addr_pton(NET_AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS, + &dhcps_addr4) < 0) { LOG_ERR("Invalid CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS"); return 0; } net_if_ipv4_addr_add(g_uap.netif, &dhcps_addr4, NET_ADDR_MANUAL, 0); net_if_ipv4_set_gw(g_uap.netif, &dhcps_addr4); - if (net_addr_pton(AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_MASK, &netmask_addr) < 0) { + if (net_addr_pton(NET_AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_MASK, + &netmask_addr) < 0) { LOG_ERR("Invalid CONFIG_NXP_WIFI_SOFTAP_IP_MASK"); return 0; } net_if_ipv4_set_netmask_by_addr(g_uap.netif, &dhcps_addr4, &netmask_addr); net_if_dormant_off(g_uap.netif); - if (net_addr_pton(AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_BASE, &base_addr) < 0) { + if (net_addr_pton(NET_AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_BASE, &base_addr) < 0) { LOG_ERR("Invalid CONFIG_NXP_WIFI_SOFTAP_IP_BASE"); return 0; } @@ -356,7 +358,8 @@ int nxp_wifi_wlan_event_callback(enum wlan_event_reason reason, void *data) net_if_dormant_on(g_uap.netif); LOG_DBG("WLAN: UAP Stopped"); - if (net_addr_pton(AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS, &dhcps_addr4) < 0) { + if (net_addr_pton(NET_AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS, + &dhcps_addr4) < 0) { LOG_ERR("Invalid CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS"); } else { net_if_ipv4_addr_rm(g_uap.netif, &dhcps_addr4); @@ -680,13 +683,13 @@ static int nxp_wifi_start_ap(const struct device *dev, struct wifi_connect_req_p return -EAGAIN; } - if (net_addr_pton(AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS, &ap_addr4->address) < 0) { + if (net_addr_pton(NET_AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS, &ap_addr4->address) < 0) { LOG_ERR("Invalid CONFIG_NXP_WIFI_SOFTAP_IP_ADDRESS"); return -ENOENT; } ap_addr4->gw = ap_addr4->address; - if (net_addr_pton(AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_MASK, &ap_addr4->netmask) < 0) { + if (net_addr_pton(NET_AF_INET, CONFIG_NXP_WIFI_SOFTAP_IP_MASK, &ap_addr4->netmask) < 0) { LOG_ERR("Invalid CONFIG_NXP_WIFI_SOFTAP_IP_MASK"); return -ENOENT; } diff --git a/drivers/wifi/simplelink/simplelink_sockets.c b/drivers/wifi/simplelink/simplelink_sockets.c index 29819ad456486..446bd408fcf96 100644 --- a/drivers/wifi/simplelink/simplelink_sockets.c +++ b/drivers/wifi/simplelink/simplelink_sockets.c @@ -9,10 +9,9 @@ LOG_MODULE_DECLARE(LOG_MODULE_NAME); #include #include -#include #include -/* Define sockaddr, etc, before simplelink.h */ +/* Define net_sockaddr, etc, before simplelink.h */ #include #include @@ -33,7 +32,7 @@ LOG_MODULE_DECLARE(LOG_MODULE_NAME); #define SD_TO_OBJ(sd) ((void *)(sd + 1)) #define OBJ_TO_SD(obj) (((int)obj) - 1) -static int simplelink_socket_accept(void *obj, struct sockaddr *addr, +static int simplelink_socket_accept(void *obj, struct net_sockaddr *addr, socklen_t *addrlen); /* @@ -189,10 +188,10 @@ static int getErrno(_i32 error) static int simplelink_socket_family_from_posix(int family, int *family_sl) { switch (family) { - case AF_INET: + case NET_AF_INET: *family_sl = SL_AF_INET; break; - case AF_INET6: + case NET_AF_INET6: *family_sl = SL_AF_INET6; break; default: @@ -223,17 +222,17 @@ static int simplelink_socket_type_from_posix(int type, int *type_sl) static int simplelink_socket_proto_from_zephyr(int proto, int *proto_sl) { - if (proto >= IPPROTO_TLS_1_0 && proto <= IPPROTO_TLS_1_2) { + if (proto >= NET_IPPROTO_TLS_1_0 && proto <= NET_IPPROTO_TLS_1_2) { *proto_sl = SL_SEC_SOCKET; - } else if (proto >= IPPROTO_DTLS_1_0 && proto <= IPPROTO_DTLS_1_2) { + } else if (proto >= NET_IPPROTO_DTLS_1_0 && proto <= NET_IPPROTO_DTLS_1_2) { /* SimpleLink doesn't handle DTLS yet! */ return -EPROTONOSUPPORT; } else { switch (proto) { - case IPPROTO_TCP: + case NET_IPPROTO_TCP: *proto_sl = SL_IPPROTO_TCP; break; - case IPPROTO_UDP: + case NET_IPPROTO_UDP: *proto_sl = SL_IPPROTO_UDP; break; default: @@ -281,7 +280,7 @@ static int simplelink_socket(int family, int type, int proto) if (IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS) && sl_proto == SL_SEC_SOCKET) { /* Now, set specific TLS version via setsockopt(): */ - sec_method = (proto - IPPROTO_TLS_1_0) + + sec_method = (proto - NET_IPPROTO_TLS_1_0) + SL_SO_SEC_METHOD_TLSV1; retval = sl_SetSockOpt(sd, SL_SOL_SOCKET, SL_SO_SECMETHOD, @@ -318,17 +317,17 @@ static int simplelink_close(void *obj) return retval; } -static SlSockAddr_t *translate_z_to_sl_addrlen(socklen_t addrlen, +static SlSockAddr_t *translate_z_to_sl_addrlen(net_socklen_t addrlen, SlSockAddrIn_t *sl_addr_in, SlSockAddrIn6_t *sl_addr_in6, SlSocklen_t *sl_addrlen) { SlSockAddr_t *sl_addr = NULL; - if (addrlen == sizeof(struct sockaddr_in)) { + if (addrlen == sizeof(struct net_sockaddr_in)) { *sl_addrlen = sizeof(SlSockAddrIn_t); sl_addr = (SlSockAddr_t *)sl_addr_in; - } else if (addrlen == sizeof(struct sockaddr_in6)) { + } else if (addrlen == sizeof(struct net_sockaddr_in6)) { *sl_addrlen = sizeof(SlSockAddrIn6_t); sl_addr = (SlSockAddr_t *)sl_addr_in6; } @@ -336,16 +335,16 @@ static SlSockAddr_t *translate_z_to_sl_addrlen(socklen_t addrlen, return sl_addr; } -static SlSockAddr_t *translate_z_to_sl_addrs(const struct sockaddr *addr, - socklen_t addrlen, +static SlSockAddr_t *translate_z_to_sl_addrs(const struct net_sockaddr *addr, + net_socklen_t addrlen, SlSockAddrIn_t *sl_addr_in, SlSockAddrIn6_t *sl_addr_in6, SlSocklen_t *sl_addrlen) { SlSockAddr_t *sl_addr = NULL; - if (addrlen == sizeof(struct sockaddr_in)) { - struct sockaddr_in *z_sockaddr_in = (struct sockaddr_in *)addr; + if (addrlen == sizeof(struct net_sockaddr_in)) { + struct net_sockaddr_in *z_sockaddr_in = (struct net_sockaddr_in *)addr; *sl_addrlen = sizeof(SlSockAddrIn_t); sl_addr_in->sin_family = SL_AF_INET; @@ -354,9 +353,9 @@ static SlSockAddr_t *translate_z_to_sl_addrs(const struct sockaddr *addr, z_sockaddr_in->sin_addr.s_addr; sl_addr = (SlSockAddr_t *)sl_addr_in; - } else if (addrlen == sizeof(struct sockaddr_in6)) { - struct sockaddr_in6 *z_sockaddr_in6 = - (struct sockaddr_in6 *)addr; + } else if (addrlen == sizeof(struct net_sockaddr_in6)) { + struct net_sockaddr_in6 *z_sockaddr_in6 = + (struct net_sockaddr_in6 *)addr; *sl_addrlen = sizeof(SlSockAddrIn6_t); sl_addr_in6->sin6_family = SL_AF_INET6; @@ -373,48 +372,48 @@ static SlSockAddr_t *translate_z_to_sl_addrs(const struct sockaddr *addr, static void translate_sl_to_z_addr(SlSockAddr_t *sl_addr, SlSocklen_t sl_addrlen, - struct sockaddr *addr, - socklen_t *addrlen) + struct net_sockaddr *addr, + net_socklen_t *addrlen) { SlSockAddrIn_t *sl_addr_in; SlSockAddrIn6_t *sl_addr_in6; if (sl_addr->sa_family == SL_AF_INET) { if (sl_addrlen == (SlSocklen_t)sizeof(SlSockAddrIn_t)) { - struct sockaddr_in *z_sockaddr_in = - (struct sockaddr_in *)addr; + struct net_sockaddr_in *z_sockaddr_in = + (struct net_sockaddr_in *)addr; sl_addr_in = (SlSockAddrIn_t *)sl_addr; - z_sockaddr_in->sin_family = AF_INET; + z_sockaddr_in->sin_family = NET_AF_INET; z_sockaddr_in->sin_port = sl_addr_in->sin_port; z_sockaddr_in->sin_addr.s_addr = sl_addr_in->sin_addr.s_addr; - *addrlen = sizeof(struct sockaddr_in); + *addrlen = sizeof(struct net_sockaddr_in); } else { *addrlen = sl_addrlen; } } else if (sl_addr->sa_family == SL_AF_INET6) { if (sl_addrlen == sizeof(SlSockAddrIn6_t)) { - struct sockaddr_in6 *z_sockaddr_in6 = - (struct sockaddr_in6 *)addr; + struct net_sockaddr_in6 *z_sockaddr_in6 = + (struct net_sockaddr_in6 *)addr; sl_addr_in6 = (SlSockAddrIn6_t *)sl_addr; - z_sockaddr_in6->sin6_family = AF_INET6; + z_sockaddr_in6->sin6_family = NET_AF_INET6; z_sockaddr_in6->sin6_port = sl_addr_in6->sin6_port; z_sockaddr_in6->sin6_scope_id = (uint8_t)sl_addr_in6->sin6_scope_id; memcpy(z_sockaddr_in6->sin6_addr.s6_addr, sl_addr_in6->sin6_addr._S6_un._S6_u32, sizeof(z_sockaddr_in6->sin6_addr.s6_addr)); - *addrlen = sizeof(struct sockaddr_in6); + *addrlen = sizeof(struct net_sockaddr_in6); } else { *addrlen = sl_addrlen; } } } -static int simplelink_accept(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int simplelink_accept(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int sd = OBJ_TO_SD(obj); int retval; @@ -452,8 +451,8 @@ static int simplelink_accept(void *obj, struct sockaddr *addr, return retval; } -static int simplelink_bind(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int simplelink_bind(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int sd = OBJ_TO_SD(obj); int retval; @@ -500,8 +499,8 @@ static int simplelink_listen(void *obj, int backlog) return retval; } -static int simplelink_connect(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int simplelink_connect(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int sd = OBJ_TO_SD(obj); int retval; @@ -647,7 +646,7 @@ static int simplelink_poll(struct zsock_pollfd *fds, int nfds, int msecs) * map to SimpleLink values, then set stored filenames * via SimpleLink's sl_SetSockOpt() */ -static int map_credentials(int sd, const void *optval, socklen_t optlen) +static int map_credentials(int sd, const void *optval, net_socklen_t optlen) { sec_tag_t *sec_tags = (sec_tag_t *)optval; int retval = 0; @@ -703,7 +702,7 @@ static int map_credentials(int sd, const void *optval, socklen_t optlen) return retval; } #else -static int map_credentials(int sd, const void *optval, socklen_t optlen) +static int map_credentials(int sd, const void *optval, net_socklen_t optlen) { return 0; } @@ -713,7 +712,7 @@ static int map_credentials(int sd, const void *optval, socklen_t optlen) #define _SEC_DOMAIN_VERIF SL_SO_SECURE_DOMAIN_NAME_VERIFICATION static int simplelink_setsockopt(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int sd = OBJ_TO_SD(obj); int retval; @@ -807,7 +806,7 @@ static int simplelink_setsockopt(void *obj, int level, int optname, } static int simplelink_getsockopt(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int sd = OBJ_TO_SD(obj); int retval; @@ -903,7 +902,7 @@ static int handle_recv_flags(int sd, int flags, bool set, int *nb_enabled) } static ssize_t simplelink_recvfrom(void *obj, void *buf, size_t len, int flags, - struct sockaddr *from, socklen_t *fromlen) + struct net_sockaddr *from, net_socklen_t *fromlen) { int sd = OBJ_TO_SD(obj); ssize_t retval; @@ -949,8 +948,8 @@ static ssize_t simplelink_recvfrom(void *obj, void *buf, size_t len, int flags, } static ssize_t simplelink_sendto(void *obj, const void *buf, size_t len, - int flags, const struct sockaddr *to, - socklen_t tolen) + int flags, const struct net_sockaddr *to, + net_socklen_t tolen) { int sd = OBJ_TO_SD(obj); ssize_t retval; @@ -983,7 +982,7 @@ static ssize_t simplelink_sendto(void *obj, const void *buf, size_t len, return retval; } -static ssize_t simplelink_sendmsg(void *obj, const struct msghdr *msg, +static ssize_t simplelink_sendmsg(void *obj, const struct net_msghdr *msg, int flags) { errno = -ENOTSUP; @@ -995,7 +994,7 @@ static int set_addr_info(const struct SlNetUtil_addrInfo_t *sl_ai, struct zsock_addrinfo **res) { struct zsock_addrinfo *ai; - struct sockaddr *ai_addr; + struct net_sockaddr *ai_addr; int retval = 0; ai = calloc(1, sizeof(struct zsock_addrinfo)); @@ -1003,8 +1002,8 @@ static int set_addr_info(const struct SlNetUtil_addrInfo_t *sl_ai, retval = DNS_EAI_MEMORY; goto exit; } else { - /* Now, alloc the embedded sockaddr struct: */ - ai_addr = calloc(1, sizeof(struct sockaddr)); + /* Now, alloc the embedded net_sockaddr struct: */ + ai_addr = calloc(1, sizeof(struct net_sockaddr)); if (!ai_addr) { retval = DNS_EAI_MEMORY; free(ai); @@ -1013,21 +1012,21 @@ static int set_addr_info(const struct SlNetUtil_addrInfo_t *sl_ai, } /* Now, fill in the fields of res (addrinfo struct): */ - ai->ai_family = (sl_ai->ai_family == SL_AF_INET6 ? AF_INET6 : AF_INET); + ai->ai_family = (sl_ai->ai_family == SL_AF_INET6 ? NET_AF_INET6 : NET_AF_INET); ai->ai_socktype = (sl_ai->ai_socktype == SLNETSOCK_SOCK_DGRAM ? - SOCK_DGRAM : SOCK_STREAM); + NET_SOCK_DGRAM : NET_SOCK_STREAM); ai->ai_protocol = (sl_ai->ai_protocol == SLNETSOCK_PROTO_UDP ? - IPPROTO_UDP : IPPROTO_TCP); + NET_IPPROTO_UDP : NET_IPPROTO_TCP); /* Fill sockaddr struct fields based on family: */ - if (ai->ai_family == AF_INET) { + if (ai->ai_family == NET_AF_INET) { SlNetSock_AddrIn_t *sl_addr = (SlNetSock_AddrIn_t *)sl_ai->ai_addr; net_sin(ai_addr)->sin_family = ai->ai_family; net_sin(ai_addr)->sin_addr.s_addr = sl_addr->sin_addr.s_addr; net_sin(ai_addr)->sin_port = sl_addr->sin_port; - ai->ai_addrlen = sizeof(struct sockaddr_in); + ai->ai_addrlen = sizeof(struct net_sockaddr_in); } else { SlNetSock_AddrIn6_t *sl_addr = (SlNetSock_AddrIn6_t *)sl_ai->ai_addr; @@ -1042,7 +1041,7 @@ static int set_addr_info(const struct SlNetUtil_addrInfo_t *sl_ai, net_sin6(ai_addr)->sin6_addr.s6_addr32[3] = sl_addr->sin6_addr._S6_un._S6_u32[3]; net_sin6(ai_addr)->sin6_port = sl_addr->sin6_port; - ai->ai_addrlen = sizeof(struct sockaddr_in6); + ai->ai_addrlen = sizeof(struct net_sockaddr_in6); } ai->ai_addr = ai_addr; ai->ai_next = *res; @@ -1074,28 +1073,28 @@ static int simplelink_getaddrinfo(const char *node, const char *service, * SlNetUtil only supports AI_NUMERICHOST and AI_PASSIVE, so * the rest are ignored. */ - sl_hints.ai_flags |= ((hints->ai_flags & AI_PASSIVE) ? + sl_hints.ai_flags |= ((hints->ai_flags & ZSOCK_AI_PASSIVE) ? SLNETUTIL_AI_PASSIVE : 0); - sl_hints.ai_flags |= ((hints->ai_flags & AI_NUMERICHOST) ? + sl_hints.ai_flags |= ((hints->ai_flags & ZSOCK_AI_NUMERICHOST) ? SLNETUTIL_AI_NUMERICHOST : 0); - if (hints->ai_family == AF_UNSPEC) { + if (hints->ai_family == NET_AF_UNSPEC) { sl_hints.ai_family = SLNETSOCK_AF_UNSPEC; } else { - sl_hints.ai_family = (hints->ai_family == AF_INET6 ? + sl_hints.ai_family = (hints->ai_family == NET_AF_INET6 ? SLNETSOCK_AF_INET6 : SLNETSOCK_AF_INET); } if (hints->ai_socktype == 0) { sl_hints.ai_socktype = 0; } else { sl_hints.ai_socktype = - (hints->ai_socktype == SOCK_DGRAM ? + (hints->ai_socktype == NET_SOCK_DGRAM ? SLNETSOCK_SOCK_DGRAM : SLNETSOCK_SOCK_STREAM); } if (hints->ai_protocol == 0) { sl_hints.ai_protocol = 0; } else { sl_hints.ai_protocol = - (hints->ai_protocol == IPPROTO_UDP ? + (hints->ai_protocol == NET_IPPROTO_UDP ? SLNETSOCK_PROTO_UDP : SLNETSOCK_PROTO_TCP); } @@ -1143,17 +1142,17 @@ static int simplelink_fcntl(int sd, int cmd, va_list args) SlSocklen_t optlen = sizeof(SlSockNonblocking_t); switch (cmd) { - case F_GETFL: + case ZVFS_F_GETFL: retval = sl_GetSockOpt(sd, SL_SOL_SOCKET, SL_SO_NONBLOCKING, (_u8 *)&enableOption, &optlen); if (retval == 0) { if (enableOption.NonBlockingEnabled) { - retval |= O_NONBLOCK; + retval |= ZVFS_O_NONBLOCK; } } break; - case F_SETFL: - if ((va_arg(args, int) & O_NONBLOCK) != 0) { + case ZVFS_F_SETFL: + if ((va_arg(args, int) & ZVFS_O_NONBLOCK) != 0) { enableOption.NonBlockingEnabled = 1; } else { enableOption.NonBlockingEnabled = 0; @@ -1280,8 +1279,8 @@ int simplelink_socket_create(int family, int type, int proto) return fd; } -static int simplelink_socket_accept(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int simplelink_socket_accept(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int fd = zvfs_reserve_fd(); int sock; @@ -1304,7 +1303,7 @@ static int simplelink_socket_accept(void *obj, struct sockaddr *addr, } #ifdef CONFIG_NET_SOCKETS_OFFLOAD -NET_SOCKET_OFFLOAD_REGISTER(simplelink, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, AF_UNSPEC, +NET_SOCKET_OFFLOAD_REGISTER(simplelink, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY, NET_AF_UNSPEC, simplelink_is_supported, simplelink_socket_create); #endif diff --git a/drivers/wifi/simplelink/simplelink_support.c b/drivers/wifi/simplelink/simplelink_support.c index dab0739a08b73..3edb1b58cf006 100644 --- a/drivers/wifi/simplelink/simplelink_support.c +++ b/drivers/wifi/simplelink/simplelink_support.c @@ -141,7 +141,7 @@ static int32_t configure_simplelink(void) ASSERT_ON_ERROR(retval, WLAN_ERROR); #if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_CONFIG_MY_IPV4_ADDR) - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr4) + if (net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr4) < 0) { LOG_ERR("Invalid CONFIG_NET_CONFIG_MY_IPV4_ADDR"); return -1; @@ -153,7 +153,7 @@ static int32_t configure_simplelink(void) #if defined(CONFIG_NET_CONFIG_MY_IPV4_GW) if (strcmp(CONFIG_NET_CONFIG_MY_IPV4_GW, "") != 0) { - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_GW, + if (net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_MY_IPV4_GW, &addr4) < 0) { LOG_ERR("Invalid CONFIG_NET_CONFIG_MY_IPV4_GW"); return -1; @@ -167,7 +167,7 @@ static int32_t configure_simplelink(void) #if defined(CONFIG_NET_CONFIG_MY_IPV4_NETMASK) if (strcmp(CONFIG_NET_CONFIG_MY_IPV4_NETMASK, "") != 0) { - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, + if (net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, &addr4) < 0) { LOG_ERR("Invalid CONFIG_NET_CONFIG_MY_IPV4_NETMASK"); return -1; diff --git a/drivers/wifi/winc1500/wifi_winc1500.c b/drivers/wifi/winc1500/wifi_winc1500.c index b0788a04c5605..a5cb597c371f9 100644 --- a/drivers/wifi/winc1500/wifi_winc1500.c +++ b/drivers/wifi/winc1500/wifi_winc1500.c @@ -297,13 +297,13 @@ static int winc1500_get(sa_family_t family, struct socket_data *sd; SOCKET sock; - if (family != AF_INET) { - LOG_ERR("Only AF_INET is supported!"); + if (family != NET_AF_INET) { + LOG_ERR("Only NET_AF_INET is supported!"); return -1; } - /* winc1500 atmel uses AF_INET 2 instead of zephyrs AF_INET 1 - * we have checked if family is AF_INET so we can hardcode this + /* winc1500 atmel uses NET_AF_INET 2 instead of zephyrs NET_AF_INET 1 + * we have checked if family is NET_AF_INET so we can hardcode this * for now. */ sock = winc1500_socket(2, type, 0); @@ -873,7 +873,7 @@ static void handle_socket_msg_accept(struct socket_data *sd, void *pvMsg) accept_msg->strAddr.sin_addr.s4_addr[1], accept_msg->strAddr.sin_addr.s4_addr[2], accept_msg->strAddr.sin_addr.s4_addr[3], - ntohs(accept_msg->strAddr.sin_port), + net_ntohs(accept_msg->strAddr.sin_port), accept_msg->sock); if (accept_msg->sock < 0) { @@ -891,8 +891,8 @@ static void handle_socket_msg_accept(struct socket_data *sd, void *pvMsg) memcpy(a_sd, sd, sizeof(struct socket_data)); - ret = net_context_get(AF_INET, SOCK_STREAM, - IPPROTO_TCP, &a_sd->context); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, + NET_IPPROTO_TCP, &a_sd->context); if (ret < 0) { LOG_ERR("Cannot get new net context for ACCEPT"); return; @@ -910,7 +910,7 @@ static void handle_socket_msg_accept(struct socket_data *sd, void *pvMsg) net_context_set_state(a_sd->context, NET_CONTEXT_CONNECTED); /** Setup remote */ - a_sd->context->remote.sa_family = AF_INET; + a_sd->context->remote.sa_family = NET_AF_INET; net_sin(&a_sd->context->remote)->sin_port = accept_msg->strAddr.sin_port; net_sin(&a_sd->context->remote)->sin_addr.s_addr = diff --git a/include/zephyr/logging/log_backend_net.h b/include/zephyr/logging/log_backend_net.h index 71b22e1e0e9e0..32892cc617876 100644 --- a/include/zephyr/logging/log_backend_net.h +++ b/include/zephyr/logging/log_backend_net.h @@ -42,18 +42,18 @@ extern "C" { bool log_backend_net_set_addr(const char *addr); /** - * @brief Allows user to set a server IP address, provided as sockaddr structure, at runtime + * @brief Allows user to set a server IP address, provided as net_sockaddr structure, at runtime * * @details This function allows the user to set an IPv4 or IPv6 address at runtime. It can be * called either before or after the backend has been initialized. If it gets called when * the net logger backend context is running, it'll release it and create another one with * the new address next time process() gets called. * - * @param addr Pointer to the sockaddr structure that contains the IP address. + * @param addr Pointer to the net_sockaddr structure that contains the IP address. * * @return True if address could be set, false otherwise. */ -bool log_backend_net_set_ip(const struct sockaddr *addr); +bool log_backend_net_set_ip(const struct net_sockaddr *addr); /** * @brief update the hostname diff --git a/include/zephyr/net/canbus.h b/include/zephyr/net/canbus.h index 1d7056a72ead7..1d96457746094 100644 --- a/include/zephyr/net/canbus.h +++ b/include/zephyr/net/canbus.h @@ -39,12 +39,12 @@ struct canbus_api { /** Set socket CAN option */ int (*setsockopt)(const struct device *dev, void *obj, int level, int optname, - const void *optval, socklen_t optlen); + const void *optval, net_socklen_t optlen); /** Get socket CAN option */ int (*getsockopt)(const struct device *dev, void *obj, int level, int optname, - const void *optval, socklen_t *optlen); + const void *optval, net_socklen_t *optlen); }; /* Make sure that the network interface API is properly setup inside diff --git a/include/zephyr/net/capture.h b/include/zephyr/net/capture.h index 1ebb3da414e8e..b009410578f4b 100644 --- a/include/zephyr/net/capture.h +++ b/include/zephyr/net/capture.h @@ -337,8 +337,8 @@ struct net_capture_info { const struct device *capture_dev; struct net_if *capture_iface; struct net_if *tunnel_iface; - struct sockaddr *peer; - struct sockaddr *local; + struct net_sockaddr *peer; + struct net_sockaddr *local; bool is_enabled; }; diff --git a/include/zephyr/net/coap.h b/include/zephyr/net/coap.h index dbf4a546f1dce..a3bcb043066d7 100644 --- a/include/zephyr/net/coap.h +++ b/include/zephyr/net/coap.h @@ -262,7 +262,7 @@ struct coap_resource; */ typedef int (*coap_method_t)(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len); + struct net_sockaddr *addr, net_socklen_t addr_len); /** * @typedef coap_notify_t @@ -300,7 +300,7 @@ struct coap_observer { /** Observer list node */ sys_snode_t list; /** Observer connection end point information */ - struct sockaddr addr; + struct net_sockaddr addr; /** Observer token */ uint8_t token[8]; /** Extended token length */ @@ -350,7 +350,7 @@ struct coap_option { */ typedef int (*coap_reply_t)(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from); + const struct net_sockaddr *from); /** * @brief CoAP transmission parameters. @@ -375,7 +375,7 @@ struct coap_transmission_parameters { * @brief Represents a request awaiting for an acknowledgment (ACK). */ struct coap_pending { - struct sockaddr addr; /**< Remote address */ + struct net_sockaddr addr; /**< Remote address */ int64_t t0; /**< Time when the request was sent */ uint32_t timeout; /**< Timeout in ms */ uint16_t id; /**< Message id */ @@ -707,7 +707,7 @@ int coap_handle_request_len(struct coap_packet *cpkt, size_t resources_len, struct coap_option *options, uint8_t opt_num, - struct sockaddr *addr, socklen_t addr_len); + struct net_sockaddr *addr, net_socklen_t addr_len); /** * @brief When a request is received, call the appropriate methods of @@ -729,7 +729,7 @@ int coap_handle_request(struct coap_packet *cpkt, struct coap_resource *resources, struct coap_option *options, uint8_t opt_num, - struct sockaddr *addr, socklen_t addr_len); + struct net_sockaddr *addr, net_socklen_t addr_len); /** * Represents the size of each block that will be transferred using @@ -996,7 +996,7 @@ size_t coap_next_block(const struct coap_packet *cpkt, */ void coap_observer_init(struct coap_observer *observer, const struct coap_packet *request, - const struct sockaddr *addr); + const struct net_sockaddr *addr); /** * @brief After the observer is initialized, associate the observer @@ -1037,7 +1037,7 @@ bool coap_remove_observer(struct coap_resource *resource, */ struct coap_observer *coap_find_observer( struct coap_observer *observers, size_t len, - const struct sockaddr *addr, + const struct net_sockaddr *addr, const uint8_t *token, uint8_t token_len); /** @@ -1055,7 +1055,7 @@ struct coap_observer *coap_find_observer( */ struct coap_observer *coap_find_observer_by_addr( struct coap_observer *observers, size_t len, - const struct sockaddr *addr); + const struct net_sockaddr *addr); /** * @brief Returns the observer that has token @a token. @@ -1114,7 +1114,7 @@ void coap_reply_init(struct coap_reply *reply, */ int coap_pending_init(struct coap_pending *pending, const struct coap_packet *request, - const struct sockaddr *addr, + const struct net_sockaddr *addr, const struct coap_transmission_parameters *params); /** @@ -1174,7 +1174,7 @@ struct coap_pending *coap_pending_received( */ struct coap_reply *coap_response_received( const struct coap_packet *response, - const struct sockaddr *from, + const struct net_sockaddr *from, struct coap_reply *replies, size_t len); /** diff --git a/include/zephyr/net/coap_client.h b/include/zephyr/net/coap_client.h index 1d3b959a7d2d0..2b46de1260567 100644 --- a/include/zephyr/net/coap_client.h +++ b/include/zephyr/net/coap_client.h @@ -164,8 +164,8 @@ struct coap_client_internal_request { struct coap_client { int fd; - struct sockaddr address; - socklen_t socklen; + struct net_sockaddr address; + net_socklen_t socklen; struct k_mutex lock; uint8_t recv_buf[MAX_COAP_MSG_LEN]; struct coap_client_internal_request requests[CONFIG_COAP_CLIENT_MAX_REQUESTS]; @@ -206,7 +206,7 @@ int coap_client_init(struct coap_client *client, const char *info); * @return zero when operation started successfully or negative error code otherwise. */ -int coap_client_req(struct coap_client *client, int sock, const struct sockaddr *addr, +int coap_client_req(struct coap_client *client, int sock, const struct net_sockaddr *addr, struct coap_client_request *req, struct coap_transmission_parameters *params); /** diff --git a/include/zephyr/net/coap_service.h b/include/zephyr/net/coap_service.h index de0cb23d325bb..78bb207116140 100644 --- a/include/zephyr/net/coap_service.h +++ b/include/zephyr/net/coap_service.h @@ -100,7 +100,7 @@ struct coap_service { * static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led0), gpios); * * static int led_put(struct coap_resource *resource, struct coap_packet *request, - * struct sockaddr *addr, socklen_t addr_len) + * struct net_sockaddr *addr, net_socklen_t addr_len) * { * const uint8_t *payload; * uint16_t payload_len; @@ -288,7 +288,7 @@ int coap_service_is_running(const struct coap_service *service); * @return 0 in case of success or negative in case of error. */ int coap_service_send(const struct coap_service *service, const struct coap_packet *cpkt, - const struct sockaddr *addr, socklen_t addr_len, + const struct net_sockaddr *addr, net_socklen_t addr_len, const struct coap_transmission_parameters *params); /** @@ -304,7 +304,7 @@ int coap_service_send(const struct coap_service *service, const struct coap_pack * @return 0 in case of success or negative in case of error. */ int coap_resource_send(const struct coap_resource *resource, const struct coap_packet *cpkt, - const struct sockaddr *addr, socklen_t addr_len, + const struct net_sockaddr *addr, net_socklen_t addr_len, const struct coap_transmission_parameters *params); /** @@ -321,7 +321,7 @@ int coap_resource_send(const struct coap_resource *resource, const struct coap_p * @return the observe option value in case of success or negative in case of error. */ int coap_resource_parse_observe(struct coap_resource *resource, const struct coap_packet *request, - const struct sockaddr *addr); + const struct net_sockaddr *addr); /** * @brief Lookup an observer by address and remove it from the @p resource . @@ -333,7 +333,7 @@ int coap_resource_parse_observe(struct coap_resource *resource, const struct coa * @return 0 in case of success or negative in case of error. */ int coap_resource_remove_observer_by_addr(struct coap_resource *resource, - const struct sockaddr *addr); + const struct net_sockaddr *addr); /** * @brief Lookup an observer by token and remove it from the @p resource . diff --git a/include/zephyr/net/dhcpv4_server.h b/include/zephyr/net/dhcpv4_server.h index 1cd0bbdb49edb..692b3b5490606 100644 --- a/include/zephyr/net/dhcpv4_server.h +++ b/include/zephyr/net/dhcpv4_server.h @@ -48,7 +48,7 @@ struct dhcpv4_client_id { struct dhcpv4_addr_slot { enum dhcpv4_server_addr_state state; struct dhcpv4_client_id client_id; - struct in_addr addr; + struct net_in_addr addr; uint32_t lease_time; k_timepoint_t expiry; }; @@ -69,7 +69,7 @@ struct dhcpv4_addr_slot { * * @return 0 on success, a negative error code otherwise. */ -int net_dhcpv4_server_start(struct net_if *iface, struct in_addr *base_addr); +int net_dhcpv4_server_start(struct net_if *iface, struct net_in_addr *base_addr); /** * @brief Stop DHCPv4 server instance on an iface @@ -126,7 +126,7 @@ int net_dhcpv4_server_foreach_lease(struct net_if *iface, */ typedef int (*net_dhcpv4_server_provider_cb_t)(struct net_if *iface, const struct dhcpv4_client_id *client_id, - struct in_addr *addr, + struct net_in_addr *addr, void *user_data); /** * @brief Set the callback used to provide addresses to the DHCP server. diff --git a/include/zephyr/net/dns_resolve.h b/include/zephyr/net/dns_resolve.h index aed2b17d7674c..83aa8c2354ef9 100644 --- a/include/zephyr/net/dns_resolve.h +++ b/include/zephyr/net/dns_resolve.h @@ -214,7 +214,7 @@ struct dns_socket_dispatcher; * @return 0 if ok, <0 if error */ typedef int (*dns_socket_dispatcher_cb)(struct dns_socket_dispatcher *ctx, int sock, - struct sockaddr *addr, size_t addrlen, + struct net_sockaddr *addr, size_t addrlen, struct net_buf *buf, size_t data_len); /** @brief DNS socket dispatcher context. */ @@ -235,7 +235,7 @@ struct dns_socket_dispatcher { /** Type of the socket (resolver / responder) */ enum dns_socket_type type; /** Local endpoint address (used when binding the socket) */ - struct sockaddr local_addr; + struct net_sockaddr local_addr; /** DNS socket dispatcher callback is called for incoming traffic */ dns_socket_dispatcher_cb cb; /** Socket descriptors to poll */ @@ -312,10 +312,10 @@ struct dns_addrinfo { union { struct { /** Length of the ai_addr field or ai_canonname */ - socklen_t ai_addrlen; + net_socklen_t ai_addrlen; - /* AF_INET or AF_INET6 address info */ - struct sockaddr ai_addr; + /* NET_AF_INET or NET_AF_INET6 address info */ + struct net_sockaddr ai_addr; /** AF_LOCAL Canonical name of the address */ char ai_canonname[DNS_MAX_NAME_SIZE + 1]; @@ -427,7 +427,7 @@ struct dns_resolve_context { /** List of configured DNS servers */ struct dns_server { /** DNS server information */ - struct sockaddr dns_server; + struct net_sockaddr dns_server; /** Connection to the DNS server */ int sock; @@ -536,7 +536,7 @@ struct mdns_probe_user_data { }; struct mdns_responder_context { - struct sockaddr server_addr; + struct net_sockaddr server_addr; struct dns_socket_dispatcher dispatcher; struct zsock_pollfd fds[1]; int sock; @@ -555,7 +555,7 @@ struct mdns_responder_context { * * @details This function sets the DNS server address and initializes the * DNS context that is used by the actual resolver. DNS server addresses - * can be specified either in textual form, or as struct sockaddr (or both). + * can be specified either in textual form, or as struct net_sockaddr (or both). * Note that the recommended way to resolve DNS names is to use * the dns_get_addr_info() API. In that case user does not need to * call dns_resolve_init() as the DNS servers are already setup by the system. @@ -571,15 +571,15 @@ struct mdns_responder_context { * IPv4 + port : 10.0.9.1:5353 * IPv6 : 2001:db8::22:42 * IPv6 + port : [2001:db8::22:42]:5353 - * @param dns_servers_sa DNS server addresses as struct sockaddr. The array - * is NULL terminated. Port numbers are optional in struct sockaddr, the + * @param dns_servers_sa DNS server addresses as struct net_sockaddr. The array + * is NULL terminated. Port numbers are optional in struct net_sockaddr, the * default will be used if set to 0. * * @return 0 if ok, <0 if error. */ int dns_resolve_init(struct dns_resolve_context *ctx, const char *dns_servers_str[], - const struct sockaddr *dns_servers_sa[]); + const struct net_sockaddr *dns_servers_sa[]); /** * @brief Init DNS resolving context with default Kconfig options. @@ -615,8 +615,8 @@ int dns_resolve_close(struct dns_resolve_context *ctx); * IPv4 + port : 10.0.9.1:5353 * IPv6 : 2001:db8::22:42 * IPv6 + port : [2001:db8::22:42]:5353 - * @param servers_sa DNS server addresses as struct sockaddr. The array - * is NULL terminated. Port numbers are optional in struct sockaddr, the + * @param servers_sa DNS server addresses as struct net_sockaddr. The array + * is NULL terminated. Port numbers are optional in struct net_sockaddr, the * default will be used if set to 0. * @param source Source of the DNS servers, e.g., manual, DHCPv4/6, etc. * @@ -624,7 +624,7 @@ int dns_resolve_close(struct dns_resolve_context *ctx); */ int dns_resolve_reconfigure(struct dns_resolve_context *ctx, const char *servers_str[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], enum dns_server_source source); /** @@ -639,8 +639,8 @@ int dns_resolve_reconfigure(struct dns_resolve_context *ctx, * IPv4 + port : 10.0.9.1:5353 * IPv6 : 2001:db8::22:42 * IPv6 + port : [2001:db8::22:42]:5353 - * @param servers_sa DNS server addresses as struct sockaddr. The array - * is NULL terminated. Port numbers are optional in struct sockaddr, the + * @param servers_sa DNS server addresses as struct net_sockaddr. The array + * is NULL terminated. Port numbers are optional in struct net_sockaddr, the * default will be used if set to 0. * @param interfaces Network interfaces to which the DNS servers are bound. * This is an array of network interface indices. The array must be @@ -651,7 +651,7 @@ int dns_resolve_reconfigure(struct dns_resolve_context *ctx, */ int dns_resolve_reconfigure_with_interfaces(struct dns_resolve_context *ctx, const char *servers_str[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], int interfaces[], enum dns_server_source source); @@ -682,8 +682,8 @@ int dns_resolve_remove_source(struct dns_resolve_context *ctx, int if_index, * @brief Remove servers from the DNS resolving context that have a specific IP address. * * @param ctx DNS context - * @param servers_sa DNS server addresses as struct sockaddr. The array - * is NULL terminated. Port numbers are optional in struct sockaddr, the + * @param servers_sa DNS server addresses as struct net_sockaddr. The array + * is NULL terminated. Port numbers are optional in struct net_sockaddr, the * default will be used if set to 0. * @param interfaces Network interfaces to which the DNS servers are bound. * This is an array of network interface indices. The array must be @@ -692,7 +692,7 @@ int dns_resolve_remove_source(struct dns_resolve_context *ctx, int if_index, * @return 0 if ok, <0 if error. */ int dns_resolve_remove_server_addresses(struct dns_resolve_context *ctx, - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], int interfaces[]); /** diff --git a/include/zephyr/net/dns_sd.h b/include/zephyr/net/dns_sd.h index 97548199dc940..5dc25e287a07b 100644 --- a/include/zephyr/net/dns_sd.h +++ b/include/zephyr/net/dns_sd.h @@ -96,8 +96,8 @@ extern "C" { * ephemeral port usage - i.e. when the service is bound using port number 0. * In that case, Zephyr (like other OS's) will simply choose an unused port. * When using ephemeral ports, it can be helpful to assign @p _port to the - * @ref sockaddr_in.sin_port field of an IPv4 @ref sockaddr_in, or to the - * @ref sockaddr_in6.sin6_port field of an IPv6 @ref sockaddr_in6. + * @ref net_sockaddr_in.sin_port field of an IPv4 @ref net_sockaddr_in, or to the + * @ref net_sockaddr_in6.sin6_port field of an IPv6 @ref net_sockaddr_in6. * * The service can be referenced using the @p _id variable. * diff --git a/include/zephyr/net/ethernet.h b/include/zephyr/net/ethernet.h index 70a7ca40ab6e7..4eaf0d140351c 100644 --- a/include/zephyr/net/ethernet.h +++ b/include/zephyr/net/ethernet.h @@ -927,7 +927,7 @@ const struct net_eth_addr *net_eth_broadcast_addr(void); * @param ipv4_addr IPv4 multicast address * @param mac_addr Output buffer for Ethernet address */ -void net_eth_ipv4_mcast_to_mac_addr(const struct in_addr *ipv4_addr, +void net_eth_ipv4_mcast_to_mac_addr(const struct net_in_addr *ipv4_addr, struct net_eth_addr *mac_addr); /** @@ -936,7 +936,7 @@ void net_eth_ipv4_mcast_to_mac_addr(const struct in_addr *ipv4_addr, * @param ipv6_addr IPv6 multicast address * @param mac_addr Output buffer for Ethernet address */ -void net_eth_ipv6_mcast_to_mac_addr(const struct in6_addr *ipv6_addr, +void net_eth_ipv6_mcast_to_mac_addr(const struct net_in6_addr *ipv6_addr, struct net_eth_addr *mac_addr); /** diff --git a/include/zephyr/net/icmp.h b/include/zephyr/net/icmp.h index 126e934c8d173..02ae3f538d531 100644 --- a/include/zephyr/net/icmp.h +++ b/include/zephyr/net/icmp.h @@ -76,7 +76,7 @@ typedef int (*net_icmp_handler_t)(struct net_icmp_ctx *ctx, */ typedef int (*net_icmp_offload_ping_handler_t)(struct net_icmp_ctx *ctx, struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, void *user_data); @@ -118,8 +118,8 @@ struct net_icmp_ip_hdr { struct net_ipv6_hdr *ipv6; }; - /** Is the header IPv4 or IPv6 one. Value of either AF_INET or AF_INET6 */ - sa_family_t family; + /** Is the header IPv4 or IPv6 one. Value of either NET_AF_INET or NET_AF_INET6 */ + net_sa_family_t family; }; /** @@ -194,7 +194,7 @@ int net_icmp_cleanup_ctx(struct net_icmp_ctx *ctx); */ int net_icmp_send_echo_request(struct net_icmp_ctx *ctx, struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, void *user_data); @@ -218,7 +218,7 @@ int net_icmp_send_echo_request(struct net_icmp_ctx *ctx, */ int net_icmp_send_echo_request_no_wait(struct net_icmp_ctx *ctx, struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, void *user_data); diff --git a/include/zephyr/net/igmp.h b/include/zephyr/net/igmp.h index 099bbda377f67..9286194e6a7cc 100644 --- a/include/zephyr/net/igmp.h +++ b/include/zephyr/net/igmp.h @@ -31,9 +31,9 @@ extern "C" { /** IGMP parameters */ struct igmp_param { - struct in_addr *source_list; /**< List of sources to include or exclude */ - size_t sources_len; /**< Length of source list */ - bool include; /**< Source list filter type */ + struct net_in_addr *source_list; /**< List of sources to include or exclude */ + size_t sources_len; /**< Length of source list */ + bool include; /**< Source list filter type */ }; /** @@ -46,10 +46,10 @@ struct igmp_param { * @return Return 0 if joining was done, <0 otherwise. */ #if defined(CONFIG_NET_IPV4_IGMP) -int net_ipv4_igmp_join(struct net_if *iface, const struct in_addr *addr, +int net_ipv4_igmp_join(struct net_if *iface, const struct net_in_addr *addr, const struct igmp_param *param); #else -static inline int net_ipv4_igmp_join(struct net_if *iface, const struct in_addr *addr, +static inline int net_ipv4_igmp_join(struct net_if *iface, const struct net_in_addr *addr, const struct igmp_param *param) { ARG_UNUSED(iface); @@ -69,10 +69,10 @@ static inline int net_ipv4_igmp_join(struct net_if *iface, const struct in_addr * @return Return 0 if leaving is done, <0 otherwise. */ #if defined(CONFIG_NET_IPV4_IGMP) -int net_ipv4_igmp_leave(struct net_if *iface, const struct in_addr *addr); +int net_ipv4_igmp_leave(struct net_if *iface, const struct net_in_addr *addr); #else static inline int net_ipv4_igmp_leave(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { ARG_UNUSED(iface); ARG_UNUSED(addr); diff --git a/include/zephyr/net/latmon.h b/include/zephyr/net/latmon.h index 1a6831761a9ba..42c61ccf4b929 100644 --- a/include/zephyr/net/latmon.h +++ b/include/zephyr/net/latmon.h @@ -59,7 +59,7 @@ void net_latmon_start(int latmus, net_latmon_measure_t measure_func); * negative errno code on failure. * */ -int net_latmon_connect(int socket, struct in_addr *ip); +int net_latmon_connect(int socket, struct net_in_addr *ip); /** * @brief Get a socket for the Latmus service. @@ -73,7 +73,7 @@ int net_latmon_connect(int socket, struct in_addr *ip); * * @return A valid socket descriptor on success, negative errno code on failure. */ -int net_latmon_get_socket(struct sockaddr *bind_addr); +int net_latmon_get_socket(struct net_sockaddr *bind_addr); /** * @brief Check if the latency monitor is running. diff --git a/include/zephyr/net/lwm2m.h b/include/zephyr/net/lwm2m.h index d1ce2191bc58b..9254d67a0bef1 100644 --- a/include/zephyr/net/lwm2m.h +++ b/include/zephyr/net/lwm2m.h @@ -207,7 +207,7 @@ enum lwm2m_socket_states { */ struct lwm2m_ctx { /** Destination address storage */ - struct sockaddr remote_addr; + struct net_sockaddr remote_addr; /** @cond INTERNAL_HIDDEN * Private CoAP and networking structures + 1 is for RD Client own message diff --git a/include/zephyr/net/midi2.h b/include/zephyr/net/midi2.h index e7bda15a82a56..f7b4723b631ee 100644 --- a/include/zephyr/net/midi2.h +++ b/include/zephyr/net/midi2.h @@ -169,9 +169,9 @@ struct netmidi2_session { /** Sequence number of the next universal MIDI packet to receive */ uint16_t rx_ump_seq; /** Remote address of the peer */ - struct sockaddr_storage addr; + struct net_sockaddr_storage addr; /** Length of the peer's remote address */ - socklen_t addr_len; + net_socklen_t addr_len; /** The Network MIDI2 endpoint to which this session belongs */ struct netmidi2_ep *ep; #if defined(CONFIG_NETMIDI2_HOST_AUTH) || defined(__DOXYGEN__) @@ -208,9 +208,9 @@ struct netmidi2_ep { const char *piid; /** The local endpoint address */ union { - struct sockaddr addr; - struct sockaddr_in addr4; - struct sockaddr_in6 addr6; + struct net_sockaddr addr; + struct net_sockaddr_in addr4; + struct net_sockaddr_in6 addr6; }; /** The listening socket wrapped in a poll descriptor */ struct zsock_pollfd pollsock; diff --git a/include/zephyr/net/mld.h b/include/zephyr/net/mld.h index 031eb03c931eb..a7129b35933e2 100644 --- a/include/zephyr/net/mld.h +++ b/include/zephyr/net/mld.h @@ -40,10 +40,10 @@ extern "C" { * @return 0 if joining was done, <0 otherwise. */ #if defined(CONFIG_NET_IPV6_MLD) -int net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr); +int net_ipv6_mld_join(struct net_if *iface, const struct net_in6_addr *addr); #else static inline int -net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr) +net_ipv6_mld_join(struct net_if *iface, const struct net_in6_addr *addr) { ARG_UNUSED(addr); ARG_UNUSED(iface); @@ -61,10 +61,10 @@ net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr) * @return 0 if leaving is done, <0 otherwise. */ #if defined(CONFIG_NET_IPV6_MLD) -int net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr); +int net_ipv6_mld_leave(struct net_if *iface, const struct net_in6_addr *addr); #else static inline int -net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr) +net_ipv6_mld_leave(struct net_if *iface, const struct net_in6_addr *addr) { ARG_UNUSED(iface); ARG_UNUSED(addr); diff --git a/include/zephyr/net/mqtt.h b/include/zephyr/net/mqtt.h index a6864d676fbe7..3f1fca45ed11d 100644 --- a/include/zephyr/net/mqtt.h +++ b/include/zephyr/net/mqtt.h @@ -855,8 +855,8 @@ struct mqtt_transport { #if defined(CONFIG_SOCKS) struct { - struct sockaddr addr; - socklen_t addrlen; + struct net_sockaddr addr; + net_socklen_t addrlen; } proxy; #endif }; @@ -1047,8 +1047,8 @@ void mqtt_client_init(struct mqtt_client *client); * @note Must be called before calling mqtt_connect(). */ int mqtt_client_set_proxy(struct mqtt_client *client, - struct sockaddr *proxy_addr, - socklen_t addrlen); + struct net_sockaddr *proxy_addr, + net_socklen_t addrlen); #endif /** diff --git a/include/zephyr/net/mqtt_sn.h b/include/zephyr/net/mqtt_sn.h index 56a95315f739e..c348b06442548 100644 --- a/include/zephyr/net/mqtt_sn.h +++ b/include/zephyr/net/mqtt_sn.h @@ -230,8 +230,8 @@ struct mqtt_sn_transport_udp { int sock; /** Address of broadcasts */ - struct sockaddr bcaddr; - socklen_t bcaddrlen; + struct net_sockaddr bcaddr; + net_socklen_t bcaddrlen; }; #define UDP_TRANSPORT(transport) CONTAINER_OF(transport, struct mqtt_sn_transport_udp, tp) @@ -243,8 +243,8 @@ struct mqtt_sn_transport_udp { * @param[in] gwaddr Pre-initialized gateway address * @param[in] addrlen Size of the gwaddr structure. */ -int mqtt_sn_transport_udp_init(struct mqtt_sn_transport_udp *udp, struct sockaddr *gwaddr, - socklen_t addrlen); +int mqtt_sn_transport_udp_init(struct mqtt_sn_transport_udp *udp, struct net_sockaddr *gwaddr, + net_socklen_t addrlen); #endif /** diff --git a/include/zephyr/net/net_compat.h b/include/zephyr/net/net_compat.h new file mode 100644 index 0000000000000..bf4bd83210d38 --- /dev/null +++ b/include/zephyr/net/net_compat.h @@ -0,0 +1,315 @@ +/** @file + * @brief Network namespace compatibility mode header + * + * Allows to use relevant network symbols without the "net_", "NET_" or + * "ZSOCK_" prefixes. + */ + +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#ifndef ZEPHYR_INCLUDE_NET_NET_COMPAT_H_ +#define ZEPHYR_INCLUDE_NET_NET_COMPAT_H_ + +/** + * @brief Network namespace compatibility mode symbols + * @defgroup net_compat Network namespace compatibility mode symbols + * @since 4.4 + * @version 0.0.1 + * @ingroup networking + * @{ + */ + +/* No need to generate documentation for the compatibility mode symbols */ +/** @cond INTERNAL_HIDDEN */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Prevent direct inclusion of this file. This is a private header + * meant to be included via . + */ +#if !defined(ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS) +#error "This header file should not be included directly. " \ + "Include instead." +#endif /* !defined(ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS) */ + +#define PF_UNSPEC NET_PF_UNSPEC +#define PF_INET NET_PF_INET +#define PF_INET6 NET_PF_INET6 +#define PF_PACKET NET_PF_PACKET +#define PF_CAN NET_PF_CAN +#define PF_NET_MGMT NET_PF_NET_MGMT +#define PF_LOCAL NET_PF_LOCAL +#define PF_UNIX NET_PF_UNIX + +#define AF_UNSPEC NET_PF_UNSPEC +#define AF_INET NET_PF_INET +#define AF_INET6 NET_PF_INET6 +#define AF_PACKET NET_PF_PACKET +#define AF_CAN NET_PF_CAN +#define AF_NET_MGMT NET_PF_NET_MGMT +#define AF_LOCAL NET_PF_LOCAL +#define AF_UNIX NET_PF_UNIX + +#define IPPROTO_IP NET_IPPROTO_IP +#define IPPROTO_ICMP NET_IPPROTO_ICMP +#define IPPROTO_IGMP NET_IPPROTO_IGMP +#define IPPROTO_ETH_P_ALL NET_IPPROTO_ETH_P_ALL +#define IPPROTO_IPIP NET_IPPROTO_IPIP +#define IPPROTO_TCP NET_IPPROTO_TCP +#define IPPROTO_UDP NET_IPPROTO_UDP +#define IPPROTO_IPV6 NET_IPPROTO_IPV6 +#define IPPROTO_ICMPV6 NET_IPPROTO_ICMPV6 +#define IPPROTO_RAW NET_IPPROTO_RAW +#define IPPROTO_TLS_1_0 NET_IPPROTO_TLS_1_0 +#define IPPROTO_TLS_1_1 NET_IPPROTO_TLS_1_1 +#define IPPROTO_TLS_1_2 NET_IPPROTO_TLS_1_2 +#define IPPROTO_TLS_1_3 NET_IPPROTO_TLS_1_3 +#define IPPROTO_DTLS_1_0 NET_IPPROTO_DTLS_1_0 +#define IPPROTO_DTLS_1_2 NET_IPPROTO_DTLS_1_2 + +#define SOCK_STREAM NET_SOCK_STREAM +#define SOCK_DGRAM NET_SOCK_DGRAM +#define SOCK_RAW NET_SOCK_RAW + +#define CAN_RAW NET_CAN_RAW +#define SOL_CAN_RAW (NET_SOL_CAN_BASE + NET_CAN_RAW) +#define CAN_RAW_FILTER NET_CAN_RAW_FILTER + +#define ntohs(x) net_ntohs(x) +#define ntohl(x) net_ntohl(x) +#define ntohll(x) net_ntohll(x) +#define htons(x) net_htons(x) +#define htonl(x) net_htonl(x) +#define htonll(x) net_htonll(x) + +#define in_addr net_in_addr +#define in6_addr net_in6_addr + +#define sockaddr net_sockaddr +#define sockaddr_in net_sockaddr_in +#define sockaddr_in6 net_sockaddr_in6 +#define sockaddr_ll net_sockaddr_ll +#define sockaddr_can net_sockaddr_can +#define sockaddr_un net_sockaddr_un +#define sockaddr_nm net_sockaddr_nm +#define sockaddr_ptr net_sockaddr_ptr +#define sockaddr_in_ptr net_sockaddr_in_ptr +#define sockaddr_in6_ptr net_sockaddr_in6_ptr +#define sockaddr_ll_ptr net_sockaddr_ll_ptr +#define sockaddr_un_ptr net_sockaddr_un_ptr +#define sockaddr_can_ptr net_sockaddr_can_ptr +#define sockaddr_storage net_sockaddr_storage + +#define sa_family_t net_sa_family_t +#define socklen_t net_socklen_t + +#define iovec net_iovec +#define msghdr net_msghdr +#define cmsghdr net_cmsghdr +#define ALIGN_H(x) NET_ALIGN_H(x) +#define ALIGN_D(x) NET_ALIGN_D(x) +#define CMSG_LEN(len) NET_CMSG_LEN(len) +#define CMSG_SPACE(len) NET_CMSG_SPACE(len) +#define CMSG_DATA(cmsg) NET_CMSG_DATA(cmsg) +#define CMSG_FIRSTHDR(msghdr) NET_CMSG_FIRSTHDR(msghdr) +#define CMSG_NXTHDR(msghdr, cmsg) NET_CMSG_NXTHDR(msghdr, cmsg) + +#define PACKET_HOST NET_PACKET_HOST +#define PACKET_BROADCAST NET_PACKET_BROADCAST +#define PACKET_MULTICAST NET_PACKET_MULTICAST +#define PACKET_OTHERHOST NET_PACKET_OTHERHOST +#define PACKET_OUTGOING NET_PACKET_OUTGOING +#define PACKET_LOOPBACK NET_PACKET_LOOPBACK +#define PACKET_FASTROUTE NET_PACKET_FASTROUTE + +#define in6addr_any net_in6addr_any +#define in6addr_loopback net_in6addr_loopback + +#define INADDR_ANY NET_INADDR_ANY +#define INADDR_BROADCAST NET_INADDR_BROADCAST +#define INADDR_ANY_INIT NET_INADDR_ANY_INIT +#define INADDR_LOOPBACK_INIT NET_INADDR_LOOPBACK_INIT +#define INET_ADDRSTRLEN NET_INET_ADDRSTRLEN +#define INET6_ADDRSTRLEN NET_INET6_ADDRSTRLEN +#define IN6ADDR_ANY_INIT NET_IN6ADDR_ANY_INIT +#define IN6ADDR_LOOPBACK_INIT NET_IN6ADDR_LOOPBACK_INIT + +#define IFNAMSIZ NET_IFNAMSIZ + +#define in_pktinfo net_in_pktinfo +#define ip_mreqn net_ip_mreqn +#define ip_mreq net_ip_mreq +#define ipv6_mreq net_ipv6_mreq +#define in6_pktinfo net_in6_pktinfo +#define ifreq net_ifreq + +#define SOL_TLS ZSOCK_SOL_TLS +#define TLS_SEC_TAG_LIST ZSOCK_TLS_SEC_TAG_LIST +#define TLS_HOSTNAME ZSOCK_TLS_HOSTNAME +#define TLS_CIPHERSUITE_LIST ZSOCK_TLS_CIPHERSUITE_LIST +#define TLS_CIPHERSUITE_USED ZSOCK_TLS_CIPHERSUITE_USED +#define TLS_PEER_VERIFY ZSOCK_TLS_PEER_VERIFY +#define TLS_DTLS_ROLE ZSOCK_TLS_DTLS_ROLE +#define TLS_ALPN_LIST ZSOCK_TLS_ALPN_LIST +#define TLS_DTLS_HANDSHAKE_TIMEOUT_MIN ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MIN +#define TLS_DTLS_HANDSHAKE_TIMEOUT_MAX ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MAX +#define TLS_CERT_NOCOPY ZSOCK_TLS_CERT_NOCOPY +#define TLS_NATIVE ZSOCK_TLS_NATIVE +#define TLS_SESSION_CACHE ZSOCK_TLS_SESSION_CACHE +#define TLS_SESSION_CACHE_PURGE ZSOCK_TLS_SESSION_CACHE_PURGE +#define TLS_DTLS_CID ZSOCK_TLS_DTLS_CID +#define TLS_DTLS_CID_STATUS ZSOCK_TLS_DTLS_CID_STATUS +#define TLS_DTLS_CID_VALUE ZSOCK_TLS_DTLS_CID_VALUE +#define TLS_DTLS_PEER_CID_VALUE ZSOCK_TLS_DTLS_PEER_CID_VALUE +#define TLS_DTLS_HANDSHAKE_ON_CONNECT ZSOCK_TLS_DTLS_HANDSHAKE_ON_CONNECT +#define TLS_CERT_VERIFY_RESULT ZSOCK_TLS_CERT_VERIFY_RESULT +#define TLS_CERT_VERIFY_CALLBACK ZSOCK_TLS_CERT_VERIFY_CALLBACK +#define TLS_PEER_VERIFY_NONE ZSOCK_TLS_PEER_VERIFY_NONE +#define TLS_PEER_VERIFY_OPTIONAL ZSOCK_TLS_PEER_VERIFY_OPTIONAL +#define TLS_PEER_VERIFY_REQUIRED ZSOCK_TLS_PEER_VERIFY_REQUIRED +#define TLS_DTLS_ROLE_CLIENT ZSOCK_TLS_DTLS_ROLE_CLIENT +#define TLS_DTLS_ROLE_SERVER ZSOCK_TLS_DTLS_ROLE_SERVER +#define TLS_CERT_NOCOPY_NONE ZSOCK_TLS_CERT_NOCOPY_NONE +#define TLS_CERT_NOCOPY_OPTIONAL ZSOCK_TLS_CERT_NOCOPY_OPTIONAL +#define TLS_SESSION_CACHE_DISABLED ZSOCK_TLS_SESSION_CACHE_DISABLED +#define TLS_SESSION_CACHE_ENABLED ZSOCK_TLS_SESSION_CACHE_ENABLED +#define TLS_DTLS_CID_DISABLED ZSOCK_TLS_DTLS_CID_DISABLED +#define TLS_DTLS_CID_SUPPORTED ZSOCK_TLS_DTLS_CID_SUPPORTED +#define TLS_DTLS_CID_ENABLED ZSOCK_TLS_DTLS_CID_ENABLED +#define TLS_DTLS_CID_STATUS_DISABLED ZSOCK_TLS_DTLS_CID_STATUS_DISABLED +#define TLS_DTLS_CID_STATUS_DOWNLINK ZSOCK_TLS_DTLS_CID_STATUS_DOWNLINK +#define TLS_DTLS_CID_STATUS_UPLINK ZSOCK_TLS_DTLS_CID_STATUS_UPLINK +#define TLS_DTLS_CID_STATUS_BIDIRECTIONAL ZSOCK_TLS_DTLS_CID_STATUS_BIDIRECTIONAL + +#define tls_cert_verify_cb zsock_tls_cert_verify_cb + +#define AI_PASSIVE ZSOCK_AI_PASSIVE +#define AI_CANONNAME ZSOCK_AI_CANONNAME +#define AI_NUMERICHOST ZSOCK_AI_NUMERICHOST +#define AI_V4MAPPED ZSOCK_AI_V4MAPPED +#define AI_ALL ZSOCK_AI_ALL +#define AI_ADDRCONFIG ZSOCK_AI_ADDRCONFIG +#define AI_NUMERICSERV ZSOCK_AI_NUMERICSERV +#define AI_EXTFLAGS ZSOCK_AI_EXTFLAGS + +#define NI_NUMERICHOST ZSOCK_NI_NUMERICHOST +#define NI_NUMERICSERV ZSOCK_NI_NUMERICSERV +#define NI_NOFQDN ZSOCK_NI_NOFQDN +#define NI_NAMEREQD ZSOCK_NI_NAMEREQD +#define NI_DGRAM ZSOCK_NI_DGRAM +#define NI_MAXHOST ZSOCK_NI_MAXHOST + +#define SOL_SOCKET ZSOCK_SOL_SOCKET +#define SO_DEBUG ZSOCK_SO_DEBUG +#define SO_REUSEADDR ZSOCK_SO_REUSEADDR +#define SO_TYPE ZSOCK_SO_TYPE +#define SO_ERROR ZSOCK_SO_ERROR +#define SO_DONTROUTE ZSOCK_SO_DONTROUTE +#define SO_BROADCAST ZSOCK_SO_BROADCAST +#define SO_SNDBUF ZSOCK_SO_SNDBUF +#define SO_RCVBUF ZSOCK_SO_RCVBUF +#define SO_KEEPALIVE ZSOCK_SO_KEEPALIVE +#define SO_OOBINLINE ZSOCK_SO_OOBINLINE +#define SO_PRIORITY ZSOCK_SO_PRIORITY +#define SO_LINGER ZSOCK_SO_LINGER +#define SO_REUSEPORT ZSOCK_SO_REUSEPORT +#define SO_RCVLOWAT ZSOCK_SO_RCVLOWAT +#define SO_SNDLOWAT ZSOCK_SO_SNDLOWAT +#define SO_RCVTIMEO ZSOCK_SO_RCVTIMEO +#define SO_SNDTIMEO ZSOCK_SO_SNDTIMEO +#define SO_BINDTODEVICE ZSOCK_SO_BINDTODEVICE +#define SO_ACCEPTCONN ZSOCK_SO_ACCEPTCONN +#define SO_TIMESTAMPING ZSOCK_SO_TIMESTAMPING +#define SO_PROTOCOL ZSOCK_SO_PROTOCOL +#define SO_DOMAIN ZSOCK_SO_DOMAIN +#define SO_SOCKS5 ZSOCK_SO_SOCKS5 +#define SO_TXTIME ZSOCK_SO_TXTIME +#define SCM_TXTIME ZSOCK_SCM_TXTIME +#define SOF_TIMESTAMPING_RX_HARDWARE ZSOCK_SOF_TIMESTAMPING_RX_HARDWARE +#define SOF_TIMESTAMPING_TX_HARDWARE ZSOCK_SOF_TIMESTAMPING_TX_HARDWARE + +#define SHUT_RD ZSOCK_SHUT_RD +#define SHUT_WR ZSOCK_SHUT_WR +#define SHUT_RDWR ZSOCK_SHUT_RDWR + +#define MSG_PEEK ZSOCK_MSG_PEEK +#define MSG_TRUNC ZSOCK_MSG_TRUNC +#define MSG_DONTWAIT ZSOCK_MSG_DONTWAIT +#define MSG_WAITALL ZSOCK_MSG_WAITALL + +#define TCP_NODELAY ZSOCK_TCP_NODELAY +#define TCP_KEEPIDLE ZSOCK_TCP_KEEPIDLE +#define TCP_KEEPINTVL ZSOCK_TCP_KEEPINTVL +#define TCP_KEEPCNT ZSOCK_TCP_KEEPCNT + +#define IP_TOS ZSOCK_IP_TOS +#define IP_TTL ZSOCK_IP_TTL +#define IP_PKTINFO ZSOCK_IP_PKTINFO +#define IP_RECVTTL ZSOCK_IP_RECVTTL +#define IP_MTU ZSOCK_IP_MTU +#define IP_MULTICAST_IF ZSOCK_IP_MULTICAST_IF +#define IP_MULTICAST_TTL ZSOCK_IP_MULTICAST_TTL +#define IP_MULTICAST_LOOP ZSOCK_IP_MULTICAST_LOOP +#define IP_ADD_MEMBERSHIP ZSOCK_IP_ADD_MEMBERSHIP +#define IP_DROP_MEMBERSHIP ZSOCK_IP_DROP_MEMBERSHIP +#define IP_LOCAL_PORT_RANGE ZSOCK_IP_LOCAL_PORT_RANGE + +#define IPV6_UNICAST_HOPS ZSOCK_IPV6_UNICAST_HOPS +#define IPV6_MULTICAST_IF ZSOCK_IPV6_MULTICAST_IF +#define IPV6_MULTICAST_HOPS ZSOCK_IPV6_MULTICAST_HOPS +#define IPV6_MULTICAST_LOOP ZSOCK_IPV6_MULTICAST_LOOP +#define IPV6_ADD_MEMBERSHIP ZSOCK_IPV6_ADD_MEMBERSHIP +#define IPV6_DROP_MEMBERSHIP ZSOCK_IPV6_DROP_MEMBERSHIP +#define IPV6_JOIN_GROUP ZSOCK_IPV6_ADD_MEMBERSHIP +#define IPV6_LEAVE_GROUP ZSOCK_IPV6_DROP_MEMBERSHIP +#define IPV6_MTU ZSOCK_IPV6_MTU +#define IPV6_V6ONLY ZSOCK_IPV6_V6ONLY +#define IPV6_RECVPKTINFO ZSOCK_IPV6_RECVPKTINFO +#define IPV6_PKTINFO ZSOCK_IPV6_PKTINFO +#define IPV6_RECVHOPLIMIT ZSOCK_IPV6_RECVHOPLIMIT +#define IPV6_HOPLIMIT ZSOCK_IPV6_HOPLIMIT +#define IPV6_ADDR_PREFERENCES ZSOCK_IPV6_ADDR_PREFERENCES +#define IPV6_PREFER_SRC_TMP ZSOCK_IPV6_PREFER_SRC_TMP +#define IPV6_PREFER_SRC_PUBLIC ZSOCK_IPV6_PREFER_SRC_PUBLIC +#define IPV6_PREFER_SRC_PUBTMP_DEFAULT ZSOCK_IPV6_PREFER_SRC_PUBTMP_DEFAULT +#define IPV6_PREFER_SRC_COA ZSOCK_IPV6_PREFER_SRC_COA +#define IPV6_PREFER_SRC_HOME ZSOCK_IPV6_PREFER_SRC_HOME +#define IPV6_PREFER_SRC_CGA ZSOCK_IPV6_PREFER_SRC_CGA +#define IPV6_PREFER_SRC_NONCGA ZSOCK_IPV6_PREFER_SRC_NONCGA +#define IPV6_TCLASS ZSOCK_IPV6_TCLASS + +#define SOMAXCONN ZSOCK_SOMAXCONN + +#define IN6_IS_ADDR_UNSPECIFIED(addr) ZSOCK_IN6_IS_ADDR_UNSPECIFIED(addr) +#define IN6_IS_ADDR_LOOPBACK(addr) ZSOCK_IN6_IS_ADDR_LOOPBACK(addr) +#define IN6_IS_ADDR_MULTICAST(addr) ZSOCK_IN6_IS_ADDR_MULTICAST(addr) +#define IN6_IS_ADDR_LINKLOCAL(addr) ZSOCK_IN6_IS_ADDR_LINKLOCAL(addr) +#define IN6_IS_ADDR_SITELOCAL(addr) ZSOCK_IN6_IS_ADDR_SITELOCAL(addr) +#define IN6_IS_ADDR_V4MAPPED(addr) ZSOCK_IN6_IS_ADDR_V4MAPPED(addr) +#define IN6_IS_ADDR_MC_GLOBAL(addr) ZSOCK_IN6_IS_ADDR_MC_GLOBAL(addr) +#define IN6_IS_ADDR_MC_NODELOCAL(addr) ZSOCK_IN6_IS_ADDR_MC_NODELOCAL(addr) +#define IN6_IS_ADDR_MC_LINKLOCAL(addr) ZSOCK_IN6_IS_ADDR_MC_LINKLOCAL(addr) +#define IN6_IS_ADDR_MC_SITELOCAL(addr) ZSOCK_IN6_IS_ADDR_MC_SITELOCAL(addr) +#define IN6_IS_ADDR_MC_ORGLOCAL(addr) ZSOCK_IN6_IS_ADDR_MC_ORGLOCAL(addr) + +#if !defined(ARPHRD_ETHER) +#define ARPHRD_ETHER NET_ARPHRD_ETHER +#endif + +#ifdef __cplusplus +} +#endif + +/** @endcond */ + +/** + * @} + */ + +#endif /* ZEPHYR_INCLUDE_NET_NET_COMPAT_H_ */ diff --git a/include/zephyr/net/net_context.h b/include/zephyr/net/net_context.h index 93772ba7ee963..cd6aeafbfc3d5 100644 --- a/include/zephyr/net/net_context.h +++ b/include/zephyr/net/net_context.h @@ -140,8 +140,8 @@ typedef void (*net_context_send_cb_t)(struct net_context *context, * @param user_data The user data given in net_context_accept() call. */ typedef void (*net_tcp_accept_cb_t)(struct net_context *new_context, - struct sockaddr *addr, - socklen_t addrlen, + struct net_sockaddr *addr, + net_socklen_t addrlen, int status, void *user_data); @@ -226,12 +226,12 @@ __net_socket struct net_context { /** Local endpoint address. Note that the values are in network byte * order. */ - struct sockaddr_ptr local; + struct net_sockaddr_ptr local; /** Remote endpoint address. Note that the values are in network byte * order. */ - struct sockaddr remote; + struct net_sockaddr remote; /** Connection handle */ struct net_conn_handle *conn_handler; @@ -314,8 +314,8 @@ __net_socket struct net_context { #if defined(CONFIG_SOCKS) /** Socks proxy address */ struct { - struct sockaddr addr; - socklen_t addrlen; + struct net_sockaddr addr; + net_socklen_t addrlen; } proxy; #endif #if defined(CONFIG_NET_CONTEXT_CLAMP_PORT_RANGE) @@ -386,13 +386,13 @@ __net_socket struct net_context { union { /** * IPv6 multicast output network interface for this context/socket. - * Only allowed for SOCK_DGRAM or SOCK_RAW type sockets. + * Only allowed for NET_SOCK_DGRAM or NET_SOCK_RAW type sockets. */ uint8_t ipv6_mcast_ifindex; /** * IPv4 multicast output network interface for this context/socket. - * Only allowed for SOCK_DGRAM type sockets. + * Only allowed for NET_SOCK_DGRAM type sockets. */ uint8_t ipv4_mcast_ifindex; }; @@ -583,7 +583,7 @@ static inline void net_context_set_state(struct net_context *context, * * @return Network state. */ -static inline sa_family_t net_context_get_family(struct net_context *context) +static inline net_sa_family_t net_context_get_family(struct net_context *context) { NET_ASSERT(context); @@ -597,17 +597,17 @@ static inline sa_family_t net_context_get_family(struct net_context *context) * of the context. * * @param context Network context. - * @param family Address family (AF_INET, AF_INET6, AF_PACKET, AF_CAN) + * @param family Address family (NET_AF_INET, NET_AF_INET6, NET_AF_PACKET, NET_AF_CAN) */ static inline void net_context_set_family(struct net_context *context, - sa_family_t family) + net_sa_family_t family) { uint8_t flag = 0U; NET_ASSERT(context); - if (family == AF_UNSPEC || family == AF_INET || family == AF_INET6 || - family == AF_PACKET || family == AF_CAN) { + if (family == NET_AF_UNSPEC || family == NET_AF_INET || family == NET_AF_INET6 || + family == NET_AF_PACKET || family == NET_AF_CAN) { /* Family is in BIT(4), BIT(5) and BIT(6) */ flag = (uint8_t)(family << 3); } @@ -640,7 +640,7 @@ enum net_sock_type net_context_get_type(struct net_context *context) * of the context. * * @param context Network context. - * @param type Context type (SOCK_STREAM or SOCK_DGRAM) + * @param type Context type (NET_SOCK_STREAM or NET_SOCK_DGRAM) */ static inline void net_context_set_type(struct net_context *context, enum net_sock_type type) @@ -649,7 +649,7 @@ static inline void net_context_set_type(struct net_context *context, NET_ASSERT(context); - if (type == SOCK_DGRAM || type == SOCK_STREAM || type == SOCK_RAW) { + if (type == NET_SOCK_DGRAM || type == NET_SOCK_STREAM || type == NET_SOCK_RAW) { /* Type is in BIT(6) and BIT(7)*/ flag = (uint16_t)(type << 6); } @@ -729,7 +729,7 @@ static inline uint16_t net_context_get_proto(struct net_context *context) * of the context. * * @param context Network context. - * @param proto Context IP protocol (IPPROTO_UDP, IPPROTO_TCP or IEEE 802.3 + * @param proto Context IP protocol (NET_IPPROTO_UDP, NET_IPPROTO_TCP or IEEE 802.3 * protocol value) */ static inline void net_context_set_proto(struct net_context *context, @@ -1030,15 +1030,15 @@ static inline bool net_context_is_proxy_enabled(struct net_context *context) * context is created. This is similar as BSD socket() function. * The context will be created with a reference count of 1. * - * @param family IP address family (AF_INET or AF_INET6) - * @param type Type of the socket, SOCK_STREAM or SOCK_DGRAM - * @param ip_proto IP protocol, IPPROTO_UDP or IPPROTO_TCP. For raw socket + * @param family IP address family (NET_AF_INET or NET_AF_INET6) + * @param type Type of the socket, NET_SOCK_STREAM or NET_SOCK_DGRAM + * @param ip_proto IP protocol, NET_IPPROTO_UDP or NET_IPPROTO_TCP. For raw socket * access, the value is the L2 protocol value from IEEE 802.3 (see ethernet.h) * @param context The allocated context is returned to the caller. * * @return 0 if ok, < 0 if error */ -int net_context_get(sa_family_t family, +int net_context_get(net_sa_family_t family, enum net_sock_type type, uint16_t ip_proto, struct net_context **context); @@ -1100,13 +1100,13 @@ int net_context_unref(struct net_context *context); #if defined(CONFIG_NET_IPV4) int net_context_create_ipv4_new(struct net_context *context, struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst); + const struct net_in_addr *src, + const struct net_in_addr *dst); #else static inline int net_context_create_ipv4_new(struct net_context *context, struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst) + const struct net_in_addr *src, + const struct net_in_addr *dst) { return -1; } @@ -1125,13 +1125,13 @@ static inline int net_context_create_ipv4_new(struct net_context *context, #if defined(CONFIG_NET_IPV6) int net_context_create_ipv6_new(struct net_context *context, struct net_pkt *pkt, - const struct in6_addr *src, - const struct in6_addr *dst); + const struct net_in6_addr *src, + const struct net_in6_addr *dst); #else static inline int net_context_create_ipv6_new(struct net_context *context, struct net_pkt *pkt, - const struct in6_addr *src, - const struct in6_addr *dst) + const struct net_in6_addr *src, + const struct net_in6_addr *dst) { ARG_UNUSED(context); ARG_UNUSED(pkt); @@ -1153,8 +1153,8 @@ static inline int net_context_create_ipv6_new(struct net_context *context, * @return 0 if ok, < 0 if error */ int net_context_bind(struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen); + const struct net_sockaddr *addr, + net_socklen_t addrlen); /** * @brief Mark the context as a listening one. @@ -1177,7 +1177,7 @@ int net_context_listen(struct net_context *context, * connection is established, the user-supplied callback (cb) * is executed. cb is called even if the timeout was set to * K_FOREVER. cb is not called if the timeout expires. - * For datagram sockets (SOCK_DGRAM), this function only sets + * For datagram sockets (NET_SOCK_DGRAM), this function only sets * the peer address. * This function is similar to the BSD connect() function. * @@ -1198,8 +1198,8 @@ int net_context_listen(struct net_context *context, * @return -ETIMEDOUT if the connect operation times out. */ int net_context_connect(struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen, + const struct net_sockaddr *addr, + net_socklen_t addrlen, net_context_connect_cb_t cb, k_timeout_t timeout, void *user_data); @@ -1240,7 +1240,7 @@ int net_context_accept(struct net_context *context, * @details This function can be used to send network data to a peer * connection. After the network buffer is sent, a caller-supplied * callback is called. Note that the callback might be called after this - * function has returned. For context of type SOCK_DGRAM, the destination + * function has returned. For context of type NET_SOCK_DGRAM, the destination * address must have been set by the call to net_context_connect(). * This is similar as BSD send() function. * @@ -1265,7 +1265,7 @@ int net_context_send(struct net_context *context, * * @details This function can be used to send network data to a peer * specified by address. This variant can only be used for datagram - * connections of type SOCK_DGRAM. After the network buffer is sent, + * connections of type NET_SOCK_DGRAM. After the network buffer is sent, * a caller-supplied callback is called. Note that the callback might be * called after this function has returned. * This is similar as BSD sendto() function. @@ -1284,17 +1284,17 @@ int net_context_send(struct net_context *context, int net_context_sendto(struct net_context *context, const void *buf, size_t len, - const struct sockaddr *dst_addr, - socklen_t addrlen, + const struct net_sockaddr *dst_addr, + net_socklen_t addrlen, net_context_send_cb_t cb, k_timeout_t timeout, void *user_data); /** - * @brief Send data in iovec to a peer specified in msghdr struct. + * @brief Send data in iovec to a peer specified in net_msghdr struct. * * @details This function has similar semantics as Posix sendmsg() call. - * For unconnected socket, the msg_name field in msghdr must be set. For + * For unconnected socket, the msg_name field in net_msghdr must be set. For * connected socket the msg_name should be set to NULL, and msg_namelen to 0. * After the network buffer is sent, a caller-supplied callback is called. * Note that the callback might be called after this function has returned. @@ -1309,7 +1309,7 @@ int net_context_sendto(struct net_context *context, * @return numbers of bytes sent on success, a negative errno otherwise */ int net_context_sendmsg(struct net_context *context, - const struct msghdr *msghdr, + const struct net_msghdr *msghdr, int flags, net_context_send_cb_t cb, k_timeout_t timeout, @@ -1501,7 +1501,7 @@ static inline void net_context_setup_pools(struct net_context *context, * @return false if the port is not bound */ bool net_context_port_in_use(enum net_ip_protocol ip_proto, - uint16_t local_port, const struct sockaddr *local_addr); + uint16_t local_port, const struct net_sockaddr *local_addr); #ifdef __cplusplus } diff --git a/include/zephyr/net/net_event.h b/include/zephyr/net/net_event.h index 556a78ae99e9a..16c5ae2c7a7bd 100644 --- a/include/zephyr/net/net_event.h +++ b/include/zephyr/net/net_event.h @@ -482,7 +482,7 @@ enum net_event_l4_cmd { */ struct net_event_ipv6_addr { /** IPv6 address related to this event */ - struct in6_addr addr; + struct net_in6_addr addr; }; /** @@ -496,7 +496,7 @@ struct net_event_ipv6_addr { */ struct net_event_ipv6_nbr { /** Neighbor IPv6 address */ - struct in6_addr addr; + struct net_in6_addr addr; /** Neighbor index in cache */ int idx; }; @@ -511,9 +511,9 @@ struct net_event_ipv6_nbr { */ struct net_event_ipv6_route { /** IPv6 address of the next hop */ - struct in6_addr nexthop; + struct net_in6_addr nexthop; /** IPv6 address or prefix of the route */ - struct in6_addr addr; + struct net_in6_addr addr; /** IPv6 prefix length */ uint8_t prefix_len; }; @@ -528,7 +528,7 @@ struct net_event_ipv6_route { */ struct net_event_ipv6_prefix { /** IPv6 prefix */ - struct in6_addr addr; + struct net_in6_addr addr; /** IPv6 prefix length */ uint8_t len; /** IPv6 prefix lifetime in seconds */ @@ -558,7 +558,7 @@ struct net_event_l4_hostname { */ struct net_event_ipv6_pe_filter { /** IPv6 address of privacy extension filter */ - struct in6_addr prefix; + struct net_in6_addr prefix; /** IPv6 filter deny or allow list */ bool is_deny_list; }; @@ -572,7 +572,7 @@ struct net_event_ipv6_pe_filter { */ struct net_event_ipv4_pmtu_info { /** IPv4 address */ - struct in_addr dst; + struct net_in_addr dst; /** New MTU */ uint16_t mtu; }; @@ -586,7 +586,7 @@ struct net_event_ipv4_pmtu_info { */ struct net_event_ipv6_pmtu_info { /** IPv6 address */ - struct in6_addr dst; + struct net_in6_addr dst; /** New MTU */ uint32_t mtu; }; diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h index 2241504e54914..6ea94ad7f60fa 100644 --- a/include/zephyr/net/net_if.h +++ b/include/zephyr/net/net_if.h @@ -195,7 +195,7 @@ struct net_if_ipv6_prefix { struct net_timeout lifetime; /** IPv6 prefix */ - struct in6_addr prefix; + struct net_in6_addr prefix; /** Backpointer to network interface where this prefix is used */ struct net_if *iface; @@ -443,10 +443,10 @@ struct net_if_dhcpv6 { uint8_t prefix_len; /** Assigned IPv6 prefix. */ - struct in6_addr prefix; + struct net_in6_addr prefix; /** Assigned IPv6 address. */ - struct in6_addr addr; + struct net_in6_addr addr; }; #endif /* defined(CONFIG_NET_DHCPV6) && defined(CONFIG_NET_NATIVE_IPV6) */ @@ -469,7 +469,7 @@ struct net_if_addr_ipv4 { /** IPv4 address */ struct net_if_addr ipv4; /** Netmask */ - struct in_addr netmask; + struct net_in_addr netmask; }; /** IPv4 configuration */ @@ -481,7 +481,7 @@ struct net_if_ipv4 { struct net_if_mcast_addr mcast[NET_IF_MAX_IPV4_MADDR]; /** Gateway */ - struct in_addr gw; + struct net_in_addr gw; /** IPv4 time-to-live */ uint8_t ttl; @@ -518,13 +518,13 @@ struct net_if_dhcpv4 { uint32_t rebinding_time; /** Server ID */ - struct in_addr server_id; + struct net_in_addr server_id; /** Requested IP addr */ - struct in_addr requested_ip; + struct net_in_addr requested_ip; /** Received netmask from the server */ - struct in_addr netmask; + struct net_in_addr netmask; /** * DHCPv4 client state in the process of network @@ -536,14 +536,14 @@ struct net_if_dhcpv4 { uint8_t attempts; /** The address of the server the request is sent to */ - struct in_addr request_server_addr; + struct net_in_addr request_server_addr; /** The source address of a received DHCP message */ - struct in_addr response_src_addr; + struct net_in_addr response_src_addr; #ifdef CONFIG_NET_DHCPV4_OPTION_NTP_SERVER /** NTP server address */ - struct in_addr ntp_addr; + struct net_in_addr ntp_addr; #endif }; #endif /* CONFIG_NET_DHCPV4 */ @@ -554,7 +554,7 @@ struct net_if_ipv4_autoconf { struct net_if *iface; /** Requested IP addr */ - struct in_addr requested_ip; + struct net_in_addr requested_ip; /** IPV4 Autoconf state in the process of network address allocation. */ @@ -1275,10 +1275,10 @@ static inline void net_if_stop_rs(struct net_if *iface) * @param ipv6_addr Pointer to the IPv6 address of the neighbor node. */ #if defined(CONFIG_NET_IPV6_ND) && defined(CONFIG_NET_NATIVE_IPV6) -void net_if_nbr_reachability_hint(struct net_if *iface, const struct in6_addr *ipv6_addr); +void net_if_nbr_reachability_hint(struct net_if *iface, const struct net_in6_addr *ipv6_addr); #else static inline void net_if_nbr_reachability_hint(struct net_if *iface, - const struct in6_addr *ipv6_addr) + const struct net_in6_addr *ipv6_addr) { ARG_UNUSED(iface); ARG_UNUSED(ipv6_addr); @@ -1317,7 +1317,7 @@ int net_if_set_link_addr_locked(struct net_if *iface, #if CONFIG_NET_IF_LOG_LEVEL >= LOG_LEVEL_DBG extern int net_if_addr_unref_debug(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr, struct net_if_addr **ifaddr, const char *caller, int line); @@ -1325,7 +1325,7 @@ extern int net_if_addr_unref_debug(struct net_if *iface, net_if_addr_unref_debug(iface, family, addr, ifaddr, __func__, __LINE__) extern struct net_if_addr *net_if_addr_ref_debug(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr, const char *caller, int line); @@ -1333,11 +1333,11 @@ extern struct net_if_addr *net_if_addr_ref_debug(struct net_if *iface, net_if_addr_ref_debug(iface, family, addr, __func__, __LINE__) #else extern int net_if_addr_unref(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr, struct net_if_addr **ifaddr); extern struct net_if_addr *net_if_addr_ref(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr); #endif /* CONFIG_NET_IF_LOG_LEVEL */ @@ -1535,7 +1535,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup_raw(const uint8_t *addr, * * @return Pointer to interface address, NULL if not found. */ -struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr, +struct net_if_addr *net_if_ipv6_addr_lookup(const struct net_in6_addr *addr, struct net_if **iface); /** @cond INTERNAL_HIDDEN */ @@ -1552,7 +1552,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup_by_iface_raw(struct net_if *iface, * @return Pointer to interface address, NULL if not found. */ struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface, - const struct in6_addr *addr); + const struct net_in6_addr *addr); /** * @brief Check if this IPv6 address belongs to one of the interface indices. @@ -1562,7 +1562,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface, * @return >0 if address was found in given network interface index, * all other values mean address was not found */ -__syscall int net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr); +__syscall int net_if_ipv6_addr_lookup_by_index(const struct net_in6_addr *addr); /** * @brief Add a IPv6 address to an interface @@ -1575,7 +1575,7 @@ __syscall int net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr); * @return Pointer to interface address, NULL if cannot be added */ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime); @@ -1590,7 +1590,7 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface, * @return True if ok, false if address could not be added */ __syscall bool net_if_ipv6_addr_add_by_index(int index, - const struct in6_addr *addr, + const struct net_in6_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime); @@ -1611,7 +1611,7 @@ void net_if_ipv6_addr_update_lifetime(struct net_if_addr *ifaddr, * * @return True if successfully removed, false otherwise */ -bool net_if_ipv6_addr_rm(struct net_if *iface, const struct in6_addr *addr); +bool net_if_ipv6_addr_rm(struct net_if *iface, const struct net_in6_addr *addr); /** * @brief Remove an IPv6 address from an interface by index @@ -1622,7 +1622,7 @@ bool net_if_ipv6_addr_rm(struct net_if *iface, const struct in6_addr *addr); * @return True if successfully removed, false otherwise */ __syscall bool net_if_ipv6_addr_rm_by_index(int index, - const struct in6_addr *addr); + const struct net_in6_addr *addr); /** * @typedef net_if_ip_addr_cb_t @@ -1656,7 +1656,7 @@ void net_if_ipv6_addr_foreach(struct net_if *iface, net_if_ip_addr_cb_t cb, * @return Pointer to interface multicast address, NULL if cannot be added */ struct net_if_mcast_addr *net_if_ipv6_maddr_add(struct net_if *iface, - const struct in6_addr *addr); + const struct net_in6_addr *addr); /** * @brief Remove an IPv6 multicast address from an interface @@ -1666,7 +1666,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_add(struct net_if *iface, * * @return True if successfully removed, false otherwise */ -bool net_if_ipv6_maddr_rm(struct net_if *iface, const struct in6_addr *addr); +bool net_if_ipv6_maddr_rm(struct net_if *iface, const struct net_in6_addr *addr); /** * @typedef net_if_ip_maddr_cb_t @@ -1707,7 +1707,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_lookup_raw(const uint8_t *maddr, * * @return Pointer to interface multicast address, NULL if not found. */ -struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct in6_addr *addr, +struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct net_in6_addr *addr, struct net_if **iface); /** @@ -1815,7 +1815,7 @@ void net_if_ipv6_maddr_leave(struct net_if *iface, * @return Pointer to prefix, NULL if not found. */ struct net_if_ipv6_prefix *net_if_ipv6_prefix_get(struct net_if *iface, - const struct in6_addr *addr); + const struct net_in6_addr *addr); /** * @brief Check if this IPv6 prefix belongs to this interface @@ -1827,7 +1827,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_get(struct net_if *iface, * @return Pointer to prefix, NULL if not found. */ struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, uint8_t len); /** @@ -1841,7 +1841,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface, * @return Pointer to prefix, NULL if the prefix was not added. */ struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint8_t len, uint32_t lifetime); @@ -1854,7 +1854,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface, * * @return True if successfully removed, false otherwise */ -bool net_if_ipv6_prefix_rm(struct net_if *iface, const struct in6_addr *addr, +bool net_if_ipv6_prefix_rm(struct net_if *iface, const struct net_in6_addr *addr, uint8_t len); /** @@ -1895,7 +1895,7 @@ void net_if_ipv6_prefix_unset_timer(struct net_if_ipv6_prefix *prefix); * * @return True if address is part of our subnet, false otherwise */ -bool net_if_ipv6_addr_onlink(struct net_if **iface, const struct in6_addr *addr); +bool net_if_ipv6_addr_onlink(struct net_if **iface, const struct net_in6_addr *addr); /** * @brief Get the IPv6 address of the given router @@ -1904,7 +1904,7 @@ bool net_if_ipv6_addr_onlink(struct net_if **iface, const struct in6_addr *addr) * @return pointer to the IPv6 address, or NULL if none */ #if defined(CONFIG_NET_NATIVE_IPV6) -static inline struct in6_addr *net_if_router_ipv6(struct net_if_router *router) +static inline struct net_in6_addr *net_if_router_ipv6(struct net_if_router *router) { if (router == NULL) { return NULL; @@ -1913,9 +1913,9 @@ static inline struct in6_addr *net_if_router_ipv6(struct net_if_router *router) return &router->address.in6_addr; } #else -static inline struct in6_addr *net_if_router_ipv6(struct net_if_router *router) +static inline struct net_in6_addr *net_if_router_ipv6(struct net_if_router *router) { - static struct in6_addr addr; + static struct net_in6_addr addr; ARG_UNUSED(router); @@ -1933,7 +1933,7 @@ static inline struct in6_addr *net_if_router_ipv6(struct net_if_router *router) * @return Pointer to router information, NULL if cannot be found */ struct net_if_router *net_if_ipv6_router_lookup(struct net_if *iface, - const struct in6_addr *addr); + const struct net_in6_addr *addr); /** * @brief Find default router for this IPv6 address. @@ -1945,7 +1945,7 @@ struct net_if_router *net_if_ipv6_router_lookup(struct net_if *iface, * @return Pointer to router information, NULL if cannot be found */ struct net_if_router *net_if_ipv6_router_find_default(struct net_if *iface, - const struct in6_addr *addr); + const struct net_in6_addr *addr); /** * @brief Update validity lifetime time of a router. @@ -1966,7 +1966,7 @@ void net_if_ipv6_router_update_lifetime(struct net_if_router *router, * @return Pointer to router information, NULL if could not be added */ struct net_if_router *net_if_ipv6_router_add(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, uint16_t router_lifetime); /** @@ -2206,11 +2206,11 @@ static inline uint32_t net_if_ipv6_get_retrans_timer(struct net_if *iface) * could be found. */ #if defined(CONFIG_NET_IPV6) -const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *iface, - const struct in6_addr *dst); +const struct net_in6_addr *net_if_ipv6_select_src_addr(struct net_if *iface, + const struct net_in6_addr *dst); #else -static inline const struct in6_addr *net_if_ipv6_select_src_addr( - struct net_if *iface, const struct in6_addr *dst) +static inline const struct net_in6_addr *net_if_ipv6_select_src_addr( + struct net_if *iface, const struct net_in6_addr *dst) { ARG_UNUSED(iface); ARG_UNUSED(dst); @@ -2233,12 +2233,12 @@ static inline const struct in6_addr *net_if_ipv6_select_src_addr( * could be found. */ #if defined(CONFIG_NET_IPV6) -const struct in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *iface, - const struct in6_addr *dst, +const struct net_in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *iface, + const struct net_in6_addr *dst, int flags); #else -static inline const struct in6_addr *net_if_ipv6_select_src_addr_hint( - struct net_if *iface, const struct in6_addr *dst, int flags) +static inline const struct net_in6_addr *net_if_ipv6_select_src_addr_hint( + struct net_if *iface, const struct net_in6_addr *dst, int flags) { ARG_UNUSED(iface); ARG_UNUSED(dst); @@ -2258,10 +2258,10 @@ static inline const struct in6_addr *net_if_ipv6_select_src_addr_hint( * could be found. */ #if defined(CONFIG_NET_IPV6) -struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst); +struct net_if *net_if_ipv6_select_src_iface(const struct net_in6_addr *dst); #else static inline struct net_if *net_if_ipv6_select_src_iface( - const struct in6_addr *dst) + const struct net_in6_addr *dst) { ARG_UNUSED(dst); @@ -2282,11 +2282,11 @@ static inline struct net_if *net_if_ipv6_select_src_iface( * could be found. */ #if defined(CONFIG_NET_IPV6) -struct net_if *net_if_ipv6_select_src_iface_addr(const struct in6_addr *dst, - const struct in6_addr **src_addr); +struct net_if *net_if_ipv6_select_src_iface_addr(const struct net_in6_addr *dst, + const struct net_in6_addr **src_addr); #else static inline struct net_if *net_if_ipv6_select_src_iface_addr( - const struct in6_addr *dst, const struct in6_addr **src_addr) + const struct net_in6_addr *dst, const struct net_in6_addr **src_addr) { ARG_UNUSED(dst); ARG_UNUSED(src_addr); @@ -2304,7 +2304,7 @@ static inline struct net_if *net_if_ipv6_select_src_iface_addr( * @return Pointer to link local IPv6 address, NULL if no proper IPv6 address * could be found. */ -struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface, +struct net_in6_addr *net_if_ipv6_get_ll(struct net_if *iface, enum net_addr_state addr_state); /** @@ -2316,7 +2316,7 @@ struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface, * * @return Pointer to IPv6 address, NULL if not found. */ -struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state, +struct net_in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state, struct net_if **iface); /** @@ -2326,7 +2326,7 @@ struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state, * @param iface Interface where the DAD was running. * @param addr IPv6 address that failed DAD */ -void net_if_ipv6_dad_failed(struct net_if *iface, const struct in6_addr *addr); +void net_if_ipv6_dad_failed(struct net_if *iface, const struct net_in6_addr *addr); /** * @brief Return global IPv6 address from the first interface that has @@ -2339,7 +2339,7 @@ void net_if_ipv6_dad_failed(struct net_if *iface, const struct in6_addr *addr); * * @return Pointer to IPv6 address, NULL if not found. */ -struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state, +struct net_in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state, struct net_if **iface); /** @@ -2406,7 +2406,7 @@ void net_if_ipv4_set_mcast_ttl(struct net_if *iface, uint8_t ttl); * * @return Pointer to interface address, NULL if not found. */ -struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, +struct net_if_addr *net_if_ipv4_addr_lookup(const struct net_in_addr *addr, struct net_if **iface); /** @@ -2420,7 +2420,7 @@ struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, * @return Pointer to interface address, NULL if cannot be added */ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface, - const struct in_addr *addr, + const struct net_in_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime); @@ -2432,7 +2432,7 @@ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface, * * @return True if successfully removed, false otherwise */ -bool net_if_ipv4_addr_rm(struct net_if *iface, const struct in_addr *addr); +bool net_if_ipv4_addr_rm(struct net_if *iface, const struct net_in_addr *addr); /** * @brief Check if this IPv4 address belongs to one of the interface indices. @@ -2442,7 +2442,7 @@ bool net_if_ipv4_addr_rm(struct net_if *iface, const struct in_addr *addr); * @return >0 if address was found in given network interface index, * all other values mean address was not found */ -__syscall int net_if_ipv4_addr_lookup_by_index(const struct in_addr *addr); +__syscall int net_if_ipv4_addr_lookup_by_index(const struct net_in_addr *addr); /** * @brief Add a IPv4 address to an interface by network interface index @@ -2455,7 +2455,7 @@ __syscall int net_if_ipv4_addr_lookup_by_index(const struct in_addr *addr); * @return True if ok, false if the address could not be added */ __syscall bool net_if_ipv4_addr_add_by_index(int index, - const struct in_addr *addr, + const struct net_in_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime); @@ -2468,7 +2468,7 @@ __syscall bool net_if_ipv4_addr_add_by_index(int index, * @return True if successfully removed, false otherwise */ __syscall bool net_if_ipv4_addr_rm_by_index(int index, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Go through all IPv4 addresses on a network interface and call callback @@ -2490,7 +2490,7 @@ void net_if_ipv4_addr_foreach(struct net_if *iface, net_if_ip_addr_cb_t cb, * @return Pointer to interface multicast address, NULL if cannot be added */ struct net_if_mcast_addr *net_if_ipv4_maddr_add(struct net_if *iface, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Remove an IPv4 multicast address from an interface @@ -2500,7 +2500,7 @@ struct net_if_mcast_addr *net_if_ipv4_maddr_add(struct net_if *iface, * * @return True if successfully removed, false otherwise */ -bool net_if_ipv4_maddr_rm(struct net_if *iface, const struct in_addr *addr); +bool net_if_ipv4_maddr_rm(struct net_if *iface, const struct net_in_addr *addr); /** * @brief Go through all IPv4 multicast addresses on a network interface and call @@ -2523,7 +2523,7 @@ void net_if_ipv4_maddr_foreach(struct net_if *iface, net_if_ip_maddr_cb_t cb, * * @return Pointer to interface multicast address, NULL if not found. */ -struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct in_addr *addr, +struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct net_in_addr *addr, struct net_if **iface); /** @@ -2567,7 +2567,7 @@ void net_if_ipv4_maddr_leave(struct net_if *iface, * @return pointer to the IPv4 address, or NULL if none */ #if defined(CONFIG_NET_NATIVE_IPV4) -static inline struct in_addr *net_if_router_ipv4(struct net_if_router *router) +static inline struct net_in_addr *net_if_router_ipv4(struct net_if_router *router) { if (router == NULL) { return NULL; @@ -2576,9 +2576,9 @@ static inline struct in_addr *net_if_router_ipv4(struct net_if_router *router) return &router->address.in_addr; } #else -static inline struct in_addr *net_if_router_ipv4(struct net_if_router *router) +static inline struct net_in_addr *net_if_router_ipv4(struct net_if_router *router) { - static struct in_addr addr; + static struct net_in_addr addr; ARG_UNUSED(router); @@ -2596,7 +2596,7 @@ static inline struct in_addr *net_if_router_ipv4(struct net_if_router *router) * @return Pointer to router information, NULL if cannot be found */ struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Find default router for this IPv4 address. @@ -2608,7 +2608,7 @@ struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface, * @return Pointer to router information, NULL if cannot be found */ struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Add IPv4 router to the system. * @@ -2620,7 +2620,7 @@ struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface, * @return Pointer to router information, NULL if could not be added */ struct net_if_router *net_if_ipv4_router_add(struct net_if *iface, - const struct in_addr *addr, + const struct net_in_addr *addr, bool is_default, uint16_t router_lifetime); @@ -2642,7 +2642,7 @@ bool net_if_ipv4_router_rm(struct net_if_router *router); * @return True if address is part of local subnet, false otherwise. */ bool net_if_ipv4_addr_mask_cmp(struct net_if *iface, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Check if the given IPv4 address is a broadcast address. @@ -2653,7 +2653,7 @@ bool net_if_ipv4_addr_mask_cmp(struct net_if *iface, * @return True if address is a broadcast address, false otherwise. */ bool net_if_ipv4_is_addr_bcast(struct net_if *iface, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Get a network interface that should be used when sending @@ -2665,10 +2665,10 @@ bool net_if_ipv4_is_addr_bcast(struct net_if *iface, * could be found. */ #if defined(CONFIG_NET_IPV4) -struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst); +struct net_if *net_if_ipv4_select_src_iface(const struct net_in_addr *dst); #else static inline struct net_if *net_if_ipv4_select_src_iface( - const struct in_addr *dst) + const struct net_in_addr *dst) { ARG_UNUSED(dst); @@ -2689,11 +2689,11 @@ static inline struct net_if *net_if_ipv4_select_src_iface( * could be found. */ #if defined(CONFIG_NET_IPV4) -struct net_if *net_if_ipv4_select_src_iface_addr(const struct in_addr *dst, - const struct in_addr **src_addr); +struct net_if *net_if_ipv4_select_src_iface_addr(const struct net_in_addr *dst, + const struct net_in_addr **src_addr); #else static inline struct net_if *net_if_ipv4_select_src_iface_addr( - const struct in_addr *dst, const struct in_addr **src_addr) + const struct net_in_addr *dst, const struct net_in_addr **src_addr) { ARG_UNUSED(dst); ARG_UNUSED(src_addr); @@ -2714,11 +2714,11 @@ static inline struct net_if *net_if_ipv4_select_src_iface_addr( * could be found. */ #if defined(CONFIG_NET_IPV4) -const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *iface, - const struct in_addr *dst); +const struct net_in_addr *net_if_ipv4_select_src_addr(struct net_if *iface, + const struct net_in_addr *dst); #else -static inline const struct in_addr *net_if_ipv4_select_src_addr( - struct net_if *iface, const struct in_addr *dst) +static inline const struct net_in_addr *net_if_ipv4_select_src_addr( + struct net_if *iface, const struct net_in_addr *dst) { ARG_UNUSED(iface); ARG_UNUSED(dst); @@ -2736,7 +2736,7 @@ static inline const struct in_addr *net_if_ipv4_select_src_addr( * @return Pointer to link local IPv4 address, NULL if no proper IPv4 address * could be found. */ -struct in_addr *net_if_ipv4_get_ll(struct net_if *iface, +struct net_in_addr *net_if_ipv4_get_ll(struct net_if *iface, enum net_addr_state addr_state); /** @@ -2748,7 +2748,7 @@ struct in_addr *net_if_ipv4_get_ll(struct net_if *iface, * @return Pointer to link local IPv4 address, NULL if no proper IPv4 address * could be found. */ -struct in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, +struct net_in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, enum net_addr_state addr_state); /** @@ -2760,8 +2760,8 @@ struct in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, * @return The netmask set on the interface related to the give address, * unspecified address if not found. */ -struct in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface, - const struct in_addr *addr); +struct net_in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface, + const struct net_in_addr *addr); /** * @brief Get IPv4 netmask of an interface. @@ -2772,7 +2772,7 @@ struct in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface, * * @return The netmask set on the interface, unspecified address if not found. */ -__deprecated struct in_addr net_if_ipv4_get_netmask(struct net_if *iface); +__deprecated struct net_in_addr net_if_ipv4_get_netmask(struct net_if *iface); /** * @brief Set IPv4 netmask for an interface. @@ -2783,7 +2783,7 @@ __deprecated struct in_addr net_if_ipv4_get_netmask(struct net_if *iface); * @param netmask IPv4 netmask */ __deprecated void net_if_ipv4_set_netmask(struct net_if *iface, - const struct in_addr *netmask); + const struct net_in_addr *netmask); /** * @brief Set IPv4 netmask for an interface index. @@ -2796,7 +2796,7 @@ __deprecated void net_if_ipv4_set_netmask(struct net_if *iface, * @return True if netmask was added, false otherwise. */ __deprecated __syscall bool net_if_ipv4_set_netmask_by_index(int index, - const struct in_addr *netmask); + const struct net_in_addr *netmask); /** * @brief Set IPv4 netmask for an interface index for a given address. @@ -2808,8 +2808,8 @@ __deprecated __syscall bool net_if_ipv4_set_netmask_by_index(int index, * @return True if netmask was added, false otherwise. */ __syscall bool net_if_ipv4_set_netmask_by_addr_by_index(int index, - const struct in_addr *addr, - const struct in_addr *netmask); + const struct net_in_addr *addr, + const struct net_in_addr *netmask); /** * @brief Set IPv4 netmask for an interface index for a given address. @@ -2821,8 +2821,8 @@ __syscall bool net_if_ipv4_set_netmask_by_addr_by_index(int index, * @return True if netmask was added, false otherwise. */ bool net_if_ipv4_set_netmask_by_addr(struct net_if *iface, - const struct in_addr *addr, - const struct in_addr *netmask); + const struct net_in_addr *addr, + const struct net_in_addr *netmask); /** * @brief Get IPv4 gateway of an interface. @@ -2831,7 +2831,7 @@ bool net_if_ipv4_set_netmask_by_addr(struct net_if *iface, * * @return The gateway set on the interface, unspecified address if not found. */ -struct in_addr net_if_ipv4_get_gw(struct net_if *iface); +struct net_in_addr net_if_ipv4_get_gw(struct net_if *iface); /** * @brief Set IPv4 gateway for an interface. @@ -2839,7 +2839,7 @@ struct in_addr net_if_ipv4_get_gw(struct net_if *iface); * @param iface Interface to use. * @param gw IPv4 address of an gateway */ -void net_if_ipv4_set_gw(struct net_if *iface, const struct in_addr *gw); +void net_if_ipv4_set_gw(struct net_if *iface, const struct net_in_addr *gw); /** * @brief Set IPv4 gateway for an interface index. @@ -2849,7 +2849,7 @@ void net_if_ipv4_set_gw(struct net_if *iface, const struct in_addr *gw); * * @return True if gateway was added, false otherwise. */ -__syscall bool net_if_ipv4_set_gw_by_index(int index, const struct in_addr *gw); +__syscall bool net_if_ipv4_set_gw_by_index(int index, const struct net_in_addr *gw); /** * @brief Get a network interface that should be used when sending @@ -2861,7 +2861,7 @@ __syscall bool net_if_ipv4_set_gw_by_index(int index, const struct in_addr *gw); * will return the default network interface if the best network interface * is not found. */ -struct net_if *net_if_select_src_iface(const struct sockaddr *dst); +struct net_if *net_if_select_src_iface(const struct net_sockaddr *dst); /** * @typedef net_if_link_callback_t diff --git a/include/zephyr/net/net_ip.h b/include/zephyr/net/net_ip.h index 6cc199d758366..3bb0feb888c5e 100644 --- a/include/zephyr/net/net_ip.h +++ b/include/zephyr/net/net_ip.h @@ -41,54 +41,54 @@ extern "C" { /** @endcond */ /* Protocol families. */ -#define PF_UNSPEC 0 /**< Unspecified protocol family. */ -#define PF_INET 1 /**< IP protocol family version 4. */ -#define PF_INET6 2 /**< IP protocol family version 6. */ -#define PF_PACKET 3 /**< Packet family. */ -#define PF_CAN 4 /**< Controller Area Network. */ -#define PF_NET_MGMT 5 /**< Network management info. */ -#define PF_LOCAL 6 /**< Inter-process communication */ -#define PF_UNIX PF_LOCAL /**< Inter-process communication */ +#define NET_PF_UNSPEC 0 /**< Unspecified protocol family. */ +#define NET_PF_INET 1 /**< IP protocol family version 4. */ +#define NET_PF_INET6 2 /**< IP protocol family version 6. */ +#define NET_PF_PACKET 3 /**< Packet family. */ +#define NET_PF_CAN 4 /**< Controller Area Network. */ +#define NET_PF_NET_MGMT 5 /**< Network management info. */ +#define NET_PF_LOCAL 6 /**< Inter-process communication */ +#define NET_PF_UNIX NET_PF_LOCAL /**< Inter-process communication */ /* Address families. */ -#define AF_UNSPEC PF_UNSPEC /**< Unspecified address family. */ -#define AF_INET PF_INET /**< IP protocol family version 4. */ -#define AF_INET6 PF_INET6 /**< IP protocol family version 6. */ -#define AF_PACKET PF_PACKET /**< Packet family. */ -#define AF_CAN PF_CAN /**< Controller Area Network. */ -#define AF_NET_MGMT PF_NET_MGMT /**< Network management info. */ -#define AF_LOCAL PF_LOCAL /**< Inter-process communication */ -#define AF_UNIX PF_UNIX /**< Inter-process communication */ +#define NET_AF_UNSPEC NET_PF_UNSPEC /**< Unspecified address family. */ +#define NET_AF_INET NET_PF_INET /**< IP protocol family version 4. */ +#define NET_AF_INET6 NET_PF_INET6 /**< IP protocol family version 6. */ +#define NET_AF_PACKET NET_PF_PACKET /**< Packet family. */ +#define NET_AF_CAN NET_PF_CAN /**< Controller Area Network. */ +#define NET_AF_NET_MGMT NET_PF_NET_MGMT /**< Network management info. */ +#define NET_AF_LOCAL NET_PF_LOCAL /**< Inter-process communication */ +#define NET_AF_UNIX NET_PF_UNIX /**< Inter-process communication */ /** Protocol numbers from IANA/BSD */ enum net_ip_protocol { - IPPROTO_IP = 0, /**< IP protocol (pseudo-val for setsockopt() */ - IPPROTO_ICMP = 1, /**< ICMP protocol */ - IPPROTO_IGMP = 2, /**< IGMP protocol */ - IPPROTO_ETH_P_ALL = 3, /**< Every packet. from linux if_ether.h */ - IPPROTO_IPIP = 4, /**< IPIP tunnels */ - IPPROTO_TCP = 6, /**< TCP protocol */ - IPPROTO_UDP = 17, /**< UDP protocol */ - IPPROTO_IPV6 = 41, /**< IPv6 protocol */ - IPPROTO_ICMPV6 = 58, /**< ICMPv6 protocol */ - IPPROTO_RAW = 255, /**< RAW IP packets */ + NET_IPPROTO_IP = 0, /**< IP protocol (pseudo-val for setsockopt() */ + NET_IPPROTO_ICMP = 1, /**< ICMP protocol */ + NET_IPPROTO_IGMP = 2, /**< IGMP protocol */ + NET_IPPROTO_ETH_P_ALL = 3, /**< Every packet. from linux if_ether.h */ + NET_IPPROTO_IPIP = 4, /**< IPIP tunnels */ + NET_IPPROTO_TCP = 6, /**< TCP protocol */ + NET_IPPROTO_UDP = 17, /**< UDP protocol */ + NET_IPPROTO_IPV6 = 41, /**< IPv6 protocol */ + NET_IPPROTO_ICMPV6 = 58, /**< ICMPv6 protocol */ + NET_IPPROTO_RAW = 255, /**< RAW IP packets */ }; /** Protocol numbers for TLS protocols */ enum net_ip_protocol_secure { - IPPROTO_TLS_1_0 = 256, /**< TLS 1.0 protocol */ - IPPROTO_TLS_1_1 = 257, /**< TLS 1.1 protocol */ - IPPROTO_TLS_1_2 = 258, /**< TLS 1.2 protocol */ - IPPROTO_TLS_1_3 = 259, /**< TLS 1.3 protocol */ - IPPROTO_DTLS_1_0 = 272, /**< DTLS 1.0 protocol */ - IPPROTO_DTLS_1_2 = 273, /**< DTLS 1.2 protocol */ + NET_IPPROTO_TLS_1_0 = 256, /**< TLS 1.0 protocol */ + NET_IPPROTO_TLS_1_1 = 257, /**< TLS 1.1 protocol */ + NET_IPPROTO_TLS_1_2 = 258, /**< TLS 1.2 protocol */ + NET_IPPROTO_TLS_1_3 = 259, /**< TLS 1.3 protocol */ + NET_IPPROTO_DTLS_1_0 = 272, /**< DTLS 1.0 protocol */ + NET_IPPROTO_DTLS_1_2 = 273, /**< DTLS 1.2 protocol */ }; /** Socket type */ enum net_sock_type { - SOCK_STREAM = 1, /**< Stream socket type */ - SOCK_DGRAM, /**< Datagram socket type */ - SOCK_RAW /**< RAW socket type */ + NET_SOCK_STREAM = 1, /**< Stream socket type */ + NET_SOCK_DGRAM, /**< Datagram socket type */ + NET_SOCK_RAW /**< RAW socket type */ }; /** @brief Convert 16-bit value from network to host byte order. @@ -97,7 +97,7 @@ enum net_sock_type { * * @return Host byte order value. */ -#define ntohs(x) sys_be16_to_cpu(x) +#define net_ntohs(x) sys_be16_to_cpu(x) /** @brief Convert 32-bit value from network to host byte order. * @@ -105,7 +105,7 @@ enum net_sock_type { * * @return Host byte order value. */ -#define ntohl(x) sys_be32_to_cpu(x) +#define net_ntohl(x) sys_be32_to_cpu(x) /** @brief Convert 64-bit value from network to host byte order. * @@ -113,7 +113,7 @@ enum net_sock_type { * * @return Host byte order value. */ -#define ntohll(x) sys_be64_to_cpu(x) +#define net_ntohll(x) sys_be64_to_cpu(x) /** @brief Convert 16-bit value from host to network byte order. * @@ -121,7 +121,7 @@ enum net_sock_type { * * @return Network byte order value. */ -#define htons(x) sys_cpu_to_be16(x) +#define net_htons(x) sys_cpu_to_be16(x) /** @brief Convert 32-bit value from host to network byte order. * @@ -129,7 +129,7 @@ enum net_sock_type { * * @return Network byte order value. */ -#define htonl(x) sys_cpu_to_be32(x) +#define net_htonl(x) sys_cpu_to_be32(x) /** @brief Convert 64-bit value from host to network byte order. * @@ -137,10 +137,10 @@ enum net_sock_type { * * @return Network byte order value. */ -#define htonll(x) sys_cpu_to_be64(x) +#define net_htonll(x) sys_cpu_to_be64(x) /** IPv6 address struct */ -struct in6_addr { +struct net_in6_addr { union { uint8_t s6_addr[16]; /**< IPv6 address buffer */ uint16_t s6_addr16[8]; /**< In big endian */ @@ -152,7 +152,7 @@ struct in6_addr { #define NET_IPV6_ADDR_SIZE 16 /** IPv4 address struct */ -struct in_addr { +struct net_in_addr { union { uint8_t s4_addr[4]; /**< IPv4 address buffer */ uint16_t s4_addr16[2]; /**< In big endian */ @@ -165,111 +165,108 @@ struct in_addr { #define NET_IPV4_ADDR_SIZE 4 /** Socket address family type */ -typedef unsigned short int sa_family_t; +typedef unsigned short int net_sa_family_t; /** Length of a socket address */ -#ifndef __socklen_t_defined -typedef uint32_t socklen_t; -#define __socklen_t_defined -#endif +typedef uint32_t net_socklen_t; /* * Note that the sin_port and sin6_port are in network byte order - * in various sockaddr* structs. + * in various net_sockaddr* structs. */ /** Socket address struct for IPv6. */ -struct sockaddr_in6 { - sa_family_t sin6_family; /**< AF_INET6 */ +struct net_sockaddr_in6 { + net_sa_family_t sin6_family; /**< NET_AF_INET6 */ uint16_t sin6_port; /**< Port number */ - struct in6_addr sin6_addr; /**< IPv6 address */ + struct net_in6_addr sin6_addr; /**< IPv6 address */ uint8_t sin6_scope_id; /**< Interfaces for a scope */ }; /** Socket address struct for IPv4. */ -struct sockaddr_in { - sa_family_t sin_family; /**< AF_INET */ +struct net_sockaddr_in { + net_sa_family_t sin_family; /**< NET_AF_INET */ uint16_t sin_port; /**< Port number */ - struct in_addr sin_addr; /**< IPv4 address */ + struct net_in_addr sin_addr; /**< IPv4 address */ }; /** Socket address struct for packet socket. */ -struct sockaddr_ll { - sa_family_t sll_family; /**< Always AF_PACKET */ - uint16_t sll_protocol; /**< Physical-layer protocol */ - int sll_ifindex; /**< Interface number */ - uint16_t sll_hatype; /**< ARP hardware type */ - uint8_t sll_pkttype; /**< Packet type */ - uint8_t sll_halen; /**< Length of address */ - uint8_t sll_addr[8]; /**< Physical-layer address, big endian */ +struct net_sockaddr_ll { + net_sa_family_t sll_family; /**< Always NET_AF_PACKET */ + uint16_t sll_protocol; /**< Physical-layer protocol */ + int sll_ifindex; /**< Interface number */ + uint16_t sll_hatype; /**< ARP hardware type */ + uint8_t sll_pkttype; /**< Packet type */ + uint8_t sll_halen; /**< Length of address */ + uint8_t sll_addr[8]; /**< Physical-layer address, big endian */ }; /** @cond INTERNAL_HIDDEN */ /** Socket address struct for IPv6 where address is a pointer */ -struct sockaddr_in6_ptr { - sa_family_t sin6_family; /**< AF_INET6 */ +struct net_sockaddr_in6_ptr { + net_sa_family_t sin6_family; /**< NET_AF_INET6 */ uint16_t sin6_port; /**< Port number */ - struct in6_addr *sin6_addr; /**< IPv6 address */ + struct net_in6_addr *sin6_addr; /**< IPv6 address */ uint8_t sin6_scope_id; /**< interfaces for a scope */ }; /** Socket address struct for IPv4 where address is a pointer */ -struct sockaddr_in_ptr { - sa_family_t sin_family; /**< AF_INET */ +struct net_sockaddr_in_ptr { + net_sa_family_t sin_family; /**< NET_AF_INET */ uint16_t sin_port; /**< Port number */ - struct in_addr *sin_addr; /**< IPv4 address */ + struct net_in_addr *sin_addr; /**< IPv4 address */ }; /** Socket address struct for packet socket where address is a pointer */ -struct sockaddr_ll_ptr { - sa_family_t sll_family; /**< Always AF_PACKET */ - uint16_t sll_protocol; /**< Physical-layer protocol */ - int sll_ifindex; /**< Interface number */ - uint16_t sll_hatype; /**< ARP hardware type */ - uint8_t sll_pkttype; /**< Packet type */ - uint8_t sll_halen; /**< Length of address */ - uint8_t *sll_addr; /**< Physical-layer address, big endian */ +struct net_sockaddr_ll_ptr { + net_sa_family_t sll_family; /**< Always NET_AF_PACKET */ + uint16_t sll_protocol; /**< Physical-layer protocol */ + int sll_ifindex; /**< Interface number */ + uint16_t sll_hatype; /**< ARP hardware type */ + uint8_t sll_pkttype; /**< Packet type */ + uint8_t sll_halen; /**< Length of address */ + uint8_t *sll_addr; /**< Physical-layer address, big endian */ }; /** Socket address struct for unix socket where address is a pointer */ -struct sockaddr_un_ptr { - sa_family_t sun_family; /**< Always AF_UNIX */ - char *sun_path; /**< pathname */ +struct net_sockaddr_un_ptr { + net_sa_family_t sun_family; /**< Always NET_AF_UNIX */ + char *sun_path; /**< Pathname */ }; -struct sockaddr_can_ptr { - sa_family_t can_family; - int can_ifindex; +struct net_sockaddr_can_ptr { + net_sa_family_t can_family; + int can_ifindex; }; /** @endcond */ #if !defined(HAVE_IOVEC) /** IO vector array element */ -struct iovec { +struct net_iovec { void *iov_base; /**< Pointer to data */ size_t iov_len; /**< Length of the data */ }; #endif /** Message struct */ -struct msghdr { - void *msg_name; /**< Optional socket address, big endian */ - socklen_t msg_namelen; /**< Size of socket address */ - struct iovec *msg_iov; /**< Scatter/gather array */ - size_t msg_iovlen; /**< Number of elements in msg_iov */ - void *msg_control; /**< Ancillary data */ - size_t msg_controllen; /**< Ancillary data buffer len */ - int msg_flags; /**< Flags on received message */ +struct net_msghdr { + void *msg_name; /**< Optional socket address, big endian */ + net_socklen_t msg_namelen; /**< Size of socket address */ + struct net_iovec *msg_iov; /**< Scatter/gather array */ + size_t msg_iovlen; /**< Number of elements in msg_iov */ + void *msg_control; /**< Ancillary data */ + size_t msg_controllen; /**< Ancillary data buffer len */ + int msg_flags; /**< Flags on received message */ }; /** Control message ancillary data */ -struct cmsghdr { - socklen_t cmsg_len; /**< Number of bytes, including header */ - int cmsg_level; /**< Originating protocol */ - int cmsg_type; /**< Protocol-specific type */ - z_max_align_t cmsg_data[]; /**< Flexible array member to force alignment of cmsghdr */ +struct net_cmsghdr { + net_socklen_t cmsg_len; /**< Number of bytes, including header */ + int cmsg_level; /**< Originating protocol */ + int cmsg_type; /**< Protocol-specific type */ + z_max_align_t cmsg_data[]; /**< Flexible array member to force alignment of net_cmsghdr */ }; /** @cond INTERNAL_HIDDEN */ @@ -277,42 +274,42 @@ struct cmsghdr { /* Alignment for headers and data. These are arch specific but define * them here atm if not found already. */ -#if !defined(ALIGN_H) -#define ALIGN_H(x) ROUND_UP(x, __alignof__(struct cmsghdr)) +#if !defined(NET_ALIGN_H) +#define NET_ALIGN_H(x) ROUND_UP(x, __alignof__(struct net_cmsghdr)) #endif -#if !defined(ALIGN_D) -#define ALIGN_D(x) ROUND_UP(x, __alignof__(z_max_align_t)) +#if !defined(NET_ALIGN_D) +#define NET_ALIGN_D(x) ROUND_UP(x, __alignof__(z_max_align_t)) #endif /** @endcond */ -#if !defined(CMSG_FIRSTHDR) +#if !defined(NET_CMSG_FIRSTHDR) /** * Returns a pointer to the first cmsghdr in the ancillary data buffer * associated with the passed msghdr. It returns NULL if there isn't * enough space for a cmsghdr in the buffer. */ -#define CMSG_FIRSTHDR(msghdr) \ - ((msghdr)->msg_controllen >= sizeof(struct cmsghdr) ? \ - (struct cmsghdr *)((msghdr)->msg_control) : NULL) +#define NET_CMSG_FIRSTHDR(msghdr) \ + ((msghdr)->msg_controllen >= sizeof(struct net_cmsghdr) ? \ + (struct net_cmsghdr *)((msghdr)->msg_control) : NULL) #endif -#if !defined(CMSG_NXTHDR) +#if !defined(NET_CMSG_NXTHDR) /** * Returns the next valid cmsghdr after the passed cmsghdr. It returns NULL * when there isn't enough space left in the buffer. */ -#define CMSG_NXTHDR(msghdr, cmsg) \ - (((cmsg) == NULL) ? CMSG_FIRSTHDR(msghdr) : \ - (((uint8_t *)(cmsg) + ALIGN_H((cmsg)->cmsg_len) + \ - ALIGN_D(sizeof(struct cmsghdr)) > \ +#define NET_CMSG_NXTHDR(msghdr, cmsg) \ + (((cmsg) == NULL) ? NET_CMSG_FIRSTHDR(msghdr) : \ + (((uint8_t *)(cmsg) + NET_ALIGN_H((cmsg)->cmsg_len) + \ + NET_ALIGN_D(sizeof(struct net_cmsghdr)) > \ (uint8_t *)((msghdr)->msg_control) + (msghdr)->msg_controllen) ? \ NULL : \ - (struct cmsghdr *)((uint8_t *)(cmsg) + \ - ALIGN_H((cmsg)->cmsg_len)))) + (struct net_cmsghdr *)((uint8_t *)(cmsg) + \ + NET_ALIGN_H((cmsg)->cmsg_len)))) #endif -#if !defined(CMSG_DATA) +#if !defined(NET_CMSG_DATA) /** * Returns a pointer to the data portion of a cmsghdr. The pointer returned * cannot be assumed to be suitably aligned for accessing arbitrary payload @@ -320,39 +317,40 @@ struct cmsghdr { * the payload, but should instead use memcpy(3) to copy data to or from a * suitably declared object. */ -#define CMSG_DATA(cmsg) ((uint8_t *)(cmsg) + ALIGN_D(sizeof(struct cmsghdr))) +#define NET_CMSG_DATA(cmsg) ((uint8_t *)(cmsg) + NET_ALIGN_D(sizeof(struct net_cmsghdr))) #endif -#if !defined(CMSG_SPACE) +#if !defined(NET_CMSG_SPACE) /** * Returns the number of bytes an ancillary element with payload of the passed * data length occupies. */ -#define CMSG_SPACE(length) (ALIGN_D(sizeof(struct cmsghdr)) + ALIGN_H(length)) +#define NET_CMSG_SPACE(length) (NET_ALIGN_D(sizeof(struct net_cmsghdr)) + NET_ALIGN_H(length)) #endif -#if !defined(CMSG_LEN) +#if !defined(NET_CMSG_LEN) /** - * Returns the value to store in the cmsg_len member of the cmsghdr structure, + * Returns the value to store in the cmsg_len member of the net_cmsghdr structure, * taking into account any necessary alignment. * It takes the data length as an argument. */ -#define CMSG_LEN(length) (ALIGN_D(sizeof(struct cmsghdr)) + length) +#define NET_CMSG_LEN(length) (NET_ALIGN_D(sizeof(struct net_cmsghdr)) + length) #endif /** @cond INTERNAL_HIDDEN */ /* Packet types. */ -#define PACKET_HOST 0 /* To us */ -#define PACKET_BROADCAST 1 /* To all */ -#define PACKET_MULTICAST 2 /* To group */ -#define PACKET_OTHERHOST 3 /* To someone else */ -#define PACKET_OUTGOING 4 /* Originated by us */ -#define PACKET_LOOPBACK 5 -#define PACKET_FASTROUTE 6 +#define NET_PACKET_HOST 0 /* To us */ +#define NET_PACKET_BROADCAST 1 /* To all */ +#define NET_PACKET_MULTICAST 2 /* To group */ +#define NET_PACKET_OTHERHOST 3 /* To someone else */ +#define NET_PACKET_OUTGOING 4 /* Originated by us */ +#define NET_PACKET_LOOPBACK 5 +#define NET_PACKET_FASTROUTE 6 /* ARP protocol HARDWARE identifiers. */ -#define ARPHRD_ETHER 1 +#define NET_ARPHRD_ETHER 1 +#define NET_ARPHRD_PPP 512 /* Note: These macros are defined in a specific order. * The largest sockaddr size is the last one. @@ -360,23 +358,23 @@ struct cmsghdr { #if defined(CONFIG_NET_IPV4) #undef NET_SOCKADDR_MAX_SIZE #undef NET_SOCKADDR_PTR_MAX_SIZE -#define NET_SOCKADDR_MAX_SIZE (sizeof(struct sockaddr_in)) -#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_in_ptr)) +#define NET_SOCKADDR_MAX_SIZE (sizeof(struct net_sockaddr_in)) +#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct net_sockaddr_in_ptr)) #endif #if defined(CONFIG_NET_SOCKETS_PACKET) #undef NET_SOCKADDR_MAX_SIZE #undef NET_SOCKADDR_PTR_MAX_SIZE -#define NET_SOCKADDR_MAX_SIZE (sizeof(struct sockaddr_ll)) -#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_ll_ptr)) +#define NET_SOCKADDR_MAX_SIZE (sizeof(struct net_sockaddr_ll)) +#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct net_sockaddr_ll_ptr)) #endif #if defined(CONFIG_NET_IPV6) #undef NET_SOCKADDR_MAX_SIZE -#define NET_SOCKADDR_MAX_SIZE (sizeof(struct sockaddr_in6)) +#define NET_SOCKADDR_MAX_SIZE (sizeof(struct net_sockaddr_in6)) #if !defined(CONFIG_NET_SOCKETS_PACKET) #undef NET_SOCKADDR_PTR_MAX_SIZE -#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_in6_ptr)) +#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct net_sockaddr_in6_ptr)) #endif #endif @@ -384,10 +382,10 @@ struct cmsghdr { #define UNIX_PATH_MAX 108 #undef NET_SOCKADDR_MAX_SIZE /* Define NET_SOCKADDR_MAX_SIZE to be struct of sa_family_t + char[UNIX_PATH_MAX] */ -#define NET_SOCKADDR_MAX_SIZE (UNIX_PATH_MAX+sizeof(sa_family_t)) +#define NET_SOCKADDR_MAX_SIZE (UNIX_PATH_MAX+sizeof(net_sa_family_t)) #if !defined(CONFIG_NET_SOCKETS_PACKET) #undef NET_SOCKADDR_PTR_MAX_SIZE -#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_un_ptr)) +#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct net_sockaddr_un_ptr)) #endif #endif @@ -395,8 +393,8 @@ struct cmsghdr { #if !defined(CONFIG_NET_IPV6) #if !defined(CONFIG_NET_SOCKETS_PACKET) #if !defined(CONFIG_NET_NATIVE_OFFLOADED_SOCKETS) -#define NET_SOCKADDR_MAX_SIZE (sizeof(struct sockaddr_in6)) -#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_in6_ptr)) +#define NET_SOCKADDR_MAX_SIZE (sizeof(struct net_sockaddr_in6)) +#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct net_sockaddr_in6_ptr)) #endif #endif #endif @@ -407,74 +405,80 @@ struct cmsghdr { #define SOCKADDR_ALIGN (4) /** Generic sockaddr struct. Must be cast to proper type. */ -struct sockaddr { - sa_family_t sa_family; /**< Address family */ +struct net_sockaddr { + net_sa_family_t sa_family; /**< Address family */ /** @cond INTERNAL_HIDDEN */ - char data[NET_SOCKADDR_MAX_SIZE - sizeof(sa_family_t)]; + char data[NET_SOCKADDR_MAX_SIZE - sizeof(net_sa_family_t)]; /** @endcond */ } __aligned(SOCKADDR_ALIGN); /** @cond INTERNAL_HIDDEN */ -struct sockaddr_ptr { - sa_family_t family; - char data[NET_SOCKADDR_PTR_MAX_SIZE - sizeof(sa_family_t)]; +struct net_sockaddr_ptr { + net_sa_family_t family; + char data[NET_SOCKADDR_PTR_MAX_SIZE - sizeof(net_sa_family_t)]; } __aligned(SOCKADDR_ALIGN); /* Same as sockaddr in our case */ -struct sockaddr_storage { - sa_family_t ss_family; - char data[NET_SOCKADDR_MAX_SIZE - sizeof(sa_family_t)]; +struct net_sockaddr_storage { + net_sa_family_t ss_family; + char data[NET_SOCKADDR_MAX_SIZE - sizeof(net_sa_family_t)]; } __aligned(SOCKADDR_ALIGN); /* Socket address struct for UNIX domain sockets */ -struct sockaddr_un { - sa_family_t sun_family; /* AF_UNIX */ - char sun_path[NET_SOCKADDR_MAX_SIZE - sizeof(sa_family_t)]; +struct net_sockaddr_un { + net_sa_family_t sun_family; /* NET_AF_UNIX */ + char sun_path[NET_SOCKADDR_MAX_SIZE - sizeof(net_sa_family_t)]; }; struct net_addr { - sa_family_t family; + net_sa_family_t family; union { - struct in6_addr in6_addr; - struct in_addr in_addr; +#if defined(CONFIG_NET_NAMESPACE_COMPAT_MODE) + struct net_in6_addr net_in6_addr; + struct net_in_addr net_in_addr; +#else + struct net_in6_addr in6_addr; + struct net_in_addr in_addr; +#endif }; }; /** A pointer to IPv6 any address (all values zero) */ -extern const struct in6_addr in6addr_any; +extern const struct net_in6_addr net_in6addr_any; /** A pointer to IPv6 loopback address (::1) */ -extern const struct in6_addr in6addr_loopback; +extern const struct net_in6_addr net_in6addr_loopback; /** @endcond */ /** IPv6 address initializer */ -#define IN6ADDR_ANY_INIT { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, \ - 0, 0, 0, 0, 0, 0, 0 } } } +#define NET_IN6ADDR_ANY_INIT { { { 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 0 } } } /** IPv6 loopback address initializer */ -#define IN6ADDR_LOOPBACK_INIT { { { 0, 0, 0, 0, 0, 0, 0, \ - 0, 0, 0, 0, 0, 0, 0, 0, 1 } } } +#define NET_IN6ADDR_LOOPBACK_INIT { { { 0, 0, 0, 0, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0, 0, 0, 1 } } } /** IPv4 any address */ -#define INADDR_ANY 0 +#define NET_INADDR_ANY 0 /** IPv4 broadcast address */ -#define INADDR_BROADCAST 0xffffffff +#define NET_INADDR_BROADCAST 0xffffffff /** IPv4 address initializer */ -#define INADDR_ANY_INIT { { { INADDR_ANY } } } +#define NET_INADDR_ANY_INIT { { { NET_INADDR_ANY } } } /** IPv6 loopback address initializer */ -#define INADDR_LOOPBACK_INIT { { { 127, 0, 0, 1 } } } +#define NET_INADDR_LOOPBACK_INIT { { { 127, 0, 0, 1 } } } /** Max length of the IPv4 address as a string. Defined by POSIX. */ -#define INET_ADDRSTRLEN 16 +#define NET_INET_ADDRSTRLEN 16 + /** Max length of the IPv6 address as a string. Takes into account possible * mapped IPv4 addresses. */ -#define INET6_ADDRSTRLEN 46 +#define NET_INET6_ADDRSTRLEN 46 /** @cond INTERNAL_HIDDEN */ @@ -673,15 +677,88 @@ union net_proto_header { #define NET_IPV4_MORE_FRAG_MASK 0x2000 /* Mask for the 1-bit More Fragments field */ #define NET_IPV4_DO_NOT_FRAG_MASK 0x4000 /* Mask for the 1-bit Do Not Fragment field */ +/** Network interface name length */ +#if defined(CONFIG_NET_INTERFACE_NAME) +#define NET_IFNAMSIZ CONFIG_NET_INTERFACE_NAME_LEN +#else +#if defined(Z_DEVICE_MAX_NAME_LEN) +#define NET_IFNAMSIZ Z_DEVICE_MAX_NAME_LEN +#else +#define NET_IFNAMSIZ 1 +#endif /* Z_DEVICE_MAX_NAME_LEN */ +#endif /* CONFIG_NET_INTERFACE_NAME */ + /** @endcond */ +/** + * @name Network interface name description + * @{ + */ + +/** Interface description structure */ +struct net_ifreq { + char ifr_name[NET_IFNAMSIZ]; /**< Network interface name */ +}; +/** @} */ + +/** + * @brief Incoming IPv4 packet information. + * + * Used as ancillary data when calling recvmsg() and IP_PKTINFO socket + * option is set. + */ +struct net_in_pktinfo { + unsigned int ipi_ifindex; /**< Network interface index */ + struct net_in_addr ipi_spec_dst; /**< Local address */ + struct net_in_addr ipi_addr; /**< Header Destination address */ +}; + +/** + * @brief Struct used when joining or leaving a IPv4 multicast group. + */ +struct net_ip_mreqn { + struct net_in_addr imr_multiaddr; /**< IP multicast group address */ + struct net_in_addr imr_address; /**< IP address of local interface */ + int imr_ifindex; /**< Network interface index */ +}; + +/** + * @brief Struct used when setting a IPv4 multicast network interface. + */ +struct net_ip_mreq { + struct net_in_addr imr_multiaddr; /**< IP multicast group address */ + struct net_in_addr imr_interface; /**< IP address of local interface */ +}; + +/** + * @brief Struct used when joining or leaving a IPv6 multicast group. + */ +struct net_ipv6_mreq { + /** IPv6 multicast address of group */ + struct net_in6_addr ipv6mr_multiaddr; + + /** Network interface index of the local IPv6 address */ + int ipv6mr_ifindex; +}; + +/** + * @brief Incoming IPv6 packet information. + * + * Used as ancillary data when calling recvmsg() and IPV6_RECVPKTINFO socket + * option is set. + */ +struct net_in6_pktinfo { + struct net_in6_addr ipi6_addr; /**< Destination IPv6 address */ + unsigned int ipi6_ifindex; /**< Receive interface index */ +}; + /** @cond INTERNAL_HIDDEN */ static inline bool net_ipv6_is_addr_loopback_raw(const uint8_t *addr) { return UNALIGNED_GET((uint32_t *)addr) == 0 && UNALIGNED_GET((uint32_t *)addr + 1) == 0 && UNALIGNED_GET((uint32_t *)addr + 2) == 0 && - ntohl(UNALIGNED_GET((uint32_t *)addr + 3)) == 1; + net_ntohl(UNALIGNED_GET((uint32_t *)addr + 3)) == 1; } /** @endcond */ @@ -692,7 +769,7 @@ static inline bool net_ipv6_is_addr_loopback_raw(const uint8_t *addr) * * @return True if address is a loopback address, False otherwise. */ -static inline bool net_ipv6_is_addr_loopback(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_loopback(const struct net_in6_addr *addr) { return net_ipv6_is_addr_loopback_raw(addr->s6_addr); } @@ -711,7 +788,7 @@ static inline bool net_ipv6_is_addr_mcast_raw(const uint8_t *addr) * * @return True if address is multicast address, False otherwise. */ -static inline bool net_ipv6_is_addr_mcast(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_mcast(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_raw(addr->s6_addr); } @@ -729,7 +806,7 @@ static inline bool net_ipv6_is_my_addr_raw(const uint8_t *addr) } /** @endcond */ -extern struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr, +extern struct net_if_addr *net_if_ipv6_addr_lookup(const struct net_in6_addr *addr, struct net_if **iface); /** @@ -739,13 +816,13 @@ extern struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr, * * @return True if address was found, False otherwise. */ -static inline bool net_ipv6_is_my_addr(struct in6_addr *addr) +static inline bool net_ipv6_is_my_addr(struct net_in6_addr *addr) { return net_if_ipv6_addr_lookup(addr, NULL) != NULL; } extern struct net_if_mcast_addr *net_if_ipv6_maddr_lookup( - const struct in6_addr *addr, struct net_if **iface); + const struct net_in6_addr *addr, struct net_if **iface); /** * @brief Check if IPv6 multicast address is found in one of the @@ -755,7 +832,7 @@ extern struct net_if_mcast_addr *net_if_ipv6_maddr_lookup( * * @return True if address was found, False otherwise. */ -static inline bool net_ipv6_is_my_maddr(struct in6_addr *maddr) +static inline bool net_ipv6_is_my_maddr(struct net_in6_addr *maddr) { return net_if_ipv6_maddr_lookup(maddr, NULL) != NULL; } @@ -845,7 +922,7 @@ static inline bool net_ipv4_is_addr_loopback_raw(const uint8_t *addr) * * @return True if address is a loopback address, False otherwise. */ -static inline bool net_ipv4_is_addr_loopback(const struct in_addr *addr) +static inline bool net_ipv4_is_addr_loopback(const struct net_in_addr *addr) { return net_ipv4_is_addr_loopback_raw(addr->s4_addr); } @@ -864,7 +941,7 @@ static inline bool net_ipv4_is_addr_unspecified_raw(const uint8_t *addr) * * @return True if the address is unspecified, false otherwise. */ -static inline bool net_ipv4_is_addr_unspecified(const struct in_addr *addr) +static inline bool net_ipv4_is_addr_unspecified(const struct net_in_addr *addr) { return net_ipv4_is_addr_unspecified_raw(addr->s4_addr); } @@ -872,7 +949,7 @@ static inline bool net_ipv4_is_addr_unspecified(const struct in_addr *addr) /** @cond INTERNAL_HIDDEN */ static inline bool net_ipv4_is_addr_mcast_raw(const uint8_t *addr) { - return (ntohl(UNALIGNED_GET((uint32_t *)addr)) & 0xF0000000) == 0xE0000000; + return (net_ntohl(UNALIGNED_GET((uint32_t *)addr)) & 0xF0000000) == 0xE0000000; } /** @endcond */ @@ -883,7 +960,7 @@ static inline bool net_ipv4_is_addr_mcast_raw(const uint8_t *addr) * * @return True if address is multicast address, False otherwise. */ -static inline bool net_ipv4_is_addr_mcast(const struct in_addr *addr) +static inline bool net_ipv4_is_addr_mcast(const struct net_in_addr *addr) { return net_ipv4_is_addr_mcast_raw(addr->s4_addr); } @@ -891,7 +968,7 @@ static inline bool net_ipv4_is_addr_mcast(const struct in_addr *addr) /** @cond INTERNAL_HIDDEN */ static inline bool net_ipv4_is_ll_addr_raw(const uint8_t *addr) { - return (ntohl(UNALIGNED_GET((uint32_t *)addr)) & 0xFFFF0000) == 0xA9FE0000; + return (net_ntohl(UNALIGNED_GET((uint32_t *)addr)) & 0xFFFF0000) == 0xA9FE0000; } /** @endcond */ @@ -902,7 +979,7 @@ static inline bool net_ipv4_is_ll_addr_raw(const uint8_t *addr) * * @return True if it is, false otherwise. */ -static inline bool net_ipv4_is_ll_addr(const struct in_addr *addr) +static inline bool net_ipv4_is_ll_addr(const struct net_in_addr *addr) { return net_ipv4_is_ll_addr_raw(addr->s4_addr); } @@ -916,11 +993,11 @@ static inline bool net_ipv4_is_ll_addr(const struct in_addr *addr) * * @return True if it is, false otherwise. */ -static inline bool net_ipv4_is_private_addr(const struct in_addr *addr) +static inline bool net_ipv4_is_private_addr(const struct net_in_addr *addr) { uint32_t masked_24, masked_16, masked_12, masked_10, masked_8; - masked_24 = ntohl(UNALIGNED_GET(&addr->s_addr)) & 0xFFFFFF00; + masked_24 = net_ntohl(UNALIGNED_GET(&addr->s_addr)) & 0xFFFFFF00; masked_16 = masked_24 & 0xFFFF0000; masked_12 = masked_24 & 0xFFF00000; masked_10 = masked_24 & 0xFFC00000; @@ -955,7 +1032,7 @@ static inline bool net_ipv4_is_private_addr(const struct in_addr *addr) static inline void net_ipv4_addr_copy_raw(uint8_t *dest, const uint8_t *src) { - net_ipaddr_copy((struct in_addr *)dest, (const struct in_addr *)src); + net_ipaddr_copy((struct net_in_addr *)dest, (const struct net_in_addr *)src); } /** @@ -967,7 +1044,7 @@ static inline void net_ipv4_addr_copy_raw(uint8_t *dest, static inline void net_ipv6_addr_copy_raw(uint8_t *dest, const uint8_t *src) { - memcpy(dest, src, sizeof(struct in6_addr)); + memcpy(dest, src, sizeof(struct net_in6_addr)); } /** @@ -992,8 +1069,8 @@ static inline bool net_ipv4_addr_cmp_raw(const uint8_t *addr1, * * @return True if the addresses are the same, false otherwise. */ -static inline bool net_ipv4_addr_cmp(const struct in_addr *addr1, - const struct in_addr *addr2) +static inline bool net_ipv4_addr_cmp(const struct net_in_addr *addr1, + const struct net_in_addr *addr2) { return net_ipv4_addr_cmp_raw(addr1->s4_addr, addr2->s4_addr); } @@ -1006,10 +1083,10 @@ static inline bool net_ipv4_addr_cmp(const struct in_addr *addr1, * * @return True if the addresses are the same, false otherwise. */ -static inline bool net_ipv6_addr_cmp(const struct in6_addr *addr1, - const struct in6_addr *addr2) +static inline bool net_ipv6_addr_cmp(const struct net_in6_addr *addr1, + const struct net_in6_addr *addr2) { - return !memcmp(addr1, addr2, sizeof(struct in6_addr)); + return !memcmp(addr1, addr2, sizeof(struct net_in6_addr)); } /** @@ -1023,14 +1100,14 @@ static inline bool net_ipv6_addr_cmp(const struct in6_addr *addr1, static inline bool net_ipv6_addr_cmp_raw(const uint8_t *addr1, const uint8_t *addr2) { - return net_ipv6_addr_cmp((const struct in6_addr *)addr1, - (const struct in6_addr *)addr2); + return net_ipv6_addr_cmp((const struct net_in6_addr *)addr1, + (const struct net_in6_addr *)addr2); } /** @cond INTERNAL_HIDDEN */ static inline bool net_ipv6_is_ll_addr_raw(const uint8_t *addr) { - return UNALIGNED_GET((uint16_t *)addr) == htons(0xFE80); + return UNALIGNED_GET((uint16_t *)addr) == net_htons(0xFE80); } /** @endcond */ @@ -1041,7 +1118,7 @@ static inline bool net_ipv6_is_ll_addr_raw(const uint8_t *addr) * * @return True if it is, false otherwise. */ -static inline bool net_ipv6_is_ll_addr(const struct in6_addr *addr) +static inline bool net_ipv6_is_ll_addr(const struct net_in6_addr *addr) { return net_ipv6_is_ll_addr_raw(addr->s6_addr); } @@ -1053,9 +1130,9 @@ static inline bool net_ipv6_is_ll_addr(const struct in6_addr *addr) * * @return True if it is, false otherwise. */ -static inline bool net_ipv6_is_sl_addr(const struct in6_addr *addr) +static inline bool net_ipv6_is_sl_addr(const struct net_in6_addr *addr) { - return UNALIGNED_GET(&addr->s6_addr16[0]) == htons(0xFEC0); + return UNALIGNED_GET(&addr->s6_addr16[0]) == net_htons(0xFEC0); } @@ -1066,7 +1143,7 @@ static inline bool net_ipv6_is_sl_addr(const struct in6_addr *addr) * * @return True if it is, false otherwise. */ -static inline bool net_ipv6_is_ula_addr(const struct in6_addr *addr) +static inline bool net_ipv6_is_ula_addr(const struct net_in6_addr *addr) { return addr->s6_addr[0] == 0xFD; } @@ -1078,7 +1155,7 @@ static inline bool net_ipv6_is_ula_addr(const struct in6_addr *addr) * * @return True if it is, false otherwise. */ -static inline bool net_ipv6_is_global_addr(const struct in6_addr *addr) +static inline bool net_ipv6_is_global_addr(const struct net_in6_addr *addr) { return (addr->s6_addr[0] & 0xE0) == 0x20; } @@ -1092,11 +1169,11 @@ static inline bool net_ipv6_is_global_addr(const struct in6_addr *addr) * * @return True if it is, false otherwise. */ -static inline bool net_ipv6_is_private_addr(const struct in6_addr *addr) +static inline bool net_ipv6_is_private_addr(const struct net_in6_addr *addr) { uint32_t masked_32, masked_7; - masked_32 = ntohl(UNALIGNED_GET(&addr->s6_addr32[0])); + masked_32 = net_ntohl(UNALIGNED_GET(&addr->s6_addr32[0])); masked_7 = masked_32 & 0xfc000000; return masked_32 == 0x20010db8 || /* 2001:db8::/32 */ @@ -1108,25 +1185,25 @@ static inline bool net_ipv6_is_private_addr(const struct in6_addr *addr) * * @return Any IPv6 address. */ -const struct in6_addr *net_ipv6_unspecified_address(void); +const struct net_in6_addr *net_ipv6_unspecified_address(void); /** * @brief Return pointer to any (all bits zeros) IPv4 address. * * @return Any IPv4 address. */ -const struct in_addr *net_ipv4_unspecified_address(void); +const struct net_in_addr *net_ipv4_unspecified_address(void); /** * @brief Return pointer to broadcast (all bits ones) IPv4 address. * * @return Broadcast IPv4 address. */ -const struct in_addr *net_ipv4_broadcast_address(void); +const struct net_in_addr *net_ipv4_broadcast_address(void); struct net_if; extern bool net_if_ipv4_addr_mask_cmp(struct net_if *iface, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Check if the given address belongs to same subnet that @@ -1138,7 +1215,7 @@ extern bool net_if_ipv4_addr_mask_cmp(struct net_if *iface, * @return True if address is in same subnet, false otherwise. */ static inline bool net_ipv4_addr_mask_cmp(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { return net_if_ipv4_addr_mask_cmp(iface, addr); } @@ -1170,7 +1247,7 @@ static inline bool net_ipv4_is_addr_bcast_raw(struct net_if *iface, /** @endcond */ extern bool net_if_ipv4_is_addr_bcast(struct net_if *iface, - const struct in_addr *addr); + const struct net_in_addr *addr); /** * @brief Check if the given IPv4 address is a broadcast address. @@ -1182,7 +1259,7 @@ extern bool net_if_ipv4_is_addr_bcast(struct net_if *iface, */ #if defined(CONFIG_NET_NATIVE_IPV4) static inline bool net_ipv4_is_addr_bcast(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { if (net_ipv4_addr_cmp(addr, net_ipv4_broadcast_address())) { return true; @@ -1192,7 +1269,7 @@ static inline bool net_ipv4_is_addr_bcast(struct net_if *iface, } #else static inline bool net_ipv4_is_addr_bcast(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { ARG_UNUSED(iface); ARG_UNUSED(addr); @@ -1218,7 +1295,7 @@ static inline bool net_ipv4_is_my_addr_raw(const uint8_t *addr) } /** @endcond */ -extern struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, +extern struct net_if_addr *net_if_ipv4_addr_lookup(const struct net_in_addr *addr, struct net_if **iface); /** @@ -1230,7 +1307,7 @@ extern struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, * @return True if IPv4 address is found in one of the network interfaces, * False otherwise. */ -static inline bool net_ipv4_is_my_addr(const struct in_addr *addr) +static inline bool net_ipv4_is_my_addr(const struct net_in_addr *addr) { bool ret; @@ -1259,7 +1336,7 @@ static inline bool net_ipv6_is_addr_unspecified_raw(const uint8_t *addr) * * @return True if the address is unspecified, false otherwise. */ -static inline bool net_ipv6_is_addr_unspecified(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_unspecified(const struct net_in6_addr *addr) { return net_ipv6_is_addr_unspecified_raw(addr->s6_addr); } @@ -1267,11 +1344,11 @@ static inline bool net_ipv6_is_addr_unspecified(const struct in6_addr *addr) /** @cond INTERNAL_HIDDEN */ static inline bool net_ipv6_is_addr_solicited_node_raw(const uint8_t *addr) { - return UNALIGNED_GET((uint32_t *)addr) == htonl(0xff020000) && + return UNALIGNED_GET((uint32_t *)addr) == net_htonl(0xff020000) && UNALIGNED_GET((uint32_t *)addr + 1) == 0x00000000 && - UNALIGNED_GET((uint32_t *)addr + 2) == htonl(0x00000001) && - ((UNALIGNED_GET((uint32_t *)addr + 3) & htonl(0xff000000)) == - htonl(0xff000000)); + UNALIGNED_GET((uint32_t *)addr + 2) == net_htonl(0x00000001) && + ((UNALIGNED_GET((uint32_t *)addr + 3) & net_htonl(0xff000000)) == + net_htonl(0xff000000)); } /** @endcond */ @@ -1283,7 +1360,7 @@ static inline bool net_ipv6_is_addr_solicited_node_raw(const uint8_t *addr) * * @return True if the address is solicited node address, false otherwise. */ -static inline bool net_ipv6_is_addr_solicited_node(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_solicited_node(const struct net_in6_addr *addr) { return net_ipv6_is_addr_solicited_node_raw(addr->s6_addr); } @@ -1317,7 +1394,7 @@ static inline int net_ipv6_get_addr_mcast_scope_raw(const uint8_t *addr) * @return True if the address is in given scope multicast address, * false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_scope(const struct in6_addr *addr, +static inline bool net_ipv6_is_addr_mcast_scope(const struct net_in6_addr *addr, int scope) { return net_ipv6_is_addr_mcast_scope_raw(addr->s6_addr, scope); @@ -1332,11 +1409,11 @@ static inline bool net_ipv6_is_addr_mcast_scope(const struct in6_addr *addr, * @return True if both addresses have same multicast scope, * false otherwise. */ -static inline bool net_ipv6_is_same_mcast_scope(const struct in6_addr *addr_1, - const struct in6_addr *addr_2) +static inline bool net_ipv6_is_same_mcast_scope(const struct net_in6_addr *addr_1, + const struct net_in6_addr *addr_2) { return (addr_1->s6_addr[0] == 0xff) && (addr_2->s6_addr[0] == 0xff) && - (addr_1->s6_addr[1] == addr_2->s6_addr[1]); + (addr_1->s6_addr[1] == addr_2->s6_addr[1]); } /** @@ -1346,7 +1423,7 @@ static inline bool net_ipv6_is_same_mcast_scope(const struct in6_addr *addr_1, * * @return Scope of the address, -1 if address is not multicast. */ -static inline int net_ipv6_get_addr_mcast_scope(const struct in6_addr *addr) +static inline int net_ipv6_get_addr_mcast_scope(const struct net_in6_addr *addr) { return net_ipv6_get_addr_mcast_scope_raw(addr->s6_addr); } @@ -1385,7 +1462,7 @@ static inline bool net_ipv6_is_addr_mcast_org_raw(const uint8_t *addr) * * @return True if the address is global multicast address, false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_global(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_mcast_global(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_scope(addr, 0x0e); } @@ -1399,7 +1476,7 @@ static inline bool net_ipv6_is_addr_mcast_global(const struct in6_addr *addr) * @return True if the address is a interface scope multicast address, * false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_iface(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_mcast_iface(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_scope(addr, 0x01); } @@ -1413,7 +1490,7 @@ static inline bool net_ipv6_is_addr_mcast_iface(const struct in6_addr *addr) * @return True if the address is a link local scope multicast address, * false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_link(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_mcast_link(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_scope(addr, 0x02); } @@ -1427,7 +1504,7 @@ static inline bool net_ipv6_is_addr_mcast_link(const struct in6_addr *addr) * @return True if the address is a mesh-local scope multicast address, * false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_mesh(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_mcast_mesh(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_scope(addr, 0x03); } @@ -1441,7 +1518,7 @@ static inline bool net_ipv6_is_addr_mcast_mesh(const struct in6_addr *addr) * @return True if the address is a site scope multicast address, * false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_site(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_mcast_site(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_scope(addr, 0x05); } @@ -1455,7 +1532,7 @@ static inline bool net_ipv6_is_addr_mcast_site(const struct in6_addr *addr) * @return True if the address is an organization scope multicast address, * false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_org(const struct in6_addr *addr) +static inline bool net_ipv6_is_addr_mcast_org(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_scope(addr, 0x08); } @@ -1481,8 +1558,8 @@ static inline bool net_ipv6_is_addr_mcast_group_raw(const uint8_t *addr, * @return True if the IPv6 multicast address belongs to given multicast * group, false otherwise. */ -static inline bool net_ipv6_is_addr_mcast_group(const struct in6_addr *addr, - const struct in6_addr *group) +static inline bool net_ipv6_is_addr_mcast_group(const struct net_in6_addr *addr, + const struct net_in6_addr *group) { return net_ipv6_is_addr_mcast_group_raw(addr->s6_addr, group->s6_addr); } @@ -1508,7 +1585,7 @@ static inline bool net_ipv6_is_addr_mcast_all_nodes_group_raw(const uint8_t *add * group, false otherwise */ static inline bool -net_ipv6_is_addr_mcast_all_nodes_group(const struct in6_addr *addr) +net_ipv6_is_addr_mcast_all_nodes_group(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_all_nodes_group_raw(addr->s6_addr); } @@ -1523,7 +1600,7 @@ net_ipv6_is_addr_mcast_all_nodes_group(const struct in6_addr *addr) * false otherwise. */ static inline bool -net_ipv6_is_addr_mcast_iface_all_nodes(const struct in6_addr *addr) +net_ipv6_is_addr_mcast_iface_all_nodes(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_iface(addr) && net_ipv6_is_addr_mcast_all_nodes_group(addr); @@ -1547,7 +1624,7 @@ static inline bool net_ipv6_is_addr_mcast_link_all_nodes_raw(const uint8_t *addr * address, false otherwise. */ static inline bool -net_ipv6_is_addr_mcast_link_all_nodes(const struct in6_addr *addr) +net_ipv6_is_addr_mcast_link_all_nodes(const struct net_in6_addr *addr) { return net_ipv6_is_addr_mcast_link(addr) && net_ipv6_is_addr_mcast_all_nodes_group(addr); @@ -1561,8 +1638,8 @@ net_ipv6_is_addr_mcast_link_all_nodes(const struct in6_addr *addr) * @param dst IPv6 address. */ static inline -void net_ipv6_addr_create_solicited_node(const struct in6_addr *src, - struct in6_addr *dst) +void net_ipv6_addr_create_solicited_node(const struct net_in6_addr *src, + struct net_in6_addr *dst) { dst->s6_addr[0] = 0xFF; dst->s6_addr[1] = 0x02; @@ -1589,20 +1666,20 @@ void net_ipv6_addr_create_solicited_node(const struct in6_addr *src, * @param addr6 16-bit word which is part of the address * @param addr7 16-bit word which is part of the address */ -static inline void net_ipv6_addr_create(struct in6_addr *addr, +static inline void net_ipv6_addr_create(struct net_in6_addr *addr, uint16_t addr0, uint16_t addr1, uint16_t addr2, uint16_t addr3, uint16_t addr4, uint16_t addr5, uint16_t addr6, uint16_t addr7) { - UNALIGNED_PUT(htons(addr0), &addr->s6_addr16[0]); - UNALIGNED_PUT(htons(addr1), &addr->s6_addr16[1]); - UNALIGNED_PUT(htons(addr2), &addr->s6_addr16[2]); - UNALIGNED_PUT(htons(addr3), &addr->s6_addr16[3]); - UNALIGNED_PUT(htons(addr4), &addr->s6_addr16[4]); - UNALIGNED_PUT(htons(addr5), &addr->s6_addr16[5]); - UNALIGNED_PUT(htons(addr6), &addr->s6_addr16[6]); - UNALIGNED_PUT(htons(addr7), &addr->s6_addr16[7]); + UNALIGNED_PUT(net_htons(addr0), &addr->s6_addr16[0]); + UNALIGNED_PUT(net_htons(addr1), &addr->s6_addr16[1]); + UNALIGNED_PUT(net_htons(addr2), &addr->s6_addr16[2]); + UNALIGNED_PUT(net_htons(addr3), &addr->s6_addr16[3]); + UNALIGNED_PUT(net_htons(addr4), &addr->s6_addr16[4]); + UNALIGNED_PUT(net_htons(addr5), &addr->s6_addr16[5]); + UNALIGNED_PUT(net_htons(addr6), &addr->s6_addr16[6]); + UNALIGNED_PUT(net_htons(addr7), &addr->s6_addr16[7]); } /** @@ -1610,7 +1687,7 @@ static inline void net_ipv6_addr_create(struct in6_addr *addr, * * @param addr IPv6 address */ -static inline void net_ipv6_addr_create_ll_allnodes_mcast(struct in6_addr *addr) +static inline void net_ipv6_addr_create_ll_allnodes_mcast(struct net_in6_addr *addr) { net_ipv6_addr_create(addr, 0xff02, 0, 0, 0, 0, 0, 0, 0x0001); } @@ -1620,7 +1697,7 @@ static inline void net_ipv6_addr_create_ll_allnodes_mcast(struct in6_addr *addr) * * @param addr IPv6 address */ -static inline void net_ipv6_addr_create_ll_allrouters_mcast(struct in6_addr *addr) +static inline void net_ipv6_addr_create_ll_allrouters_mcast(struct net_in6_addr *addr) { net_ipv6_addr_create(addr, 0xff02, 0, 0, 0, 0, 0, 0, 0x0002); } @@ -1631,12 +1708,12 @@ static inline void net_ipv6_addr_create_ll_allrouters_mcast(struct in6_addr *add * @param addr4 IPv4 address * @param addr6 IPv6 address to be created */ -static inline void net_ipv6_addr_create_v4_mapped(const struct in_addr *addr4, - struct in6_addr *addr6) +static inline void net_ipv6_addr_create_v4_mapped(const struct net_in_addr *addr4, + struct net_in6_addr *addr6) { net_ipv6_addr_create(addr6, 0, 0, 0, 0, 0, 0xffff, - ntohs(addr4->s4_addr16[0]), - ntohs(addr4->s4_addr16[1])); + net_ntohs(addr4->s4_addr16[0]), + net_ntohs(addr4->s4_addr16[1])); } /** @@ -1647,7 +1724,7 @@ static inline void net_ipv6_addr_create_v4_mapped(const struct in_addr *addr4, * * @return True if IPv6 address is a IPv4 mapped address, False otherwise. */ -static inline bool net_ipv6_addr_is_v4_mapped(const struct in6_addr *addr) +static inline bool net_ipv6_addr_is_v4_mapped(const struct net_in6_addr *addr) { if (UNALIGNED_GET(&addr->s6_addr32[0]) == 0 && UNALIGNED_GET(&addr->s6_addr32[1]) == 0 && @@ -1677,10 +1754,10 @@ static inline bool net_ipv6_addr_is_v4_mapped(const struct in6_addr *addr) * @return 0 if ok, < 0 if error */ int net_ipv6_addr_generate_iid(struct net_if *iface, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint8_t *network_id, size_t network_id_len, uint8_t dad_counter, - struct in6_addr *addr, + struct net_in6_addr *addr, struct net_linkaddr *lladdr); /** @@ -1689,7 +1766,7 @@ int net_ipv6_addr_generate_iid(struct net_if *iface, * @param addr IPv6 address * @param lladdr Link local address */ -static inline void net_ipv6_addr_create_iid(struct in6_addr *addr, +static inline void net_ipv6_addr_create_iid(struct net_in6_addr *addr, struct net_linkaddr *lladdr) { (void)net_ipv6_addr_generate_iid(NULL, NULL, NULL, 0, 0, addr, lladdr); @@ -1752,7 +1829,7 @@ static inline bool net_ipv6_addr_based_on_ll_raw(const uint8_t *addr, * * @return True if it is, False otherwise */ -static inline bool net_ipv6_addr_based_on_ll(const struct in6_addr *addr, +static inline bool net_ipv6_addr_based_on_ll(const struct net_in6_addr *addr, const struct net_linkaddr *lladdr) { if (addr == NULL || lladdr == NULL) { @@ -1763,46 +1840,46 @@ static inline bool net_ipv6_addr_based_on_ll(const struct in6_addr *addr, } /** - * @brief Get sockaddr from sockaddr_storage. This is a helper so that + * @brief Get net_sockaddr from net_sockaddr_storage. This is a helper so that * the code calling this function can be made shorter. * * @param addr Socket storage address * * @return Pointer to socket address (struct sockaddr) */ -static inline struct sockaddr *net_sad(const struct sockaddr_storage *addr) +static inline struct net_sockaddr *net_sad(const struct net_sockaddr_storage *addr) { - return (struct sockaddr *)addr; + return (struct net_sockaddr *)addr; } /** - * @brief Get sockaddr_in6 from sockaddr. This is a helper so that + * @brief Get net_sockaddr_in6 from net_sockaddr. This is a helper so that * the code calling this function can be made shorter. * * @param addr Socket address * * @return Pointer to IPv6 socket address */ -static inline struct sockaddr_in6 *net_sin6(const struct sockaddr *addr) +static inline struct net_sockaddr_in6 *net_sin6(const struct net_sockaddr *addr) { - return (struct sockaddr_in6 *)addr; + return (struct net_sockaddr_in6 *)addr; } /** - * @brief Get sockaddr_in from sockaddr. This is a helper so that + * @brief Get net_sockaddr_in from net_sockaddr. This is a helper so that * the code calling this function can be made shorter. * * @param addr Socket address * * @return Pointer to IPv4 socket address */ -static inline struct sockaddr_in *net_sin(const struct sockaddr *addr) +static inline struct net_sockaddr_in *net_sin(const struct net_sockaddr *addr) { - return (struct sockaddr_in *)addr; + return (struct net_sockaddr_in *)addr; } /** - * @brief Get sockaddr_in6_ptr from sockaddr_ptr. This is a helper so that + * @brief Get net_sockaddr_in6_ptr from net_sockaddr_ptr. This is a helper so that * the code calling this function can be made shorter. * * @param addr Socket address @@ -1810,13 +1887,13 @@ static inline struct sockaddr_in *net_sin(const struct sockaddr *addr) * @return Pointer to IPv6 socket address */ static inline -struct sockaddr_in6_ptr *net_sin6_ptr(const struct sockaddr_ptr *addr) +struct net_sockaddr_in6_ptr *net_sin6_ptr(const struct net_sockaddr_ptr *addr) { - return (struct sockaddr_in6_ptr *)addr; + return (struct net_sockaddr_in6_ptr *)addr; } /** - * @brief Get sockaddr_in_ptr from sockaddr_ptr. This is a helper so that + * @brief Get net_sockaddr_in_ptr from sockaddr_ptr. This is a helper so that * the code calling this function can be made shorter. * * @param addr Socket address @@ -1824,13 +1901,13 @@ struct sockaddr_in6_ptr *net_sin6_ptr(const struct sockaddr_ptr *addr) * @return Pointer to IPv4 socket address */ static inline -struct sockaddr_in_ptr *net_sin_ptr(const struct sockaddr_ptr *addr) +struct net_sockaddr_in_ptr *net_sin_ptr(const struct net_sockaddr_ptr *addr) { - return (struct sockaddr_in_ptr *)addr; + return (struct net_sockaddr_in_ptr *)addr; } /** - * @brief Get sockaddr_ll_ptr from sockaddr_ptr. This is a helper so that + * @brief Get net_sockaddr_ll_ptr from sockaddr_ptr. This is a helper so that * the code calling this function can be made shorter. * * @param addr Socket address @@ -1838,13 +1915,13 @@ struct sockaddr_in_ptr *net_sin_ptr(const struct sockaddr_ptr *addr) * @return Pointer to linklayer socket address */ static inline -struct sockaddr_ll_ptr *net_sll_ptr(const struct sockaddr_ptr *addr) +struct net_sockaddr_ll_ptr *net_sll_ptr(const struct net_sockaddr_ptr *addr) { - return (struct sockaddr_ll_ptr *)addr; + return (struct net_sockaddr_ll_ptr *)addr; } /** - * @brief Get sockaddr_can_ptr from sockaddr_ptr. This is a helper so that + * @brief Get net_sockaddr_can_ptr from net_sockaddr_ptr. This is a helper so that * the code needing this functionality can be made shorter. * * @param addr Socket address @@ -1852,64 +1929,64 @@ struct sockaddr_ll_ptr *net_sll_ptr(const struct sockaddr_ptr *addr) * @return Pointer to CAN socket address */ static inline -struct sockaddr_can_ptr *net_can_ptr(const struct sockaddr_ptr *addr) +struct net_sockaddr_can_ptr *net_can_ptr(const struct net_sockaddr_ptr *addr) { - return (struct sockaddr_can_ptr *)addr; + return (struct net_sockaddr_can_ptr *)addr; } /** * @brief Convert a string to IP address. * - * @param family IP address family (AF_INET or AF_INET6) + * @param family IP address family (NET_AF_INET or NET_AF_INET6) * @param src IP address in a null terminated string - * @param dst Pointer to struct in_addr if family is AF_INET or - * pointer to struct in6_addr if family is AF_INET6 + * @param dst Pointer to struct net_in_addr if family is NET_AF_INET or + * pointer to struct net_in6_addr if family is NET_AF_INET6 * * @note This function doesn't do precise error checking, * do not use for untrusted strings. * * @return 0 if ok, < 0 if error */ -__syscall int net_addr_pton(sa_family_t family, const char *src, void *dst); +__syscall int net_addr_pton(net_sa_family_t family, const char *src, void *dst); /** * @brief Convert IP address to string form. * - * @param family IP address family (AF_INET or AF_INET6) - * @param src Pointer to struct in_addr if family is AF_INET or - * pointer to struct in6_addr if family is AF_INET6 + * @param family IP address family (NET_AF_INET or NET_AF_INET6) + * @param src Pointer to struct net_in_addr if family is NET_AF_INET or + * pointer to struct net_in6_addr if family is NET_AF_INET6 * @param dst Buffer for IP address as a null terminated string * @param size Number of bytes available in the buffer * * @return dst pointer if ok, NULL if error */ -__syscall char *net_addr_ntop(sa_family_t family, const void *src, +__syscall char *net_addr_ntop(net_sa_family_t family, const void *src, char *dst, size_t size); /** * @brief Create netmask from mask length. * - * @param family IP address family (AF_INET or AF_INET6) + * @param family IP address family (NET_AF_INET or NET_AF_INET6) * @param mask_len Netmask length (in IPv4) or prefix length (in IPv6) - * @param mask Pointer to struct sockaddr_in if family is AF_INET or - * pointer to struct sockaddr_in6 if family is AF_INET6 + * @param mask Pointer to struct sockaddr_in if family is NET_AF_INET or + * pointer to struct sockaddr_in6 if family is NET_AF_INET6 * * @return 0 if ok, < 0 if error */ -int net_mask_len_to_netmask(sa_family_t family, uint8_t mask_len, - struct sockaddr *mask); +int net_mask_len_to_netmask(net_sa_family_t family, uint8_t mask_len, + struct net_sockaddr *mask); /** * @brief Create mask length from netmask. * - * @param family IP address family (AF_INET or AF_INET6) - * @param mask Pointer to struct sockaddr_in if family is AF_INET or - * pointer to struct sockaddr_in6 if family is AF_INET6 + * @param family IP address family (NET_AF_INET or NET_AF_INET6) + * @param mask Pointer to struct sockaddr_in if family is NET_AF_INET or + * pointer to struct sockaddr_in6 if family is NET_AF_INET6 * @param mask_len Netmask length (in IPv4) or prefix length (in IPv6) * * @return 0 if ok, < 0 if error */ -int net_netmask_to_mask_len(sa_family_t family, struct sockaddr *mask, +int net_netmask_to_mask_len(net_sa_family_t family, struct net_sockaddr *mask, uint8_t *mask_len); /** @@ -1934,7 +2011,7 @@ int net_netmask_to_mask_len(sa_family_t family, struct sockaddr *mask, * @return True if parsing could be done, false otherwise. */ bool net_ipaddr_parse(const char *str, size_t str_len, - struct sockaddr *addr); + struct net_sockaddr *addr); /** * @brief Parse a string that contains either IPv4 or IPv6 address @@ -1964,7 +2041,7 @@ bool net_ipaddr_parse(const char *str, size_t str_len, * All other values point to next character after the "," or " " in the string. */ const char *net_ipaddr_parse_mask(const char *str, size_t str_len, - struct sockaddr *addr, uint8_t *mask_len); + struct net_sockaddr *addr, uint8_t *mask_len); /** * @brief Set the default port in the sockaddr structure. @@ -1975,7 +2052,7 @@ const char *net_ipaddr_parse_mask(const char *str, size_t str_len, * * @return 0 if ok, <0 if error */ -int net_port_set_default(struct sockaddr *addr, uint16_t default_port); +int net_port_set_default(struct net_sockaddr *addr, uint16_t default_port); /** * @brief Compare TCP sequence numbers. @@ -2092,7 +2169,7 @@ static inline uint8_t net_priority2vlan(enum net_priority priority) * * @return Network address family as a string, or NULL if family is unknown. */ -const char *net_family2str(sa_family_t family); +const char *net_family2str(net_sa_family_t family); /** * @brief Add IPv6 prefix as a privacy extension filter. @@ -2105,9 +2182,9 @@ const char *net_family2str(sa_family_t family); * @return 0 if ok, <0 if error */ #if defined(CONFIG_NET_IPV6_PE) -int net_ipv6_pe_add_filter(struct in6_addr *addr, bool is_denylist); +int net_ipv6_pe_add_filter(struct net_in6_addr *addr, bool is_denylist); #else -static inline int net_ipv6_pe_add_filter(struct in6_addr *addr, +static inline int net_ipv6_pe_add_filter(struct net_in6_addr *addr, bool is_denylist) { ARG_UNUSED(addr); @@ -2125,9 +2202,9 @@ static inline int net_ipv6_pe_add_filter(struct in6_addr *addr, * @return 0 if ok, <0 if error */ #if defined(CONFIG_NET_IPV6_PE) -int net_ipv6_pe_del_filter(struct in6_addr *addr); +int net_ipv6_pe_del_filter(struct net_in6_addr *addr); #else -static inline int net_ipv6_pe_del_filter(struct in6_addr *addr) +static inline int net_ipv6_pe_del_filter(struct net_in6_addr *addr) { ARG_UNUSED(addr); @@ -2141,9 +2218,14 @@ static inline int net_ipv6_pe_del_filter(struct in6_addr *addr) #include +#if defined(CONFIG_NET_NAMESPACE_COMPAT_MODE) +#define ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS +#include +#undef ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS +#endif /* CONFIG_NET_NAMESPACE_COMPAT_MODE */ + /** * @} */ - #endif /* ZEPHYR_INCLUDE_NET_NET_IP_H_ */ diff --git a/include/zephyr/net/net_offload.h b/include/zephyr/net/net_offload.h index f1752672aec62..ce94340e0750b 100644 --- a/include/zephyr/net/net_offload.h +++ b/include/zephyr/net/net_offload.h @@ -53,7 +53,7 @@ struct net_offload { /** * This function is called when the socket is to be opened. */ - int (*get)(sa_family_t family, + int (*get)(net_sa_family_t family, enum net_sock_type type, enum net_ip_protocol ip_proto, struct net_context **context); @@ -62,8 +62,8 @@ struct net_offload { * This function is called when user wants to bind to local IP address. */ int (*bind)(struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen); + const struct net_sockaddr *addr, + net_socklen_t addrlen); /** * This function is called when user wants to mark the socket @@ -76,8 +76,8 @@ struct net_offload { * to a peer host. */ int (*connect)(struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen, + const struct net_sockaddr *addr, + net_socklen_t addrlen, net_context_connect_cb_t cb, int32_t timeout, void *user_data); @@ -103,8 +103,8 @@ struct net_offload { * This function is called when user wants to send data to peer host. */ int (*sendto)(struct net_pkt *pkt, - const struct sockaddr *dst_addr, - socklen_t addrlen, + const struct net_sockaddr *dst_addr, + net_socklen_t addrlen, net_context_send_cb_t cb, int32_t timeout, void *user_data); @@ -134,15 +134,15 @@ struct net_offload { * * @param iface Network interface where the offloaded IP stack can be * reached. - * @param family IP address family (AF_INET or AF_INET6) - * @param type Type of the socket, SOCK_STREAM or SOCK_DGRAM - * @param ip_proto IP protocol, IPPROTO_UDP or IPPROTO_TCP + * @param family IP address family (NET_AF_INET or NET_AF_INET6) + * @param type Type of the socket, NET_SOCK_STREAM or NET_SOCK_DGRAM + * @param ip_proto IP protocol, NET_IPPROTO_UDP or NET_IPPROTO_TCP * @param context The allocated context is returned to the caller. * * @return 0 if ok, < 0 if error */ static inline int net_offload_get(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, enum net_sock_type type, enum net_ip_protocol ip_proto, struct net_context **context) @@ -169,8 +169,8 @@ static inline int net_offload_get(struct net_if *iface, */ static inline int net_offload_bind(struct net_if *iface, struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen) + const struct net_sockaddr *addr, + net_socklen_t addrlen) { NET_ASSERT(iface); NET_ASSERT(net_if_offload(iface)); @@ -210,7 +210,7 @@ static inline int net_offload_listen(struct net_if *iface, * connection is established, the user-supplied callback (cb) * is executed. cb is called even if the timeout was set to * K_FOREVER. cb is not called if the timeout expires. - * For datagram sockets (SOCK_DGRAM), this function only sets + * For datagram sockets (NET_SOCK_DGRAM), this function only sets * the peer address. * This function is similar to the BSD connect() function. * @@ -233,8 +233,8 @@ static inline int net_offload_listen(struct net_if *iface, */ static inline int net_offload_connect(struct net_if *iface, struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen, + const struct net_sockaddr *addr, + net_socklen_t addrlen, net_context_connect_cb_t cb, k_timeout_t timeout, void *user_data) @@ -303,7 +303,7 @@ static inline int net_offload_accept(struct net_if *iface, * a caller-supplied callback is called. The callback is called even * if timeout was set to K_FOREVER, the callback is called * before this function will return in this case. The callback is not - * called if the timeout expires. For context of type SOCK_DGRAM, + * called if the timeout expires. For context of type NET_SOCK_DGRAM, * the destination address must have been set by the call to * net_context_connect(). * This is similar as BSD send() function. @@ -339,7 +339,7 @@ static inline int net_offload_send(struct net_if *iface, * * @details This function can be used to send network data to a peer * specified by address. This variant can only be used for datagram - * connections of type SOCK_DGRAM. This function will return immediately + * connections of type NET_SOCK_DGRAM. This function will return immediately * if the timeout is set to K_NO_WAIT. If the timeout is set to K_FOREVER, * the function will wait until the network packet is sent. Timeout * value > 0 will wait as many ms. After the network packet @@ -364,8 +364,8 @@ static inline int net_offload_send(struct net_if *iface, */ static inline int net_offload_sendto(struct net_if *iface, struct net_pkt *pkt, - const struct sockaddr *dst_addr, - socklen_t addrlen, + const struct net_sockaddr *dst_addr, + net_socklen_t addrlen, net_context_send_cb_t cb, k_timeout_t timeout, void *user_data) @@ -457,7 +457,7 @@ static inline int net_offload_put(struct net_if *iface, /** @cond INTERNAL_HIDDEN */ static inline int net_offload_get(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, enum net_sock_type type, enum net_ip_protocol ip_proto, struct net_context **context) @@ -467,8 +467,8 @@ static inline int net_offload_get(struct net_if *iface, static inline int net_offload_bind(struct net_if *iface, struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen) + const struct net_sockaddr *addr, + net_socklen_t addrlen) { return 0; } @@ -482,8 +482,8 @@ static inline int net_offload_listen(struct net_if *iface, static inline int net_offload_connect(struct net_if *iface, struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen, + const struct net_sockaddr *addr, + net_socklen_t addrlen, net_context_connect_cb_t cb, k_timeout_t timeout, void *user_data) @@ -511,8 +511,8 @@ static inline int net_offload_send(struct net_if *iface, static inline int net_offload_sendto(struct net_if *iface, struct net_pkt *pkt, - const struct sockaddr *dst_addr, - socklen_t addrlen, + const struct net_sockaddr *dst_addr, + net_socklen_t addrlen, net_context_send_cb_t cb, k_timeout_t timeout, void *user_data) diff --git a/include/zephyr/net/net_pkt.h b/include/zephyr/net/net_pkt.h index 617f22470a690..45f54f41183fb 100644 --- a/include/zephyr/net/net_pkt.h +++ b/include/zephyr/net/net_pkt.h @@ -213,13 +213,13 @@ struct net_pkt { uint8_t ipv4_acd_arp_msg : 1; /* Is this pkt IPv4 conflict detection ARP * message. * Note: family needs to be - * AF_INET. + * NET_AF_INET. */ #endif #if defined(CONFIG_NET_LLDP) uint8_t lldp_pkt : 1; /* Is this pkt an LLDP message. * Note: family needs to be - * AF_UNSPEC. + * NET_AF_UNSPEC. */ #endif uint8_t ppp_msg : 1; /* This is a PPP message */ @@ -341,13 +341,13 @@ struct net_pkt { * have network tunneling in use. */ union { - struct sockaddr remote; + struct net_sockaddr remote; /* This will make sure that there is enough storage to store * the address struct. The access to value is via remote * address. */ - struct sockaddr_storage remote_storage; + struct net_sockaddr_storage remote_storage; }; #endif /* CONFIG_NET_OFFLOAD */ @@ -1484,7 +1484,7 @@ static inline void net_pkt_set_src_ipv6_addr(struct net_pkt *pkt) { net_if_ipv6_select_src_addr(net_context_get_iface( net_pkt_context(pkt)), - (struct in6_addr *)NET_IPV6_HDR(pkt)->src); + (struct net_in6_addr *)NET_IPV6_HDR(pkt)->src); } static inline void net_pkt_set_overwrite(struct net_pkt *pkt, bool overwrite) @@ -1552,14 +1552,14 @@ static inline bool net_pkt_filter_local_in_recv_ok(struct net_pkt *pkt) #endif /* CONFIG_NET_PKT_FILTER && CONFIG_NET_PKT_FILTER_LOCAL_IN_HOOK */ #if defined(CONFIG_NET_OFFLOAD) || defined(CONFIG_NET_L2_IPIP) -static inline struct sockaddr *net_pkt_remote_address(struct net_pkt *pkt) +static inline struct net_sockaddr *net_pkt_remote_address(struct net_pkt *pkt) { return &pkt->remote; } static inline void net_pkt_set_remote_address(struct net_pkt *pkt, - struct sockaddr *address, - socklen_t len) + struct net_sockaddr *address, + net_socklen_t len) { memcpy(&pkt->remote, address, len); } @@ -1957,7 +1957,7 @@ int net_pkt_alloc_buffer_raw_debug(struct net_pkt *pkt, size_t size, struct net_pkt *net_pkt_alloc_with_buffer_debug(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout, const char *caller, @@ -1970,7 +1970,7 @@ struct net_pkt *net_pkt_alloc_with_buffer_debug(struct net_if *iface, struct net_pkt *net_pkt_rx_alloc_with_buffer_debug(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout, const char *caller, @@ -2142,7 +2142,7 @@ int net_pkt_alloc_buffer_raw(struct net_pkt *pkt, size_t size, */ struct net_pkt *net_pkt_alloc_with_buffer(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout); @@ -2151,7 +2151,7 @@ struct net_pkt *net_pkt_alloc_with_buffer(struct net_if *iface, /* Same as above but specifically for RX packet */ struct net_pkt *net_pkt_rx_alloc_with_buffer(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout); @@ -2478,7 +2478,7 @@ static inline int net_pkt_write_u8(struct net_pkt *pkt, uint8_t data) */ static inline int net_pkt_write_be16(struct net_pkt *pkt, uint16_t data) { - uint16_t data_be16 = htons(data); + uint16_t data_be16 = net_htons(data); return net_pkt_write(pkt, &data_be16, sizeof(uint16_t)); } @@ -2497,7 +2497,7 @@ static inline int net_pkt_write_be16(struct net_pkt *pkt, uint16_t data) */ static inline int net_pkt_write_be32(struct net_pkt *pkt, uint32_t data) { - uint32_t data_be32 = htonl(data); + uint32_t data_be32 = net_htonl(data); return net_pkt_write(pkt, &data_be32, sizeof(uint32_t)); } diff --git a/include/zephyr/net/net_pkt_filter.h b/include/zephyr/net/net_pkt_filter.h index 44c43c3d52bdd..73e65f67b756a 100644 --- a/include/zephyr/net/net_pkt_filter.h +++ b/include/zephyr/net/net_pkt_filter.h @@ -419,10 +419,10 @@ extern npf_test_fn_t npf_ip_src_addr_unmatch; * addresses contained in the provided set. * * @param _name Name of the condition - * @param _ip_addr_array Array of struct in_addr or struct in6_addr items to test - *against + * @param _ip_addr_array Array of struct net_in_addr or + * struct net_in6_addr items to test against * @param _ip_addr_num number of IP addresses in the array - * @param _af Addresses family type (AF_INET / AF_INET6) in the array + * @param _af Addresses family type (NET_AF_INET / NET_AF_INET6) in the array */ #define NPF_IP_SRC_ADDR_ALLOWLIST(_name, _ip_addr_array, _ip_addr_num, _af) \ struct npf_test_ip _name = { \ @@ -442,10 +442,10 @@ extern npf_test_fn_t npf_ip_src_addr_unmatch; * addresses contained in the provided set. * * @param _name Name of the condition - * @param _ip_addr_array Array of struct in_addr or struct in6_addr items to test - *against + * @param _ip_addr_array Array of struct net_in_addr or + * struct net_in6_addr items to test against * @param _ip_addr_num number of IP addresses in the array - * @param _af Addresses family type (AF_INET / AF_INET6) in the array + * @param _af Addresses family type (NET_AF_INET / NET_AF_INET6) in the array */ #define NPF_IP_SRC_ADDR_BLOCKLIST(_name, _ip_addr_array, _ip_addr_num, _af) \ struct npf_test_ip _name = { \ @@ -628,7 +628,7 @@ extern npf_test_fn_t npf_eth_vlan_type_unmatch; */ #define NPF_ETH_TYPE_MATCH(_name, _type) \ struct npf_test_eth_type _name = { \ - .type = htons(_type), \ + .type = net_htons(_type), \ .test.fn = npf_eth_type_match, \ IF_ENABLED(NPF_TEST_ENABLE_NAME, \ (.test.name = "eth type", \ @@ -643,7 +643,7 @@ extern npf_test_fn_t npf_eth_vlan_type_unmatch; */ #define NPF_ETH_TYPE_UNMATCH(_name, _type) \ struct npf_test_eth_type _name = { \ - .type = htons(_type), \ + .type = net_htons(_type), \ .test.fn = npf_eth_type_unmatch, \ IF_ENABLED(NPF_TEST_ENABLE_NAME, \ (.test.name = "!eth type", \ @@ -659,7 +659,7 @@ extern npf_test_fn_t npf_eth_vlan_type_unmatch; */ #define NPF_ETH_VLAN_TYPE_MATCH(_name, _type) \ struct npf_test_eth_type _name = { \ - .type = htons(_type), \ + .type = net_htons(_type), \ .test.fn = npf_eth_vlan_type_match, \ IF_ENABLED(NPF_TEST_ENABLE_NAME, \ (.test.name = "eth vlan type", \ @@ -675,7 +675,7 @@ extern npf_test_fn_t npf_eth_vlan_type_unmatch; */ #define NPF_ETH_VLAN_TYPE_UNMATCH(_name, _type) \ struct npf_test_eth_type _name = { \ - .type = htons(_type), \ + .type = net_htons(_type), \ .test.fn = npf_eth_vlan_type_unmatch, \ IF_ENABLED(NPF_TEST_ENABLE_NAME, \ (.test.name = "!eth vlan type", \ diff --git a/include/zephyr/net/ocpp.h b/include/zephyr/net/ocpp.h index e205097cdf321..9c7b9df3e131f 100644 --- a/include/zephyr/net/ocpp.h +++ b/include/zephyr/net/ocpp.h @@ -146,7 +146,7 @@ struct ocpp_cs_info { char *cs_ip; /**< Central system IP address */ char *ws_url; /**< Websocket url exclude ipaddr & port */ int port; /**< Central system port number */ - sa_family_t sa_family; /**< IP protocol family type 4/6 */ + net_sa_family_t sa_family; /**< IP protocol family type 4/6 */ }; /** @brief Parameters opaque session handle for ocpp_* API */ diff --git a/include/zephyr/net/ppp.h b/include/zephyr/net/ppp.h index e992a7512bd69..156625b42c728 100644 --- a/include/zephyr/net/ppp.h +++ b/include/zephyr/net/ppp.h @@ -390,13 +390,13 @@ struct lcp_options { /** IPv4 control protocol options */ struct ipcp_options { /** IPv4 address */ - struct in_addr address; + struct net_in_addr address; /** Primary DNS server address */ - struct in_addr dns1_address; + struct net_in_addr dns1_address; /** Secondary DNS server address */ - struct in_addr dns2_address; + struct net_in_addr dns2_address; }; /** IPv6 control protocol options */ diff --git a/include/zephyr/net/sntp.h b/include/zephyr/net/sntp.h index 6b4f1456db3b9..cab73877f89c6 100644 --- a/include/zephyr/net/sntp.h +++ b/include/zephyr/net/sntp.h @@ -66,8 +66,8 @@ struct sntp_ctx { * * @return 0 if ok, <0 if error. */ -int sntp_init(struct sntp_ctx *ctx, struct sockaddr *addr, - socklen_t addr_len); +int sntp_init(struct sntp_ctx *ctx, struct net_sockaddr *addr, + net_socklen_t addr_len); /** * @brief Perform SNTP query @@ -112,7 +112,7 @@ void sntp_close(struct sntp_ctx *ctx); * * @return 0 if ok, <0 if error. */ -int sntp_init_async(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len, +int sntp_init_async(struct sntp_ctx *ctx, struct net_sockaddr *addr, net_socklen_t addr_len, const struct net_socket_service_desc *service); /** @@ -176,7 +176,7 @@ int sntp_simple(const char *server, uint32_t timeout, * * @return 0 if ok, <0 if error (-ETIMEDOUT if timeout). */ -int sntp_simple_addr(struct sockaddr *addr, socklen_t addr_len, uint32_t timeout, +int sntp_simple_addr(struct net_sockaddr *addr, net_socklen_t addr_len, uint32_t timeout, struct sntp_time *ts); #ifdef __cplusplus diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h index 7bad851f23820..f21a7fd764cc6 100644 --- a/include/zephyr/net/socket.h +++ b/include/zephyr/net/socket.h @@ -110,29 +110,29 @@ extern "C" { /** Protocol level for TLS. * Here, the same socket protocol level for TLS as in Linux was used. */ -#define SOL_TLS 282 +#define ZSOCK_SOL_TLS 282 /** Socket option to select TLS credentials to use. It accepts and returns an * array of sec_tag_t that indicate which TLS credentials should be used with * specific socket. */ -#define TLS_SEC_TAG_LIST 1 +#define ZSOCK_TLS_SEC_TAG_LIST 1 /** Write-only socket option to set hostname. It accepts a string containing * the hostname (may be NULL to disable hostname verification). By default, * hostname check is enforced for TLS clients. */ -#define TLS_HOSTNAME 2 +#define ZSOCK_TLS_HOSTNAME 2 /** Socket option to select ciphersuites to use. It accepts and returns an array * of integers with IANA assigned ciphersuite identifiers. * If not set, socket will allow all ciphersuites available in the system * (mbedTLS default behavior). */ -#define TLS_CIPHERSUITE_LIST 3 +#define ZSOCK_TLS_CIPHERSUITE_LIST 3 /** Read-only socket option to read a ciphersuite chosen during TLS handshake. * It returns an integer containing an IANA assigned ciphersuite identifier * of chosen ciphersuite. */ -#define TLS_CIPHERSUITE_USED 4 +#define ZSOCK_TLS_CIPHERSUITE_USED 4 /** Write-only socket option to set peer verification level for TLS connection. * This option accepts an integer with a peer verification level, compatible * with mbedTLS values: @@ -143,7 +143,7 @@ extern "C" { * If not set, socket will use mbedTLS defaults (none for servers, required * for clients). */ -#define TLS_PEER_VERIFY 5 +#define ZSOCK_TLS_PEER_VERIFY 5 /** Write-only socket option to set role for DTLS connection. This option * is irrelevant for TLS connections, as for them role is selected based on * connect()/listen() usage. By default, DTLS will assume client role. @@ -152,30 +152,30 @@ extern "C" { * - 0 - client * - 1 - server */ -#define TLS_DTLS_ROLE 6 +#define ZSOCK_TLS_DTLS_ROLE 6 /** Socket option for setting the supported Application Layer Protocols. * It accepts and returns a const char array of NULL terminated strings * representing the supported application layer protocols listed during * the TLS handshake. */ -#define TLS_ALPN_LIST 7 +#define ZSOCK_TLS_ALPN_LIST 7 /** Socket option to set DTLS min handshake timeout. The timeout starts at min, * and upon retransmission the timeout is doubled util max is reached. * Min and max arguments are separate options. The time unit is ms. */ -#define TLS_DTLS_HANDSHAKE_TIMEOUT_MIN 8 +#define ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MIN 8 /** Socket option to set DTLS max handshake timeout. The timeout starts at min, * and upon retransmission the timeout is doubled util max is reached. * Min and max arguments are separate options. The time unit is ms. */ -#define TLS_DTLS_HANDSHAKE_TIMEOUT_MAX 9 +#define ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MAX 9 /** Socket option for preventing certificates from being copied to the mbedTLS * heap if possible. The option is only effective for DER certificates and is * ignored for PEM certificates. */ -#define TLS_CERT_NOCOPY 10 +#define ZSOCK_TLS_CERT_NOCOPY 10 /** TLS socket option to use with offloading. The option instructs the network * stack only to offload underlying TCP/UDP communication. The TLS/DTLS * operation is handled by a native TLS/DTLS socket implementation from Zephyr. @@ -186,16 +186,16 @@ extern "C" { * socket. After that, the application may use SO_BINDTODEVICE to choose the * dedicated network interface for the underlying TCP/UDP socket. */ -#define TLS_NATIVE 11 +#define ZSOCK_TLS_NATIVE 11 /** Socket option to control TLS session caching on a socket. Accepted values: * - 0 - Disabled. * - 1 - Enabled. */ -#define TLS_SESSION_CACHE 12 +#define ZSOCK_TLS_SESSION_CACHE 12 /** Write-only socket option to purge session cache immediately. * This option accepts any value. */ -#define TLS_SESSION_CACHE_PURGE 13 +#define ZSOCK_TLS_SESSION_CACHE_PURGE 13 /** Write-only socket option to control DTLS CID. * The option accepts an integer, indicating the setting. * Accepted values for the option are: 0, 1 and 2. @@ -207,7 +207,7 @@ extern "C" { * TLS_DTLS_CID_VALUE will be sent to the peer. Otherwise, a random value * will be used. */ -#define TLS_DTLS_CID 14 +#define ZSOCK_TLS_DTLS_CID 14 /** Read-only socket option to get DTLS CID status. * The option accepts a pointer to an integer, indicating the setting upon * return. @@ -217,19 +217,19 @@ extern "C" { * - 2 - DTLS CID is sent to the uplink. * - 3 - DTLS CID is used in both directions. */ -#define TLS_DTLS_CID_STATUS 15 +#define ZSOCK_TLS_DTLS_CID_STATUS 15 /** Socket option to set or get the value of the DTLS connection ID to be * used for the DTLS session. * The option accepts a byte array, holding the CID value. */ -#define TLS_DTLS_CID_VALUE 16 +#define ZSOCK_TLS_DTLS_CID_VALUE 16 /** Read-only socket option to get the value of the DTLS connection ID * received from the peer. * The option accepts a pointer to a byte array, holding the CID value upon * return. The optlen returned will be 0 if the peer did not provide a * connection ID, otherwise will contain the length of the CID value. */ -#define TLS_DTLS_PEER_CID_VALUE 17 +#define ZSOCK_TLS_DTLS_PEER_CID_VALUE 17 /** Socket option to configure DTLS socket behavior on connect(). * If set, DTLS connect() will execute the handshake with the configured peer. * This is the default behavior. @@ -237,7 +237,7 @@ extern "C" { * UDP socket) and will not attempt to execute DTLS handshake. The handshake * will take place in consecutive send()/recv() call. */ -#define TLS_DTLS_HANDSHAKE_ON_CONNECT 18 +#define ZSOCK_TLS_DTLS_HANDSHAKE_ON_CONNECT 18 /** Read-only socket option to obtain the result of the certificate verification * from the most recent handshake if TLS_PEER_VERIFY_OPTIONAL was set on the * socket. @@ -247,9 +247,9 @@ extern "C" { * flags. For mbed TLS backend, the flags are defined in "X509 Verify codes" * section of x509.h header. */ -#define TLS_CERT_VERIFY_RESULT 19 +#define ZSOCK_TLS_CERT_VERIFY_RESULT 19 /** Write-only socket option to configure a certificate verification callback for - * the socket. The option accepts a pointer to a @ref tls_cert_verify_cb + * the socket. The option accepts a pointer to a @ref zsock_tls_cert_verify_cb * structure, which contains pointers to the actual callback function and * application-defined context. * @@ -260,38 +260,38 @@ extern "C" { * The option is only available if CONFIG_NET_SOCKETS_TLS_CERT_VERIFY_CALLBACK * Kconfig option is enabled. */ -#define TLS_CERT_VERIFY_CALLBACK 20 +#define ZSOCK_TLS_CERT_VERIFY_CALLBACK 20 /* Valid values for @ref TLS_PEER_VERIFY option */ -#define TLS_PEER_VERIFY_NONE 0 /**< Peer verification disabled. */ -#define TLS_PEER_VERIFY_OPTIONAL 1 /**< Peer verification optional. */ -#define TLS_PEER_VERIFY_REQUIRED 2 /**< Peer verification required. */ +#define ZSOCK_TLS_PEER_VERIFY_NONE 0 /**< Peer verification disabled. */ +#define ZSOCK_TLS_PEER_VERIFY_OPTIONAL 1 /**< Peer verification optional. */ +#define ZSOCK_TLS_PEER_VERIFY_REQUIRED 2 /**< Peer verification required. */ /* Valid values for @ref TLS_DTLS_ROLE option */ -#define TLS_DTLS_ROLE_CLIENT 0 /**< Client role in a DTLS session. */ -#define TLS_DTLS_ROLE_SERVER 1 /**< Server role in a DTLS session. */ +#define ZSOCK_TLS_DTLS_ROLE_CLIENT 0 /**< Client role in a DTLS session. */ +#define ZSOCK_TLS_DTLS_ROLE_SERVER 1 /**< Server role in a DTLS session. */ /* Valid values for @ref TLS_CERT_NOCOPY option */ -#define TLS_CERT_NOCOPY_NONE 0 /**< Cert duplicated in heap */ -#define TLS_CERT_NOCOPY_OPTIONAL 1 /**< Cert not copied in heap if DER */ +#define ZSOCK_TLS_CERT_NOCOPY_NONE 0 /**< Cert duplicated in heap */ +#define ZSOCK_TLS_CERT_NOCOPY_OPTIONAL 1 /**< Cert not copied in heap if DER */ /* Valid values for @ref TLS_SESSION_CACHE option */ -#define TLS_SESSION_CACHE_DISABLED 0 /**< Disable TLS session caching. */ -#define TLS_SESSION_CACHE_ENABLED 1 /**< Enable TLS session caching. */ +#define ZSOCK_TLS_SESSION_CACHE_DISABLED 0 /**< Disable TLS session caching. */ +#define ZSOCK_TLS_SESSION_CACHE_ENABLED 1 /**< Enable TLS session caching. */ /* Valid values for @ref TLS_DTLS_CID (Connection ID) option */ -#define TLS_DTLS_CID_DISABLED 0 /**< CID is disabled */ -#define TLS_DTLS_CID_SUPPORTED 1 /**< CID is supported */ -#define TLS_DTLS_CID_ENABLED 2 /**< CID is enabled */ +#define ZSOCK_TLS_DTLS_CID_DISABLED 0 /**< CID is disabled */ +#define ZSOCK_TLS_DTLS_CID_SUPPORTED 1 /**< CID is supported */ +#define ZSOCK_TLS_DTLS_CID_ENABLED 2 /**< CID is enabled */ /* Valid values for @ref TLS_DTLS_CID_STATUS option */ -#define TLS_DTLS_CID_STATUS_DISABLED 0 /**< CID is disabled */ -#define TLS_DTLS_CID_STATUS_DOWNLINK 1 /**< CID is in use by us */ -#define TLS_DTLS_CID_STATUS_UPLINK 2 /**< CID is in use by peer */ -#define TLS_DTLS_CID_STATUS_BIDIRECTIONAL 3 /**< CID is in use by us and peer */ +#define ZSOCK_TLS_DTLS_CID_STATUS_DISABLED 0 /**< CID is disabled */ +#define ZSOCK_TLS_DTLS_CID_STATUS_DOWNLINK 1 /**< CID is in use by us */ +#define ZSOCK_TLS_DTLS_CID_STATUS_UPLINK 2 /**< CID is in use by peer */ +#define ZSOCK_TLS_DTLS_CID_STATUS_BIDIRECTIONAL 3 /**< CID is in use by us and peer */ -/** Data structure for @ref TLS_CERT_VERIFY_CALLBACK socket option. */ -struct tls_cert_verify_cb { +/** Data structure for @ref ZSOCK_TLS_CERT_VERIFY_CALLBACK socket option. */ +struct zsock_tls_cert_verify_cb { /** A pointer to the certificate verification callback function. * * The actual callback function type is defined by mbed TLS, see @@ -315,15 +315,15 @@ struct zsock_addrinfo { struct zsock_addrinfo *ai_next; /**< Pointer to next address entry */ int ai_flags; /**< Additional options */ int ai_family; /**< Address family of the returned addresses */ - int ai_socktype; /**< Socket type, for example SOCK_STREAM or SOCK_DGRAM */ + int ai_socktype; /**< Socket type, for example NET_SOCK_STREAM or NET_SOCK_DGRAM */ int ai_protocol; /**< Protocol for addresses, 0 means any protocol */ int ai_eflags; /**< Extended flags for special usage */ - socklen_t ai_addrlen; /**< Length of the socket address */ - struct sockaddr *ai_addr; /**< Pointer to the address */ + net_socklen_t ai_addrlen; /**< Length of the socket address */ + struct net_sockaddr *ai_addr; /**< Pointer to the address */ char *ai_canonname; /**< Optional official name of the host */ /** @cond INTERNAL_HIDDEN */ - struct sockaddr _ai_addr; + struct net_sockaddr _ai_addr; char _ai_canonname[DNS_MAX_NAME_SIZE + 1]; /** @endcond */ }; @@ -429,8 +429,8 @@ __syscall int zsock_shutdown(int sock, int how); * This function is also exposed as `bind()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall int zsock_bind(int sock, const struct sockaddr *addr, - socklen_t addrlen); +__syscall int zsock_bind(int sock, const struct net_sockaddr *addr, + net_socklen_t addrlen); /** * @brief Connect a socket to a peer network address @@ -442,8 +442,8 @@ __syscall int zsock_bind(int sock, const struct sockaddr *addr, * This function is also exposed as `connect()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall int zsock_connect(int sock, const struct sockaddr *addr, - socklen_t addrlen); +__syscall int zsock_connect(int sock, const struct net_sockaddr *addr, + net_socklen_t addrlen); /** * @brief Set up a STREAM socket to accept peer connections @@ -467,7 +467,7 @@ __syscall int zsock_listen(int sock, int backlog); * This function is also exposed as `accept()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen); +__syscall int zsock_accept(int sock, struct net_sockaddr *addr, net_socklen_t *addrlen); /** * @brief Send data to an arbitrary network address @@ -480,8 +480,8 @@ __syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen); * if @kconfig{CONFIG_POSIX_API} is defined. */ __syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen); + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen); /** * @brief Send data to a connected peer @@ -509,7 +509,7 @@ static inline ssize_t zsock_send(int sock, const void *buf, size_t len, * This function is also exposed as `sendmsg()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg, +__syscall ssize_t zsock_sendmsg(int sock, const struct net_msghdr *msg, int flags); /** @@ -523,8 +523,8 @@ __syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg, * if @kconfig{CONFIG_POSIX_API} is defined. */ __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen); + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen); /** * @brief Receive a message from an arbitrary network address @@ -536,7 +536,7 @@ __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len, * This function is also exposed as `recvmsg()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall ssize_t zsock_recvmsg(int sock, struct msghdr *msg, int flags); +__syscall ssize_t zsock_recvmsg(int sock, struct net_msghdr *msg, int flags); /** * @brief Receive data from a connected peer @@ -652,7 +652,7 @@ static inline int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout) * if @kconfig{CONFIG_POSIX_API} is defined. */ __syscall int zsock_getsockopt(int sock, int level, int optname, - void *optval, socklen_t *optlen); + void *optval, net_socklen_t *optlen); /** * @brief Set various socket options @@ -668,7 +668,7 @@ __syscall int zsock_getsockopt(int sock, int level, int optname, * if @kconfig{CONFIG_POSIX_API} is defined. */ __syscall int zsock_setsockopt(int sock, int level, int optname, - const void *optval, socklen_t optlen); + const void *optval, net_socklen_t optlen); /** * @brief Get peer name @@ -680,8 +680,8 @@ __syscall int zsock_setsockopt(int sock, int level, int optname, * This function is also exposed as `getpeername()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall int zsock_getpeername(int sock, struct sockaddr *addr, - socklen_t *addrlen); +__syscall int zsock_getpeername(int sock, struct net_sockaddr *addr, + net_socklen_t *addrlen); /** * @brief Get socket name @@ -693,8 +693,8 @@ __syscall int zsock_getpeername(int sock, struct sockaddr *addr, * This function is also exposed as `getsockname()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall int zsock_getsockname(int sock, struct sockaddr *addr, - socklen_t *addrlen); +__syscall int zsock_getsockname(int sock, struct net_sockaddr *addr, + net_socklen_t *addrlen); /** * @brief Get local host name @@ -718,7 +718,7 @@ __syscall int zsock_gethostname(char *buf, size_t len); * This function is also exposed as `inet_ntop()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -static inline char *zsock_inet_ntop(sa_family_t family, const void *src, +static inline char *zsock_inet_ntop(net_sa_family_t family, const void *src, char *dst, size_t size) { return net_addr_ntop(family, src, dst, size); @@ -734,7 +734,7 @@ static inline char *zsock_inet_ntop(sa_family_t family, const void *src, * This function is also exposed as `inet_pton()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -__syscall int zsock_inet_pton(sa_family_t family, const char *src, void *dst); +__syscall int zsock_inet_pton(net_sa_family_t family, const char *src, void *dst); /** @cond INTERNAL_HIDDEN */ __syscall int z_zsock_getaddrinfo_internal(const char *host, @@ -750,21 +750,21 @@ __syscall int z_zsock_getaddrinfo_internal(const char *host, * @{ */ /** Address for bind() (vs for connect()) */ -#define AI_PASSIVE 0x1 +#define ZSOCK_AI_PASSIVE 0x1 /** Fill in ai_canonname */ -#define AI_CANONNAME 0x2 +#define ZSOCK_AI_CANONNAME 0x2 /** Assume host address is in numeric notation, don't DNS lookup */ -#define AI_NUMERICHOST 0x4 +#define ZSOCK_AI_NUMERICHOST 0x4 /** May return IPv4 mapped address for IPv6 */ -#define AI_V4MAPPED 0x8 +#define ZSOCK_AI_V4MAPPED 0x8 /** May return both native IPv6 and mapped IPv4 address for IPv6 */ -#define AI_ALL 0x10 +#define ZSOCK_AI_ALL 0x10 /** IPv4/IPv6 support depends on local system config */ -#define AI_ADDRCONFIG 0x20 +#define ZSOCK_AI_ADDRCONFIG 0x20 /** Assume service (port) is numeric */ -#define AI_NUMERICSERV 0x400 +#define ZSOCK_AI_NUMERICSERV 0x400 /** Extra flags present (see RFC 5014) */ -#define AI_EXTFLAGS 0x800 +#define ZSOCK_AI_EXTFLAGS 0x800 /** @} */ /** @@ -810,21 +810,21 @@ const char *zsock_gai_strerror(int errcode); * @{ */ /** zsock_getnameinfo(): Resolve to numeric address. */ -#define NI_NUMERICHOST 1 +#define ZSOCK_NI_NUMERICHOST 1 /** zsock_getnameinfo(): Resolve to numeric port number. */ -#define NI_NUMERICSERV 2 +#define ZSOCK_NI_NUMERICSERV 2 /** zsock_getnameinfo(): Return only hostname instead of FQDN */ -#define NI_NOFQDN 4 +#define ZSOCK_NI_NOFQDN 4 /** zsock_getnameinfo(): Dummy option for compatibility */ -#define NI_NAMEREQD 8 +#define ZSOCK_NI_NAMEREQD 8 /** zsock_getnameinfo(): Dummy option for compatibility */ -#define NI_DGRAM 16 +#define ZSOCK_NI_DGRAM 16 /* POSIX extensions */ /** zsock_getnameinfo(): Max supported hostname length */ -#ifndef NI_MAXHOST -#define NI_MAXHOST 64 +#ifndef ZSOCK_NI_MAXHOST +#define ZSOCK_NI_MAXHOST 64 #endif /** @} */ @@ -838,305 +838,237 @@ const char *zsock_gai_strerror(int errcode); * This function is also exposed as `getnameinfo()` * if @kconfig{CONFIG_POSIX_API} is defined. */ -int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen, - char *host, socklen_t hostlen, - char *serv, socklen_t servlen, int flags); +int zsock_getnameinfo(const struct net_sockaddr *addr, net_socklen_t addrlen, + char *host, net_socklen_t hostlen, + char *serv, net_socklen_t servlen, int flags); /** - * @name Network interface name description - * @{ - */ -/** Network interface name length */ -#if defined(CONFIG_NET_INTERFACE_NAME) -#define IFNAMSIZ CONFIG_NET_INTERFACE_NAME_LEN -#else -#define IFNAMSIZ Z_DEVICE_MAX_NAME_LEN -#endif - -/** Interface description structure */ -struct ifreq { - char ifr_name[IFNAMSIZ]; /**< Network interface name */ -}; -/** @} */ - -/** - * @name Socket level options (SOL_SOCKET) + * @name Socket level options (ZSOCK_SOL_SOCKET) * @{ */ /** Socket-level option */ -#define SOL_SOCKET 1 +#define ZSOCK_SOL_SOCKET 1 /* Socket options for SOL_SOCKET level */ /** Recording debugging information (ignored, for compatibility) */ -#define SO_DEBUG 1 +#define ZSOCK_SO_DEBUG 1 /** address reuse */ -#define SO_REUSEADDR 2 +#define ZSOCK_SO_REUSEADDR 2 /** Type of the socket */ -#define SO_TYPE 3 +#define ZSOCK_SO_TYPE 3 /** Async error */ -#define SO_ERROR 4 +#define ZSOCK_SO_ERROR 4 /** Bypass normal routing and send directly to host (ignored, for compatibility) */ -#define SO_DONTROUTE 5 +#define ZSOCK_SO_DONTROUTE 5 /** Transmission of broadcast messages is supported (ignored, for compatibility) */ -#define SO_BROADCAST 6 +#define ZSOCK_SO_BROADCAST 6 /** Size of socket send buffer */ -#define SO_SNDBUF 7 +#define ZSOCK_SO_SNDBUF 7 /** Size of socket recv buffer */ -#define SO_RCVBUF 8 +#define ZSOCK_SO_RCVBUF 8 /** Enable sending keep-alive messages on connections */ -#define SO_KEEPALIVE 9 +#define ZSOCK_SO_KEEPALIVE 9 /** Place out-of-band data into receive stream (ignored, for compatibility) */ -#define SO_OOBINLINE 10 +#define ZSOCK_SO_OOBINLINE 10 /** Socket priority */ -#define SO_PRIORITY 12 +#define ZSOCK_SO_PRIORITY 12 /** Socket lingers on close (ignored, for compatibility) */ -#define SO_LINGER 13 +#define ZSOCK_SO_LINGER 13 /** Allow multiple sockets to reuse a single port */ -#define SO_REUSEPORT 15 +#define ZSOCK_SO_REUSEPORT 15 /** Receive low watermark (ignored, for compatibility) */ -#define SO_RCVLOWAT 18 +#define ZSOCK_SO_RCVLOWAT 18 /** Send low watermark (ignored, for compatibility) */ -#define SO_SNDLOWAT 19 +#define ZSOCK_SO_SNDLOWAT 19 /** * Receive timeout * Applies to receive functions like recv(), but not to connect() */ -#define SO_RCVTIMEO 20 +#define ZSOCK_SO_RCVTIMEO 20 /** Send timeout */ -#define SO_SNDTIMEO 21 +#define ZSOCK_SO_SNDTIMEO 21 /** Bind a socket to an interface */ -#define SO_BINDTODEVICE 25 +#define ZSOCK_SO_BINDTODEVICE 25 /** Socket accepts incoming connections (ignored, for compatibility) */ -#define SO_ACCEPTCONN 30 +#define ZSOCK_SO_ACCEPTCONN 30 /** Timestamp TX RX or both packets. Supports multiple timestamp sources. */ -#define SO_TIMESTAMPING 37 +#define ZSOCK_SO_TIMESTAMPING 37 /** Protocol used with the socket */ -#define SO_PROTOCOL 38 +#define ZSOCK_SO_PROTOCOL 38 /** Domain used with SOCKET */ -#define SO_DOMAIN 39 +#define ZSOCK_SO_DOMAIN 39 /** Enable SOCKS5 for Socket */ -#define SO_SOCKS5 60 +#define ZSOCK_SO_SOCKS5 60 /** Socket TX time (when the data should be sent) */ -#define SO_TXTIME 61 +#define ZSOCK_SO_TXTIME 61 /** Socket TX time (same as SO_TXTIME) */ -#define SCM_TXTIME SO_TXTIME +#define ZSOCK_SCM_TXTIME ZSOCK_SO_TXTIME /** Timestamp generation flags */ /** Request RX timestamps generated by network adapter. */ -#define SOF_TIMESTAMPING_RX_HARDWARE BIT(0) +#define ZSOCK_SOF_TIMESTAMPING_RX_HARDWARE BIT(0) /** * Request TX timestamps generated by network adapter. * This can be enabled via socket option or control messages. */ -#define SOF_TIMESTAMPING_TX_HARDWARE BIT(1) +#define ZSOCK_SOF_TIMESTAMPING_TX_HARDWARE BIT(1) /** */ /** @} */ /** - * @name TCP level options (IPPROTO_TCP) + * @name TCP level options (NET_IPPROTO_TCP) * @{ */ -/* Socket options for IPPROTO_TCP level */ +/* Socket options for NET_IPPROTO_TCP level */ /** Disable TCP buffering (ignored, for compatibility) */ -#define TCP_NODELAY 1 +#define ZSOCK_TCP_NODELAY 1 /** Start keepalives after this period (seconds) */ -#define TCP_KEEPIDLE 2 +#define ZSOCK_TCP_KEEPIDLE 2 /** Interval between keepalives (seconds) */ -#define TCP_KEEPINTVL 3 +#define ZSOCK_TCP_KEEPINTVL 3 /** Number of keepalives before dropping connection */ -#define TCP_KEEPCNT 4 +#define ZSOCK_TCP_KEEPCNT 4 /** @} */ /** - * @name IPv4 level options (IPPROTO_IP) + * @name IPv4 level options (NET_IPPROTO_IP) * @{ */ /* Socket options for IPPROTO_IP level */ /** Set or receive the Type-Of-Service value for an outgoing packet. */ -#define IP_TOS 1 +#define ZSOCK_IP_TOS 1 /** Set or receive the Time-To-Live value for an outgoing packet. */ -#define IP_TTL 2 +#define ZSOCK_IP_TTL 2 /** Pass an IP_PKTINFO ancillary message that contains a * pktinfo structure that supplies some information about the * incoming packet. */ -#define IP_PKTINFO 8 - -/** - * @brief Incoming IPv4 packet information. - * - * Used as ancillary data when calling recvmsg() and IP_PKTINFO socket - * option is set. - */ -struct in_pktinfo { - unsigned int ipi_ifindex; /**< Network interface index */ - struct in_addr ipi_spec_dst; /**< Local address */ - struct in_addr ipi_addr; /**< Header Destination address */ -}; +#define ZSOCK_IP_PKTINFO 8 /** Pass an IP_RECVTTL ancillary message that contains information * about the time to live of the incoming packet. */ -#define IP_RECVTTL 12 +#define ZSOCK_IP_RECVTTL 12 /** Retrieve the current known path MTU of the current socket. Returns an - * integer. IP_MTU is valid only for getsockopt and can be employed only when + * integer. ZSOCK_IP_MTU is valid only for getsockopt and can be employed only when * the socket has been connected. */ -#define IP_MTU 14 +#define ZSOCK_IP_MTU 14 /** Set IPv4 multicast datagram network interface. */ -#define IP_MULTICAST_IF 32 +#define ZSOCK_IP_MULTICAST_IF 32 /** Set IPv4 multicast TTL value. */ -#define IP_MULTICAST_TTL 33 +#define ZSOCK_IP_MULTICAST_TTL 33 /** Set IPv4 multicast loop value. */ -#define IP_MULTICAST_LOOP 34 +#define ZSOCK_IP_MULTICAST_LOOP 34 /** Join IPv4 multicast group. */ -#define IP_ADD_MEMBERSHIP 35 +#define ZSOCK_IP_ADD_MEMBERSHIP 35 /** Leave IPv4 multicast group. */ -#define IP_DROP_MEMBERSHIP 36 - -/** - * @brief Struct used when joining or leaving a IPv4 multicast group. - */ -struct ip_mreqn { - struct in_addr imr_multiaddr; /**< IP multicast group address */ - struct in_addr imr_address; /**< IP address of local interface */ - int imr_ifindex; /**< Network interface index */ -}; - -/** - * @brief Struct used when setting a IPv4 multicast network interface. - */ -struct ip_mreq { - struct in_addr imr_multiaddr; /**< IP multicast group address */ - struct in_addr imr_interface; /**< IP address of local interface */ -}; +#define ZSOCK_IP_DROP_MEMBERSHIP 36 /** Clamp down the global port range for a given socket */ -#define IP_LOCAL_PORT_RANGE 51 +#define ZSOCK_IP_LOCAL_PORT_RANGE 51 /** @} */ /** - * @name IPv6 level options (IPPROTO_IPV6) + * @name IPv6 level options (NET_IPPROTO_IPV6) * @{ */ -/* Socket options for IPPROTO_IPV6 level */ +/* Socket options for NET_IPPROTO_IPV6 level */ /** Set the unicast hop limit for the socket. */ -#define IPV6_UNICAST_HOPS 16 +#define ZSOCK_IPV6_UNICAST_HOPS 16 /** Set multicast output network interface index for the socket. */ -#define IPV6_MULTICAST_IF 17 +#define ZSOCK_IPV6_MULTICAST_IF 17 /** Set the multicast hop limit for the socket. */ -#define IPV6_MULTICAST_HOPS 18 +#define ZSOCK_IPV6_MULTICAST_HOPS 18 /** Set the multicast loop bit for the socket. */ -#define IPV6_MULTICAST_LOOP 19 +#define ZSOCK_IPV6_MULTICAST_LOOP 19 /** Join IPv6 multicast group. */ -#define IPV6_ADD_MEMBERSHIP 20 +#define ZSOCK_IPV6_ADD_MEMBERSHIP 20 /** Leave IPv6 multicast group. */ -#define IPV6_DROP_MEMBERSHIP 21 +#define ZSOCK_IPV6_DROP_MEMBERSHIP 21 /** Join IPv6 multicast group. */ -#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP +#define ZSOCK_IPV6_JOIN_GROUP ZSOCK_IPV6_ADD_MEMBERSHIP /** Leave IPv6 multicast group. */ -#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP - -/** - * @brief Struct used when joining or leaving a IPv6 multicast group. - */ -struct ipv6_mreq { - /** IPv6 multicast address of group */ - struct in6_addr ipv6mr_multiaddr; - - /** Network interface index of the local IPv6 address */ - int ipv6mr_ifindex; -}; +#define ZSOCK_IPV6_LEAVE_GROUP ZSOCK_IPV6_DROP_MEMBERSHIP /** For getsockopt(), retrieve the current known IPv6 path MTU of the given socket. * Valid only when the socket has been connected. * For setsockopt(), set the MTU to be used for the socket. The MTU is limited by * the device MTU or the path MTU when path MTU discovery is enabled. */ -#define IPV6_MTU 24 +#define ZSOCK_IPV6_MTU 24 /** Don't support IPv4 access */ -#define IPV6_V6ONLY 26 +#define ZSOCK_IPV6_V6ONLY 26 /** Pass an IPV6_RECVPKTINFO ancillary message that contains a * in6_pktinfo structure that supplies some information about the * incoming packet. See RFC 3542. */ -#define IPV6_RECVPKTINFO 49 +#define ZSOCK_IPV6_RECVPKTINFO 49 /** Option which returns an in6_pktinfo structure in ancillary data */ -#define IPV6_PKTINFO 50 +#define ZSOCK_IPV6_PKTINFO 50 /** Pass an IPV6_RECVHOPLIMIT ancillary message that contains information * about the hop limit of the incoming packet. See RFC 3542. */ -#define IPV6_RECVHOPLIMIT 51 +#define ZSOCK_IPV6_RECVHOPLIMIT 51 /** Set or receive the hoplimit value for an outgoing packet. */ -#define IPV6_HOPLIMIT 52 +#define ZSOCK_IPV6_HOPLIMIT 52 /** RFC5014: Source address selection. */ -#define IPV6_ADDR_PREFERENCES 72 +#define ZSOCK_IPV6_ADDR_PREFERENCES 72 /** Prefer temporary address as source. */ -#define IPV6_PREFER_SRC_TMP 0x0001 +#define ZSOCK_IPV6_PREFER_SRC_TMP 0x0001 /** Prefer public address as source. */ -#define IPV6_PREFER_SRC_PUBLIC 0x0002 +#define ZSOCK_IPV6_PREFER_SRC_PUBLIC 0x0002 /** Either public or temporary address is selected as a default source * depending on the output interface configuration (this is the default value). * This is Linux specific option not found in the RFC. */ -#define IPV6_PREFER_SRC_PUBTMP_DEFAULT 0x0100 +#define ZSOCK_IPV6_PREFER_SRC_PUBTMP_DEFAULT 0x0100 /** Prefer Care-of address as source. Ignored in Zephyr. */ -#define IPV6_PREFER_SRC_COA 0x0004 +#define ZSOCK_IPV6_PREFER_SRC_COA 0x0004 /** Prefer Home address as source. Ignored in Zephyr. */ -#define IPV6_PREFER_SRC_HOME 0x0400 +#define ZSOCK_IPV6_PREFER_SRC_HOME 0x0400 /** Prefer CGA (Cryptographically Generated Address) address as source. Ignored in Zephyr. */ -#define IPV6_PREFER_SRC_CGA 0x0008 +#define ZSOCK_IPV6_PREFER_SRC_CGA 0x0008 /** Prefer non-CGA address as source. Ignored in Zephyr. */ -#define IPV6_PREFER_SRC_NONCGA 0x0800 - -/** - * @brief Incoming IPv6 packet information. - * - * Used as ancillary data when calling recvmsg() and IPV6_RECVPKTINFO socket - * option is set. - */ -struct in6_pktinfo { - struct in6_addr ipi6_addr; /**< Destination IPv6 address */ - unsigned int ipi6_ifindex; /**< Receive interface index */ -}; +#define ZSOCK_IPV6_PREFER_SRC_NONCGA 0x0800 /** Set or receive the traffic class value for an outgoing packet. */ -#define IPV6_TCLASS 67 +#define ZSOCK_IPV6_TCLASS 67 /** @} */ /** @@ -1144,7 +1076,7 @@ struct in6_pktinfo { * @{ */ /** listen: The maximum backlog queue length */ -#define SOMAXCONN 128 +#define ZSOCK_SOMAXCONN 128 /** @} */ /** @@ -1152,38 +1084,38 @@ struct in6_pktinfo { * @{ */ /** Check unspecified IPv6 address. */ -#define IN6_IS_ADDR_UNSPECIFIED(addr) \ +#define ZSOCK_IN6_IS_ADDR_UNSPECIFIED(addr) \ net_ipv6_addr_cmp(net_ipv6_unspecified_address(), addr) /** Check loopback IPv6 address. */ -#define IN6_IS_ADDR_LOOPBACK(addr) net_ipv6_is_addr_loopback(addr) +#define ZSOCK_IN6_IS_ADDR_LOOPBACK(addr) net_ipv6_is_addr_loopback(addr) /** Check IPv6 multicast address */ -#define IN6_IS_ADDR_MULTICAST(addr) net_ipv6_is_addr_mcast(addr) +#define ZSOCK_IN6_IS_ADDR_MULTICAST(addr) net_ipv6_is_addr_mcast(addr) /** Check IPv6 link local address */ -#define IN6_IS_ADDR_LINKLOCAL(addr) net_ipv6_is_ll_addr(addr) +#define ZSOCK_IN6_IS_ADDR_LINKLOCAL(addr) net_ipv6_is_ll_addr(addr) /** Check IPv6 site local address */ -#define IN6_IS_ADDR_SITELOCAL(addr) net_ipv6_is_sl_addr(addr) +#define ZSOCK_IN6_IS_ADDR_SITELOCAL(addr) net_ipv6_is_sl_addr(addr) /** Check IPv6 v4 mapped address */ -#define IN6_IS_ADDR_V4MAPPED(addr) net_ipv6_addr_is_v4_mapped(addr) +#define ZSOCK_IN6_IS_ADDR_V4MAPPED(addr) net_ipv6_addr_is_v4_mapped(addr) /** Check IPv6 multicast global address */ -#define IN6_IS_ADDR_MC_GLOBAL(addr) net_ipv6_is_addr_mcast_global(addr) +#define ZSOCK_IN6_IS_ADDR_MC_GLOBAL(addr) net_ipv6_is_addr_mcast_global(addr) /** Check IPv6 multicast node local address */ -#define IN6_IS_ADDR_MC_NODELOCAL(addr) net_ipv6_is_addr_mcast_iface(addr) +#define ZSOCK_IN6_IS_ADDR_MC_NODELOCAL(addr) net_ipv6_is_addr_mcast_iface(addr) /** Check IPv6 multicast link local address */ -#define IN6_IS_ADDR_MC_LINKLOCAL(addr) net_ipv6_is_addr_mcast_link(addr) +#define ZSOCK_IN6_IS_ADDR_MC_LINKLOCAL(addr) net_ipv6_is_addr_mcast_link(addr) /** Check IPv6 multicast site local address */ -#define IN6_IS_ADDR_MC_SITELOCAL(addr) net_ipv6_is_addr_mcast_site(addr) +#define ZSOCK_IN6_IS_ADDR_MC_SITELOCAL(addr) net_ipv6_is_addr_mcast_site(addr) /** Check IPv6 multicast organization local address */ -#define IN6_IS_ADDR_MC_ORGLOCAL(addr) net_ipv6_is_addr_mcast_org(addr) +#define ZSOCK_IN6_IS_ADDR_MC_ORGLOCAL(addr) net_ipv6_is_addr_mcast_org(addr) /** @} */ @@ -1237,25 +1169,25 @@ struct net_socket_register { struct socket_op_vtable { struct fd_op_vtable fd_vtable; int (*shutdown)(void *obj, int how); - int (*bind)(void *obj, const struct sockaddr *addr, socklen_t addrlen); - int (*connect)(void *obj, const struct sockaddr *addr, - socklen_t addrlen); + int (*bind)(void *obj, const struct net_sockaddr *addr, net_socklen_t addrlen); + int (*connect)(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen); int (*listen)(void *obj, int backlog); - int (*accept)(void *obj, struct sockaddr *addr, socklen_t *addrlen); + int (*accept)(void *obj, struct net_sockaddr *addr, net_socklen_t *addrlen); ssize_t (*sendto)(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen); + const struct net_sockaddr *dest_addr, net_socklen_t addrlen); ssize_t (*recvfrom)(void *obj, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen); + struct net_sockaddr *src_addr, net_socklen_t *addrlen); int (*getsockopt)(void *obj, int level, int optname, - void *optval, socklen_t *optlen); + void *optval, net_socklen_t *optlen); int (*setsockopt)(void *obj, int level, int optname, - const void *optval, socklen_t optlen); - ssize_t (*sendmsg)(void *obj, const struct msghdr *msg, int flags); - ssize_t (*recvmsg)(void *obj, struct msghdr *msg, int flags); - int (*getpeername)(void *obj, struct sockaddr *addr, - socklen_t *addrlen); - int (*getsockname)(void *obj, struct sockaddr *addr, - socklen_t *addrlen); + const void *optval, net_socklen_t optlen); + ssize_t (*sendmsg)(void *obj, const struct net_msghdr *msg, int flags); + ssize_t (*recvmsg)(void *obj, struct net_msghdr *msg, int flags); + int (*getpeername)(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen); + int (*getsockname)(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen); }; /** @endcond */ @@ -1270,30 +1202,4 @@ struct socket_op_vtable { * @} */ -/* Avoid circular loops with POSIX socket headers. - * We have these includes here so that we do not need - * to change the applications that were only including - * zephyr/net/socket.h header file. - * - * Additionally, if non-zephyr-prefixed headers are used here, - * native_sim pulls in those from the host rather than Zephyr's. - */ -#if defined(CONFIG_POSIX_API) -#if !defined(ZEPHYR_INCLUDE_POSIX_ARPA_INET_H_) -#include -#endif -#if !defined(ZEPHYR_INCLUDE_POSIX_NETDB_H_) -#include -#endif -#if !defined(ZEPHYR_INCLUDE_POSIX_UNISTD_H_) -#include -#endif -#if !defined(ZEPHYR_INCLUDE_POSIX_POLL_H_) -#include -#endif -#if !defined(ZEPHYR_INCLUDE_POSIX_SYS_SOCKET_H_) -#include -#endif -#endif /* CONFIG_POSIX_API */ - #endif /* ZEPHYR_INCLUDE_NET_SOCKET_H_ */ diff --git a/include/zephyr/net/socket_net_mgmt.h b/include/zephyr/net/socket_net_mgmt.h index 595a92bbad932..da581d979b7b2 100644 --- a/include/zephyr/net/socket_net_mgmt.h +++ b/include/zephyr/net/socket_net_mgmt.h @@ -56,26 +56,26 @@ extern "C" { /** @} */ /* for @name */ /** - * struct sockaddr_nm - The sockaddr structure for NET_MGMT sockets + * struct net_sockaddr_nm - The net_sockaddr structure for NET_MGMT sockets * * Similar concepts are used as in Linux AF_NETLINK. The NETLINK name is not * used in order to avoid confusion between Zephyr and Linux as the * implementations are different. * * The socket domain (address family) is AF_NET_MGMT, and the type of socket - * is either SOCK_RAW or SOCK_DGRAM, because this is a datagram-oriented + * is either NET_SOCK_RAW or NET_SOCK_DGRAM, because this is a datagram-oriented * service. * * The protocol (protocol type) selects for which feature the socket is used. * - * When used with bind(), the nm_pid field of the sockaddr_nm can be + * When used with bind(), the nm_pid field of the net_sockaddr_nm can be * filled with the calling thread' own id. The nm_pid serves here as the local * address of this net_mgmt socket. The application is responsible for picking * a unique integer value to fill in nm_pid. */ -struct sockaddr_nm { +struct net_sockaddr_nm { /** AF_NET_MGMT address family. */ - sa_family_t nm_family; + net_sa_family_t nm_family; /** Network interface related to this address */ int nm_ifindex; diff --git a/include/zephyr/net/socketcan.h b/include/zephyr/net/socketcan.h index ca88d3760c589..6f7be936c9359 100644 --- a/include/zephyr/net/socketcan.h +++ b/include/zephyr/net/socketcan.h @@ -31,16 +31,16 @@ extern "C" { */ /** Protocols of the protocol family PF_CAN */ -#define CAN_RAW 1 +#define NET_CAN_RAW 1 /** @cond INTERNAL_HIDDEN */ /* SocketCAN options */ -#define SOL_CAN_BASE 100 -#define SOL_CAN_RAW (SOL_CAN_BASE + CAN_RAW) +#define NET_SOL_CAN_BASE 100 +#define NET_SOL_CAN_RAW (NET_SOL_CAN_BASE + NET_CAN_RAW) enum { - CAN_RAW_FILTER = 1, + NET_CAN_RAW_FILTER = 1, }; /** @endcond */ @@ -66,12 +66,12 @@ enum { #define CANFD_FDF 0x04 /**< Mark CAN FD for dual use of struct canfd_frame */ /** - * struct sockaddr_can - The sockaddr structure for CAN sockets + * struct net_sockaddr_can - The net_sockaddr structure for CAN sockets * */ -struct sockaddr_can { - sa_family_t can_family; /**< Address family */ - int can_ifindex; /**< SocketCAN network interface index */ +struct net_sockaddr_can { + net_sa_family_t can_family; /**< Address family */ + int can_ifindex; /**< SocketCAN network interface index */ }; /** diff --git a/include/zephyr/net/virtual.h b/include/zephyr/net/virtual.h index d956ff1a4b95d..4982af07d36a2 100644 --- a/include/zephyr/net/virtual.h +++ b/include/zephyr/net/virtual.h @@ -79,10 +79,10 @@ struct virtual_interface_link_types { #endif struct virtual_interface_config { - sa_family_t family; + net_sa_family_t family; union { - struct in_addr peer4addr; - struct in6_addr peer6addr; + struct net_in_addr peer4addr; + struct net_in6_addr peer6addr; int mtu; struct virtual_interface_link_types link_types; struct { diff --git a/include/zephyr/net/virtual_mgmt.h b/include/zephyr/net/virtual_mgmt.h index 26c091dcb2e88..1aba1396d3196 100644 --- a/include/zephyr/net/virtual_mgmt.h +++ b/include/zephyr/net/virtual_mgmt.h @@ -40,10 +40,10 @@ extern "C" { (NET_VIRTUAL_INTERFACE_BASE | NET_MGMT_EVENT_BIT) struct virtual_interface_req_params { - sa_family_t family; + net_sa_family_t family; union { - struct in_addr peer4addr; - struct in6_addr peer6addr; + struct net_in_addr peer4addr; + struct net_in6_addr peer6addr; int mtu; struct virtual_interface_link_types link_types; struct { diff --git a/include/zephyr/net/zperf.h b/include/zephyr/net/zperf.h index 3b4e9bbb684ed..3cf7dee564010 100644 --- a/include/zephyr/net/zperf.h +++ b/include/zephyr/net/zperf.h @@ -53,11 +53,11 @@ struct zperf_upload_params { uint64_t unix_offset_us; zperf_data_load_custom data_loader; void *data_loader_ctx; - struct sockaddr peer_addr; + struct net_sockaddr peer_addr; uint32_t duration_ms; uint32_t rate_kbps; uint16_t packet_size; - char if_name[IFNAMSIZ]; + char if_name[NET_IFNAMSIZ]; struct { uint8_t tos; int tcp_nodelay; @@ -72,8 +72,8 @@ struct zperf_upload_params { struct zperf_download_params { uint16_t port; - struct sockaddr addr; - char if_name[IFNAMSIZ]; + struct net_sockaddr addr; + char if_name[NET_IFNAMSIZ]; }; /** @endcond */ diff --git a/include/zephyr/posix/arpa/inet.h b/include/zephyr/posix/arpa/inet.h index 39b6cf6232e68..6b44b8d7b5357 100644 --- a/include/zephyr/posix/arpa/inet.h +++ b/include/zephyr/posix/arpa/inet.h @@ -24,6 +24,13 @@ char *inet_ntoa(struct in_addr in); char *inet_ntop(sa_family_t family, const void *src, char *dst, size_t size); int inet_pton(sa_family_t family, const char *src, void *dst); +#define ntohs(x) net_ntohs(x) +#define ntohl(x) net_ntohl(x) +#define ntohll(x) net_ntohll(x) +#define htons(x) net_htons(x) +#define htonl(x) net_htonl(x) +#define htonll(x) net_htonll(x) + #ifdef __cplusplus } #endif diff --git a/include/zephyr/posix/net/if.h b/include/zephyr/posix/net/if.h index 80360a69604d0..e3b620f3c5e07 100644 --- a/include/zephyr/posix/net/if.h +++ b/include/zephyr/posix/net/if.h @@ -12,6 +12,10 @@ #define IF_NAMESIZE 1 #endif +#if !defined(IFNAMSIZ) +#define IFNAMSIZ IF_NAMESIZE +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/zephyr/posix/netdb.h b/include/zephyr/posix/netdb.h index 5a094428e2250..dc8aaca8a2123 100644 --- a/include/zephyr/posix/netdb.h +++ b/include/zephyr/posix/netdb.h @@ -63,10 +63,10 @@ void endhostent(void); void endnetent(void); void endprotoent(void); void endservent(void); -void freeaddrinfo(struct zsock_addrinfo *ai); +void freeaddrinfo(struct addrinfo *ai); const char *gai_strerror(int errcode); -int getaddrinfo(const char *host, const char *service, const struct zsock_addrinfo *hints, - struct zsock_addrinfo **res); +int getaddrinfo(const char *host, const char *service, const struct addrinfo *hints, + struct addrinfo **res); struct hostent *gethostent(void); int getnameinfo(const struct sockaddr *addr, socklen_t addrlen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, int flags); diff --git a/include/zephyr/posix/netinet/in.h b/include/zephyr/posix/netinet/in.h index 1134aaac123a0..f8b6db3c1c817 100644 --- a/include/zephyr/posix/netinet/in.h +++ b/include/zephyr/posix/netinet/in.h @@ -17,6 +17,12 @@ extern "C" { typedef uint16_t in_port_t; typedef uint32_t in_addr_t; +#define in_addr net_in_addr +#define in6_addr net_in6_addr + +#define INET_ADDRSTRLEN NET_INET_ADDRSTRLEN +#define INET6_ADDRSTRLEN NET_INET6_ADDRSTRLEN + #ifdef __cplusplus } #endif diff --git a/include/zephyr/posix/sys/socket.h b/include/zephyr/posix/sys/socket.h index 669434f8fd072..13bc2aea6f2e6 100644 --- a/include/zephyr/posix/sys/socket.h +++ b/include/zephyr/posix/sys/socket.h @@ -7,16 +7,11 @@ #define ZEPHYR_INCLUDE_POSIX_SYS_SOCKET_H_ #include -#include - -#define SHUT_RD ZSOCK_SHUT_RD -#define SHUT_WR ZSOCK_SHUT_WR -#define SHUT_RDWR ZSOCK_SHUT_RDWR -#define MSG_PEEK ZSOCK_MSG_PEEK -#define MSG_TRUNC ZSOCK_MSG_TRUNC -#define MSG_DONTWAIT ZSOCK_MSG_DONTWAIT -#define MSG_WAITALL ZSOCK_MSG_WAITALL +#undef ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS +#define ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS +#include +#undef ZEPHYR_INCLUDE_NET_COMPAT_MODE_SYMBOLS #ifdef __cplusplus extern "C" { @@ -27,6 +22,21 @@ struct linger { int l_linger; }; +#if !defined(CONFIG_NET_NAMESPACE_COMPAT_MODE) +typedef uint32_t socklen_t; +struct msghdr; +struct sockaddr; + +#define MSG_PEEK ZSOCK_MSG_PEEK +#define MSG_TRUNC ZSOCK_MSG_TRUNC +#define MSG_DONTWAIT ZSOCK_MSG_DONTWAIT +#define MSG_WAITALL ZSOCK_MSG_WAITALL + +#define SHUT_RD ZSOCK_SHUT_RD +#define SHUT_WR ZSOCK_SHUT_WR +#define SHUT_RDWR ZSOCK_SHUT_RDWR +#endif + int accept(int sock, struct sockaddr *addr, socklen_t *addrlen); int bind(int sock, const struct sockaddr *addr, socklen_t addrlen); int connect(int sock, const struct sockaddr *addr, socklen_t addrlen); diff --git a/include/zephyr/shell/shell_mqtt.h b/include/zephyr/shell/shell_mqtt.h index 4a96f9f0eac5d..64f64a8efb542 100644 --- a/include/zephyr/shell/shell_mqtt.h +++ b/include/zephyr/shell/shell_mqtt.h @@ -68,7 +68,7 @@ struct shell_mqtt { struct k_mutex lock; /** MQTT Broker details. */ - struct sockaddr_storage broker; + struct net_sockaddr_storage broker; struct zsock_addrinfo *haddr; struct zsock_pollfd fds[1]; diff --git a/modules/nrf_wifi/os/shim.c b/modules/nrf_wifi/os/shim.c index 79137e46e13fc..eee7039bc06f9 100644 --- a/modules/nrf_wifi/os/shim.c +++ b/modules/nrf_wifi/os/shim.c @@ -562,7 +562,7 @@ void *net_pkt_from_nbuf(void *iface, void *frm) data = zep_shim_nbuf_data_get(nwb); - pkt = net_pkt_rx_alloc_with_buffer(iface, len, AF_UNSPEC, 0, K_MSEC(100)); + pkt = net_pkt_rx_alloc_with_buffer(iface, len, NET_AF_UNSPEC, 0, K_MSEC(100)); if (!pkt) { goto out; diff --git a/modules/openthread/platform/dhcp6_pd.c b/modules/openthread/platform/dhcp6_pd.c index 5b0cf93c8139d..0cb45976a42d1 100644 --- a/modules/openthread/platform/dhcp6_pd.c +++ b/modules/openthread/platform/dhcp6_pd.c @@ -62,9 +62,9 @@ void otPlatInfraIfDhcp6PdClientSend(otInstance *aInstance, VerifyOrExit(dhcpv6_pd_client_sock != -1 && aInfraIfIndex == ail_iface_idx); uint16_t length = otMessageGetLength(aMessage); - struct sockaddr_in6 dest_sock_addr = {.sin6_family = AF_INET6, - .sin6_port = htons(DHCPV6_SERVER_PORT), - .sin6_addr = IN6ADDR_ANY_INIT, + struct net_sockaddr_in6 dest_sock_addr = {.sin6_family = NET_AF_INET6, + .sin6_port = net_htons(DHCPV6_SERVER_PORT), + .sin6_addr = NET_IN6ADDR_ANY_INIT, .sin6_scope_id = 0}; memcpy(&dest_sock_addr.sin6_addr, aDestAddress, sizeof(otIp6Address)); @@ -75,7 +75,7 @@ void otPlatInfraIfDhcp6PdClientSend(otInstance *aInstance, VerifyOrExit(otMessageRead(aMessage, 0, req->buffer, length) == length); VerifyOrExit(zsock_sendto(dhcpv6_pd_client_sock, req->buffer, length, 0, - (struct sockaddr *)&dest_sock_addr, + (struct net_sockaddr *)&dest_sock_addr, sizeof(dest_sock_addr)) == length); exit: @@ -87,8 +87,8 @@ void otPlatInfraIfDhcp6PdClientSend(otInstance *aInstance, static void dhcpv6_pd_client_receive_handler(struct net_socket_service_event *evt) { - struct sockaddr_in6 addr = {0}; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 addr = {0}; + net_socklen_t addrlen = sizeof(addr); ssize_t len = 0; struct otbr_msg_ctx *req = NULL; @@ -97,11 +97,11 @@ static void dhcpv6_pd_client_receive_handler(struct net_socket_service_event *ev memset(req, 0, sizeof(struct otbr_msg_ctx)); len = zsock_recvfrom(dhcpv6_pd_client_sock, req->buffer, sizeof(req->buffer), 0, - (struct sockaddr *)&addr, &addrlen); + (struct net_sockaddr *)&addr, &addrlen); VerifyOrExit(len > 0, openthread_border_router_deallocate_message((void *)req)); req->length = (uint16_t)len; - req->sock_addr.mPort = ntohs(addr.sin6_port); + req->sock_addr.mPort = net_ntohs(addr.sin6_port); req->cb = process_dhcpv6_pd_client_message; openthread_border_router_post_message(req); @@ -112,35 +112,38 @@ static void dhcpv6_pd_client_receive_handler(struct net_socket_service_event *ev static void dhcpv6_pd_client_socket_init(uint32_t infra_if_index) { char name[CONFIG_NET_INTERFACE_NAME_LEN + 1] = {0}; - struct ifreq if_req = {0}; + struct net_ifreq if_req = {0}; int hop_limit = 255; int on = 1; - struct sockaddr_in6 addr = {.sin6_family = AF_INET6, - .sin6_port = htons(DHCPV6_CLIENT_PORT), - .sin6_addr = IN6ADDR_ANY_INIT, + struct net_sockaddr_in6 addr = {.sin6_family = NET_AF_INET6, + .sin6_port = net_htons(DHCPV6_CLIENT_PORT), + .sin6_addr = NET_IN6ADDR_ANY_INIT, .sin6_scope_id = 0}; - dhcpv6_pd_client_sock = zsock_socket(AF_INET6, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP); + dhcpv6_pd_client_sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); VerifyOrExit(dhcpv6_pd_client_sock >= 0); - VerifyOrExit(zsock_bind(dhcpv6_pd_client_sock, (struct sockaddr *)&addr, + VerifyOrExit(zsock_bind(dhcpv6_pd_client_sock, (struct net_sockaddr *)&addr, sizeof(addr)) == 0); - VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, SOL_SOCKET, SO_REUSEADDR, + VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, &on, sizeof(on)) == 0); - VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, SOL_SOCKET, SO_REUSEPORT, + VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEPORT, &on, sizeof(on)) == 0); VerifyOrExit(net_if_get_name(net_if_get_by_index(infra_if_index), name, CONFIG_NET_INTERFACE_NAME_LEN) > 0); memcpy(if_req.ifr_name, name, MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1)); - VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, SOL_SOCKET, SO_BINDTODEVICE, &if_req, - sizeof(if_req)) == 0); - VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, ZSOCK_SOL_SOCKET, + ZSOCK_SO_BINDTODEVICE, &if_req, sizeof(if_req)) == 0); + VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, NET_IPPROTO_IPV6, + ZSOCK_IPV6_MULTICAST_HOPS, &hop_limit, sizeof(hop_limit)) == 0); - VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, + VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, NET_IPPROTO_IPV6, + ZSOCK_IPV6_UNICAST_HOPS, &hop_limit, sizeof(hop_limit)) == 0); - VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, + VerifyOrExit(zsock_setsockopt(dhcpv6_pd_client_sock, NET_IPPROTO_IPV6, + ZSOCK_IPV6_MULTICAST_IF, &infra_if_index, sizeof(infra_if_index)) == 0); sockfd_udp[0].fd = dhcpv6_pd_client_sock; diff --git a/modules/openthread/platform/dns_upstream_resolver.c b/modules/openthread/platform/dns_upstream_resolver.c index 2bd605c48f283..428b021732d9e 100644 --- a/modules/openthread/platform/dns_upstream_resolver.c +++ b/modules/openthread/platform/dns_upstream_resolver.c @@ -159,7 +159,7 @@ static void dns_pkt_recv_cb(struct net_buf *dns_data, size_t buf_len, void *user OT_ERROR_NONE); (void)memcpy(req->buffer, dns_data->data, buf_len); - UNALIGNED_PUT(htons(ctx->originated_query_id), (uint16_t *)(req->buffer)); + UNALIGNED_PUT(net_htons(ctx->originated_query_id), (uint16_t *)(req->buffer)); req->length = buf_len; req->cb = dns_upstream_resolver_handle_response; req->user_data = user_data; diff --git a/modules/openthread/platform/infra_if.c b/modules/openthread/platform/infra_if.c index 6f3db98d42605..ce5fa3c57c3ec 100644 --- a/modules/openthread/platform/infra_if.c +++ b/modules/openthread/platform/infra_if.c @@ -65,8 +65,8 @@ otError otPlatInfraIfSendIcmp6Nd(uint32_t aInfraIfIndex, const otIp6Address *aDe src = net_if_ipv6_select_src_addr(ail_iface_ptr, &dst); VerifyOrExit(!net_ipv6_is_addr_unspecified(src), error = OT_ERROR_FAILED); - pkt = net_pkt_alloc_with_buffer(ail_iface_ptr, aBufferLength, AF_INET6, IPPROTO_ICMPV6, - K_MSEC(100)); + pkt = net_pkt_alloc_with_buffer(ail_iface_ptr, aBufferLength, NET_AF_INET6, + NET_IPPROTO_ICMPV6, K_MSEC(100)); VerifyOrExit(pkt, error = OT_ERROR_FAILED); net_pkt_set_ipv6_hop_limit(pkt, NET_IPV6_ND_HOP_LIMIT); @@ -75,7 +75,7 @@ otError otPlatInfraIfSendIcmp6Nd(uint32_t aInfraIfIndex, const otIp6Address *aDe VerifyOrExit(net_pkt_write(pkt, aBuffer, aBufferLength) == 0, error = OT_ERROR_FAILED); net_pkt_cursor_init(pkt); - VerifyOrExit(net_ipv6_finalize(pkt, IPPROTO_ICMPV6) == 0, error = OT_ERROR_FAILED); + VerifyOrExit(net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6) == 0, error = OT_ERROR_FAILED); VerifyOrExit(net_send_data(pkt) == 0, error = OT_ERROR_FAILED); exit: @@ -99,7 +99,7 @@ otError otPlatInfraIfDiscoverNat64Prefix(uint32_t aInfraIfIndex) bool otPlatInfraIfHasAddress(uint32_t aInfraIfIndex, const otIp6Address *aAddress) { struct net_if_addr *ifaddr = NULL; - struct in6_addr addr = {0}; + struct net_in6_addr addr = {0}; memcpy(addr.s6_addr, aAddress->mFields.m8, sizeof(otIp6Address)); @@ -133,7 +133,7 @@ otError otPlatGetInfraIfLinkLayerAddress(otInstance *aInstance, uint32_t aIfInde otError infra_if_init(otInstance *instance, struct net_if *ail_iface) { otError error = OT_ERROR_NONE; - struct in6_addr addr = {0}; + struct net_in6_addr addr = {0}; ot_instance = instance; ail_iface_ptr = ail_iface; @@ -153,10 +153,10 @@ static void handle_ra_from_ot(const uint8_t *buffer, uint16_t buffer_length) struct net_if *ot_iface = net_if_get_first_by_type(&NET_L2_GET_NAME(OPENTHREAD)); struct net_if_ipv6_prefix *prefix_added = NULL; struct net_route_entry *route_added = NULL; - struct in6_addr rio_prefix = {0}; + struct net_in6_addr rio_prefix = {0}; struct net_if_addr *ifaddr = NULL; - struct in6_addr addr_to_add_from_pio = {0}; - struct in6_addr nexthop = {0}; + struct net_in6_addr addr_to_add_from_pio = {0}; + struct net_in6_addr nexthop = {0}; uint8_t i = sizeof(struct net_icmp_hdr) + sizeof(struct net_icmpv6_ra_hdr); while (i + sizeof(struct net_icmpv6_nd_opt_hdr) <= buffer_length) { @@ -169,11 +169,11 @@ static void handle_ra_from_ot(const uint8_t *buffer, uint16_t buffer_length) const struct net_icmpv6_nd_opt_prefix_info *pio = (const struct net_icmpv6_nd_opt_prefix_info *)&buffer[i]; prefix_added = net_if_ipv6_prefix_add(ail_iface_ptr, - (struct in6_addr *)pio->prefix, + (struct net_in6_addr *)pio->prefix, pio->prefix_len, pio->valid_lifetime); i += sizeof(struct net_icmpv6_nd_opt_prefix_info); net_ipv6_addr_generate_iid( - ail_iface_ptr, (struct in6_addr *)pio->prefix, + ail_iface_ptr, (struct net_in6_addr *)pio->prefix, COND_CODE_1(CONFIG_NET_IPV6_IID_STABLE, ((uint8_t *)&ail_iface_ptr->config.ip.ipv6->network_counter), (NULL)), COND_CODE_1(CONFIG_NET_IPV6_IID_STABLE, @@ -255,13 +255,13 @@ otError infra_if_start_icmp6_listener(void) { otError error = OT_ERROR_NONE; - VerifyOrExit(net_icmp_init_ctx(&ra_ctx, AF_INET6, NET_ICMPV6_RA, 0, + VerifyOrExit(net_icmp_init_ctx(&ra_ctx, NET_AF_INET6, NET_ICMPV6_RA, 0, handle_icmp6_input) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(net_icmp_init_ctx(&rs_ctx, AF_INET6, NET_ICMPV6_RS, 0, + VerifyOrExit(net_icmp_init_ctx(&rs_ctx, NET_AF_INET6, NET_ICMPV6_RS, 0, handle_icmp6_input) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(net_icmp_init_ctx(&na_ctx, AF_INET6, NET_ICMPV6_NA, 0, + VerifyOrExit(net_icmp_init_ctx(&na_ctx, NET_AF_INET6, NET_ICMPV6_NA, 0, handle_icmp6_input) == 0, error = OT_ERROR_FAILED); diff --git a/modules/openthread/platform/mdns_socket.c b/modules/openthread/platform/mdns_socket.c index 71abb3150c3ba..abaa8432f24dc 100644 --- a/modules/openthread/platform/mdns_socket.c +++ b/modules/openthread/platform/mdns_socket.c @@ -104,50 +104,52 @@ static otError mdns_socket_init_v6(uint32_t ail_iface_idx) { otError error = OT_ERROR_NONE; char name[CONFIG_NET_INTERFACE_NAME_LEN + 1] = {0}; - struct ifreq if_req = {0}; - struct ipv6_mreq mreq_v6 = {0}; + struct net_ifreq if_req = {0}; + struct net_ipv6_mreq mreq_v6 = {0}; int mcast_hops = 255; int on = 1; - struct sockaddr_in6 addr = {.sin6_family = AF_INET6, - .sin6_port = htons(MULTICAST_PORT), + struct net_sockaddr_in6 addr = {.sin6_family = NET_AF_INET6, + .sin6_port = net_htons(MULTICAST_PORT), .sin6_addr = {{{0}}}, .sin6_scope_id = 0}; - mdns_sock_v6 = zsock_socket(AF_INET6, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP); + mdns_sock_v6 = zsock_socket(NET_AF_INET6, SOCK_DGRAM, IPPROTO_UDP); VerifyOrExit(mdns_sock_v6 >= 0, error = OT_ERROR_FAILED); VerifyOrExit(net_if_get_name(net_if_get_by_index(ail_iface_idx), name, CONFIG_NET_INTERFACE_NAME_LEN) > 0, error = OT_ERROR_FAILED); memcpy(if_req.ifr_name, name, MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1)); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, SOL_SOCKET, SO_BINDTODEVICE, &if_req, - sizeof(if_req)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, + &if_req, sizeof(if_req)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEPORT, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, IPPROTO_IPV6, IPV6_V6ONLY, &on, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); mreq_v6.ipv6mr_ifindex = ail_iface_idx; net_ipv6_addr_create(&mreq_v6.ipv6mr_multiaddr, 0xff02, 0, 0, 0, 0, 0, 0, 0x00fb); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq_v6, - sizeof(mreq_v6)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_ADD_MEMBERSHIP, + &mreq_v6, sizeof(mreq_v6)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_LOOP, &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, IPPROTO_IPV6, IPV6_MULTICAST_IF, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_IF, &ail_iface_index, sizeof(ail_iface_index)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, &mcast_hops, sizeof(mcast_hops)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v6, IPPROTO_IPV6, IPV6_UNICAST_HOPS, + VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_UNICAST_HOPS, &mcast_hops, sizeof(mcast_hops)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_bind(mdns_sock_v6, (struct sockaddr *)&addr, sizeof(addr)) == 0, + VerifyOrExit(zsock_bind(mdns_sock_v6, (struct net_sockaddr *)&addr, sizeof(addr)) == 0, error = OT_ERROR_FAILED); sockfd_udp[0].fd = mdns_sock_v6; @@ -166,46 +168,48 @@ static otError mdns_socket_init_v4(uint32_t ail_iface_idx) { otError error = OT_ERROR_NONE; char name[CONFIG_NET_INTERFACE_NAME_LEN + 1] = {0}; - struct ifreq if_req = {0}; - struct ip_mreqn mreq_v4 = {0}; + struct net_ifreq if_req = {0}; + struct net_ip_mreqn mreq_v4 = {0}; int mcast_hops = 255; int on = 1; - struct sockaddr_in addr = {.sin_family = AF_INET, - .sin_port = htons(MULTICAST_PORT), + struct net_sockaddr_in addr = {.sin_family = NET_AF_INET, + .sin_port = net_htons(MULTICAST_PORT), .sin_addr = {{{0}}}}; - mdns_sock_v4 = zsock_socket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP); + mdns_sock_v4 = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); VerifyOrExit(mdns_sock_v4 >= 0, error = OT_ERROR_FAILED); VerifyOrExit(net_if_get_name(net_if_get_by_index(ail_iface_idx), name, CONFIG_NET_INTERFACE_NAME_LEN) > 0, error = OT_ERROR_FAILED); memcpy(if_req.ifr_name, name, MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1)); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, SOL_SOCKET, SO_BINDTODEVICE, &if_req, - sizeof(if_req)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, + &if_req, sizeof(if_req)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEPORT, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); mreq_v4.imr_ifindex = ail_iface_idx; - mreq_v4.imr_multiaddr.s_addr = htonl(0xE00000FB); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq_v4, - sizeof(mreq_v4)) == 0, + mreq_v4.imr_multiaddr.s_addr = net_htonl(0xE00000FB); + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, NET_IPPROTO_IP, ZSOCK_IP_ADD_MEMBERSHIP, + &mreq_v4, sizeof(mreq_v4)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, IPPROTO_IP, IP_MULTICAST_LOOP, &on, - sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_LOOP, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, IPPROTO_IP, IP_MULTICAST_IF, &mreq_v4, - sizeof(mreq_v4)) == 0, + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, + &mreq_v4, sizeof(mreq_v4)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, IPPROTO_IP, IP_MULTICAST_TTL, + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, &mcast_hops, sizeof(mcast_hops)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(mdns_sock_v4, IPPROTO_IP, IP_TTL, + VerifyOrExit(zsock_setsockopt(mdns_sock_v4, NET_IPPROTO_IP, ZSOCK_IP_TTL, &mcast_hops, sizeof(mcast_hops)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_bind(mdns_sock_v4, (struct sockaddr *)&addr, sizeof(addr)) == 0, + VerifyOrExit(zsock_bind(mdns_sock_v4, (struct net_sockaddr *)&addr, sizeof(addr)) == 0, error = OT_ERROR_FAILED); sockfd_udp[1].fd = mdns_sock_v4; @@ -245,14 +249,14 @@ static void mdns_send_multicast(otMessage *message, uint32_t ail_iface_idx) { uint16_t length = otMessageGetLength(message); struct otbr_msg_ctx *req = NULL; - struct sockaddr_in6 addr_v6 = {.sin6_family = AF_INET6, - .sin6_port = htons(MULTICAST_PORT), - .sin6_addr = IN6ADDR_ANY_INIT, + struct net_sockaddr_in6 addr_v6 = {.sin6_family = NET_AF_INET6, + .sin6_port = net_htons(MULTICAST_PORT), + .sin6_addr = NET_IN6ADDR_ANY_INIT, .sin6_scope_id = 0}; #if defined(CONFIG_NET_IPV4) - struct sockaddr_in addr_v4 = {.sin_family = AF_INET, - .sin_port = htons(MULTICAST_PORT), - .sin_addr = INADDR_ANY_INIT}; + struct net_sockaddr_in addr_v4 = {.sin_family = NET_AF_INET, + .sin_port = net_htons(MULTICAST_PORT), + .sin_addr = NET_INADDR_ANY_INIT}; #endif /* CONFIG_NET_IPV4*/ VerifyOrExit(length <= OTBR_MESSAGE_SIZE); @@ -260,15 +264,17 @@ static void mdns_send_multicast(otMessage *message, uint32_t ail_iface_idx) net_ipv6_addr_create(&addr_v6.sin6_addr, 0xff02, 0, 0, 0, 0, 0, 0, 0x00fb); #if defined(CONFIG_NET_IPV4) - addr_v4.sin_addr.s_addr = htonl(0xE00000FB); + addr_v4.sin_addr.s_addr = net_htonl(0xE00000FB); #endif /* CONFIG_NET_IPV4 */ VerifyOrExit(otMessageRead(message, 0, req->buffer, length) == length); - VerifyOrExit(zsock_sendto(mdns_sock_v6, req->buffer, length, 0, (struct sockaddr *)&addr_v6, + VerifyOrExit(zsock_sendto(mdns_sock_v6, req->buffer, length, 0, + (struct net_sockaddr *)&addr_v6, sizeof(addr_v6)) > 0); #if defined(CONFIG_NET_IPV4) - VerifyOrExit(zsock_sendto(mdns_sock_v4, req->buffer, length, 0, (struct sockaddr *)&addr_v4, + VerifyOrExit(zsock_sendto(mdns_sock_v4, req->buffer, length, 0, + (struct net_sockaddr *)&addr_v4, sizeof(addr_v4)) > 0); #endif /* CONFIG_NET_IPV4 */ exit: @@ -285,19 +291,19 @@ static void mdns_send_unicast(otMessage *message, const otPlatMdnsAddressInfo *a otIp4Address ot_ipv4_addr = {0}; #if defined(CONFIG_NET_IPV4) bool send_ipv4 = false; - struct sockaddr_in addr_v4 = {0}; + struct net_sockaddr_in addr_v4 = {0}; #endif /* CONFIG_NET_IPV4*/ - struct sockaddr_in6 addr_v6 = {.sin6_family = AF_INET6, - .sin6_port = htons(aAddress->mPort), - .sin6_addr = IN6ADDR_ANY_INIT, + struct net_sockaddr_in6 addr_v6 = {.sin6_family = NET_AF_INET6, + .sin6_port = net_htons(aAddress->mPort), + .sin6_addr = NET_IN6ADDR_ANY_INIT, .sin6_scope_id = 0}; VerifyOrExit(length <= OTBR_MESSAGE_SIZE); VerifyOrExit(openthread_border_router_allocate_message((void **)&req) == OT_ERROR_NONE); #if defined(CONFIG_NET_IPV4) if (otIp4FromIp4MappedIp6Address(&aAddress->mAddress, &ot_ipv4_addr) == OT_ERROR_NONE) { - addr_v4.sin_family = AF_INET; - addr_v4.sin_port = htons(aAddress->mPort); + addr_v4.sin_family = NET_AF_INET; + addr_v4.sin_port = net_htons(aAddress->mPort); memcpy(&addr_v4.sin_addr.s_addr, &ot_ipv4_addr, sizeof(otIp4Address)); send_ipv4 = true; } @@ -306,12 +312,13 @@ static void mdns_send_unicast(otMessage *message, const otPlatMdnsAddressInfo *a VerifyOrExit(otMessageRead(message, 0, req->buffer, length) == length); - VerifyOrExit(zsock_sendto(mdns_sock_v6, req->buffer, length, 0, (struct sockaddr *)&addr_v6, + VerifyOrExit(zsock_sendto(mdns_sock_v6, req->buffer, length, 0, + (struct net_sockaddr *)&addr_v6, sizeof(addr_v6)) > 0); #if defined(CONFIG_NET_IPV4) if (send_ipv4) { VerifyOrExit(zsock_sendto(mdns_sock_v4, req->buffer, length, 0, - (struct sockaddr *)&addr_v4, + (struct net_sockaddr *)&addr_v4, sizeof(addr_v4)) > 0); } #endif /* CONFIG_NET_IPV4 */ @@ -324,12 +331,12 @@ static void mdns_send_unicast(otMessage *message, const otPlatMdnsAddressInfo *a static void mdns_receive_handler(struct net_socket_service_event *evt) { - struct sockaddr_in6 addr_v6 = {0}; + struct net_sockaddr_in6 addr_v6 = {0}; #if defined(CONFIG_NET_IPV4) - struct sockaddr_in addr_v4 = {0}; - socklen_t optlen = sizeof(int); + struct net_sockaddr_in addr_v4 = {0}; + net_socklen_t optlen = sizeof(int); #endif /* CONFIG_NET_IPV4 */ - socklen_t addrlen; + net_socklen_t addrlen; ssize_t len = 0; int family; struct otbr_msg_ctx *req = NULL; @@ -337,25 +344,25 @@ static void mdns_receive_handler(struct net_socket_service_event *evt) VerifyOrExit(evt->event.revents & ZSOCK_POLLIN); VerifyOrExit(openthread_border_router_allocate_message((void **)&req) == OT_ERROR_NONE); #if defined(CONFIG_NET_IPV4) - (void)zsock_getsockopt(evt->event.fd, SOL_SOCKET, SO_DOMAIN, &family, &optlen); + (void)zsock_getsockopt(evt->event.fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_DOMAIN, &family, &optlen); - if (family == AF_INET) { + if (family == NET_AF_INET) { addrlen = sizeof(addr_v4); len = zsock_recvfrom(mdns_sock_v4, req->buffer, sizeof(req->buffer), 0, - (struct sockaddr *)&addr_v4, &addrlen); + (struct net_sockaddr *)&addr_v4, &addrlen); VerifyOrExit(len > 0); otIp4ToIp4MappedIp6Address((otIp4Address *)&addr_v4.sin_addr.s_addr, &req->addr_info.mAddress); - req->addr_info.mPort = ntohs(addr_v4.sin_port); + req->addr_info.mPort = net_ntohs(addr_v4.sin_port); } else { #endif /* CONFIG_NET_IPV4 */ addrlen = sizeof(addr_v6); len = zsock_recvfrom(mdns_sock_v6, req->buffer, sizeof(req->buffer), 0, - (struct sockaddr *)&addr_v6, &addrlen); + (struct net_sockaddr *)&addr_v6, &addrlen); VerifyOrExit(len > 0); memcpy(&req->addr_info.mAddress, &addr_v6.sin6_addr, sizeof(req->addr_info.mAddress)); - req->addr_info.mPort = ntohs(addr_v6.sin6_port); + req->addr_info.mPort = net_ntohs(addr_v6.sin6_port); #if defined(CONFIG_NET_IPV4) } #endif /* CONFIG_NET_IPV4 */ diff --git a/modules/openthread/platform/trel.c b/modules/openthread/platform/trel.c index 58ae1a559e58b..25f9a9fe8e303 100644 --- a/modules/openthread/platform/trel.c +++ b/modules/openthread/platform/trel.c @@ -29,19 +29,19 @@ NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(trel_udp_service, trel_receive_handler, MA void otPlatTrelEnable(otInstance *aInstance, uint16_t *aUdpPort) { - struct sockaddr_in6 addr = {.sin6_family = AF_INET6, + struct net_sockaddr_in6 addr = {.sin6_family = NET_AF_INET6, .sin6_port = 0, - .sin6_addr = IN6ADDR_ANY_INIT, + .sin6_addr = NET_IN6ADDR_ANY_INIT, .sin6_scope_id = 0}; - socklen_t len = sizeof(addr); + net_socklen_t len = sizeof(addr); - trel_sock = zsock_socket(AF_INET6, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP); + trel_sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); VerifyOrExit(trel_sock >= 0); - VerifyOrExit(zsock_bind(trel_sock, (struct sockaddr *)&addr, sizeof(addr)) == 0); + VerifyOrExit(zsock_bind(trel_sock, (struct net_sockaddr *)&addr, sizeof(addr)) == 0); - VerifyOrExit(zsock_getsockname(trel_sock, (struct sockaddr *)&addr, &len) == 0); + VerifyOrExit(zsock_getsockname(trel_sock, (struct net_sockaddr *)&addr, &len) == 0); - *aUdpPort = ntohs(addr.sin6_port); + *aUdpPort = net_ntohs(addr.sin6_port); otPlatTrelResetCounters(aInstance); @@ -74,15 +74,15 @@ void otPlatTrelSend(otInstance *aInstance, const uint8_t *aUdpPayload, uint16_t { VerifyOrExit(trel_is_enabled); - struct sockaddr_in6 dest_sock_addr = {.sin6_family = AF_INET6, - .sin6_port = htons(aDestSockAddr->mPort), + struct net_sockaddr_in6 dest_sock_addr = {.sin6_family = NET_AF_INET6, + .sin6_port = net_htons(aDestSockAddr->mPort), .sin6_addr = {{{0}}}, .sin6_scope_id = 0}; memcpy(&dest_sock_addr.sin6_addr, &aDestSockAddr->mAddress, sizeof(otIp6Address)); if (zsock_sendto(trel_sock, aUdpPayload, aUdpPayloadLen, 0, - (struct sockaddr *)&dest_sock_addr, + (struct net_sockaddr *)&dest_sock_addr, sizeof(dest_sock_addr)) == aUdpPayloadLen) { trel_counters.mTxBytes += aUdpPayloadLen; trel_counters.mTxPackets++; @@ -108,8 +108,8 @@ void otPlatTrelResetCounters(otInstance *aInstance) static void trel_receive_handler(struct net_socket_service_event *evt) { - struct sockaddr_in6 addr = {0}; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 addr = {0}; + net_socklen_t addrlen = sizeof(addr); ssize_t len = 0; struct otbr_msg_ctx *req = NULL; @@ -119,14 +119,14 @@ static void trel_receive_handler(struct net_socket_service_event *evt) VerifyOrExit(openthread_border_router_allocate_message((void **)&req) == OT_ERROR_NONE); len = zsock_recvfrom(trel_sock, req->buffer, sizeof(req->buffer), 0, - (struct sockaddr *)&addr, &addrlen); + (struct net_sockaddr *)&addr, &addrlen); VerifyOrExit(len > 0); trel_counters.mRxBytes += len; memcpy(&req->sock_addr.mAddress, &addr.sin6_addr, sizeof(otIp6Address)); req->length = (uint16_t)len; - req->sock_addr.mPort = ntohs(addr.sin6_port); + req->sock_addr.mPort = net_ntohs(addr.sin6_port); req->cb = process_trel_message; openthread_border_router_post_message(req); @@ -144,7 +144,7 @@ static void process_trel_message(struct otbr_msg_ctx *msg_ctx_ptr) otError trel_plat_init(otInstance *instance, struct net_if *ail_iface_ptr) { otError error = OT_ERROR_NONE; - struct ifreq if_req = {0}; + struct net_ifreq if_req = {0}; char name[CONFIG_NET_INTERFACE_NAME_LEN + 1] = {0}; ot_instance_ptr = instance; @@ -153,7 +153,7 @@ otError trel_plat_init(otInstance *instance, struct net_if *ail_iface_ptr) CONFIG_NET_INTERFACE_NAME_LEN) > 0, error = OT_ERROR_FAILED); memcpy(if_req.ifr_name, name, MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1)); - VerifyOrExit(zsock_setsockopt(trel_sock, SOL_SOCKET, SO_BINDTODEVICE, &if_req, + VerifyOrExit(zsock_setsockopt(trel_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &if_req, sizeof(if_req)) == 0, error = OT_ERROR_FAILED); diff --git a/modules/openthread/platform/udp.c b/modules/openthread/platform/udp.c index 1b3651cacb56d..2ccbf2edb127a 100644 --- a/modules/openthread/platform/udp.c +++ b/modules/openthread/platform/udp.c @@ -78,13 +78,14 @@ otError otPlatUdpSocket(otUdpSocket *aUdpSocket) VerifyOrExit(sock_cnt < CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER_MAX_UDP_SERVICES, error = OT_ERROR_INVALID_STATE); - sock = zsock_socket(AF_INET6, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); VerifyOrExit(sock >= 0, error = OT_ERROR_FAILED); #if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_IPV4_MAPPING_TO_IPV6) int off = 0; - VerifyOrExit(zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)) == 0, + VerifyOrExit(zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, + &off, sizeof(off)) == 0, error = OT_ERROR_FAILED); #endif @@ -139,7 +140,7 @@ otError otPlatUdpBind(otUdpSocket *aUdpSocket) { otError error = OT_ERROR_NONE; int sock = -1; - struct sockaddr_in6 addr = {0}; + struct net_sockaddr_in6 addr = {0}; int on = 1; VerifyOrExit(aUdpSocket != NULL && aUdpSocket->mHandle != NULL, @@ -147,15 +148,17 @@ otError otPlatUdpBind(otUdpSocket *aUdpSocket) sock = (int)POINTER_TO_INT(aUdpSocket->mHandle); VerifyOrExit(sock >= 0, error = OT_ERROR_INVALID_ARGS); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons(aUdpSocket->mSockName.mPort); + addr.sin6_family = NET_AF_INET6; + addr.sin6_port = net_htons(aUdpSocket->mSockName.mPort); memcpy(&addr.sin6_addr, &aUdpSocket->mSockName.mAddress, sizeof(otIp6Address)); - VerifyOrExit(zsock_bind(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0, + VerifyOrExit(zsock_bind(sock, (struct net_sockaddr *)&addr, sizeof(addr)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_RECVPKTINFO, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); - VerifyOrExit(zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_RECVHOPLIMIT, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); exit: @@ -167,7 +170,7 @@ otError otPlatUdpBindToNetif(otUdpSocket *aUdpSocket, otNetifIdentifier aNetifId otError error = OT_ERROR_NONE; int sock = -1; char name[CONFIG_NET_INTERFACE_NAME_LEN + 1] = {0}; - struct ifreq if_req = {0}; + struct net_ifreq if_req = {0}; VerifyOrExit(aUdpSocket != NULL && aUdpSocket->mHandle != NULL, error = OT_ERROR_INVALID_ARGS); @@ -177,15 +180,16 @@ otError otPlatUdpBindToNetif(otUdpSocket *aUdpSocket, otNetifIdentifier aNetifId switch (aNetifIdentifier) { case OT_NETIF_UNSPECIFIED: - VerifyOrExit(zsock_setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, NULL, 0) == 0, + VerifyOrExit(zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, + NULL, 0) == 0, error = OT_ERROR_FAILED); break; case OT_NETIF_THREAD_HOST: VerifyOrExit(net_if_get_name(ot_iface_ptr, name, CONFIG_NET_INTERFACE_NAME_LEN) > 0, error = OT_ERROR_FAILED); memcpy(if_req.ifr_name, name, MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1)); - VerifyOrExit(zsock_setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, &if_req, - sizeof(if_req)) == 0, + VerifyOrExit(zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, + &if_req, sizeof(if_req)) == 0, error = OT_ERROR_FAILED); break; case OT_NETIF_THREAD_INTERNAL: @@ -210,7 +214,7 @@ otError otPlatUdpConnect(otUdpSocket *aUdpSocket) { otError error = OT_ERROR_NONE; int sock = -1; - struct sockaddr_in6 addr = {0}; + struct net_sockaddr_in6 addr = {0}; VerifyOrExit(aUdpSocket != NULL && aUdpSocket->mHandle != NULL, error = OT_ERROR_INVALID_ARGS); @@ -219,11 +223,11 @@ otError otPlatUdpConnect(otUdpSocket *aUdpSocket) if (aUdpSocket->mPeerName.mPort != 0 && !otIp6IsAddressUnspecified(&aUdpSocket->mPeerName.mAddress)) { - addr.sin6_family = AF_INET6; + addr.sin6_family = NET_AF_INET6; memcpy(&addr.sin6_addr, &aUdpSocket->mPeerName.mAddress, sizeof(otIp6Address)); - addr.sin6_port = htons(aUdpSocket->mPeerName.mPort); + addr.sin6_port = net_htons(aUdpSocket->mPeerName.mPort); - VerifyOrExit(zsock_connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0, + VerifyOrExit(zsock_connect(sock, (struct net_sockaddr *)&addr, sizeof(addr)) == 0, error = OT_ERROR_FAILED); } @@ -237,18 +241,19 @@ otError otPlatUdpSend(otUdpSocket *aUdpSocket, { otError error = OT_ERROR_NONE; struct otbr_msg_ctx *req = NULL; - uint8_t control_buf[CMSG_SPACE(sizeof(struct in6_pktinfo)) + CMSG_SPACE(sizeof(int))] = {0}; + uint8_t control_buf[NET_CMSG_SPACE(sizeof(struct net_in6_pktinfo)) + + NET_CMSG_SPACE(sizeof(int))] = {0}; uint16_t len = otMessageGetLength(aMessage); size_t control_len = 0; - struct sockaddr_in6 peer = {0}; + struct net_sockaddr_in6 peer = {0}; int sock = -1; - struct iovec iov = {0}; - struct msghdr msg_hdr = {0}; - struct cmsghdr *cmsg_hdr = NULL; + struct net_iovec iov = {0}; + struct net_msghdr msg_hdr = {0}; + struct net_cmsghdr *cmsg_hdr = NULL; int hop_limit = 0; int on = 1, off = 0; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); VerifyOrExit(aUdpSocket != NULL && aUdpSocket->mHandle != NULL, error = OT_ERROR_INVALID_ARGS); @@ -263,8 +268,8 @@ otError otPlatUdpSend(otUdpSocket *aUdpSocket, iov.iov_base = req->buffer; iov.iov_len = len; - peer.sin6_family = AF_INET6; - peer.sin6_port = htons(aMessageInfo->mPeerPort); + peer.sin6_family = NET_AF_INET6; + peer.sin6_port = net_htons(aMessageInfo->mPeerPort); memcpy(&peer.sin6_addr, &aMessageInfo->mPeerAddr, sizeof(otIp6Address)); if (((aMessageInfo->mPeerAddr.mFields.m8[0] == 0xfe) && @@ -282,36 +287,36 @@ otError otPlatUdpSend(otUdpSocket *aUdpSocket, msg_hdr.msg_flags = 0; - cmsg_hdr = CMSG_FIRSTHDR(&msg_hdr); - cmsg_hdr->cmsg_level = IPPROTO_IPV6; - cmsg_hdr->cmsg_type = IPV6_HOPLIMIT; - cmsg_hdr->cmsg_len = CMSG_LEN(sizeof(int)); + cmsg_hdr = NET_CMSG_FIRSTHDR(&msg_hdr); + cmsg_hdr->cmsg_level = NET_IPPROTO_IPV6; + cmsg_hdr->cmsg_type = ZSOCK_IPV6_HOPLIMIT; + cmsg_hdr->cmsg_len = NET_CMSG_LEN(sizeof(int)); hop_limit = (aMessageInfo->mHopLimit ? aMessageInfo->mHopLimit : 255); - memcpy(CMSG_DATA(cmsg_hdr), &hop_limit, sizeof(int)); - control_len += CMSG_SPACE(sizeof(int)); + memcpy(NET_CMSG_DATA(cmsg_hdr), &hop_limit, sizeof(int)); + control_len += NET_CMSG_SPACE(sizeof(int)); if (!otIp6IsAddressUnspecified(&aMessageInfo->mSockAddr)) { - struct in6_pktinfo pktinfo; + struct net_in6_pktinfo pktinfo; - cmsg_hdr = CMSG_NXTHDR(&msg_hdr, cmsg_hdr); - cmsg_hdr->cmsg_level = IPPROTO_IPV6; - cmsg_hdr->cmsg_type = IPV6_PKTINFO; - cmsg_hdr->cmsg_len = CMSG_LEN(sizeof(pktinfo)); + cmsg_hdr = NET_CMSG_NXTHDR(&msg_hdr, cmsg_hdr); + cmsg_hdr->cmsg_level = NET_IPPROTO_IPV6; + cmsg_hdr->cmsg_type = ZSOCK_IPV6_PKTINFO; + cmsg_hdr->cmsg_len = NET_CMSG_LEN(sizeof(pktinfo)); pktinfo.ipi6_ifindex = aMessageInfo->mIsHostInterface ? 0 : ail_iface_index; memcpy(&pktinfo.ipi6_addr, &aMessageInfo->mSockAddr, sizeof(otIp6Address)); - memcpy(CMSG_DATA(cmsg_hdr), &pktinfo, sizeof(pktinfo)); + memcpy(NET_CMSG_DATA(cmsg_hdr), &pktinfo, sizeof(pktinfo)); - control_len += CMSG_SPACE(sizeof(pktinfo)); + control_len += NET_CMSG_SPACE(sizeof(pktinfo)); } msg_hdr.msg_controllen = control_len; if (aMessageInfo->mMulticastLoop) { - VerifyOrExit(zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &on, - sizeof(on)) == 0, + VerifyOrExit(zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_LOOP, + &on, sizeof(on)) == 0, error = OT_ERROR_FAILED); } @@ -320,13 +325,13 @@ otError otPlatUdpSend(otUdpSocket *aUdpSocket, otMessageFree(aMessage); aMessage = NULL; - VerifyOrExit(zsock_getsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &optval, + VerifyOrExit(zsock_getsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_LOOP, &optval, &optlen) == 0, error = OT_ERROR_FAILED); if (optval) { - VerifyOrExit(zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &off, - sizeof(off)) == 0, + VerifyOrExit(zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_LOOP, + &off, sizeof(off)) == 0, error = OT_ERROR_FAILED); } @@ -366,8 +371,8 @@ otError otPlatUdpJoinMulticastGroup(otUdpSocket *aUdpSocket, otNetifIdentifier a break; } - VerifyOrExit(zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq, - sizeof(mreq)) == 0, + VerifyOrExit(zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_ADD_MEMBERSHIP, + &mreq, sizeof(mreq)) == 0, error = OT_ERROR_FAILED); exit: @@ -378,7 +383,7 @@ otError otPlatUdpLeaveMulticastGroup(otUdpSocket *aUdpSocket, otNetifIdentifier const otIp6Address *aAddress) { otError error = OT_ERROR_NONE; - struct ipv6_mreq mreq = {0}; + struct net_ipv6_mreq mreq = {0}; int sock; VerifyOrExit(aUdpSocket != NULL && aUdpSocket->mHandle != NULL, @@ -402,8 +407,8 @@ otError otPlatUdpLeaveMulticastGroup(otUdpSocket *aUdpSocket, otNetifIdentifier break; } - VerifyOrExit(zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq, - sizeof(mreq)) == 0, + VerifyOrExit(zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_DROP_MEMBERSHIP, + &mreq, sizeof(mreq)) == 0, error = OT_ERROR_FAILED); exit: @@ -412,11 +417,12 @@ otError otPlatUdpLeaveMulticastGroup(otUdpSocket *aUdpSocket, otNetifIdentifier static void udp_receive_handler(struct net_socket_service_event *evt) { - uint8_t control[CMSG_SPACE(sizeof(int)) + CMSG_SPACE(sizeof(struct in6_pktinfo))] = {0}; - struct msghdr msg = {0}; - struct iovec iov = {0}; - struct cmsghdr *cmsg = NULL; - struct sockaddr_in6 peer_addr = {0}; + uint8_t control[NET_CMSG_SPACE(sizeof(int)) + + NET_CMSG_SPACE(sizeof(struct net_in6_pktinfo))] = {0}; + struct net_msghdr msg = {0}; + struct net_iovec iov = {0}; + struct net_cmsghdr *cmsg = NULL; + struct net_sockaddr_in6 peer_addr = {0}; struct otbr_msg_ctx *req = NULL; ssize_t rval = 0; @@ -450,22 +456,22 @@ static void udp_receive_handler(struct net_socket_service_event *evt) VerifyOrExit(rval > 0); req->length = (uint16_t)rval; - for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { - if (cmsg->cmsg_level == IPPROTO_IPV6) { - if (cmsg->cmsg_type == IPV6_PKTINFO && - cmsg->cmsg_len == CMSG_LEN(sizeof(struct in6_pktinfo))) { - struct in6_pktinfo pktinfo; + for (cmsg = NET_CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = NET_CMSG_NXTHDR(&msg, cmsg)) { + if (cmsg->cmsg_level == NET_IPPROTO_IPV6) { + if (cmsg->cmsg_type == ZSOCK_IPV6_PKTINFO && + cmsg->cmsg_len == NET_CMSG_LEN(sizeof(struct net_in6_pktinfo))) { + struct net_in6_pktinfo pktinfo; - memcpy(&pktinfo, CMSG_DATA(cmsg), sizeof(pktinfo)); + memcpy(&pktinfo, NET_CMSG_DATA(cmsg), sizeof(pktinfo)); memcpy(&req->message_info.mSockAddr, &pktinfo.ipi6_addr, sizeof(otIp6Address)); req->message_info.mIsHostInterface = (pktinfo.ipi6_ifindex == (unsigned int)ail_iface_index); - } else if (cmsg->cmsg_type == IPV6_HOPLIMIT && - cmsg->cmsg_len == CMSG_LEN(sizeof(int))) { + } else if (cmsg->cmsg_type == ZSOCK_IPV6_HOPLIMIT && + cmsg->cmsg_len == NET_CMSG_LEN(sizeof(int))) { int hoplimit; - memcpy(&hoplimit, CMSG_DATA(cmsg), sizeof(hoplimit)); + memcpy(&hoplimit, NET_CMSG_DATA(cmsg), sizeof(hoplimit)); req->message_info.mHopLimit = (uint8_t)hoplimit; } else { continue; @@ -475,7 +481,7 @@ static void udp_receive_handler(struct net_socket_service_event *evt) } memcpy(&req->message_info.mPeerAddr, &peer_addr.sin6_addr, sizeof(otIp6Address)); - req->message_info.mPeerPort = ntohs(peer_addr.sin6_port); + req->message_info.mPeerPort = net_ntohs(peer_addr.sin6_port); req->message_info.mSockPort = req->socket->mSockName.mPort; openthread_border_router_post_message(req); diff --git a/samples/boards/nxp/s32/netc/src/main.c b/samples/boards/nxp/s32/netc/src/main.c index 09e6cea988362..0a2ce0d565f34 100644 --- a/samples/boards/nxp/s32/netc/src/main.c +++ b/samples/boards/nxp/s32/netc/src/main.c @@ -27,7 +27,7 @@ static int setup_iface(struct net_if *iface, const char *ipv6_addr, LOG_INF("Configuring iface %d (%p)", net_if_get_by_iface(iface), iface); if (IS_ENABLED(CONFIG_NET_IPV6) && net_if_flag_is_set(iface, NET_IF_IPV6)) { - if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) { + if (net_addr_pton(NET_AF_INET6, ipv6_addr, &addr6)) { LOG_ERR("Invalid address: %s", ipv6_addr); return -EINVAL; } @@ -41,7 +41,7 @@ static int setup_iface(struct net_if *iface, const char *ipv6_addr, } if (IS_ENABLED(CONFIG_NET_IPV4) && net_if_flag_is_set(iface, NET_IF_IPV4)) { - if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) { + if (net_addr_pton(NET_AF_INET, ipv4_addr, &addr4)) { LOG_ERR("Invalid address: %s", ipv4_addr); return -EINVAL; } @@ -56,7 +56,7 @@ static int setup_iface(struct net_if *iface, const char *ipv6_addr, if (netmask && netmask[0]) { struct in_addr nm; - if (net_addr_pton(AF_INET, netmask, &nm)) { + if (net_addr_pton(NET_AF_INET, netmask, &nm)) { LOG_ERR("Invalid netmask: %s", netmask); return -EINVAL; } diff --git a/samples/drivers/modem/hello_hl78xx/src/main.c b/samples/drivers/modem/hello_hl78xx/src/main.c index e45fe0eb80990..e1f8849851ccb 100644 --- a/samples/drivers/modem/hello_hl78xx/src/main.c +++ b/samples/drivers/modem/hello_hl78xx/src/main.c @@ -16,6 +16,10 @@ #include #include +#include +#include +#include + /* Macros used to subscribe to specific Zephyr NET management events. */ #if defined(CONFIG_NET_SAMPLE_COMMON_WAIT_DNS_SERVER_ADDITION) #define L4_EVENT_MASK (NET_EVENT_DNS_SERVER_ADD | NET_EVENT_L4_DISCONNECTED) diff --git a/samples/drivers/video/tcpserversink/src/main.c b/samples/drivers/video/tcpserversink/src/main.c index 26315b9235897..051a30a1edced 100644 --- a/samples/drivers/video/tcpserversink/src/main.c +++ b/samples/drivers/video/tcpserversink/src/main.c @@ -13,6 +13,12 @@ #include #include +#include +#include +#include +#include +#include + LOG_MODULE_REGISTER(main, CONFIG_LOG_DEFAULT_LEVEL); #define MY_PORT 5000 diff --git a/samples/net/cellular_modem/src/main.c b/samples/net/cellular_modem/src/main.c index b6afbf6a97f5b..b24a95ea26982 100644 --- a/samples/net/cellular_modem/src/main.c +++ b/samples/net/cellular_modem/src/main.c @@ -13,6 +13,12 @@ #include #include +#include +#include +#include +#include +#include + #include #define L4_EVENT_MASK \ diff --git a/samples/net/cloud/aws_iot_mqtt/src/main.c b/samples/net/cloud/aws_iot_mqtt/src/main.c index 61548c338f4a2..73c5dca5e2d9b 100644 --- a/samples/net/cloud/aws_iot_mqtt/src/main.c +++ b/samples/net/cloud/aws_iot_mqtt/src/main.c @@ -10,6 +10,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/samples/net/cloud/mqtt_azure/src/main.c b/samples/net/cloud/mqtt_azure/src/main.c index 538461af2d1c3..88925f7298918 100644 --- a/samples/net/cloud/mqtt_azure/src/main.c +++ b/samples/net/cloud/mqtt_azure/src/main.c @@ -7,6 +7,13 @@ #include LOG_MODULE_REGISTER(mqtt_azure, LOG_LEVEL_DBG); +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/samples/net/cloud/tagoio_http_post/src/sockets.c b/samples/net/cloud/tagoio_http_post/src/sockets.c index e7bd79d8506a3..2744657f95eb9 100644 --- a/samples/net/cloud/tagoio_http_post/src/sockets.c +++ b/samples/net/cloud/tagoio_http_post/src/sockets.c @@ -7,6 +7,13 @@ #include LOG_MODULE_DECLARE(tagoio_http_post, CONFIG_TAGOIO_HTTP_POST_LOG_LEVEL); +#include +#include +#include +#include +#include +#include + #include #include #include diff --git a/samples/net/common/tunnel.c b/samples/net/common/tunnel.c index 613527aa103fa..2df34d9dd8f81 100644 --- a/samples/net/common/tunnel.c +++ b/samples/net/common/tunnel.c @@ -55,7 +55,7 @@ static void iface_cb(struct net_if *iface, void *user_data) static int setup_iface(struct net_if *iface, const char *ipaddr) { struct net_if_addr *ifaddr; - struct sockaddr addr; + struct net_sockaddr addr; /* Before setting up tunnel, make sure it will be ignored by conn_mgr */ conn_mgr_ignore_iface(iface); @@ -65,7 +65,7 @@ static int setup_iface(struct net_if *iface, const char *ipaddr) return -EINVAL; } - if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == NET_AF_INET6) { ifaddr = net_if_ipv6_addr_add(iface, &net_sin6(&addr)->sin6_addr, NET_ADDR_MANUAL, 0); @@ -76,7 +76,7 @@ static int setup_iface(struct net_if *iface, const char *ipaddr) } } - if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == NET_AF_INET) { ifaddr = net_if_ipv4_addr_add(iface, &net_sin(&addr)->sin_addr, NET_ADDR_MANUAL, 0); @@ -93,7 +93,7 @@ static int setup_iface(struct net_if *iface, const char *ipaddr) int init_tunnel(void) { struct virtual_interface_req_params params = { 0 }; - struct sockaddr peer = { 0 }; + struct net_sockaddr peer = { 0 }; struct ud ud; int ret; int mtu; @@ -113,24 +113,24 @@ int init_tunnel(void) return -EINVAL; } - if (IS_ENABLED(CONFIG_NET_IPV6) && peer.sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && peer.sa_family == NET_AF_INET6) { struct net_if *iface; iface = net_if_ipv6_select_src_iface( &net_sin6(&peer)->sin6_addr); ud.peer = iface; - params.family = AF_INET6; + params.family = NET_AF_INET6; net_ipaddr_copy(¶ms.peer6addr, &net_sin6(&peer)->sin6_addr); mtu = NET_ETH_MTU - sizeof(struct net_ipv6_hdr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && peer.sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && peer.sa_family == NET_AF_INET) { struct net_if *iface; iface = net_if_ipv4_select_src_iface( &net_sin(&peer)->sin_addr); ud.peer = iface; - params.family = AF_INET; + params.family = NET_AF_INET; net_ipaddr_copy(¶ms.peer4addr, &net_sin(&peer)->sin_addr); mtu = NET_ETH_MTU - sizeof(struct net_ipv4_hdr); diff --git a/samples/net/common/vlan.c b/samples/net/common/vlan.c index 0c04ff15b2e96..b5cb862fc2508 100644 --- a/samples/net/common/vlan.c +++ b/samples/net/common/vlan.c @@ -48,8 +48,8 @@ static int setup_iface(struct net_if *eth_iface, struct net_if *vlan_iface, const char *option) { - struct sockaddr_storage addr = { 0 }; - struct sockaddr *paddr = (struct sockaddr *)&addr; + struct net_sockaddr_storage addr = { 0 }; + struct net_sockaddr *paddr = (struct net_sockaddr *)&addr; const char *addr_str, *next; struct net_if_addr *ifaddr; uint8_t mask_len = 0; @@ -91,15 +91,15 @@ static int setup_iface(struct net_if *eth_iface, inet_ntop(paddr->sa_family, net_sin(paddr)->sin_addr.s4_addr, my_addr, sizeof(my_addr)); - if (paddr->sa_family == AF_INET) { - struct sockaddr_in *addr4 = (struct sockaddr_in *)paddr; - struct sockaddr_in mask; + if (paddr->sa_family == NET_AF_INET) { + struct net_sockaddr_in *addr4 = (struct net_sockaddr_in *)paddr; + struct net_sockaddr_in mask; ifaddr = net_if_ipv4_addr_add(vlan_iface, &addr4->sin_addr, NET_ADDR_MANUAL, 0); - ret = net_mask_len_to_netmask(AF_INET, mask_len, - (struct sockaddr *)&mask); + ret = net_mask_len_to_netmask(NET_AF_INET, mask_len, + (struct net_sockaddr *)&mask); if (ret < 0) { LOG_ERR("Invalid network mask length (%d)", ret); return ret; @@ -109,8 +109,8 @@ static int setup_iface(struct net_if *eth_iface, &addr4->sin_addr, &mask.sin_addr); - } else if (paddr->sa_family == AF_INET6) { - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)paddr; + } else if (paddr->sa_family == NET_AF_INET6) { + struct net_sockaddr_in6 *addr6 = (struct net_sockaddr_in6 *)paddr; struct in6_addr netaddr6; ifaddr = net_if_ipv6_addr_add(vlan_iface, &addr6->sin6_addr, diff --git a/samples/net/dhcpv4_client/src/main.c b/samples/net/dhcpv4_client/src/main.c index 72f7a17f273cc..f307e3401e97b 100644 --- a/samples/net/dhcpv4_client/src/main.c +++ b/samples/net/dhcpv4_client/src/main.c @@ -56,15 +56,15 @@ static void handler(struct net_mgmt_event_callback *cb, } LOG_INF(" Address[%d]: %s", net_if_get_by_iface(iface), - net_addr_ntop(AF_INET, + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->unicast[i].ipv4.address.in_addr, buf, sizeof(buf))); LOG_INF(" Subnet[%d]: %s", net_if_get_by_iface(iface), - net_addr_ntop(AF_INET, + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->unicast[i].netmask, buf, sizeof(buf))); LOG_INF(" Router[%d]: %s", net_if_get_by_iface(iface), - net_addr_ntop(AF_INET, + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->gw, buf, sizeof(buf))); LOG_INF("Lease time[%d]: %u seconds", net_if_get_by_iface(iface), @@ -80,7 +80,7 @@ static void option_handler(struct net_dhcpv4_option_callback *cb, char buf[NET_IPV4_ADDR_LEN]; LOG_INF("DHCP Option %d: %s", cb->option, - net_addr_ntop(AF_INET, cb->data, buf, sizeof(buf))); + net_addr_ntop(NET_AF_INET, cb->data, buf, sizeof(buf))); } int main(void) diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c index 5302f56987429..07e76c4c40e65 100644 --- a/samples/net/dns_resolve/src/main.c +++ b/samples/net/dns_resolve/src/main.c @@ -64,10 +64,10 @@ void dns_result_cb(enum dns_resolve_status status, return; } - if (info->ai_family == AF_INET) { + if (info->ai_family == NET_AF_INET) { hr_family = "IPv4"; addr = &net_sin(&info->ai_addr)->sin_addr; - } else if (info->ai_family == AF_INET6) { + } else if (info->ai_family == NET_AF_INET6) { hr_family = "IPv6"; addr = &net_sin6(&info->ai_addr)->sin6_addr; } else { @@ -113,10 +113,10 @@ void mdns_result_cb(enum dns_resolve_status status, return; } - if (info->ai_family == AF_INET) { + if (info->ai_family == NET_AF_INET) { hr_family = "IPv4"; addr = &net_sin(&info->ai_addr)->sin_addr; - } else if (info->ai_family == AF_INET6) { + } else if (info->ai_family == NET_AF_INET6) { hr_family = "IPv6"; addr = &net_sin6(&info->ai_addr)->sin6_addr; } else { @@ -181,16 +181,16 @@ static void print_dhcpv4_addr(struct net_if *iface, struct net_if_addr *if_addr, } LOG_INF("IPv4 address: %s", - net_addr_ntop(AF_INET, &if_addr->address.in_addr, + net_addr_ntop(NET_AF_INET, &if_addr->address.in_addr, hr_addr, NET_IPV4_ADDR_LEN)); LOG_INF("Lease time: %u seconds", iface->config.dhcpv4.lease_time); netmask = net_if_ipv4_get_netmask_by_addr(iface, &if_addr->address.in_addr); LOG_INF("Subnet: %s", - net_addr_ntop(AF_INET, &netmask, hr_addr, NET_IPV4_ADDR_LEN)); + net_addr_ntop(NET_AF_INET, &netmask, hr_addr, NET_IPV4_ADDR_LEN)); LOG_INF("Router: %s", - net_addr_ntop(AF_INET, + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->gw, hr_addr, NET_IPV4_ADDR_LEN)); diff --git a/samples/net/dsa/src/dsa_lldp.c b/samples/net/dsa/src/dsa_lldp.c index 368579cddd9c7..2c30fbd0aefb3 100644 --- a/samples/net/dsa/src/dsa_lldp.c +++ b/samples/net/dsa/src/dsa_lldp.c @@ -8,6 +8,11 @@ #include #include +#include +#include +#include +#include + #include #include #include diff --git a/samples/net/ipv4_autoconf/src/main.c b/samples/net/ipv4_autoconf/src/main.c index 9dd9fa53bb71c..7fecd8ce2f399 100644 --- a/samples/net/ipv4_autoconf/src/main.c +++ b/samples/net/ipv4_autoconf/src/main.c @@ -48,11 +48,11 @@ static void handler(struct net_mgmt_event_callback *cb, } LOG_INF("Your address: %s", - net_addr_ntop(AF_INET, + net_addr_ntop(NET_AF_INET, &cfg->ip.ipv4->unicast[i].ipv4.address.in_addr, buf, sizeof(buf))); LOG_INF("Your netmask: %s", - net_addr_ntop(AF_INET, + net_addr_ntop(NET_AF_INET, &cfg->ip.ipv4->unicast[i].netmask, buf, sizeof(buf))); } diff --git a/samples/net/latmon/src/main.c b/samples/net/latmon/src/main.c index 92eb1fc82aa6e..e3c97d42d0467 100644 --- a/samples/net/latmon/src/main.c +++ b/samples/net/latmon/src/main.c @@ -13,6 +13,8 @@ LOG_MODULE_REGISTER(sample_latmon, LOG_LEVEL_DBG); #include #include #include +#include + /* * Blink Control * DHCP: red diff --git a/samples/net/lldp/src/main.c b/samples/net/lldp/src/main.c index d4d90f2e439f0..077505e6aec10 100644 --- a/samples/net/lldp/src/main.c +++ b/samples/net/lldp/src/main.c @@ -73,7 +73,7 @@ static int setup_iface(struct net_if *eth_iface, LOG_ERR("Cannot enable VLAN for tag %d (%d)", vlan_tag, ret); } - if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) { + if (net_addr_pton(NET_AF_INET6, ipv6_addr, &addr6)) { LOG_ERR("Invalid address: %s", ipv6_addr); return -EINVAL; } @@ -84,7 +84,7 @@ static int setup_iface(struct net_if *eth_iface, return -EINVAL; } - if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) { + if (net_addr_pton(NET_AF_INET, ipv4_addr, &addr4)) { LOG_ERR("Invalid address: %s", ipv4_addr); return -EINVAL; } diff --git a/samples/net/mdns_responder/src/service.c b/samples/net/mdns_responder/src/service.c index 31f65c0492fc3..74e61aad950d7 100644 --- a/samples/net/mdns_responder/src/service.c +++ b/samples/net/mdns_responder/src/service.c @@ -8,6 +8,9 @@ #include #include #include +#include +#include +#include #include #include #include diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c index 03050685b41aa..0b7136a3948c1 100644 --- a/samples/net/mqtt_publisher/src/main.c +++ b/samples/net/mqtt_publisher/src/main.c @@ -7,6 +7,9 @@ #include LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG); +#include +#include + #include #include #include diff --git a/samples/net/mqtt_sn_publisher/src/udp.c b/samples/net/mqtt_sn_publisher/src/udp.c index fa369520959e2..28930abec4d9b 100644 --- a/samples/net/mqtt_sn_publisher/src/udp.c +++ b/samples/net/mqtt_sn_publisher/src/udp.c @@ -158,10 +158,10 @@ static void process_thread(void) * CONFIG_MQTT_SN_LIB_MAX_ADDR_SIZE. */ switch (gwaddr.sa_family) { - case AF_INET: + case NET_AF_INET: gwaddr_data.size = sizeof(struct sockaddr_in); break; - case AF_INET6: + case NET_AF_INET6: gwaddr_data.size = sizeof(struct sockaddr_in6); break; } diff --git a/samples/net/ocpp/src/main.c b/samples/net/ocpp/src/main.c index b703428bce46d..0d60a41a6d69a 100644 --- a/samples/net/ocpp/src/main.c +++ b/samples/net/ocpp/src/main.c @@ -7,6 +7,12 @@ #include #include +#include +#include +#include +#include +#include + #include #include #include diff --git a/samples/net/promiscuous_mode/src/main.c b/samples/net/promiscuous_mode/src/main.c index 1014c5e972f98..1d1536dfdcfe1 100644 --- a/samples/net/promiscuous_mode/src/main.c +++ b/samples/net/promiscuous_mode/src/main.c @@ -72,16 +72,16 @@ static void print_info(struct net_pkt *pkt) switch (NET_IPV6_HDR(pkt)->vtc & 0xf0) { case 0x60: - family = AF_INET6; - net_pkt_set_family(pkt, AF_INET6); + family = NET_AF_INET6; + net_pkt_set_family(pkt, NET_AF_INET6); dst = &NET_IPV6_HDR(pkt)->dst; src = &NET_IPV6_HDR(pkt)->src; next_hdr = NET_IPV6_HDR(pkt)->nexthdr; net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); break; case 0x40: - family = AF_INET; - net_pkt_set_family(pkt, AF_INET); + family = NET_AF_INET; + net_pkt_set_family(pkt, NET_AF_INET); dst = &NET_IPV4_HDR(pkt)->dst; src = &NET_IPV4_HDR(pkt)->src; next_hdr = NET_IPV4_HDR(pkt)->proto; @@ -89,7 +89,7 @@ static void print_info(struct net_pkt *pkt) break; } - if (family == AF_UNSPEC) { + if (family == NET_AF_UNSPEC) { LOG_INF("Recv %p len %zd (unknown address family)", pkt, net_pkt_get_len(pkt)); return; @@ -98,16 +98,16 @@ static void print_info(struct net_pkt *pkt) ret = 0; switch (next_hdr) { - case IPPROTO_TCP: + case NET_IPPROTO_TCP: proto = "TCP"; ret = get_ports(pkt, &src_port, &dst_port); break; - case IPPROTO_UDP: + case NET_IPPROTO_UDP: proto = "UDP"; ret = get_ports(pkt, &src_port, &dst_port); break; - case IPPROTO_ICMPV6: - case IPPROTO_ICMP: + case NET_IPPROTO_ICMPV6: + case NET_IPPROTO_ICMP: proto = "ICMP"; break; default: @@ -127,8 +127,8 @@ static void print_info(struct net_pkt *pkt) len = net_pkt_get_len(pkt); - if (family == AF_INET) { - if (next_hdr == IPPROTO_TCP || next_hdr == IPPROTO_UDP) { + if (family == NET_AF_INET) { + if (next_hdr == NET_IPPROTO_TCP || next_hdr == NET_IPPROTO_UDP) { LOG_INF("%s %s (%zd) %s:%u -> %s:%u", "IPv4", proto, len, src_addr, src_port, @@ -139,7 +139,7 @@ static void print_info(struct net_pkt *pkt) dst_addr); } } else { - if (next_hdr == IPPROTO_TCP || next_hdr == IPPROTO_UDP) { + if (next_hdr == NET_IPPROTO_TCP || next_hdr == NET_IPPROTO_UDP) { LOG_INF("%s %s (%zd) [%s]:%u -> [%s]:%u", "IPv6", proto, len, src_addr, src_port, diff --git a/samples/net/sockets/can/src/main.c b/samples/net/sockets/can/src/main.c index 8bd51984a6427..6b992d32eb5a8 100644 --- a/samples/net/sockets/can/src/main.c +++ b/samples/net/sockets/can/src/main.c @@ -14,6 +14,9 @@ LOG_MODULE_REGISTER(net_socket_can_sample, LOG_LEVEL_DBG); #include #include +#include +#include + #define PRIORITY k_thread_priority_get(k_current_get()) #define STACKSIZE 1024 #define SLEEP_PERIOD K_SECONDS(1) diff --git a/samples/net/sockets/coap_client/src/coap-client.c b/samples/net/sockets/coap_client/src/coap-client.c index 4b61135d997e8..1ee2dac6da51c 100644 --- a/samples/net/sockets/coap_client/src/coap-client.c +++ b/samples/net/sockets/coap_client/src/coap-client.c @@ -12,6 +12,11 @@ LOG_MODULE_REGISTER(net_coap_client_sample, LOG_LEVEL_DBG); #include #include +#include +#include +#include +#include + #include #include #include diff --git a/samples/net/sockets/coap_download/src/main.c b/samples/net/sockets/coap_download/src/main.c index 73345d4492cc2..89e3bda9488c0 100644 --- a/samples/net/sockets/coap_download/src/main.c +++ b/samples/net/sockets/coap_download/src/main.c @@ -63,7 +63,8 @@ static void do_coap_download(struct sockaddr *sa) .num_options = 0, .user_data = NULL}; - LOG_INF("Starting CoAP download using %s", (AF_INET == sa->sa_family) ? "IPv4" : "IPv6"); + LOG_INF("Starting CoAP download using %s", + (NET_AF_INET == sa->sa_family) ? "IPv4" : "IPv6"); sockfd = zsock_socket(sa->sa_family, SOCK_DGRAM, 0); if (sockfd < 0) { @@ -105,9 +106,9 @@ int main(void) #if defined(CONFIG_NET_IPV4) struct sockaddr_in *addr4 = (struct sockaddr_in *)&sa; - addr4->sin_family = AF_INET; + addr4->sin_family = NET_AF_INET; addr4->sin_port = htons(CONFIG_NET_SAMPLE_COAP_SERVER_PORT); - zsock_inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &addr4->sin_addr); + zsock_inet_pton(NET_AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &addr4->sin_addr); do_coap_download(&sa); #endif @@ -115,9 +116,9 @@ int main(void) #if defined(CONFIG_NET_IPV6) struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&sa; - addr6->sin6_family = AF_INET6; + addr6->sin6_family = NET_AF_INET6; addr6->sin6_port = htons(CONFIG_NET_SAMPLE_COAP_SERVER_PORT); - zsock_inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &addr6->sin6_addr); + zsock_inet_pton(NET_AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &addr6->sin6_addr); do_coap_download(&sa); #endif diff --git a/samples/net/sockets/coap_server/src/main.c b/samples/net/sockets/coap_server/src/main.c index 64db9d128cd30..6b3620affdeda 100644 --- a/samples/net/sockets/coap_server/src/main.c +++ b/samples/net/sockets/coap_server/src/main.c @@ -111,7 +111,7 @@ static int join_coap_multicast_group(uint16_t port) { static struct in6_addr my_addr = MY_IP6ADDR; struct sockaddr_in6 mcast_addr = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_addr = ALL_NODES_LOCAL_COAP_MCAST, .sin6_port = htons(port) }; struct net_if_addr *ifaddr; @@ -125,7 +125,7 @@ static int join_coap_multicast_group(uint16_t port) } #if defined(CONFIG_NET_CONFIG_SETTINGS) - if (net_addr_pton(AF_INET6, + if (net_addr_pton(NET_AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &my_addr) < 0) { LOG_ERR("Invalid IPv6 address %s", diff --git a/samples/net/sockets/coap_upload/src/main.c b/samples/net/sockets/coap_upload/src/main.c index 62eba2a922da6..372304b666210 100644 --- a/samples/net/sockets/coap_upload/src/main.c +++ b/samples/net/sockets/coap_upload/src/main.c @@ -167,7 +167,8 @@ static void coap_upload(struct coap_client *client, struct sockaddr *sa, int ret; LOG_INF(""); - LOG_INF("* Starting CoAP upload using %s", (AF_INET == sa->sa_family) ? "IPv4" : "IPv6"); + LOG_INF("* Starting CoAP upload using %s", + (NET_AF_INET == sa->sa_family) ? "IPv4" : "IPv6"); sock = zsock_socket(sa->sa_family, SOCK_DGRAM, 0); if (sock < 0) { @@ -215,9 +216,9 @@ int main(void) #if defined(CONFIG_NET_IPV4) struct sockaddr_in *addr4 = (struct sockaddr_in *)&sa; - addr4->sin_family = AF_INET; + addr4->sin_family = NET_AF_INET; addr4->sin_port = htons(CONFIG_NET_SAMPLE_COAP_SERVER_PORT); - zsock_inet_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &addr4->sin_addr); + zsock_inet_pton(NET_AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &addr4->sin_addr); coap_upload(&client, &sa, sizeof(struct sockaddr_in)); #endif @@ -225,9 +226,9 @@ int main(void) #if defined(CONFIG_NET_IPV6) struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&sa; - addr6->sin6_family = AF_INET6; + addr6->sin6_family = NET_AF_INET6; addr6->sin6_port = htons(CONFIG_NET_SAMPLE_COAP_SERVER_PORT); - zsock_inet_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &addr6->sin6_addr); + zsock_inet_pton(NET_AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &addr6->sin6_addr); coap_upload(&client, &sa, sizeof(struct sockaddr_in6)); #endif diff --git a/samples/net/sockets/dumb_http_server_mt/src/main.c b/samples/net/sockets/dumb_http_server_mt/src/main.c index 4c8a10219239b..5971d8efc6f3d 100644 --- a/samples/net/sockets/dumb_http_server_mt/src/main.c +++ b/samples/net/sockets/dumb_http_server_mt/src/main.c @@ -8,6 +8,9 @@ #define LOG_LEVEL LOG_LEVEL_DBG LOG_MODULE_REGISTER(net_dumb_http_srv_mt_sample); +#include +#include + #include #include #include diff --git a/samples/net/sockets/echo/src/socket_echo.c b/samples/net/sockets/echo/src/socket_echo.c index c8aad2bb06813..967042f0470d1 100644 --- a/samples/net/sockets/echo/src/socket_echo.c +++ b/samples/net/sockets/echo/src/socket_echo.c @@ -17,6 +17,12 @@ #else +#include +#include +#include +#include +#include + #include #include diff --git a/samples/net/sockets/echo_async/src/socket_echo.c b/samples/net/sockets/echo_async/src/socket_echo.c index 60067baf91cdf..66cb4706072f4 100644 --- a/samples/net/sockets/echo_async/src/socket_echo.c +++ b/samples/net/sockets/echo_async/src/socket_echo.c @@ -23,6 +23,12 @@ #else #include +#include +#include +#include +#include +#include + #include #include diff --git a/samples/net/sockets/echo_async_select/src/socket_echo_select.c b/samples/net/sockets/echo_async_select/src/socket_echo_select.c index 6ff8a6d52552b..24b07e60c1fd4 100644 --- a/samples/net/sockets/echo_async_select/src/socket_echo_select.c +++ b/samples/net/sockets/echo_async_select/src/socket_echo_select.c @@ -24,6 +24,10 @@ #else +#include +#include +#include +#include #include #include #include diff --git a/samples/net/sockets/echo_client/src/echo-client.c b/samples/net/sockets/echo_client/src/echo-client.c index 9c451b9c3ccf5..d6a22d236d7ba 100644 --- a/samples/net/sockets/echo_client/src/echo-client.c +++ b/samples/net/sockets/echo_client/src/echo-client.c @@ -25,6 +25,8 @@ LOG_MODULE_REGISTER(net_echo_client_sample, LOG_LEVEL_DBG); #include #include +#include +#include #include #include diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c index 32019849d8fa9..66c61750be5ef 100644 --- a/samples/net/sockets/echo_client/src/tcp.c +++ b/samples/net/sockets/echo_client/src/tcp.c @@ -14,6 +14,10 @@ LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include #include +#include +#include +#include + #include #include #include diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c index 49b6c14b8f1f7..d9d3fdd52600d 100644 --- a/samples/net/sockets/echo_client/src/udp.c +++ b/samples/net/sockets/echo_client/src/udp.c @@ -14,6 +14,10 @@ LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG); #include #include +#include +#include +#include + #include #include #include diff --git a/samples/net/sockets/echo_server/src/tcp.c b/samples/net/sockets/echo_server/src/tcp.c index 584ff0ffc02ed..45742db9629a6 100644 --- a/samples/net/sockets/echo_server/src/tcp.c +++ b/samples/net/sockets/echo_server/src/tcp.c @@ -14,6 +14,9 @@ LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include #include +#include +#include + #include #include diff --git a/samples/net/sockets/echo_server/src/udp.c b/samples/net/sockets/echo_server/src/udp.c index 6847ebd3eb634..b62ecf2c5e4e4 100644 --- a/samples/net/sockets/echo_server/src/udp.c +++ b/samples/net/sockets/echo_server/src/udp.c @@ -14,6 +14,9 @@ LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG); #include #include +#include +#include + #include #include diff --git a/samples/net/sockets/http_client/src/main.c b/samples/net/sockets/http_client/src/main.c index 3751f580cc16d..05645c7586be8 100644 --- a/samples/net/sockets/http_client/src/main.c +++ b/samples/net/sockets/http_client/src/main.c @@ -7,6 +7,10 @@ #include LOG_MODULE_REGISTER(net_http_client_sample, LOG_LEVEL_DBG); +#include +#include +#include + #include #include #include diff --git a/samples/net/sockets/http_get/src/http_get.c b/samples/net/sockets/http_get/src/http_get.c index 86c38e990d8f3..32e79c434830b 100644 --- a/samples/net/sockets/http_get/src/http_get.c +++ b/samples/net/sockets/http_get/src/http_get.c @@ -17,6 +17,12 @@ #else +#include +#include +#include +#include +#include + #include #include diff --git a/samples/net/sockets/http_server/src/ws.c b/samples/net/sockets/http_server/src/ws.c index af074f6763b2d..b474a1f28de73 100644 --- a/samples/net/sockets/http_server/src/ws.c +++ b/samples/net/sockets/http_server/src/ws.c @@ -6,6 +6,9 @@ #include +#include +#include + #include #include #include diff --git a/samples/net/sockets/net_mgmt/src/main.c b/samples/net/sockets/net_mgmt/src/main.c index d7b28e8e81bb8..8cc57c7aa04a3 100644 --- a/samples/net/sockets/net_mgmt/src/main.c +++ b/samples/net/sockets/net_mgmt/src/main.c @@ -10,6 +10,7 @@ LOG_MODULE_REGISTER(net_mgmt_sock_sample, LOG_LEVEL_DBG); #include #include #include +#include #include #include #include @@ -145,19 +146,19 @@ static void listener(void *p1, void *p2, void *p3) printk("DAD succeed for interface %d (%s)\n", event_addr.nm_ifindex, get_ip_addr(ipaddr, sizeof(ipaddr), - AF_INET6, hdr)); + NET_AF_INET6, hdr)); break; case NET_EVENT_IPV6_ADDR_ADD: printk("IPv6 address added to interface %d (%s)\n", event_addr.nm_ifindex, get_ip_addr(ipaddr, sizeof(ipaddr), - AF_INET6, hdr)); + NET_AF_INET6, hdr)); break; case NET_EVENT_IPV6_ADDR_DEL: printk("IPv6 address removed from interface %d (%s)\n", event_addr.nm_ifindex, get_ip_addr(ipaddr, sizeof(ipaddr), - AF_INET6, hdr)); + NET_AF_INET6, hdr)); break; } } diff --git a/samples/net/sockets/packet/src/packet.c b/samples/net/sockets/packet/src/packet.c index e4354254b3e80..7f0a3dc708f1d 100644 --- a/samples/net/sockets/packet/src/packet.c +++ b/samples/net/sockets/packet/src/packet.c @@ -16,6 +16,9 @@ LOG_MODULE_REGISTER(net_pkt_sock_sample, LOG_LEVEL_DBG); #include #include +#include +#include + #define STACK_SIZE 1024 #if defined(CONFIG_NET_TC_THREAD_COOPERATIVE) #define THREAD_PRIORITY K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1) diff --git a/samples/net/sockets/sntp_client/src/main.c b/samples/net/sockets/sntp_client/src/main.c index 3725f46d91a45..a5376765a3e63 100644 --- a/samples/net/sockets/sntp_client/src/main.c +++ b/samples/net/sockets/sntp_client/src/main.c @@ -12,6 +12,7 @@ LOG_MODULE_REGISTER(net_sntp_client_sample, LOG_LEVEL_DBG); #include #include #include +#include #include "net_sample_common.h" diff --git a/samples/net/sockets/tcp/src/main.c b/samples/net/sockets/tcp/src/main.c index 7b961e0c82133..9ab31578e6cfb 100644 --- a/samples/net/sockets/tcp/src/main.c +++ b/samples/net/sockets/tcp/src/main.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/samples/net/sockets/txtime/src/main.c b/samples/net/sockets/txtime/src/main.c index 870e10f8ff7ce..75b3bef979568 100644 --- a/samples/net/sockets/txtime/src/main.c +++ b/samples/net/sockets/txtime/src/main.c @@ -22,6 +22,9 @@ LOG_MODULE_REGISTER(net_txtime_sample, LOG_LEVEL_DBG); #include #include +#include +#include + #include "net_sample_common.h" #define APP_BANNER "Run SO_TXTIME client" diff --git a/samples/net/sockets/websocket_client/src/main.c b/samples/net/sockets/websocket_client/src/main.c index 17205cd812364..380de812556b2 100644 --- a/samples/net/sockets/websocket_client/src/main.c +++ b/samples/net/sockets/websocket_client/src/main.c @@ -7,6 +7,10 @@ #include LOG_MODULE_REGISTER(net_websocket_client_sample, LOG_LEVEL_DBG); +#include +#include +#include + #include #include #include diff --git a/samples/net/telnet/src/telnet.c b/samples/net/telnet/src/telnet.c index f8df416e39ae0..35de775993d37 100644 --- a/samples/net/telnet/src/telnet.c +++ b/samples/net/telnet/src/telnet.c @@ -26,7 +26,7 @@ static void setup_ipv6(void) struct in6_addr addr; struct net_if *iface = net_if_get_default(); - if (net_addr_pton(AF_INET6, MCAST_IP6ADDR, &addr)) { + if (net_addr_pton(NET_AF_INET6, MCAST_IP6ADDR, &addr)) { LOG_ERR("Invalid address: %s", MCAST_IP6ADDR); return; } diff --git a/samples/net/tftp_client/src/tftp-client.c b/samples/net/tftp_client/src/tftp-client.c index be65dadd5ea63..d5355d2be5292 100644 --- a/samples/net/tftp_client/src/tftp-client.c +++ b/samples/net/tftp_client/src/tftp-client.c @@ -11,6 +11,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include +#include #define APP_BANNER "Run TFTP client" #define TFTP_SAMPLE_DATA "Lorem ipsum dolor sit amet, consectetur adipiscing elit" diff --git a/samples/net/virtual/src/main.c b/samples/net/virtual/src/main.c index bbc803cd4a3c1..c2c2ae6942f6e 100644 --- a/samples/net/virtual/src/main.c +++ b/samples/net/virtual/src/main.c @@ -237,7 +237,7 @@ static int setup_iface(struct net_if *iface, if (IS_ENABLED(CONFIG_NET_IPV6) && net_if_flag_is_set(iface, NET_IF_IPV6)) { - if (net_addr_pton(AF_INET6, ipv6_addr, &addr6)) { + if (net_addr_pton(NET_AF_INET6, ipv6_addr, &addr6)) { LOG_ERR("Invalid address: %s", ipv6_addr); return -EINVAL; } @@ -254,9 +254,9 @@ static int setup_iface(struct net_if *iface, goto try_ipv4; } - params.family = AF_INET6; + params.family = NET_AF_INET6; - if (net_addr_pton(AF_INET6, peer6addr, &addr6)) { + if (net_addr_pton(NET_AF_INET6, peer6addr, &addr6)) { LOG_ERR("Cannot parse peer %s address %s to tunnel", "IPv6", peer6addr); } else { @@ -288,7 +288,7 @@ static int setup_iface(struct net_if *iface, if (IS_ENABLED(CONFIG_NET_IPV4) && net_if_flag_is_set(iface, NET_IF_IPV4)) { - if (net_addr_pton(AF_INET, ipv4_addr, &addr4)) { + if (net_addr_pton(NET_AF_INET, ipv4_addr, &addr4)) { LOG_ERR("Invalid address: %s", ipv4_addr); return -EINVAL; } @@ -304,7 +304,7 @@ static int setup_iface(struct net_if *iface, if (netmask) { struct in_addr nm; - if (net_addr_pton(AF_INET, netmask, &nm)) { + if (net_addr_pton(NET_AF_INET, netmask, &nm)) { LOG_ERR("Invalid netmask: %s", netmask); return -EINVAL; } @@ -316,9 +316,9 @@ static int setup_iface(struct net_if *iface, goto done; } - params.family = AF_INET; + params.family = NET_AF_INET; - if (net_addr_pton(AF_INET, peer4addr, &addr4)) { + if (net_addr_pton(NET_AF_INET, peer4addr, &addr4)) { LOG_ERR("Cannot parse peer %s address %s to tunnel", "IPv4", peer4addr); } else { diff --git a/samples/subsys/modbus/tcp_gateway/src/main.c b/samples/subsys/modbus/tcp_gateway/src/main.c index 3d30112ebd46d..2dbca06023672 100644 --- a/samples/subsys/modbus/tcp_gateway/src/main.c +++ b/samples/subsys/modbus/tcp_gateway/src/main.c @@ -10,6 +10,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include LOG_MODULE_REGISTER(tcp_gateway, LOG_LEVEL_INF); diff --git a/samples/subsys/modbus/tcp_server/src/main.c b/samples/subsys/modbus/tcp_server/src/main.c index 163fca98fc656..a8921bf563fd8 100644 --- a/samples/subsys/modbus/tcp_server/src/main.c +++ b/samples/subsys/modbus/tcp_server/src/main.c @@ -10,6 +10,13 @@ #include #include +#include +#include +#include +#include +#include +#include + #include #include diff --git a/subsys/logging/backends/Kconfig.net b/subsys/logging/backends/Kconfig.net index 87286fe3d875c..a789072d6858e 100644 --- a/subsys/logging/backends/Kconfig.net +++ b/subsys/logging/backends/Kconfig.net @@ -6,7 +6,6 @@ config LOG_BACKEND_NET bool "Networking backend" depends on NETWORKING && (NET_UDP || NET_TCP) && NET_SOCKETS && !LOG_MODE_IMMEDIATE - depends on POSIX_C_LANG_SUPPORT_R help Send syslog messages to network server. See RFC 5424 (syslog protocol) and RFC 5426 (syslog over UDP) and diff --git a/subsys/logging/backends/log_backend_net.c b/subsys/logging/backends/log_backend_net.c index 1c14971936b2b..3537cd5609c37 100644 --- a/subsys/logging/backends/log_backend_net.c +++ b/subsys/logging/backends/log_backend_net.c @@ -32,7 +32,7 @@ static char dev_hostname[MAX_HOSTNAME_LEN + 1]; static uint8_t output_buf[CONFIG_LOG_BACKEND_NET_MAX_BUF_SIZE]; static bool net_init_done; -struct sockaddr server_addr; +struct net_sockaddr server_addr; static bool panic_mode; static uint32_t log_format_current = CONFIG_LOG_BACKEND_NET_OUTPUT_DEFAULT; @@ -46,8 +46,8 @@ static struct log_backend_net_ctx { static int line_out(uint8_t *data, size_t length, void *output_ctx) { struct log_backend_net_ctx *ctx = (struct log_backend_net_ctx *)output_ctx; - struct msghdr msg = { 0 }; - struct iovec io_vector[2]; + struct net_msghdr msg = { 0 }; + struct net_iovec io_vector[2]; int pos = 0; int ret; @@ -91,15 +91,15 @@ LOG_OUTPUT_DEFINE(log_output_net, line_out, output_buf, sizeof(output_buf)); static int do_net_init(struct log_backend_net_ctx *ctx) { - socklen_t server_addr_len = 0; - int ret, proto = IPPROTO_UDP, type = SOCK_DGRAM; + net_socklen_t server_addr_len = 0; + int ret, proto = NET_IPPROTO_UDP, type = NET_SOCK_DGRAM; - if (IS_ENABLED(CONFIG_NET_IPV4) && server_addr.sa_family == AF_INET) { - server_addr_len = sizeof(struct sockaddr_in); + if (IS_ENABLED(CONFIG_NET_IPV4) && server_addr.sa_family == NET_AF_INET) { + server_addr_len = sizeof(struct net_sockaddr_in); } - if (IS_ENABLED(CONFIG_NET_IPV6) && server_addr.sa_family == AF_INET6) { - server_addr_len = sizeof(struct sockaddr_in6); + if (IS_ENABLED(CONFIG_NET_IPV6) && server_addr.sa_family == NET_AF_INET6) { + server_addr_len = sizeof(struct net_sockaddr_in6); } if (server_addr_len == 0) { @@ -108,8 +108,8 @@ static int do_net_init(struct log_backend_net_ctx *ctx) } if (ctx->is_tcp) { - proto = IPPROTO_TCP; - type = SOCK_STREAM; + proto = NET_IPPROTO_TCP; + type = NET_SOCK_STREAM; } ret = zsock_socket(server_addr.sa_family, type, proto); @@ -219,7 +219,7 @@ bool log_backend_net_set_addr(const char *addr) return ret; } - net_sin(&server_addr)->sin_port = htons(514); + net_sin(&server_addr)->sin_port = net_htons(514); ret = net_ipaddr_parse(addr, strlen(addr), &server_addr); if (!ret) { @@ -230,7 +230,7 @@ bool log_backend_net_set_addr(const char *addr) return ret; } -bool log_backend_net_set_ip(const struct sockaddr *addr) +bool log_backend_net_set_ip(const struct net_sockaddr *addr) { bool ret = check_net_init_done(); @@ -238,8 +238,8 @@ bool log_backend_net_set_ip(const struct sockaddr *addr) return ret; } - if ((IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) || - (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6)) { + if ((IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) || + (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6)) { memcpy(&server_addr, addr, sizeof(server_addr)); net_port_set_default(&server_addr, 514); diff --git a/subsys/mgmt/hawkbit/hawkbit.c b/subsys/mgmt/hawkbit/hawkbit.c index 1452836dc7a92..73ceac1dbff53 100644 --- a/subsys/mgmt/hawkbit/hawkbit.c +++ b/subsys/mgmt/hawkbit/hawkbit.c @@ -467,14 +467,14 @@ static bool start_http_client(int *hb_sock) struct zsock_addrinfo *addr; struct zsock_addrinfo hints = {0}; int resolve_attempts = 10; - int protocol = IS_ENABLED(CONFIG_HAWKBIT_USE_TLS) ? IPPROTO_TLS_1_2 : IPPROTO_TCP; + int protocol = IS_ENABLED(CONFIG_HAWKBIT_USE_TLS) ? NET_IPPROTO_TLS_1_2 : NET_IPPROTO_TCP; if (IS_ENABLED(CONFIG_NET_IPV6)) { - hints.ai_family = AF_INET6; - hints.ai_socktype = SOCK_STREAM; + hints.ai_family = NET_AF_INET6; + hints.ai_socktype = NET_SOCK_STREAM; } else if (IS_ENABLED(CONFIG_NET_IPV4)) { - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; + hints.ai_family = NET_AF_INET; + hints.ai_socktype = NET_SOCK_STREAM; } while (resolve_attempts--) { @@ -491,7 +491,7 @@ static bool start_http_client(int *hb_sock) return false; } - *hb_sock = zsock_socket(addr->ai_family, SOCK_STREAM, protocol); + *hb_sock = zsock_socket(addr->ai_family, NET_SOCK_STREAM, protocol); if (*hb_sock < 0) { LOG_ERR("Failed to create TCP socket"); goto err; @@ -502,13 +502,13 @@ static bool start_http_client(int *hb_sock) HAWKBIT_CERT_TAG, }; - if (zsock_setsockopt(*hb_sock, SOL_TLS, TLS_SEC_TAG_LIST, sec_tag_opt, + if (zsock_setsockopt(*hb_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, sec_tag_opt, sizeof(sec_tag_opt)) < 0) { LOG_ERR("Failed to set TLS_TAG option"); goto err_sock; } - if (zsock_setsockopt(*hb_sock, SOL_TLS, TLS_HOSTNAME, HAWKBIT_SERVER_DOMAIN, + if (zsock_setsockopt(*hb_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_HOSTNAME, HAWKBIT_SERVER_DOMAIN, sizeof(HAWKBIT_SERVER_DOMAIN)) < 0) { goto err_sock; } diff --git a/subsys/mgmt/mcumgr/transport/src/smp_udp.c b/subsys/mgmt/mcumgr/transport/src/smp_udp.c index 822f71fd5243c..ebdfefc7ce26f 100644 --- a/subsys/mgmt/mcumgr/transport/src/smp_udp.c +++ b/subsys/mgmt/mcumgr/transport/src/smp_udp.c @@ -42,8 +42,8 @@ BUILD_ASSERT(0, "Either IPv4 or IPv6 SMP must be enabled for the MCUmgr UDP SMP "CONFIG_MCUMGR_TRANSPORT_UDP_IPV4 or CONFIG_MCUMGR_TRANSPORT_UDP_IPV6"); #endif -BUILD_ASSERT(sizeof(struct sockaddr) <= CONFIG_MCUMGR_TRANSPORT_NETBUF_USER_DATA_SIZE, - "CONFIG_MCUMGR_TRANSPORT_NETBUF_USER_DATA_SIZE must be >= sizeof(struct sockaddr)"); +BUILD_ASSERT(sizeof(struct net_sockaddr) <= CONFIG_MCUMGR_TRANSPORT_NETBUF_USER_DATA_SIZE, + "CONFIG_MCUMGR_TRANSPORT_NETBUF_USER_DATA_SIZE must be >= sizeof(struct net_sockaddr)"); enum proto_type { PROTOCOL_IPV4 = 0, @@ -102,7 +102,7 @@ static const char *smp_udp_proto_to_name(enum proto_type proto) static int smp_udp4_tx(struct net_buf *nb) { int ret; - struct sockaddr *addr = net_buf_user_data(nb); + struct net_sockaddr *addr = net_buf_user_data(nb); ret = zsock_sendto(smp_udp_configs.ipv4.sock, nb->data, nb->len, 0, addr, sizeof(*addr)); @@ -126,7 +126,7 @@ static int smp_udp4_tx(struct net_buf *nb) static int smp_udp6_tx(struct net_buf *nb) { int ret; - struct sockaddr *addr = net_buf_user_data(nb); + struct net_sockaddr *addr = net_buf_user_data(nb); ret = zsock_sendto(smp_udp_configs.ipv6.sock, nb->data, nb->len, 0, addr, sizeof(*addr)); @@ -155,10 +155,10 @@ static uint16_t smp_udp_get_mtu(const struct net_buf *nb) static int smp_udp_ud_copy(struct net_buf *dst, const struct net_buf *src) { - struct sockaddr *src_ud = net_buf_user_data(src); - struct sockaddr *dst_ud = net_buf_user_data(dst); + struct net_sockaddr *src_ud = net_buf_user_data(src); + struct net_sockaddr *dst_ud = net_buf_user_data(dst); - memcpy(dst_ud, src_ud, sizeof(struct sockaddr)); + memcpy(dst_ud, src_ud, sizeof(struct net_sockaddr)); return MGMT_ERR_EOK; } @@ -167,8 +167,8 @@ static int create_socket(enum proto_type proto, int *sock) { int tmp_sock; int err; - struct sockaddr_storage addr_storage; - struct sockaddr *addr = (struct sockaddr *)&addr_storage; + struct net_sockaddr_storage addr_storage; + struct net_sockaddr *addr = (struct net_sockaddr *)&addr_storage; socklen_t addr_len = 0; #if defined(CONFIG_MCUMGR_TRANSPORT_UDP_DTLS) @@ -177,28 +177,28 @@ static int create_socket(enum proto_type proto, int *sock) if (IS_ENABLED(CONFIG_MCUMGR_TRANSPORT_UDP_IPV4) && proto == PROTOCOL_IPV4) { - struct sockaddr_in *addr4 = (struct sockaddr_in *)addr; + struct net_sockaddr_in *addr4 = (struct net_sockaddr_in *)addr; addr_len = sizeof(*addr4); memset(addr4, 0, sizeof(*addr4)); - addr4->sin_family = AF_INET; + addr4->sin_family = NET_AF_INET; addr4->sin_port = htons(CONFIG_MCUMGR_TRANSPORT_UDP_PORT); addr4->sin_addr.s_addr = htonl(INADDR_ANY); } else if (IS_ENABLED(CONFIG_MCUMGR_TRANSPORT_UDP_IPV6) && proto == PROTOCOL_IPV6) { - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr; + struct net_sockaddr_in6 *addr6 = (struct net_sockaddr_in6 *)addr; addr_len = sizeof(*addr6); memset(addr6, 0, sizeof(*addr6)); - addr6->sin6_family = AF_INET6; + addr6->sin6_family = NET_AF_INET6; addr6->sin6_port = htons(CONFIG_MCUMGR_TRANSPORT_UDP_PORT); addr6->sin6_addr = in6addr_any; } #if defined(CONFIG_MCUMGR_TRANSPORT_UDP_DTLS) - tmp_sock = zsock_socket(addr->sa_family, SOCK_DGRAM, IPPROTO_DTLS_1_2); + tmp_sock = zsock_socket(addr->sa_family, NET_SOCK_DGRAM, NET_IPPROTO_DTLS_1_2); #else - tmp_sock = zsock_socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP); + tmp_sock = zsock_socket(addr->sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); #endif err = errno; @@ -265,14 +265,14 @@ static void smp_udp_receive_thread(void *p1, void *p2, void *p3) LOG_INF("Started (%s)", smp_udp_proto_to_name(conf->proto)); while (1) { - struct sockaddr addr; + struct net_sockaddr addr; socklen_t addr_len = sizeof(addr); int len = zsock_recvfrom(conf->sock, conf->recv_buffer, CONFIG_MCUMGR_TRANSPORT_UDP_MTU, 0, &addr, &addr_len); if (len > 0) { - struct sockaddr *ud; + struct net_sockaddr *ud; struct net_buf *nb; /* Store sender address in user data for reply */ diff --git a/subsys/mgmt/updatehub/updatehub.c b/subsys/mgmt/updatehub/updatehub.c index 2cada59864ae6..370aa802b1f9f 100644 --- a/subsys/mgmt/updatehub/updatehub.c +++ b/subsys/mgmt/updatehub/updatehub.c @@ -175,20 +175,20 @@ static bool start_coap_client(void) memset(&hints, 0, sizeof(hints)); if (IS_ENABLED(CONFIG_NET_IPV6)) { - hints.ai_family = AF_INET6; - hints.ai_socktype = SOCK_STREAM; + hints.ai_family = NET_AF_INET6; + hints.ai_socktype = NET_SOCK_STREAM; } else if (IS_ENABLED(CONFIG_NET_IPV4)) { - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; + hints.ai_family = NET_AF_INET; + hints.ai_socktype = NET_SOCK_STREAM; } #if defined(CONFIG_UPDATEHUB_DTLS) int verify = TLS_PEER_VERIFY_REQUIRED; sec_tag_t sec_list[] = { CA_CERTIFICATE_TAG }; - int protocol = IPPROTO_DTLS_1_2; + int protocol = NET_IPPROTO_DTLS_1_2; char port[] = "5684"; #else - int protocol = IPPROTO_UDP; + int protocol = NET_IPPROTO_UDP; char port[] = "5683"; #endif @@ -206,7 +206,7 @@ static bool start_coap_client(void) ret = 1; - ctx.sock = zsock_socket(addr->ai_family, SOCK_DGRAM, protocol); + ctx.sock = zsock_socket(addr->ai_family, NET_SOCK_DGRAM, protocol); if (ctx.sock < 0) { LOG_ERR("Failed to create UDP socket"); goto error; @@ -215,13 +215,14 @@ static bool start_coap_client(void) ret = -1; #if defined(CONFIG_UPDATEHUB_DTLS) - if (zsock_setsockopt(ctx.sock, SOL_TLS, TLS_SEC_TAG_LIST, + if (zsock_setsockopt(ctx.sock, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, sec_list, sizeof(sec_list)) < 0) { LOG_ERR("Failed to set TLS_TAG option"); goto error; } - if (zsock_setsockopt(ctx.sock, SOL_TLS, TLS_PEER_VERIFY, &verify, sizeof(int)) < 0) { + if (zsock_setsockopt(ctx.sock, ZSOCK_SOL_TLS, ZSOCK_TLS_PEER_VERIFY, + &verify, sizeof(int)) < 0) { LOG_ERR("Failed to set TLS_PEER_VERIFY option"); goto error; } diff --git a/subsys/modem/modem_ppp.c b/subsys/modem/modem_ppp.c index eb3f54bf07f93..47c898979d68b 100644 --- a/subsys/modem/modem_ppp.c +++ b/subsys/modem/modem_ppp.c @@ -39,11 +39,11 @@ static uint16_t modem_ppp_fcs_final(uint16_t fcs) static uint16_t modem_ppp_ppp_protocol(struct net_pkt *pkt) { - if (net_pkt_family(pkt) == AF_INET) { + if (net_pkt_family(pkt) == NET_AF_INET) { return PPP_IP; } - if (net_pkt_family(pkt) == AF_INET6) { + if (net_pkt_family(pkt) == NET_AF_INET6) { return PPP_IPV6; } @@ -270,7 +270,7 @@ static void modem_ppp_process_received_byte(struct modem_ppp *ppp, uint8_t byte) if (net_pkt_available_buffer(ppp->rx_pkt) == 1) { if (net_pkt_alloc_buffer(ppp->rx_pkt, CONFIG_MODEM_PPP_NET_BUF_FRAG_SIZE, - AF_INET, K_NO_WAIT) < 0) { + NET_AF_INET, K_NO_WAIT) < 0) { LOG_WRN("Failed to alloc buffer"); net_pkt_unref(ppp->rx_pkt); ppp->rx_pkt = NULL; @@ -478,8 +478,8 @@ static int modem_ppp_ppp_api_send(const struct device *dev, struct net_pkt *pkt) } /* Validate packet protocol */ - if ((net_pkt_is_ppp(pkt) == false) && (net_pkt_family(pkt) != AF_INET) && - (net_pkt_family(pkt) != AF_INET6)) { + if ((net_pkt_is_ppp(pkt) == false) && (net_pkt_family(pkt) != NET_AF_INET) && + (net_pkt_family(pkt) != NET_AF_INET6)) { return -EPROTONOSUPPORT; } diff --git a/subsys/net/ip/6lo.c b/subsys/net/ip/6lo.c index be4ad0ff045ce..439bca628cd12 100644 --- a/subsys/net/ip/6lo.c +++ b/subsys/net/ip/6lo.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(net_6lo, CONFIG_NET_6LO_LOG_LEVEL); #if defined(CONFIG_NET_6LO_CONTEXT) struct net_6lo_context { - struct in6_addr prefix; + struct net_in6_addr prefix; struct net_if *iface; uint16_t lifetime; uint8_t is_used : 1; @@ -128,8 +128,8 @@ static inline bool net_6lo_ll_prefix_padded_with_zeros(const uint8_t *addr) static inline bool net_6lo_addr_16_bit_compressible(const uint8_t *addr) { - return ((UNALIGNED_GET((uint32_t *)addr + 2) == htonl(0xFFu)) && - (UNALIGNED_GET((uint16_t *)addr + 6) == htons(0xFE00u))); + return ((UNALIGNED_GET((uint32_t *)addr + 2) == net_htonl(0xFFu)) && + (UNALIGNED_GET((uint16_t *)addr + 6) == net_htons(0xFE00u))); } static inline bool net_6lo_maddr_8_bit_compressible(const uint8_t *addr) @@ -233,7 +233,7 @@ get_6lo_context_by_cid(struct net_if *iface, uint8_t cid) /* Get the context by addr */ static inline struct net_6lo_context * -get_6lo_context_by_addr(struct net_if *iface, struct in6_addr *addr) +get_6lo_context_by_addr(struct net_if *iface, struct net_in6_addr *addr) { uint8_t i; @@ -353,7 +353,7 @@ static uint8_t *compress_nh(struct net_ipv6_hdr *ipv6, uint8_t *inline_ptr, uint16_t *iphc) { /* Next header */ - if (ipv6->nexthdr == IPPROTO_UDP) { + if (ipv6->nexthdr == NET_IPPROTO_UDP) { *iphc |= NET_6LO_IPHC_NH_1; } else { inline_ptr -= sizeof(ipv6->nexthdr); @@ -613,9 +613,9 @@ static inline uint8_t *compress_nh_udp(struct net_udp_hdr *udp, uint8_t *inline_ memmove(inline_ptr_udp, &udp->chksum, sizeof(udp->chksum)); } - if ((((htons(udp->src_port) >> 4) & 0xFFF) == + if ((((net_htons(udp->src_port) >> 4) & 0xFFF) == NET_6LO_NHC_UDP_4_BIT_PORT) && - (((htons(udp->dst_port) >> 4) & 0xFFF) == + (((net_htons(udp->dst_port) >> 4) & 0xFFF) == NET_6LO_NHC_UDP_4_BIT_PORT)) { NET_DBG("UDP ports src and dst 4 bits inlined"); @@ -624,14 +624,14 @@ static inline uint8_t *compress_nh_udp(struct net_udp_hdr *udp, uint8_t *inline_ */ nhc |= NET_6LO_NHC_UDP_PORT_11; - tmp = (uint8_t)(htons(udp->src_port)); + tmp = (uint8_t)(net_htons(udp->src_port)); tmp = tmp << 4; - tmp |= (((uint8_t)(htons(udp->dst_port))) & 0x0F); + tmp |= (((uint8_t)(net_htons(udp->dst_port))) & 0x0F); inline_ptr_udp -= sizeof(tmp); *inline_ptr_udp = tmp; - } else if (((htons(udp->dst_port) >> 8) & 0xFF) == + } else if (((net_htons(udp->dst_port) >> 8) & 0xFF) == NET_6LO_NHC_UDP_8_BIT_PORT) { NET_DBG("UDP ports src full, dst 8 bits inlined"); @@ -641,12 +641,12 @@ static inline uint8_t *compress_nh_udp(struct net_udp_hdr *udp, uint8_t *inline_ nhc |= NET_6LO_NHC_UDP_PORT_01; inline_ptr_udp -= sizeof(uint8_t); - *inline_ptr_udp = (uint8_t)(htons(udp->dst_port)); + *inline_ptr_udp = (uint8_t)(net_htons(udp->dst_port)); inline_ptr_udp -= sizeof(udp->src_port); memmove(inline_ptr_udp, &udp->src_port, sizeof(udp->src_port)); - } else if (((htons(udp->src_port) >> 8) & 0xFF) == + } else if (((net_htons(udp->src_port) >> 8) & 0xFF) == NET_6LO_NHC_UDP_8_BIT_PORT) { NET_DBG("UDP ports src 8bits, dst full inlined"); @@ -659,7 +659,7 @@ static inline uint8_t *compress_nh_udp(struct net_udp_hdr *udp, uint8_t *inline_ memmove(inline_ptr_udp, &udp->dst_port, sizeof(udp->dst_port)); inline_ptr_udp -= sizeof(uint8_t); - *inline_ptr_udp = (uint8_t)(htons(udp->src_port)); + *inline_ptr_udp = (uint8_t)(net_htons(udp->src_port)); } else { NET_DBG("Can not compress ports, ports are inlined"); @@ -685,7 +685,7 @@ static struct net_6lo_context *get_src_addr_ctx(struct net_pkt *pkt, struct net_6lo_context *src; src = get_6lo_context_by_addr(net_pkt_iface(pkt), - (struct in6_addr *)ipv6->src); + (struct net_in6_addr *)ipv6->src); if (!src || !src->compress) { return NULL; } @@ -700,7 +700,7 @@ static struct net_6lo_context *get_dst_addr_ctx(struct net_pkt *pkt, struct net_6lo_context *dst; dst = get_6lo_context_by_addr(net_pkt_iface(pkt), - (struct in6_addr *)ipv6->dst); + (struct net_in6_addr *)ipv6->dst); if (!dst || !dst->compress) { return NULL; } @@ -735,7 +735,7 @@ static inline int compress_IPHC_header(struct net_pkt *pkt) return -EINVAL; } - if (ipv6->nexthdr == IPPROTO_UDP && + if (ipv6->nexthdr == NET_IPPROTO_UDP && pkt->frags->len < NET_IPV6UDPH_LEN) { NET_ERR("Invalid length %d, min %d", pkt->frags->len, NET_IPV6UDPH_LEN); @@ -744,7 +744,7 @@ static inline int compress_IPHC_header(struct net_pkt *pkt) inline_pos = pkt->buffer->data + NET_IPV6H_LEN; - if (ipv6->nexthdr == IPPROTO_UDP) { + if (ipv6->nexthdr == NET_IPPROTO_UDP) { udp = (struct net_udp_hdr *)inline_pos; inline_pos += NET_UDPH_LEN; @@ -778,7 +778,7 @@ static inline int compress_IPHC_header(struct net_pkt *pkt) goto sa_end; } - if (net_ipv6_is_addr_unspecified((struct in6_addr *)ipv6->src)) { + if (net_ipv6_is_addr_unspecified((struct net_in6_addr *)ipv6->src)) { NET_DBG("SAM_00, SAC_1 unspecified src address"); /* Unspecified IPv6 src address */ @@ -819,7 +819,7 @@ static inline int compress_IPHC_header(struct net_pkt *pkt) #endif inline_pos -= sizeof(iphc); - iphc = htons(iphc); + iphc = net_htons(iphc); memmove(inline_pos, &iphc, sizeof(iphc)); compressed = inline_pos - pkt->buffer->data; @@ -920,7 +920,7 @@ static inline uint8_t *uncompress_sa(uint16_t iphc, uint8_t *cursor, struct net_ipv6_hdr *ipv6, struct net_pkt *pkt) { - struct in6_addr src_ip; + struct net_in6_addr src_ip; NET_DBG("SAC_0"); @@ -981,7 +981,7 @@ static inline uint8_t *uncompress_sa_ctx(uint16_t iphc, uint8_t *cursor, struct net_6lo_context *ctx, struct net_pkt *pkt) { - struct in6_addr src_ip; + struct net_in6_addr src_ip; net_ipv6_addr_copy_raw((uint8_t *)&src_ip, ipv6->src); @@ -1041,7 +1041,7 @@ static inline uint8_t *uncompress_sa_ctx(uint16_t iphc, uint8_t *cursor, static inline uint8_t *uncompress_da_mcast(uint16_t iphc, uint8_t *cursor, struct net_ipv6_hdr *ipv6) { - struct in6_addr dst_ip; + struct net_in6_addr dst_ip; NET_DBG("Dst is multicast"); @@ -1126,7 +1126,7 @@ static inline uint8_t *uncompress_da(uint16_t iphc, uint8_t *cursor, struct net_ipv6_hdr *ipv6, struct net_pkt *pkt) { - struct in6_addr dst_ip; + struct net_in6_addr dst_ip; NET_DBG("DAC_0"); @@ -1188,7 +1188,7 @@ static inline uint8_t *uncompress_da_ctx(uint16_t iphc, uint8_t *cursor, struct net_6lo_context *ctx, struct net_pkt *pkt) { - struct in6_addr dst_ip; + struct net_in6_addr dst_ip; NET_DBG("DAC_1"); @@ -1275,7 +1275,7 @@ static uint8_t *uncompress_nh_udp(uint8_t nhc, uint8_t *cursor, memmove(&udp->src_port, cursor, sizeof(udp->src_port)); cursor += sizeof(udp->src_port); - udp->dst_port = htons(((uint16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) | + udp->dst_port = net_htons(((uint16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) | *cursor); cursor++; @@ -1283,7 +1283,7 @@ static uint8_t *uncompress_nh_udp(uint8_t nhc, uint8_t *cursor, case NET_6LO_NHC_UDP_PORT_10: NET_DBG("src 8 bits, dst full inlined"); - udp->src_port = htons(((uint16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) | + udp->src_port = net_htons(((uint16_t)NET_6LO_NHC_UDP_8_BIT_PORT << 8) | *cursor); cursor++; memmove(&udp->dst_port, cursor, sizeof(udp->dst_port)); @@ -1293,10 +1293,10 @@ static uint8_t *uncompress_nh_udp(uint8_t nhc, uint8_t *cursor, case NET_6LO_NHC_UDP_PORT_11: NET_DBG("src and dst 4 bits inlined"); - udp->src_port = htons((NET_6LO_NHC_UDP_4_BIT_PORT << 4) | + udp->src_port = net_htons((NET_6LO_NHC_UDP_4_BIT_PORT << 4) | (*cursor >> 4)); - udp->dst_port = htons((NET_6LO_NHC_UDP_4_BIT_PORT << 4) | + udp->dst_port = net_htons((NET_6LO_NHC_UDP_4_BIT_PORT << 4) | (*cursor & 0x0F)); cursor++; @@ -1353,7 +1353,7 @@ static bool uncompress_IPHC_header(struct net_pkt *pkt) struct net_6lo_context *dst = NULL; #endif - iphc = ntohs(UNALIGNED_GET((uint16_t *)pkt->buffer->data)); + iphc = net_ntohs(UNALIGNED_GET((uint16_t *)pkt->buffer->data)); inline_size = get_ihpc_inlined_size(iphc); if (inline_size < 0) { @@ -1485,7 +1485,7 @@ static bool uncompress_IPHC_header(struct net_pkt *pkt) } if (iphc & NET_6LO_IPHC_NH_MASK) { - ipv6->nexthdr = IPPROTO_UDP; + ipv6->nexthdr = NET_IPPROTO_UDP; udp = (struct net_udp_hdr *)(frag->data + NET_IPV6H_LEN); /* skip nhc */ cursor++; @@ -1499,10 +1499,10 @@ static bool uncompress_IPHC_header(struct net_pkt *pkt) /* Set IPv6 header and UDP (if next header is) length */ len = net_pkt_get_len(pkt) - NET_IPV6H_LEN; - ipv6->len = htons(len); + ipv6->len = net_htons(len); - if (ipv6->nexthdr == IPPROTO_UDP && udp) { - udp->len = htons(len); + if (ipv6->nexthdr == NET_IPPROTO_UDP && udp) { + udp->len = net_htons(len); if (nhc & NET_6LO_NHC_UDP_CHECKSUM) { udp->chksum = net_calc_chksum_udp(pkt); @@ -1602,7 +1602,7 @@ int net_6lo_uncompress_hdr_diff(struct net_pkt *pkt) return 0; } - iphc = ntohs(UNALIGNED_GET((uint16_t *)pkt->buffer->data)); + iphc = net_ntohs(UNALIGNED_GET((uint16_t *)pkt->buffer->data)); inline_size = get_ihpc_inlined_size(iphc); if (inline_size < 0) { diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig index 2d35de954a95f..11eb35fcb32c3 100644 --- a/subsys/net/ip/Kconfig +++ b/subsys/net/ip/Kconfig @@ -8,6 +8,16 @@ menu "IP stack" +config NET_NAMESPACE_COMPAT_MODE + bool "Network namespace compatibility mode" + default y + help + The networking APIs and code is now namespaced i.e., relevant network + APIs now have either net_, NET_ or ZSOCK_ prefixes. This avoids + circular dependency against a Posix subsystem which might define + duplicate symbols. The compatibility mode will be deprecated in the + future and eventually removed. + # Hidden option enabled whenever an IP stack is available. config NET_IP bool diff --git a/subsys/net/ip/canbus_socket.c b/subsys/net/ip/canbus_socket.c index 5a2debc2e092f..7419ba3e296b6 100644 --- a/subsys/net/ip/canbus_socket.c +++ b/subsys/net/ip/canbus_socket.c @@ -20,10 +20,10 @@ LOG_MODULE_REGISTER(net_sockets_can, CONFIG_NET_SOCKETS_LOG_LEVEL); enum net_verdict net_canbus_socket_input(struct net_pkt *pkt) { - __ASSERT_NO_MSG(net_pkt_family(pkt) == AF_CAN); + __ASSERT_NO_MSG(net_pkt_family(pkt) == NET_AF_CAN); if (net_if_l2(net_pkt_iface(pkt)) == &NET_L2_GET_NAME(CANBUS_RAW)) { - return net_conn_can_input(pkt, CAN_RAW); + return net_conn_can_input(pkt, NET_CAN_RAW); } return NET_CONTINUE; diff --git a/subsys/net/ip/connection.c b/subsys/net/ip/connection.c index 70e856806f5dc..2b31fe90a877c 100644 --- a/subsys/net/ip/connection.c +++ b/subsys/net/ip/connection.c @@ -71,11 +71,11 @@ void conn_register_debug(struct net_conn *conn, if (conn->flags & NET_CONN_REMOTE_ADDR_SET) { if (IS_ENABLED(CONFIG_NET_IPV6) && - conn->family == AF_INET6) { + conn->family == NET_AF_INET6) { snprintk(dst, sizeof(dst), "%s", net_sprint_ipv6_addr(&net_sin6(&conn->remote_addr)->sin6_addr)); } else if (IS_ENABLED(CONFIG_NET_IPV4) && - conn->family == AF_INET) { + conn->family == NET_AF_INET) { snprintk(dst, sizeof(dst), "%s", net_sprint_ipv4_addr(&net_sin(&conn->remote_addr)->sin_addr)); } else { @@ -87,11 +87,11 @@ void conn_register_debug(struct net_conn *conn, if (conn->flags & NET_CONN_LOCAL_ADDR_SET) { if (IS_ENABLED(CONFIG_NET_IPV6) && - conn->family == AF_INET6) { + conn->family == NET_AF_INET6) { snprintk(src, sizeof(src), "%s", net_sprint_ipv6_addr(&net_sin6(&conn->local_addr)->sin6_addr)); } else if (IS_ENABLED(CONFIG_NET_IPV4) && - conn->family == AF_INET) { + conn->family == NET_AF_INET) { snprintk(src, sizeof(src), "%s", net_sprint_ipv4_addr(&net_sin(&conn->local_addr)->sin_addr)); } else { @@ -153,8 +153,8 @@ static void conn_set_unused(struct net_conn *conn) /* Check if we already have identical connection handler installed. */ static struct net_conn *conn_find_handler(struct net_if *iface, uint16_t proto, uint8_t family, - const struct sockaddr *remote_addr, - const struct sockaddr *local_addr, + const struct net_sockaddr *remote_addr, + const struct net_sockaddr *local_addr, uint16_t remote_port, uint16_t local_port, bool reuseport_set) @@ -179,7 +179,7 @@ static struct net_conn *conn_find_handler(struct net_if *iface, } if (IS_ENABLED(CONFIG_NET_IPV6) && - local_addr->sa_family == AF_INET6 && + local_addr->sa_family == NET_AF_INET6 && local_addr->sa_family == conn->local_addr.sa_family) { if (!net_ipv6_addr_cmp( @@ -189,7 +189,7 @@ static struct net_conn *conn_find_handler(struct net_if *iface, continue; } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - local_addr->sa_family == AF_INET && + local_addr->sa_family == NET_AF_INET && local_addr->sa_family == conn->local_addr.sa_family) { if (!net_ipv4_addr_cmp( @@ -206,7 +206,7 @@ static struct net_conn *conn_find_handler(struct net_if *iface, } if (net_sin(&conn->local_addr)->sin_port != - htons(local_port)) { + net_htons(local_port)) { continue; } @@ -216,7 +216,7 @@ static struct net_conn *conn_find_handler(struct net_if *iface, } if (IS_ENABLED(CONFIG_NET_IPV6) && - remote_addr->sa_family == AF_INET6 && + remote_addr->sa_family == NET_AF_INET6 && remote_addr->sa_family == conn->remote_addr.sa_family) { if (!net_ipv6_addr_cmp( @@ -226,7 +226,7 @@ static struct net_conn *conn_find_handler(struct net_if *iface, continue; } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - remote_addr->sa_family == AF_INET && + remote_addr->sa_family == NET_AF_INET && remote_addr->sa_family == conn->remote_addr.sa_family) { if (!net_ipv4_addr_cmp( @@ -246,7 +246,7 @@ static struct net_conn *conn_find_handler(struct net_if *iface, } if (net_sin(&conn->remote_addr)->sin_port != - htons(remote_port)) { + net_htons(remote_port)) { continue; } @@ -276,7 +276,7 @@ static void net_conn_change_callback(struct net_conn *conn, } static int net_conn_change_remote(struct net_conn *conn, - const struct sockaddr *remote_addr, + const struct net_sockaddr *remote_addr, uint16_t remote_port) { NET_DBG("[%zu] connection handler %p changed remote", @@ -284,9 +284,9 @@ static int net_conn_change_remote(struct net_conn *conn, if (remote_addr) { if (IS_ENABLED(CONFIG_NET_IPV6) && - remote_addr->sa_family == AF_INET6) { + remote_addr->sa_family == NET_AF_INET6) { memcpy(&conn->remote_addr, remote_addr, - sizeof(struct sockaddr_in6)); + sizeof(struct net_sockaddr_in6)); if (!net_ipv6_is_addr_unspecified( &net_sin6(remote_addr)-> @@ -294,9 +294,9 @@ static int net_conn_change_remote(struct net_conn *conn, conn->flags |= NET_CONN_REMOTE_ADDR_SPEC; } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - remote_addr->sa_family == AF_INET) { + remote_addr->sa_family == NET_AF_INET) { memcpy(&conn->remote_addr, remote_addr, - sizeof(struct sockaddr_in)); + sizeof(struct net_sockaddr_in)); if (net_sin(remote_addr)->sin_addr.s_addr) { conn->flags |= NET_CONN_REMOTE_ADDR_SPEC; @@ -314,7 +314,7 @@ static int net_conn_change_remote(struct net_conn *conn, if (remote_port) { conn->flags |= NET_CONN_REMOTE_PORT_SPEC; - net_sin(&conn->remote_addr)->sin_port = htons(remote_port); + net_sin(&conn->remote_addr)->sin_port = net_htons(remote_port); } else { conn->flags &= ~NET_CONN_REMOTE_PORT_SPEC; } @@ -323,7 +323,7 @@ static int net_conn_change_remote(struct net_conn *conn, } static int net_conn_change_local(struct net_conn *conn, - const struct sockaddr *local_addr, + const struct net_sockaddr *local_addr, uint16_t local_port) { NET_DBG("[%zu] connection handler %p changed local", @@ -331,30 +331,30 @@ static int net_conn_change_local(struct net_conn *conn, if (local_addr != NULL) { if (IS_ENABLED(CONFIG_NET_IPV6) && - local_addr->sa_family == AF_INET6) { + local_addr->sa_family == NET_AF_INET6) { memcpy(&conn->local_addr, local_addr, - sizeof(struct sockaddr_in6)); + sizeof(struct net_sockaddr_in6)); if (!net_ipv6_is_addr_unspecified( &net_sin6(local_addr)->sin6_addr)) { conn->flags |= NET_CONN_LOCAL_ADDR_SPEC; } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - local_addr->sa_family == AF_INET) { + local_addr->sa_family == NET_AF_INET) { memcpy(&conn->local_addr, local_addr, - sizeof(struct sockaddr_in)); + sizeof(struct net_sockaddr_in)); if (net_sin(local_addr)->sin_addr.s_addr) { conn->flags |= NET_CONN_LOCAL_ADDR_SPEC; } } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && - local_addr->sa_family == AF_CAN) { + local_addr->sa_family == NET_AF_CAN) { memcpy(&conn->local_addr, local_addr, - sizeof(struct sockaddr_can)); + sizeof(struct net_sockaddr_can)); } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - local_addr->sa_family == AF_PACKET) { + local_addr->sa_family == NET_AF_PACKET) { memcpy(&conn->local_addr, local_addr, - sizeof(struct sockaddr_ll)); + sizeof(struct net_sockaddr_ll)); } else { NET_ERR("Local address family not set"); return -EINVAL; @@ -368,7 +368,7 @@ static int net_conn_change_local(struct net_conn *conn, if (local_port > 0U) { conn->flags |= NET_CONN_LOCAL_PORT_SPEC; - net_sin(&conn->local_addr)->sin_port = htons(local_port); + net_sin(&conn->local_addr)->sin_port = net_htons(local_port); } else { conn->flags &= ~NET_CONN_LOCAL_PORT_SPEC; } @@ -377,8 +377,8 @@ static int net_conn_change_local(struct net_conn *conn, } int net_conn_register(uint16_t proto, enum net_sock_type type, uint8_t family, - const struct sockaddr *remote_addr, - const struct sockaddr *local_addr, + const struct net_sockaddr *remote_addr, + const struct net_sockaddr *local_addr, uint16_t remote_port, uint16_t local_port, struct net_context *context, @@ -473,9 +473,9 @@ int net_conn_unregister(struct net_conn_handle *handle) int net_conn_update(struct net_conn_handle *handle, net_conn_cb_t cb, void *user_data, - const struct sockaddr *remote_addr, + const struct net_sockaddr *remote_addr, uint16_t remote_port, - const struct sockaddr *local_addr, + const struct net_sockaddr *local_addr, uint16_t local_port) { struct net_conn *conn = (struct net_conn *)handle; @@ -503,7 +503,7 @@ int net_conn_update(struct net_conn_handle *handle, static bool conn_addr_cmp(struct net_pkt *pkt, union net_ip_header *ip_hdr, - struct sockaddr *addr, + struct net_sockaddr *addr, bool is_remote) { if (addr->sa_family != net_pkt_family(pkt)) { @@ -511,8 +511,8 @@ static bool conn_addr_cmp(struct net_pkt *pkt, } if (IS_ENABLED(CONFIG_NET_IPV6) && - net_pkt_family(pkt) == AF_INET6 && - addr->sa_family == AF_INET6) { + net_pkt_family(pkt) == NET_AF_INET6 && + addr->sa_family == NET_AF_INET6) { uint8_t *addr6; if (is_remote) { @@ -531,8 +531,8 @@ static bool conn_addr_cmp(struct net_pkt *pkt, return true; } else if (IS_ENABLED(CONFIG_NET_IPV4) && - net_pkt_family(pkt) == AF_INET && - addr->sa_family == AF_INET) { + net_pkt_family(pkt) == NET_AF_INET && + addr->sa_family == NET_AF_INET) { uint8_t *addr4; if (is_remote) { @@ -558,7 +558,7 @@ static inline void conn_send_icmp_error(struct net_pkt *pkt) return; } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { net_icmpv6_send_error(pkt, NET_ICMPV6_DST_UNREACH, NET_ICMPV6_DST_UNREACH_NO_PORT, 0); @@ -575,11 +575,11 @@ static bool conn_are_endpoints_valid(struct net_pkt *pkt, uint8_t family, bool is_my_src_addr; bool is_same_src_and_dst_addr; - if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { is_my_src_addr = net_ipv4_is_my_addr_raw(ip_hdr->ipv4->src); is_same_src_and_dst_addr = net_ipv4_addr_cmp_raw( ip_hdr->ipv4->src, ip_hdr->ipv4->dst); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + } else if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { is_my_src_addr = net_ipv6_is_my_addr_raw(ip_hdr->ipv6->src); is_same_src_and_dst_addr = net_ipv6_addr_cmp_raw( ip_hdr->ipv6->src, ip_hdr->ipv6->dst); @@ -639,11 +639,11 @@ static void conn_raw_socket_deliver(struct net_pkt *pkt, struct net_conn *conn, #if defined(CONFIG_NET_SOCKETS_PACKET) void net_conn_packet_input(struct net_pkt *pkt, uint16_t proto, enum net_sock_type type) { - struct sockaddr_ll *local; + struct net_sockaddr_ll *local; struct net_conn *conn; - /* Only accept input with AF_PACKET family. */ - if (net_pkt_family(pkt) != AF_PACKET) { + /* Only accept input with NET_AF_PACKET family. */ + if (net_pkt_family(pkt) != NET_AF_PACKET) { return; } @@ -658,12 +658,12 @@ void net_conn_packet_input(struct net_pkt *pkt, uint16_t proto, enum net_sock_ty } /* If there are other listening connections than - * AF_PACKET, the packet shall be also passed back to + * NET_AF_PACKET, the packet shall be also passed back to * net_conn_input() in upper layer processing in order to * re-check if there is any listening socket interested * in this packet. */ - if (conn->family != AF_PACKET) { + if (conn->family != NET_AF_PACKET) { continue; /* wrong family */ } @@ -678,7 +678,7 @@ void net_conn_packet_input(struct net_pkt *pkt, uint16_t proto, enum net_sock_ty /* Allow proto mismatch if socket was created with ETH_P_ALL, or it's raw * packet socket input. */ - if (conn->proto != proto && conn->proto != ETH_P_ALL && type != SOCK_RAW) { + if (conn->proto != proto && conn->proto != ETH_P_ALL && type != NET_SOCK_RAW) { continue; /* wrong protocol */ } @@ -686,7 +686,7 @@ void net_conn_packet_input(struct net_pkt *pkt, uint16_t proto, enum net_sock_ty /* Unbound sockets should collect packets from all interfaces. */ if ((conn->flags & NET_CONN_LOCAL_ADDR_SET) != 0U) { - local = (struct sockaddr_ll *)&conn->local_addr; + local = (struct net_sockaddr_ll *)&conn->local_addr; if (local->sll_ifindex != 0 && local->sll_ifindex != net_if_get_by_iface(net_pkt_iface(pkt))) { continue; @@ -717,7 +717,7 @@ enum net_verdict net_conn_raw_ip_input(struct net_pkt *pkt, uint8_t pkt_family = net_pkt_family(pkt); struct net_conn *conn; - if (pkt_family != AF_INET && pkt_family != AF_INET6) { + if (pkt_family != NET_AF_INET && pkt_family != NET_AF_INET6) { return NET_CONTINUE; } @@ -736,11 +736,11 @@ enum net_verdict net_conn_raw_ip_input(struct net_pkt *pkt, continue; /* wrong family */ } - if (conn->type != SOCK_RAW) { + if (conn->type != NET_SOCK_RAW) { continue; /* wrong type */ } - if (conn->proto != proto && conn->proto != IPPROTO_IP) { + if (conn->proto != proto && conn->proto != NET_IPPROTO_IP) { continue; /* wrong protocol */ } @@ -781,7 +781,7 @@ enum net_verdict net_conn_can_input(struct net_pkt *pkt, uint8_t proto) void *user_data = NULL; /* Only accept input with AF_CAN family and CAN_RAW protocol. */ - if (net_pkt_family(pkt) != AF_CAN || proto != CAN_RAW) { + if (net_pkt_family(pkt) != NET_AF_CAN || proto != NET_CAN_RAW) { return NET_DROP; } @@ -796,11 +796,11 @@ enum net_verdict net_conn_can_input(struct net_pkt *pkt, uint8_t proto) continue; /* wrong interface */ } - if (conn->family != AF_CAN) { + if (conn->family != NET_AF_CAN) { continue; /* wrong family */ } - if (conn->proto != CAN_RAW) { + if (conn->proto != NET_CAN_RAW) { continue; /* wrong protocol */ } @@ -859,11 +859,11 @@ enum net_verdict net_conn_input(struct net_pkt *pkt, return NET_DROP; } - if (pkt_family == AF_INET || pkt_family == AF_INET6) { - if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) { + if (pkt_family == NET_AF_INET || pkt_family == NET_AF_INET6) { + if (IS_ENABLED(CONFIG_NET_UDP) && proto == NET_IPPROTO_UDP) { src_port = proto_hdr->udp->src_port; dst_port = proto_hdr->udp->dst_port; - } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) { + } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == NET_IPPROTO_TCP) { if (proto_hdr->tcp == NULL) { return NET_DROP; } @@ -882,7 +882,7 @@ enum net_verdict net_conn_input(struct net_pkt *pkt, NET_DBG("Check %s listener for pkt %p src port %u dst port %u" " family %d", net_proto2str(net_pkt_family(pkt), proto), pkt, - ntohs(src_port), ntohs(dst_port), net_pkt_family(pkt)); + net_ntohs(src_port), net_ntohs(dst_port), net_pkt_family(pkt)); struct net_conn *best_match = NULL; int16_t best_rank = -1; @@ -896,14 +896,14 @@ enum net_verdict net_conn_input(struct net_pkt *pkt, /* If we receive a packet with multicast destination address, we might * need to deliver the packet to multiple recipients. */ - if (IS_ENABLED(CONFIG_NET_IPV4) && pkt_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && pkt_family == NET_AF_INET) { if (net_ipv4_is_addr_mcast_raw(ip_hdr->ipv4->dst)) { is_mcast_pkt = true; } else if (net_if_ipv4_is_addr_bcast_raw(pkt_iface, ip_hdr->ipv4->dst)) { is_bcast_pkt = true; } - } else if (IS_ENABLED(CONFIG_NET_IPV6) && pkt_family == AF_INET6) { + } else if (IS_ENABLED(CONFIG_NET_IPV6) && pkt_family == NET_AF_INET6) { is_mcast_pkt = net_ipv6_is_addr_mcast_raw(ip_hdr->ipv6->dst); } @@ -916,10 +916,10 @@ enum net_verdict net_conn_input(struct net_pkt *pkt, } /* Is the candidate connection matching the packet's protocol family? */ - if (conn->family != AF_UNSPEC && conn->family != pkt_family) { + if (conn->family != NET_AF_UNSPEC && conn->family != pkt_family) { if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) { - if (!(conn->family == AF_INET6 && pkt_family == AF_INET && - !conn->v6only && conn->type != SOCK_RAW)) { + if (!(conn->family == NET_AF_INET6 && pkt_family == NET_AF_INET && + !conn->v6only && conn->type != NET_SOCK_RAW)) { continue; } } else { @@ -938,8 +938,8 @@ enum net_verdict net_conn_input(struct net_pkt *pkt, uint8_t conn_family = conn->family; if ((IS_ENABLED(CONFIG_NET_UDP) || IS_ENABLED(CONFIG_NET_TCP)) && - (conn_family == AF_INET || conn_family == AF_INET6 || - conn_family == AF_UNSPEC)) { + (conn_family == NET_AF_INET || conn_family == NET_AF_INET6 || + conn_family == NET_AF_UNSPEC)) { /* Is the candidate connection matching the packet's TCP/UDP * address and port? */ @@ -967,7 +967,8 @@ enum net_verdict net_conn_input(struct net_pkt *pkt, * address by mapping it to IPv6 address. */ if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) { - if (!(conn->family == AF_INET6 && pkt_family == AF_INET && + if (!(conn->family == NET_AF_INET6 && + pkt_family == NET_AF_INET && !conn->v6only && net_ipv6_is_addr_unspecified( &net_sin6(&conn->local_addr)->sin6_addr))) { @@ -1054,9 +1055,9 @@ enum net_verdict net_conn_input(struct net_pkt *pkt, NET_DBG("No match found."); - if ((pkt_family == AF_INET || pkt_family == AF_INET6) && + if ((pkt_family == NET_AF_INET || pkt_family == NET_AF_INET6) && !(is_mcast_pkt || is_bcast_pkt)) { - if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP && + if (IS_ENABLED(CONFIG_NET_TCP) && proto == NET_IPPROTO_TCP && IS_ENABLED(CONFIG_NET_TCP_REJECT_CONN_WITH_RST)) { net_tcp_reply_rst(pkt); net_stats_update_tcp_seg_connrst(pkt_iface); diff --git a/subsys/net/ip/connection.h b/subsys/net/ip/connection.h index cbdbc9e0e946c..0e977190ff009 100644 --- a/subsys/net/ip/connection.h +++ b/subsys/net/ip/connection.h @@ -55,10 +55,10 @@ struct net_conn { sys_snode_t node; /** Remote socket address */ - struct sockaddr remote_addr; + struct net_sockaddr remote_addr; /** Local socket address */ - struct sockaddr local_addr; + struct net_sockaddr local_addr; /** Callback to be called when matching net packet is received */ net_conn_cb_t cb; @@ -92,8 +92,8 @@ struct net_conn { * is received corresponding to received packet. * * @param proto Protocol for the connection (depends on the protocol - * family, e.g. UDP/TCP in the case of AF_INET/AF_INET6) - * @param type Connection type (SOCK_STREAM/DGRAM/RAW) + * family, e.g. UDP/TCP in the case of NET_AF_INET/NET_AF_INET6) + * @param type Connection type (NET_SOCK_STREAM/DGRAM/RAW) * @param family Protocol family (AF_*) * @param remote_addr Remote address of the connection end point. * @param local_addr Local address of the connection end point. @@ -108,8 +108,8 @@ struct net_conn { */ #if defined(CONFIG_NET_NATIVE) int net_conn_register(uint16_t proto, enum net_sock_type type, uint8_t family, - const struct sockaddr *remote_addr, - const struct sockaddr *local_addr, + const struct net_sockaddr *remote_addr, + const struct net_sockaddr *local_addr, uint16_t remote_port, uint16_t local_port, struct net_context *context, @@ -119,8 +119,8 @@ int net_conn_register(uint16_t proto, enum net_sock_type type, uint8_t family, #else static inline int net_conn_register(uint16_t proto, enum net_sock_type type, uint8_t family, - const struct sockaddr *remote_addr, - const struct sockaddr *local_addr, + const struct net_sockaddr *remote_addr, + const struct net_sockaddr *local_addr, uint16_t remote_port, uint16_t local_port, struct net_context *context, @@ -178,9 +178,9 @@ static inline int net_conn_unregister(struct net_conn_handle *handle) int net_conn_update(struct net_conn_handle *handle, net_conn_cb_t cb, void *user_data, - const struct sockaddr *remote_addr, + const struct net_sockaddr *remote_addr, uint16_t remote_port, - const struct sockaddr *local_addr, + const struct net_sockaddr *local_addr, uint16_t local_port); /** diff --git a/subsys/net/ip/icmp.c b/subsys/net/ip/icmp.c index b4769ee8c9415..150fe2473d5d7 100644 --- a/subsys/net/ip/icmp.c +++ b/subsys/net/ip/icmp.c @@ -57,7 +57,7 @@ int net_icmp_init_ctx(struct net_icmp_ctx *ctx, uint8_t family, uint8_t type, return -EINVAL; } - if (family != AF_INET && family != AF_INET6) { + if (family != NET_AF_INET && family != NET_AF_INET6) { NET_ERR("Wrong address family"); return -EINVAL; } @@ -125,7 +125,7 @@ int net_icmp_cleanup_ctx(struct net_icmp_ctx *ctx) #if defined(CONFIG_NET_IPV4) static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, struct net_if *iface, - struct in_addr *dst, + struct net_in_addr *dst, struct net_icmp_ping_params *params, void *user_data, k_timeout_t timeout) @@ -134,7 +134,7 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, struct net_icmpv4_echo_req); int ret = -ENOBUFS; struct net_icmpv4_echo_req *echo_req; - const struct in_addr *src; + const struct net_in_addr *src; struct net_pkt *pkt; if (!iface->config.ip.ipv4) { @@ -146,7 +146,7 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_icmpv4_echo_req) + params->data_size, - AF_INET, IPPROTO_ICMP, + NET_AF_INET, NET_IPPROTO_ICMP, timeout); if (!pkt) { return -ENOMEM; @@ -178,8 +178,8 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, goto drop; } - echo_req->identifier = htons(params->identifier); - echo_req->sequence = htons(params->sequence); + echo_req->identifier = net_htons(params->identifier); + echo_req->sequence = net_htons(params->sequence); net_pkt_set_data(pkt, &icmpv4_access); @@ -188,7 +188,7 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, } else if (params->data == NULL && params->data_size > 0) { /* Generate payload. */ if (params->data_size >= sizeof(uint32_t)) { - uint32_t time_stamp = htonl(k_cycle_get_32()); + uint32_t time_stamp = net_htonl(k_cycle_get_32()); net_pkt_write(pkt, &time_stamp, sizeof(time_stamp)); params->data_size -= sizeof(time_stamp); @@ -203,7 +203,7 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_ICMP); + net_ipv4_finalize(pkt, NET_IPPROTO_ICMP); NET_DBG("Sending ICMPv4 Echo Request type %d from %s to %s", NET_ICMPV4_ECHO_REQUEST, @@ -231,7 +231,7 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, #else static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, struct net_if *iface, - struct in_addr *dst, + struct net_in_addr *dst, struct net_icmp_ping_params *params, void *user_data, k_timeout_t timeout) @@ -249,7 +249,7 @@ static int send_icmpv4_echo_request(struct net_icmp_ctx *ctx, #if defined(CONFIG_NET_IPV6) static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, struct net_if *iface, - struct in6_addr *dst, + struct net_in6_addr *dst, struct net_icmp_ping_params *params, void *user_data, k_timeout_t timeout) @@ -258,7 +258,7 @@ static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, struct net_icmpv6_echo_req); int ret = -ENOBUFS; struct net_icmpv6_echo_req *echo_req; - const struct in6_addr *src; + const struct net_in6_addr *src; struct net_pkt *pkt; if (!iface->config.ip.ipv6) { @@ -270,7 +270,7 @@ static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_icmpv6_echo_req) + params->data_size, - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, timeout); if (!pkt) { return -ENOMEM; @@ -302,8 +302,8 @@ static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, goto drop; } - echo_req->identifier = htons(params->identifier); - echo_req->sequence = htons(params->sequence); + echo_req->identifier = net_htons(params->identifier); + echo_req->sequence = net_htons(params->sequence); net_pkt_set_data(pkt, &icmpv6_access); @@ -312,7 +312,7 @@ static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, } else if (params->data == NULL && params->data_size > 0) { /* Generate payload. */ if (params->data_size >= sizeof(uint32_t)) { - uint32_t time_stamp = htonl(k_cycle_get_32()); + uint32_t time_stamp = net_htonl(k_cycle_get_32()); net_pkt_write(pkt, &time_stamp, sizeof(time_stamp)); params->data_size -= sizeof(time_stamp); @@ -326,7 +326,7 @@ static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); NET_DBG("Sending ICMPv6 Echo Request type %d from %s to %s", NET_ICMPV6_ECHO_REQUEST, @@ -353,7 +353,7 @@ static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, #else static int send_icmpv6_echo_request(struct net_icmp_ctx *ctx, struct net_if *iface, - struct in6_addr *dst, + struct net_in6_addr *dst, struct net_icmp_ping_params *params, void *user_data, k_timeout_t timeout) @@ -418,7 +418,7 @@ static int get_offloaded_ping_handler(struct net_if *iface, static int net_icmp_send_echo_request_timeout(struct net_icmp_ctx *ctx, struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, void *user_data, k_timeout_t timeout) @@ -428,9 +428,9 @@ static int net_icmp_send_echo_request_timeout(struct net_icmp_ctx *ctx, } if (iface == NULL) { - if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == NET_AF_INET) { iface = net_if_ipv4_select_src_iface(&net_sin(dst)->sin_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == AF_INET6) { + } else if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface(&net_sin6(dst)->sin6_addr); } @@ -458,7 +458,7 @@ static int net_icmp_send_echo_request_timeout(struct net_icmp_ctx *ctx, return ping_handler(ctx, iface, dst, params, user_data); } - if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == NET_AF_INET) { if (params == NULL) { params = get_default_params(); } @@ -467,7 +467,7 @@ static int net_icmp_send_echo_request_timeout(struct net_icmp_ctx *ctx, params, user_data, timeout); } - if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == NET_AF_INET6) { if (params == NULL) { params = get_default_params(); } @@ -481,7 +481,7 @@ static int net_icmp_send_echo_request_timeout(struct net_icmp_ctx *ctx, int net_icmp_send_echo_request(struct net_icmp_ctx *ctx, struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, void *user_data) { @@ -495,7 +495,7 @@ int net_icmp_send_echo_request(struct net_icmp_ctx *ctx, int net_icmp_send_echo_request_no_wait(struct net_icmp_ctx *ctx, struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, void *user_data) { @@ -551,7 +551,7 @@ int net_icmp_call_ipv4_handlers(struct net_pkt *pkt, struct net_icmp_ip_hdr ip_hdr; ip_hdr.ipv4 = ipv4_hdr; - ip_hdr.family = AF_INET; + ip_hdr.family = NET_AF_INET; return icmp_call_handlers(pkt, &ip_hdr, icmp_hdr); } @@ -563,7 +563,7 @@ int net_icmp_call_ipv6_handlers(struct net_pkt *pkt, struct net_icmp_ip_hdr ip_hdr; ip_hdr.ipv6 = ipv6_hdr; - ip_hdr.family = AF_INET6; + ip_hdr.family = NET_AF_INET6; return icmp_call_handlers(pkt, &ip_hdr, icmp_hdr); } diff --git a/subsys/net/ip/icmpv4.c b/subsys/net/ip/icmpv4.c index 7a2d5cacde298..bc3540a2a91f7 100644 --- a/subsys/net/ip/icmpv4.c +++ b/subsys/net/ip/icmpv4.c @@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(net_icmpv4, CONFIG_NET_ICMPV4_LOG_LEVEL); struct net_icmpv4_hdr_opts_data { struct net_pkt *reply; - const struct in_addr *src; + const struct net_in_addr *src; }; int net_icmpv4_create(struct net_pkt *pkt, uint8_t icmp_type, uint8_t icmp_code) @@ -83,10 +83,10 @@ int net_icmpv4_finalize(struct net_pkt *pkt, bool force_chksum) static int icmpv4_update_record_route(uint8_t *opt_data, uint8_t opt_len, struct net_pkt *reply, - const struct in_addr *src) + const struct net_in_addr *src) { uint8_t len = net_pkt_ipv4_opts_len(reply); - uint8_t addr_len = sizeof(struct in_addr); + uint8_t addr_len = sizeof(struct net_in_addr); uint8_t ptr_offset = 4U; uint8_t offset = 0U; uint8_t skip; @@ -191,10 +191,10 @@ static int icmpv4_update_record_route(uint8_t *opt_data, static int icmpv4_update_time_stamp(uint8_t *opt_data, uint8_t opt_len, struct net_pkt *reply, - const struct in_addr *src) + const struct net_in_addr *src) { uint8_t len = net_pkt_ipv4_opts_len(reply); - uint8_t addr_len = sizeof(struct in_addr); + uint8_t addr_len = sizeof(struct net_in_addr); uint8_t ptr_offset = 5U; uint8_t offset = 0U; uint8_t new_entry_len; @@ -305,7 +305,7 @@ static int icmpv4_update_time_stamp(uint8_t *opt_data, switch (flag) { case NET_IPV4_TS_OPT_TS_ONLY: - if (net_pkt_write_be32(reply, htons(k_uptime_get_32()))) { + if (net_pkt_write_be32(reply, net_htons(k_uptime_get_32()))) { goto drop; } @@ -321,7 +321,7 @@ static int icmpv4_update_time_stamp(uint8_t *opt_data, len += addr_len; - if (net_pkt_write_be32(reply, htons(k_uptime_get_32()))) { + if (net_pkt_write_be32(reply, net_htons(k_uptime_get_32()))) { goto drop; } @@ -369,7 +369,7 @@ static int icmpv4_reply_to_options(uint8_t opt_type, static int icmpv4_handle_header_options(struct net_pkt *pkt, struct net_pkt *reply, - const struct in_addr *src) + const struct net_in_addr *src) { struct net_icmpv4_hdr_opts_data ud; uint8_t len; @@ -402,7 +402,7 @@ static int icmpv4_handle_header_options(struct net_pkt *pkt, #else static int icmpv4_handle_header_options(struct net_pkt *pkt, struct net_pkt *reply, - const struct in_addr *src) + const struct net_in_addr *src) { ARG_UNUSED(pkt); ARG_UNUSED(reply); @@ -420,8 +420,8 @@ static int icmpv4_handle_echo_request(struct net_icmp_ctx *ctx, { struct net_pkt *reply = NULL; struct net_ipv4_hdr *ip_hdr = hdr->ipv4; - struct in_addr req_src, req_dst; - const struct in_addr *src; + struct net_in_addr req_src, req_dst; + const struct net_in_addr *src; int16_t payload_len; net_ipv4_addr_copy_raw(req_src.s4_addr, ip_hdr->src); @@ -450,7 +450,7 @@ static int icmpv4_handle_echo_request(struct net_icmp_ctx *ctx, reply = net_pkt_alloc_with_buffer(net_pkt_iface(pkt), net_pkt_ipv4_opts_len(pkt) + payload_len, - AF_INET, IPPROTO_ICMP, + NET_AF_INET, NET_IPPROTO_ICMP, PKT_WAIT_TIME); if (!reply) { NET_DBG("DROP: No buffer"); @@ -489,7 +489,7 @@ static int icmpv4_handle_echo_request(struct net_icmp_ctx *ctx, } net_pkt_cursor_init(reply); - net_ipv4_finalize(reply, IPPROTO_ICMP); + net_ipv4_finalize(reply, NET_IPPROTO_ICMP); NET_DBG("Sending Echo Reply from %s to %s", net_sprint_ipv4_addr(src), @@ -517,7 +517,7 @@ int net_icmpv4_send_error(struct net_pkt *orig, uint8_t type, uint8_t code) NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access, struct net_ipv4_hdr); int err = -EIO; struct net_ipv4_hdr *ip_hdr; - struct in_addr orig_src, orig_dst; + struct net_in_addr orig_src, orig_dst; struct net_pkt *pkt; size_t copy_len; @@ -528,7 +528,7 @@ int net_icmpv4_send_error(struct net_pkt *orig, uint8_t type, uint8_t code) goto drop_no_pkt; } - if (ip_hdr->proto == IPPROTO_ICMP) { + if (ip_hdr->proto == NET_IPPROTO_ICMP) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(icmpv4_access, struct net_icmp_hdr); struct net_icmp_hdr *icmp_hdr; @@ -551,14 +551,14 @@ int net_icmpv4_send_error(struct net_pkt *orig, uint8_t type, uint8_t code) */ NET_DBG("Not sending error to bcast pkt from %s on proto %s", net_sprint_ipv4_addr(&orig_src), - net_proto2str(AF_INET, ip_hdr->proto)); + net_proto2str(NET_AF_INET, ip_hdr->proto)); goto drop_no_pkt; } - if (ip_hdr->proto == IPPROTO_UDP) { + if (ip_hdr->proto == NET_IPPROTO_UDP) { copy_len = sizeof(struct net_ipv4_hdr) + sizeof(struct net_udp_hdr); - } else if (ip_hdr->proto == IPPROTO_TCP) { + } else if (ip_hdr->proto == NET_IPPROTO_TCP) { copy_len = sizeof(struct net_ipv4_hdr) + sizeof(struct net_tcp_hdr); } else { @@ -567,7 +567,7 @@ int net_icmpv4_send_error(struct net_pkt *orig, uint8_t type, uint8_t code) pkt = net_pkt_alloc_with_buffer(net_pkt_iface(orig), copy_len + NET_ICMPV4_UNUSED_LEN, - AF_INET, IPPROTO_ICMP, + NET_AF_INET, NET_IPPROTO_ICMP, PKT_WAIT_TIME); if (!pkt) { err = -ENOMEM; @@ -582,7 +582,7 @@ int net_icmpv4_send_error(struct net_pkt *orig, uint8_t type, uint8_t code) } net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_ICMP); + net_ipv4_finalize(pkt, NET_IPPROTO_ICMP); net_linkaddr_set(net_pkt_lladdr_dst(pkt), net_pkt_lladdr_src(orig)->addr, @@ -677,8 +677,8 @@ static int icmpv4_handle_dst_unreach(struct net_icmp_ctx *ctx, struct net_ipv4_hdr *ip_hdr = hdr->ipv4; uint16_t length = net_pkt_get_len(pkt); struct net_pmtu_entry *entry; - struct sockaddr_in sockaddr_src = { - .sin_family = AF_INET, + struct net_sockaddr_in sockaddr_src = { + .sin_family = NET_AF_INET, }; uint16_t mtu; int ret; @@ -710,7 +710,7 @@ static int icmpv4_handle_dst_unreach(struct net_icmp_ctx *ctx, net_pkt_acknowledge_data(pkt, &dst_unreach_access); - mtu = ntohs(dest_unreach_hdr->mtu); + mtu = net_ntohs(dest_unreach_hdr->mtu); if (mtu < MIN_IPV4_MTU) { NET_DBG("DROP: Unsupported MTU %u, min is %u", @@ -718,9 +718,9 @@ static int icmpv4_handle_dst_unreach(struct net_icmp_ctx *ctx, goto drop; } - net_ipaddr_copy(&sockaddr_src.sin_addr, (struct in_addr *)&ip_hdr->src); + net_ipaddr_copy(&sockaddr_src.sin_addr, (struct net_in_addr *)&ip_hdr->src); - entry = net_pmtu_get_entry((struct sockaddr *)&sockaddr_src); + entry = net_pmtu_get_entry((struct net_sockaddr *)&sockaddr_src); if (entry == NULL) { NET_DBG("DROP: Cannot find PMTU entry for %s", net_sprint_ipv4_addr(&ip_hdr->src)); @@ -766,7 +766,7 @@ void net_icmpv4_init(void) static struct net_icmp_ctx ctx; int ret; - ret = net_icmp_init_ctx(&ctx, AF_INET, NET_ICMPV4_ECHO_REQUEST, 0, + ret = net_icmp_init_ctx(&ctx, NET_AF_INET, NET_ICMPV4_ECHO_REQUEST, 0, icmpv4_handle_echo_request); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV4_ECHO_REQUEST), @@ -774,7 +774,7 @@ void net_icmpv4_init(void) } #if defined(CONFIG_NET_IPV4_PMTU) - ret = net_icmp_init_ctx(&dst_unreach_ctx, AF_INET, NET_ICMPV4_DST_UNREACH, 0, + ret = net_icmp_init_ctx(&dst_unreach_ctx, NET_AF_INET, NET_ICMPV4_DST_UNREACH, 0, icmpv4_handle_dst_unreach); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV4_DST_UNREACH), diff --git a/subsys/net/ip/icmpv6.c b/subsys/net/ip/icmpv6.c index c9cebeafba603..5613635b42181 100644 --- a/subsys/net/ip/icmpv6.c +++ b/subsys/net/ip/icmpv6.c @@ -104,8 +104,8 @@ static int icmpv6_handle_echo_request(struct net_icmp_ctx *ctx, { struct net_pkt *reply = NULL; struct net_ipv6_hdr *ip_hdr = hdr->ipv6; - struct in6_addr req_src, req_dst; - const struct in6_addr *src; + struct net_in6_addr req_src, req_dst; + const struct net_in6_addr *src; int16_t payload_len; ARG_UNUSED(user_data); @@ -118,7 +118,7 @@ static int icmpv6_handle_echo_request(struct net_icmp_ctx *ctx, net_sprint_ipv6_addr(&req_src), net_sprint_ipv6_addr(&req_dst)); - payload_len = ntohs(ip_hdr->len) - + payload_len = net_ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) - NET_ICMPH_LEN; if (payload_len < NET_ICMPV6_UNUSED_LEN) { /* No identifier or sequence number present */ @@ -126,7 +126,7 @@ static int icmpv6_handle_echo_request(struct net_icmp_ctx *ctx, } reply = net_pkt_alloc_with_buffer(net_pkt_iface(pkt), payload_len, - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, PKT_WAIT_TIME); if (!reply) { NET_DBG("DROP: No buffer"); @@ -167,7 +167,7 @@ static int icmpv6_handle_echo_request(struct net_icmp_ctx *ctx, } net_pkt_cursor_init(reply); - net_ipv6_finalize(reply, IPPROTO_ICMPV6); + net_ipv6_finalize(reply, NET_IPPROTO_ICMPV6); NET_DBG("Sending Echo Reply from %s to %s", net_sprint_ipv6_addr(src), @@ -196,9 +196,9 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code, { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr); int err = -EIO; - struct in6_addr orig_src, orig_dst; + struct net_in6_addr orig_src, orig_dst; struct net_ipv6_hdr *ip_hdr; - const struct in6_addr *src; + const struct net_in6_addr *src; struct net_pkt *pkt; size_t copy_len; int ret; @@ -210,7 +210,7 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code, goto drop_no_pkt; } - if (ip_hdr->nexthdr == IPPROTO_ICMPV6) { + if (ip_hdr->nexthdr == NET_IPPROTO_ICMPV6) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(icmpv6_access, struct net_icmp_hdr); struct net_icmp_hdr *icmp_hdr; @@ -231,10 +231,10 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code, net_ipv6_addr_copy_raw(orig_src.s6_addr, ip_hdr->src); net_ipv6_addr_copy_raw(orig_dst.s6_addr, ip_hdr->dst); - if (ip_hdr->nexthdr == IPPROTO_UDP) { + if (ip_hdr->nexthdr == NET_IPPROTO_UDP) { copy_len = sizeof(struct net_ipv6_hdr) + sizeof(struct net_udp_hdr); - } else if (ip_hdr->nexthdr == IPPROTO_TCP) { + } else if (ip_hdr->nexthdr == NET_IPPROTO_TCP) { copy_len = sizeof(struct net_ipv6_hdr) + sizeof(struct net_tcp_hdr); } else { @@ -244,7 +244,7 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code, pkt = net_pkt_alloc_with_buffer(net_pkt_iface(orig), net_pkt_lladdr_src(orig)->len * 2 + copy_len + NET_ICMPV6_UNUSED_LEN, - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, PKT_WAIT_TIME); if (!pkt) { err = -ENOMEM; @@ -322,7 +322,7 @@ int net_icmpv6_send_error(struct net_pkt *orig, uint8_t type, uint8_t code, } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); NET_DBG("Sending ICMPv6 Error Message type %d code %d param %d" " from %s to %s", type, code, param, @@ -394,7 +394,7 @@ void net_icmpv6_init(void) static struct net_icmp_ctx ctx; int ret; - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_ECHO_REQUEST, 0, + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_ECHO_REQUEST, 0, icmpv6_handle_echo_request); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_ECHO_REQUEST), diff --git a/subsys/net/ip/igmp.c b/subsys/net/ip/igmp.c index c8f93ff097500..f9a707f277d70 100644 --- a/subsys/net/ip/igmp.c +++ b/subsys/net/ip/igmp.c @@ -32,11 +32,11 @@ LOG_MODULE_DECLARE(net_ipv4, CONFIG_NET_IPV4_LOG_LEVEL); #define IGMPV2_PAYLOAD_MIN_LEN 8 #define IGMPV3_PAYLOAD_MIN_LEN 12 -static const struct in_addr all_systems = { { { 224, 0, 0, 1 } } }; +static const struct net_in_addr all_systems = { { { 224, 0, 0, 1 } } }; #if defined(CONFIG_NET_IPV4_IGMPV3) -static const struct in_addr igmp_multicast_addr = { { { 224, 0, 0, 22 } } }; +static const struct net_in_addr igmp_multicast_addr = { { { 224, 0, 0, 22 } } }; #else -static const struct in_addr all_routers = { { { 224, 0, 0, 2 } } }; +static const struct net_in_addr all_routers = { { { 224, 0, 0, 2 } } }; #endif #define dbg_addr(action, pkt_str, src, dst) \ @@ -53,7 +53,7 @@ enum igmp_version { IGMPV3, }; -static int igmp_v2_create(struct net_pkt *pkt, const struct in_addr *addr, +static int igmp_v2_create(struct net_pkt *pkt, const struct net_in_addr *addr, uint8_t type) { NET_PKT_DATA_ACCESS_DEFINE(igmp_access, @@ -123,7 +123,7 @@ static int igmp_v3_create(struct net_pkt *pkt, uint8_t type, struct net_if_mcast igmp->type = type; igmp->reserved_1 = 0U; igmp->reserved_2 = 0U; - igmp->groups_len = htons(group_count); + igmp->groups_len = net_htons(group_count); /* Setting initial value of chksum to 0 to calculate chksum as described in RFC 3376 * ch 4.1.2 */ @@ -155,7 +155,7 @@ static int igmp_v3_create(struct net_pkt *pkt, uint8_t type, struct net_if_mcast group_record->type = mcast[i].record_type; group_record->aux_len = 0U; net_ipaddr_copy(&group_record->address, &mcast[i].address.in_addr); - group_record->sources_len = htons(mcast[i].sources_len); + group_record->sources_len = net_htons(mcast[i].sources_len); if (net_pkt_set_data(pkt, &group_record_access)) { return -ENOBUFS; @@ -183,8 +183,8 @@ static int igmp_v3_create(struct net_pkt *pkt, uint8_t type, struct net_if_mcast } #endif -static int igmp_v2_create_packet(struct net_pkt *pkt, const struct in_addr *dst, - const struct in_addr *group, uint8_t type) +static int igmp_v2_create_packet(struct net_pkt *pkt, const struct net_in_addr *dst, + const struct net_in_addr *group, uint8_t type) { const uint32_t router_alert = 0x94040000; /* RFC 2213 ch 2.1 */ int ret; @@ -216,7 +216,7 @@ static int igmp_v2_create_packet(struct net_pkt *pkt, const struct in_addr *dst, } #if defined(CONFIG_NET_IPV4_IGMPV3) -static int igmp_v3_create_packet(struct net_pkt *pkt, const struct in_addr *dst, +static int igmp_v3_create_packet(struct net_pkt *pkt, const struct net_in_addr *dst, struct net_if_mcast_addr mcast[], size_t mcast_len, uint8_t type) { const uint32_t router_alert = 0x94040000; /* RFC 2213 ch 2.1 */ @@ -247,7 +247,7 @@ static int igmp_send(struct net_pkt *pkt) int ret; net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_IGMP); + net_ipv4_finalize(pkt, NET_IPPROTO_IGMP); ret = net_send_data(pkt); if (ret < 0) { @@ -308,7 +308,7 @@ static int send_igmp_report(struct net_if *iface, pkt = net_pkt_alloc_with_buffer(iface, IPV4_OPT_HDR_ROUTER_ALERT_LEN + sizeof(struct net_ipv4_igmp_v2_report), - AF_INET, IPPROTO_IGMP, + NET_AF_INET, NET_IPPROTO_IGMP, PKT_WAIT_TIME); if (!pkt) { return -ENOMEM; @@ -378,8 +378,8 @@ static int send_igmp_v3_report(struct net_if *iface, struct net_ipv4_igmp_v3_que iface, IPV4_OPT_HDR_ROUTER_ALERT_LEN + sizeof(struct net_ipv4_igmp_v3_report) + sizeof(struct net_ipv4_igmp_v3_group_record) * group_count + - sizeof(struct in_addr) * source_count, - AF_INET, IPPROTO_IGMP, PKT_WAIT_TIME); + sizeof(struct net_in_addr) * source_count, + NET_AF_INET, NET_IPPROTO_IGMP, PKT_WAIT_TIME); if (!pkt) { return -ENOMEM; } @@ -505,7 +505,7 @@ enum net_verdict net_ipv4_igmp_input(struct net_pkt *pkt, struct net_ipv4_hdr *i #if !defined(CONFIG_NET_IPV4_IGMPV3) static int igmp_send_generic(struct net_if *iface, - const struct in_addr *addr, + const struct net_in_addr *addr, bool join) { struct net_pkt *pkt; @@ -514,7 +514,7 @@ static int igmp_send_generic(struct net_if *iface, pkt = net_pkt_alloc_with_buffer(iface, IPV4_OPT_HDR_ROUTER_ALERT_LEN + sizeof(struct net_ipv4_igmp_v2_report), - AF_INET, IPPROTO_IGMP, + NET_AF_INET, NET_IPPROTO_IGMP, PKT_WAIT_TIME); if (!pkt) { return -ENOMEM; @@ -555,8 +555,8 @@ static int igmpv3_send_generic(struct net_if *iface, struct net_if_mcast_addr *m IPV4_OPT_HDR_ROUTER_ALERT_LEN + sizeof(struct net_ipv4_igmp_v3_report) + sizeof(struct net_ipv4_igmp_v3_group_record) + - sizeof(struct in_addr) * mcast->sources_len, - AF_INET, IPPROTO_IGMP, PKT_WAIT_TIME); + sizeof(struct net_in_addr) * mcast->sources_len, + NET_AF_INET, NET_IPPROTO_IGMP, PKT_WAIT_TIME); if (!pkt) { return -ENOMEM; } @@ -580,7 +580,7 @@ static int igmpv3_send_generic(struct net_if *iface, struct net_if_mcast_addr *m } #endif -int net_ipv4_igmp_join(struct net_if *iface, const struct in_addr *addr, +int net_ipv4_igmp_join(struct net_if *iface, const struct net_in_addr *addr, const struct igmp_param *param) { struct net_if_mcast_addr *maddr; @@ -648,12 +648,12 @@ int net_ipv4_igmp_join(struct net_if *iface, const struct in_addr *addr, net_if_mcast_monitor(iface, &maddr->address, true); net_mgmt_event_notify_with_info(NET_EVENT_IPV4_MCAST_JOIN, iface, &maddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); return ret; } -int net_ipv4_igmp_leave(struct net_if *iface, const struct in_addr *addr) +int net_ipv4_igmp_leave(struct net_if *iface, const struct net_in_addr *addr) { struct net_if_mcast_addr *maddr; int ret = 0; @@ -689,7 +689,7 @@ int net_ipv4_igmp_leave(struct net_if *iface, const struct in_addr *addr) net_if_mcast_monitor(iface, &maddr->address, false); net_mgmt_event_notify_with_info(NET_EVENT_IPV4_MCAST_LEAVE, iface, &maddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); return ret; } diff --git a/subsys/net/ip/ipv4.c b/subsys/net/ip/ipv4.c index 1e902bf471534..53b807ddcf7e5 100644 --- a/subsys/net/ip/ipv4.c +++ b/subsys/net/ip/ipv4.c @@ -28,14 +28,14 @@ LOG_MODULE_REGISTER(net_ipv4, CONFIG_NET_IPV4_LOG_LEVEL); #include "ipv4.h" #include "pmtu.h" -BUILD_ASSERT(sizeof(struct in_addr) == NET_IPV4_ADDR_SIZE); +BUILD_ASSERT(sizeof(struct net_in_addr) == NET_IPV4_ADDR_SIZE); /* Timeout for various buffer allocations in this file. */ #define NET_BUF_TIMEOUT K_MSEC(50) int net_ipv4_create_full(struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst, + const struct net_in_addr *src, + const struct net_in_addr *dst, uint8_t tos, uint16_t id, uint8_t flags, @@ -88,8 +88,8 @@ int net_ipv4_create_full(struct net_pkt *pkt, } int net_ipv4_create(struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst) + const struct net_in_addr *src, + const struct net_in_addr *dst) { uint8_t tos = 0; uint8_t flags = 0U; @@ -126,7 +126,7 @@ int net_ipv4_finalize(struct net_pkt *pkt, uint8_t next_header_proto) } } - ipv4_hdr->len = htons(net_pkt_get_len(pkt)); + ipv4_hdr->len = net_htons(net_pkt_get_len(pkt)); ipv4_hdr->proto = next_header_proto; if (net_if_need_calc_tx_checksum(net_pkt_iface(pkt), NET_IF_CHECKSUM_IPV4_HEADER)) { @@ -137,12 +137,12 @@ int net_ipv4_finalize(struct net_pkt *pkt, uint8_t next_header_proto) net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IP); if (IS_ENABLED(CONFIG_NET_UDP) && - next_header_proto == IPPROTO_UDP) { + next_header_proto == NET_IPPROTO_UDP) { return net_udp_finalize(pkt, false); } else if (IS_ENABLED(CONFIG_NET_TCP) && - next_header_proto == IPPROTO_TCP) { + next_header_proto == NET_IPPROTO_TCP) { return net_tcp_finalize(pkt, false); - } else if (next_header_proto == IPPROTO_ICMP) { + } else if (next_header_proto == NET_IPPROTO_ICMP) { return net_icmpv4_finalize(pkt, false); } @@ -292,7 +292,7 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt) net_pkt_set_ipv4_opts_len(pkt, opts_len); - pkt_len = ntohs(hdr->len); + pkt_len = net_ntohs(hdr->len); if (real_len < pkt_len) { NET_DBG("DROP: pkt len per hdr %d != pkt real len %d", pkt_len, real_len); @@ -326,7 +326,7 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt) if (net_ipv4_is_addr_unspecified_raw(hdr->src) && !net_ipv4_is_addr_bcast_raw(net_pkt_iface(pkt), hdr->dst) && - (hdr->proto != IPPROTO_IGMP)) { + (hdr->proto != NET_IPPROTO_IGMP)) { NET_DBG("DROP: src addr is %s", "unspecified"); goto drop; } @@ -339,7 +339,7 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt) net_pkt_set_ipv4_ttl(pkt, hdr->ttl); - net_pkt_set_family(pkt, PF_INET); + net_pkt_set_family(pkt, NET_PF_INET); if (!net_pkt_filter_ip_recv_ok(pkt)) { /* drop the packet */ @@ -349,14 +349,14 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt) if ((!net_ipv4_is_my_addr_raw(hdr->dst) && !net_ipv4_is_addr_mcast_raw(hdr->dst) && - !(hdr->proto == IPPROTO_UDP && + !(hdr->proto == NET_IPPROTO_UDP && (net_ipv4_addr_cmp_raw(hdr->dst, net_ipv4_broadcast_address()->s4_addr) || /* RFC 1122 ch. 3.3.6 The 0.0.0.0 is non-standard bcast addr */ (IS_ENABLED(CONFIG_NET_IPV4_ACCEPT_ZERO_BROADCAST) && net_ipv4_addr_cmp_raw(hdr->dst, net_ipv4_unspecified_address()->s4_addr)) || net_dhcpv4_accept_unicast(pkt)))) || - (hdr->proto == IPPROTO_TCP && + (hdr->proto == NET_IPPROTO_TCP && net_ipv4_is_addr_bcast_raw(net_pkt_iface(pkt), hdr->dst))) { NET_DBG("DROP: not for me"); goto drop; @@ -374,7 +374,7 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt) if (IS_ENABLED(CONFIG_NET_IPV4_FRAGMENT)) { /* Check if this is a fragmented packet, and if so, handle reassembly */ - if ((ntohs(*((uint16_t *)&hdr->offset[0])) & + if ((net_ntohs(*((uint16_t *)&hdr->offset[0])) & (NET_IPV4_FRAGH_OFFSET_MASK | NET_IPV4_MORE_FRAG_MASK)) != 0) { return net_ipv4_handle_fragment_hdr(pkt, hdr); } @@ -393,27 +393,27 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt) } switch (hdr->proto) { - case IPPROTO_ICMP: + case NET_IPPROTO_ICMP: verdict = net_icmpv4_input(pkt, hdr); if (verdict == NET_DROP) { goto drop; } return verdict; #if defined(CONFIG_NET_IPV4_IGMP) - case IPPROTO_IGMP: + case NET_IPPROTO_IGMP: verdict = net_ipv4_igmp_input(pkt, hdr); if (verdict == NET_DROP) { goto drop; } return verdict; #endif - case IPPROTO_TCP: + case NET_IPPROTO_TCP: proto_hdr.tcp = net_tcp_input(pkt, &tcp_access); if (proto_hdr.tcp) { verdict = NET_OK; } break; - case IPPROTO_UDP: + case NET_IPPROTO_UDP: proto_hdr.udp = net_udp_input(pkt, &udp_access); if (proto_hdr.udp) { verdict = NET_OK; @@ -421,16 +421,16 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt) break; #if defined(CONFIG_NET_L2_IPIP) - case IPPROTO_IPV6: - case IPPROTO_IPIP: { - struct sockaddr_in remote_addr = { 0 }; + case NET_IPPROTO_IPV6: + case NET_IPPROTO_IPIP: { + struct net_sockaddr_in remote_addr = { 0 }; struct net_if *tunnel_iface; - remote_addr.sin_family = AF_INET; + remote_addr.sin_family = NET_AF_INET; net_ipv4_addr_copy_raw((uint8_t *)&remote_addr.sin_addr, hdr->src); - net_pkt_set_remote_address(pkt, (struct sockaddr *)&remote_addr, - sizeof(struct sockaddr_in)); + net_pkt_set_remote_address(pkt, (struct net_sockaddr *)&remote_addr, + sizeof(struct net_sockaddr_in)); /* Get rid of the old IP header */ net_pkt_cursor_restore(pkt, &hdr_start); @@ -463,16 +463,16 @@ enum net_verdict net_ipv4_prepare_for_send(struct net_pkt *pkt) { if (IS_ENABLED(CONFIG_NET_IPV4_PMTU)) { struct net_pmtu_entry *entry; - struct sockaddr_in dst = { - .sin_family = AF_INET, + struct net_sockaddr_in dst = { + .sin_family = NET_AF_INET, }; int ret; net_ipv4_addr_copy_raw((uint8_t *)&dst.sin_addr, NET_IPV4_HDR(pkt)->dst); - entry = net_pmtu_get_entry((struct sockaddr *)&dst); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dst); if (entry == NULL) { - ret = net_pmtu_update_mtu((struct sockaddr *)&dst, + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dst, net_if_get_mtu(net_pkt_iface(pkt))); if (ret < 0) { NET_DBG("Cannot update PMTU for %s (%d)", diff --git a/subsys/net/ip/ipv4.h b/subsys/net/ip/ipv4.h index 120bb0b20b220..fe52a16566d72 100644 --- a/subsys/net/ip/ipv4.h +++ b/subsys/net/ip/ipv4.h @@ -77,7 +77,7 @@ struct net_ipv4_igmp_v2_query { /* 16-bit ones' complement of the entire message */ uint16_t chksum; /* The multicast address being queried */ - struct in_addr address; + struct net_in_addr address; } __packed; struct net_ipv4_igmp_v2_report { @@ -88,7 +88,7 @@ struct net_ipv4_igmp_v2_report { /* 16-bit ones' complement of the entire message */ uint16_t chksum; /* The multicast address being queried */ - struct in_addr address; + struct net_in_addr address; } __packed; struct net_ipv4_igmp_v3_query { @@ -99,7 +99,7 @@ struct net_ipv4_igmp_v3_query { /* 16-bit ones' complement of the entire message */ uint16_t chksum; /* The multicast address being queried */ - struct in_addr address; + struct net_in_addr address; /* Reserved field, ignore */ uint8_t reserved: 4; /* Suppress Router-side Processing Flag */ @@ -120,7 +120,7 @@ struct net_ipv4_igmp_v3_group_record { /* Number of Source Addresses */ uint16_t sources_len; /* The multicast address to report to*/ - struct in_addr address; + struct net_in_addr address; } __packed; struct net_ipv4_igmp_v3_report { @@ -152,16 +152,16 @@ struct net_ipv4_igmp_v3_report { */ #if defined(CONFIG_NET_NATIVE_IPV4) int net_ipv4_create_full(struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst, + const struct net_in_addr *src, + const struct net_in_addr *dst, uint8_t tos, uint16_t id, uint8_t flags, uint16_t offset); #else static inline int net_ipv4_create_full(struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst, + const struct net_in_addr *src, + const struct net_in_addr *dst, uint8_t tos, uint16_t id, uint8_t flags, @@ -190,12 +190,12 @@ static inline int net_ipv4_create_full(struct net_pkt *pkt, */ #if defined(CONFIG_NET_NATIVE_IPV4) int net_ipv4_create(struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst); + const struct net_in_addr *src, + const struct net_in_addr *dst); #else static inline int net_ipv4_create(struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst) + const struct net_in_addr *src, + const struct net_in_addr *dst) { ARG_UNUSED(pkt); ARG_UNUSED(src); @@ -338,10 +338,10 @@ static inline void net_ipv4_set_ecn(uint8_t *tos, uint8_t ecn) /** Store pending IPv4 fragment information that is needed for reassembly. */ struct net_ipv4_reassembly { /** IPv4 source address of the fragment */ - struct in_addr src; + struct net_in_addr src; /** IPv4 destination address of the fragment */ - struct in_addr dst; + struct net_in_addr dst; /** * Timeout for cancelling the reassembly. The timer is used diff --git a/subsys/net/ip/ipv4_acd.c b/subsys/net/ip/ipv4_acd.c index 5fa07a97d6a49..8d094671355b2 100644 --- a/subsys/net/ip/ipv4_acd.c +++ b/subsys/net/ip/ipv4_acd.c @@ -71,22 +71,22 @@ enum ipv4_acd_state { }; static struct net_pkt *ipv4_acd_prepare_arp(struct net_if *iface, - struct in_addr *sender_ip, - struct in_addr *target_ip) + struct net_in_addr *sender_ip, + struct net_in_addr *target_ip) { struct net_pkt *pkt, *arp; int ret; - /* We provide AF_UNSPEC to the allocator: this packet does not + /* We provide NET_AF_UNSPEC to the allocator: this packet does not * need space for any IPv4 header. */ pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, BUF_ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, BUF_ALLOC_TIMEOUT); if (!pkt) { return NULL; } - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); net_pkt_set_ipv4_acd(pkt, true); ret = net_arp_prepare(pkt, target_ip, sender_ip, &arp); @@ -101,7 +101,7 @@ static struct net_pkt *ipv4_acd_prepare_arp(struct net_if *iface, static void ipv4_acd_send_probe(struct net_if_addr *ifaddr) { struct net_if *iface = net_if_get_by_index(ifaddr->ifindex); - struct in_addr unspecified = { 0 }; + struct net_in_addr unspecified = { 0 }; struct net_pkt *pkt; pkt = ipv4_acd_prepare_arp(iface, &unspecified, &ifaddr->address.in_addr); @@ -306,7 +306,7 @@ enum net_verdict net_ipv4_acd_input(struct net_if *iface, struct net_pkt *pkt) (uint8_t *)&ifaddr->address.in_addr) && (memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) && (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr, - (uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) { + (uint8_t *)&(struct net_in_addr)NET_INADDR_ANY_INIT)))) { NET_DBG("Conflict detected from %s for %s", net_sprint_ll_addr((uint8_t *)&arp_hdr->src_hwaddr, arp_hdr->hwlen), @@ -368,7 +368,7 @@ enum net_verdict net_ipv4_acd_input(struct net_if *iface, struct net_pkt *pkt) net_mgmt_event_notify_with_info( NET_EVENT_IPV4_ACD_CONFLICT, iface, &ifaddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } break; diff --git a/subsys/net/ip/ipv4_autoconf.c b/subsys/net/ip/ipv4_autoconf.c index fc32ce7d7da96..08c70b82b4b11 100644 --- a/subsys/net/ip/ipv4_autoconf.c +++ b/subsys/net/ip/ipv4_autoconf.c @@ -25,7 +25,7 @@ static struct net_mgmt_event_callback mgmt4_acd_cb; static inline void ipv4_autoconf_addr_set(struct net_if_ipv4_autoconf *ipv4auto) { - struct in_addr netmask = { { { 255, 255, 0, 0 } } }; + struct net_in_addr netmask = { { { 255, 255, 0, 0 } } }; if (ipv4auto->state == NET_IPV4_AUTOCONF_INIT) { ipv4auto->requested_ip.s4_addr[0] = 169U; @@ -58,7 +58,7 @@ static void acd_event_handler(struct net_mgmt_event_callback *cb, uint64_t mgmt_event, struct net_if *iface) { struct net_if_config *cfg; - struct in_addr *addr; + struct net_in_addr *addr; cfg = net_if_get_config(iface); if (!cfg) { @@ -75,11 +75,11 @@ static void acd_event_handler(struct net_mgmt_event_callback *cb, return; } - if (cb->info_length != sizeof(struct in_addr)) { + if (cb->info_length != sizeof(struct net_in_addr)) { return; } - addr = (struct in_addr *)cb->info; + addr = (struct net_in_addr *)cb->info; if (!net_ipv4_addr_cmp(&cfg->ipv4auto.requested_ip, addr)) { return; diff --git a/subsys/net/ip/ipv4_fragment.c b/subsys/net/ip/ipv4_fragment.c index bbe41ab534ea3..b06a9d2658c97 100644 --- a/subsys/net/ip/ipv4_fragment.c +++ b/subsys/net/ip/ipv4_fragment.c @@ -70,7 +70,7 @@ static struct net_ipv4_reassembly *reassembly_get(uint16_t id, const uint8_t *sr return &reassembly[avail]; } -static bool reassembly_cancel(uint32_t id, struct in_addr *src, struct in_addr *dst) +static bool reassembly_cancel(uint32_t id, struct net_in_addr *src, struct net_in_addr *dst) { int i, j; @@ -197,7 +197,7 @@ static void reassemble_packet(struct net_ipv4_reassembly *reass) } /* Fix the total length, offset and checksum of the IPv4 packet */ - ipv4_hdr->len = htons(net_pkt_get_len(pkt)); + ipv4_hdr->len = net_htons(net_pkt_get_len(pkt)); ipv4_hdr->offset[0] = 0; ipv4_hdr->offset[1] = 0; ipv4_hdr->chksum = 0; @@ -328,8 +328,8 @@ enum net_verdict net_ipv4_handle_fragment_hdr(struct net_pkt *pkt, struct net_ip int ret; int i; - flag = ntohs(*((uint16_t *)&hdr->offset)); - id = ntohs(*((uint16_t *)&hdr->id)); + flag = net_ntohs(*((uint16_t *)&hdr->offset)); + id = net_ntohs(*((uint16_t *)&hdr->id)); reass = reassembly_get(id, hdr->src, hdr->dst, hdr->proto); if (!reass) { @@ -431,7 +431,7 @@ static int send_ipv4_fragment(struct net_pkt *pkt, uint16_t rand_id, uint16_t fi frag_pkt = net_pkt_alloc_with_buffer(net_pkt_iface(pkt), fit_len + net_pkt_ip_hdr_len(pkt), - AF_INET, 0, NET_BUF_TIMEOUT); + NET_AF_INET, 0, NET_BUF_TIMEOUT); if (!frag_pkt) { return -ENOMEM; } @@ -480,7 +480,7 @@ static int send_ipv4_fragment(struct net_pkt *pkt, uint16_t rand_id, uint16_t fi } sys_put_be16(offset_pkt, ipv4_hdr->offset); - ipv4_hdr->len = htons((fit_len + net_pkt_ip_hdr_len(pkt))); + ipv4_hdr->len = net_htons((fit_len + net_pkt_ip_hdr_len(pkt))); ipv4_hdr->chksum = 0; ipv4_hdr->chksum = net_calc_chksum_ipv4(frag_pkt); @@ -532,7 +532,7 @@ int net_ipv4_send_fragmented_pkt(struct net_if *iface, struct net_pkt *pkt, } /* Check if the DF (Don't Fragment) flag is set, if so, we cannot fragment the packet */ - flag = ntohs(*((uint16_t *)&frag_hdr->offset)); + flag = net_ntohs(*((uint16_t *)&frag_hdr->offset)); if (flag & NET_IPV4_DO_NOT_FRAG_MASK) { /* This packet cannot be fragmented */ @@ -569,13 +569,13 @@ int net_ipv4_send_fragmented_pkt(struct net_if *iface, struct net_pkt *pkt, net_pkt_acknowledge_data(pkt, &frag_access); switch (frag_hdr->proto) { - case IPPROTO_ICMP: + case NET_IPPROTO_ICMP: ret = net_icmpv4_finalize(pkt, true); break; - case IPPROTO_TCP: + case NET_IPPROTO_TCP: ret = net_tcp_finalize(pkt, true); break; - case IPPROTO_UDP: + case NET_IPPROTO_UDP: ret = net_udp_finalize(pkt, true); break; default: @@ -630,12 +630,12 @@ enum net_verdict net_ipv4_prepare_for_send_fragment(struct net_pkt *pkt) uint16_t mtu; if (IS_ENABLED(CONFIG_NET_IPV4_PMTU)) { - struct sockaddr_in dst = { - .sin_family = AF_INET, - .sin_addr = *((struct in_addr *)ip_hdr->dst), + struct net_sockaddr_in dst = { + .sin_family = NET_AF_INET, + .sin_addr = *((struct net_in_addr *)ip_hdr->dst), }; - ret = net_pmtu_get_mtu((struct sockaddr *)&dst); + ret = net_pmtu_get_mtu((struct net_sockaddr *)&dst); if (ret <= 0) { goto use_interface_mtu; } diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c index 079835d944cdb..2193dbdf666a2 100644 --- a/subsys/net/ip/ipv6.c +++ b/subsys/net/ip/ipv6.c @@ -42,7 +42,7 @@ LOG_MODULE_REGISTER(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL); #include "route.h" #include "net_stats.h" -BUILD_ASSERT(sizeof(struct in6_addr) == NET_IPV6_ADDR_SIZE); +BUILD_ASSERT(sizeof(struct net_in6_addr) == NET_IPV6_ADDR_SIZE); /* Timeout value to be used when allocating net buffer during various * neighbor discovery procedures. @@ -58,8 +58,8 @@ BUILD_ASSERT(sizeof(struct in6_addr) == NET_IPV6_ADDR_SIZE); #define MAX_REACHABLE_TIME 3600000 int net_ipv6_create(struct net_pkt *pkt, - const struct in6_addr *src, - const struct in6_addr *dst) + const struct net_in6_addr *src, + const struct net_in6_addr *dst) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr); struct net_ipv6_hdr *ipv6_hdr; @@ -127,7 +127,7 @@ int net_ipv6_finalize(struct net_pkt *pkt, uint8_t next_header_proto) return -ENOBUFS; } - ipv6_hdr->len = htons(net_pkt_get_len(pkt) - + ipv6_hdr->len = net_htons(net_pkt_get_len(pkt) - sizeof(struct net_ipv6_hdr)); if (net_pkt_ipv6_next_hdr(pkt) != 255U) { @@ -146,12 +146,12 @@ int net_ipv6_finalize(struct net_pkt *pkt, uint8_t next_header_proto) net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IPV6); if (IS_ENABLED(CONFIG_NET_UDP) && - next_header_proto == IPPROTO_UDP) { + next_header_proto == NET_IPPROTO_UDP) { return net_udp_finalize(pkt, false); } else if (IS_ENABLED(CONFIG_NET_TCP) && - next_header_proto == IPPROTO_TCP) { + next_header_proto == NET_IPPROTO_TCP) { return net_tcp_finalize(pkt, false); - } else if (next_header_proto == IPPROTO_ICMPV6) { + } else if (next_header_proto == NET_IPPROTO_ICMPV6) { return net_icmpv6_finalize(pkt, false); } @@ -285,7 +285,7 @@ static inline int ipv6_handle_ext_hdr_options(struct net_pkt *pkt, #if defined(CONFIG_NET_ROUTE) static struct net_route_entry *add_route(struct net_if *iface, - struct in6_addr *addr, + struct net_in6_addr *addr, uint8_t prefix_len) { struct net_route_entry *route; @@ -320,8 +320,8 @@ static enum net_verdict ipv6_route_packet(struct net_pkt *pkt, struct net_ipv6_hdr *hdr) { struct net_route_entry *route; - struct in6_addr *nexthop; - struct in6_addr src_ip, dst_ip; + struct net_in6_addr *nexthop; + struct net_in6_addr src_ip, dst_ip; bool found; net_ipv6_addr_copy_raw(src_ip.s6_addr, hdr->src); @@ -506,7 +506,7 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt) goto drop; } - pkt_len = ntohs(hdr->len) + sizeof(struct net_ipv6_hdr); + pkt_len = net_ntohs(hdr->len) + sizeof(struct net_ipv6_hdr); if (real_len < pkt_len) { NET_DBG("DROP: pkt len per hdr %d != pkt real len %d", pkt_len, real_len); @@ -580,7 +580,7 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt) net_pkt_set_ipv6_ext_len(pkt, 0); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_set_ipv6_hop_limit(pkt, NET_IPV6_HDR(pkt)->hop_limit); - net_pkt_set_family(pkt, PF_INET6); + net_pkt_set_family(pkt, NET_PF_INET6); if (!net_pkt_filter_ip_recv_ok(pkt)) { /* drop the packet */ @@ -769,10 +769,10 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt) } switch (current_hdr) { - case IPPROTO_ICMPV6: + case NET_IPPROTO_ICMPV6: verdict = net_icmpv6_input(pkt, hdr); break; - case IPPROTO_TCP: + case NET_IPPROTO_TCP: proto_hdr.tcp = net_tcp_input(pkt, &tcp_access); if (proto_hdr.tcp) { verdict = NET_OK; @@ -780,7 +780,7 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt) NET_DBG("%s verdict %s", "TCP", net_verdict2str(verdict)); break; - case IPPROTO_UDP: + case NET_IPPROTO_UDP: proto_hdr.udp = net_udp_input(pkt, &udp_access); if (proto_hdr.udp) { verdict = NET_OK; @@ -790,16 +790,16 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt) break; #if defined(CONFIG_NET_L2_IPIP) - case IPPROTO_IPV6: - case IPPROTO_IPIP: { - struct sockaddr_in6 remote_addr = { 0 }; + case NET_IPPROTO_IPV6: + case NET_IPPROTO_IPIP: { + struct net_sockaddr_in6 remote_addr = { 0 }; struct net_if *tunnel_iface; - remote_addr.sin6_family = AF_INET6; + remote_addr.sin6_family = NET_AF_INET6; net_ipv6_addr_copy_raw((uint8_t *)&remote_addr.sin6_addr, hdr->src); - net_pkt_set_remote_address(pkt, (struct sockaddr *)&remote_addr, - sizeof(struct sockaddr_in6)); + net_pkt_set_remote_address(pkt, (struct net_sockaddr *)&remote_addr, + sizeof(struct net_sockaddr_in6)); /* Get rid of the old IP header */ net_pkt_cursor_restore(pkt, &hdr_start); @@ -817,7 +817,7 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt) if (verdict == NET_DROP) { NET_DBG("DROP: because verdict"); goto drop; - } else if (current_hdr == IPPROTO_ICMPV6) { + } else if (current_hdr == NET_IPPROTO_ICMPV6) { NET_DBG("%s verdict %s", "ICMPv6", net_verdict2str(verdict)); return verdict; } @@ -850,7 +850,7 @@ enum net_verdict net_ipv6_input(struct net_pkt *pkt) static bool check_reserved(const uint8_t *buf, size_t len) { /* Subnet-Router Anycast (RFC 4291) */ - if (memcmp(buf, (uint8_t *)&(struct in6_addr)IN6ADDR_ANY_INIT, len) == 0) { + if (memcmp(buf, (uint8_t *)&(struct net_in6_addr)NET_IN6ADDR_ANY_INIT, len) == 0) { return true; } @@ -868,7 +868,7 @@ static bool check_reserved(const uint8_t *buf, size_t len) #endif /* CONFIG_NET_IPV6_IID_STABLE */ static int gen_stable_iid(uint8_t if_index, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint8_t *network_id, size_t network_id_len, uint8_t dad_counter, uint8_t *stable_iid, @@ -884,7 +884,7 @@ static int gen_stable_iid(uint8_t if_index, static bool once; static uint8_t secret_key[16]; /* Min 128 bits, RFC 7217 ch 5 */ struct { - struct in6_addr prefix; + struct net_in6_addr prefix; uint8_t if_index; uint8_t network_id[16]; uint8_t dad_counter; @@ -897,7 +897,7 @@ static int gen_stable_iid(uint8_t if_index, return -EINVAL; } - memcpy(&buf.prefix, prefix, sizeof(struct in6_addr)); + memcpy(&buf.prefix, prefix, sizeof(struct net_in6_addr)); buf.if_index = if_index; @@ -958,25 +958,25 @@ static int gen_stable_iid(uint8_t if_index, } int net_ipv6_addr_generate_iid(struct net_if *iface, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint8_t *network_id, size_t network_id_len, uint8_t dad_counter, - struct in6_addr *addr, + struct net_in6_addr *addr, struct net_linkaddr *lladdr) { - struct in6_addr tmp_addr; + struct net_in6_addr tmp_addr; uint8_t if_index; if_index = (iface == NULL) ? net_if_get_by_iface(net_if_get_default()) : net_if_get_by_iface(iface); if (IS_ENABLED(CONFIG_NET_IPV6_IID_STABLE)) { - struct in6_addr tmp_prefix = { 0 }; + struct net_in6_addr tmp_prefix = { 0 }; int ret; if (prefix == NULL) { - UNALIGNED_PUT(htonl(0xfe800000), &tmp_prefix.s6_addr32[0]); + UNALIGNED_PUT(net_htonl(0xfe800000), &tmp_prefix.s6_addr32[0]); } else { UNALIGNED_PUT(UNALIGNED_GET(&prefix->s6_addr32[0]), &tmp_prefix.s6_addr32[0]); @@ -993,7 +993,7 @@ int net_ipv6_addr_generate_iid(struct net_if *iface, } if (prefix == NULL) { - UNALIGNED_PUT(htonl(0xfe800000), &tmp_addr.s6_addr32[0]); + UNALIGNED_PUT(net_htonl(0xfe800000), &tmp_addr.s6_addr32[0]); UNALIGNED_PUT(0, &tmp_addr.s6_addr32[1]); } else { UNALIGNED_PUT(UNALIGNED_GET(&prefix->s6_addr32[0]), &tmp_addr.s6_addr32[0]); diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h index d9989f9b92468..5e8cf15cda78d 100644 --- a/subsys/net/ip/ipv6.h +++ b/subsys/net/ip/ipv6.h @@ -88,7 +88,7 @@ struct net_ipv6_nbr_data { struct k_fifo pending_queue; /** IPv6 address. */ - struct in6_addr addr; + struct net_in6_addr addr; /** Reachable timer. */ int64_t reachable; @@ -132,23 +132,23 @@ int net_ipv6_start_dad(struct net_if *iface, struct net_if_addr *ifaddr); #endif int net_ipv6_send_ns(struct net_if *iface, struct net_pkt *pending, - const struct in6_addr *src, const struct in6_addr *dst, - const struct in6_addr *tgt, bool is_my_address); + const struct net_in6_addr *src, const struct net_in6_addr *dst, + const struct net_in6_addr *tgt, bool is_my_address); int net_ipv6_send_rs(struct net_if *iface); int net_ipv6_start_rs(struct net_if *iface); -int net_ipv6_send_na(struct net_if *iface, const struct in6_addr *src, - const struct in6_addr *dst, const struct in6_addr *tgt, +int net_ipv6_send_na(struct net_if *iface, const struct net_in6_addr *src, + const struct net_in6_addr *dst, const struct net_in6_addr *tgt, uint8_t flags); static inline bool net_ipv6_is_nexthdr_upper_layer(uint8_t nexthdr) { - return (nexthdr == IPPROTO_ICMPV6 || nexthdr == IPPROTO_UDP || - nexthdr == IPPROTO_TCP || + return (nexthdr == NET_IPPROTO_ICMPV6 || nexthdr == NET_IPPROTO_UDP || + nexthdr == NET_IPPROTO_TCP || (IS_ENABLED(CONFIG_NET_L2_VIRTUAL) && - ((nexthdr == IPPROTO_IPV6) || (nexthdr == IPPROTO_IPIP)))); + ((nexthdr == NET_IPPROTO_IPV6) || (nexthdr == NET_IPPROTO_IPIP)))); } /** @@ -162,12 +162,12 @@ static inline bool net_ipv6_is_nexthdr_upper_layer(uint8_t nexthdr) */ #if defined(CONFIG_NET_NATIVE_IPV6) int net_ipv6_create(struct net_pkt *pkt, - const struct in6_addr *src, - const struct in6_addr *dst); + const struct net_in6_addr *src, + const struct net_in6_addr *dst); #else static inline int net_ipv6_create(struct net_pkt *pkt, - const struct in6_addr *src, - const struct in6_addr *dst) + const struct net_in6_addr *src, + const struct net_in6_addr *dst) { ARG_UNUSED(pkt); ARG_UNUSED(src); @@ -211,10 +211,10 @@ static inline int net_ipv6_finalize(struct net_pkt *pkt, * @return Return 0 if leaving is done, <0 otherwise. */ #if defined(CONFIG_NET_IPV6_MLD) -int net_ipv6_mld_send_single(struct net_if *iface, const struct in6_addr *addr, uint8_t mode); +int net_ipv6_mld_send_single(struct net_if *iface, const struct net_in6_addr *addr, uint8_t mode); #else static inline int -net_ipv6_mld_send_single(struct net_if *iface, const struct in6_addr *addr, uint8_t mode) +net_ipv6_mld_send_single(struct net_if *iface, const struct net_in6_addr *addr, uint8_t mode) { ARG_UNUSED(iface); ARG_UNUSED(addr); @@ -279,10 +279,10 @@ void net_ipv6_nbr_unlock(void); */ #if defined(CONFIG_NET_IPV6_NBR_CACHE) && defined(CONFIG_NET_NATIVE_IPV6) struct net_nbr *net_ipv6_nbr_lookup(struct net_if *iface, - struct in6_addr *addr); + struct net_in6_addr *addr); #else static inline struct net_nbr *net_ipv6_nbr_lookup(struct net_if *iface, - struct in6_addr *addr) + struct net_in6_addr *addr) { return NULL; } @@ -309,11 +309,11 @@ struct net_nbr *net_ipv6_get_nbr(struct net_if *iface, uint8_t idx); * @return A valid pointer on a neighbor on success, NULL otherwise */ #if defined(CONFIG_NET_IPV6_NBR_CACHE) && defined(CONFIG_NET_NATIVE_IPV6) -struct in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface, +struct net_in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface, uint8_t idx); #else static inline -struct in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface, +struct net_in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface, uint8_t idx) { return NULL; @@ -337,13 +337,13 @@ struct in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface, */ #if defined(CONFIG_NET_IPV6_NBR_CACHE) && defined(CONFIG_NET_NATIVE_IPV6) struct net_nbr *net_ipv6_nbr_add(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, const struct net_linkaddr *lladdr, bool is_router, enum net_ipv6_nbr_state state); #else static inline struct net_nbr *net_ipv6_nbr_add(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, const struct net_linkaddr *lladdr, bool is_router, enum net_ipv6_nbr_state state) @@ -361,9 +361,9 @@ static inline struct net_nbr *net_ipv6_nbr_add(struct net_if *iface, * @return True if neighbor could be removed, False otherwise */ #if defined(CONFIG_NET_IPV6_NBR_CACHE) && defined(CONFIG_NET_NATIVE_IPV6) -bool net_ipv6_nbr_rm(struct net_if *iface, struct in6_addr *addr); +bool net_ipv6_nbr_rm(struct net_if *iface, struct net_in6_addr *addr); #else -static inline bool net_ipv6_nbr_rm(struct net_if *iface, struct in6_addr *addr) +static inline bool net_ipv6_nbr_rm(struct net_if *iface, struct net_in6_addr *addr) { return true; } @@ -397,10 +397,10 @@ static inline void net_ipv6_nbr_foreach(net_nbr_cb_t cb, void *user_data) * @param ipv6_addr Pointer to the IPv6 address of the neighbor node. */ #if defined(CONFIG_NET_IPV6_ND) && defined(CONFIG_NET_NATIVE_IPV6) -void net_ipv6_nbr_reachability_hint(struct net_if *iface, const struct in6_addr *ipv6_addr); +void net_ipv6_nbr_reachability_hint(struct net_if *iface, const struct net_in6_addr *ipv6_addr); #else static inline void net_ipv6_nbr_reachability_hint(struct net_if *iface, - const struct in6_addr *ipv6_addr) + const struct net_in6_addr *ipv6_addr) { ARG_UNUSED(iface); ARG_UNUSED(ipv6_addr); @@ -428,10 +428,10 @@ static inline void net_ipv6_nbr_set_reachable_timer(struct net_if *iface, /** Store pending IPv6 fragment information that is needed for reassembly. */ struct net_ipv6_reassembly { /** IPv6 source address of the fragment */ - struct in6_addr src; + struct net_in6_addr src; /** IPv6 destination address of the fragment */ - struct in6_addr dst; + struct net_in6_addr dst; /** * Timeout for cancelling the reassembly. The timer is used @@ -588,12 +588,12 @@ static inline void net_ipv6_set_ecn(uint8_t *tc, uint8_t ecn) * @param preferred_lifetime Preferred lifetime of this IPv6 prefix (in seconds) */ #if defined(CONFIG_NET_IPV6_PE) -void net_ipv6_pe_start(struct net_if *iface, const struct in6_addr *prefix, +void net_ipv6_pe_start(struct net_if *iface, const struct net_in6_addr *prefix, uint32_t vlifetime, uint32_t preferred_lifetime); #else static inline void net_ipv6_pe_start(struct net_if *iface, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint32_t vlifetime, uint32_t preferred_lifetime) { @@ -643,7 +643,7 @@ static inline int net_ipv6_pe_init(struct net_if *iface) } #endif /* CONFIG_NET_IPV6_PE */ -typedef void (*net_ipv6_pe_filter_cb_t)(struct in6_addr *prefix, +typedef void (*net_ipv6_pe_filter_cb_t)(struct net_in6_addr *prefix, bool is_denylist, void *user_data); diff --git a/subsys/net/ip/ipv6_fragment.c b/subsys/net/ip/ipv6_fragment.c index dc913a7a6033c..5c64aa1153c7f 100644 --- a/subsys/net/ip/ipv6_fragment.c +++ b/subsys/net/ip/ipv6_fragment.c @@ -158,8 +158,8 @@ static struct net_ipv6_reassembly *reassembly_get(uint32_t id, } static bool reassembly_cancel(uint32_t id, - struct in6_addr *src, - struct in6_addr *dst) + struct net_in6_addr *src, + struct net_in6_addr *dst) { int i, j; @@ -335,7 +335,7 @@ static void reassemble_packet(struct net_ipv6_reassembly *reass) len = net_pkt_get_len(pkt) - sizeof(struct net_ipv6_hdr); - ipv6.hdr->len = htons(len); + ipv6.hdr->len = net_htons(len); net_pkt_set_data(pkt, &ipv6_access); net_pkt_set_ip_reassembled(pkt, true); @@ -601,7 +601,7 @@ static int send_ipv6_fragment(struct net_pkt *pkt, frag_pkt = net_pkt_alloc_with_buffer(net_pkt_iface(pkt), fit_len + net_pkt_ipv6_ext_len(pkt) + NET_IPV6_FRAGH_LEN, - AF_INET6, 0, BUF_ALLOC_TIMEOUT); + NET_AF_INET6, 0, BUF_ALLOC_TIMEOUT); if (!frag_pkt) { return -ENOMEM; } @@ -635,7 +635,7 @@ static int send_ipv6_fragment(struct net_pkt *pkt, frag_hdr->nexthdr = next_hdr; frag_hdr->reserved = 0U; frag_hdr->id = net_pkt_ipv6_fragment_id(pkt); - frag_hdr->offset = htons(((frag_offset / 8U) << 3) | !final); + frag_hdr->offset = net_htons(((frag_offset / 8U) << 3) | !final); net_pkt_set_chksum_done(frag_pkt, true); @@ -736,13 +736,13 @@ int net_ipv6_send_fragmented_pkt(struct net_if *iface, struct net_pkt *pkt, net_pkt_skip(pkt, last_hdr_off); switch (next_hdr) { - case IPPROTO_ICMPV6: + case NET_IPPROTO_ICMPV6: ret = net_icmpv6_finalize(pkt, true); break; - case IPPROTO_TCP: + case NET_IPPROTO_TCP: ret = net_tcp_finalize(pkt, true); break; - case IPPROTO_UDP: + case NET_IPPROTO_UDP: ret = net_udp_finalize(pkt, true); break; default: diff --git a/subsys/net/ip/ipv6_mld.c b/subsys/net/ip/ipv6_mld.c index 8444e36b25ce2..af166c25823cc 100644 --- a/subsys/net/ip/ipv6_mld.c +++ b/subsys/net/ip/ipv6_mld.c @@ -37,7 +37,7 @@ LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL); #define IPV6_OPT_HDR_ROUTER_ALERT_LEN 8 #define MLDV2_REPORT_RESERVED_BYTES 2 -#define MLDv2_LEN (MLDv2_MCAST_RECORD_LEN + sizeof(struct in6_addr)) +#define MLDv2_LEN (MLDv2_MCAST_RECORD_LEN + sizeof(struct net_in6_addr)) /* Internal structure used for appending multicast routes to MLDv2 reports */ struct mcast_route_appending_info { @@ -48,7 +48,7 @@ struct mcast_route_appending_info { }; static int mld_create(struct net_pkt *pkt, - const struct in6_addr *addr, + const struct net_in6_addr *addr, uint8_t record_type) { NET_PKT_DATA_ACCESS_DEFINE(mld_access, @@ -76,7 +76,7 @@ static int mld_create(struct net_pkt *pkt, static int mld_create_packet(struct net_pkt *pkt, uint16_t count) { - struct in6_addr dst; + struct net_in6_addr dst; /* Sent to all MLDv2-capable routers */ net_ipv6_addr_create(&dst, 0xff02, 0, 0, 0, 0, 0, 0, 0x0016); @@ -90,7 +90,7 @@ static int mld_create_packet(struct net_pkt *pkt, uint16_t count) } /* Add hop-by-hop option and router alert option, RFC 3810 ch 5. */ - if (net_pkt_write_u8(pkt, IPPROTO_ICMPV6) || + if (net_pkt_write_u8(pkt, NET_IPPROTO_ICMPV6) || net_pkt_write_u8(pkt, 0)) { return -ENOBUFS; } @@ -127,7 +127,7 @@ static int mld_send(struct net_pkt *pkt) int ret; net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); ret = net_send_data(pkt); if (ret < 0) { @@ -176,7 +176,7 @@ static void append_mcast_routes(struct net_route_entry_mcast *entry, void *user_ } #endif -int net_ipv6_mld_send_single(struct net_if *iface, const struct in6_addr *addr, uint8_t mode) +int net_ipv6_mld_send_single(struct net_if *iface, const struct net_in6_addr *addr, uint8_t mode) { struct net_pkt *pkt; int ret; @@ -184,8 +184,8 @@ int net_ipv6_mld_send_single(struct net_if *iface, const struct in6_addr *addr, pkt = net_pkt_alloc_with_buffer(iface, IPV6_OPT_HDR_ROUTER_ALERT_LEN + NET_ICMPV6_UNUSED_LEN + MLDv2_MCAST_RECORD_LEN + - sizeof(struct in6_addr), - AF_INET6, IPPROTO_ICMPV6, + sizeof(struct net_in6_addr), + NET_AF_INET6, NET_IPPROTO_ICMPV6, PKT_WAIT_TIME); if (!pkt) { return -ENOMEM; @@ -210,7 +210,7 @@ int net_ipv6_mld_send_single(struct net_if *iface, const struct in6_addr *addr, return ret; } -int net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr) +int net_ipv6_mld_join(struct net_if *iface, const struct net_in6_addr *addr) { struct net_if_mcast_addr *maddr; int ret = 0; @@ -251,12 +251,12 @@ int net_ipv6_mld_join(struct net_if *iface, const struct in6_addr *addr) net_mgmt_event_notify_with_info(NET_EVENT_IPV6_MCAST_JOIN, iface, &maddr->address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); return ret; } -int net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr) +int net_ipv6_mld_leave(struct net_if *iface, const struct net_in6_addr *addr) { struct net_if_mcast_addr *maddr; int ret = 0; @@ -288,7 +288,7 @@ int net_ipv6_mld_leave(struct net_if *iface, const struct in6_addr *addr) net_mgmt_event_notify_with_info(NET_EVENT_IPV6_MCAST_LEAVE, iface, &maddr->address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); return ret; } @@ -321,7 +321,7 @@ static int send_mld_report(struct net_if *iface) pkt = net_pkt_alloc_with_buffer(iface, IPV6_OPT_HDR_ROUTER_ALERT_LEN + NET_ICMPV6_UNUSED_LEN + count * MLDv2_MCAST_RECORD_LEN, - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, PKT_WAIT_TIME); if (!pkt) { return -ENOBUFS; @@ -439,12 +439,12 @@ static int handle_mld_query(struct net_icmp_ctx *ctx, net_stats_update_ipv6_mld_recv(net_pkt_iface(pkt)); - mld_query->num_sources = ntohs(mld_query->num_sources); + mld_query->num_sources = net_ntohs(mld_query->num_sources); pkt_len = sizeof(struct net_ipv6_hdr) + net_pkt_ipv6_ext_len(pkt) + sizeof(struct net_icmp_hdr) + sizeof(struct net_icmpv6_mld_query) + - sizeof(struct in6_addr) * mld_query->num_sources; + sizeof(struct net_in6_addr) * mld_query->num_sources; if (length < pkt_len || pkt_len > NET_IPV6_MTU || ip_hdr->hop_limit != 1U || icmp_hdr->code != 0U) { @@ -471,7 +471,7 @@ void net_ipv6_mld_init(void) static struct net_icmp_ctx ctx; int ret; - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_MLD_QUERY, 0, handle_mld_query); + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_MLD_QUERY, 0, handle_mld_query); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_MLD_QUERY), ret); diff --git a/subsys/net/ip/ipv6_nbr.c b/subsys/net/ip/ipv6_nbr.c index 3ced3e8b3a6bc..2ef04fe00b243 100644 --- a/subsys/net/ip/ipv6_nbr.c +++ b/subsys/net/ip/ipv6_nbr.c @@ -254,7 +254,7 @@ void nbr_print(void) static struct net_nbr *nbr_lookup(struct net_nbr_table *table, struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { int i; @@ -306,7 +306,7 @@ static inline void nbr_free(struct net_nbr *nbr) net_nbr_unlink(nbr, NULL); } -bool net_ipv6_nbr_rm(struct net_if *iface, struct in6_addr *addr) +bool net_ipv6_nbr_rm(struct net_if *iface, struct net_in6_addr *addr) { struct net_nbr *nbr; #if defined(CONFIG_NET_MGMT_EVENT_INFO) @@ -458,7 +458,7 @@ static void ipv6_ns_reply_timeout(struct k_work *work) } static void nbr_init(struct net_nbr *nbr, struct net_if *iface, - const struct in6_addr *addr, bool is_router, + const struct net_in6_addr *addr, bool is_router, enum net_ipv6_nbr_state state) { nbr->idx = NET_NBR_LLADDR_UNKNOWN; @@ -482,7 +482,7 @@ static void nbr_init(struct net_nbr *nbr, struct net_if *iface, } static struct net_nbr *nbr_new(struct net_if *iface, - const struct in6_addr *addr, bool is_router, + const struct net_in6_addr *addr, bool is_router, enum net_ipv6_nbr_state state) { struct net_nbr *nbr = net_nbr_get(&net_neighbor.table); @@ -502,7 +502,7 @@ static struct net_nbr *nbr_new(struct net_if *iface, static void dbg_update_neighbor_lladdr(const struct net_linkaddr *new_lladdr, const struct net_linkaddr *old_lladdr, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { char out[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")]; @@ -517,7 +517,7 @@ static void dbg_update_neighbor_lladdr(const struct net_linkaddr *new_lladdr, static void dbg_update_neighbor_lladdr_raw(uint8_t *new_lladdr, struct net_linkaddr *old_lladdr, - struct in6_addr *addr) + struct net_in6_addr *addr) { struct net_linkaddr lladdr = { .len = old_lladdr->len, @@ -608,7 +608,7 @@ static void ipv6_nd_remove_old_stale_nbr(void) } static struct net_nbr *add_nbr(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, bool is_router, enum net_ipv6_nbr_state state) { @@ -638,7 +638,7 @@ static struct net_nbr *add_nbr(struct net_if *iface, } struct net_nbr *net_ipv6_nbr_add(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, const struct net_linkaddr *lladdr, bool is_router, enum net_ipv6_nbr_state state) @@ -722,7 +722,7 @@ void net_neighbor_table_clear(struct net_nbr_table *table) NET_DBG("Neighbor table %p cleared", table); } -struct in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface, +struct net_in6_addr *net_ipv6_nbr_lookup_by_index(struct net_if *iface, uint8_t idx) { int i; @@ -767,7 +767,7 @@ int net_ipv6_start_dad(struct net_if *iface, struct net_if_addr *ifaddr) &ifaddr->address.in6_addr, true); } -static inline bool dad_failed(struct net_if *iface, struct in6_addr *addr) +static inline bool dad_failed(struct net_if *iface, struct net_in6_addr *addr) { if (net_ipv6_is_ll_addr(addr)) { NET_ERR("DAD failed, no ll IPv6 address!"); @@ -781,11 +781,11 @@ static inline bool dad_failed(struct net_if *iface, struct in6_addr *addr) #endif /* CONFIG_NET_IPV6_DAD */ #if defined(CONFIG_NET_IPV6_NBR_CACHE) -static struct in6_addr *check_route(struct net_if *iface, - struct in6_addr *dst, +static struct net_in6_addr *check_route(struct net_if *iface, + struct net_in6_addr *dst, bool *try_route) { - struct in6_addr *nexthop = NULL; + struct net_in6_addr *nexthop = NULL; struct net_route_entry *route; struct net_if_router *router; @@ -837,10 +837,10 @@ static struct in6_addr *check_route(struct net_if *iface, enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr); - struct in6_addr *nexthop = NULL; + struct net_in6_addr *nexthop = NULL; struct net_if *iface = NULL; struct net_ipv6_hdr *ip_hdr; - struct in6_addr dst_ip; + struct net_in6_addr dst_ip; struct net_nbr *nbr; int ret; @@ -862,13 +862,13 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt) uint16_t mtu; if (IS_ENABLED(CONFIG_NET_IPV6_PMTU)) { - struct sockaddr_in6 dst = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 dst = { + .sin6_family = NET_AF_INET6, }; net_ipv6_addr_copy_raw((uint8_t *)&dst.sin6_addr, ip_hdr->dst); - ret = net_pmtu_get_mtu((struct sockaddr *)&dst); + ret = net_pmtu_get_mtu((struct net_sockaddr *)&dst); if (ret <= 0) { goto use_interface_mtu; } @@ -971,15 +971,15 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt) try_send: if (IS_ENABLED(CONFIG_NET_IPV6_PMTU)) { struct net_pmtu_entry *entry; - struct sockaddr_in6 dst = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 dst = { + .sin6_family = NET_AF_INET6, }; - net_ipaddr_copy(&dst.sin6_addr, (struct in6_addr *)ip_hdr->dst); + net_ipaddr_copy(&dst.sin6_addr, (struct net_in6_addr *)ip_hdr->dst); - entry = net_pmtu_get_entry((struct sockaddr *)&dst); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dst); if (entry == NULL) { - ret = net_pmtu_update_mtu((struct sockaddr *)&dst, + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dst, net_if_get_mtu(iface)); if (ret < 0) { NET_DBG("Cannot update PMTU for %s (%d)", @@ -1029,7 +1029,7 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt) net_ipv6_nbr_unlock(); #if defined(CONFIG_NET_IPV6_ND) - struct in6_addr src_ip; + struct net_in6_addr src_ip; net_ipv6_addr_copy_raw(src_ip.s6_addr, ip_hdr->src); @@ -1065,7 +1065,7 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt) } struct net_nbr *net_ipv6_nbr_lookup(struct net_if *iface, - struct in6_addr *addr) + struct net_in6_addr *addr) { struct net_nbr *nbr; @@ -1159,8 +1159,8 @@ static bool read_llao(struct net_pkt *pkt, return true; } -int net_ipv6_send_na(struct net_if *iface, const struct in6_addr *src, - const struct in6_addr *dst, const struct in6_addr *tgt, +int net_ipv6_send_na(struct net_if *iface, const struct net_in6_addr *src, + const struct net_in6_addr *dst, const struct net_in6_addr *tgt, uint8_t flags) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(na_access, @@ -1175,7 +1175,7 @@ int net_ipv6_send_na(struct net_if *iface, const struct in6_addr *src, pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_icmpv6_na_hdr) + llao_len, - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, ND_NET_BUF_TIMEOUT); if (!pkt) { return -ENOMEM; @@ -1209,7 +1209,7 @@ int net_ipv6_send_na(struct net_if *iface, const struct in6_addr *src, } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); dbg_addr_sent_tgt("Neighbor Advertisement", src, dst, &na_hdr->tgt, pkt); @@ -1233,8 +1233,8 @@ int net_ipv6_send_na(struct net_if *iface, const struct in6_addr *src, } static void ns_routing_info(struct net_pkt *pkt, - struct in6_addr *nexthop, - struct in6_addr *tgt) + struct net_in6_addr *nexthop, + struct net_in6_addr *tgt) { if (CONFIG_NET_IPV6_LOG_LEVEL >= LOG_LEVEL_DBG) { char out[NET_IPV6_ADDR_LEN]; @@ -1273,10 +1273,10 @@ static int handle_ns_input(struct net_icmp_ctx *ctx, struct net_icmpv6_nd_opt_hdr *nd_opt_hdr; struct net_icmpv6_ns_hdr *ns_hdr; struct net_if_addr *ifaddr; - const struct in6_addr *na_src; - const struct in6_addr *na_dst; - struct in6_addr *tgt; - struct in6_addr ns_tgt, ns_src, ns_dst; + const struct net_in6_addr *na_src; + const struct net_in6_addr *na_dst; + struct net_in6_addr *tgt; + struct net_in6_addr ns_tgt, ns_src, ns_dst; struct net_linkaddr src_lladdr; src_lladdr.len = 0; @@ -1364,7 +1364,7 @@ static int handle_ns_input(struct net_icmp_ctx *ctx, if (!ifaddr) { if (IS_ENABLED(CONFIG_NET_ROUTING)) { - struct in6_addr *nexthop; + struct net_in6_addr *nexthop; nexthop = check_route(NULL, &ns_tgt, NULL); if (nexthop) { @@ -1437,7 +1437,7 @@ static int handle_ns_input(struct net_icmp_ctx *ctx, /* We reuse the received packet for the NA addresses*/ net_ipv6_addr_create_ll_allnodes_mcast(&ns_dst); - net_ipaddr_copy((struct in6_addr *)ip_hdr->src, + net_ipaddr_copy((struct net_in6_addr *)ip_hdr->src, net_if_ipv6_select_src_addr( net_pkt_iface(pkt), &ns_dst)); @@ -1667,7 +1667,7 @@ void net_ipv6_nbr_set_reachable_timer(struct net_if *iface, } void net_ipv6_nbr_reachability_hint(struct net_if *iface, - const struct in6_addr *ipv6_addr) + const struct net_in6_addr *ipv6_addr) { struct net_nbr *nbr = NULL; @@ -1695,7 +1695,7 @@ void net_ipv6_nbr_reachability_hint(struct net_if *iface, #if defined(CONFIG_NET_IPV6_NBR_CACHE) static inline bool handle_na_neighbor(struct net_pkt *pkt, struct net_icmpv6_na_hdr *na_hdr, - struct in6_addr *na_tgt, + struct net_in6_addr *na_tgt, uint16_t tllao_offset) { struct net_linkaddr lladdr = { 0 }; @@ -1894,7 +1894,7 @@ static int handle_na_input(struct net_icmp_ctx *ctx, uint16_t tllao_offset = 0U; struct net_icmpv6_nd_opt_hdr *nd_opt_hdr; struct net_icmpv6_na_hdr *na_hdr; - struct in6_addr na_tgt, na_dst; + struct net_in6_addr na_tgt, na_dst; struct net_if_addr *ifaddr; if (net_if_flag_is_set(net_pkt_iface(pkt), NET_IF_IPV6_NO_ND)) { @@ -2003,9 +2003,9 @@ static int handle_na_input(struct net_icmp_ctx *ctx, int net_ipv6_send_ns(struct net_if *iface, struct net_pkt *pending, - const struct in6_addr *src, - const struct in6_addr *dst, - const struct in6_addr *tgt, + const struct net_in6_addr *src, + const struct net_in6_addr *dst, + const struct net_in6_addr *tgt, bool is_my_address) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ns_access, @@ -2013,7 +2013,7 @@ int net_ipv6_send_ns(struct net_if *iface, struct net_pkt *pkt = NULL; int ret = -ENOBUFS; struct net_icmpv6_ns_hdr *ns_hdr; - struct in6_addr node_dst; + struct net_in6_addr node_dst; struct net_nbr *nbr; uint8_t llao_len; @@ -2044,7 +2044,7 @@ int net_ipv6_send_ns(struct net_if *iface, pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_icmpv6_ns_hdr) + llao_len, - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, ND_NET_BUF_TIMEOUT); if (!pkt) { ret = -ENOMEM; @@ -2083,7 +2083,7 @@ int net_ipv6_send_ns(struct net_if *iface, } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); net_ipv6_nbr_lock(); nbr = add_nbr(iface, tgt, false, @@ -2173,8 +2173,8 @@ int net_ipv6_send_rs(struct net_if *iface) { uint8_t llao_len = 0U; int ret = -ENOBUFS; - const struct in6_addr *src; - struct in6_addr dst; + const struct net_in6_addr *src; + struct net_in6_addr dst; struct net_pkt *pkt; net_ipv6_addr_create_ll_allrouters_mcast(&dst); @@ -2187,7 +2187,7 @@ int net_ipv6_send_rs(struct net_if *iface) pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_icmpv6_rs_hdr) + llao_len, - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, ND_NET_BUF_TIMEOUT); if (!pkt) { return -ENOMEM; @@ -2209,7 +2209,7 @@ int net_ipv6_send_rs(struct net_if *iface) } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); dbg_addr_sent("Router Solicitation", src, &dst, pkt); @@ -2237,7 +2237,7 @@ int net_ipv6_start_rs(struct net_if *iface) } static inline struct net_nbr *handle_ra_neighbor(struct net_pkt *pkt, uint8_t len, - struct in6_addr *ra_src) + struct net_in6_addr *ra_src) { struct net_linkaddr lladdr; @@ -2254,7 +2254,7 @@ static inline void handle_prefix_onlink(struct net_pkt *pkt, struct net_icmpv6_nd_opt_prefix_info *prefix_info) { struct net_if_ipv6_prefix *prefix; - struct in6_addr received_prefix; + struct net_in6_addr received_prefix; net_ipv6_addr_copy_raw(received_prefix.s6_addr, prefix_info->prefix); @@ -2266,7 +2266,7 @@ static inline void handle_prefix_onlink(struct net_pkt *pkt, } prefix = net_if_ipv6_prefix_add(net_pkt_iface(pkt), - (struct in6_addr *)prefix_info->prefix, + (struct net_in6_addr *)prefix_info->prefix, prefix_info->prefix_len, prefix_info->valid_lifetime); if (prefix) { @@ -2336,8 +2336,8 @@ static inline void handle_prefix_autonomous(struct net_pkt *pkt, struct net_icmpv6_nd_opt_prefix_info *prefix_info) { struct net_if *iface = net_pkt_iface(pkt); - struct in6_addr received_prefix; - struct in6_addr addr = { }; + struct net_in6_addr received_prefix; + struct net_in6_addr addr = { }; struct net_if_addr *ifaddr; int ret; @@ -2424,8 +2424,8 @@ static inline bool handle_ra_prefix(struct net_pkt *pkt) net_pkt_acknowledge_data(pkt, &rapfx_access); - valid_lifetime = ntohl(pfx_info->valid_lifetime); - preferred_lifetime = ntohl(pfx_info->preferred_lifetime); + valid_lifetime = net_ntohl(pfx_info->valid_lifetime); + preferred_lifetime = net_ntohl(pfx_info->preferred_lifetime); if (valid_lifetime >= preferred_lifetime && !net_ipv6_is_ll_addr_raw(pfx_info->prefix)) { @@ -2485,13 +2485,13 @@ static inline bool handle_ra_6co(struct net_pkt *pkt, uint8_t len) #endif static inline bool handle_ra_route_info(struct net_pkt *pkt, uint8_t len, - struct in6_addr *ra_src) + struct net_in6_addr *ra_src) { NET_PKT_DATA_ACCESS_DEFINE(routeinfo_access, struct net_icmpv6_nd_opt_route_info); struct net_icmpv6_nd_opt_route_info *route_info; struct net_route_entry *route; - struct in6_addr prefix_buf = { 0 }; + struct net_in6_addr prefix_buf = { 0 }; uint8_t prefix_field_len = (len - 1) * 8; uint32_t route_lifetime; uint8_t prefix_len; @@ -2510,7 +2510,7 @@ static inline bool handle_ra_route_info(struct net_pkt *pkt, uint8_t len, } prefix_len = route_info->prefix_len; - route_lifetime = ntohl(route_info->route_lifetime); + route_lifetime = net_ntohl(route_info->route_lifetime); preference = route_info->flags.prf; ret = net_pkt_read(pkt, &prefix_buf, prefix_field_len); @@ -2548,11 +2548,11 @@ static inline bool handle_ra_rdnss(struct net_pkt *pkt, uint8_t len) NET_PKT_DATA_ACCESS_DEFINE(rdnss_access, struct net_icmpv6_nd_opt_rdnss); struct net_icmpv6_nd_opt_rdnss *rdnss; struct dns_resolve_context *ctx; - struct sockaddr_in6 dns = { - .sin6_family = AF_INET6 + struct net_sockaddr_in6 dns = { + .sin6_family = NET_AF_INET6 }; - const struct sockaddr *dns_servers[] = { - (struct sockaddr *)&dns, NULL + const struct net_sockaddr *dns_servers[] = { + (struct net_sockaddr *)&dns, NULL }; int interfaces[] = { net_if_get_by_iface(net_pkt_iface(pkt)) @@ -2597,7 +2597,7 @@ static inline bool handle_ra_rdnss(struct net_pkt *pkt, uint8_t len) interfaces, DNS_SOURCE_IPV6_RA); } else { - dns.sin6_port = htons(53); + dns.sin6_port = net_htons(53); ret = dns_resolve_remove_server_addresses(ctx, dns_servers, interfaces); } @@ -2630,7 +2630,7 @@ static int handle_ra_input(struct net_icmp_ctx *ctx, struct net_if_router *router; uint32_t mtu, reachable_time, retrans_timer; uint16_t router_lifetime; - struct in6_addr ra_src; + struct net_in6_addr ra_src; ARG_UNUSED(user_data); @@ -2662,9 +2662,9 @@ static int handle_ra_input(struct net_icmp_ctx *ctx, net_pkt_acknowledge_data(pkt, &ra_access); - router_lifetime = ntohs(ra_hdr->router_lifetime); - reachable_time = ntohl(ra_hdr->reachable_time); - retrans_timer = ntohl(ra_hdr->retrans_timer); + router_lifetime = net_ntohs(ra_hdr->router_lifetime); + reachable_time = net_ntohl(ra_hdr->reachable_time); + retrans_timer = net_ntohl(ra_hdr->retrans_timer); if (ra_hdr->cur_hop_limit) { net_if_ipv6_set_hop_limit(net_pkt_iface(pkt), @@ -2868,8 +2868,8 @@ static int handle_ptb_input(struct net_icmp_ctx *ctx, struct net_ipv6_hdr *ip_hdr = hdr->ipv6; uint16_t length = net_pkt_get_len(pkt); struct net_icmpv6_ptb *ptb_hdr; - struct sockaddr_in6 sockaddr_src = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 sockaddr_src = { + .sin6_family = NET_AF_INET6, }; struct net_pmtu_entry *entry; uint32_t mtu; @@ -2899,7 +2899,7 @@ static int handle_ptb_input(struct net_icmp_ctx *ctx, net_pkt_acknowledge_data(pkt, &ptb_access); - mtu = ntohl(ptb_hdr->mtu); + mtu = net_ntohl(ptb_hdr->mtu); if (mtu < MIN_IPV6_MTU || mtu > MAX_IPV6_MTU) { NET_DBG("DROP: Unsupported MTU %u, min is %u, max is %u", @@ -2907,9 +2907,9 @@ static int handle_ptb_input(struct net_icmp_ctx *ctx, goto drop; } - net_ipaddr_copy(&sockaddr_src.sin6_addr, (struct in6_addr *)&ip_hdr->src); + net_ipaddr_copy(&sockaddr_src.sin6_addr, (struct net_in6_addr *)&ip_hdr->src); - entry = net_pmtu_get_entry((struct sockaddr *)&sockaddr_src); + entry = net_pmtu_get_entry((struct net_sockaddr *)&sockaddr_src); if (entry == NULL) { NET_DBG("DROP: Cannot find PMTU entry for %s", net_sprint_ipv6_addr(&ip_hdr->src)); @@ -2986,13 +2986,13 @@ void net_ipv6_nbr_init(void) int ret; #if defined(CONFIG_NET_IPV6_NBR_CACHE) - ret = net_icmp_init_ctx(&ns_ctx, AF_INET6, NET_ICMPV6_NS, 0, handle_ns_input); + ret = net_icmp_init_ctx(&ns_ctx, NET_AF_INET6, NET_ICMPV6_NS, 0, handle_ns_input); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_NS), ret); } - ret = net_icmp_init_ctx(&na_ctx, AF_INET6, NET_ICMPV6_NA, 0, handle_na_input); + ret = net_icmp_init_ctx(&na_ctx, NET_AF_INET6, NET_ICMPV6_NA, 0, handle_na_input); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_NA), ret); @@ -3001,7 +3001,7 @@ void net_ipv6_nbr_init(void) k_work_init_delayable(&ipv6_ns_reply_timer, ipv6_ns_reply_timeout); #endif #if defined(CONFIG_NET_IPV6_ND) - ret = net_icmp_init_ctx(&ra_ctx, AF_INET6, NET_ICMPV6_RA, 0, handle_ra_input); + ret = net_icmp_init_ctx(&ra_ctx, NET_AF_INET6, NET_ICMPV6_RA, 0, handle_ra_input); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_RA), ret); @@ -3012,7 +3012,8 @@ void net_ipv6_nbr_init(void) #endif #if defined(CONFIG_NET_IPV6_PMTU) - ret = net_icmp_init_ctx(&ptb_ctx, AF_INET6, NET_ICMPV6_PACKET_TOO_BIG, 0, handle_ptb_input); + ret = net_icmp_init_ctx(&ptb_ctx, NET_AF_INET6, NET_ICMPV6_PACKET_TOO_BIG, 0, + handle_ptb_input); if (ret < 0) { NET_ERR("Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_PACKET_TOO_BIG), ret); diff --git a/subsys/net/ip/ipv6_pe.c b/subsys/net/ip/ipv6_pe.c index e982ce5baa1c9..86a12669e47e7 100644 --- a/subsys/net/ip/ipv6_pe.c +++ b/subsys/net/ip/ipv6_pe.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(net_ipv6_pe, CONFIG_NET_IPV6_PE_LOG_LEVEL); #include "ipv6.h" /* From RFC 5453 */ -static const struct in6_addr reserved_anycast_subnet = { { { +static const struct net_in6_addr reserved_anycast_subnet = { { { 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } } }; @@ -80,7 +80,7 @@ static inline uint32_t REGEN_ADVANCE(uint32_t retrans_timer, #if CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT > 0 /* Is this denylisting filter or not */ static bool ipv6_pe_denylist; -static struct in6_addr ipv6_pe_filter[CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT]; +static struct net_in6_addr ipv6_pe_filter[CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT]; static K_MUTEX_DEFINE(lock); #endif @@ -88,7 +88,7 @@ static K_MUTEX_DEFINE(lock); /* We need to periodically update the private address. */ static struct k_work_delayable temp_lifetime; -static bool ipv6_pe_use_this_prefix(const struct in6_addr *prefix) +static bool ipv6_pe_use_this_prefix(const struct net_in6_addr *prefix) { #if CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT > 0 int filter_found = false; @@ -134,11 +134,11 @@ static bool ipv6_pe_use_this_prefix(const struct in6_addr *prefix) } static bool ipv6_pe_prefix_already_exists(struct net_if_ipv6 *ipv6, - const struct in6_addr *prefix) + const struct net_in6_addr *prefix) { ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6 || + ipv6->unicast[i].address.family != NET_AF_INET6 || !ipv6->unicast[i].is_temporary || ipv6->unicast[i].addr_state == NET_ADDR_DEPRECATED) { continue; @@ -156,13 +156,13 @@ static bool ipv6_pe_prefix_already_exists(struct net_if_ipv6 *ipv6, static int ipv6_pe_prefix_remove(struct net_if *iface, struct net_if_ipv6 *ipv6, - const struct in6_addr *prefix) + const struct net_in6_addr *prefix) { int count = 0; ARRAY_FOR_EACH(ipv6->unicast, i) { if (ipv6->unicast[i].is_used && - ipv6->unicast[i].address.family == AF_INET6 && + ipv6->unicast[i].address.family == NET_AF_INET6 && ipv6->unicast[i].is_temporary && net_ipv6_is_prefix( (uint8_t *)&ipv6->unicast[i].address.in6_addr, @@ -177,14 +177,14 @@ static int ipv6_pe_prefix_remove(struct net_if *iface, } static bool ipv6_pe_prefix_update_lifetimes(struct net_if_ipv6 *ipv6, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint32_t vlifetime) { int32_t addr_age, new_age; ARRAY_FOR_EACH(ipv6->unicast, i) { if (!(ipv6->unicast[i].is_used && - ipv6->unicast[i].address.family == AF_INET6 && + ipv6->unicast[i].address.family == NET_AF_INET6 && ipv6->unicast[i].is_temporary && ipv6->unicast[i].addr_state == NET_ADDR_PREFERRED && net_ipv6_is_prefix( @@ -217,7 +217,7 @@ static bool ipv6_pe_prefix_update_lifetimes(struct net_if_ipv6 *ipv6, /* RFC 8981 ch 3.3.2 */ static int gen_temporary_iid(struct net_if *iface, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint8_t *network_id, size_t network_id_len, uint8_t dad_counter, uint8_t *temporary_iid, @@ -232,7 +232,7 @@ static int gen_temporary_iid(struct net_if *iface, static bool once; static uint8_t secret_key[16]; /* Min 128 bits, RFC 8981 ch 3.3.2 */ struct { - struct in6_addr prefix; + struct net_in6_addr prefix; uint32_t current_time; uint8_t network_id[16]; uint8_t mac[6]; @@ -242,7 +242,7 @@ static int gen_temporary_iid(struct net_if *iface, .dad_counter = dad_counter, }; - memcpy(&buf.prefix, prefix, sizeof(struct in6_addr)); + memcpy(&buf.prefix, prefix, sizeof(struct net_in6_addr)); if (network_id != NULL && network_id_len > 0) { memcpy(buf.network_id, network_id, @@ -293,12 +293,12 @@ static int gen_temporary_iid(struct net_if *iface, return (status == PSA_SUCCESS) ? 0 : -EIO; } -void net_ipv6_pe_start(struct net_if *iface, const struct in6_addr *prefix, +void net_ipv6_pe_start(struct net_if *iface, const struct net_in6_addr *prefix, uint32_t vlifetime, uint32_t preferred_lifetime) { struct net_if_addr *ifaddr; struct net_if_ipv6 *ipv6; - struct in6_addr addr; + struct net_in6_addr addr; k_ticks_t remaining; k_timeout_t vlifetimeout; int i, ret, dad_count = 1; @@ -369,7 +369,7 @@ void net_ipv6_pe_start(struct net_if *iface, const struct in6_addr *prefix, ifaddr = net_if_ipv6_addr_lookup(&addr, NULL); if (ifaddr == NULL && !net_ipv6_is_addr_unspecified(&addr) && memcmp(&addr, &reserved_anycast_subnet, - sizeof(struct in6_addr)) != 0) { + sizeof(struct net_in6_addr)) != 0) { valid = true; break; } @@ -440,7 +440,7 @@ void net_ipv6_pe_start(struct net_if *iface, const struct in6_addr *prefix, static void iface_cb(struct net_if *iface, void *user_data) { bool is_new_filter_denylist = !ipv6_pe_denylist; - struct in6_addr *prefix = user_data; + struct net_in6_addr *prefix = user_data; struct net_if_ipv6 *ipv6; int ret; @@ -456,7 +456,7 @@ static void iface_cb(struct net_if *iface, void *user_data) ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6 || + ipv6->unicast[i].address.family != NET_AF_INET6 || !ipv6->unicast[i].is_temporary) { continue; } @@ -505,7 +505,7 @@ static void ipv6_pe_recheck_filters(bool is_denylist) #endif /* CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT > 0 */ #if CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT > 0 -static void send_filter_event(struct in6_addr *addr, bool is_denylist, +static void send_filter_event(struct net_in6_addr *addr, bool is_denylist, uint64_t event_type) { if (IS_ENABLED(CONFIG_NET_MGMT_EVENT_INFO)) { @@ -524,7 +524,7 @@ static void send_filter_event(struct in6_addr *addr, bool is_denylist, } #endif -int net_ipv6_pe_add_filter(struct in6_addr *addr, bool is_denylist) +int net_ipv6_pe_add_filter(struct net_in6_addr *addr, bool is_denylist) { #if CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT > 0 bool found = false; @@ -588,7 +588,7 @@ int net_ipv6_pe_add_filter(struct in6_addr *addr, bool is_denylist) #endif } -int net_ipv6_pe_del_filter(struct in6_addr *addr) +int net_ipv6_pe_del_filter(struct net_in6_addr *addr) { #if CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT > 0 int ret = -ENOENT; @@ -660,7 +660,7 @@ int net_ipv6_pe_filter_foreach(net_ipv6_pe_filter_cb_t cb, void *user_data) struct deprecated_work { struct k_work_delayable work; struct net_if *iface; - struct in6_addr addr; + struct net_in6_addr addr; }; static struct deprecated_work trigger_deprecated_event; @@ -674,13 +674,13 @@ static void send_deprecated_event(struct k_work *work) net_mgmt_event_notify_with_info(NET_EVENT_IPV6_ADDR_DEPRECATED, dw->iface, &dw->addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } static void renewal_cb(struct net_if *iface, void *user_data) { struct net_if_ipv6 *ipv6; - struct in6_addr prefix; + struct net_in6_addr prefix; if (net_if_config_ipv6_get(iface, &ipv6) < 0) { return; @@ -694,7 +694,7 @@ static void renewal_cb(struct net_if *iface, void *user_data) int32_t diff; if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6 || + ipv6->unicast[i].address.family != NET_AF_INET6 || !ipv6->unicast[i].is_temporary || ipv6->unicast[i].addr_state == NET_ADDR_DEPRECATED) { continue; @@ -743,7 +743,7 @@ static void renewal_cb(struct net_if *iface, void *user_data) trigger_deprecated_event.iface = iface; memcpy(&trigger_deprecated_event.addr, &ipv6->unicast[i].address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); /* 500ms should be enough for DAD to pass */ k_work_schedule(&trigger_deprecated_event.work, K_MSEC(500)); diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c index dbe1a5270a4e4..f8049d6d719ff 100644 --- a/subsys/net/ip/net_context.c +++ b/subsys/net/ip/net_context.c @@ -157,7 +157,7 @@ bool net_context_is_timestamping_set(struct net_context *context) static inline bool is_in_tcp_listen_state(struct net_context *context) { #if defined(CONFIG_NET_TCP) - if (net_context_get_type(context) == SOCK_STREAM && + if (net_context_get_type(context) == NET_SOCK_STREAM && net_context_get_state(context) == NET_CONTEXT_LISTENING) { return true; } @@ -171,7 +171,7 @@ static inline bool is_in_tcp_listen_state(struct net_context *context) static inline bool is_in_tcp_time_wait_state(struct net_context *context) { #if defined(CONFIG_NET_TCP) - if (net_context_get_type(context) == SOCK_STREAM) { + if (net_context_get_type(context) == NET_SOCK_STREAM) { const struct tcp *tcp_conn = context->tcp; if (net_tcp_get_state(tcp_conn) == TCP_TIME_WAIT) { @@ -189,7 +189,7 @@ static int check_used_port(struct net_context *context, struct net_if *iface, enum net_ip_protocol proto, uint16_t local_port, - const struct sockaddr *local_addr, + const struct net_sockaddr *local_addr, bool reuseaddr_set, bool reuseport_set, bool check_port_range) @@ -206,7 +206,7 @@ static int check_used_port(struct net_context *context, } if (!(net_context_get_proto(&contexts[i]) == proto && - net_sin((struct sockaddr *)& + net_sin((struct net_sockaddr *)& contexts[i].local)->sin_port == local_port)) { continue; } @@ -218,9 +218,9 @@ static int check_used_port(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_IPV6) && - local_addr->sa_family == AF_INET6) { + local_addr->sa_family == NET_AF_INET6) { if (net_sin6_ptr(&contexts[i].local)->sin6_addr == NULL || - net_sin6_ptr(&contexts[i].local)->sin6_family != AF_INET6) { + net_sin6_ptr(&contexts[i].local)->sin6_family != NET_AF_INET6) { continue; } @@ -255,7 +255,7 @@ static int check_used_port(struct net_context *context, if (net_ipv6_addr_cmp( net_sin6_ptr(&contexts[i].local)-> sin6_addr, - &((struct sockaddr_in6 *) + &((struct net_sockaddr_in6 *) local_addr)->sin6_addr)) { if (reuseport_set && net_context_is_reuseport_set(&contexts[i])) { @@ -274,7 +274,7 @@ static int check_used_port(struct net_context *context, } } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - local_addr->sa_family == AF_INET) { + local_addr->sa_family == NET_AF_INET) { /* If there is an IPv6 socket already bound and * if v6only option is enabled, then it is possible to * bind IPv4 address to it. @@ -282,7 +282,7 @@ static int check_used_port(struct net_context *context, if (net_sin_ptr(&contexts[i].local)->sin_addr == NULL || ((IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) ? net_context_is_v6only_set(&contexts[i]) : true) && - net_sin_ptr(&contexts[i].local)->sin_family != AF_INET)) { + net_sin_ptr(&contexts[i].local)->sin_family != NET_AF_INET)) { continue; } @@ -317,7 +317,7 @@ static int check_used_port(struct net_context *context, if (net_ipv4_addr_cmp( net_sin_ptr(&contexts[i].local)-> sin_addr, - &((struct sockaddr_in *) + &((struct net_sockaddr_in *) local_addr)->sin_addr)) { if (reuseport_set && net_context_is_reuseport_set(&contexts[i])) { @@ -352,7 +352,7 @@ static int check_used_port(struct net_context *context, (0)); if (upper != 0 && lower != 0 && lower < upper) { - if (ntohs(local_port) < lower || ntohs(local_port) > upper) { + if (net_ntohs(local_port) < lower || net_ntohs(local_port) > upper) { return -ERANGE; } } @@ -365,7 +365,7 @@ static int check_used_port(struct net_context *context, #define MAX_PORT_RETRIES 5 static uint16_t find_available_port(struct net_context *context, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { uint16_t local_port; int count = MAX_PORT_RETRIES; @@ -402,7 +402,7 @@ static uint16_t find_available_port(struct net_context *context, } while (count > 0 && check_used_port(context, NULL, net_context_get_proto(context), - htons(local_port), + net_htons(local_port), addr, false, false, @@ -412,7 +412,7 @@ static uint16_t find_available_port(struct net_context *context, return 0; } - return htons(local_port); + return net_htons(local_port); } #else #define check_used_port(...) 0 @@ -421,63 +421,63 @@ static uint16_t find_available_port(struct net_context *context, bool net_context_port_in_use(enum net_ip_protocol proto, uint16_t local_port, - const struct sockaddr *local_addr) + const struct net_sockaddr *local_addr) { - return check_used_port(NULL, NULL, proto, htons(local_port), + return check_used_port(NULL, NULL, proto, net_htons(local_port), local_addr, false, false, false) != 0; } #if defined(CONFIG_NET_CONTEXT_CHECK) -static int net_context_check(sa_family_t family, enum net_sock_type type, +static int net_context_check(net_sa_family_t family, enum net_sock_type type, uint16_t proto, struct net_context **context) { switch (family) { - case AF_INET: - case AF_INET6: - if (family == AF_INET && !IS_ENABLED(CONFIG_NET_IPV4)) { + case NET_AF_INET: + case NET_AF_INET6: + if (family == NET_AF_INET && !IS_ENABLED(CONFIG_NET_IPV4)) { NET_DBG("IPv4 disabled"); return -EPFNOSUPPORT; } - if (family == AF_INET6 && !IS_ENABLED(CONFIG_NET_IPV6)) { + if (family == NET_AF_INET6 && !IS_ENABLED(CONFIG_NET_IPV6)) { NET_DBG("IPv6 disabled"); return -EPFNOSUPPORT; } if (!IS_ENABLED(CONFIG_NET_UDP)) { - if (type == SOCK_DGRAM) { + if (type == NET_SOCK_DGRAM) { NET_DBG("DGRAM socket type disabled."); return -EPROTOTYPE; } - if (proto == IPPROTO_UDP) { + if (proto == NET_IPPROTO_UDP) { NET_DBG("UDP disabled"); return -EPROTONOSUPPORT; } } if (!IS_ENABLED(CONFIG_NET_TCP)) { - if (type == SOCK_STREAM) { + if (type == NET_SOCK_STREAM) { NET_DBG("STREAM socket type disabled."); return -EPROTOTYPE; } - if (proto == IPPROTO_TCP) { + if (proto == NET_IPPROTO_TCP) { NET_DBG("TCP disabled"); return -EPROTONOSUPPORT; } } switch (type) { - case SOCK_DGRAM: - if (proto != IPPROTO_UDP) { + case NET_SOCK_DGRAM: + if (proto != NET_IPPROTO_UDP) { NET_DBG("Context type and protocol mismatch," " type %d proto %d", type, proto); return -EPROTONOSUPPORT; } break; - case SOCK_STREAM: - if (proto != IPPROTO_TCP) { + case NET_SOCK_STREAM: + if (proto != NET_IPPROTO_TCP) { NET_DBG("Context type and protocol mismatch," " type %d proto %d", type, proto); return -EPROTONOSUPPORT; } break; - case SOCK_RAW: + case NET_SOCK_RAW: if (!IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW)) { NET_DBG("RAW IP sockets disabled."); return -EPROTONOSUPPORT; @@ -489,33 +489,33 @@ static int net_context_check(sa_family_t family, enum net_sock_type type, } break; - case AF_PACKET: + case NET_AF_PACKET: if (!IS_ENABLED(CONFIG_NET_SOCKETS_PACKET)) { NET_DBG("AF_PACKET disabled"); return -EPFNOSUPPORT; } if (!IS_ENABLED(CONFIG_NET_SOCKETS_PACKET_DGRAM) && - type == SOCK_DGRAM) { + type == NET_SOCK_DGRAM) { NET_DBG("DGRAM socket type disabled."); return -EPROTOTYPE; } - if (type != SOCK_RAW && type != SOCK_DGRAM) { + if (type != NET_SOCK_RAW && type != NET_SOCK_DGRAM) { NET_DBG("AF_PACKET only supports RAW and DGRAM socket " "types."); return -EPROTOTYPE; } break; - case AF_CAN: + case NET_AF_CAN: if (!IS_ENABLED(CONFIG_NET_SOCKETS_CAN)) { NET_DBG("AF_CAN disabled"); return -EPFNOSUPPORT; } - if (type != SOCK_RAW) { + if (type != NET_SOCK_RAW) { NET_DBG("AF_CAN only supports RAW socket type."); return -EPROTOTYPE; } - if (proto != CAN_RAW) { + if (proto != NET_CAN_RAW) { NET_DBG("AF_CAN only supports RAW_CAN protocol."); return -EPROTOTYPE; } @@ -535,7 +535,7 @@ static int net_context_check(sa_family_t family, enum net_sock_type type, } #endif /* CONFIG_NET_CONTEXT_CHECK */ -int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto, +int net_context_get(net_sa_family_t family, enum net_sock_type type, uint16_t proto, struct net_context **context) { int i, ret; @@ -560,7 +560,7 @@ int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto, * as it is not known at this point yet. */ if (!net_if_is_ip_offloaded(net_if_get_default()) - && proto == IPPROTO_TCP) { + && proto == NET_IPPROTO_TCP) { if (net_tcp_get(&contexts[i]) < 0) { break; } @@ -575,7 +575,7 @@ int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto, net_context_set_proto(&contexts[i], proto); #if defined(CONFIG_NET_IPV6) - contexts[i].options.addr_preferences = IPV6_PREFER_SRC_PUBTMP_DEFAULT; + contexts[i].options.addr_preferences = ZSOCK_IPV6_PREFER_SRC_PUBTMP_DEFAULT; #endif #if defined(CONFIG_NET_CONTEXT_RCVTIMEO) @@ -593,14 +593,15 @@ int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto, IS_ENABLED(CONFIG_NET_INITIAL_IPV4_MCAST_LOOP); #endif if (IS_ENABLED(CONFIG_NET_IP)) { - (void)memset(&contexts[i].remote, 0, sizeof(struct sockaddr)); - (void)memset(&contexts[i].local, 0, sizeof(struct sockaddr_ptr)); + (void)memset(&contexts[i].remote, 0, sizeof(struct net_sockaddr)); + (void)memset(&contexts[i].local, 0, sizeof(struct net_sockaddr_ptr)); - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { - struct sockaddr_in6 *addr6 = - (struct sockaddr_in6 *)&contexts[i].local; + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { + struct net_sockaddr_in6 *addr6 = + (struct net_sockaddr_in6 *)&contexts[i].local; addr6->sin6_port = - find_available_port(&contexts[i], (struct sockaddr *)addr6); + find_available_port(&contexts[i], + (struct net_sockaddr *)addr6); if (!addr6->sin6_port) { ret = -EADDRINUSE; @@ -614,11 +615,13 @@ int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto, IS_ENABLED(CONFIG_NET_INITIAL_IPV6_MCAST_LOOP); #endif } - if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { - struct sockaddr_in *addr = (struct sockaddr_in *)&contexts[i].local; + if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { + struct net_sockaddr_in *addr = + (struct net_sockaddr_in *)&contexts[i].local; addr->sin_port = - find_available_port(&contexts[i], (struct sockaddr *)addr); + find_available_port(&contexts[i], + (struct net_sockaddr *)addr); if (!addr->sin_port) { ret = -EADDRINUSE; @@ -648,7 +651,7 @@ int net_context_get(sa_family_t family, enum net_sock_type type, uint16_t proto, if (ret < 0) { if (ret == -EADDRINUSE && !net_if_is_ip_offloaded(net_if_get_default()) && - proto == IPPROTO_TCP) { + proto == NET_IPPROTO_TCP) { /* Free the TCP context that we allocated earlier */ net_tcp_put(&contexts[i], false); } @@ -746,64 +749,64 @@ int net_context_put(struct net_context *context) return ret; } -/* If local address is not bound, bind it to INADDR_ANY and random port. */ +/* If local address is not bound, bind it to NET_INADDR_ANY and random port. */ static int bind_default(struct net_context *context) { - sa_family_t family = net_context_get_family(context); + net_sa_family_t family = net_context_get_family(context); - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { - struct sockaddr_in6 addr6; + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { + struct net_sockaddr_in6 addr6; if (net_sin6_ptr(&context->local)->sin6_addr) { return 0; } - addr6.sin6_family = AF_INET6; + addr6.sin6_family = NET_AF_INET6; memcpy(&addr6.sin6_addr, net_ipv6_unspecified_address(), sizeof(addr6.sin6_addr)); - addr6.sin6_port = net_context_get_type(context) == SOCK_RAW ? + addr6.sin6_port = net_context_get_type(context) == NET_SOCK_RAW ? 0 : find_available_port(context, - (struct sockaddr *)&addr6); + (struct net_sockaddr *)&addr6); - return net_context_bind(context, (struct sockaddr *)&addr6, + return net_context_bind(context, (struct net_sockaddr *)&addr6, sizeof(addr6)); } - if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { - struct sockaddr_in addr4; + if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { + struct net_sockaddr_in addr4; if (net_sin_ptr(&context->local)->sin_addr) { return 0; } - addr4.sin_family = AF_INET; - addr4.sin_addr.s_addr = INADDR_ANY; - addr4.sin_port = net_context_get_type(context) == SOCK_RAW ? + addr4.sin_family = NET_AF_INET; + addr4.sin_addr.s_addr = NET_INADDR_ANY; + addr4.sin_port = net_context_get_type(context) == NET_SOCK_RAW ? 0 : find_available_port(context, - (struct sockaddr *)&addr4); + (struct net_sockaddr *)&addr4); - return net_context_bind(context, (struct sockaddr *)&addr4, + return net_context_bind(context, (struct net_sockaddr *)&addr4, sizeof(addr4)); } - if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && family == AF_PACKET) { - struct sockaddr_ll ll_addr; + if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && family == NET_AF_PACKET) { + struct net_sockaddr_ll ll_addr; struct net_if *iface = net_context_get_iface(context); if (net_sll_ptr(&context->local)->sll_addr) { return 0; } - ll_addr.sll_family = AF_PACKET; - ll_addr.sll_protocol = htons(net_context_get_proto(context)); + ll_addr.sll_family = NET_AF_PACKET; + ll_addr.sll_protocol = net_htons(net_context_get_proto(context)); ll_addr.sll_ifindex = (iface == NULL) ? 0 : net_if_get_by_iface(iface); - return net_context_bind(context, (struct sockaddr *)&ll_addr, + return net_context_bind(context, (struct net_sockaddr *)&ll_addr, sizeof(ll_addr)); } - if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == AF_CAN) { - struct sockaddr_can can_addr; + if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == NET_AF_CAN) { + struct net_sockaddr_can can_addr; if (context->iface >= 0) { return 0; @@ -824,9 +827,9 @@ static int bind_default(struct net_context *context) #endif } - can_addr.can_family = AF_CAN; + can_addr.can_family = NET_AF_CAN; - return net_context_bind(context, (struct sockaddr *)&can_addr, + return net_context_bind(context, (struct net_sockaddr *)&can_addr, sizeof(can_addr)); } @@ -837,7 +840,7 @@ static int recheck_port(struct net_context *context, struct net_if *iface, int proto, uint16_t port, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { int ret; @@ -853,7 +856,7 @@ static int recheck_port(struct net_context *context, uint16_t re_port; NET_DBG("Port %d is out of range, re-selecting!", - ntohs(net_sin(addr)->sin_port)); + net_ntohs(net_sin(addr)->sin_port)); re_port = find_available_port(context, addr); if (re_port == 0U) { NET_ERR("No available port found (iface %d)", @@ -864,7 +867,7 @@ static int recheck_port(struct net_context *context, net_sin_ptr(&context->local)->sin_port = re_port; net_sin(addr)->sin_port = re_port; } else { - NET_ERR("Port %d is in use!", ntohs(net_sin(addr)->sin_port)); + NET_ERR("Port %d is in use!", net_ntohs(net_sin(addr)->sin_port)); NET_DBG("Interface %d (%p)", iface ? net_if_get_by_iface(iface) : 0, iface); return -EADDRINUSE; @@ -876,8 +879,8 @@ static int recheck_port(struct net_context *context, return 0; } -int net_context_bind(struct net_context *context, const struct sockaddr *addr, - socklen_t addrlen) +int net_context_bind(struct net_context *context, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int ret; @@ -890,18 +893,18 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, * the code below. Only applies for stream sockets. * TODO: Support rebinding. */ - if (net_context_get_type(context) == SOCK_STREAM) { + if (net_context_get_type(context) == NET_SOCK_STREAM) { if (context->conn_handler != NULL) { return -EISCONN; } } - if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { struct net_if *iface = NULL; - struct in6_addr *ptr; - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr; + struct net_in6_addr *ptr; + struct net_sockaddr_in6 *addr6 = (struct net_sockaddr_in6 *)addr; - if (addrlen < sizeof(struct sockaddr_in6)) { + if (addrlen < sizeof(struct net_sockaddr_in6)) { return -EINVAL; } @@ -913,7 +916,7 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, struct net_if_mcast_addr *maddr; if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_type(context) == SOCK_DGRAM) { + net_context_get_type(context) == NET_SOCK_DGRAM) { if (COND_CODE_1(CONFIG_NET_IPV6, (context->options.ipv6_mcast_ifindex > 0), (false))) { @@ -937,7 +940,7 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, &net_sin6(&context->remote)->sin6_addr); } - ptr = (struct in6_addr *)net_ipv6_unspecified_address(); + ptr = (struct net_in6_addr *)net_ipv6_unspecified_address(); } else { struct net_if_addr *ifaddr; @@ -962,7 +965,7 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, net_context_set_iface(context, iface); - net_sin6_ptr(&context->local)->sin6_family = AF_INET6; + net_sin6_ptr(&context->local)->sin6_family = NET_AF_INET6; net_sin6_ptr(&context->local)->sin6_addr = ptr; if (IS_ENABLED(CONFIG_NET_OFFLOAD) && net_if_is_ip_offloaded(iface)) { @@ -992,10 +995,10 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, NET_DBG("Context %p binding to %s [%s]:%d iface %d (%p)", context, - net_proto2str(AF_INET6, + net_proto2str(NET_AF_INET6, net_context_get_proto(context)), net_sprint_ipv6_addr(ptr), - ntohs(addr6->sin6_port), + net_ntohs(addr6->sin6_port), net_if_get_by_iface(iface), iface); unlock_ipv6: @@ -1004,13 +1007,13 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, return ret; } - if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) { - struct sockaddr_in *addr4 = (struct sockaddr_in *)addr; + if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { + struct net_sockaddr_in *addr4 = (struct net_sockaddr_in *)addr; struct net_if *iface = NULL; struct net_if_addr *ifaddr; - struct in_addr *ptr; + struct net_in_addr *ptr; - if (addrlen < sizeof(struct sockaddr_in)) { + if (addrlen < sizeof(struct net_sockaddr_in)) { return -EINVAL; } @@ -1022,7 +1025,7 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, struct net_if_mcast_addr *maddr; if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_type(context) == SOCK_DGRAM) { + net_context_get_type(context) == NET_SOCK_DGRAM) { if (COND_CODE_1(CONFIG_NET_IPV4, (context->options.ipv4_mcast_ifindex > 0), (false))) { @@ -1040,13 +1043,13 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, ptr = &maddr->address.in_addr; - } else if (UNALIGNED_GET(&addr4->sin_addr.s_addr) == INADDR_ANY) { + } else if (UNALIGNED_GET(&addr4->sin_addr.s_addr) == NET_INADDR_ANY) { if (iface == NULL) { iface = net_if_ipv4_select_src_iface( &net_sin(&context->remote)->sin_addr); } - ptr = (struct in_addr *)net_ipv4_unspecified_address(); + ptr = (struct net_in_addr *)net_ipv4_unspecified_address(); } else { ifaddr = net_if_ipv4_addr_lookup( &addr4->sin_addr, @@ -1069,7 +1072,7 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, net_context_set_iface(context, iface); - net_sin_ptr(&context->local)->sin_family = AF_INET; + net_sin_ptr(&context->local)->sin_family = NET_AF_INET; net_sin_ptr(&context->local)->sin_addr = ptr; if (IS_ENABLED(CONFIG_NET_OFFLOAD) && net_if_is_ip_offloaded(iface)) { @@ -1099,10 +1102,10 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, NET_DBG("Context %p binding to %s %s:%d iface %d (%p)", context, - net_proto2str(AF_INET, + net_proto2str(NET_AF_INET, net_context_get_proto(context)), net_sprint_ipv4_addr(ptr), - ntohs(addr4->sin_port), + net_ntohs(addr4->sin_port), net_if_get_by_iface(iface), iface); unlock_ipv4: @@ -1112,11 +1115,11 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, } if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - addr->sa_family == AF_PACKET) { - struct sockaddr_ll *ll_addr = (struct sockaddr_ll *)addr; + addr->sa_family == NET_AF_PACKET) { + struct net_sockaddr_ll *ll_addr = (struct net_sockaddr_ll *)addr; struct net_if *iface = NULL; - if (addrlen < sizeof(struct sockaddr_ll)) { + if (addrlen < sizeof(struct net_sockaddr_ll)) { return -EINVAL; } @@ -1138,7 +1141,7 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, k_mutex_lock(&context->lock, K_FOREVER); - net_sll_ptr(&context->local)->sll_family = AF_PACKET; + net_sll_ptr(&context->local)->sll_family = NET_AF_PACKET; net_sll_ptr(&context->local)->sll_ifindex = ll_addr->sll_ifindex; net_sll_ptr(&context->local)->sll_protocol = @@ -1156,7 +1159,7 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, } NET_DBG("Context %p bind to type 0x%04x iface[%d] %p addr %s", - context, htons(net_context_get_proto(context)), + context, net_htons(net_context_get_proto(context)), ll_addr->sll_ifindex, iface, net_sprint_ll_addr( net_sll_ptr(&context->local)->sll_addr, @@ -1167,11 +1170,11 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, return 0; } - if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && addr->sa_family == AF_CAN) { - struct sockaddr_can *can_addr = (struct sockaddr_can *)addr; + if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && addr->sa_family == NET_AF_CAN) { + struct net_sockaddr_can *can_addr = (struct net_sockaddr_can *)addr; struct net_if *iface = NULL; - if (addrlen < sizeof(struct sockaddr_can)) { + if (addrlen < sizeof(struct net_sockaddr_can)) { return -EINVAL; } @@ -1199,9 +1202,9 @@ int net_context_bind(struct net_context *context, const struct sockaddr *addr, k_mutex_lock(&context->lock, K_FOREVER); net_context_set_iface(context, iface); - net_context_set_family(context, AF_CAN); + net_context_set_family(context, NET_AF_CAN); - net_can_ptr(&context->local)->can_family = AF_CAN; + net_can_ptr(&context->local)->can_family = NET_AF_CAN; net_can_ptr(&context->local)->can_ifindex = can_addr->can_ifindex; @@ -1263,20 +1266,20 @@ int net_context_listen(struct net_context *context, int backlog) #if defined(CONFIG_NET_IPV4) int net_context_create_ipv4_new(struct net_context *context, struct net_pkt *pkt, - const struct in_addr *src, - const struct in_addr *dst) + const struct net_in_addr *src, + const struct net_in_addr *dst) { if (!src) { NET_ASSERT((( - struct sockaddr_in_ptr *)&context->local)->sin_addr); + struct net_sockaddr_in_ptr *)&context->local)->sin_addr); - src = ((struct sockaddr_in_ptr *)&context->local)->sin_addr; + src = ((struct net_sockaddr_in_ptr *)&context->local)->sin_addr; } if (net_ipv4_is_addr_unspecified(src) || net_ipv4_is_addr_mcast(src)) { src = net_if_ipv4_select_src_addr(net_pkt_iface(pkt), - (struct in_addr *)dst); + (struct net_in_addr *)dst); /* If src address is still unspecified, do not create pkt */ if (net_ipv4_is_addr_unspecified(src)) { NET_WARN("DROP: src addr is unspecified"); @@ -1296,12 +1299,12 @@ int net_context_create_ipv4_new(struct net_context *context, if (IS_ENABLED(CONFIG_NET_IPV4_PMTU)) { struct net_pmtu_entry *entry; - struct sockaddr_in dst_addr = { - .sin_family = AF_INET, + struct net_sockaddr_in dst_addr = { + .sin_family = NET_AF_INET, .sin_addr = *dst, }; - entry = net_pmtu_get_entry((struct sockaddr *)&dst_addr); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dst_addr); if (entry == NULL) { /* Try to figure out the MTU of the path */ net_pkt_set_ipv4_pmtu(pkt, true); @@ -1317,19 +1320,19 @@ int net_context_create_ipv4_new(struct net_context *context, #if defined(CONFIG_NET_IPV6) int net_context_create_ipv6_new(struct net_context *context, struct net_pkt *pkt, - const struct in6_addr *src, - const struct in6_addr *dst) + const struct net_in6_addr *src, + const struct net_in6_addr *dst) { if (!src) { NET_ASSERT((( - struct sockaddr_in6_ptr *)&context->local)->sin6_addr); + struct net_sockaddr_in6_ptr *)&context->local)->sin6_addr); - src = ((struct sockaddr_in6_ptr *)&context->local)->sin6_addr; + src = ((struct net_sockaddr_in6_ptr *)&context->local)->sin6_addr; } if (net_ipv6_is_addr_unspecified(src) || net_ipv6_is_addr_mcast(src)) { src = net_if_ipv6_select_src_addr_hint(net_pkt_iface(pkt), - (struct in6_addr *)dst, + (struct net_in6_addr *)dst, context->options.addr_preferences); } @@ -1348,14 +1351,14 @@ int net_context_create_ipv6_new(struct net_context *context, #endif /* CONFIG_NET_IPV6 */ int net_context_connect(struct net_context *context, - const struct sockaddr *addr, - socklen_t addrlen, + const struct net_sockaddr *addr, + net_socklen_t addrlen, net_context_connect_cb_t cb, k_timeout_t timeout, void *user_data) { - struct sockaddr *laddr = NULL; - struct sockaddr local_addr __unused; + struct net_sockaddr *laddr = NULL; + struct net_sockaddr local_addr __unused; uint16_t lport, rport; int ret; @@ -1375,11 +1378,11 @@ int net_context_connect(struct net_context *context, } /* As per POSIX, for non-connection-mode sockets: - * "If the sa_family member of address is AF_UNSPEC, the socket's peer + * "If the sa_family member of address is NET_AF_UNSPEC, the socket's peer * address shall be reset."" */ - if (IS_ENABLED(CONFIG_NET_UDP) && addr->sa_family == AF_UNSPEC && - net_context_get_type(context) == SOCK_DGRAM) { + if (IS_ENABLED(CONFIG_NET_UDP) && addr->sa_family == NET_AF_UNSPEC && + net_context_get_type(context) == NET_SOCK_DGRAM) { context->flags &= ~NET_CONTEXT_REMOTE_ADDR_SET; memset(&context->remote, 0, sizeof(context->remote)); ret = 0; @@ -1394,7 +1397,7 @@ int net_context_connect(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - addr->sa_family == AF_PACKET) { + addr->sa_family == NET_AF_PACKET) { ret = -EOPNOTSUPP; goto unlock; } @@ -1405,26 +1408,26 @@ int net_context_connect(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_IPV6) && - net_context_get_family(context) == AF_INET6) { - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) + net_context_get_family(context) == NET_AF_INET6) { + struct net_sockaddr_in6 *addr6 = (struct net_sockaddr_in6 *) &context->remote; - if (addrlen < sizeof(struct sockaddr_in6)) { + if (addrlen < sizeof(struct net_sockaddr_in6)) { ret = -EINVAL; goto unlock; } - if (net_context_get_proto(context) == IPPROTO_TCP && + if (net_context_get_proto(context) == NET_IPPROTO_TCP && net_ipv6_is_addr_mcast(&addr6->sin6_addr)) { ret = -EADDRNOTAVAIL; goto unlock; } memcpy(&addr6->sin6_addr, &net_sin6(addr)->sin6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); addr6->sin6_port = net_sin6(addr)->sin6_port; - addr6->sin6_family = AF_INET6; + addr6->sin6_family = NET_AF_INET6; if (!net_ipv6_is_addr_unspecified(&addr6->sin6_addr)) { context->flags |= NET_CONTEXT_REMOTE_ADDR_SET; @@ -1445,10 +1448,10 @@ int net_context_connect(struct net_context *context, goto unlock; } - net_sin6_ptr(&context->local)->sin6_family = AF_INET6; - net_sin6(&local_addr)->sin6_family = AF_INET6; + net_sin6_ptr(&context->local)->sin6_family = NET_AF_INET6; + net_sin6(&local_addr)->sin6_family = NET_AF_INET6; net_sin6(&local_addr)->sin6_port = lport = - net_sin6((struct sockaddr *)&context->local)->sin6_port; + net_sin6((struct net_sockaddr *)&context->local)->sin6_port; if (net_sin6_ptr(&context->local)->sin6_addr) { net_ipaddr_copy(&net_sin6(&local_addr)->sin6_addr, @@ -1457,16 +1460,16 @@ int net_context_connect(struct net_context *context, laddr = &local_addr; } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - net_context_get_family(context) == AF_INET) { - struct sockaddr_in *addr4 = (struct sockaddr_in *) + net_context_get_family(context) == NET_AF_INET) { + struct net_sockaddr_in *addr4 = (struct net_sockaddr_in *) &context->remote; - if (addrlen < sizeof(struct sockaddr_in)) { + if (addrlen < sizeof(struct net_sockaddr_in)) { ret = -EINVAL; goto unlock; } - if (net_context_get_proto(context) == IPPROTO_TCP && + if (net_context_get_proto(context) == NET_IPPROTO_TCP && (net_ipv4_is_addr_mcast(&addr4->sin_addr) || net_ipv4_is_addr_bcast(net_context_get_iface(context), &addr4->sin_addr))) { @@ -1475,10 +1478,10 @@ int net_context_connect(struct net_context *context, } memcpy(&addr4->sin_addr, &net_sin(addr)->sin_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); addr4->sin_port = net_sin(addr)->sin_port; - addr4->sin_family = AF_INET; + addr4->sin_family = NET_AF_INET; if (addr4->sin_addr.s_addr) { context->flags |= NET_CONTEXT_REMOTE_ADDR_SET; @@ -1493,10 +1496,10 @@ int net_context_connect(struct net_context *context, goto unlock; } - net_sin_ptr(&context->local)->sin_family = AF_INET; - net_sin(&local_addr)->sin_family = AF_INET; + net_sin_ptr(&context->local)->sin_family = NET_AF_INET; + net_sin(&local_addr)->sin_family = NET_AF_INET; net_sin(&local_addr)->sin_port = lport = - net_sin((struct sockaddr *)&context->local)->sin_port; + net_sin((struct net_sockaddr *)&context->local)->sin_port; if (net_sin_ptr(&context->local)->sin_addr) { net_ipaddr_copy(&net_sin(&local_addr)->sin_addr, @@ -1523,14 +1526,14 @@ int net_context_connect(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_type(context) == SOCK_DGRAM) { + net_context_get_type(context) == NET_SOCK_DGRAM) { if (cb) { cb(context, 0, user_data); } ret = 0; } else if (IS_ENABLED(CONFIG_NET_TCP) && - net_context_get_type(context) == SOCK_STREAM) { + net_context_get_type(context) == NET_SOCK_STREAM) { NET_ASSERT(laddr != NULL); ret = net_tcp_connect(context, addr, laddr, rport, lport, @@ -1572,7 +1575,7 @@ int net_context_accept(struct net_context *context, } if ((net_context_get_state(context) != NET_CONTEXT_LISTENING) && - (net_context_get_type(context) != SOCK_STREAM)) { + (net_context_get_type(context) != NET_SOCK_STREAM)) { NET_DBG("Invalid socket, state %d type %d", net_context_get_state(context), net_context_get_type(context)); @@ -1580,7 +1583,7 @@ int net_context_accept(struct net_context *context, goto unlock; } - if (net_context_get_proto(context) == IPPROTO_TCP) { + if (net_context_get_proto(context) == NET_IPPROTO_TCP) { ret = net_tcp_accept(context, cb, user_data); goto unlock; } @@ -1659,7 +1662,7 @@ static int get_context_proxy(struct net_context *context, void *value, uint32_t *len) { #if defined(CONFIG_SOCKS) - struct sockaddr *addr = (struct sockaddr *)value; + struct net_sockaddr *addr = (struct net_sockaddr *)value; if (!value || !len) { return -EINVAL; @@ -1989,7 +1992,7 @@ static int get_context_timestamping(struct net_context *context, static int get_context_mtu(struct net_context *context, void *value, uint32_t *len) { - sa_family_t family = net_context_get_family(context); + net_sa_family_t family = net_context_get_family(context); struct net_if *iface = NULL; int mtu; @@ -2005,10 +2008,10 @@ static int get_context_mtu(struct net_context *context, mtu = net_if_get_mtu(iface); } else { - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface( &net_sin6(&context->remote)->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { iface = net_if_ipv4_select_src_iface( &net_sin(&context->remote)->sin_addr); } else { @@ -2032,10 +2035,10 @@ static int get_context_mcast_ifindex(struct net_context *context, void *value, uint32_t *len) { #if defined(CONFIG_NET_IPV6) || defined(CONFIG_NET_IPV4) - sa_family_t family = net_context_get_family(context); + net_sa_family_t family = net_context_get_family(context); - if ((IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) || - (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET)) { + if ((IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) || + (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET)) { /* If user has not set the ifindex, then get the interface * that this socket is bound to. */ @@ -2049,11 +2052,11 @@ static int get_context_mcast_ifindex(struct net_context *context, iface = net_if_get_default(); } - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { if (!net_if_flag_is_set(iface, NET_IF_IPV6)) { return -EPROTOTYPE; } - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { if (!net_if_flag_is_set(iface, NET_IF_IPV4)) { return -EPROTOTYPE; } @@ -2124,7 +2127,7 @@ static int get_context_ipv6_mcast_loop(struct net_context *context, * to net_pkt from msghdr. */ static int context_write_data(struct net_pkt *pkt, const void *buf, - int buf_len, const struct msghdr *msghdr) + int buf_len, const struct net_msghdr *msghdr) { int ret = 0; @@ -2153,26 +2156,26 @@ static int context_write_data(struct net_pkt *pkt, const void *buf, } static int context_setup_udp_packet(struct net_context *context, - sa_family_t family, + net_sa_family_t family, struct net_pkt *pkt, const void *buf, size_t len, - const struct msghdr *msg, - const struct sockaddr *dst_addr, - socklen_t addrlen) + const struct net_msghdr *msg, + const struct net_sockaddr *dst_addr, + net_socklen_t addrlen) { int ret = -EINVAL; uint16_t dst_port = 0U; - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)dst_addr; + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { + struct net_sockaddr_in6 *addr6 = (struct net_sockaddr_in6 *)dst_addr; dst_port = addr6->sin6_port; ret = net_context_create_ipv6_new(context, pkt, NULL, &addr6->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { - struct sockaddr_in *addr4 = (struct sockaddr_in *)dst_addr; + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { + struct net_sockaddr_in *addr4 = (struct net_sockaddr_in *)dst_addr; dst_port = addr4->sin_port; @@ -2190,7 +2193,7 @@ static int context_setup_udp_packet(struct net_context *context, } ret = net_udp_create(pkt, - net_sin((struct sockaddr *) + net_sin((struct net_sockaddr *) &context->local)->sin_port, dst_port); if (ret) { @@ -2203,11 +2206,11 @@ static int context_setup_udp_packet(struct net_context *context, } #if defined(CONFIG_NET_CONTEXT_TIMESTAMPING) - if (context->options.timestamping & SOF_TIMESTAMPING_TX_HARDWARE) { + if (context->options.timestamping & ZSOCK_SOF_TIMESTAMPING_TX_HARDWARE) { net_pkt_set_tx_timestamping(pkt, true); } - if (context->options.timestamping & SOF_TIMESTAMPING_RX_HARDWARE) { + if (context->options.timestamping & ZSOCK_SOF_TIMESTAMPING_RX_HARDWARE) { net_pkt_set_rx_timestamping(pkt, true); } #endif @@ -2215,11 +2218,11 @@ static int context_setup_udp_packet(struct net_context *context, return 0; } -static int context_setup_raw_ip_packet(sa_family_t family, +static int context_setup_raw_ip_packet(net_sa_family_t family, struct net_pkt *pkt, const void *buf, size_t len, - const struct msghdr *msg) + const struct net_msghdr *msg) { int ret; @@ -2228,7 +2231,7 @@ static int context_setup_raw_ip_packet(sa_family_t family, return ret; } - if (family == AF_INET) { + if (family == NET_AF_INET) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access, struct net_ipv4_hdr); struct net_ipv4_hdr *ipv4_hdr; @@ -2257,17 +2260,17 @@ static int context_setup_raw_ip_packet(sa_family_t family, net_pkt_set_data(pkt, &ipv4_access); } - net_pkt_set_ll_proto_type(pkt, ETH_P_IP); + net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IP); } else { net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); - net_pkt_set_ll_proto_type(pkt, ETH_P_IPV6); + net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IPV6); } return 0; } static void context_finalize_packet(struct net_context *context, - sa_family_t family, + net_sa_family_t family, struct net_pkt *pkt) { /* This function is meant to be temporary: once all moved to new @@ -2276,15 +2279,15 @@ static void context_finalize_packet(struct net_context *context, net_pkt_cursor_init(pkt); - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { net_ipv6_finalize(pkt, net_context_get_proto(context)); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { net_ipv4_finalize(pkt, net_context_get_proto(context)); } } static struct net_pkt *context_alloc_pkt(struct net_context *context, - sa_family_t family, + net_sa_family_t family, size_t len, k_timeout_t timeout) { struct net_pkt *pkt; @@ -2322,54 +2325,54 @@ static struct net_pkt *context_alloc_pkt(struct net_context *context, return pkt; } -static void set_pkt_txtime(struct net_pkt *pkt, const struct msghdr *msghdr) +static void set_pkt_txtime(struct net_pkt *pkt, const struct net_msghdr *msghdr) { - struct cmsghdr *cmsg; - - for (cmsg = CMSG_FIRSTHDR(msghdr); cmsg != NULL; - cmsg = CMSG_NXTHDR(msghdr, cmsg)) { - if (cmsg->cmsg_len == CMSG_LEN(sizeof(uint64_t)) && - cmsg->cmsg_level == SOL_SOCKET && - cmsg->cmsg_type == SCM_TXTIME) { - net_pkt_set_timestamp_ns(pkt, *(net_time_t *)CMSG_DATA(cmsg)); + struct net_cmsghdr *cmsg; + + for (cmsg = NET_CMSG_FIRSTHDR(msghdr); cmsg != NULL; + cmsg = NET_CMSG_NXTHDR(msghdr, cmsg)) { + if (cmsg->cmsg_len == NET_CMSG_LEN(sizeof(uint64_t)) && + cmsg->cmsg_level == ZSOCK_SOL_SOCKET && + cmsg->cmsg_type == ZSOCK_SCM_TXTIME) { + net_pkt_set_timestamp_ns(pkt, *(net_time_t *)NET_CMSG_DATA(cmsg)); break; } } } -static void set_pkt_hoplimit(struct net_pkt *pkt, const struct msghdr *msg_hdr) +static void set_pkt_hoplimit(struct net_pkt *pkt, const struct net_msghdr *msg_hdr) { - struct cmsghdr *cmsg; - const struct sockaddr_in6 *addr6 = NULL; + struct net_cmsghdr *cmsg; + const struct net_sockaddr_in6 *addr6 = NULL; if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) && IS_ENABLED(CONFIG_NET_IPV6)) { addr6 = msg_hdr->msg_name; } - for (cmsg = CMSG_FIRSTHDR(msg_hdr); cmsg != NULL; - cmsg = CMSG_NXTHDR(msg_hdr, cmsg)) { - if (net_pkt_family(pkt) == AF_INET6) { - if (cmsg->cmsg_len == CMSG_LEN(sizeof(int)) && - cmsg->cmsg_level == IPPROTO_IPV6 && - cmsg->cmsg_type == IPV6_HOPLIMIT) { - net_pkt_set_ipv6_hop_limit(pkt, *(uint8_t *)CMSG_DATA(cmsg)); + for (cmsg = NET_CMSG_FIRSTHDR(msg_hdr); cmsg != NULL; + cmsg = NET_CMSG_NXTHDR(msg_hdr, cmsg)) { + if (net_pkt_family(pkt) == NET_AF_INET6) { + if (cmsg->cmsg_len == NET_CMSG_LEN(sizeof(int)) && + cmsg->cmsg_level == NET_IPPROTO_IPV6 && + cmsg->cmsg_type == ZSOCK_IPV6_HOPLIMIT) { + net_pkt_set_ipv6_hop_limit(pkt, *(uint8_t *)NET_CMSG_DATA(cmsg)); break; } - } else if (net_pkt_family(pkt) == AF_INET) { + } else if (net_pkt_family(pkt) == NET_AF_INET) { if (addr6 == NULL || (addr6 != NULL && !net_ipv6_addr_is_v4_mapped(&addr6->sin6_addr))) { - if (cmsg->cmsg_len == CMSG_LEN(sizeof(int)) && - cmsg->cmsg_level == IPPROTO_IP && - cmsg->cmsg_type == IP_TTL) { - net_pkt_set_ipv4_ttl(pkt, *(uint8_t *)CMSG_DATA(cmsg)); + if (cmsg->cmsg_len == NET_CMSG_LEN(sizeof(int)) && + cmsg->cmsg_level == NET_IPPROTO_IP && + cmsg->cmsg_type == ZSOCK_IP_TTL) { + net_pkt_set_ipv4_ttl(pkt, *(uint8_t *)NET_CMSG_DATA(cmsg)); break; } } else if (addr6 != NULL && net_ipv6_addr_is_v4_mapped(&addr6->sin6_addr)) { - if (cmsg->cmsg_len == CMSG_LEN(sizeof(int)) && - cmsg->cmsg_level == IPPROTO_IPV6 && - cmsg->cmsg_type == IPV6_HOPLIMIT) { - net_pkt_set_ipv4_ttl(pkt, *(uint8_t *)CMSG_DATA(cmsg)); + if (cmsg->cmsg_len == NET_CMSG_LEN(sizeof(int)) && + cmsg->cmsg_level == NET_IPPROTO_IPV6 && + cmsg->cmsg_type == ZSOCK_IPV6_HOPLIMIT) { + net_pkt_set_ipv4_ttl(pkt, *(uint8_t *)NET_CMSG_DATA(cmsg)); break; } } @@ -2380,17 +2383,17 @@ static void set_pkt_hoplimit(struct net_pkt *pkt, const struct msghdr *msg_hdr) static int context_sendto(struct net_context *context, const void *buf, size_t len, - const struct sockaddr *dst_addr, - socklen_t addrlen, + const struct net_sockaddr *dst_addr, + net_socklen_t addrlen, net_context_send_cb_t cb, k_timeout_t timeout, void *user_data, bool sendto) { - const struct msghdr *msghdr = NULL; + const struct net_msghdr *msghdr = NULL; struct net_if *iface = NULL; struct net_pkt *pkt = NULL; - sa_family_t family; + net_sa_family_t family; size_t tmp_len; int ret; @@ -2410,22 +2413,22 @@ static int context_sendto(struct net_context *context, } /* Are we trying to send IPv4 packet to mapped V6 address, in that case - * we need to set the family to AF_INET so that various checks below + * we need to set the family to NET_AF_INET so that various checks below * are done to the packet correctly and we actually send an IPv4 pkt. */ if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) && IS_ENABLED(CONFIG_NET_IPV6) && - net_context_get_family(context) == AF_INET6) { - const struct sockaddr_in6 *addr6 = NULL; + net_context_get_family(context) == NET_AF_INET6) { + const struct net_sockaddr_in6 *addr6 = NULL; if (dst_addr != NULL) { - addr6 = (const struct sockaddr_in6 *)dst_addr; + addr6 = (const struct net_sockaddr_in6 *)dst_addr; } else if (msghdr != NULL) { addr6 = msghdr->msg_name; } if (addr6 != NULL && net_ipv6_addr_is_v4_mapped(&addr6->sin6_addr)) { - family = AF_INET; + family = NET_AF_INET; } else { family = net_context_get_family(context); } @@ -2433,9 +2436,9 @@ static int context_sendto(struct net_context *context, family = net_context_get_family(context); } - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { - const struct sockaddr_in6 *addr6 = - (const struct sockaddr_in6 *)dst_addr; + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { + const struct net_sockaddr_in6 *addr6 = + (const struct net_sockaddr_in6 *)dst_addr; if (msghdr) { addr6 = msghdr->msg_name; @@ -2443,15 +2446,15 @@ static int context_sendto(struct net_context *context, if (!addr6) { addr6 = net_sin6(&context->remote); - addrlen = sizeof(struct sockaddr_in6); + addrlen = sizeof(struct net_sockaddr_in6); } /* For sendmsg(), the dst_addr is NULL so set it here. */ - dst_addr = (const struct sockaddr *)addr6; + dst_addr = (const struct net_sockaddr *)addr6; } - if (addrlen < sizeof(struct sockaddr_in6)) { + if (addrlen < sizeof(struct net_sockaddr_in6)) { return -EINVAL; } @@ -2460,7 +2463,7 @@ static int context_sendto(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_type(context) == SOCK_DGRAM) { + net_context_get_type(context) == NET_SOCK_DGRAM) { if (net_ipv6_is_addr_mcast(&addr6->sin6_addr) && COND_CODE_1(CONFIG_NET_IPV6, (context->options.ipv6_mcast_ifindex > 0), (false))) { @@ -2486,9 +2489,9 @@ static int context_sendto(struct net_context *context, } } - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { - const struct sockaddr_in *addr4 = (const struct sockaddr_in *)dst_addr; - struct sockaddr_in mapped; + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { + const struct net_sockaddr_in *addr4 = (const struct net_sockaddr_in *)dst_addr; + struct net_sockaddr_in mapped; if (msghdr) { addr4 = msghdr->msg_name; @@ -2496,32 +2499,32 @@ static int context_sendto(struct net_context *context, if (!addr4) { addr4 = net_sin(&context->remote); - addrlen = sizeof(struct sockaddr_in); + addrlen = sizeof(struct net_sockaddr_in); } /* For sendmsg(), the dst_addr is NULL so set it here. */ - dst_addr = (const struct sockaddr *)addr4; + dst_addr = (const struct net_sockaddr *)addr4; } /* Get the destination address from the mapped IPv6 address */ if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) && - addr4->sin_family == AF_INET6 && + addr4->sin_family == NET_AF_INET6 && net_ipv6_addr_is_v4_mapped(&net_sin6(dst_addr)->sin6_addr)) { - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)dst_addr; + struct net_sockaddr_in6 *addr6 = (struct net_sockaddr_in6 *)dst_addr; mapped.sin_port = addr6->sin6_port; - mapped.sin_family = AF_INET; + mapped.sin_family = NET_AF_INET; net_ipaddr_copy(&mapped.sin_addr, - (struct in_addr *)(&addr6->sin6_addr.s6_addr32[3])); + (struct net_in_addr *)(&addr6->sin6_addr.s6_addr32[3])); addr4 = &mapped; /* For sendmsg(), the dst_addr is NULL so set it here. */ - dst_addr = (const struct sockaddr *)addr4; + dst_addr = (const struct net_sockaddr *)addr4; } - if (addrlen < sizeof(struct sockaddr_in)) { + if (addrlen < sizeof(struct net_sockaddr_in)) { return -EINVAL; } @@ -2530,7 +2533,7 @@ static int context_sendto(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_type(context) == SOCK_DGRAM) { + net_context_get_type(context) == NET_SOCK_DGRAM) { if (net_ipv4_is_addr_mcast(&addr4->sin_addr) && COND_CODE_1(CONFIG_NET_IPV4, (context->options.ipv4_mcast_ifindex > 0), (false))) { @@ -2555,25 +2558,25 @@ static int context_sendto(struct net_context *context, } } - } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && family == AF_PACKET) { - struct sockaddr_ll *ll_addr = (struct sockaddr_ll *)dst_addr; + } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && family == NET_AF_PACKET) { + struct net_sockaddr_ll *ll_addr = (struct net_sockaddr_ll *)dst_addr; if (msghdr) { ll_addr = msghdr->msg_name; addrlen = msghdr->msg_namelen; if (!ll_addr) { - ll_addr = (struct sockaddr_ll *) + ll_addr = (struct net_sockaddr_ll *) (&context->remote); - addrlen = sizeof(struct sockaddr_ll); + addrlen = sizeof(struct net_sockaddr_ll); } /* For sendmsg(), the dst_addr is NULL so set it here. */ - dst_addr = (const struct sockaddr *)ll_addr; + dst_addr = (const struct net_sockaddr *)ll_addr; } - if (addrlen < sizeof(struct sockaddr_ll)) { + if (addrlen < sizeof(struct net_sockaddr_ll)) { return -EINVAL; } @@ -2593,7 +2596,7 @@ static int context_sendto(struct net_context *context, net_context_set_iface(context, iface); } - if (net_context_get_type(context) == SOCK_DGRAM) { + if (net_context_get_type(context) == NET_SOCK_DGRAM) { context->flags |= NET_CONTEXT_REMOTE_ADDR_SET; /* The user must set the protocol in send call */ @@ -2602,30 +2605,30 @@ static int context_sendto(struct net_context *context, * point to remote addr. */ if ((void *)&context->remote != (void *)ll_addr) { - memcpy((struct sockaddr_ll *)&context->remote, - ll_addr, sizeof(struct sockaddr_ll)); + memcpy((struct net_sockaddr_ll *)&context->remote, + ll_addr, sizeof(struct net_sockaddr_ll)); } } - } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == AF_CAN) { - struct sockaddr_can *can_addr = (struct sockaddr_can *)dst_addr; + } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == NET_AF_CAN) { + struct net_sockaddr_can *can_addr = (struct net_sockaddr_can *)dst_addr; if (msghdr) { can_addr = msghdr->msg_name; addrlen = msghdr->msg_namelen; if (!can_addr) { - can_addr = (struct sockaddr_can *) + can_addr = (struct net_sockaddr_can *) (&context->remote); - addrlen = sizeof(struct sockaddr_can); + addrlen = sizeof(struct net_sockaddr_can); } /* For sendmsg(), the dst_addr is NULL so set it here. */ - dst_addr = (const struct sockaddr *)can_addr; + dst_addr = (const struct net_sockaddr *)can_addr; } - if (addrlen < sizeof(struct sockaddr_can)) { + if (addrlen < sizeof(struct net_sockaddr_can)) { return -EINVAL; } @@ -2667,7 +2670,7 @@ static int context_sendto(struct net_context *context, context->user_data = user_data; if (IS_ENABLED(CONFIG_NET_TCP) && - net_context_get_proto(context) == IPPROTO_TCP && + net_context_get_proto(context) == NET_IPPROTO_TCP && !net_if_is_ip_offloaded(net_context_get_iface(context))) { goto skip_alloc; } @@ -2681,8 +2684,8 @@ static int context_sendto(struct net_context *context, tmp_len = net_pkt_available_payload_buffer( pkt, net_context_get_proto(context)); if (tmp_len < len) { - if (net_context_get_type(context) == SOCK_DGRAM || - net_context_get_type(context) == SOCK_RAW) { + if (net_context_get_type(context) == NET_SOCK_DGRAM || + net_context_get_type(context) == NET_SOCK_RAW) { NET_ERR("Available payload buffer (%zu) is not enough for requested DGRAM (%zu)", tmp_len, len); ret = -ENOMEM; @@ -2733,10 +2736,10 @@ static int context_sendto(struct net_context *context, ret = net_offload_send(net_context_get_iface(context), pkt, cb, timeout, user_data); } - } else if (((IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) || - (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6)) && + } else if (((IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) || + (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6)) && IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && - net_context_get_type(context) == SOCK_RAW) { + net_context_get_type(context) == NET_SOCK_RAW) { ret = context_setup_raw_ip_packet(family, pkt, buf, len, msghdr); if (ret < 0) { goto fail; @@ -2744,7 +2747,7 @@ static int context_sendto(struct net_context *context, ret = net_try_send_data(pkt, timeout); } else if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_proto(context) == IPPROTO_UDP) { + net_context_get_proto(context) == NET_IPPROTO_UDP) { ret = context_setup_udp_packet(context, family, pkt, buf, len, msghdr, dst_addr, addrlen); if (ret < 0) { @@ -2755,7 +2758,7 @@ static int context_sendto(struct net_context *context, ret = net_try_send_data(pkt, timeout); } else if (IS_ENABLED(CONFIG_NET_TCP) && - net_context_get_proto(context) == IPPROTO_TCP) { + net_context_get_proto(context) == NET_IPPROTO_TCP) { ret = net_tcp_queue(context, buf, len, msghdr); if (ret < 0) { @@ -2765,7 +2768,7 @@ static int context_sendto(struct net_context *context, len = ret; ret = net_tcp_send_data(context, cb, user_data); - } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && family == AF_PACKET) { + } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && family == NET_AF_PACKET) { ret = context_write_data(pkt, buf, len, msghdr); if (ret < 0) { goto fail; @@ -2773,14 +2776,14 @@ static int context_sendto(struct net_context *context, net_pkt_cursor_init(pkt); - struct sockaddr_ll_ptr *ll_src_addr; - struct sockaddr_ll *ll_dst_addr; + struct net_sockaddr_ll_ptr *ll_src_addr; + struct net_sockaddr_ll *ll_dst_addr; /* The destination address is set in remote for this * socket type. */ - ll_dst_addr = (struct sockaddr_ll *)&context->remote; - ll_src_addr = (struct sockaddr_ll_ptr *)&context->local; + ll_dst_addr = (struct net_sockaddr_ll *)&context->remote; + ll_src_addr = (struct net_sockaddr_ll_ptr *)&context->local; (void)net_linkaddr_set(net_pkt_lladdr_dst(pkt), ll_dst_addr->sll_addr, @@ -2789,11 +2792,11 @@ static int context_sendto(struct net_context *context, ll_src_addr->sll_addr, sizeof(struct net_eth_addr)); - net_pkt_set_ll_proto_type(pkt, ntohs(ll_dst_addr->sll_protocol)); + net_pkt_set_ll_proto_type(pkt, net_ntohs(ll_dst_addr->sll_protocol)); net_if_try_queue_tx(net_pkt_iface(pkt), pkt, timeout); - } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == AF_CAN && - net_context_get_proto(context) == CAN_RAW) { + } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == NET_AF_CAN && + net_context_get_proto(context) == NET_CAN_RAW) { ret = context_write_data(pkt, buf, len, msghdr); if (ret < 0) { goto fail; @@ -2826,9 +2829,9 @@ static void raw_inet_set_remote(struct net_context *context, const void *buf, { struct net_if *iface; - if (net_context_get_family(context) == AF_INET) { - struct sockaddr_in *remote = - (struct sockaddr_in *)&context->remote; + if (net_context_get_family(context) == NET_AF_INET) { + struct net_sockaddr_in *remote = + (struct net_sockaddr_in *)&context->remote; const struct net_ipv4_hdr *iphdr = buf; if (len < sizeof(struct net_ipv4_hdr)) { @@ -2840,7 +2843,7 @@ static void raw_inet_set_remote(struct net_context *context, const void *buf, goto out; } - remote->sin_family = AF_INET; + remote->sin_family = NET_AF_INET; remote->sin_port = 0; memcpy(&remote->sin_addr, iphdr->dst, sizeof(remote->sin_addr)); @@ -2854,9 +2857,9 @@ static void raw_inet_set_remote(struct net_context *context, const void *buf, } net_context_set_iface(context, iface); - } else if (net_context_get_family(context) == AF_INET6) { - struct sockaddr_in6 *remote = - (struct sockaddr_in6 *)&context->remote; + } else if (net_context_get_family(context) == NET_AF_INET6) { + struct net_sockaddr_in6 *remote = + (struct net_sockaddr_in6 *)&context->remote; const struct net_ipv6_hdr *iphdr = buf; if (len < sizeof(struct net_ipv6_hdr)) { @@ -2868,7 +2871,7 @@ static void raw_inet_set_remote(struct net_context *context, const void *buf, goto out; } - remote->sin6_family = AF_INET6; + remote->sin6_family = NET_AF_INET6; remote->sin6_port = 0; memcpy(&remote->sin6_addr, iphdr->dst, sizeof(remote->sin6_addr)); @@ -2898,34 +2901,34 @@ int net_context_send(struct net_context *context, void *user_data) { bool dst_check = true; - socklen_t addrlen; + net_socklen_t addrlen; int ret = 0; k_mutex_lock(&context->lock, K_FOREVER); if (IS_ENABLED(CONFIG_NET_IPV6) && - net_context_get_family(context) == AF_INET6) { - addrlen = sizeof(struct sockaddr_in6); + net_context_get_family(context) == NET_AF_INET6) { + addrlen = sizeof(struct net_sockaddr_in6); if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && - net_context_get_type(context) == SOCK_RAW) { + net_context_get_type(context) == NET_SOCK_RAW) { raw_inet_set_remote(context, buf, len); dst_check = false; } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - net_context_get_family(context) == AF_INET) { - addrlen = sizeof(struct sockaddr_in); + net_context_get_family(context) == NET_AF_INET) { + addrlen = sizeof(struct net_sockaddr_in); if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && - net_context_get_type(context) == SOCK_RAW) { + net_context_get_type(context) == NET_SOCK_RAW) { raw_inet_set_remote(context, buf, len); dst_check = false; } } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - net_context_get_family(context) == AF_PACKET) { + net_context_get_family(context) == NET_AF_PACKET) { ret = -EOPNOTSUPP; goto unlock; } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && - net_context_get_family(context) == AF_CAN) { - addrlen = sizeof(struct sockaddr_can); + net_context_get_family(context) == NET_AF_CAN) { + addrlen = sizeof(struct net_sockaddr_can); } else { addrlen = 0; } @@ -2947,7 +2950,7 @@ int net_context_send(struct net_context *context, } int net_context_sendmsg(struct net_context *context, - const struct msghdr *msghdr, + const struct net_msghdr *msghdr, int flags, net_context_send_cb_t cb, k_timeout_t timeout, @@ -2968,8 +2971,8 @@ int net_context_sendmsg(struct net_context *context, int net_context_sendto(struct net_context *context, const void *buf, size_t len, - const struct sockaddr *dst_addr, - socklen_t addrlen, + const struct net_sockaddr *dst_addr, + net_socklen_t addrlen, net_context_send_cb_t cb, k_timeout_t timeout, void *user_data) @@ -3010,7 +3013,7 @@ enum net_verdict net_context_packet_received(struct net_conn *conn, goto unlock; } - if (net_context_get_proto(context) == IPPROTO_TCP) { + if (net_context_get_proto(context) == NET_IPPROTO_TCP) { net_stats_update_tcp_recv(net_pkt_iface(pkt), net_pkt_remaining_data(pkt)); } @@ -3039,10 +3042,10 @@ static int recv_dgram(struct net_context *context, k_timeout_t timeout, void *user_data) { - struct sockaddr local_addr = { + struct net_sockaddr local_addr = { .sa_family = net_context_get_family(context), }; - struct sockaddr *laddr = NULL; + struct net_sockaddr *laddr = NULL; uint16_t lport = 0U; int ret; @@ -3054,7 +3057,7 @@ static int recv_dgram(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_IPV6) && - net_context_get_family(context) == AF_INET6) { + net_context_get_family(context) == NET_AF_INET6) { if (net_sin6_ptr(&context->local)->sin6_addr) { net_ipaddr_copy(&net_sin6(&local_addr)->sin6_addr, net_sin6_ptr(&context->local)->sin6_addr); @@ -3063,10 +3066,10 @@ static int recv_dgram(struct net_context *context, } net_sin6(&local_addr)->sin6_port = - net_sin6((struct sockaddr *)&context->local)->sin6_port; - lport = net_sin6((struct sockaddr *)&context->local)->sin6_port; + net_sin6((struct net_sockaddr *)&context->local)->sin6_port; + lport = net_sin6((struct net_sockaddr *)&context->local)->sin6_port; } else if (IS_ENABLED(CONFIG_NET_IPV4) && - net_context_get_family(context) == AF_INET) { + net_context_get_family(context) == NET_AF_INET) { if (net_sin_ptr(&context->local)->sin_addr) { net_ipaddr_copy(&net_sin(&local_addr)->sin_addr, net_sin_ptr(&context->local)->sin_addr); @@ -3074,7 +3077,7 @@ static int recv_dgram(struct net_context *context, laddr = &local_addr; } - lport = net_sin((struct sockaddr *)&context->local)->sin_port; + lport = net_sin((struct net_sockaddr *)&context->local)->sin_port; } context->recv_cb = cb; @@ -3094,8 +3097,8 @@ static int recv_dgram(struct net_context *context, user_data, context->flags & NET_CONTEXT_REMOTE_ADDR_SET ? &context->remote : NULL, - ntohs(net_sin(&context->remote)->sin_port), - laddr, ntohs(lport)); + net_ntohs(net_sin(&context->remote)->sin_port), + laddr, net_ntohs(lport)); return ret; } @@ -3105,8 +3108,8 @@ static int recv_dgram(struct net_context *context, context->flags & NET_CONTEXT_REMOTE_ADDR_SET ? &context->remote : NULL, laddr, - ntohs(net_sin(&context->remote)->sin_port), - ntohs(lport), + net_ntohs(net_sin(&context->remote)->sin_port), + net_ntohs(lport), context, net_context_packet_received, user_data, @@ -3153,7 +3156,7 @@ static enum net_verdict net_context_raw_packet_received( static int recv_raw(struct net_context *context, net_context_recv_cb_t cb, k_timeout_t timeout, - struct sockaddr *local_addr, + struct net_sockaddr *local_addr, void *user_data) { int ret; @@ -3218,28 +3221,28 @@ int net_context_recv(struct net_context *context, family = net_context_get_family(context); - if (((IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) || - (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6)) && + if (((IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) || + (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6)) && IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && - net_context_get_type(context) == SOCK_RAW) { + net_context_get_type(context) == NET_SOCK_RAW) { ret = recv_dgram(context, cb, timeout, user_data); } else if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_proto(context) == IPPROTO_UDP) { + net_context_get_proto(context) == NET_IPPROTO_UDP) { ret = recv_dgram(context, cb, timeout, user_data); } else if (IS_ENABLED(CONFIG_NET_TCP) && - net_context_get_proto(context) == IPPROTO_TCP) { + net_context_get_proto(context) == NET_IPPROTO_TCP) { ret = net_tcp_recv(context, cb, user_data); } else { if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - family == AF_PACKET) { - struct sockaddr_ll addr = { 0 }; + family == NET_AF_PACKET) { + struct net_sockaddr_ll addr = { 0 }; ret = bind_default(context); if (ret < 0) { goto unlock; } - addr.sll_family = AF_PACKET; + addr.sll_family = NET_AF_PACKET; addr.sll_ifindex = net_sll_ptr(&context->local)->sll_ifindex; addr.sll_protocol = @@ -3254,11 +3257,11 @@ int net_context_recv(struct net_context *context, } ret = recv_raw(context, cb, timeout, - (struct sockaddr *)&addr, user_data); + (struct net_sockaddr *)&addr, user_data); } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && - family == AF_CAN) { - struct sockaddr_can local_addr = { - .can_family = AF_CAN, + family == NET_AF_CAN) { + struct net_sockaddr_can local_addr = { + .can_family = NET_AF_CAN, }; ret = bind_default(context); @@ -3267,7 +3270,7 @@ int net_context_recv(struct net_context *context, } ret = recv_raw(context, cb, timeout, - (struct sockaddr *)&local_addr, + (struct net_sockaddr *)&local_addr, user_data); if (ret == -EALREADY) { /* This is perfectly normal for CAN sockets. @@ -3414,7 +3417,7 @@ static int set_context_proxy(struct net_context *context, const void *value, uint32_t len) { #if defined(CONFIG_SOCKS) - struct sockaddr *addr = (struct sockaddr *)value; + struct net_sockaddr *addr = (struct net_sockaddr *)value; if (len > NET_SOCKADDR_MAX_SIZE) { return -EINVAL; @@ -3693,9 +3696,9 @@ static int set_context_ipv6_mtu(struct net_context *context, if (net_context_is_bound_to_iface(context)) { iface = net_context_get_iface(context); } else { - sa_family_t family = net_context_get_family(context); + net_sa_family_t family = net_context_get_family(context); - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface( &net_sin6(&context->remote)->sin6_addr); } else { @@ -3747,7 +3750,7 @@ static int set_context_recv_hoplimit(struct net_context *context, const void *value, uint32_t len) { #if defined(CONFIG_NET_CONTEXT_RECV_HOPLIMIT) - if (net_context_get_type(context) == SOCK_DGRAM) { + if (net_context_get_type(context) == NET_SOCK_DGRAM) { return set_bool_option(&context->options.recv_hoplimit, value, len); } @@ -3797,20 +3800,20 @@ static int set_context_mcast_ifindex(struct net_context *context, const void *value, uint32_t len) { #if defined(CONFIG_NET_IPV6) || defined(CONFIG_NET_IPV4) - sa_family_t family = net_context_get_family(context); + net_sa_family_t family = net_context_get_family(context); int mcast_ifindex = *((int *)value); enum net_sock_type type; struct net_if *iface; - if ((IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) || - (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET)) { + if ((IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) || + (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET)) { if (len != sizeof(int)) { return -EINVAL; } type = net_context_get_type(context); - if (type != SOCK_DGRAM) { + if (type != NET_SOCK_DGRAM) { return -EINVAL; } @@ -3829,11 +3832,11 @@ static int set_context_mcast_ifindex(struct net_context *context, return -ENOENT; } - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { if (!net_if_flag_is_set(iface, NET_IF_IPV6)) { return -EPROTOTYPE; } - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { if (!net_if_flag_is_set(iface, NET_IF_IPV4)) { return -EPROTOTYPE; } @@ -3965,10 +3968,10 @@ int net_context_set_option(struct net_context *context, case NET_OPT_MTU: /* IPv4 only supports getting the MTU */ if (IS_ENABLED(CONFIG_NET_IPV4) && - net_context_get_family(context) == AF_INET) { + net_context_get_family(context) == NET_AF_INET) { ret = -EOPNOTSUPP; } else if (IS_ENABLED(CONFIG_NET_IPV6) && - net_context_get_family(context) == AF_INET6) { + net_context_get_family(context) == NET_AF_INET6) { ret = set_context_ipv6_mtu(context, value, len); } @@ -4090,38 +4093,38 @@ int net_context_get_option(struct net_context *context, } int net_context_get_local_addr(struct net_context *ctx, - struct sockaddr *addr, - socklen_t *addrlen) + struct net_sockaddr *addr, + net_socklen_t *addrlen) { if (ctx == NULL || addr == NULL || addrlen == NULL) { return -EINVAL; } if (IS_ENABLED(CONFIG_NET_TCP) && - net_context_get_type(ctx) == SOCK_STREAM) { + net_context_get_type(ctx) == NET_SOCK_STREAM) { return net_tcp_endpoint_copy(ctx, addr, NULL, addrlen); } - if (IS_ENABLED(CONFIG_NET_UDP) && net_context_get_type(ctx) == SOCK_DGRAM) { - socklen_t newlen; + if (IS_ENABLED(CONFIG_NET_UDP) && net_context_get_type(ctx) == NET_SOCK_DGRAM) { + net_socklen_t newlen; - if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == AF_INET) { - newlen = MIN(*addrlen, sizeof(struct sockaddr_in)); + if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == NET_AF_INET) { + newlen = MIN(*addrlen, sizeof(struct net_sockaddr_in)); - net_sin(addr)->sin_family = AF_INET; + net_sin(addr)->sin_family = NET_AF_INET; net_sin(addr)->sin_port = net_sin_ptr(&ctx->local)->sin_port; memcpy(&net_sin(addr)->sin_addr, net_sin_ptr(&ctx->local)->sin_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == AF_INET6) { - newlen = MIN(*addrlen, sizeof(struct sockaddr_in6)); + } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == NET_AF_INET6) { + newlen = MIN(*addrlen, sizeof(struct net_sockaddr_in6)); - net_sin6(addr)->sin6_family = AF_INET6; + net_sin6(addr)->sin6_family = NET_AF_INET6; net_sin6(addr)->sin6_port = net_sin6_ptr(&ctx->local)->sin6_port; memcpy(&net_sin6(addr)->sin6_addr, net_sin6_ptr(&ctx->local)->sin6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } else { return -EAFNOSUPPORT; } diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c index 461de2f8a1f12..4e6d309f7d363 100644 --- a/subsys/net/ip/net_core.c +++ b/subsys/net/ip/net_core.c @@ -72,7 +72,7 @@ static inline enum net_verdict process_data(struct net_pkt *pkt) { int ret; - net_packet_socket_input(pkt, ETH_P_ALL, SOCK_RAW); + net_packet_socket_input(pkt, ETH_P_ALL, NET_SOCK_RAW); /* If there is no data, then drop the packet. */ if (!pkt->frags) { @@ -103,13 +103,13 @@ static inline enum net_verdict process_data(struct net_pkt *pkt) net_pkt_cursor_init(pkt); if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET_DGRAM)) { - net_packet_socket_input(pkt, net_pkt_ll_proto_type(pkt), SOCK_DGRAM); + net_packet_socket_input(pkt, net_pkt_ll_proto_type(pkt), NET_SOCK_DGRAM); } uint8_t family = net_pkt_family(pkt); - if (IS_ENABLED(CONFIG_NET_IP) && (family == AF_INET || family == AF_INET6 || - family == AF_UNSPEC || family == AF_PACKET)) { + if (IS_ENABLED(CONFIG_NET_IP) && (family == NET_AF_INET || family == NET_AF_INET6 || + family == NET_AF_UNSPEC || family == NET_AF_PACKET)) { /* IP version and header length. */ uint8_t vtc_vhl = NET_IPV6_HDR(pkt)->vtc & 0xf0; @@ -123,7 +123,7 @@ static inline enum net_verdict process_data(struct net_pkt *pkt) net_stats_update_ip_errors_protoerr(net_pkt_iface(pkt)); net_stats_update_ip_errors_vhlerr(net_pkt_iface(pkt)); return NET_DROP; - } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == AF_CAN) { + } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == NET_AF_CAN) { return net_canbus_socket_input(pkt); } @@ -192,7 +192,7 @@ static inline int check_ip(struct net_pkt *pkt) family = net_pkt_family(pkt); ret = 0; - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6 && + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6 && net_pkt_ll_proto_type(pkt) == NET_ETH_PTYPE_IPV6) { /* Drop IPv6 packet if hop limit is 0 */ if (NET_IPV6_HDR(pkt)->hop_limit == 0) { @@ -226,7 +226,7 @@ static inline int check_ip(struct net_pkt *pkt) if ((net_ipv6_is_addr_loopback_raw(NET_IPV6_HDR(pkt)->dst) || net_ipv6_is_my_addr_raw(NET_IPV6_HDR(pkt)->dst)) && !net_pkt_forwarding(pkt)) { - struct in6_addr addr; + struct net_in6_addr addr; /* Swap the addresses so that in receiving side * the packet is accepted. @@ -262,7 +262,7 @@ static inline int check_ip(struct net_pkt *pkt) goto drop; } - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET && + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET && net_pkt_ll_proto_type(pkt) == NET_ETH_PTYPE_IP) { /* Drop IPv4 packet if ttl is 0 */ if (NET_IPV4_HDR(pkt)->ttl == 0) { @@ -297,7 +297,7 @@ static inline int check_ip(struct net_pkt *pkt) (net_ipv4_is_addr_bcast_raw(net_pkt_iface(pkt), NET_IPV4_HDR(pkt)->dst) == false && net_ipv4_is_my_addr_raw(NET_IPV4_HDR(pkt)->dst))) { - struct in_addr addr; + struct net_in_addr addr; /* Swap the addresses so that in receiving side * the packet is accepted. @@ -328,7 +328,7 @@ static inline int check_ip(struct net_pkt *pkt) drop: if (IS_ENABLED(CONFIG_NET_STATISTICS)) { - if (family == AF_INET6) { + if (family == NET_AF_INET6) { net_stats_update_ipv6_drop(net_pkt_iface(pkt)); } else { net_stats_update_ipv4_drop(net_pkt_iface(pkt)); @@ -342,21 +342,21 @@ static inline int check_ip(struct net_pkt *pkt) static inline bool process_multicast(struct net_pkt *pkt) { struct net_context *ctx = net_pkt_context(pkt); - sa_family_t family = net_pkt_family(pkt); + net_sa_family_t family = net_pkt_family(pkt); if (ctx == NULL) { return false; } #if defined(CONFIG_NET_IPV4) - if (family == AF_INET) { - const struct in_addr *dst = (const struct in_addr *)&NET_IPV4_HDR(pkt)->dst; + if (family == NET_AF_INET) { + const struct net_in_addr *dst = (const struct net_in_addr *)&NET_IPV4_HDR(pkt)->dst; return net_ipv4_is_addr_mcast(dst) && net_context_get_ipv4_mcast_loop(ctx); } #endif #if defined(CONFIG_NET_IPV6) - if (family == AF_INET6) { + if (family == NET_AF_INET6) { return net_ipv6_is_addr_mcast_raw(NET_IPV6_HDR(pkt)->dst) && net_context_get_ipv6_mcast_loop(ctx); } @@ -423,12 +423,12 @@ int net_try_send_data(struct net_pkt *pkt, k_timeout_t timeout) if (IS_ENABLED(CONFIG_NET_STATISTICS)) { switch (net_pkt_family(pkt)) { #if defined(CONFIG_NET_IPV4) - case AF_INET: + case NET_AF_INET: net_stats_update_ipv4_sent(net_pkt_iface(pkt)); break; #endif #if defined(CONFIG_NET_IPV6) - case AF_INET6: + case NET_AF_INET6: net_stats_update_ipv6_sent(net_pkt_iface(pkt)); break; #endif @@ -458,10 +458,10 @@ int net_try_send_data(struct net_pkt *pkt, k_timeout_t timeout) if (IS_ENABLED(CONFIG_NET_STATISTICS)) { switch (family) { - case AF_INET: + case NET_AF_INET: net_stats_update_ipv4_sent(iface); break; - case AF_INET6: + case NET_AF_INET6: net_stats_update_ipv6_sent(iface); break; } diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c index 11001fe403f17..03798e2075ee0 100644 --- a/subsys/net/ip/net_if.c +++ b/subsys/net/ip/net_if.c @@ -187,10 +187,10 @@ static inline void net_context_send_cb(struct net_context *context, } if (IS_ENABLED(CONFIG_NET_UDP) && - net_context_get_proto(context) == IPPROTO_UDP) { + net_context_get_proto(context) == NET_IPPROTO_UDP) { net_stats_update_udp_sent(net_context_get_iface(context)); } else if (IS_ENABLED(CONFIG_NET_TCP) && - net_context_get_proto(context) == IPPROTO_TCP) { + net_context_get_proto(context) == NET_IPPROTO_TCP) { net_stats_update_tcp_seg_sent(net_context_get_iface(context)); } } @@ -511,21 +511,21 @@ enum net_verdict net_if_try_send_data(struct net_if *iface, struct net_pkt *pkt, } #endif - /* Bypass the IP stack with AF_INET(6)/SOCK_RAW */ - if (context && net_context_get_type(context) == SOCK_RAW && - (net_context_get_family(context) == AF_INET || - net_context_get_family(context) == AF_INET6)) { + /* Bypass the IP stack with NET_AF_INET(6)/NET_SOCK_RAW */ + if (context && net_context_get_type(context) == NET_SOCK_RAW && + (net_context_get_family(context) == NET_AF_INET || + net_context_get_family(context) == NET_AF_INET6)) { goto done; } /* If the ll dst address is not set check if it is present in the nbr * cache. */ - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { verdict = net_ipv6_prepare_for_send(pkt); } - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { verdict = net_ipv4_prepare_for_send(pkt); } @@ -732,12 +732,12 @@ static struct net_if_router *iface_router_lookup(struct net_if *iface, continue; } - if ((IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6 && + if ((IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6 && net_ipv6_addr_cmp(net_if_router_ipv6(&routers[i]), - (const struct in6_addr *)addr)) || - (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET && + (const struct net_in6_addr *)addr)) || + (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET && net_ipv4_addr_cmp(net_if_router_ipv4(&routers[i]), - (const struct in_addr *)addr))) { + (const struct net_in_addr *)addr))) { router = &routers[i]; goto out; } @@ -753,7 +753,7 @@ static void iface_router_notify_deletion(struct net_if_router *router, const char *delete_reason) { if (IS_ENABLED(CONFIG_NET_IPV6) && - router->address.family == AF_INET6) { + router->address.family == NET_AF_INET6) { NET_DBG("IPv6 router %s %s", net_sprint_ipv6_addr(net_if_router_ipv6(router)), delete_reason); @@ -761,9 +761,9 @@ static void iface_router_notify_deletion(struct net_if_router *router, net_mgmt_event_notify_with_info(NET_EVENT_IPV6_ROUTER_DEL, router->iface, &router->address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } else if (IS_ENABLED(CONFIG_NET_IPV4) && - router->address.family == AF_INET) { + router->address.family == NET_AF_INET) { NET_DBG("IPv4 router %s %s", net_sprint_ipv4_addr(net_if_router_ipv4(router)), delete_reason); @@ -771,7 +771,7 @@ static void iface_router_notify_deletion(struct net_if_router *router, net_mgmt_event_notify_with_info(NET_EVENT_IPV4_ROUTER_DEL, router->iface, &router->address.in_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } } @@ -882,31 +882,31 @@ static struct net_if_router *iface_router_add(struct net_if *iface, routers[i].lifetime = 0; } - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { memcpy(net_if_router_ipv6(&routers[i]), addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); net_mgmt_event_notify_with_info( NET_EVENT_IPV6_ROUTER_ADD, iface, &routers[i].address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); NET_DBG("interface %p router %s lifetime %u default %d " "added", iface, net_sprint_ipv6_addr(addr), lifetime, routers[i].is_default); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { memcpy(net_if_router_ipv4(&routers[i]), addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); routers[i].is_default = is_default; net_mgmt_event_notify_with_info( NET_EVENT_IPV4_ROUTER_ADD, iface, &routers[i].address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); NET_DBG("interface %p router %s lifetime %u default %d " "added", iface, - net_sprint_ipv4_addr((struct in_addr *)addr), + net_sprint_ipv4_addr((struct net_in_addr *)addr), lifetime, is_default); } @@ -1139,7 +1139,7 @@ int net_if_config_ipv6_put(struct net_if *iface) #if defined(CONFIG_NET_IPV6_MLD) static void join_mcast_allnodes(struct net_if *iface) { - struct in6_addr addr; + struct net_in6_addr addr; int ret; if (iface->config.ip.ipv6 == NULL) { @@ -1157,9 +1157,9 @@ static void join_mcast_allnodes(struct net_if *iface) } static void join_mcast_solicit_node(struct net_if *iface, - struct in6_addr *my_addr) + struct net_in6_addr *my_addr) { - struct in6_addr addr; + struct net_in6_addr addr; int ret; if (iface->config.ip.ipv6 == NULL) { @@ -1202,7 +1202,7 @@ static void leave_mcast_all(struct net_if *iface) } } -static void join_mcast_nodes(struct net_if *iface, struct in6_addr *addr) +static void join_mcast_nodes(struct net_if *iface, struct net_in6_addr *addr) { enum net_l2_flags flags = 0; @@ -1279,7 +1279,7 @@ static void dad_timeout(struct k_work *work) net_mgmt_event_notify_with_info(NET_EVENT_IPV6_DAD_SUCCEED, iface, &ifaddr->address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); /* The address gets added to neighbor cache which is not * needed in this case as the address is our own one. @@ -1335,7 +1335,7 @@ void net_if_start_dad(struct net_if *iface) struct net_if_addr *ifaddr, *next; struct net_if_ipv6 *ipv6; sys_slist_t dad_needed; - struct in6_addr addr = { }; + struct net_in6_addr addr = { }; int ret; net_if_lock(iface); @@ -1388,7 +1388,7 @@ void net_if_start_dad(struct net_if *iface) ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6 || + ipv6->unicast[i].address.family != NET_AF_INET6 || &ipv6->unicast[i] == ifaddr || net_ipv6_is_addr_loopback( &ipv6->unicast[i].address.in6_addr)) { @@ -1414,7 +1414,7 @@ void net_if_start_dad(struct net_if *iface) net_if_unlock(iface); } -void net_if_ipv6_dad_failed(struct net_if *iface, const struct in6_addr *addr) +void net_if_ipv6_dad_failed(struct net_if *iface, const struct net_in6_addr *addr) { struct net_if_addr *ifaddr; uint32_t timeout, preferred_lifetime; @@ -1448,7 +1448,7 @@ void net_if_ipv6_dad_failed(struct net_if *iface, const struct in6_addr *addr) net_mgmt_event_notify_with_info(NET_EVENT_IPV6_DAD_FAILED, iface, &ifaddr->address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); /* The old address needs to be removed from the interface before we can * start new DAD for the new PE address as the amount of address slots @@ -1620,7 +1620,7 @@ static inline void iface_ipv6_nd_init(void) #if defined(CONFIG_NET_IPV6_ND) && defined(CONFIG_NET_NATIVE_IPV6) -void net_if_nbr_reachability_hint(struct net_if *iface, const struct in6_addr *ipv6_addr) +void net_if_nbr_reachability_hint(struct net_if *iface, const struct net_in6_addr *ipv6_addr) { net_if_lock(iface); @@ -1842,7 +1842,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup_raw(const uint8_t *addr, ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6) { + ipv6->unicast[i].address.family != NET_AF_INET6) { continue; } @@ -1868,7 +1868,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup_raw(const uint8_t *addr, return ifaddr; } -struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr, +struct net_if_addr *net_if_ipv6_addr_lookup(const struct net_in6_addr *addr, struct net_if **ret) { return net_if_ipv6_addr_lookup_raw(addr->s6_addr, ret); @@ -1889,7 +1889,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup_by_iface_raw(struct net_if *iface, ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6) { + ipv6->unicast[i].address.family != NET_AF_INET6) { continue; } @@ -1909,12 +1909,12 @@ struct net_if_addr *net_if_ipv6_addr_lookup_by_iface_raw(struct net_if *iface, } struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { return net_if_ipv6_addr_lookup_by_iface_raw(iface, addr->s6_addr); } -int z_impl_net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr) +int z_impl_net_if_ipv6_addr_lookup_by_index(const struct net_in6_addr *addr) { struct net_if *iface = NULL; struct net_if_addr *if_addr; @@ -1929,9 +1929,9 @@ int z_impl_net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr) #ifdef CONFIG_USERSPACE static inline int z_vrfy_net_if_ipv6_addr_lookup_by_index( - const struct in6_addr *addr) + const struct net_in6_addr *addr) { - struct in6_addr addr_v6; + struct net_in6_addr addr_v6; K_OOPS(k_usermode_from_copy(&addr_v6, (void *)addr, sizeof(addr_v6))); @@ -1957,7 +1957,7 @@ void net_if_ipv6_addr_update_lifetime(struct net_if_addr *ifaddr, } static struct net_if_addr *ipv6_addr_find(struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6; @@ -1977,14 +1977,14 @@ static struct net_if_addr *ipv6_addr_find(struct net_if *iface, } static inline void net_if_addr_init(struct net_if_addr *ifaddr, - const struct in6_addr *addr, + const struct net_in6_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime) { ifaddr->is_used = true; ifaddr->is_added = true; ifaddr->is_temporary = false; - ifaddr->address.family = AF_INET6; + ifaddr->address.family = NET_AF_INET6; ifaddr->addr_type = addr_type; ifaddr->atomic_ref = ATOMIC_INIT(1); @@ -2006,7 +2006,7 @@ static inline void net_if_addr_init(struct net_if_addr *ifaddr, } struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime) { @@ -2065,7 +2065,7 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface, net_mgmt_event_notify_with_info( NET_EVENT_IPV6_ADDR_ADD, iface, &ipv6->unicast[i].address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); ifaddr = &ipv6->unicast[i]; break; @@ -2097,7 +2097,7 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface, return ifaddr; } -bool net_if_ipv6_addr_rm(struct net_if *iface, const struct in6_addr *addr) +bool net_if_ipv6_addr_rm(struct net_if *iface, const struct net_in6_addr *addr) { struct net_if_addr *ifaddr; struct net_if_ipv6 *ipv6; @@ -2116,7 +2116,7 @@ bool net_if_ipv6_addr_rm(struct net_if *iface, const struct in6_addr *addr) goto out; } - ret = net_if_addr_unref(iface, AF_INET6, addr, &ifaddr); + ret = net_if_addr_unref(iface, NET_AF_INET6, addr, &ifaddr); if (ret > 0) { NET_DBG("Address %s still in use (ref %d)", net_sprint_ipv6_addr(addr), ret); @@ -2135,7 +2135,7 @@ bool net_if_ipv6_addr_rm(struct net_if *iface, const struct in6_addr *addr) } bool z_impl_net_if_ipv6_addr_add_by_index(int index, - const struct in6_addr *addr, + const struct net_in6_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime) { @@ -2152,11 +2152,11 @@ bool z_impl_net_if_ipv6_addr_add_by_index(int index, #ifdef CONFIG_USERSPACE bool z_vrfy_net_if_ipv6_addr_add_by_index(int index, - const struct in6_addr *addr, + const struct net_in6_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime) { - struct in6_addr addr_v6; + struct net_in6_addr addr_v6; struct net_if *iface; iface = z_vrfy_net_if_get_by_index(index); @@ -2176,7 +2176,7 @@ bool z_vrfy_net_if_ipv6_addr_add_by_index(int index, #endif /* CONFIG_USERSPACE */ bool z_impl_net_if_ipv6_addr_rm_by_index(int index, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { struct net_if *iface; @@ -2190,9 +2190,9 @@ bool z_impl_net_if_ipv6_addr_rm_by_index(int index, #ifdef CONFIG_USERSPACE bool z_vrfy_net_if_ipv6_addr_rm_by_index(int index, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { - struct in6_addr addr_v6; + struct net_in6_addr addr_v6; struct net_if *iface; iface = z_vrfy_net_if_get_by_index(index); @@ -2239,7 +2239,7 @@ void net_if_ipv6_addr_foreach(struct net_if *iface, net_if_ip_addr_cb_t cb, } struct net_if_mcast_addr *net_if_ipv6_maddr_add(struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { struct net_if_mcast_addr *ifmaddr = NULL; struct net_if_ipv6 *ipv6; @@ -2268,7 +2268,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_add(struct net_if *iface, } ipv6->mcast[i].is_used = true; - ipv6->mcast[i].address.family = AF_INET6; + ipv6->mcast[i].address.family = NET_AF_INET6; memcpy(&ipv6->mcast[i].address.in6_addr, addr, 16); NET_DBG("[%zu] interface %d (%p) address %s added", i, @@ -2278,7 +2278,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_add(struct net_if *iface, net_mgmt_event_notify_with_info( NET_EVENT_IPV6_MADDR_ADD, iface, &ipv6->mcast[i].address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); ifmaddr = &ipv6->mcast[i]; goto out; @@ -2290,7 +2290,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_add(struct net_if *iface, return ifmaddr; } -bool net_if_ipv6_maddr_rm(struct net_if *iface, const struct in6_addr *addr) +bool net_if_ipv6_maddr_rm(struct net_if *iface, const struct net_in6_addr *addr) { bool ret = false; struct net_if_ipv6 *ipv6; @@ -2321,7 +2321,7 @@ bool net_if_ipv6_maddr_rm(struct net_if *iface, const struct in6_addr *addr) net_mgmt_event_notify_with_info( NET_EVENT_IPV6_MADDR_DEL, iface, &ipv6->mcast[i].address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); ret = true; goto out; @@ -2383,7 +2383,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_lookup_raw(const uint8_t *maddr, ARRAY_FOR_EACH(ipv6->mcast, i) { if (!ipv6->mcast[i].is_used || - ipv6->mcast[i].address.family != AF_INET6) { + ipv6->mcast[i].address.family != NET_AF_INET6) { continue; } @@ -2408,7 +2408,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_lookup_raw(const uint8_t *maddr, return ifmaddr; } -struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct in6_addr *maddr, +struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct net_in6_addr *maddr, struct net_if **ret) { return net_if_ipv6_maddr_lookup_raw(maddr->s6_addr, ret); @@ -2436,10 +2436,10 @@ void net_if_ipv6_maddr_join(struct net_if *iface, struct net_if_mcast_addr *addr net_if_unlock(iface); } -struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface, +struct net_in6_addr *net_if_ipv6_get_ll(struct net_if *iface, enum net_addr_state addr_state) { - struct in6_addr *addr = NULL; + struct net_in6_addr *addr = NULL; struct net_if_ipv6 *ipv6; net_if_lock(iface); @@ -2453,7 +2453,7 @@ struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface, if (!ipv6->unicast[i].is_used || (addr_state != NET_ADDR_ANY_STATE && ipv6->unicast[i].addr_state != addr_state) || - ipv6->unicast[i].address.family != AF_INET6) { + ipv6->unicast[i].address.family != NET_AF_INET6) { continue; } @@ -2469,10 +2469,10 @@ struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface, return addr; } -struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state, +struct net_in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state, struct net_if **iface) { - struct in6_addr *addr = NULL; + struct net_in6_addr *addr = NULL; STRUCT_SECTION_FOREACH(net_if, tmp) { net_if_lock(tmp); @@ -2494,7 +2494,7 @@ struct in6_addr *net_if_ipv6_get_ll_addr(enum net_addr_state state, return addr; } -static inline struct in6_addr *check_global_addr(struct net_if *iface, +static inline struct net_in6_addr *check_global_addr(struct net_if *iface, enum net_addr_state state) { struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6; @@ -2506,7 +2506,7 @@ static inline struct in6_addr *check_global_addr(struct net_if *iface, ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || (ipv6->unicast[i].addr_state != state) || - ipv6->unicast[i].address.family != AF_INET6) { + ipv6->unicast[i].address.family != NET_AF_INET6) { continue; } @@ -2518,10 +2518,10 @@ static inline struct in6_addr *check_global_addr(struct net_if *iface, return NULL; } -struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state, +struct net_in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state, struct net_if **iface) { - struct in6_addr *addr = NULL; + struct net_in6_addr *addr = NULL; STRUCT_SECTION_FOREACH(net_if, tmp) { if (iface && *iface && tmp != *iface) { @@ -2550,12 +2550,12 @@ struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state, #if defined(CONFIG_NET_NATIVE_IPV6) static void remove_prefix_addresses(struct net_if *iface, struct net_if_ipv6 *ipv6, - const struct in6_addr *addr, + const struct net_in6_addr *addr, uint8_t len) { ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6 || + ipv6->unicast[i].address.family != NET_AF_INET6 || ipv6->unicast[i].addr_type != NET_ADDR_AUTOCONF) { continue; } @@ -2690,7 +2690,7 @@ static void prefix_start_timer(struct net_if_ipv6_prefix *ifprefix, } static struct net_if_ipv6_prefix *ipv6_prefix_find(struct net_if *iface, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint8_t prefix_len) { struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6; @@ -2715,7 +2715,7 @@ static struct net_if_ipv6_prefix *ipv6_prefix_find(struct net_if *iface, static void net_if_ipv6_prefix_init(struct net_if *iface, struct net_if_ipv6_prefix *ifprefix, - const struct in6_addr *addr, uint8_t len, + const struct net_in6_addr *addr, uint8_t len, uint32_t lifetime) { ifprefix->is_used = true; @@ -2731,7 +2731,7 @@ static void net_if_ipv6_prefix_init(struct net_if *iface, } struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface, - const struct in6_addr *prefix, + const struct net_in6_addr *prefix, uint8_t len, uint32_t lifetime) { @@ -2788,7 +2788,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface, return ifprefix; } -bool net_if_ipv6_prefix_rm(struct net_if *iface, const struct in6_addr *addr, +bool net_if_ipv6_prefix_rm(struct net_if *iface, const struct net_in6_addr *addr, uint8_t len) { bool ret = false; @@ -2845,7 +2845,7 @@ bool net_if_ipv6_prefix_rm(struct net_if *iface, const struct in6_addr *addr, } struct net_if_ipv6_prefix *net_if_ipv6_prefix_get(struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { struct net_if_ipv6_prefix *prefix = NULL; struct net_if_ipv6 *ipv6; @@ -2896,7 +2896,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_get(struct net_if *iface, } struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, uint8_t len) { struct net_if_ipv6_prefix *prefix = NULL; @@ -2927,7 +2927,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface, return prefix; } -bool net_if_ipv6_addr_onlink(struct net_if **iface, const struct in6_addr *addr) +bool net_if_ipv6_addr_onlink(struct net_if **iface, const struct net_in6_addr *addr) { bool ret = false; @@ -2991,15 +2991,15 @@ void net_if_ipv6_prefix_unset_timer(struct net_if_ipv6_prefix *prefix) } struct net_if_router *net_if_ipv6_router_lookup(struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { - return iface_router_lookup(iface, AF_INET6, addr); + return iface_router_lookup(iface, NET_AF_INET6, addr); } struct net_if_router *net_if_ipv6_router_find_default(struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { - return iface_router_find_default(iface, AF_INET6, addr); + return iface_router_find_default(iface, NET_AF_INET6, addr); } void net_if_ipv6_router_update_lifetime(struct net_if_router *router, @@ -3016,10 +3016,10 @@ void net_if_ipv6_router_update_lifetime(struct net_if_router *router, } struct net_if_router *net_if_ipv6_router_add(struct net_if *iface, - const struct in6_addr *addr, + const struct net_in6_addr *addr, uint16_t lifetime) { - return iface_router_add(iface, AF_INET6, addr, false, lifetime); + return iface_router_add(iface, NET_AF_INET6, addr, false, lifetime); } bool net_if_ipv6_router_rm(struct net_if_router *router) @@ -3105,15 +3105,15 @@ void net_if_ipv6_set_hop_limit(struct net_if *iface, uint8_t hop_limit) #endif /* CONFIG_NET_NATIVE_IPV6 */ -static uint8_t get_diff_ipv6(const struct in6_addr *src, - const struct in6_addr *dst) +static uint8_t get_diff_ipv6(const struct net_in6_addr *src, + const struct net_in6_addr *dst) { return get_ipaddr_diff((const uint8_t *)src, (const uint8_t *)dst, 16); } static inline bool is_proper_ipv6_address(struct net_if_addr *addr) { - if (addr->is_used && addr->address.family == AF_INET6 && + if (addr->is_used && addr->address.family == NET_AF_INET6 && !net_ipv6_is_ll_addr(&addr->address.in6_addr)) { if (addr->addr_state == NET_ADDR_PREFERRED || addr->addr_state == NET_ADDR_DEPRECATED) { @@ -3131,7 +3131,7 @@ static bool use_public_address(bool prefer_public, bool is_temporary, if (!prefer_public && is_temporary) { /* Allow socket to override the kconfig option */ - if (flags & IPV6_PREFER_SRC_PUBLIC) { + if (flags & ZSOCK_IPV6_PREFER_SRC_PUBLIC) { return true; } @@ -3139,15 +3139,15 @@ static bool use_public_address(bool prefer_public, bool is_temporary, } } - if (flags & IPV6_PREFER_SRC_TMP) { + if (flags & ZSOCK_IPV6_PREFER_SRC_TMP) { return false; } return true; } -static struct in6_addr *net_if_ipv6_get_best_match(struct net_if *iface, - const struct in6_addr *dst, +static struct net_in6_addr *net_if_ipv6_get_best_match(struct net_if *iface, + const struct net_in6_addr *dst, uint8_t prefix_len, uint8_t *best_so_far, int flags) @@ -3155,9 +3155,9 @@ static struct in6_addr *net_if_ipv6_get_best_match(struct net_if *iface, enum net_addr_state addr_state = NET_ADDR_ANY_STATE; struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6; struct net_if_addr *public_addr = NULL; - struct in6_addr *src = NULL; + struct net_in6_addr *src = NULL; uint8_t public_addr_len = 0; - struct in6_addr *temp_addr = NULL; + struct net_in6_addr *temp_addr = NULL; uint8_t len, temp_addr_len = 0; bool ret; @@ -3266,19 +3266,19 @@ static struct in6_addr *net_if_ipv6_get_best_match(struct net_if *iface, } } else { /* By default prefer always public address if found */ - if (flags & IPV6_PREFER_SRC_PUBLIC) { + if (flags & ZSOCK_IPV6_PREFER_SRC_PUBLIC) { use_public: if (public_addr && !net_ipv6_addr_cmp(&public_addr->address.in6_addr, src)) { src = &public_addr->address.in6_addr; *best_so_far = public_addr_len; } - } else if (flags & IPV6_PREFER_SRC_TMP) { + } else if (flags & ZSOCK_IPV6_PREFER_SRC_TMP) { if (temp_addr && !net_ipv6_addr_cmp(temp_addr, src)) { src = temp_addr; *best_so_far = temp_addr_len; } - } else if (flags & IPV6_PREFER_SRC_PUBTMP_DEFAULT) { + } else if (flags & ZSOCK_IPV6_PREFER_SRC_PUBTMP_DEFAULT) { goto use_public; } } @@ -3297,11 +3297,11 @@ static struct in6_addr *net_if_ipv6_get_best_match(struct net_if *iface, return src; } -const struct in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *dst_iface, - const struct in6_addr *dst, +const struct net_in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *dst_iface, + const struct net_in6_addr *dst, int flags) { - const struct in6_addr *src = NULL; + const struct net_in6_addr *src = NULL; uint8_t best_match = 0U; if (dst == NULL) { @@ -3325,7 +3325,7 @@ const struct in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *dst_iface flags); } else { STRUCT_SECTION_FOREACH(net_if, iface) { - struct in6_addr *addr; + struct net_in6_addr *addr; addr = net_if_ipv6_get_best_match(iface, dst, prefix_len, @@ -3341,7 +3341,7 @@ const struct in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *dst_iface if (dst_iface) { src = net_if_ipv6_get_ll(dst_iface, NET_ADDR_PREFERRED); } else { - struct in6_addr *addr; + struct net_in6_addr *addr; addr = net_if_ipv6_get_ll(net_if_get_default(), NET_ADDR_PREFERRED); if (addr) { @@ -3368,19 +3368,19 @@ const struct in6_addr *net_if_ipv6_select_src_addr_hint(struct net_if *dst_iface return src; } -const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *dst_iface, - const struct in6_addr *dst) +const struct net_in6_addr *net_if_ipv6_select_src_addr(struct net_if *dst_iface, + const struct net_in6_addr *dst) { return net_if_ipv6_select_src_addr_hint(dst_iface, dst, - IPV6_PREFER_SRC_PUBTMP_DEFAULT); + ZSOCK_IPV6_PREFER_SRC_PUBTMP_DEFAULT); } -struct net_if *net_if_ipv6_select_src_iface_addr(const struct in6_addr *dst, - const struct in6_addr **src_addr) +struct net_if *net_if_ipv6_select_src_iface_addr(const struct net_in6_addr *dst, + const struct net_in6_addr **src_addr) { struct net_if *iface = NULL; - const struct in6_addr *src; + const struct net_in6_addr *src; src = net_if_ipv6_select_src_addr(NULL, dst); if (src != net_ipv6_unspecified_address()) { @@ -3398,7 +3398,7 @@ struct net_if *net_if_ipv6_select_src_iface_addr(const struct in6_addr *dst, return iface; } -struct net_if *net_if_ipv6_select_src_iface(const struct in6_addr *dst) +struct net_if *net_if_ipv6_select_src_iface(const struct net_in6_addr *dst) { return net_if_ipv6_select_src_iface_addr(dst, NULL); } @@ -3463,7 +3463,7 @@ static void iface_ipv6_stop(struct net_if *iface) /* Remove all autoconf addresses */ ARRAY_FOR_EACH(ipv6->unicast, i) { if (ipv6->unicast[i].is_used && - ipv6->unicast[i].address.family == AF_INET6 && + ipv6->unicast[i].address.family == NET_AF_INET6 && ipv6->unicast[i].addr_type == NET_ADDR_AUTOCONF) { (void)net_if_ipv6_addr_rm(iface, &ipv6->unicast[i].address.in6_addr); @@ -3498,7 +3498,7 @@ static void iface_ipv6_init(int if_count) } #endif /* CONFIG_NET_NATIVE_IPV6 */ #else /* CONFIG_NET_IPV6 */ -struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct in6_addr *addr, +struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct net_in6_addr *addr, struct net_if **iface) { ARG_UNUSED(addr); @@ -3507,7 +3507,7 @@ struct net_if_mcast_addr *net_if_ipv6_maddr_lookup(const struct in6_addr *addr, return NULL; } -struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr, +struct net_if_addr *net_if_ipv6_addr_lookup(const struct net_in6_addr *addr, struct net_if **ret) { ARG_UNUSED(addr); @@ -3516,7 +3516,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup(const struct in6_addr *addr, return NULL; } -struct in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state, +struct net_in6_addr *net_if_ipv6_get_global_addr(enum net_addr_state state, struct net_if **iface) { ARG_UNUSED(state); @@ -3622,7 +3622,7 @@ int net_if_config_ipv4_put(struct net_if *iface) } bool net_if_ipv4_addr_mask_cmp(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { bool ret = false; struct net_if_ipv4 *ipv4; @@ -3637,7 +3637,7 @@ bool net_if_ipv4_addr_mask_cmp(struct net_if *iface, ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -3662,7 +3662,7 @@ static bool ipv4_is_broadcast_address(struct net_if *iface, { struct net_if_ipv4 *ipv4; bool ret = false; - struct in_addr bcast; + struct net_in_addr bcast; net_if_lock(iface); @@ -3674,7 +3674,7 @@ static bool ipv4_is_broadcast_address(struct net_if *iface, ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -3714,16 +3714,16 @@ bool net_if_ipv4_is_addr_bcast_raw(struct net_if *iface, } bool net_if_ipv4_is_addr_bcast(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { return net_if_ipv4_is_addr_bcast_raw(iface, addr->s4_addr); } -struct net_if *net_if_ipv4_select_src_iface_addr(const struct in_addr *dst, - const struct in_addr **src_addr) +struct net_if *net_if_ipv4_select_src_iface_addr(const struct net_in_addr *dst, + const struct net_in_addr **src_addr) { struct net_if *selected = NULL; - const struct in_addr *src; + const struct net_in_addr *src; src = net_if_ipv4_select_src_addr(NULL, dst); if (src != net_ipv4_unspecified_address()) { @@ -3741,13 +3741,13 @@ struct net_if *net_if_ipv4_select_src_iface_addr(const struct in_addr *dst, return selected; } -struct net_if *net_if_ipv4_select_src_iface(const struct in_addr *dst) +struct net_if *net_if_ipv4_select_src_iface(const struct net_in_addr *dst) { return net_if_ipv4_select_src_iface_addr(dst, NULL); } -static uint8_t get_diff_ipv4(const struct in_addr *src, - const struct in_addr *dst) +static uint8_t get_diff_ipv4(const struct net_in_addr *src, + const struct net_in_addr *dst) { return get_ipaddr_diff((const uint8_t *)src, (const uint8_t *)dst, 4); } @@ -3755,19 +3755,19 @@ static uint8_t get_diff_ipv4(const struct in_addr *src, static inline bool is_proper_ipv4_address(struct net_if_addr *addr) { if (addr->is_used && addr->addr_state == NET_ADDR_PREFERRED && - addr->address.family == AF_INET) { + addr->address.family == NET_AF_INET) { return true; } return false; } -static struct in_addr *net_if_ipv4_get_best_match(struct net_if *iface, - const struct in_addr *dst, +static struct net_in_addr *net_if_ipv4_get_best_match(struct net_if *iface, + const struct net_in_addr *dst, uint8_t *best_so_far, bool ll) { struct net_if_ipv4 *ipv4; - struct in_addr *src = NULL; + struct net_in_addr *src = NULL; uint8_t len; net_if_lock(iface); @@ -3778,7 +3778,7 @@ static struct in_addr *net_if_ipv4_get_best_match(struct net_if *iface, } ARRAY_FOR_EACH(ipv4->unicast, i) { - struct in_addr subnet; + struct net_in_addr subnet; if (!is_proper_ipv4_address(&ipv4->unicast[i].ipv4)) { continue; @@ -3826,10 +3826,10 @@ static struct in_addr *net_if_ipv4_get_best_match(struct net_if *iface, return src; } -static struct in_addr *if_ipv4_get_addr(struct net_if *iface, +static struct net_in_addr *if_ipv4_get_addr(struct net_if *iface, enum net_addr_state addr_state, bool ll) { - struct in_addr *addr = NULL; + struct net_in_addr *addr = NULL; struct net_if_ipv4 *ipv4; if (!iface) { @@ -3847,7 +3847,7 @@ static struct in_addr *if_ipv4_get_addr(struct net_if *iface, if (!ipv4->unicast[i].ipv4.is_used || (addr_state != NET_ADDR_ANY_STATE && ipv4->unicast[i].ipv4.addr_state != addr_state) || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -3871,22 +3871,22 @@ static struct in_addr *if_ipv4_get_addr(struct net_if *iface, return addr; } -struct in_addr *net_if_ipv4_get_ll(struct net_if *iface, +struct net_in_addr *net_if_ipv4_get_ll(struct net_if *iface, enum net_addr_state addr_state) { return if_ipv4_get_addr(iface, addr_state, true); } -struct in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, +struct net_in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, enum net_addr_state addr_state) { return if_ipv4_get_addr(iface, addr_state, false); } -const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *dst_iface, - const struct in_addr *dst) +const struct net_in_addr *net_if_ipv4_select_src_addr(struct net_if *dst_iface, + const struct net_in_addr *dst) { - const struct in_addr *src = NULL; + const struct net_in_addr *src = NULL; uint8_t best_match = 0U; if (dst == NULL) { @@ -3901,7 +3901,7 @@ const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *dst_iface, &best_match, false); } else { STRUCT_SECTION_FOREACH(net_if, iface) { - struct in_addr *addr; + struct net_in_addr *addr; addr = net_if_ipv4_get_best_match(iface, dst, &best_match, @@ -3916,7 +3916,7 @@ const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *dst_iface, if (dst_iface) { src = net_if_ipv4_get_ll(dst_iface, NET_ADDR_PREFERRED); } else { - struct in_addr *addr; + struct net_in_addr *addr; STRUCT_SECTION_FOREACH(net_if, iface) { addr = net_if_ipv4_get_best_match(iface, dst, @@ -3979,7 +3979,7 @@ struct net_if_addr *net_if_ipv4_addr_get_first_by_index(int ifindex) ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -4011,7 +4011,7 @@ struct net_if_addr *net_if_ipv4_addr_lookup_raw(const uint8_t *addr, ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -4035,13 +4035,13 @@ struct net_if_addr *net_if_ipv4_addr_lookup_raw(const uint8_t *addr, return ifaddr; } -struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, +struct net_if_addr *net_if_ipv4_addr_lookup(const struct net_in_addr *addr, struct net_if **ret) { return net_if_ipv4_addr_lookup_raw(addr->s4_addr, ret); } -int z_impl_net_if_ipv4_addr_lookup_by_index(const struct in_addr *addr) +int z_impl_net_if_ipv4_addr_lookup_by_index(const struct net_in_addr *addr) { struct net_if_addr *if_addr; struct net_if *iface = NULL; @@ -4056,9 +4056,9 @@ int z_impl_net_if_ipv4_addr_lookup_by_index(const struct in_addr *addr) #ifdef CONFIG_USERSPACE static inline int z_vrfy_net_if_ipv4_addr_lookup_by_index( - const struct in_addr *addr) + const struct net_in_addr *addr) { - struct in_addr addr_v4; + struct net_in_addr addr_v4; K_OOPS(k_usermode_from_copy(&addr_v4, (void *)addr, sizeof(addr_v4))); @@ -4067,10 +4067,10 @@ static inline int z_vrfy_net_if_ipv4_addr_lookup_by_index( #include #endif -struct in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface, - const struct in_addr *addr) +struct net_in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface, + const struct net_in_addr *addr) { - struct in_addr netmask = { 0 }; + struct net_in_addr netmask = { 0 }; struct net_if_ipv4 *ipv4; uint32_t subnet; @@ -4087,7 +4087,7 @@ struct in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface, ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -4108,8 +4108,8 @@ struct in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface, } bool net_if_ipv4_set_netmask_by_addr(struct net_if *iface, - const struct in_addr *addr, - const struct in_addr *netmask) + const struct net_in_addr *addr, + const struct net_in_addr *netmask) { struct net_if_ipv4 *ipv4; uint32_t subnet; @@ -4128,7 +4128,7 @@ bool net_if_ipv4_set_netmask_by_addr(struct net_if *iface, ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -4154,9 +4154,9 @@ bool net_if_ipv4_set_netmask_by_addr(struct net_if *iface, * in this case and return the first one found. Please use * net_if_ipv4_get_netmask_by_addr() instead. */ -struct in_addr net_if_ipv4_get_netmask(struct net_if *iface) +struct net_in_addr net_if_ipv4_get_netmask(struct net_if *iface) { - struct in_addr netmask = { 0 }; + struct net_in_addr netmask = { 0 }; struct net_if_ipv4 *ipv4; net_if_lock(iface); @@ -4172,7 +4172,7 @@ struct in_addr net_if_ipv4_get_netmask(struct net_if *iface) ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -4192,7 +4192,7 @@ struct in_addr net_if_ipv4_get_netmask(struct net_if *iface) * net_if_ipv4_set_netmask_by_addr() instead. */ static void net_if_ipv4_set_netmask_deprecated(struct net_if *iface, - const struct in_addr *netmask) + const struct net_in_addr *netmask) { struct net_if_ipv4 *ipv4; @@ -4209,7 +4209,7 @@ static void net_if_ipv4_set_netmask_deprecated(struct net_if *iface, ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -4222,13 +4222,13 @@ static void net_if_ipv4_set_netmask_deprecated(struct net_if *iface, } void net_if_ipv4_set_netmask(struct net_if *iface, - const struct in_addr *netmask) + const struct net_in_addr *netmask) { net_if_ipv4_set_netmask_deprecated(iface, netmask); } bool z_impl_net_if_ipv4_set_netmask_by_index(int index, - const struct in_addr *netmask) + const struct net_in_addr *netmask) { struct net_if *iface; @@ -4243,8 +4243,8 @@ bool z_impl_net_if_ipv4_set_netmask_by_index(int index, } bool z_impl_net_if_ipv4_set_netmask_by_addr_by_index(int index, - const struct in_addr *addr, - const struct in_addr *netmask) + const struct net_in_addr *addr, + const struct net_in_addr *netmask) { struct net_if *iface; @@ -4260,9 +4260,9 @@ bool z_impl_net_if_ipv4_set_netmask_by_addr_by_index(int index, #ifdef CONFIG_USERSPACE bool z_vrfy_net_if_ipv4_set_netmask_by_index(int index, - const struct in_addr *netmask) + const struct net_in_addr *netmask) { - struct in_addr netmask_addr; + struct net_in_addr netmask_addr; struct net_if *iface; iface = z_vrfy_net_if_get_by_index(index); @@ -4279,10 +4279,10 @@ bool z_vrfy_net_if_ipv4_set_netmask_by_index(int index, #include bool z_vrfy_net_if_ipv4_set_netmask_by_addr_by_index(int index, - const struct in_addr *addr, - const struct in_addr *netmask) + const struct net_in_addr *addr, + const struct net_in_addr *netmask) { - struct in_addr ipv4_addr, netmask_addr; + struct net_in_addr ipv4_addr, netmask_addr; struct net_if *iface; iface = z_vrfy_net_if_get_by_index(index); @@ -4303,9 +4303,9 @@ bool z_vrfy_net_if_ipv4_set_netmask_by_addr_by_index(int index, #include #endif /* CONFIG_USERSPACE */ -struct in_addr net_if_ipv4_get_gw(struct net_if *iface) +struct net_in_addr net_if_ipv4_get_gw(struct net_if *iface) { - struct in_addr gw = { 0 }; + struct net_in_addr gw = { 0 }; net_if_lock(iface); @@ -4324,7 +4324,7 @@ struct in_addr net_if_ipv4_get_gw(struct net_if *iface) return gw; } -void net_if_ipv4_set_gw(struct net_if *iface, const struct in_addr *gw) +void net_if_ipv4_set_gw(struct net_if *iface, const struct net_in_addr *gw) { net_if_lock(iface); @@ -4342,7 +4342,7 @@ void net_if_ipv4_set_gw(struct net_if *iface, const struct in_addr *gw) } bool z_impl_net_if_ipv4_set_gw_by_index(int index, - const struct in_addr *gw) + const struct net_in_addr *gw) { struct net_if *iface; @@ -4358,9 +4358,9 @@ bool z_impl_net_if_ipv4_set_gw_by_index(int index, #ifdef CONFIG_USERSPACE bool z_vrfy_net_if_ipv4_set_gw_by_index(int index, - const struct in_addr *gw) + const struct net_in_addr *gw) { - struct in_addr gw_addr; + struct net_in_addr gw_addr; struct net_if *iface; iface = z_vrfy_net_if_get_by_index(index); @@ -4377,7 +4377,7 @@ bool z_vrfy_net_if_ipv4_set_gw_by_index(int index, #endif /* CONFIG_USERSPACE */ static struct net_if_addr *ipv4_addr_find(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { struct net_if_ipv4 *ipv4 = iface->config.ip.ipv4; @@ -4408,7 +4408,7 @@ void net_if_ipv4_acd_succeeded(struct net_if *iface, struct net_if_addr *ifaddr) net_mgmt_event_notify_with_info(NET_EVENT_IPV4_ACD_SUCCEED, iface, &ifaddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); net_if_unlock(iface); } @@ -4423,7 +4423,7 @@ void net_if_ipv4_acd_failed(struct net_if *iface, struct net_if_addr *ifaddr) net_mgmt_event_notify_with_info(NET_EVENT_IPV4_ACD_FAILED, iface, &ifaddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); net_if_ipv4_addr_rm(iface, &ifaddr->address.in_addr); @@ -4496,7 +4496,7 @@ void net_if_start_acd(struct net_if *iface) */ ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET || + ipv4->unicast[i].ipv4.address.family != NET_AF_INET || net_ipv4_is_addr_loopback( &ipv4->unicast[i].ipv4.address.in_addr)) { continue; @@ -4526,7 +4526,7 @@ void net_if_start_acd(struct net_if *iface) #endif /* CONFIG_NET_IPV4_ACD */ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface, - const struct in_addr *addr, + const struct net_in_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime) { @@ -4580,7 +4580,7 @@ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface, if (ifaddr) { ifaddr->is_used = true; ifaddr->is_added = true; - ifaddr->address.family = AF_INET; + ifaddr->address.family = NET_AF_INET; ifaddr->address.in_addr.s4_addr32[0] = addr->s4_addr32[0]; ifaddr->addr_type = addr_type; @@ -4612,11 +4612,11 @@ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface, ifaddr->addr_state = NET_ADDR_PREFERRED; } - cur->netmask.s_addr = htonl(default_netmask); + cur->netmask.s_addr = net_htonl(default_netmask); net_mgmt_event_notify_with_info(NET_EVENT_IPV4_ADDR_ADD, iface, &ifaddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); net_if_unlock(iface); @@ -4633,7 +4633,7 @@ struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface, return ifaddr; } -bool net_if_ipv4_addr_rm(struct net_if *iface, const struct in_addr *addr) +bool net_if_ipv4_addr_rm(struct net_if *iface, const struct net_in_addr *addr) { struct net_if_addr *ifaddr; struct net_if_ipv4 *ipv4; @@ -4652,7 +4652,7 @@ bool net_if_ipv4_addr_rm(struct net_if *iface, const struct in_addr *addr) goto out; } - ret = net_if_addr_unref(iface, AF_INET, addr, &ifaddr); + ret = net_if_addr_unref(iface, NET_AF_INET, addr, &ifaddr); if (ret > 0) { NET_DBG("Address %s still in use (ref %d)", net_sprint_ipv4_addr(addr), ret); @@ -4671,7 +4671,7 @@ bool net_if_ipv4_addr_rm(struct net_if *iface, const struct in_addr *addr) } bool z_impl_net_if_ipv4_addr_add_by_index(int index, - const struct in_addr *addr, + const struct net_in_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime) { @@ -4689,11 +4689,11 @@ bool z_impl_net_if_ipv4_addr_add_by_index(int index, #ifdef CONFIG_USERSPACE bool z_vrfy_net_if_ipv4_addr_add_by_index(int index, - const struct in_addr *addr, + const struct net_in_addr *addr, enum net_addr_type addr_type, uint32_t vlifetime) { - struct in_addr addr_v4; + struct net_in_addr addr_v4; struct net_if *iface; iface = z_vrfy_net_if_get_by_index(index); @@ -4713,7 +4713,7 @@ bool z_vrfy_net_if_ipv4_addr_add_by_index(int index, #endif /* CONFIG_USERSPACE */ bool z_impl_net_if_ipv4_addr_rm_by_index(int index, - const struct in_addr *addr) + const struct net_in_addr *addr) { struct net_if *iface; @@ -4727,9 +4727,9 @@ bool z_impl_net_if_ipv4_addr_rm_by_index(int index, #ifdef CONFIG_USERSPACE bool z_vrfy_net_if_ipv4_addr_rm_by_index(int index, - const struct in_addr *addr) + const struct net_in_addr *addr) { - struct in_addr addr_v4; + struct net_in_addr addr_v4; struct net_if *iface; iface = z_vrfy_net_if_get_by_index(index); @@ -4777,7 +4777,7 @@ void net_if_ipv4_addr_foreach(struct net_if *iface, net_if_ip_addr_cb_t cb, static struct net_if_mcast_addr *ipv4_maddr_find(struct net_if *iface, bool is_used, - const struct in_addr *addr) + const struct net_in_addr *addr) { struct net_if_ipv4 *ipv4 = iface->config.ip.ipv4; @@ -4804,7 +4804,7 @@ static struct net_if_mcast_addr *ipv4_maddr_find(struct net_if *iface, return NULL; } struct net_if_mcast_addr *net_if_ipv4_maddr_add(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { struct net_if_mcast_addr *maddr = NULL; @@ -4823,7 +4823,7 @@ struct net_if_mcast_addr *net_if_ipv4_maddr_add(struct net_if *iface, maddr = ipv4_maddr_find(iface, false, NULL); if (maddr) { maddr->is_used = true; - maddr->address.family = AF_INET; + maddr->address.family = NET_AF_INET; maddr->address.in_addr.s4_addr32[0] = addr->s4_addr32[0]; NET_DBG("interface %d (%p) address %s added", @@ -4833,7 +4833,7 @@ struct net_if_mcast_addr *net_if_ipv4_maddr_add(struct net_if *iface, net_mgmt_event_notify_with_info( NET_EVENT_IPV4_MADDR_ADD, iface, &maddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } out: @@ -4842,7 +4842,7 @@ struct net_if_mcast_addr *net_if_ipv4_maddr_add(struct net_if *iface, return maddr; } -bool net_if_ipv4_maddr_rm(struct net_if *iface, const struct in_addr *addr) +bool net_if_ipv4_maddr_rm(struct net_if *iface, const struct net_in_addr *addr) { struct net_if_mcast_addr *maddr; bool ret = false; @@ -4860,7 +4860,7 @@ bool net_if_ipv4_maddr_rm(struct net_if *iface, const struct in_addr *addr) net_mgmt_event_notify_with_info( NET_EVENT_IPV4_MADDR_DEL, iface, &maddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); ret = true; } @@ -4898,7 +4898,7 @@ void net_if_ipv4_maddr_foreach(struct net_if *iface, net_if_ip_maddr_cb_t cb, net_if_unlock(iface); } -struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct in_addr *maddr, +struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct net_in_addr *maddr, struct net_if **ret) { struct net_if_mcast_addr *addr = NULL; @@ -5027,23 +5027,23 @@ void net_if_ipv4_set_mcast_ttl(struct net_if *iface, uint8_t ttl) } struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { - return iface_router_lookup(iface, AF_INET, addr); + return iface_router_lookup(iface, NET_AF_INET, addr); } struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface, - const struct in_addr *addr) + const struct net_in_addr *addr) { - return iface_router_find_default(iface, AF_INET, addr); + return iface_router_find_default(iface, NET_AF_INET, addr); } struct net_if_router *net_if_ipv4_router_add(struct net_if *iface, - const struct in_addr *addr, + const struct net_in_addr *addr, bool is_default, uint16_t lifetime) { - return iface_router_add(iface, AF_INET, addr, is_default, lifetime); + return iface_router_add(iface, NET_AF_INET, addr, is_default, lifetime); } bool net_if_ipv4_router_rm(struct net_if_router *router) @@ -5184,7 +5184,7 @@ static void clear_joined_ipv4_mcast_groups(struct net_if *iface) #endif /* CONFIG_NET_NATIVE_IPV4 */ #else /* CONFIG_NET_IPV4 */ -struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct in_addr *addr, +struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct net_in_addr *addr, struct net_if **iface) { ARG_UNUSED(addr); @@ -5193,7 +5193,7 @@ struct net_if_mcast_addr *net_if_ipv4_maddr_lookup(const struct in_addr *addr, return NULL; } -struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, +struct net_if_addr *net_if_ipv4_addr_lookup(const struct net_in_addr *addr, struct net_if **ret) { ARG_UNUSED(addr); @@ -5202,7 +5202,7 @@ struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, return NULL; } -struct in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, +struct net_in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, enum net_addr_state addr_state) { ARG_UNUSED(addr_state); @@ -5219,7 +5219,7 @@ struct in_addr *net_if_ipv4_get_global_addr(struct net_if *iface, #define iface_ipv4_start(...) #endif /* !CONFIG_NET_NATIVE_IPV4 */ -struct net_if *net_if_select_src_iface(const struct sockaddr *dst) +struct net_if *net_if_select_src_iface(const struct net_sockaddr *dst) { struct net_if *iface = NULL; @@ -5227,12 +5227,12 @@ struct net_if *net_if_select_src_iface(const struct sockaddr *dst) goto out; } - if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface(&net_sin6(dst)->sin6_addr); goto out; } - if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == NET_AF_INET) { iface = net_if_ipv4_select_src_iface(&net_sin(dst)->sin_addr); goto out; } @@ -5246,7 +5246,7 @@ struct net_if *net_if_select_src_iface(const struct sockaddr *dst) } static struct net_if_addr *get_ifaddr(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr, unsigned int *mcast_addr_count) { @@ -5254,10 +5254,10 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface, net_if_lock(iface); - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { struct net_if_ipv6 *ipv6 = COND_CODE_1(CONFIG_NET_IPV6, (iface->config.ip.ipv6), (NULL)); - struct in6_addr maddr; + struct net_in6_addr maddr; unsigned int maddr_count = 0; int found = -1; @@ -5265,11 +5265,11 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface, goto out; } - net_ipv6_addr_create_solicited_node((struct in6_addr *)addr, + net_ipv6_addr_create_solicited_node((struct net_in6_addr *)addr, &maddr); ARRAY_FOR_EACH(ipv6->unicast, i) { - struct in6_addr unicast_maddr; + struct net_in6_addr unicast_maddr; if (!ipv6->unicast[i].is_used) { continue; @@ -5304,7 +5304,7 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface, goto out; } - if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { struct net_if_ipv4 *ipv4 = COND_CODE_1(CONFIG_NET_IPV4, (iface->config.ip.ipv4), (NULL)); @@ -5339,7 +5339,7 @@ static struct net_if_addr *get_ifaddr(struct net_if *iface, struct net_if_addr *net_if_ipv6_get_ifaddr(struct net_if *iface, const void *addr) { - return get_ifaddr(iface, AF_INET6, addr, NULL); + return get_ifaddr(iface, NET_AF_INET6, addr, NULL); } #endif /* CONFIG_NET_TEST */ @@ -5388,7 +5388,7 @@ static void remove_ipv6_ifaddr(struct net_if *iface, /* Remove the solicited-node multicast address only if no other * unicast address is also using it */ - struct in6_addr maddr; + struct net_in6_addr maddr; net_ipv6_addr_create_solicited_node(&ifaddr->address.in6_addr, &maddr); @@ -5402,7 +5402,7 @@ static void remove_ipv6_ifaddr(struct net_if *iface, net_mgmt_event_notify_with_info(NET_EVENT_IPV6_ADDR_DEL, iface, &ifaddr->address.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); out: net_if_unlock(iface); } @@ -5426,7 +5426,7 @@ static void remove_ipv4_ifaddr(struct net_if *iface, net_mgmt_event_notify_with_info(NET_EVENT_IPV4_ADDR_DEL, iface, &ifaddr->address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); out: net_if_unlock(iface); } @@ -5439,13 +5439,13 @@ static void remove_ipv4_ifaddr(struct net_if *iface, #if NET_LOG_LEVEL >= LOG_LEVEL_DBG struct net_if_addr *net_if_addr_ref_debug(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr, const char *caller, int line) #else struct net_if_addr *net_if_addr_ref(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr) #endif /* NET_LOG_LEVEL >= LOG_LEVEL_DBG */ { @@ -5454,7 +5454,7 @@ struct net_if_addr *net_if_addr_ref(struct net_if *iface, #if NET_LOG_LEVEL >= LOG_LEVEL_DBG char addr_str[IS_ENABLED(CONFIG_NET_IPV6) ? - INET6_ADDRSTRLEN : INET_ADDRSTRLEN]; + NET_INET6_ADDRSTRLEN : NET_INET_ADDRSTRLEN]; __ASSERT(iface, "iface is NULL (%s():%d)", caller, line); #endif @@ -5492,13 +5492,13 @@ struct net_if_addr *net_if_addr_ref(struct net_if *iface, #if NET_LOG_LEVEL >= LOG_LEVEL_DBG int net_if_addr_unref_debug(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr, struct net_if_addr **ret_ifaddr, const char *caller, int line) #else int net_if_addr_unref(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, const void *addr, struct net_if_addr **ret_ifaddr) #endif /* NET_LOG_LEVEL >= LOG_LEVEL_DBG */ @@ -5509,7 +5509,7 @@ int net_if_addr_unref(struct net_if *iface, #if NET_LOG_LEVEL >= LOG_LEVEL_DBG char addr_str[IS_ENABLED(CONFIG_NET_IPV6) ? - INET6_ADDRSTRLEN : INET_ADDRSTRLEN]; + NET_INET6_ADDRSTRLEN : NET_INET_ADDRSTRLEN]; __ASSERT(iface, "iface is NULL (%s():%d)", caller, line); #endif @@ -5563,11 +5563,11 @@ int net_if_addr_unref(struct net_if *iface, ifaddr->is_used = false; - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6 && addr != NULL) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6 && addr != NULL) { remove_ipv6_ifaddr(iface, ifaddr, maddr_count); } - if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET && addr != NULL) { + if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET && addr != NULL) { remove_ipv4_ifaddr(iface, ifaddr); } diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c index 28b28024c3f71..9dedcb83452d9 100644 --- a/subsys/net/ip/net_pkt.c +++ b/subsys/net/ip/net_pkt.c @@ -1075,7 +1075,7 @@ static size_t pkt_buffer_length(struct net_pkt *pkt, enum net_ip_protocol proto, size_t existing) { - sa_family_t family = net_pkt_family(pkt); + net_sa_family_t family = net_pkt_family(pkt); size_t max_len; if (net_pkt_iface(pkt)) { @@ -1085,7 +1085,7 @@ static size_t pkt_buffer_length(struct net_pkt *pkt, } /* Family vs iface MTU */ - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { if (IS_ENABLED(CONFIG_NET_IPV6_FRAGMENT) && (size > max_len)) { /* We support larger packets if IPv6 fragmentation is * enabled. @@ -1094,14 +1094,14 @@ static size_t pkt_buffer_length(struct net_pkt *pkt, } max_len = MAX(max_len, NET_IPV6_MTU); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { if (IS_ENABLED(CONFIG_NET_IPV4_FRAGMENT) && (size > max_len)) { /* We support larger packets if IPv4 fragmentation is enabled */ max_len = size; } max_len = MAX(max_len, NET_IPV4_MTU); - } else { /* family == AF_UNSPEC */ + } else { /* family == NET_AF_UNSPEC */ #if defined (CONFIG_NET_L2_ETHERNET) if (net_if_l2(net_pkt_iface(pkt)) == &NET_L2_GET_NAME(ETHERNET)) { @@ -1122,28 +1122,28 @@ static size_t pkt_buffer_length(struct net_pkt *pkt, } static size_t pkt_estimate_headers_length(struct net_pkt *pkt, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto) { size_t hdr_len = 0; - if (family == AF_UNSPEC) { + if (family == NET_AF_UNSPEC) { return 0; } /* Family header */ - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { hdr_len += NET_IPV6H_LEN; - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { hdr_len += NET_IPV4H_LEN; } /* + protocol header */ - if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) { + if (IS_ENABLED(CONFIG_NET_TCP) && proto == NET_IPPROTO_TCP) { hdr_len += NET_TCPH_LEN + NET_TCP_MAX_OPT_SIZE; - } else if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) { + } else if (IS_ENABLED(CONFIG_NET_UDP) && proto == NET_IPPROTO_UDP) { hdr_len += NET_UDPH_LEN; - } else if (proto == IPPROTO_ICMP || proto == IPPROTO_ICMPV6) { + } else if (proto == NET_IPPROTO_ICMP || proto == NET_IPPROTO_ICMPV6) { hdr_len += NET_ICMPH_LEN; } @@ -1272,7 +1272,7 @@ int net_pkt_alloc_buffer_with_reserve(struct net_pkt *pkt, size_t hdr_len = 0; struct net_buf *buf; - if (!size && proto == 0 && net_pkt_family(pkt) == AF_UNSPEC) { + if (!size && proto == 0 && net_pkt_family(pkt) == NET_AF_UNSPEC) { return 0; } @@ -1366,7 +1366,7 @@ int net_pkt_alloc_buffer(struct net_pkt *pkt, struct net_if *iface; int ret; - if (!size && proto == 0 && net_pkt_family(pkt) == AF_UNSPEC) { + if (!size && proto == 0 && net_pkt_family(pkt) == NET_AF_UNSPEC) { return 0; } @@ -1649,7 +1649,7 @@ static struct net_pkt * pkt_alloc_with_buffer(struct k_mem_slab *slab, struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout, const char *caller, @@ -1659,7 +1659,7 @@ static struct net_pkt * pkt_alloc_with_buffer(struct k_mem_slab *slab, struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout) #endif @@ -1706,7 +1706,7 @@ pkt_alloc_with_buffer(struct k_mem_slab *slab, #if NET_LOG_LEVEL >= LOG_LEVEL_DBG struct net_pkt *net_pkt_alloc_with_buffer_debug(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout, const char *caller, @@ -1714,7 +1714,7 @@ struct net_pkt *net_pkt_alloc_with_buffer_debug(struct net_if *iface, #else struct net_pkt *net_pkt_alloc_with_buffer(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout) #endif @@ -1731,7 +1731,7 @@ struct net_pkt *net_pkt_alloc_with_buffer(struct net_if *iface, #if NET_LOG_LEVEL >= LOG_LEVEL_DBG struct net_pkt *net_pkt_rx_alloc_with_buffer_debug(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout, const char *caller, @@ -1739,7 +1739,7 @@ struct net_pkt *net_pkt_rx_alloc_with_buffer_debug(struct net_if *iface, #else struct net_pkt *net_pkt_rx_alloc_with_buffer(struct net_if *iface, size_t size, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, k_timeout_t timeout) #endif @@ -2060,7 +2060,7 @@ static void clone_pkt_attributes(struct net_pkt *pkt, struct net_pkt *clone_pkt) #if defined(CONFIG_NET_OFFLOAD) || defined(CONFIG_NET_L2_IPIP) net_pkt_set_remote_address(clone_pkt, net_pkt_remote_address(pkt), - sizeof(struct sockaddr_storage)); + sizeof(struct net_sockaddr_storage)); #endif if (pkt->buffer && clone_pkt->buffer) { @@ -2070,12 +2070,12 @@ static void clone_pkt_attributes(struct net_pkt *pkt, struct net_pkt *clone_pkt) sizeof(struct net_linkaddr)); } - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { net_pkt_set_ipv4_ttl(clone_pkt, net_pkt_ipv4_ttl(pkt)); net_pkt_set_ipv4_opts_len(clone_pkt, net_pkt_ipv4_opts_len(pkt)); } else if (IS_ENABLED(CONFIG_NET_IPV6) && - net_pkt_family(pkt) == AF_INET6) { + net_pkt_family(pkt) == NET_AF_INET6) { net_pkt_set_ipv6_hop_limit(clone_pkt, net_pkt_ipv6_hop_limit(pkt)); net_pkt_set_ipv6_ext_len(clone_pkt, net_pkt_ipv6_ext_len(pkt)); @@ -2102,12 +2102,12 @@ static struct net_pkt *net_pkt_clone_internal(struct net_pkt *pkt, #if NET_LOG_LEVEL >= LOG_LEVEL_DBG clone_pkt = pkt_alloc_with_buffer(slab, net_pkt_iface(pkt), net_pkt_get_len(pkt), - AF_UNSPEC, 0, timeout, + NET_AF_UNSPEC, 0, timeout, __func__, __LINE__); #else clone_pkt = pkt_alloc_with_buffer(slab, net_pkt_iface(pkt), net_pkt_get_len(pkt), - AF_UNSPEC, 0, timeout); + NET_AF_UNSPEC, 0, timeout); #endif if (!clone_pkt) { return NULL; diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h index 6704188d7bb07..e26cac6f6827f 100644 --- a/subsys/net/ip/net_private.h +++ b/subsys/net/ip/net_private.h @@ -101,8 +101,8 @@ extern bool net_context_is_recv_hoplimit_set(struct net_context *context); extern bool net_context_is_timestamping_set(struct net_context *context); extern void net_pkt_init(void); int net_context_get_local_addr(struct net_context *context, - struct sockaddr *addr, - socklen_t *addrlen); + struct net_sockaddr *addr, + net_socklen_t *addrlen); #else static inline void net_context_init(void) { } static inline void net_pkt_init(void) { } @@ -138,8 +138,8 @@ static inline bool net_context_is_timestamping_set(struct net_context *context) } static inline int net_context_get_local_addr(struct net_context *context, - struct sockaddr *addr, - socklen_t *addrlen) + struct net_sockaddr *addr, + net_socklen_t *addrlen) { ARG_UNUSED(context); ARG_UNUSED(addr); @@ -174,7 +174,7 @@ extern int dns_resolve_name_internal(struct dns_resolve_context *ctx, #include extern int dns_resolve_init_with_svc(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], const struct net_socket_service_desc *svc, uint16_t port, int interfaces[]); #endif /* CONFIG_DNS_RESOLVER */ @@ -231,11 +231,11 @@ static inline bool net_tc_rx_is_immediate(int tc, int prio) } extern enum net_verdict net_promisc_mode_input(struct net_pkt *pkt); -char *net_sprint_addr(sa_family_t af, const void *addr); +char *net_sprint_addr(net_sa_family_t af, const void *addr); -#define net_sprint_ipv4_addr(_addr) net_sprint_addr(AF_INET, _addr) +#define net_sprint_ipv4_addr(_addr) net_sprint_addr(NET_AF_INET, _addr) -#define net_sprint_ipv6_addr(_addr) net_sprint_addr(AF_INET6, _addr) +#define net_sprint_ipv6_addr(_addr) net_sprint_addr(NET_AF_INET6, _addr) #if defined(CONFIG_COAP) /** @@ -349,29 +349,29 @@ enum net_verdict net_ipv4_igmp_input(struct net_pkt *pkt, static inline uint16_t net_calc_chksum_icmpv6(struct net_pkt *pkt) { - return net_calc_chksum(pkt, IPPROTO_ICMPV6); + return net_calc_chksum(pkt, NET_IPPROTO_ICMPV6); } static inline uint16_t net_calc_chksum_icmpv4(struct net_pkt *pkt) { - return net_calc_chksum(pkt, IPPROTO_ICMP); + return net_calc_chksum(pkt, NET_IPPROTO_ICMP); } static inline uint16_t net_calc_chksum_udp(struct net_pkt *pkt) { - uint16_t chksum = net_calc_chksum(pkt, IPPROTO_UDP); + uint16_t chksum = net_calc_chksum(pkt, NET_IPPROTO_UDP); return chksum == 0U ? 0xffff : chksum; } static inline uint16_t net_calc_verify_chksum_udp(struct net_pkt *pkt) { - return net_calc_chksum(pkt, IPPROTO_UDP); + return net_calc_chksum(pkt, NET_IPPROTO_UDP); } static inline uint16_t net_calc_chksum_tcp(struct net_pkt *pkt) { - return net_calc_chksum(pkt, IPPROTO_TCP); + return net_calc_chksum(pkt, NET_IPPROTO_TCP); } static inline char *net_sprint_ll_addr(const uint8_t *ll, uint8_t ll_len) diff --git a/subsys/net/ip/net_stats.h b/subsys/net/ip/net_stats.h index 17b3f0d8c7f44..529dbd089feb9 100644 --- a/subsys/net/ip/net_stats.h +++ b/subsys/net/ip/net_stats.h @@ -372,9 +372,9 @@ static inline void net_stats_update_per_proto_recv(struct net_if *iface, return; } - if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) { + if (IS_ENABLED(CONFIG_NET_UDP) && proto == NET_IPPROTO_UDP) { net_stats_update_udp_recv(iface); - } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) { + } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == NET_IPPROTO_TCP) { net_stats_update_tcp_seg_recv(iface); } } @@ -386,9 +386,9 @@ static inline void net_stats_update_per_proto_drop(struct net_if *iface, return; } - if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) { + if (IS_ENABLED(CONFIG_NET_UDP) && proto == NET_IPPROTO_UDP) { net_stats_update_udp_drop(iface); - } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) { + } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == NET_IPPROTO_TCP) { net_stats_update_tcp_drop(iface); } } diff --git a/subsys/net/ip/packet_socket.c b/subsys/net/ip/packet_socket.c index f79add6277d9c..e0b343dbb13eb 100644 --- a/subsys/net/ip/packet_socket.c +++ b/subsys/net/ip/packet_socket.c @@ -26,7 +26,7 @@ void net_packet_socket_input(struct net_pkt *pkt, uint16_t proto, enum net_sock_type type) { - sa_family_t orig_family; + net_sa_family_t orig_family; #if defined(CONFIG_NET_DSA_DEPRECATED) /* @@ -40,7 +40,7 @@ void net_packet_socket_input(struct net_pkt *pkt, orig_family = net_pkt_family(pkt); - net_pkt_set_family(pkt, AF_PACKET); + net_pkt_set_family(pkt, NET_AF_PACKET); net_conn_packet_input(pkt, proto, type); diff --git a/subsys/net/ip/pmtu.c b/subsys/net/ip/pmtu.c index cdd09ed0ca837..a6fbd579c4ef1 100644 --- a/subsys/net/ip/pmtu.c +++ b/subsys/net/ip/pmtu.c @@ -34,7 +34,7 @@ static struct net_pmtu_entry pmtu_entries[NET_PMTU_MAX_ENTRIES]; static K_MUTEX_DEFINE(lock); -static struct net_pmtu_entry *get_pmtu_entry(const struct sockaddr *dst) +static struct net_pmtu_entry *get_pmtu_entry(const struct net_sockaddr *dst) { struct net_pmtu_entry *entry = NULL; int i; @@ -43,9 +43,9 @@ static struct net_pmtu_entry *get_pmtu_entry(const struct sockaddr *dst) for (i = 0; i < ARRAY_SIZE(pmtu_entries); i++) { switch (dst->sa_family) { - case AF_INET: + case NET_AF_INET: if (IS_ENABLED(CONFIG_NET_IPV4_PMTU) && - pmtu_entries[i].dst.family == AF_INET && + pmtu_entries[i].dst.family == NET_AF_INET && net_ipv4_addr_cmp(&pmtu_entries[i].dst.in_addr, &net_sin(dst)->sin_addr)) { entry = &pmtu_entries[i]; @@ -53,9 +53,9 @@ static struct net_pmtu_entry *get_pmtu_entry(const struct sockaddr *dst) } break; - case AF_INET6: + case NET_AF_INET6: if (IS_ENABLED(CONFIG_NET_IPV6_PMTU) && - pmtu_entries[i].dst.family == AF_INET6 && + pmtu_entries[i].dst.family == NET_AF_INET6 && net_ipv6_addr_cmp(&pmtu_entries[i].dst.in6_addr, &net_sin6(dst)->sin6_addr)) { entry = &pmtu_entries[i]; @@ -117,7 +117,7 @@ static void update_pmtu_entry(struct net_pmtu_entry *entry, uint16_t mtu) if (changed) { struct net_if *iface; - if (IS_ENABLED(CONFIG_NET_IPV4_PMTU) && entry->dst.family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4_PMTU) && entry->dst.family == NET_AF_INET) { struct net_event_ipv4_pmtu_info info; net_ipaddr_copy(&info.dst, &entry->dst.in_addr); @@ -130,7 +130,7 @@ static void update_pmtu_entry(struct net_pmtu_entry *entry, uint16_t mtu) (const void *)&info, sizeof(struct net_event_ipv4_pmtu_info)); - } else if (IS_ENABLED(CONFIG_NET_IPV6_PMTU) && entry->dst.family == AF_INET6) { + } else if (IS_ENABLED(CONFIG_NET_IPV6_PMTU) && entry->dst.family == NET_AF_INET6) { struct net_event_ipv6_pmtu_info info; net_ipaddr_copy(&info.dst, &entry->dst.in6_addr); @@ -146,7 +146,7 @@ static void update_pmtu_entry(struct net_pmtu_entry *entry, uint16_t mtu) } } -struct net_pmtu_entry *net_pmtu_get_entry(const struct sockaddr *dst) +struct net_pmtu_entry *net_pmtu_get_entry(const struct net_sockaddr *dst) { struct net_pmtu_entry *entry; @@ -155,7 +155,7 @@ struct net_pmtu_entry *net_pmtu_get_entry(const struct sockaddr *dst) return entry; } -int net_pmtu_get_mtu(const struct sockaddr *dst) +int net_pmtu_get_mtu(const struct net_sockaddr *dst) { struct net_pmtu_entry *entry; @@ -167,7 +167,7 @@ int net_pmtu_get_mtu(const struct sockaddr *dst) return entry->mtu; } -static struct net_pmtu_entry *add_entry(const struct sockaddr *dst, bool *old_entry) +static struct net_pmtu_entry *add_entry(const struct net_sockaddr *dst, bool *old_entry) { struct net_pmtu_entry *entry; @@ -185,9 +185,9 @@ static struct net_pmtu_entry *add_entry(const struct sockaddr *dst, bool *old_en k_mutex_lock(&lock, K_FOREVER); switch (dst->sa_family) { - case AF_INET: + case NET_AF_INET: if (IS_ENABLED(CONFIG_NET_IPV4_PMTU)) { - entry->dst.family = AF_INET; + entry->dst.family = NET_AF_INET; net_ipaddr_copy(&entry->dst.in_addr, &net_sin(dst)->sin_addr); } else { entry->in_use = false; @@ -195,9 +195,9 @@ static struct net_pmtu_entry *add_entry(const struct sockaddr *dst, bool *old_en } break; - case AF_INET6: + case NET_AF_INET6: if (IS_ENABLED(CONFIG_NET_IPV6_PMTU)) { - entry->dst.family = AF_INET6; + entry->dst.family = NET_AF_INET6; net_ipaddr_copy(&entry->dst.in6_addr, &net_sin6(dst)->sin6_addr); } else { entry->in_use = false; @@ -220,7 +220,7 @@ static struct net_pmtu_entry *add_entry(const struct sockaddr *dst, bool *old_en return NULL; } -int net_pmtu_update_mtu(const struct sockaddr *dst, uint16_t mtu) +int net_pmtu_update_mtu(const struct net_sockaddr *dst, uint16_t mtu) { struct net_pmtu_entry *entry; uint16_t old_mtu = 0U; diff --git a/subsys/net/ip/pmtu.h b/subsys/net/ip/pmtu.h index bce20a7762c70..b5c303754f010 100644 --- a/subsys/net/ip/pmtu.h +++ b/subsys/net/ip/pmtu.h @@ -35,9 +35,9 @@ struct net_pmtu_entry { * @return PMTU entry if found, NULL otherwise */ #if defined(CONFIG_NET_PMTU) -struct net_pmtu_entry *net_pmtu_get_entry(const struct sockaddr *dst); +struct net_pmtu_entry *net_pmtu_get_entry(const struct net_sockaddr *dst); #else -static inline struct net_pmtu_entry *net_pmtu_get_entry(const struct sockaddr *dst) +static inline struct net_pmtu_entry *net_pmtu_get_entry(const struct net_sockaddr *dst) { ARG_UNUSED(dst); @@ -52,9 +52,9 @@ static inline struct net_pmtu_entry *net_pmtu_get_entry(const struct sockaddr *d * @return MTU value (> 0) if found, <0 otherwise */ #if defined(CONFIG_NET_PMTU) -int net_pmtu_get_mtu(const struct sockaddr *dst); +int net_pmtu_get_mtu(const struct net_sockaddr *dst); #else -static inline int net_pmtu_get_mtu(const struct sockaddr *dst) +static inline int net_pmtu_get_mtu(const struct net_sockaddr *dst) { ARG_UNUSED(dst); @@ -70,9 +70,9 @@ static inline int net_pmtu_get_mtu(const struct sockaddr *dst) * @return >0 previous MTU, <0 if error */ #if defined(CONFIG_NET_PMTU) -int net_pmtu_update_mtu(const struct sockaddr *dst, uint16_t mtu); +int net_pmtu_update_mtu(const struct net_sockaddr *dst, uint16_t mtu); #else -static inline int net_pmtu_update_mtu(const struct sockaddr *dst, uint16_t mtu) +static inline int net_pmtu_update_mtu(const struct net_sockaddr *dst, uint16_t mtu) { ARG_UNUSED(dst); ARG_UNUSED(mtu); diff --git a/subsys/net/ip/route.c b/subsys/net/ip/route.c index ae4989540f8aa..3a28d16953273 100644 --- a/subsys/net/ip/route.c +++ b/subsys/net/ip/route.c @@ -191,7 +191,7 @@ static inline void nbr_free(struct net_nbr *nbr) } static struct net_nbr *nbr_new(struct net_if *iface, - struct in6_addr *addr, + struct net_in6_addr *addr, uint8_t prefix_len) { struct net_nbr *nbr = net_nbr_get(&net_nbr_routes.table); @@ -214,7 +214,7 @@ static struct net_nbr *nbr_new(struct net_if *iface, } static struct net_nbr *nbr_nexthop_get(struct net_if *iface, - struct in6_addr *addr) + struct net_in6_addr *addr) { /* Note that the nexthop host must be already in the neighbor * cache. We just increase the ref count of an existing entry. @@ -250,7 +250,7 @@ static int nbr_nexthop_put(struct net_nbr *nbr) #define net_route_info(str, route, dst) \ do { \ if (CONFIG_NET_ROUTE_LOG_LEVEL >= LOG_LEVEL_DBG) { \ - struct in6_addr *naddr = net_route_get_nexthop(route); \ + struct net_in6_addr *naddr = net_route_get_nexthop(route); \ \ NET_ASSERT(naddr, "Unknown nexthop address"); \ \ @@ -268,7 +268,7 @@ static inline void update_route_access(struct net_route_entry *route) } struct net_route_entry *net_route_lookup(struct net_if *iface, - struct in6_addr *dst) + struct net_in6_addr *dst) { struct net_route_entry *route, *found = NULL; uint8_t longest_match = 0U; @@ -322,9 +322,9 @@ static inline bool route_preference_is_lower(uint8_t old, uint8_t new) } struct net_route_entry *net_route_add(struct net_if *iface, - struct in6_addr *addr, + struct net_in6_addr *addr, uint8_t prefix_len, - struct in6_addr *nexthop, + struct net_in6_addr *nexthop, uint32_t lifetime, uint8_t preference) { @@ -364,7 +364,7 @@ struct net_route_entry *net_route_add(struct net_if *iface, route = net_route_lookup(iface, addr); if (route) { /* Update nexthop if not the same */ - struct in6_addr *nexthop_addr; + struct net_in6_addr *nexthop_addr; nexthop_addr = net_route_get_nexthop(route); if (nexthop_addr && net_ipv6_addr_cmp(nexthop, nexthop_addr)) { @@ -402,7 +402,7 @@ struct net_route_entry *net_route_add(struct net_if *iface, node); if (CONFIG_NET_ROUTE_LOG_LEVEL >= LOG_LEVEL_DBG) { - struct in6_addr *in6_addr_tmp; + struct net_in6_addr *in6_addr_tmp; struct net_linkaddr *llstorage; in6_addr_tmp = net_route_get_nexthop(route); @@ -611,7 +611,7 @@ int net_route_del(struct net_route_entry *route) return 0; } -int net_route_del_by_nexthop(struct net_if *iface, struct in6_addr *nexthop) +int net_route_del_by_nexthop(struct net_if *iface, struct net_in6_addr *nexthop) { int count = 0, status = 0; struct net_nbr *nbr_nexthop; @@ -659,7 +659,7 @@ int net_route_del_by_nexthop(struct net_if *iface, struct in6_addr *nexthop) return 0; } -struct in6_addr *net_route_get_nexthop(struct net_route_entry *route) +struct net_in6_addr *net_route_get_nexthop(struct net_route_entry *route) { struct net_route_nexthop *nexthop_route; struct net_ipv6_nbr_data *ipv6_nbr_data; @@ -671,7 +671,7 @@ struct in6_addr *net_route_get_nexthop(struct net_route_entry *route) net_ipv6_nbr_lock(); SYS_SLIST_FOR_EACH_CONTAINER(&route->nexthop, nexthop_route, node) { - struct in6_addr *addr; + struct net_in6_addr *addr; ipv6_nbr_data = net_ipv6_nbr_data(nexthop_route->nbr); if (ipv6_nbr_data) { @@ -779,7 +779,7 @@ bool net_route_mcast_iface_del(struct net_route_entry_mcast *entry, #if defined(CONFIG_NET_MCAST_ROUTE_MLD_REPORTS) struct mcast_route_mld_event { - struct in6_addr *addr; + struct net_in6_addr *addr; uint8_t mode; }; @@ -863,7 +863,7 @@ int net_route_mcast_forward_packet(struct net_pkt *pkt, struct net_ipv6_hdr *hdr } int net_route_mcast_foreach(net_route_mcast_cb_t cb, - struct in6_addr *skip, + struct net_in6_addr *skip, void *user_data) { int ret = 0; @@ -886,7 +886,7 @@ int net_route_mcast_foreach(net_route_mcast_cb_t cb, } struct net_route_entry_mcast *net_route_mcast_add(struct net_if *iface, - struct in6_addr *group, + struct net_in6_addr *group, uint8_t prefix_len) { net_ipv6_nbr_lock(); @@ -941,7 +941,7 @@ bool net_route_mcast_del(struct net_route_entry_mcast *route) } struct net_route_entry_mcast * -net_route_mcast_lookup(struct in6_addr *group) +net_route_mcast_lookup(struct net_in6_addr *group) { ARRAY_FOR_EACH_PTR(route_mcast_entries, route) { if (!route->is_used) { @@ -959,7 +959,7 @@ net_route_mcast_lookup(struct in6_addr *group) } struct net_route_entry_mcast * -net_route_mcast_lookup_by_iface(struct in6_addr *group, struct net_if *iface) +net_route_mcast_lookup_by_iface(struct net_in6_addr *group, struct net_if *iface) { ARRAY_FOR_EACH_PTR(route_mcast_entries, route) { if (!route->is_used) { @@ -984,9 +984,9 @@ net_route_mcast_lookup_by_iface(struct in6_addr *group, struct net_if *iface) #endif /* CONFIG_NET_ROUTE_MCAST */ bool net_route_get_info(struct net_if *iface, - struct in6_addr *dst, + struct net_in6_addr *dst, struct net_route_entry **route, - struct in6_addr **nexthop) + struct net_in6_addr **nexthop) { struct net_if_router *router; bool ret = false; @@ -1053,7 +1053,7 @@ static bool is_ll_addr_supported(struct net_if *iface) return true; } -int net_route_packet(struct net_pkt *pkt, struct in6_addr *nexthop) +int net_route_packet(struct net_pkt *pkt, struct net_in6_addr *nexthop) { struct net_linkaddr *lladdr = NULL; struct net_nbr *nbr; diff --git a/subsys/net/ip/route.h b/subsys/net/ip/route.h index 388b53530ab4e..d775e1489945c 100644 --- a/subsys/net/ip/route.h +++ b/subsys/net/ip/route.h @@ -59,7 +59,7 @@ struct net_route_entry { struct net_timeout lifetime; /** IPv6 address/prefix of the route. */ - struct in6_addr addr; + struct net_in6_addr addr; /** IPv6 address/prefix length. */ uint8_t prefix_len; @@ -87,10 +87,10 @@ struct net_route_entry { */ #if defined(CONFIG_NET_NATIVE) struct net_route_entry *net_route_lookup(struct net_if *iface, - struct in6_addr *dst); + struct net_in6_addr *dst); #else static inline struct net_route_entry *net_route_lookup(struct net_if *iface, - struct in6_addr *dst) + struct net_in6_addr *dst) { ARG_UNUSED(iface); ARG_UNUSED(dst); @@ -112,9 +112,9 @@ static inline struct net_route_entry *net_route_lookup(struct net_if *iface, * @return Return created route entry, NULL if could not be created. */ struct net_route_entry *net_route_add(struct net_if *iface, - struct in6_addr *addr, + struct net_in6_addr *addr, uint8_t prefix_len, - struct in6_addr *nexthop, + struct net_in6_addr *nexthop, uint32_t lifetime, uint8_t preference); @@ -136,7 +136,7 @@ int net_route_del(struct net_route_entry *entry); * @return number of routes deleted, <0 if error */ int net_route_del_by_nexthop(struct net_if *iface, - struct in6_addr *nexthop); + struct net_in6_addr *nexthop); /** * @brief Update the route lifetime. @@ -158,7 +158,7 @@ void net_route_update_lifetime(struct net_route_entry *route, uint32_t lifetime) * * @return IPv6 address of the nexthop, NULL if not found. */ -struct in6_addr *net_route_get_nexthop(struct net_route_entry *entry); +struct net_in6_addr *net_route_get_nexthop(struct net_route_entry *entry); /** * @brief Get generic neighbor entry from route entry. @@ -195,7 +195,7 @@ struct net_route_entry_mcast { void *data; /** IPv6 multicast group of the route. */ - struct in6_addr group; + struct net_in6_addr group; /** Routing entry lifetime in seconds. */ uint32_t lifetime; @@ -237,7 +237,7 @@ int net_route_mcast_forward_packet(struct net_pkt *pkt, * @return Total number of multicast routing entries that are in use. */ int net_route_mcast_foreach(net_route_mcast_cb_t cb, - struct in6_addr *skip, + struct net_in6_addr *skip, void *user_data); /** @@ -250,7 +250,7 @@ int net_route_mcast_foreach(net_route_mcast_cb_t cb, * @return Multicast routing entry. */ struct net_route_entry_mcast *net_route_mcast_add(struct net_if *iface, - struct in6_addr *group, + struct net_in6_addr *group, uint8_t prefix_len); /** @@ -270,7 +270,7 @@ bool net_route_mcast_del(struct net_route_entry_mcast *route); * @return Routing entry corresponding this multicast group. */ struct net_route_entry_mcast * -net_route_mcast_lookup(struct in6_addr *group); +net_route_mcast_lookup(struct net_in6_addr *group); /** * @brief Lookup a multicast routing entry on a given interface. @@ -281,7 +281,7 @@ net_route_mcast_lookup(struct in6_addr *group); * @return Routing entry corresponding to this multicast group and interface. */ struct net_route_entry_mcast * -net_route_mcast_lookup_by_iface(struct in6_addr *group, struct net_if *iface); +net_route_mcast_lookup_by_iface(struct net_in6_addr *group, struct net_if *iface); /** * @brief Add an interface to multicast routing entry. @@ -315,9 +315,9 @@ bool net_route_mcast_iface_del(struct net_route_entry_mcast *entry, struct net_i * @return True if there is a route to the destination, False otherwise */ bool net_route_get_info(struct net_if *iface, - struct in6_addr *dst, + struct net_in6_addr *dst, struct net_route_entry **route, - struct in6_addr **nexthop); + struct net_in6_addr **nexthop); /** * @brief Send the network packet to network via some intermediate host. @@ -327,7 +327,7 @@ bool net_route_get_info(struct net_if *iface, * * @return 0 if there was no error, <0 if the packet could not be sent. */ -int net_route_packet(struct net_pkt *pkt, struct in6_addr *nexthop); +int net_route_packet(struct net_pkt *pkt, struct net_in6_addr *nexthop); /** * @brief Send the network packet to network via the given interface. diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c index a057c333e21ee..b34e5e61a793f 100644 --- a/subsys/net/ip/tcp.c +++ b/subsys/net/ip/tcp.c @@ -206,10 +206,10 @@ static struct tcphdr *th_get(struct net_pkt *pkt) return th; } -static size_t tcp_endpoint_len(sa_family_t af) +static size_t tcp_endpoint_len(net_sa_family_t af) { - return (af == AF_INET) ? sizeof(struct sockaddr_in) : - sizeof(struct sockaddr_in6); + return (af == NET_AF_INET) ? sizeof(struct net_sockaddr_in) : + sizeof(struct net_sockaddr_in6); } static int tcp_endpoint_set(union tcp_endpoint *ep, struct net_pkt *pkt, @@ -218,7 +218,7 @@ static int tcp_endpoint_set(union tcp_endpoint *ep, struct net_pkt *pkt, int ret = 0; switch (net_pkt_family(pkt)) { - case AF_INET: + case NET_AF_INET: if (IS_ENABLED(CONFIG_NET_IPV4)) { struct net_ipv4_hdr *ip = NET_IPV4_HDR(pkt); struct tcphdr *th; @@ -235,14 +235,14 @@ static int tcp_endpoint_set(union tcp_endpoint *ep, struct net_pkt *pkt, net_ipv4_addr_copy_raw((uint8_t *)&ep->sin.sin_addr, src == TCP_EP_SRC ? ip->src : ip->dst); - ep->sa.sa_family = AF_INET; + ep->sa.sa_family = NET_AF_INET; } else { ret = -EINVAL; } break; - case AF_INET6: + case NET_AF_INET6: if (IS_ENABLED(CONFIG_NET_IPV6)) { struct net_ipv6_hdr *ip = NET_IPV6_HDR(pkt); struct tcphdr *th; @@ -259,7 +259,7 @@ static int tcp_endpoint_set(union tcp_endpoint *ep, struct net_pkt *pkt, net_ipv6_addr_copy_raw((uint8_t *)&ep->sin6.sin6_addr, src == TCP_EP_SRC ? ip->src : ip->dst); - ep->sa.sa_family = AF_INET6; + ep->sa.sa_family = NET_AF_INET6; } else { ret = -EINVAL; } @@ -275,14 +275,14 @@ static int tcp_endpoint_set(union tcp_endpoint *ep, struct net_pkt *pkt, } int net_tcp_endpoint_copy(struct net_context *ctx, - struct sockaddr *local, - struct sockaddr *peer, - socklen_t *addrlen) + struct net_sockaddr *local, + struct net_sockaddr *peer, + net_socklen_t *addrlen) { const struct tcp *conn = ctx->tcp; - socklen_t newlen = ctx->local.family == AF_INET ? - sizeof(struct sockaddr_in) : - sizeof(struct sockaddr_in6); + net_socklen_t newlen = ctx->local.family == NET_AF_INET ? + sizeof(struct net_sockaddr_in) : + sizeof(struct net_sockaddr_in6); if (local != NULL) { /* If we are connected, then get the address we are actually @@ -290,18 +290,19 @@ int net_tcp_endpoint_copy(struct net_context *ctx, * be different if we are bound to any address. */ if (conn->state < TCP_ESTABLISHED) { - if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == NET_AF_INET) { memcpy(&net_sin(local)->sin_addr, net_sin_ptr(&ctx->local)->sin_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); net_sin(local)->sin_port = net_sin_ptr(&ctx->local)->sin_port; - net_sin(local)->sin_family = AF_INET; - } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == AF_INET6) { + net_sin(local)->sin_family = NET_AF_INET; + } else if (IS_ENABLED(CONFIG_NET_IPV6) && + ctx->local.family == NET_AF_INET6) { memcpy(&net_sin6(local)->sin6_addr, net_sin6_ptr(&ctx->local)->sin6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); net_sin6(local)->sin6_port = net_sin6_ptr(&ctx->local)->sin6_port; - net_sin6(local)->sin6_family = AF_INET6; + net_sin6(local)->sin6_family = NET_AF_INET6; net_sin6(local)->sin6_scope_id = net_sin6_ptr(&ctx->local)->sin6_scope_id; } else { @@ -413,7 +414,7 @@ static const char *tcp_th(struct net_pkt *pkt, uint32_t *seq_ptr, uint32_t *ack_ } #define is_6lo_technology(pkt) \ - (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6 && \ + (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6 && \ (IS_ENABLED(CONFIG_NET_L2_IEEE802154) && \ net_pkt_lladdr_dst(pkt)->type == NET_LINK_IEEE802154)) @@ -871,7 +872,7 @@ static void tcp_conn_release(struct k_work *work) */ if (conn->iface != NULL && conn->addr_ref_done) { net_if_addr_unref(conn->iface, conn->src.sa.sa_family, - conn->src.sa.sa_family == AF_INET ? + conn->src.sa.sa_family == NET_AF_INET ? (const void *)&conn->src.sin.sin_addr : (const void *)&conn->src.sin6.sin6_addr, NULL); @@ -1014,7 +1015,7 @@ static void tcp_nbr_reachability_hint(struct tcp *conn) int64_t now; struct net_if *iface; - if (net_context_get_family(conn->context) != AF_INET6) { + if (net_context_get_family(conn->context) != NET_AF_INET6) { return; } @@ -1143,7 +1144,7 @@ static bool tcp_options_check(struct tcp_options *recv_options, } recv_options->mss = - ntohs(UNALIGNED_GET((uint16_t *)(options + 2))); + net_ntohs(UNALIGNED_GET((uint16_t *)(options + 2))); recv_options->mss_found = true; NET_DBG("MSS=%hu", recv_options->mss); break; @@ -1334,12 +1335,12 @@ static int tcp_finalize_pkt(struct net_pkt *pkt) { net_pkt_cursor_init(pkt); - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { - return net_ipv4_finalize(pkt, IPPROTO_TCP); + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { + return net_ipv4_finalize(pkt, NET_IPPROTO_TCP); } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { - return net_ipv6_finalize(pkt, IPPROTO_TCP); + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { + return net_ipv6_finalize(pkt, NET_IPPROTO_TCP); } return -EINVAL; @@ -1367,11 +1368,11 @@ static int tcp_header_add(struct tcp *conn, struct net_pkt *pkt, uint8_t flags, } UNALIGNED_PUT(flags, &th->th_flags); - UNALIGNED_PUT(htons(conn->recv_win), UNALIGNED_MEMBER_ADDR(th, th_win)); - UNALIGNED_PUT(htonl(seq), UNALIGNED_MEMBER_ADDR(th, th_seq)); + UNALIGNED_PUT(net_htons(conn->recv_win), UNALIGNED_MEMBER_ADDR(th, th_win)); + UNALIGNED_PUT(net_htonl(seq), UNALIGNED_MEMBER_ADDR(th, th_seq)); if (ACK & flags) { - UNALIGNED_PUT(htonl(conn->ack), UNALIGNED_MEMBER_ADDR(th, th_ack)); + UNALIGNED_PUT(net_htonl(conn->ack), UNALIGNED_MEMBER_ADDR(th, th_ack)); } return net_pkt_set_data(pkt, &tcp_access); @@ -1379,13 +1380,13 @@ static int tcp_header_add(struct tcp *conn, struct net_pkt *pkt, uint8_t flags, static int ip_header_add(struct tcp *conn, struct net_pkt *pkt) { - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { return net_context_create_ipv4_new(conn->context, pkt, &conn->src.sin.sin_addr, &conn->dst.sin.sin_addr); } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { return net_context_create_ipv6_new(conn->context, pkt, &conn->src.sin6.sin6_addr, &conn->dst.sin6.sin6_addr); @@ -1439,23 +1440,23 @@ static int net_tcp_set_mss_opt(struct tcp *conn, struct net_pkt *pkt) recv_mss = net_tcp_get_supported_mss(conn); recv_mss |= (NET_TCP_MSS_OPT << 24) | (NET_TCP_MSS_SIZE << 16); - UNALIGNED_PUT(htonl(recv_mss), (uint32_t *)mss); + UNALIGNED_PUT(net_htonl(recv_mss), (uint32_t *)mss); return net_pkt_set_data(pkt, &mss_opt_access); } static bool is_destination_local(struct net_pkt *pkt) { - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { if (net_ipv4_is_addr_loopback( - (struct in_addr *)NET_IPV4_HDR(pkt)->dst) || + (struct net_in_addr *)NET_IPV4_HDR(pkt)->dst) || net_ipv4_is_my_addr( - (struct in_addr *)NET_IPV4_HDR(pkt)->dst)) { + (struct net_in_addr *)NET_IPV4_HDR(pkt)->dst)) { return true; } } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { if (net_ipv6_is_addr_loopback_raw(NET_IPV6_HDR(pkt)->dst) || net_ipv6_is_my_addr_raw(NET_IPV6_HDR(pkt)->dst)) { return true; @@ -1485,15 +1486,15 @@ void net_tcp_reply_rst(struct net_pkt *pkt) } /* IP header */ - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { - struct in_addr src, dst; + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { + struct net_in_addr src, dst; net_ipv4_addr_copy_raw(src.s4_addr, NET_IPV4_HDR(pkt)->src); net_ipv4_addr_copy_raw(dst.s4_addr, NET_IPV4_HDR(pkt)->dst); ret = net_ipv4_create(rst, &dst, &src); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { - struct in6_addr src, dst; + } else if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { + struct net_in6_addr src, dst; net_ipv6_addr_copy_raw(src.s6_addr, NET_IPV6_HDR(pkt)->src); net_ipv6_addr_copy_raw(dst.s6_addr, NET_IPV6_HDR(pkt)->dst); @@ -1523,14 +1524,14 @@ void net_tcp_reply_rst(struct net_pkt *pkt) UNALIGNED_PUT(RST, &th_rst->th_flags); UNALIGNED_PUT(th_pkt->th_ack, UNALIGNED_MEMBER_ADDR(th_rst, th_seq)); } else { - uint32_t ack = ntohl(th_pkt->th_seq) + tcp_data_len(pkt); + uint32_t ack = net_ntohl(th_pkt->th_seq) + tcp_data_len(pkt); if (th_flags(th_pkt) & SYN) { ack++; } UNALIGNED_PUT(RST | ACK, &th_rst->th_flags); - UNALIGNED_PUT(htonl(ack), UNALIGNED_MEMBER_ADDR(th_rst, th_ack)); + UNALIGNED_PUT(net_htonl(ack), UNALIGNED_MEMBER_ADDR(th_rst, th_ack)); } ret = net_pkt_set_data(rst, &tcp_access_rst); @@ -1694,7 +1695,7 @@ static int tcp_pkt_trim_data(struct tcp *conn, struct net_pkt *pkt, size_t data_ /* Adjust TCP seqnum */ th = th_get(pkt); - UNALIGNED_PUT(htonl(th_seq(th) + trim_len), UNALIGNED_MEMBER_ADDR(th, th_seq)); + UNALIGNED_PUT(net_htonl(th_seq(th) + trim_len), UNALIGNED_MEMBER_ADDR(th, th_seq)); out: if (new_pkt != NULL) { @@ -2350,20 +2351,20 @@ static uint32_t seq_scale(uint32_t seq) static uint8_t unique_key[16]; /* MD5 128 bits as described in RFC6528 */ -static uint32_t tcpv6_init_isn(struct in6_addr *saddr, - struct in6_addr *daddr, +static uint32_t tcpv6_init_isn(struct net_in6_addr *saddr, + struct net_in6_addr *daddr, uint16_t sport, uint16_t dport) { struct { uint8_t key[sizeof(unique_key)]; - struct in6_addr saddr; - struct in6_addr daddr; + struct net_in6_addr saddr; + struct net_in6_addr daddr; uint16_t sport; uint16_t dport; } buf = { - .saddr = *(struct in6_addr *)saddr, - .daddr = *(struct in6_addr *)daddr, + .saddr = *(struct net_in6_addr *)saddr, + .daddr = *(struct net_in6_addr *)daddr, .sport = sport, .dport = dport }; @@ -2385,20 +2386,20 @@ static uint32_t tcpv6_init_isn(struct in6_addr *saddr, return seq_scale(UNALIGNED_GET((uint32_t *)&hash[0])); } -static uint32_t tcpv4_init_isn(struct in_addr *saddr, - struct in_addr *daddr, +static uint32_t tcpv4_init_isn(struct net_in_addr *saddr, + struct net_in_addr *daddr, uint16_t sport, uint16_t dport) { struct { uint8_t key[sizeof(unique_key)]; - struct in_addr saddr; - struct in_addr daddr; + struct net_in_addr saddr; + struct net_in_addr daddr; uint16_t sport; uint16_t dport; } buf = { - .saddr = *(struct in_addr *)saddr, - .daddr = *(struct in_addr *)daddr, + .saddr = *(struct net_in_addr *)saddr, + .daddr = *(struct net_in_addr *)daddr, .sport = sport, .dport = dport }; @@ -2428,17 +2429,17 @@ static uint32_t tcpv4_init_isn(struct in_addr *saddr, #endif /* CONFIG_NET_TCP_ISN_RFC6528 */ -static uint32_t tcp_init_isn(struct sockaddr *saddr, struct sockaddr *daddr) +static uint32_t tcp_init_isn(struct net_sockaddr *saddr, struct net_sockaddr *daddr) { if (IS_ENABLED(CONFIG_NET_TCP_ISN_RFC6528)) { if (IS_ENABLED(CONFIG_NET_IPV6) && - saddr->sa_family == AF_INET6) { + saddr->sa_family == NET_AF_INET6) { return tcpv6_init_isn(&net_sin6(saddr)->sin6_addr, &net_sin6(daddr)->sin6_addr, net_sin6(saddr)->sin6_port, net_sin6(daddr)->sin6_port); } else if (IS_ENABLED(CONFIG_NET_IPV4) && - saddr->sa_family == AF_INET) { + saddr->sa_family == NET_AF_INET) { return tcpv4_init_isn(&net_sin(saddr)->sin_addr, &net_sin(daddr)->sin_addr, net_sin(saddr)->sin_port, @@ -2456,11 +2457,11 @@ static struct tcp *tcp_conn_new(struct net_pkt *pkt) { struct tcp *conn = NULL; struct net_context *context = NULL; - sa_family_t af = net_pkt_family(pkt); - struct sockaddr local_addr = { 0 }; + net_sa_family_t af = net_pkt_family(pkt); + struct net_sockaddr local_addr = { 0 }; int ret; - ret = net_context_get(af, SOCK_STREAM, IPPROTO_TCP, &context); + ret = net_context_get(af, NET_SOCK_STREAM, NET_IPPROTO_TCP, &context); if (ret < 0) { NET_ERR("net_context_get(): %d", ret); goto err; @@ -2498,11 +2499,11 @@ static struct tcp *tcp_conn_new(struct net_pkt *pkt) local_addr.sa_family = net_context_get_family(context); if (IS_ENABLED(CONFIG_NET_IPV6) && - net_context_get_family(context) == AF_INET6) { + net_context_get_family(context) == NET_AF_INET6) { net_ipaddr_copy(&net_sin6(&local_addr)->sin6_addr, &conn->src.sin6.sin6_addr); } else if (IS_ENABLED(CONFIG_NET_IPV4) && - net_context_get_family(context) == AF_INET) { + net_context_get_family(context) == NET_AF_INET) { net_ipaddr_copy(&net_sin(&local_addr)->sin_addr, &conn->src.sin.sin_addr); } @@ -2528,10 +2529,10 @@ static struct tcp *tcp_conn_new(struct net_pkt *pkt) * by the specified remote address and remote port. */ if (IS_ENABLED(CONFIG_NET_IPV6) && - net_context_get_family(context) == AF_INET6) { + net_context_get_family(context) == NET_AF_INET6) { net_sin6_ptr(&context->local)->sin6_port = conn->src.sin6.sin6_port; } else if (IS_ENABLED(CONFIG_NET_IPV4) && - net_context_get_family(context) == AF_INET) { + net_context_get_family(context) == NET_AF_INET) { net_sin_ptr(&context->local)->sin_port = conn->src.sin.sin_port; } @@ -2548,10 +2549,10 @@ static struct tcp *tcp_conn_new(struct net_pkt *pkt) net_sprint_addr(context->remote.sa_family, (const void *)&net_sin(&context->remote)->sin_addr)); - ret = net_conn_register(IPPROTO_TCP, SOCK_STREAM, af, + ret = net_conn_register(NET_IPPROTO_TCP, NET_SOCK_STREAM, af, &context->remote, &local_addr, - ntohs(conn->dst.sin.sin_port),/* local port */ - ntohs(conn->src.sin.sin_port),/* remote port */ + net_ntohs(conn->dst.sin.sin_port),/* local port */ + net_ntohs(conn->src.sin.sin_port),/* remote port */ context, tcp_recv, context, &context->conn_handler); if (ret < 0) { @@ -2562,7 +2563,7 @@ static struct tcp *tcp_conn_new(struct net_pkt *pkt) } net_if_addr_ref(conn->iface, conn->dst.sa.sa_family, - conn->src.sa.sa_family == AF_INET ? + conn->src.sa.sa_family == NET_AF_INET ? (const void *)&conn->src.sin.sin_addr : (const void *)&conn->src.sin6.sin6_addr); conn->addr_ref_done = true; @@ -3057,7 +3058,7 @@ static enum net_verdict tcp_in(struct tcp *conn, struct net_pkt *pkt) } /* Both the seqnum and the acknum are valid, then do processing. */ - conn->send_win = ntohs(th_win(th)); + conn->send_win = net_ntohs(th_win(th)); if (conn->send_win > conn->send_win_max) { NET_DBG("[%p] Lowering send window from %u to %u", conn, conn->send_win, conn->send_win_max); @@ -3147,10 +3148,10 @@ static enum net_verdict tcp_in(struct tcp *conn, struct net_pkt *pkt) * the accepted socket. */ if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) && - net_context_get_family(conn->context) == AF_INET && - net_context_get_family(context) == AF_INET6 && + net_context_get_family(conn->context) == NET_AF_INET && + net_context_get_family(context) == NET_AF_INET6 && !net_context_is_v6only_set(context)) { - struct in6_addr mapped; + struct net_in6_addr mapped; net_ipv6_addr_create_v4_mapped( &net_sin(&conn->context->remote)->sin_addr, @@ -3158,7 +3159,7 @@ static enum net_verdict tcp_in(struct tcp *conn, struct net_pkt *pkt) net_ipaddr_copy(&net_sin6(&conn->context->remote)->sin6_addr, &mapped); - net_sin6(&conn->context->remote)->sin6_family = AF_INET6; + net_sin6(&conn->context->remote)->sin6_family = NET_AF_INET6; NET_DBG("[%p] Setting v4 mapped address %s", conn, net_sprint_ipv6_addr(&mapped)); @@ -3172,8 +3173,8 @@ static enum net_verdict tcp_in(struct tcp *conn, struct net_pkt *pkt) } accept_cb(conn->context, &conn->context->remote, - net_context_get_family(context) == AF_INET6 ? - sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in), + net_context_get_family(context) == NET_AF_INET6 ? + sizeof(struct net_sockaddr_in6) : sizeof(struct net_sockaddr_in), 0, context->user_data); next = TCP_ESTABLISHED; @@ -3803,7 +3804,7 @@ int net_tcp_update_recv_wnd(struct net_context *context, int32_t delta) } int net_tcp_queue(struct net_context *context, const void *data, size_t len, - const struct msghdr *msg) + const struct net_msghdr *msg) { struct tcp *conn = context->tcp; size_t queued_len = 0; @@ -3933,8 +3934,8 @@ static int tcp_start_handshake(struct tcp *conn) * in turn will call tcp_in() to deliver the TCP packet to the stack */ int net_tcp_connect(struct net_context *context, - const struct sockaddr *remote_addr, - struct sockaddr *local_addr, + const struct net_sockaddr *remote_addr, + struct net_sockaddr *local_addr, uint16_t remote_port, uint16_t local_port, k_timeout_t timeout, net_context_connect_cb_t cb, void *user_data) @@ -3954,20 +3955,20 @@ int net_tcp_connect(struct net_context *context, tcp_derive_rto(conn); switch (net_context_get_family(context)) { - const struct in_addr *ip4; - const struct in6_addr *ip6; + const struct net_in_addr *ip4; + const struct net_in6_addr *ip6; - case AF_INET: + case NET_AF_INET: if (!IS_ENABLED(CONFIG_NET_IPV4)) { ret = -EINVAL; goto out; } - memset(&conn->src, 0, sizeof(struct sockaddr_in)); - memset(&conn->dst, 0, sizeof(struct sockaddr_in)); + memset(&conn->src, 0, sizeof(struct net_sockaddr_in)); + memset(&conn->dst, 0, sizeof(struct net_sockaddr_in)); - conn->src.sa.sa_family = AF_INET; - conn->dst.sa.sa_family = AF_INET; + conn->src.sa.sa_family = NET_AF_INET; + conn->dst.sa.sa_family = NET_AF_INET; conn->dst.sin.sin_port = remote_port; conn->src.sin.sin_port = local_port; @@ -3990,17 +3991,17 @@ int net_tcp_connect(struct net_context *context, &net_sin(remote_addr)->sin_addr); break; - case AF_INET6: + case NET_AF_INET6: if (!IS_ENABLED(CONFIG_NET_IPV6)) { ret = -EINVAL; goto out; } - memset(&conn->src, 0, sizeof(struct sockaddr_in6)); - memset(&conn->dst, 0, sizeof(struct sockaddr_in6)); + memset(&conn->src, 0, sizeof(struct net_sockaddr_in6)); + memset(&conn->dst, 0, sizeof(struct net_sockaddr_in6)); - conn->src.sin6.sin6_family = AF_INET6; - conn->dst.sin6.sin6_family = AF_INET6; + conn->src.sin6.sin6_family = NET_AF_INET6; + conn->dst.sin6.sin6_family = NET_AF_INET6; conn->dst.sin6.sin6_port = remote_port; conn->src.sin6.sin6_port = local_port; @@ -4040,7 +4041,7 @@ int net_tcp_connect(struct net_context *context, net_context_get_type(context), net_context_get_family(context), remote_addr, local_addr, - ntohs(remote_port), ntohs(local_port), + net_ntohs(remote_port), net_ntohs(local_port), context, tcp_recv, context, &context->conn_handler); if (ret < 0) { @@ -4048,7 +4049,7 @@ int net_tcp_connect(struct net_context *context, } net_if_addr_ref(conn->iface, conn->src.sa.sa_family, - conn->src.sa.sa_family == AF_INET ? + conn->src.sa.sa_family == NET_AF_INET ? (const void *)&conn->src.sin.sin_addr : (const void *)&conn->src.sin6.sin6_addr); conn->addr_ref_done = true; @@ -4106,7 +4107,7 @@ int net_tcp_accept(struct net_context *context, net_tcp_accept_cb_t cb, void *user_data) { struct tcp *conn = context->tcp; - struct sockaddr local_addr = { }; + struct net_sockaddr local_addr = { }; uint16_t local_port, remote_port; if (!conn) { @@ -4123,15 +4124,15 @@ int net_tcp_accept(struct net_context *context, net_tcp_accept_cb_t cb, local_addr.sa_family = net_context_get_family(context); switch (local_addr.sa_family) { - struct sockaddr_in *in; - struct sockaddr_in6 *in6; + struct net_sockaddr_in *in; + struct net_sockaddr_in6 *in6; - case AF_INET: + case NET_AF_INET: if (!IS_ENABLED(CONFIG_NET_IPV4)) { return -EINVAL; } - in = (struct sockaddr_in *)&local_addr; + in = (struct net_sockaddr_in *)&local_addr; if (net_sin_ptr(&context->local)->sin_addr) { net_ipaddr_copy(&in->sin_addr, @@ -4139,18 +4140,18 @@ int net_tcp_accept(struct net_context *context, net_tcp_accept_cb_t cb, } in->sin_port = - net_sin((struct sockaddr *)&context->local)->sin_port; - local_port = ntohs(in->sin_port); - remote_port = ntohs(net_sin(&context->remote)->sin_port); + net_sin((struct net_sockaddr *)&context->local)->sin_port; + local_port = net_ntohs(in->sin_port); + remote_port = net_ntohs(net_sin(&context->remote)->sin_port); break; - case AF_INET6: + case NET_AF_INET6: if (!IS_ENABLED(CONFIG_NET_IPV6)) { return -EINVAL; } - in6 = (struct sockaddr_in6 *)&local_addr; + in6 = (struct net_sockaddr_in6 *)&local_addr; if (net_sin6_ptr(&context->local)->sin6_addr) { net_ipaddr_copy(&in6->sin6_addr, @@ -4158,9 +4159,9 @@ int net_tcp_accept(struct net_context *context, net_tcp_accept_cb_t cb, } in6->sin6_port = - net_sin6((struct sockaddr *)&context->local)->sin6_port; - local_port = ntohs(in6->sin6_port); - remote_port = ntohs(net_sin6(&context->remote)->sin6_port); + net_sin6((struct net_sockaddr *)&context->local)->sin6_port; + local_port = net_ntohs(in6->sin6_port); + remote_port = net_ntohs(net_sin6(&context->remote)->sin6_port); break; @@ -4206,7 +4207,7 @@ int net_tcp_finalize(struct net_pkt *pkt, bool force_chksum) { NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr); struct net_tcp_hdr *tcp_hdr; - enum net_if_checksum_type type = net_pkt_family(pkt) == AF_INET6 ? + enum net_if_checksum_type type = net_pkt_family(pkt) == NET_AF_INET6 ? NET_IF_CHECKSUM_IPV6_TCP : NET_IF_CHECKSUM_IPV4_TCP; tcp_hdr = (struct net_tcp_hdr *)net_pkt_get_data(pkt, &tcp_access); @@ -4228,7 +4229,7 @@ struct net_tcp_hdr *net_tcp_input(struct net_pkt *pkt, struct net_pkt_data_access *tcp_access) { struct net_tcp_hdr *tcp_hdr; - enum net_if_checksum_type type = net_pkt_family(pkt) == AF_INET6 ? + enum net_if_checksum_type type = net_pkt_family(pkt) == NET_AF_INET6 ? NET_IF_CHECKSUM_IPV6_TCP : NET_IF_CHECKSUM_IPV4_TCP; if (IS_ENABLED(CONFIG_NET_TCP_CHECKSUM) && @@ -4341,7 +4342,7 @@ enum net_verdict tp_input(struct net_conn *net_conn, void *user_data) { struct net_udp_hdr *uh = net_udp_get_hdr(pkt, NULL); - size_t data_len = ntohs(uh->len) - sizeof(*uh); + size_t data_len = net_ntohs(uh->len) - sizeof(*uh); struct tcp *conn = tcp_conn_search(pkt); size_t json_len = 0; struct tp *tp; @@ -4361,7 +4362,7 @@ enum net_verdict tp_input(struct net_conn *net_conn, type = json_decode_msg(buf, data_len); - data_len = ntohs(uh->len) - sizeof(*uh); + data_len = net_ntohs(uh->len) - sizeof(*uh); net_pkt_cursor_init(pkt); net_pkt_set_overwrite(pkt, true); @@ -4480,12 +4481,12 @@ enum net_verdict tp_input(struct net_conn *net_conn, return verdict; } -static void test_cb_register(sa_family_t family, enum net_sock_type type, +static void test_cb_register(net_sa_family_t family, enum net_sock_type type, uint8_t proto, uint16_t remote_port, uint16_t local_port, net_conn_cb_t cb) { struct net_conn_handle *conn_handle = NULL; - const struct sockaddr addr = { .sa_family = family, }; + const struct net_sockaddr addr = { .sa_family = family, }; int ret = net_conn_register(proto, type, @@ -4523,11 +4524,11 @@ void net_tcp_foreach(net_tcp_cb_t cb, void *user_data) } static uint16_t get_ipv6_destination_mtu(struct net_if *iface, - const struct in6_addr *dest) + const struct net_in6_addr *dest) { #if defined(CONFIG_NET_IPV6_PMTU) - int mtu = net_pmtu_get_mtu((struct sockaddr *)&(struct sockaddr_in6){ - .sin6_family = AF_INET6, + int mtu = net_pmtu_get_mtu((struct net_sockaddr *)&(struct net_sockaddr_in6){ + .sin6_family = NET_AF_INET6, .sin6_addr = *dest }); if (mtu < 0) { @@ -4549,11 +4550,11 @@ static uint16_t get_ipv6_destination_mtu(struct net_if *iface, } static uint16_t get_ipv4_destination_mtu(struct net_if *iface, - const struct in_addr *dest) + const struct net_in_addr *dest) { #if defined(CONFIG_NET_IPV4_PMTU) - int mtu = net_pmtu_get_mtu((struct sockaddr *)&(struct sockaddr_in){ - .sin_family = AF_INET, + int mtu = net_pmtu_get_mtu((struct net_sockaddr *)&(struct net_sockaddr_in){ + .sin_family = NET_AF_INET, .sin_addr = *dest }); if (mtu < 0) { @@ -4576,9 +4577,9 @@ static uint16_t get_ipv4_destination_mtu(struct net_if *iface, uint16_t net_tcp_get_supported_mss(const struct tcp *conn) { - sa_family_t family = net_context_get_family(conn->context); + net_sa_family_t family = net_context_get_family(conn->context); - if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { struct net_if *iface = net_context_get_iface(conn->context); uint16_t dest_mtu; @@ -4587,7 +4588,7 @@ uint16_t net_tcp_get_supported_mss(const struct tcp *conn) /* Detect MSS based on interface MTU minus "TCP,IP header size" */ return dest_mtu - NET_IPV4TCPH_LEN; - } else if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { + } else if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { struct net_if *iface = net_context_get_iface(conn->context); uint16_t dest_mtu; @@ -4602,7 +4603,7 @@ uint16_t net_tcp_get_supported_mss(const struct tcp *conn) #if defined(CONFIG_NET_TEST) struct testing_user_data { - struct sockaddr remote; + struct net_sockaddr remote; uint16_t mtu; }; @@ -4610,7 +4611,7 @@ static void testing_find_conn(struct tcp *conn, void *user_data) { struct testing_user_data *data = user_data; - if (IS_ENABLED(CONFIG_NET_IPV6) && data->remote.sa_family == AF_INET6 && + if (IS_ENABLED(CONFIG_NET_IPV6) && data->remote.sa_family == NET_AF_INET6 && net_ipv6_addr_cmp(&conn->dst.sin6.sin6_addr, &net_sin6(&data->remote)->sin6_addr)) { if (data->mtu > 0) { @@ -4624,7 +4625,7 @@ static void testing_find_conn(struct tcp *conn, void *user_data) return; } - if (IS_ENABLED(CONFIG_NET_IPV4) && data->remote.sa_family == AF_INET && + if (IS_ENABLED(CONFIG_NET_IPV4) && data->remote.sa_family == NET_AF_INET && net_ipv4_addr_cmp(&conn->dst.sin.sin_addr, &net_sin(&data->remote)->sin_addr)) { if (data->mtu > 0) { @@ -4639,7 +4640,7 @@ static void testing_find_conn(struct tcp *conn, void *user_data) } } -uint16_t net_tcp_get_mtu(struct sockaddr *dst) +uint16_t net_tcp_get_mtu(struct net_sockaddr *dst) { struct testing_user_data data = { .remote = *dst, @@ -4784,10 +4785,14 @@ void net_tcp_init(void) int rto; #if defined(CONFIG_NET_TEST_PROTOCOL) /* Register inputs for TTCN-3 based TCP sanity check */ - test_cb_register(AF_INET, SOCK_STREAM, IPPROTO_TCP, 4242, 4242, tcp_input); - test_cb_register(AF_INET6, SOCK_STREAM, IPPROTO_TCP, 4242, 4242, tcp_input); - test_cb_register(AF_INET, SOCK_DGRAM, IPPROTO_UDP, 4242, 4242, tp_input); - test_cb_register(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, 4242, 4242, tp_input); + test_cb_register(NET_AF_INET, NET_NET_SOCK_STREAM, NET_IPPROTO_TCP, + 4242, 4242, tcp_input); + test_cb_register(NET_AF_INET6, NET_NET_SOCK_STREAM, NET_IPPROTO_TCP, + 4242, 4242, tcp_input); + test_cb_register(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP, + 4242, 4242, tp_input); + test_cb_register(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, + 4242, 4242, tp_input); tcp_recv_cb = tp_tcp_recv_cb; #endif diff --git a/subsys/net/ip/tcp_internal.h b/subsys/net/ip/tcp_internal.h index 848ec7d288bbb..a6299ccde731c 100644 --- a/subsys/net/ip/tcp_internal.h +++ b/subsys/net/ip/tcp_internal.h @@ -1,8 +1,8 @@ /** @file * @brief Transmission Control Protocol (TCP) * - * - net_tcp_get() is called by net_context_get(AF_INET, SOCK_STREAM, - IPPROTO_TCP, ...) and creates struct tcp for the net_context + * - net_tcp_get() is called by net_context_get(NET_AF_INET, NET_SOCK_STREAM, + NET_IPPROTO_TCP, ...) and creates struct tcp for the net_context * - net_tcp_listen()/net_tcp_accept() listen/accept * - At the reception of SYN on the listening net_context, a new pair * of net_context/struct tcp registers a new net_conn handle @@ -141,8 +141,8 @@ static inline int net_tcp_get(struct net_context *context) */ #if defined(CONFIG_NET_NATIVE_TCP) int net_tcp_connect(struct net_context *context, - const struct sockaddr *addr, - struct sockaddr *laddr, + const struct net_sockaddr *addr, + struct net_sockaddr *laddr, uint16_t rport, uint16_t lport, k_timeout_t timeout, @@ -150,8 +150,8 @@ int net_tcp_connect(struct net_context *context, void *user_data); #else static inline int net_tcp_connect(struct net_context *context, - const struct sockaddr *addr, - struct sockaddr *laddr, + const struct net_sockaddr *addr, + struct net_sockaddr *laddr, uint16_t rport, uint16_t lport, k_timeout_t timeout, net_context_connect_cb_t cb, void *user_data) @@ -313,10 +313,10 @@ struct net_tcp_hdr *net_tcp_input(struct net_pkt *pkt, */ #if defined(CONFIG_NET_NATIVE_TCP) int net_tcp_queue(struct net_context *context, const void *data, size_t len, - const struct msghdr *msg); + const struct net_msghdr *msg); #else static inline int net_tcp_queue(struct net_context *context, const void *data, - size_t len, const struct msghdr *msg) + size_t len, const struct net_msghdr *msg) { ARG_UNUSED(context); ARG_UNUSED(data); @@ -470,14 +470,14 @@ static inline void net_tcp_reply_rst(struct net_pkt *pkt) * @param context Network context * @param local TCP connection local socket information is copied here * @param peer TCP connection peer socket information is copied here - * @param addrlen Size of the sockaddr struct. Copied size is returned. + * @param addrlen Size of the net_sockaddr struct. Copied size is returned. * * @return <0 if there was an error, 0 if ok */ int net_tcp_endpoint_copy(struct net_context *ctx, - struct sockaddr *local, - struct sockaddr *peer, - socklen_t *addrlen); + struct net_sockaddr *local, + struct net_sockaddr *peer, + net_socklen_t *addrlen); /** * @brief Notify TCP layer that connection has been accepted by the application diff --git a/subsys/net/ip/tcp_private.h b/subsys/net/ip/tcp_private.h index 3d0403caee098..ac585ab3c6570 100644 --- a/subsys/net/ip/tcp_private.h +++ b/subsys/net/ip/tcp_private.h @@ -16,8 +16,8 @@ #define th_sport(_x) UNALIGNED_GET(UNALIGNED_MEMBER_ADDR((_x), th_sport)) #define th_dport(_x) UNALIGNED_GET(UNALIGNED_MEMBER_ADDR((_x), th_dport)) -#define th_seq(_x) ntohl(UNALIGNED_GET(UNALIGNED_MEMBER_ADDR((_x), th_seq))) -#define th_ack(_x) ntohl(UNALIGNED_GET(UNALIGNED_MEMBER_ADDR((_x), th_ack))) +#define th_seq(_x) net_ntohl(UNALIGNED_GET(UNALIGNED_MEMBER_ADDR((_x), th_seq))) +#define th_ack(_x) net_ntohl(UNALIGNED_GET(UNALIGNED_MEMBER_ADDR((_x), th_ack))) #define th_off(_x) ((_x)->th_off) #define th_flags(_x) UNALIGNED_GET(UNALIGNED_MEMBER_ADDR((_x), th_flags)) @@ -69,7 +69,7 @@ (_conn)->iface, \ (_len), \ net_context_get_family((_conn)->context), \ - IPPROTO_TCP, \ + NET_IPPROTO_TCP, \ TCP_PKT_ALLOC_TIMEOUT); \ } else { \ _pkt = net_pkt_alloc(TCP_PKT_ALLOC_TIMEOUT); \ @@ -89,7 +89,7 @@ (_conn)->iface, \ (_len), \ net_context_get_family((_conn)->context), \ - IPPROTO_TCP, \ + NET_IPPROTO_TCP, \ TCP_PKT_ALLOC_TIMEOUT); \ } else { \ _pkt = net_pkt_rx_alloc(TCP_PKT_ALLOC_TIMEOUT); \ @@ -107,7 +107,7 @@ if ((_len) > 0) { \ _pkt = net_pkt_alloc_with_buffer( \ (_iface), (_len), (_family), \ - IPPROTO_TCP, \ + NET_IPPROTO_TCP, \ TCP_PKT_ALLOC_TIMEOUT); \ } else { \ _pkt = net_pkt_alloc(TCP_PKT_ALLOC_TIMEOUT); \ @@ -219,9 +219,9 @@ enum tcp_data_mode { }; union tcp_endpoint { - struct sockaddr sa; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; + struct net_sockaddr sa; + struct net_sockaddr_in sin; + struct net_sockaddr_in6 sin6; }; /* TCP Option codes */ diff --git a/subsys/net/ip/tp.c b/subsys/net/ip/tp.c index 330b273471a6e..0a773f5a3fd7b 100644 --- a/subsys/net/ip/tp.c +++ b/subsys/net/ip/tp.c @@ -357,12 +357,12 @@ static void udp_finalize_pkt(struct net_pkt *pkt) net_pkt_cursor_init(pkt); - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { - ret = net_ipv4_finalize(pkt, IPPROTO_UDP); + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { + ret = net_ipv4_finalize(pkt, NET_IPPROTO_UDP); } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { - ret = net_ipv6_finalize(pkt, IPPROTO_UDP); + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { + ret = net_ipv6_finalize(pkt, NET_IPPROTO_UDP); } NET_ASSERT(ret == 0); @@ -370,22 +370,22 @@ static void udp_finalize_pkt(struct net_pkt *pkt) static int ip_header_add(struct net_pkt *pkt) { - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { - struct in_addr src; - struct in_addr dst; + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { + struct net_in_addr src; + struct net_in_addr dst; - net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &src); - net_addr_pton(AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &dst); + net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &src); + net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_PEER_IPV4_ADDR, &dst); return net_ipv4_create(pkt, &src, &dst); } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { - struct in6_addr src; - struct in6_addr dst; + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { + struct net_in6_addr src; + struct net_in6_addr dst; - net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &src); - net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &dst); + net_addr_pton(NET_AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &src); + net_addr_pton(NET_AF_INET6, CONFIG_NET_CONFIG_PEER_IPV6_ADDR, &dst); return net_ipv6_create(pkt, &src, &dst); } @@ -404,7 +404,7 @@ static void tp_pkt_send(struct net_pkt *pkt) tp_pkt_unref(pkt, tp_basename(__FILE__), __LINE__); } -static struct net_pkt *tp_output_pkt_alloc(sa_family_t af, +static struct net_pkt *tp_output_pkt_alloc(net_sa_family_t af, struct net_if *iface, size_t len, const char *file, int line) @@ -415,7 +415,7 @@ static struct net_pkt *tp_output_pkt_alloc(sa_family_t af, tp_pkt->pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_udp_hdr) + len, - af, IPPROTO_UDP, K_NO_WAIT); + af, NET_IPPROTO_UDP, K_NO_WAIT); tp_assert(tp_pkt->pkt, ""); tp_pkt->file = file; @@ -426,7 +426,7 @@ static struct net_pkt *tp_output_pkt_alloc(sa_family_t af, return tp_pkt->pkt; } -void _tp_output(sa_family_t af, struct net_if *iface, void *data, +void _tp_output(net_sa_family_t af, struct net_if *iface, void *data, size_t data_len, const char *file, int line) { struct net_pkt *pkt = tp_output_pkt_alloc(af, iface, data_len, @@ -438,7 +438,7 @@ void _tp_output(sa_family_t af, struct net_if *iface, void *data, goto fail; } - ret = net_udp_create(pkt, htons(4242), htons(4242)); + ret = net_udp_create(pkt, net_htons(4242), net_htons(4242)); if (ret < 0) { goto fail; } @@ -577,7 +577,7 @@ void tp_new_to_json(struct tp_new *tp, void *data, size_t *data_len) *data_len = error ? 0 : strlen(data); } -void tp_out(sa_family_t af, struct net_if *iface, const char *msg, +void tp_out(net_sa_family_t af, struct net_if *iface, const char *msg, const char *key, const char *value) { if (tp_trace) { diff --git a/subsys/net/ip/tp.h b/subsys/net/ip/tp.h index 7825633f9b9ea..3e5f9f6a88b59 100644 --- a/subsys/net/ip/tp.h +++ b/subsys/net/ip/tp.h @@ -116,7 +116,7 @@ char *tp_basename(char *path); const char *tp_hex_to_str(void *data, size_t len); size_t tp_str_to_hex(void *buf, size_t bufsize, const char *s); -void _tp_output(sa_family_t af, struct net_if *iface, void *data, +void _tp_output(net_sa_family_t af, struct net_if *iface, void *data, size_t data_len, const char *file, int line); #define tp_output(_af, _iface, _data, _data_len) \ _tp_output(_af, _iface, _data, _data_len, \ @@ -157,7 +157,7 @@ void tp_encode(struct tp *tp, void *data, size_t *data_len); void tp_new_to_json(struct tp_new *tp, void *data, size_t *data_len); void tp_new_find_and_apply(struct tp_new *tp, const char *key, void *value, int type); -void tp_out(sa_family_t af, struct net_if *iface, const char *msg, +void tp_out(net_sa_family_t af, struct net_if *iface, const char *msg, const char *key, const char *value); bool tp_tap_input(struct net_pkt *pkt); diff --git a/subsys/net/ip/udp.c b/subsys/net/ip/udp.c index e2214bbe47029..932f8edb3b276 100644 --- a/subsys/net/ip/udp.c +++ b/subsys/net/ip/udp.c @@ -40,7 +40,7 @@ int net_udp_finalize(struct net_pkt *pkt, bool force_chksum) NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr); struct net_udp_hdr *udp_hdr; uint16_t length = 0; - enum net_if_checksum_type type = net_pkt_family(pkt) == AF_INET6 ? + enum net_if_checksum_type type = net_pkt_family(pkt) == NET_AF_INET6 ? NET_IF_CHECKSUM_IPV6_UDP : NET_IF_CHECKSUM_IPV4_UDP; udp_hdr = (struct net_udp_hdr *)net_pkt_get_data(pkt, &udp_access); @@ -51,7 +51,7 @@ int net_udp_finalize(struct net_pkt *pkt, bool force_chksum) length = net_pkt_get_len(pkt) - net_pkt_ip_hdr_len(pkt) - net_pkt_ip_opts_len(pkt); - udp_hdr->len = htons(length); + udp_hdr->len = net_htons(length); if (net_if_need_calc_tx_checksum(net_pkt_iface(pkt), type) || force_chksum) { udp_hdr->chksum = net_calc_chksum_udp(pkt); @@ -128,8 +128,8 @@ struct net_udp_hdr *net_udp_set_hdr(struct net_pkt *pkt, } int net_udp_register(uint8_t family, - const struct sockaddr *remote_addr, - const struct sockaddr *local_addr, + const struct net_sockaddr *remote_addr, + const struct net_sockaddr *local_addr, uint16_t remote_port, uint16_t local_port, struct net_context *context, @@ -137,7 +137,7 @@ int net_udp_register(uint8_t family, void *user_data, struct net_conn_handle **handle) { - return net_conn_register(IPPROTO_UDP, SOCK_DGRAM, family, remote_addr, + return net_conn_register(NET_IPPROTO_UDP, NET_SOCK_DGRAM, family, remote_addr, local_addr, remote_port, local_port, context, cb, user_data, handle); } @@ -151,7 +151,7 @@ struct net_udp_hdr *net_udp_input(struct net_pkt *pkt, struct net_pkt_data_access *udp_access) { struct net_udp_hdr *udp_hdr; - enum net_if_checksum_type type = net_pkt_family(pkt) == AF_INET6 ? + enum net_if_checksum_type type = net_pkt_family(pkt) == NET_AF_INET6 ? NET_IF_CHECKSUM_IPV6_UDP : NET_IF_CHECKSUM_IPV4_UDP; udp_hdr = (struct net_udp_hdr *)net_pkt_get_data(pkt, udp_access); @@ -160,7 +160,7 @@ struct net_udp_hdr *net_udp_input(struct net_pkt *pkt, goto drop; } - if (ntohs(udp_hdr->len) != (net_pkt_get_len(pkt) - + if (net_ntohs(udp_hdr->len) != (net_pkt_get_len(pkt) - net_pkt_ip_hdr_len(pkt) - net_pkt_ip_opts_len(pkt))) { NET_DBG("DROP: Invalid hdr length"); @@ -172,7 +172,7 @@ struct net_udp_hdr *net_udp_input(struct net_pkt *pkt, net_pkt_is_ip_reassembled(pkt))) { if (!udp_hdr->chksum) { if (IS_ENABLED(CONFIG_NET_UDP_MISSING_CHECKSUM) && - net_pkt_family(pkt) == AF_INET) { + net_pkt_family(pkt) == NET_AF_INET) { goto out; } diff --git a/subsys/net/ip/udp_internal.h b/subsys/net/ip/udp_internal.h index 00009177d0b55..bee9081500e3b 100644 --- a/subsys/net/ip/udp_internal.h +++ b/subsys/net/ip/udp_internal.h @@ -114,8 +114,8 @@ struct net_udp_hdr *net_udp_input(struct net_pkt *pkt, * @return Return 0 if the registration succeed, <0 otherwise. */ int net_udp_register(uint8_t family, - const struct sockaddr *remote_addr, - const struct sockaddr *local_addr, + const struct net_sockaddr *remote_addr, + const struct net_sockaddr *local_addr, uint16_t remote_port, uint16_t local_port, struct net_context *context, diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c index d91b060ef1bb0..6150d9679722b 100644 --- a/subsys/net/ip/utils.c +++ b/subsys/net/ip/utils.c @@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(net_utils, CONFIG_NET_UTILS_LOG_LEVEL); #include #include -char *net_sprint_addr(sa_family_t af, const void *addr) +char *net_sprint_addr(net_sa_family_t af, const void *addr) { #define NBUFS 3 static char buf[NBUFS][NET_IPV6_ADDR_LEN]; @@ -52,22 +52,22 @@ const char *net_verdict2str(enum net_verdict verdict) const char *net_proto2str(int family, int proto) { - if (family == AF_INET || family == AF_INET6) { + if (family == NET_AF_INET || family == NET_AF_INET6) { switch (proto) { - case IPPROTO_ICMP: + case NET_IPPROTO_ICMP: return "ICMPv4"; - case IPPROTO_TCP: + case NET_IPPROTO_TCP: return "TCP"; - case IPPROTO_UDP: + case NET_IPPROTO_UDP: return "UDP"; - case IPPROTO_ICMPV6: + case NET_IPPROTO_ICMPV6: return "ICMPv6"; default: break; } - } else if (family == AF_CAN) { + } else if (family == NET_AF_CAN) { switch (proto) { - case CAN_RAW: + case NET_CAN_RAW: return "CAN_RAW"; default: break; @@ -157,11 +157,11 @@ static int net_value_to_udec(char *buf, uint32_t value, int precision) return buf - start; } -char *z_impl_net_addr_ntop(sa_family_t family, const void *src, +char *z_impl_net_addr_ntop(net_sa_family_t family, const void *src, char *dst, size_t size) { - struct in_addr addr = { 0 }; - struct in6_addr addr6 = { 0 }; + struct net_in_addr addr = { 0 }; + struct net_in6_addr addr6 = { 0 }; uint16_t *w = NULL; int i; uint8_t longest = 1U; @@ -175,8 +175,8 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src, bool mapped = false; switch (family) { - case AF_INET6: - if (size < INET6_ADDRSTRLEN) { + case NET_AF_INET6: + if (size < NET_INET6_ADDRSTRLEN) { /* POSIX definition is the size - includes nil */ return NULL; } @@ -211,8 +211,8 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src, } break; - case AF_INET: - if (size < INET_ADDRSTRLEN) { + case NET_AF_INET: + if (size < NET_INET_ADDRSTRLEN) { /* POSIX definition is the size - includes nil */ return NULL; } @@ -254,7 +254,7 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src, len = 4; addr.s_addr = addr6.s6_addr32[3]; *ptr++ = ':'; - family = AF_INET; + family = NET_AF_INET; goto print_mapped; } @@ -295,7 +295,7 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src, needcolon = true; } - if (family == AF_INET) { + if (family == NET_AF_INET) { *(ptr - 1) = '\0'; } else { *ptr = '\0'; @@ -305,22 +305,22 @@ char *z_impl_net_addr_ntop(sa_family_t family, const void *src, } #if defined(CONFIG_USERSPACE) -char *z_vrfy_net_addr_ntop(sa_family_t family, const void *src, +char *z_vrfy_net_addr_ntop(net_sa_family_t family, const void *src, char *dst, size_t size) { - char str[INET6_ADDRSTRLEN]; - struct in6_addr addr6; - struct in_addr addr4; + char str[NET_INET6_ADDRSTRLEN]; + struct net_in6_addr addr6; + struct net_in_addr addr4; char *out; const void *addr; K_OOPS(K_SYSCALL_MEMORY_WRITE(dst, size)); - if (family == AF_INET) { + if (family == NET_AF_INET) { K_OOPS(k_usermode_from_copy(&addr4, (const void *)src, sizeof(addr4))); addr = &addr4; - } else if (family == AF_INET6) { + } else if (family == NET_AF_INET6) { K_OOPS(k_usermode_from_copy(&addr6, (const void *)src, sizeof(addr6))); addr = &addr6; @@ -340,15 +340,15 @@ char *z_vrfy_net_addr_ntop(sa_family_t family, const void *src, #include #endif /* CONFIG_USERSPACE */ -int z_impl_net_addr_pton(sa_family_t family, const char *src, +int z_impl_net_addr_pton(net_sa_family_t family, const char *src, void *dst) { - if (family == AF_INET) { - struct in_addr *addr = (struct in_addr *)dst; + if (family == NET_AF_INET) { + struct net_in_addr *addr = (struct net_in_addr *)dst; uint8_t index = 0, digits = 0; uint16_t value = 0, count = 0; - (void)memset(addr, 0, sizeof(struct in_addr)); + (void)memset(addr, 0, sizeof(struct net_in_addr)); /* A valid IPv4 address that can be used with inet_pton * must be in the standard dotted-decimal notation: @@ -358,7 +358,7 @@ int z_impl_net_addr_pton(sa_family_t family, const char *src, * - No leading zeros in each octet */ - while (index < sizeof(struct in_addr)) { + while (index < sizeof(struct net_in_addr)) { if (*src == '\0' || *src == '.') { if (*src == '.') { count++; @@ -404,12 +404,12 @@ int z_impl_net_addr_pton(sa_family_t family, const char *src, return -EINVAL; } - } else if (family == AF_INET6) { + } else if (family == NET_AF_INET6) { /* If the string contains a '.', it means it's of the form * X:X:X:X:X:X:x.x.x.x, and contains only 6 16-bit pieces */ int expected_groups = strchr(src, '.') ? 6 : 8; - struct in6_addr *addr = (struct in6_addr *)dst; + struct net_in6_addr *addr = (struct net_in6_addr *)dst; int i, len; if (*src == ':') { @@ -436,7 +436,7 @@ int z_impl_net_addr_pton(sa_family_t family, const char *src, if (*src != ':') { /* Normal IPv6 16-bit piece */ - UNALIGNED_PUT(htons(strtol(src, NULL, 16)), + UNALIGNED_PUT(net_htons(strtol(src, NULL, 16)), &addr->s6_addr16[i]); src = strchr(src, ':'); if (src) { @@ -513,21 +513,21 @@ int z_impl_net_addr_pton(sa_family_t family, const char *src, } #if defined(CONFIG_USERSPACE) -int z_vrfy_net_addr_pton(sa_family_t family, const char *src, +int z_vrfy_net_addr_pton(net_sa_family_t family, const char *src, void *dst) { - char str[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN)] = {}; - struct in6_addr addr6; - struct in_addr addr4; + char str[MAX(NET_INET_ADDRSTRLEN, NET_INET6_ADDRSTRLEN)] = {}; + struct net_in6_addr addr6; + struct net_in_addr addr4; void *addr; size_t size; int err; - if (family == AF_INET) { - size = sizeof(struct in_addr); + if (family == NET_AF_INET) { + size = sizeof(struct net_in_addr); addr = &addr4; - } else if (family == AF_INET6) { - size = sizeof(struct in6_addr); + } else if (family == NET_AF_INET6) { + size = sizeof(struct net_in6_addr); addr = &addr6; } else { return -EINVAL; @@ -692,16 +692,16 @@ uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto) bool ow; if (IS_ENABLED(CONFIG_NET_IPV4) && - net_pkt_family(pkt) == AF_INET) { - if (proto != IPPROTO_ICMP && proto != IPPROTO_IGMP) { - len = 2 * sizeof(struct in_addr); + net_pkt_family(pkt) == NET_AF_INET) { + if (proto != NET_IPPROTO_ICMP && proto != NET_IPPROTO_IGMP) { + len = 2 * sizeof(struct net_in_addr); sum = net_pkt_get_len(pkt) - net_pkt_ip_hdr_len(pkt) - net_pkt_ipv4_opts_len(pkt) + proto; } } else if (IS_ENABLED(CONFIG_NET_IPV6) && - net_pkt_family(pkt) == AF_INET6) { - len = 2 * sizeof(struct in6_addr); + net_pkt_family(pkt) == NET_AF_INET6) { + len = 2 * sizeof(struct net_in6_addr); sum = net_pkt_get_len(pkt) - net_pkt_ip_hdr_len(pkt) - net_pkt_ipv6_ext_len(pkt) + proto; @@ -723,7 +723,7 @@ uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto) sum = pkt_calc_chksum(pkt, sum); - sum = (sum == 0U) ? 0xffff : htons(sum); + sum = (sum == 0U) ? 0xffff : net_htons(sum); net_pkt_cursor_restore(pkt, &backup); @@ -742,7 +742,7 @@ uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt) net_pkt_ip_hdr_len(pkt) + net_pkt_ipv4_opts_len(pkt)); - sum = (sum == 0U) ? 0xffff : htons(sum); + sum = (sum == 0U) ? 0xffff : net_htons(sum); return ~sum; } @@ -751,7 +751,7 @@ uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt) #if defined(CONFIG_NET_IPV4_IGMP) uint16_t net_calc_chksum_igmp(struct net_pkt *pkt) { - return net_calc_chksum(pkt, IPPROTO_IGMP); + return net_calc_chksum(pkt, NET_IPPROTO_IGMP); } #endif /* CONFIG_NET_IPV4_IGMP */ @@ -776,15 +776,15 @@ static bool convert_port(const char *buf, uint16_t *port) #if defined(CONFIG_NET_IPV6) static bool parse_ipv6(const char *str, size_t str_len, - struct sockaddr *addr, bool has_port) + struct net_sockaddr *addr, bool has_port) { char *ptr = NULL; - struct in6_addr *addr6; - char ipaddr[INET6_ADDRSTRLEN + 1]; + struct net_in6_addr *addr6; + char ipaddr[NET_INET6_ADDRSTRLEN + 1]; int end, len, ret, i; uint16_t port; - len = MIN(INET6_ADDRSTRLEN, str_len); + len = MIN(NET_INET6_ADDRSTRLEN, str_len); for (i = 0; i < len; i++) { if (!str[i]) { @@ -811,12 +811,12 @@ static bool parse_ipv6(const char *str, size_t str_len, addr6 = &net_sin6(addr)->sin6_addr; - ret = net_addr_pton(AF_INET6, ipaddr, addr6); + ret = net_addr_pton(NET_AF_INET6, ipaddr, addr6); if (ret < 0) { return false; } - net_sin6(addr)->sin6_family = AF_INET6; + net_sin6(addr)->sin6_family = NET_AF_INET6; if (!has_port) { return true; @@ -846,21 +846,21 @@ static bool parse_ipv6(const char *str, size_t str_len, return false; } - net_sin6(addr)->sin6_port = htons(port); + net_sin6(addr)->sin6_port = net_htons(port); NET_DBG("IPv6 host %s port %d", - net_addr_ntop(AF_INET6, addr6, ipaddr, sizeof(ipaddr) - 1), + net_addr_ntop(NET_AF_INET6, addr6, ipaddr, sizeof(ipaddr) - 1), port); } else { NET_DBG("IPv6 host %s", - net_addr_ntop(AF_INET6, addr6, ipaddr, sizeof(ipaddr) - 1)); + net_addr_ntop(NET_AF_INET6, addr6, ipaddr, sizeof(ipaddr) - 1)); } return true; } #else static inline bool parse_ipv6(const char *str, size_t str_len, - struct sockaddr *addr, bool has_port) + struct net_sockaddr *addr, bool has_port) { return false; } @@ -868,11 +868,11 @@ static inline bool parse_ipv6(const char *str, size_t str_len, #if defined(CONFIG_NET_IPV4) static bool parse_ipv4(const char *str, size_t str_len, - struct sockaddr *addr, bool has_port) + struct net_sockaddr *addr, bool has_port) { char *ptr = NULL; char ipaddr[NET_IPV4_ADDR_LEN + 1]; - struct in_addr *addr4; + struct net_in_addr *addr4; int end, len, ret, i; uint16_t port; @@ -902,12 +902,12 @@ static bool parse_ipv4(const char *str, size_t str_len, addr4 = &net_sin(addr)->sin_addr; - ret = net_addr_pton(AF_INET, ipaddr, addr4); + ret = net_addr_pton(NET_AF_INET, ipaddr, addr4); if (ret < 0) { return false; } - net_sin(addr)->sin_family = AF_INET; + net_sin(addr)->sin_family = NET_AF_INET; if (!has_port) { return true; @@ -921,22 +921,22 @@ static bool parse_ipv4(const char *str, size_t str_len, return false; } - net_sin(addr)->sin_port = htons(port); + net_sin(addr)->sin_port = net_htons(port); NET_DBG("IPv4 host %s port %d", - net_addr_ntop(AF_INET, addr4, ipaddr, sizeof(ipaddr) - 1), + net_addr_ntop(NET_AF_INET, addr4, ipaddr, sizeof(ipaddr) - 1), port); return true; } #else static inline bool parse_ipv4(const char *str, size_t str_len, - struct sockaddr *addr, bool has_port) + struct net_sockaddr *addr, bool has_port) { return false; } #endif /* CONFIG_NET_IPV4 */ -bool net_ipaddr_parse(const char *str, size_t str_len, struct sockaddr *addr) +bool net_ipaddr_parse(const char *str, size_t str_len, struct net_sockaddr *addr) { int i, count; @@ -982,7 +982,7 @@ bool net_ipaddr_parse(const char *str, size_t str_len, struct sockaddr *addr) } const char *net_ipaddr_parse_mask(const char *str, size_t str_len, - struct sockaddr *addr, uint8_t *mask_len) + struct net_sockaddr *addr, uint8_t *mask_len) { const char *next = NULL, *mask_ptr = NULL; int parsed_mask_len = -1; @@ -1039,9 +1039,9 @@ const char *net_ipaddr_parse_mask(const char *str, size_t str_len, } if (parsed_mask_len < 0) { - if (addr->sa_family == AF_INET) { + if (addr->sa_family == NET_AF_INET) { *mask_len = 32; - } else if (addr->sa_family == AF_INET6) { + } else if (addr->sa_family == NET_AF_INET6) { *mask_len = 128; } } @@ -1053,34 +1053,34 @@ const char *net_ipaddr_parse_mask(const char *str, size_t str_len, return ""; } -int net_mask_len_to_netmask(sa_family_t family, uint8_t mask_len, struct sockaddr *mask) +int net_mask_len_to_netmask(net_sa_family_t family, uint8_t mask_len, struct net_sockaddr *mask) { - if (family == AF_INET) { - struct in_addr *addr4 = &net_sin(mask)->sin_addr; - struct sockaddr_in *mask4 = (struct sockaddr_in *)mask; + if (family == NET_AF_INET) { + struct net_in_addr *addr4 = &net_sin(mask)->sin_addr; + struct net_sockaddr_in *mask4 = (struct net_sockaddr_in *)mask; if (mask_len > 32) { return -ERANGE; } - memset(mask4, 0, sizeof(struct sockaddr_in)); + memset(mask4, 0, sizeof(struct net_sockaddr_in)); - mask4->sin_family = AF_INET; + mask4->sin_family = NET_AF_INET; mask4->sin_port = 0; - addr4->s_addr = htonl(UINT32_MAX << (32 - mask_len)); + addr4->s_addr = net_htonl(UINT32_MAX << (32 - mask_len)); - } else if (family == AF_INET6) { - struct in6_addr *addr6 = &net_sin6(mask)->sin6_addr; - struct sockaddr_in6 *mask6 = (struct sockaddr_in6 *)mask; + } else if (family == NET_AF_INET6) { + struct net_in6_addr *addr6 = &net_sin6(mask)->sin6_addr; + struct net_sockaddr_in6 *mask6 = (struct net_sockaddr_in6 *)mask; uint32_t mask_val[4] = { 0 }; if (mask_len > 128) { return -ERANGE; } - memset(mask6, 0, sizeof(struct sockaddr_in6)); + memset(mask6, 0, sizeof(struct net_sockaddr_in6)); - mask6->sin6_family = AF_INET6; + mask6->sin6_family = NET_AF_INET6; mask6->sin6_port = 0; for (int i = 0; i < 4; i++) { @@ -1089,7 +1089,7 @@ int net_mask_len_to_netmask(sa_family_t family, uint8_t mask_len, struct sockadd if (bits >= 32) { mask_val[i] = UINT32_MAX; } else if (bits > 0) { - mask_val[i] = htonl(UINT32_MAX << (32 - bits)); + mask_val[i] = net_htonl(UINT32_MAX << (32 - bits)); } } @@ -1101,7 +1101,7 @@ int net_mask_len_to_netmask(sa_family_t family, uint8_t mask_len, struct sockadd return 0; } -int net_netmask_to_mask_len(sa_family_t family, struct sockaddr *mask, uint8_t *mask_len) +int net_netmask_to_mask_len(net_sa_family_t family, struct net_sockaddr *mask, uint8_t *mask_len) { int zerobits = 0; int maxlen; @@ -1111,12 +1111,12 @@ int net_netmask_to_mask_len(sa_family_t family, struct sockaddr *mask, uint8_t * return -EINVAL; } - if (family != AF_INET && family != AF_INET6) { + if (family != NET_AF_INET && family != NET_AF_INET6) { return -EINVAL; } - maxlen = family == AF_INET ? sizeof(struct in_addr) : - sizeof(struct in6_addr); + maxlen = family == NET_AF_INET ? sizeof(struct net_in_addr) : + sizeof(struct net_in6_addr); for (int i = maxlen - 1; i >= 0; i--) { n = net_sin6(mask)->sin6_addr.s6_addr[i]; @@ -1137,16 +1137,16 @@ int net_netmask_to_mask_len(sa_family_t family, struct sockaddr *mask, uint8_t * return 0; } -int net_port_set_default(struct sockaddr *addr, uint16_t default_port) +int net_port_set_default(struct net_sockaddr *addr, uint16_t default_port) { - if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET && + if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET && net_sin(addr)->sin_port == 0) { - net_sin(addr)->sin_port = htons(default_port); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6 && + net_sin(addr)->sin_port = net_htons(default_port); + } else if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6 && net_sin6(addr)->sin6_port == 0) { - net_sin6(addr)->sin6_port = htons(default_port); - } else if ((IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) || - (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6)) { + net_sin6(addr)->sin6_port = net_htons(default_port); + } else if ((IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) || + (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6)) { ; /* Port is already set */ } else { LOG_ERR("Unknown address family"); @@ -1179,43 +1179,43 @@ int net_bytes_from_str(uint8_t *buf, int buf_len, const char *src) return 0; } -const char *net_family2str(sa_family_t family) +const char *net_family2str(net_sa_family_t family) { switch (family) { - case AF_UNSPEC: + case NET_AF_UNSPEC: return "AF_UNSPEC"; - case AF_INET: + case NET_AF_INET: return "AF_INET"; - case AF_INET6: + case NET_AF_INET6: return "AF_INET6"; - case AF_PACKET: + case NET_AF_PACKET: return "AF_PACKET"; - case AF_CAN: + case NET_AF_CAN: return "AF_CAN"; } return NULL; } -const struct in_addr *net_ipv4_unspecified_address(void) +const struct net_in_addr *net_ipv4_unspecified_address(void) { - static const struct in_addr addr; + static const struct net_in_addr addr; return &addr; } -const struct in_addr *net_ipv4_broadcast_address(void) +const struct net_in_addr *net_ipv4_broadcast_address(void) { - static const struct in_addr addr = { { { 255, 255, 255, 255 } } }; + static const struct net_in_addr addr = { { { 255, 255, 255, 255 } } }; return &addr; } /* IPv6 wildcard and loopback address defined by RFC2553 */ -const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; -const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; +const struct net_in6_addr net_in6addr_any = NET_IN6ADDR_ANY_INIT; +const struct net_in6_addr net_in6addr_loopback = NET_IN6ADDR_LOOPBACK_INIT; -const struct in6_addr *net_ipv6_unspecified_address(void) +const struct net_in6_addr *net_ipv6_unspecified_address(void) { - return &in6addr_any; + return &net_in6addr_any; } diff --git a/subsys/net/l2/canbus/canbus_raw.c b/subsys/net/l2/canbus/canbus_raw.c index 8bdf1aa36506b..320a721907a68 100644 --- a/subsys/net/l2/canbus/canbus_raw.c +++ b/subsys/net/l2/canbus/canbus_raw.c @@ -23,7 +23,7 @@ static inline enum net_verdict canbus_recv(struct net_if *iface, net_pkt_lladdr_dst(pkt)->len = 0U; net_pkt_lladdr_dst(pkt)->type = NET_LINK_CANBUS_RAW; - net_pkt_set_family(pkt, AF_CAN); + net_pkt_set_family(pkt, NET_AF_CAN); return NET_CONTINUE; } diff --git a/subsys/net/l2/ethernet/arp.c b/subsys/net/l2/ethernet/arp.c index 09297323436a2..304994f2e7b5a 100644 --- a/subsys/net/l2/ethernet/arp.c +++ b/subsys/net/l2/ethernet/arp.c @@ -60,13 +60,13 @@ static void arp_entry_cleanup(struct arp_entry *entry, bool pending) entry->iface = NULL; - (void)memset(&entry->ip, 0, sizeof(struct in_addr)); + (void)memset(&entry->ip, 0, sizeof(struct net_in_addr)); (void)memset(&entry->eth, 0, sizeof(struct net_eth_addr)); } static struct arp_entry *arp_entry_find(sys_slist_t *list, struct net_if *iface, - struct in_addr *dst, + struct net_in_addr *dst, sys_snode_t **previous) { struct arp_entry *entry; @@ -93,7 +93,7 @@ static struct arp_entry *arp_entry_find(sys_slist_t *list, } static inline struct arp_entry *arp_entry_find_move_first(struct net_if *iface, - struct in_addr *dst) + struct net_in_addr *dst) { sys_snode_t *prev = NULL; struct arp_entry *entry; @@ -118,7 +118,7 @@ static inline struct arp_entry *arp_entry_find_move_first(struct net_if *iface, static inline struct arp_entry *arp_entry_find_pending(struct net_if *iface, - struct in_addr *dst) + struct net_in_addr *dst) { NET_DBG("dst %s", net_sprint_ipv4_addr(dst)); @@ -126,7 +126,7 @@ struct arp_entry *arp_entry_find_pending(struct net_if *iface, } static struct arp_entry *arp_entry_get_pending(struct net_if *iface, - struct in_addr *dst) + struct net_in_addr *dst) { sys_snode_t *prev = NULL; struct arp_entry *entry; @@ -228,7 +228,7 @@ static void arp_request_timeout(struct k_work *work) k_mutex_unlock(&arp_mutex); } -static inline struct in_addr *if_get_addr(struct net_if *iface, +static inline struct net_in_addr *if_get_addr(struct net_if *iface, const uint8_t *addr) { struct net_if_ipv4 *ipv4 = iface->config.ip.ipv4; @@ -239,7 +239,7 @@ static inline struct in_addr *if_get_addr(struct net_if *iface, ARRAY_FOR_EACH(ipv4->unicast, i) { if (ipv4->unicast[i].ipv4.is_used && - ipv4->unicast[i].ipv4.address.family == AF_INET && + ipv4->unicast[i].ipv4.address.family == NET_AF_INET && ipv4->unicast[i].ipv4.addr_state == NET_ADDR_PREFERRED && (!addr || net_ipv4_addr_cmp_raw( @@ -252,13 +252,13 @@ static inline struct in_addr *if_get_addr(struct net_if *iface, } static inline struct net_pkt *arp_prepare(struct net_if *iface, - struct in_addr *next_addr, + struct net_in_addr *next_addr, struct arp_entry *entry, struct net_pkt *pending, - struct in_addr *current_ip) + struct net_in_addr *current_ip) { struct net_arp_hdr *hdr; - struct in_addr *my_addr; + struct net_in_addr *my_addr; struct net_pkt *pkt; if (current_ip) { @@ -269,7 +269,7 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface, } else { pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, NET_BUF_TIMEOUT); + NET_AF_UNSPEC, 0, NET_BUF_TIMEOUT); if (!pkt) { return NULL; } @@ -285,7 +285,7 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface, } net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_ARP); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); net_buf_add(pkt->buffer, sizeof(struct net_arp_hdr)); @@ -321,11 +321,11 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface, (const uint8_t *)net_eth_broadcast_addr(), sizeof(struct net_eth_addr)); - hdr->hwtype = htons(NET_ARP_HTYPE_ETH); - hdr->protocol = htons(NET_ETH_PTYPE_IP); + hdr->hwtype = net_htons(NET_ARP_HTYPE_ETH); + hdr->protocol = net_htons(NET_ETH_PTYPE_IP); hdr->hwlen = sizeof(struct net_eth_addr); - hdr->protolen = sizeof(struct in_addr); - hdr->opcode = htons(NET_ARP_REQUEST); + hdr->protolen = sizeof(struct net_in_addr); + hdr->opcode = net_htons(NET_ARP_REQUEST); (void)memset(&hdr->dst_hwaddr.addr, 0x00, sizeof(struct net_eth_addr)); @@ -337,7 +337,7 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface, if (net_pkt_ipv4_acd(pkt)) { my_addr = current_ip; } else if (!entry) { - my_addr = (struct in_addr *)NET_IPV4_HDR(pending)->src; + my_addr = (struct net_in_addr *)NET_IPV4_HDR(pending)->src; } else { my_addr = if_get_addr(entry->iface, (const uint8_t *)current_ip); } @@ -345,7 +345,7 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface, if (my_addr) { net_ipv4_addr_copy_raw(hdr->src_ipaddr, (uint8_t *)my_addr); } else { - (void)memset(&hdr->src_ipaddr, 0, sizeof(struct in_addr)); + (void)memset(&hdr->src_ipaddr, 0, sizeof(struct net_in_addr)); } NET_DBG("Generating request for %s", net_sprint_ipv4_addr(next_addr)); @@ -353,13 +353,13 @@ static inline struct net_pkt *arp_prepare(struct net_if *iface, } int net_arp_prepare(struct net_pkt *pkt, - struct in_addr *request_ip, - struct in_addr *current_ip, + struct net_in_addr *request_ip, + struct net_in_addr *current_ip, struct net_pkt **arp_pkt) { bool is_ipv4_ll_used = false; struct arp_entry *entry; - struct in_addr *addr; + struct net_in_addr *addr; if (!pkt || !pkt->buffer) { return -EINVAL; @@ -478,7 +478,7 @@ int net_arp_prepare(struct net_pkt *pkt, } static void arp_gratuitous(struct net_if *iface, - struct in_addr *src, + struct net_in_addr *src, struct net_eth_addr *hwaddr) { sys_snode_t *prev = NULL; @@ -498,13 +498,13 @@ static void arp_gratuitous(struct net_if *iface, #if defined(CONFIG_NET_ARP_GRATUITOUS_TRANSMISSION) static void arp_gratuitous_send(struct net_if *iface, - struct in_addr *ipaddr) + struct net_in_addr *ipaddr) { struct net_arp_hdr *hdr; struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, NET_BUF_TIMEOUT); + NET_AF_UNSPEC, 0, NET_BUF_TIMEOUT); if (!pkt) { return; } @@ -515,11 +515,11 @@ static void arp_gratuitous_send(struct net_if *iface, hdr = NET_ARP_HDR(pkt); - hdr->hwtype = htons(NET_ARP_HTYPE_ETH); - hdr->protocol = htons(NET_ETH_PTYPE_IP); + hdr->hwtype = net_htons(NET_ARP_HTYPE_ETH); + hdr->protocol = net_htons(NET_ETH_PTYPE_IP); hdr->hwlen = sizeof(struct net_eth_addr); - hdr->protolen = sizeof(struct in_addr); - hdr->opcode = htons(NET_ARP_REQUEST); + hdr->protolen = sizeof(struct net_in_addr); + hdr->opcode = net_htons(NET_ARP_REQUEST); memcpy(&hdr->dst_hwaddr.addr, net_eth_broadcast_addr(), sizeof(struct net_eth_addr)); @@ -558,7 +558,7 @@ static void notify_all_ipv4_addr(struct net_if *iface) for (i = 0; i < NET_IF_MAX_IPV4_ADDR; i++) { if (ipv4->unicast[i].ipv4.is_used && - ipv4->unicast[i].ipv4.address.family == AF_INET && + ipv4->unicast[i].ipv4.address.family == NET_AF_INET && ipv4->unicast[i].ipv4.addr_state == NET_ADDR_PREFERRED) { arp_gratuitous_send(iface, &ipv4->unicast[i].ipv4.address.in_addr); @@ -586,7 +586,7 @@ static void iface_event_handler(struct net_mgmt_event_callback *cb, static void ipv4_event_handler(struct net_mgmt_event_callback *cb, uint64_t mgmt_event, struct net_if *iface) { - struct in_addr *ipaddr; + struct net_in_addr *ipaddr; if (!(net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET) || net_eth_is_vlan_interface(iface))) { @@ -601,11 +601,11 @@ static void ipv4_event_handler(struct net_mgmt_event_callback *cb, return; } - if (cb->info_length != sizeof(struct in_addr)) { + if (cb->info_length != sizeof(struct net_in_addr)) { return; } - ipaddr = (struct in_addr *)cb->info; + ipaddr = (struct net_in_addr *)cb->info; arp_gratuitous_send(iface, ipaddr); } @@ -638,7 +638,7 @@ static void arp_gratuitous_work_handler(struct k_work *work) #endif /* defined(CONFIG_NET_ARP_GRATUITOUS_TRANSMISSION) */ void net_arp_update(struct net_if *iface, - struct in_addr *src, + struct net_in_addr *src, struct net_eth_addr *hwaddr, bool gratuitous, bool force) @@ -735,7 +735,7 @@ static inline struct net_pkt *arp_prepare_reply(struct net_if *iface, struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, NET_BUF_TIMEOUT); + NET_AF_UNSPEC, 0, NET_BUF_TIMEOUT); if (!pkt) { return NULL; } @@ -749,11 +749,11 @@ static inline struct net_pkt *arp_prepare_reply(struct net_if *iface, net_pkt_set_vlan_tag(pkt, net_pkt_vlan_tag(req)); } - hdr->hwtype = htons(NET_ARP_HTYPE_ETH); - hdr->protocol = htons(NET_ETH_PTYPE_IP); + hdr->hwtype = net_htons(NET_ARP_HTYPE_ETH); + hdr->protocol = net_htons(NET_ETH_PTYPE_IP); hdr->hwlen = sizeof(struct net_eth_addr); - hdr->protolen = sizeof(struct in_addr); - hdr->opcode = htons(NET_ARP_REPLY); + hdr->protolen = sizeof(struct net_in_addr); + hdr->opcode = net_htons(NET_ARP_REPLY); memcpy(&hdr->dst_hwaddr.addr, &dst_addr->addr, sizeof(struct net_eth_addr)); @@ -772,15 +772,15 @@ static inline struct net_pkt *arp_prepare_reply(struct net_if *iface, sizeof(struct net_eth_addr)); net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_ARP); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); return pkt; } static bool arp_hdr_check(struct net_arp_hdr *arp_hdr) { - if (ntohs(arp_hdr->hwtype) != NET_ARP_HTYPE_ETH || - ntohs(arp_hdr->protocol) != NET_ETH_PTYPE_IP || + if (net_ntohs(arp_hdr->hwtype) != NET_ARP_HTYPE_ETH || + net_ntohs(arp_hdr->protocol) != NET_ETH_PTYPE_IP || arp_hdr->hwlen != sizeof(struct net_eth_addr) || arp_hdr->protolen != NET_ARP_IPV4_PTYPE_SIZE || net_ipv4_is_addr_loopback_raw(arp_hdr->src_ipaddr)) { @@ -797,9 +797,9 @@ enum net_verdict net_arp_input(struct net_pkt *pkt, { struct net_eth_addr *dst_hw_addr; struct net_arp_hdr *arp_hdr; - struct in_addr src_ipaddr; + struct net_in_addr src_ipaddr; struct net_pkt *reply; - struct in_addr *addr; + struct net_in_addr *addr; if (net_pkt_get_len(pkt) < sizeof(struct net_arp_hdr)) { NET_DBG("DROP: Too short ARP msg (%zu bytes, min %zu bytes)", @@ -812,7 +812,7 @@ enum net_verdict net_arp_input(struct net_pkt *pkt, return NET_DROP; } - switch (ntohs(arp_hdr->opcode)) { + switch (net_ntohs(arp_hdr->opcode)) { case NET_ARP_REQUEST: /* If ARP request sender hw address is our address, * we must drop the packet. @@ -962,7 +962,7 @@ void net_arp_clear_cache(struct net_if *iface) k_mutex_unlock(&arp_mutex); } -int net_arp_clear_pending(struct net_if *iface, struct in_addr *dst) +int net_arp_clear_pending(struct net_if *iface, struct net_in_addr *dst) { struct arp_entry *entry = arp_entry_find_pending(iface, dst); @@ -1039,7 +1039,7 @@ static enum net_verdict arp_recv(struct net_if *iface, ARG_UNUSED(iface); ARG_UNUSED(ptype); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); NET_DBG("ARP packet from %s received", net_sprint_ll_addr(net_pkt_lladdr_src(pkt)->addr, diff --git a/subsys/net/l2/ethernet/arp.h b/subsys/net/l2/ethernet/arp.h index 03ef9bbe4f87d..ef6bbfee39e87 100644 --- a/subsys/net/l2/ethernet/arp.h +++ b/subsys/net/l2/ethernet/arp.h @@ -64,21 +64,21 @@ struct net_arp_hdr { * @retval <0 on failure */ int net_arp_prepare(struct net_pkt *pkt, - struct in_addr *request_ip, - struct in_addr *current_ip, + struct net_in_addr *request_ip, + struct net_in_addr *current_ip, struct net_pkt **arp_pkt); enum net_verdict net_arp_input(struct net_pkt *pkt, struct net_eth_addr *src, struct net_eth_addr *dst); int net_arp_clear_pending(struct net_if *iface, - struct in_addr *dst); + struct net_in_addr *dst); struct arp_entry { sys_snode_t node; uint32_t req_start; struct net_if *iface; - struct in_addr ip; + struct net_in_addr ip; struct net_eth_addr eth; struct k_fifo pending_queue; }; @@ -89,7 +89,7 @@ int net_arp_foreach(net_arp_cb_t cb, void *user_data); void net_arp_clear_cache(struct net_if *iface); void net_arp_init(void); -void net_arp_update(struct net_if *iface, struct in_addr *src, +void net_arp_update(struct net_if *iface, struct net_in_addr *src, struct net_eth_addr *hwaddr, bool gratuitous, bool force); diff --git a/subsys/net/l2/ethernet/bridge.c b/subsys/net/l2/ethernet/bridge.c index d8027200d3094..e8385279cd7d4 100644 --- a/subsys/net/l2/ethernet/bridge.c +++ b/subsys/net/l2/ethernet/bridge.c @@ -402,7 +402,7 @@ static enum net_verdict bridge_iface_process(struct net_if *iface, } } - net_pkt_set_family(send_pkt, AF_UNSPEC); + net_pkt_set_family(send_pkt, NET_AF_UNSPEC); net_pkt_set_iface(send_pkt, ctx->eth_iface[i]); net_if_queue_tx(ctx->eth_iface[i], send_pkt); diff --git a/subsys/net/l2/ethernet/dsa/dsa_core.c b/subsys/net/l2/ethernet/dsa/dsa_core.c index fc796f14080fc..610f14e09dc63 100644 --- a/subsys/net/l2/ethernet/dsa/dsa_core.c +++ b/subsys/net/l2/ethernet/dsa/dsa_core.c @@ -35,7 +35,7 @@ int dsa_xmit(const struct device *dev, struct net_pkt *pkt) #ifdef CONFIG_NET_L2_PTP /* Handle TX timestamp if defines */ - if (ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP && + if (net_ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP && dsa_switch_ctx->dapi->port_txtstamp != NULL) { ret = dsa_switch_ctx->dapi->port_txtstamp(dev, pkt); if (ret != 0) { diff --git a/subsys/net/l2/ethernet/dsa/dsa_tag_netc.c b/subsys/net/l2/ethernet/dsa/dsa_tag_netc.c index ad301b2a410c5..1ddc31a595e89 100644 --- a/subsys/net/l2/ethernet/dsa/dsa_tag_netc.c +++ b/subsys/net/l2/ethernet/dsa/dsa_tag_netc.c @@ -53,7 +53,7 @@ struct net_if *dsa_tag_netc_recv(struct net_if *iface, struct net_pkt *pkt) case kNETC_TagToHostRxTs: #ifdef CONFIG_NET_L2_PTP tag_rx_ts = (netc_swt_tag_host_rx_ts_t *)tag_common; - ts = ntohll(tag_rx_ts->timestamp); + ts = net_ntohll(tag_rx_ts->timestamp); /* Fill timestamp */ pkt->timestamp.nanosecond = ts % NSEC_PER_SEC; @@ -65,7 +65,7 @@ struct net_if *dsa_tag_netc_recv(struct net_if *iface, struct net_pkt *pkt) case kNETC_TagToHostTxTs: #ifdef CONFIG_NET_L2_PTP tag_tx_ts = (netc_swt_tag_host_tx_ts_t *)tag_common; - ts = ntohll(tag_tx_ts->timestamp); + ts = net_ntohll(tag_tx_ts->timestamp); if (tagger_data->twostep_timestamp_handler != NULL) { tagger_data->twostep_timestamp_handler(dsa_switch_ctx, @@ -105,7 +105,7 @@ struct net_pkt *dsa_tag_netc_xmit(struct net_if *iface, struct net_pkt *pkt) void *tag; /* Tag is inserted after DMAC/SMAC fields. Decide header size per tag type. */ - if (ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP) { + if (net_ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP) { header_len += sizeof(netc_swt_tag_port_two_step_ts_t); } else { header_len += sizeof(netc_swt_tag_port_no_ts_t); @@ -127,7 +127,7 @@ struct net_pkt *dsa_tag_netc_xmit(struct net_if *iface, struct net_pkt *pkt) #ifdef CONFIG_NET_L2_PTP /* Enable two-step timestamping for gPTP. */ - if (ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP) { + if (net_ntohs(NET_ETH_HDR(pkt)->type) == NET_ETH_PTYPE_PTP) { /* Utilize control block for timestamp request ID */ ((netc_swt_tag_port_two_step_ts_t *)tag)->tsReqId = pkt->cb.cb[0] & 0xf; diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c index d2c3157866e29..0e571bc3d6184 100644 --- a/subsys/net/l2/ethernet/ethernet.c +++ b/subsys/net/l2/ethernet/ethernet.c @@ -49,7 +49,7 @@ const struct net_eth_addr *net_eth_broadcast_addr(void) return &broadcast_eth_addr; } -void net_eth_ipv4_mcast_to_mac_addr(const struct in_addr *ipv4_addr, +void net_eth_ipv4_mcast_to_mac_addr(const struct net_in_addr *ipv4_addr, struct net_eth_addr *mac_addr) { /* RFC 1112 6.4. Extensions to an Ethernet Local Network Module @@ -68,7 +68,7 @@ void net_eth_ipv4_mcast_to_mac_addr(const struct in_addr *ipv4_addr, mac_addr->addr[3] &= 0x7f; } -void net_eth_ipv6_mcast_to_mac_addr(const struct in6_addr *ipv6_addr, +void net_eth_ipv6_mcast_to_mac_addr(const struct net_in6_addr *ipv6_addr, struct net_eth_addr *mac_addr) { /* RFC 2464 7. Address Mapping -- Multicast @@ -140,10 +140,10 @@ static inline void ethernet_update_length(struct net_if *iface, * frame size of 60 bytes. In that case, we need to get rid of it. */ - if (net_pkt_family(pkt) == AF_INET) { - len = ntohs(NET_IPV4_HDR(pkt)->len); - } else if (net_pkt_family(pkt) == AF_INET6) { - len = ntohs(NET_IPV6_HDR(pkt)->len) + NET_IPV6H_LEN; + if (net_pkt_family(pkt) == NET_AF_INET) { + len = net_ntohs(NET_IPV4_HDR(pkt)->len); + } else if (net_pkt_family(pkt) == NET_AF_INET6) { + len = net_ntohs(NET_IPV6_HDR(pkt)->len) + NET_IPV6H_LEN; } else { return; } @@ -236,12 +236,12 @@ static void ethernet_mcast_monitor_cb(struct net_if *iface, const struct net_add switch (addr->family) { #if defined(CONFIG_NET_IPV4) - case AF_INET: + case NET_AF_INET: net_eth_ipv4_mcast_to_mac_addr(&addr->in_addr, &cfg.filter.mac_address); break; #endif /* CONFIG_NET_IPV4 */ #if defined(CONFIG_NET_IPV6) - case AF_INET6: + case NET_AF_INET6: net_eth_ipv6_mcast_to_mac_addr(&addr->in6_addr, &cfg.filter.mac_address); break; #endif /* CONFIG_NET_IPV6 */ @@ -297,7 +297,7 @@ static enum net_verdict ethernet_recv(struct net_if *iface, (void)net_if_queue_tx(bridge, out_pkt); } - type = ntohs(hdr->type); + type = net_ntohs(hdr->type); if (IS_ENABLED(CONFIG_NET_VLAN) && type == NET_ETH_PTYPE_VLAN) { if (net_eth_is_vlan_enabled(ctx, iface) && @@ -306,8 +306,8 @@ static enum net_verdict ethernet_recv(struct net_if *iface, (struct net_eth_vlan_hdr *)NET_ETH_HDR(pkt); struct net_if *vlan_iface; - net_pkt_set_vlan_tci(pkt, ntohs(hdr_vlan->vlan.tci)); - type = ntohs(hdr_vlan->type); + net_pkt_set_vlan_tci(pkt, net_ntohs(hdr_vlan->vlan.tci)); + type = net_ntohs(hdr_vlan->type); hdr_len = sizeof(struct net_eth_vlan_hdr); is_vlan_pkt = true; @@ -411,7 +411,7 @@ static enum net_verdict ethernet_recv(struct net_if *iface, if (!handled) { if (IS_ENABLED(CONFIG_NET_ETHERNET_FORWARD_UNRECOGNISED_ETHERTYPE)) { - net_pkt_set_family(pkt, AF_UNSPEC); + net_pkt_set_family(pkt, NET_AF_UNSPEC); } else { NET_DBG("Unknown hdr type 0x%04x iface %d (%p)", type, net_if_get_by_iface(iface), iface); @@ -446,9 +446,9 @@ static enum net_verdict ethernet_ip_recv(struct net_if *iface, return NET_DROP; } - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); } else if (ptype == NET_ETH_PTYPE_IPV6) { - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); } else { return NET_DROP; } @@ -480,11 +480,11 @@ static inline bool ethernet_ipv4_dst_is_broadcast_or_mcast(struct net_pkt *pkt) static bool ethernet_fill_in_dst_on_ipv4_mcast(struct net_pkt *pkt, struct net_eth_addr *dst) { - if (net_pkt_family(pkt) == AF_INET && + if (net_pkt_family(pkt) == NET_AF_INET && net_ipv4_is_addr_mcast_raw(NET_IPV4_HDR(pkt)->dst)) { /* Multicast address */ net_eth_ipv4_mcast_to_mac_addr( - (struct in_addr *)NET_IPV4_HDR(pkt)->dst, dst); + (struct net_in_addr *)NET_IPV4_HDR(pkt)->dst, dst); return true; } @@ -511,7 +511,8 @@ static int ethernet_ll_prepare_on_ipv4(struct net_if *iface, } if (IS_ENABLED(CONFIG_NET_ARP)) { - return net_arp_prepare(pkt, (struct in_addr *)NET_IPV4_HDR(pkt)->dst, NULL, out); + return net_arp_prepare(pkt, + (struct net_in_addr *)NET_IPV4_HDR(pkt)->dst, NULL, out); } return NET_ARP_COMPLETE; @@ -526,7 +527,7 @@ static int ethernet_ll_prepare_on_ipv4(struct net_if *iface, static bool ethernet_fill_in_dst_on_ipv6_mcast(struct net_pkt *pkt, struct net_eth_addr *dst) { - if (net_pkt_family(pkt) == AF_INET6 && + if (net_pkt_family(pkt) == NET_AF_INET6 && net_ipv6_is_addr_mcast_raw(NET_IPV6_HDR(pkt)->dst)) { memcpy(dst, (uint8_t *)multicast_eth_addr.addr, sizeof(struct net_eth_addr) - 4); @@ -618,7 +619,7 @@ static struct net_buf *ethernet_fill_header(struct ethernet_context *ctx, hdr_vlan = (struct net_eth_vlan_hdr *)(hdr_frag->data); - if (ptype == htons(NET_ETH_PTYPE_ARP) || + if (ptype == net_htons(NET_ETH_PTYPE_ARP) || (!ethernet_fill_in_dst_on_ipv4_mcast(pkt, &hdr_vlan->dst) && !ethernet_fill_in_dst_on_ipv6_mcast(pkt, &hdr_vlan->dst))) { memcpy(&hdr_vlan->dst, net_pkt_lladdr_dst(pkt)->addr, @@ -629,10 +630,10 @@ static struct net_buf *ethernet_fill_header(struct ethernet_context *ctx, sizeof(struct net_eth_addr)); hdr_vlan->type = ptype; - hdr_vlan->vlan.tpid = htons(NET_ETH_PTYPE_VLAN); - hdr_vlan->vlan.tci = htons(net_pkt_vlan_tci(pkt)); + hdr_vlan->vlan.tpid = net_htons(NET_ETH_PTYPE_VLAN); + hdr_vlan->vlan.tci = net_htons(net_pkt_vlan_tci(pkt)); - print_vlan_ll_addrs(pkt, ntohs(hdr_vlan->type), + print_vlan_ll_addrs(pkt, net_ntohs(hdr_vlan->type), net_pkt_vlan_tci(pkt), hdr_len, &hdr_vlan->src, &hdr_vlan->dst, false); @@ -644,7 +645,7 @@ static struct net_buf *ethernet_fill_header(struct ethernet_context *ctx, net_buf_add(hdr_frag, hdr_len); } - if (ptype == htons(NET_ETH_PTYPE_ARP) || + if (ptype == net_htons(NET_ETH_PTYPE_ARP) || (!ethernet_fill_in_dst_on_ipv4_mcast(pkt, &hdr->dst) && !ethernet_fill_in_dst_on_ipv6_mcast(pkt, &hdr->dst))) { memcpy(&hdr->dst, net_pkt_lladdr_dst(pkt)->addr, @@ -656,7 +657,7 @@ static struct net_buf *ethernet_fill_header(struct ethernet_context *ctx, hdr->type = ptype; - print_ll_addrs(pkt, ntohs(hdr->type), + print_ll_addrs(pkt, net_ntohs(hdr->type), hdr_len, &hdr->src, &hdr->dst); } @@ -689,7 +690,7 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt) { const struct ethernet_api *api = net_if_get_device(iface)->api; struct ethernet_context *ctx = net_if_l2_data(iface); - uint16_t ptype = htons(net_pkt_ll_proto_type(pkt)); + uint16_t ptype = net_htons(net_pkt_ll_proto_type(pkt)); struct net_pkt *orig_pkt = pkt; int ret; @@ -711,7 +712,7 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt) goto send; } - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET && + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET && net_pkt_ll_proto_type(pkt) == NET_ETH_PTYPE_IP) { if (!net_pkt_ipv4_acd(pkt)) { struct net_pkt *arp; @@ -729,7 +730,7 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt) arp, pkt, net_if_get_by_iface(iface), iface); net_pkt_unref(pkt); pkt = arp; - ptype = htons(net_pkt_ll_proto_type(pkt)); + ptype = net_htons(net_pkt_ll_proto_type(pkt)); } else if (ret == NET_ARP_PKT_QUEUED) { /* Original pkt got queued, pending resolution * of an ongoing ARP request. @@ -744,10 +745,10 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt) } } } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - net_pkt_family(pkt) == AF_PACKET) { + net_pkt_family(pkt) == NET_AF_PACKET) { struct net_context *context = net_pkt_context(pkt); - if (!(context && net_context_get_type(context) == SOCK_DGRAM)) { + if (!(context && net_context_get_type(context) == NET_SOCK_DGRAM)) { /* Raw packet, just send it */ goto send; } @@ -797,14 +798,14 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt) return ret; arp_error: - if (IS_ENABLED(CONFIG_NET_ARP) && ptype == htons(NET_ETH_PTYPE_ARP)) { + if (IS_ENABLED(CONFIG_NET_ARP) && ptype == net_htons(NET_ETH_PTYPE_ARP)) { /* Original packet was added to ARP's pending Q, so, to avoid it * being freed, take a reference, the reference is dropped when we * clear the pending Q in ARP and then it will be freed by net_if. */ net_pkt_ref(orig_pkt); if (net_arp_clear_pending( - iface, (struct in_addr *)NET_IPV4_HDR(pkt)->dst)) { + iface, (struct net_in_addr *)NET_IPV4_HDR(pkt)->dst)) { NET_DBG("Could not find pending ARP entry"); } /* Free the ARP request */ diff --git a/subsys/net/l2/ethernet/ethernet_mgmt.c b/subsys/net/l2/ethernet/ethernet_mgmt.c index 88272612cdedc..bfffeeab9df05 100644 --- a/subsys/net/l2/ethernet/ethernet_mgmt.c +++ b/subsys/net/l2/ethernet/ethernet_mgmt.c @@ -58,7 +58,7 @@ static int ethernet_set_config(uint64_t mgmt_request, */ if (IS_ENABLED(CONFIG_NET_NATIVE_IPV6) && IS_ENABLED(CONFIG_NET_IPV6_IID_EUI_64)) { - struct in6_addr iid; + struct net_in6_addr iid; net_ipv6_addr_create_iid(&iid, net_if_get_link_addr(iface)); diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c index 71f75825c1626..4443b1920676f 100644 --- a/subsys/net/l2/ethernet/gptp/gptp.c +++ b/subsys/net/l2/ethernet/gptp/gptp.c @@ -85,7 +85,7 @@ static void gptp_compute_clock_identity(int port) #define PRINT_INFO(msg, hdr, pkt) \ NET_DBG("Received %s seq %d pkt %p", (const char *)msg, \ - ntohs(hdr->sequence_id), pkt) \ + net_ntohs(hdr->sequence_id), pkt) \ static bool gptp_handle_critical_msg(struct net_if *iface, struct net_pkt *pkt) @@ -237,7 +237,7 @@ static void gptp_handle_msg(struct net_pkt *pkt) /* Keep the pkt alive until info is extracted. */ sync_rcv_state->rcvd_follow_up_ptr = net_pkt_ref(pkt); NET_DBG("Keeping %s seq %d pkt %p", "FOLLOWUP", - ntohs(hdr->sequence_id), pkt); + net_ntohs(hdr->sequence_id), pkt); break; case GPTP_PATH_DELAY_FOLLOWUP_MESSAGE: diff --git a/subsys/net/l2/ethernet/gptp/gptp_md.c b/subsys/net/l2/ethernet/gptp/gptp_md.c index 1c4cf53f899be..085ab4fd4ff5b 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_md.c +++ b/subsys/net/l2/ethernet/gptp/gptp_md.c @@ -23,7 +23,7 @@ static void gptp_md_sync_prepare(struct net_pkt *pkt, memcpy(&hdr->port_id.clk_id, &sync_send->src_port_id.clk_id, GPTP_CLOCK_ID_LEN); - hdr->port_id.port_number = htons(port_number); + hdr->port_id.port_number = net_htons(port_number); hdr->log_msg_interval = sync_send->log_msg_interval; } @@ -44,7 +44,7 @@ static void gptp_md_follow_up_prepare(struct net_pkt *pkt, memcpy(&hdr->port_id.clk_id, &sync_send->src_port_id.clk_id, GPTP_CLOCK_ID_LEN); - hdr->port_id.port_number = htons(port_number); + hdr->port_id.port_number = net_htons(port_number); hdr->log_msg_interval = sync_send->log_msg_interval; @@ -57,9 +57,9 @@ static void gptp_md_follow_up_prepare(struct net_pkt *pkt, * Get preciseOriginTimestamp from previous sync message * according to IEEE802.1AS 11.4.4.2.1 syncEventEgressTimestamp */ - fup->prec_orig_ts_secs_high = htons(sync_ts->_sec.high); - fup->prec_orig_ts_secs_low = htonl(sync_ts->_sec.low); - fup->prec_orig_ts_nsecs = htonl(sync_ts->nanosecond); + fup->prec_orig_ts_secs_high = net_htons(sync_ts->_sec.high); + fup->prec_orig_ts_secs_low = net_htonl(sync_ts->_sec.low); + fup->prec_orig_ts_nsecs = net_htonl(sync_ts->nanosecond); /* * Grand master clock should keep correction_field at zero, * according to IEEE802.1AS Table 11-6 and 10.6.2.2.9 @@ -70,9 +70,9 @@ static void gptp_md_follow_up_prepare(struct net_pkt *pkt, * Time aware system acting as a bridge. */ fup->prec_orig_ts_secs_high = - htons(sync_send->precise_orig_ts._sec.high); - fup->prec_orig_ts_secs_low = htonl(sync_send->precise_orig_ts._sec.low); - fup->prec_orig_ts_nsecs = htonl(sync_send->precise_orig_ts.nanosecond); + net_htons(sync_send->precise_orig_ts._sec.high); + fup->prec_orig_ts_secs_low = net_htonl(sync_send->precise_orig_ts._sec.low); + fup->prec_orig_ts_nsecs = net_htonl(sync_send->precise_orig_ts.nanosecond); /* * According to IEEE802.AS 11.1.3 and 11.2.14.2.3, when time aware * system is operating as a transparent clock also called a bridge, it @@ -88,10 +88,10 @@ static void gptp_md_follow_up_prepare(struct net_pkt *pkt, hdr->correction_field = sync_send->follow_up_correction_field + (int64_t)(sync_send->rate_ratio * delay_ns); - hdr->correction_field = htonll(hdr->correction_field << 16); + hdr->correction_field = net_htonll(hdr->correction_field << 16); } - fup->tlv_hdr.type = htons(GPTP_TLV_ORGANIZATION_EXT); - fup->tlv_hdr.len = htons(sizeof(struct gptp_follow_up_tlv)); + fup->tlv_hdr.type = net_htons(GPTP_TLV_ORGANIZATION_EXT); + fup->tlv_hdr.len = net_htons(sizeof(struct gptp_follow_up_tlv)); fup->tlv.org_id[0] = GPTP_FUP_TLV_ORG_ID_BYTE_0; fup->tlv.org_id[1] = GPTP_FUP_TLV_ORG_ID_BYTE_1; fup->tlv.org_id[2] = GPTP_FUP_TLV_ORG_ID_BYTE_2; @@ -102,16 +102,16 @@ static void gptp_md_follow_up_prepare(struct net_pkt *pkt, fup->tlv.cumulative_scaled_rate_offset = (sync_send->rate_ratio - 1.0) * GPTP_POW2_41; fup->tlv.cumulative_scaled_rate_offset = - ntohl(fup->tlv.cumulative_scaled_rate_offset); + net_ntohl(fup->tlv.cumulative_scaled_rate_offset); fup->tlv.gm_time_base_indicator = - ntohs(sync_send->gm_time_base_indicator); + net_ntohs(sync_send->gm_time_base_indicator); fup->tlv.last_gm_phase_change.high = - ntohl(sync_send->last_gm_phase_change.high); + net_ntohl(sync_send->last_gm_phase_change.high); fup->tlv.last_gm_phase_change.low = - ntohll(sync_send->last_gm_phase_change.low); + net_ntohll(sync_send->last_gm_phase_change.low); fup->tlv.scaled_last_gm_freq_change = sync_send->last_gm_freq_change; fup->tlv.scaled_last_gm_freq_change = - ntohl(fup->tlv.scaled_last_gm_freq_change); + net_ntohl(fup->tlv.scaled_last_gm_freq_change); } static int gptp_set_md_sync_receive(int port, @@ -138,14 +138,14 @@ static int gptp_set_md_sync_receive(int port, sync_ts = &state->rcvd_sync_ptr->timestamp; sync_rcv->follow_up_correction_field = - (ntohll(fup_hdr->correction_field) >> 16); + (net_ntohll(fup_hdr->correction_field) >> 16); memcpy(&sync_rcv->src_port_id, &sync_hdr->port_id, sizeof(struct gptp_port_identity)); sync_rcv->log_msg_interval = fup_hdr->log_msg_interval; sync_rcv->precise_orig_ts._sec.high = - ntohs(fup->prec_orig_ts_secs_high); - sync_rcv->precise_orig_ts._sec.low = ntohl(fup->prec_orig_ts_secs_low); - sync_rcv->precise_orig_ts.nanosecond = ntohl(fup->prec_orig_ts_nsecs); + net_ntohs(fup->prec_orig_ts_secs_high); + sync_rcv->precise_orig_ts._sec.low = net_ntohl(fup->prec_orig_ts_secs_low); + sync_rcv->precise_orig_ts.nanosecond = net_ntohl(fup->prec_orig_ts_nsecs); /* Compute time when sync was sent by the remote. */ sync_rcv->upstream_tx_time = sync_ts->second; @@ -162,18 +162,18 @@ static int gptp_set_md_sync_receive(int port, sync_rcv->upstream_tx_time -= delay_asymmetry_rated; - sync_rcv->rate_ratio = ntohl(fup->tlv.cumulative_scaled_rate_offset); + sync_rcv->rate_ratio = net_ntohl(fup->tlv.cumulative_scaled_rate_offset); sync_rcv->rate_ratio /= GPTP_POW2_41; sync_rcv->rate_ratio += 1; sync_rcv->gm_time_base_indicator = - ntohs(fup->tlv.gm_time_base_indicator); + net_ntohs(fup->tlv.gm_time_base_indicator); sync_rcv->last_gm_phase_change.high = - ntohl(fup->tlv.last_gm_phase_change.high); + net_ntohl(fup->tlv.last_gm_phase_change.high); sync_rcv->last_gm_phase_change.low = - ntohll(fup->tlv.last_gm_phase_change.low); + net_ntohll(fup->tlv.last_gm_phase_change.low); sync_rcv->last_gm_freq_change = - ntohl(fup->tlv.scaled_last_gm_freq_change); + net_ntohl(fup->tlv.scaled_last_gm_freq_change); return 0; } @@ -260,12 +260,12 @@ static void gptp_md_compute_pdelay_rate_ratio(int port) hdr = GPTP_HDR(pkt); fup = GPTP_PDELAY_RESP_FOLLOWUP(pkt); - resp_evt_tstamp = ntohs(fup->resp_orig_ts_secs_high); + resp_evt_tstamp = net_ntohs(fup->resp_orig_ts_secs_high); resp_evt_tstamp <<= 32; - resp_evt_tstamp |= ntohl(fup->resp_orig_ts_secs_low); + resp_evt_tstamp |= net_ntohl(fup->resp_orig_ts_secs_low); resp_evt_tstamp *= NSEC_PER_SEC; - resp_evt_tstamp += ntohl(fup->resp_orig_ts_nsecs); - resp_evt_tstamp += (ntohll(hdr->correction_field) >> 16); + resp_evt_tstamp += net_ntohl(fup->resp_orig_ts_nsecs); + resp_evt_tstamp += (net_ntohll(hdr->correction_field) >> 16); } if (state->init_pdelay_compute) { @@ -332,11 +332,11 @@ static void gptp_md_compute_prop_time(int port) hdr = GPTP_HDR(pkt); resp = GPTP_PDELAY_RESP(pkt); - t2_ns = ((uint64_t)ntohs(resp->req_receipt_ts_secs_high)) << 32; - t2_ns |= ntohl(resp->req_receipt_ts_secs_low); + t2_ns = ((uint64_t)net_ntohs(resp->req_receipt_ts_secs_high)) << 32; + t2_ns |= net_ntohl(resp->req_receipt_ts_secs_low); t2_ns *= NSEC_PER_SEC; - t2_ns += ntohl(resp->req_receipt_ts_nsecs); - t2_ns += (ntohll(hdr->correction_field) >> 16); + t2_ns += net_ntohl(resp->req_receipt_ts_nsecs); + t2_ns += (net_ntohll(hdr->correction_field) >> 16); } pkt = state->rcvd_pdelay_follow_up_ptr; @@ -344,11 +344,11 @@ static void gptp_md_compute_prop_time(int port) hdr = GPTP_HDR(pkt); fup = GPTP_PDELAY_RESP_FOLLOWUP(pkt); - t3_ns = ((uint64_t)ntohs(fup->resp_orig_ts_secs_high)) << 32; - t3_ns |= ntohl(fup->resp_orig_ts_secs_low); + t3_ns = ((uint64_t)net_ntohs(fup->resp_orig_ts_secs_high)) << 32; + t3_ns |= net_ntohl(fup->resp_orig_ts_secs_low); t3_ns *= NSEC_PER_SEC; - t3_ns += ntohl(fup->resp_orig_ts_nsecs); - t3_ns += (ntohll(hdr->correction_field) >> 16); + t3_ns += net_ntohl(fup->resp_orig_ts_nsecs); + t3_ns += (net_ntohll(hdr->correction_field) >> 16); } prop_time = t4_ns - t1_ns; diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.c b/subsys/net/l2/ethernet/gptp/gptp_messages.c index 30bd90bad86f2..05df99ec36c2a 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_messages.c +++ b/subsys/net/l2/ethernet/gptp/gptp_messages.c @@ -40,7 +40,7 @@ static uint8_t ieee8021_oui[3] = { OUI_IEEE_802_1_COMMITTEE }; \ NET_DBG("Sending %s seq %d pkt %p", \ msg, \ - ntohs(one_hdr->sequence_id), pkt); \ + net_ntohs(one_hdr->sequence_id), pkt); \ \ NET_DBG(" GM %d/%d/0x%x/%d/%s",\ ann->root_system_id.grand_master_prio1, \ @@ -51,7 +51,7 @@ static uint8_t ieee8021_oui[3] = { OUI_IEEE_802_1_COMMITTEE }; } else { \ NET_DBG("Sending %s seq %d pkt %p", \ msg, \ - ntohs(one_hdr->sequence_id), pkt); \ + net_ntohs(one_hdr->sequence_id), pkt); \ } \ } @@ -158,11 +158,11 @@ static struct net_pkt *setup_gptp_frame(struct net_if *iface, #if defined(CONFIG_NET_DEBUG_NET_PKT_ALLOC) pkt = net_pkt_alloc_with_buffer_debug(iface, sizeof(struct gptp_hdr) + - extra_header, AF_UNSPEC, 0, + extra_header, NET_AF_UNSPEC, 0, NET_BUF_TIMEOUT, caller, line); #else pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct gptp_hdr) + - extra_header, AF_UNSPEC, 0, + extra_header, NET_AF_UNSPEC, 0, NET_BUF_TIMEOUT); #endif if (!pkt) { @@ -215,12 +215,12 @@ struct net_pkt *gptp_prepare_sync(int port) hdr->transport_specific = GPTP_TRANSPORT_802_1_AS; hdr->message_type = GPTP_SYNC_MESSAGE; hdr->ptp_version = GPTP_VERSION; - hdr->sequence_id = htons(port_ds->sync_seq_id); + hdr->sequence_id = net_htons(port_ds->sync_seq_id); hdr->domain_number = 0U; hdr->correction_field = 0; hdr->flags.octets[0] = GPTP_FLAG_TWO_STEP; hdr->flags.octets[1] = GPTP_FLAG_PTP_TIMESCALE; - hdr->message_length = htons(sizeof(struct gptp_hdr) + + hdr->message_length = net_htons(sizeof(struct gptp_hdr) + sizeof(struct gptp_sync)); hdr->control = GPTP_SYNC_CONTROL_VALUE; @@ -274,7 +274,7 @@ struct net_pkt *gptp_prepare_follow_up(int port, struct net_pkt *sync) hdr->domain_number = 0U; hdr->flags.octets[0] = 0U; hdr->flags.octets[1] = GPTP_FLAG_PTP_TIMESCALE; - hdr->message_length = htons(sizeof(struct gptp_hdr) + + hdr->message_length = net_htons(sizeof(struct gptp_hdr) + sizeof(struct gptp_follow_up)); hdr->control = GPTP_FUP_CONTROL_VALUE; @@ -316,15 +316,15 @@ struct net_pkt *gptp_prepare_pdelay_req(int port) hdr->transport_specific = GPTP_TRANSPORT_802_1_AS; hdr->message_type = GPTP_PATH_DELAY_REQ_MESSAGE; hdr->ptp_version = GPTP_VERSION; - hdr->sequence_id = htons(port_ds->pdelay_req_seq_id); + hdr->sequence_id = net_htons(port_ds->pdelay_req_seq_id); hdr->domain_number = 0U; hdr->correction_field = 0; hdr->flags.octets[0] = 0U; hdr->flags.octets[1] = GPTP_FLAG_PTP_TIMESCALE; - hdr->message_length = htons(sizeof(struct gptp_hdr) + + hdr->message_length = net_htons(sizeof(struct gptp_hdr) + sizeof(struct gptp_pdelay_req)); - hdr->port_id.port_number = htons(port_ds->port_id.port_number); + hdr->port_id.port_number = net_htons(port_ds->port_id.port_number); hdr->control = GPTP_OTHER_CONTROL_VALUE; hdr->log_msg_interval = port_ds->cur_log_pdelay_req_itv; @@ -380,9 +380,9 @@ struct net_pkt *gptp_prepare_pdelay_resp(int port, hdr->flags.octets[0] = GPTP_FLAG_TWO_STEP; hdr->flags.octets[1] = GPTP_FLAG_PTP_TIMESCALE; - hdr->message_length = htons(sizeof(struct gptp_hdr) + + hdr->message_length = net_htons(sizeof(struct gptp_hdr) + sizeof(struct gptp_pdelay_resp)); - hdr->port_id.port_number = htons(port_ds->port_id.port_number); + hdr->port_id.port_number = net_htons(port_ds->port_id.port_number); hdr->control = GPTP_OTHER_CONTROL_VALUE; hdr->log_msg_interval = GPTP_RESP_LOG_MSG_ITV; @@ -439,9 +439,9 @@ struct net_pkt *gptp_prepare_pdelay_follow_up(int port, hdr->sequence_id = resp_hdr->sequence_id; hdr->domain_number = resp_hdr->domain_number; hdr->correction_field = 0; - hdr->message_length = htons(sizeof(struct gptp_hdr) + + hdr->message_length = net_htons(sizeof(struct gptp_hdr) + sizeof(struct gptp_pdelay_resp_follow_up)); - hdr->port_id.port_number = htons(port_ds->port_id.port_number); + hdr->port_id.port_number = net_htons(port_ds->port_id.port_number); hdr->control = GPTP_OTHER_CONTROL_VALUE; hdr->log_msg_interval = GPTP_RESP_LOG_MSG_ITV; @@ -486,7 +486,7 @@ struct net_pkt *gptp_prepare_announce(int port) NET_ASSERT(iface); pkt = setup_gptp_frame(iface, sizeof(struct gptp_announce) - 8 + - ntohs(global_ds->path_trace.len)); + net_ntohs(global_ds->path_trace.len)); if (!pkt) { NET_DBG("Cannot get gPTP frame"); return NULL; @@ -515,7 +515,7 @@ struct net_pkt *gptp_prepare_announce(int port) memcpy(hdr->port_id.clk_id, GPTP_DEFAULT_DS()->clk_id, GPTP_CLOCK_ID_LEN); - hdr->port_id.port_number = htons(port); + hdr->port_id.port_number = net_htons(port); hdr->control = GPTP_OTHER_CONTROL_VALUE; hdr->log_msg_interval = port_ds->cur_log_announce_itv; @@ -524,7 +524,7 @@ struct net_pkt *gptp_prepare_announce(int port) hdr->reserved1 = 0U; hdr->reserved2 = 0U; - ann->cur_utc_offset = htons(global_ds->current_utc_offset); + ann->cur_utc_offset = net_htons(global_ds->current_utc_offset); ann->time_source = global_ds->time_source; gm_prio = &global_ds->gm_priority; @@ -540,7 +540,7 @@ struct net_pkt *gptp_prepare_announce(int port) } ann->steps_removed = global_ds->master_steps_removed; - hdr->sequence_id = htons(port_ds->announce_seq_id); + hdr->sequence_id = net_htons(port_ds->announce_seq_id); port_ds->announce_seq_id++; ann->tlv.type = GPTP_ANNOUNCE_MSG_PATH_SEQ_TYPE; @@ -549,9 +549,9 @@ struct net_pkt *gptp_prepare_announce(int port) (void)memset(ann->reserved1, 0, sizeof(ann->reserved1)); ann->reserved2 = 0U; - hdr->message_length = htons(sizeof(struct gptp_hdr) + + hdr->message_length = net_htons(sizeof(struct gptp_hdr) + sizeof(struct gptp_announce) - 8 + - ntohs(global_ds->path_trace.len)); + net_ntohs(global_ds->path_trace.len)); ann->tlv.len = global_ds->path_trace.len; @@ -565,7 +565,7 @@ struct net_pkt *gptp_prepare_announce(int port) if (net_pkt_skip(pkt, sizeof(struct gptp_hdr) + sizeof(struct gptp_announce) - 8) || net_pkt_write(pkt, &global_ds->path_trace.path_sequence[0][0], - ntohs(global_ds->path_trace.len))) { + net_ntohs(global_ds->path_trace.len))) { goto fail; } @@ -610,9 +610,9 @@ int gptp_handle_follow_up(int port, struct net_pkt *pkt) if (sync_hdr->sequence_id != hdr->sequence_id) { NET_WARN("%s sequence id %d %s %s %d", - "FOLLOWUP", ntohs(hdr->sequence_id), + "FOLLOWUP", net_ntohs(hdr->sequence_id), "does not match", - "SYNC", ntohs(sync_hdr->sequence_id)); + "SYNC", net_ntohs(sync_hdr->sequence_id)); return -EINVAL; } @@ -689,7 +689,7 @@ int gptp_handle_pdelay_resp(int port, struct net_pkt *pkt) } /* Check port number. */ - if (resp->requesting_port_id.port_number != htons(port)) { + if (resp->requesting_port_id.port_number != net_htons(port)) { NET_WARN("Requesting Port Number %s", "does not match"); goto reset; } @@ -697,9 +697,9 @@ int gptp_handle_pdelay_resp(int port, struct net_pkt *pkt) /* Check sequence id. */ if (hdr->sequence_id != req_hdr->sequence_id) { NET_WARN("Sequence Id %d %s %d", - ntohs(hdr->sequence_id), + net_ntohs(hdr->sequence_id), "does not match", - ntohs(req_hdr->sequence_id)); + net_ntohs(req_hdr->sequence_id)); goto reset; } @@ -749,7 +749,7 @@ int gptp_handle_pdelay_follow_up(int port, struct net_pkt *pkt) } /* Check port number. */ - if (follow_up->requesting_port_id.port_number != htons(port)) { + if (follow_up->requesting_port_id.port_number != net_htons(port)) { NET_WARN("Requesting Port Number %s", "does not match"); goto reset; } @@ -757,9 +757,9 @@ int gptp_handle_pdelay_follow_up(int port, struct net_pkt *pkt) /* Check sequence id. */ if (hdr->sequence_id != req_hdr->sequence_id) { NET_WARN("Sequence Id %d %s %d", - ntohs(hdr->sequence_id), + net_ntohs(hdr->sequence_id), "does not match", - ntohs(req_hdr->sequence_id)); + net_ntohs(req_hdr->sequence_id)); goto reset; } @@ -793,7 +793,7 @@ void gptp_handle_signaling(int port, struct net_pkt *pkt) } /* Check if this is interval request. */ - if (ntohs(sig->tlv.type) != GPTP_TLV_ORGANIZATION_EXT || + if (net_ntohs(sig->tlv.type) != GPTP_TLV_ORGANIZATION_EXT || memcmp(sig->tlv.org_id, ieee8021_oui, sizeof(ieee8021_oui)) != 0 || sig->tlv.org_sub_type[0] != 0 || sig->tlv.org_sub_type[1] != 0 || sig->tlv.org_sub_type[2] != 2) { @@ -899,9 +899,9 @@ void gptp_send_pdelay_resp(int port, struct net_pkt *pkt, hdr->correction_field = 0; resp = GPTP_PDELAY_RESP(pkt); - resp->req_receipt_ts_secs_high = htons(treq->_sec.high); - resp->req_receipt_ts_secs_low = htonl(treq->_sec.low); - resp->req_receipt_ts_nsecs = htonl(treq->nanosecond); + resp->req_receipt_ts_secs_high = net_htons(treq->_sec.high); + resp->req_receipt_ts_secs_low = net_htonl(treq->_sec.low); + resp->req_receipt_ts_nsecs = net_htonl(treq->nanosecond); GPTP_STATS_INC(port, tx_pdelay_resp_count); @@ -922,9 +922,9 @@ void gptp_send_pdelay_follow_up(int port, struct net_pkt *pkt, hdr->correction_field = 0; follow_up = GPTP_PDELAY_RESP_FOLLOWUP(pkt); - follow_up->resp_orig_ts_secs_high = htons(tresp->_sec.high); - follow_up->resp_orig_ts_secs_low = htonl(tresp->_sec.low); - follow_up->resp_orig_ts_nsecs = htonl(tresp->nanosecond); + follow_up->resp_orig_ts_secs_high = net_htons(tresp->_sec.high); + follow_up->resp_orig_ts_secs_low = net_htonl(tresp->_sec.low); + follow_up->resp_orig_ts_nsecs = net_htonl(tresp->nanosecond); GPTP_STATS_INC(port, tx_pdelay_resp_fup_count); diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.h b/subsys/net/l2/ethernet/gptp/gptp_messages.h index b6bba88178941..edabb6d959eb4 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_messages.h +++ b/subsys/net/l2/ethernet/gptp/gptp_messages.h @@ -67,7 +67,7 @@ extern "C" { */ #define GPTP_ANNOUNCE_LEN(pkt) \ (sizeof(struct gptp_hdr) + sizeof(struct gptp_announce) \ - + ntohs(GPTP_ANNOUNCE(pkt)->tlv.len) \ + + net_ntohs(GPTP_ANNOUNCE(pkt)->tlv.len) \ - sizeof(struct gptp_path_trace_tlv) + 4) #define GPTP_CHECK_LEN(pkt, len) \ @@ -107,7 +107,7 @@ extern "C" { /* Other default values. */ #define GPTP_RESP_LOG_MSG_ITV 0x7F -#define GPTP_ANNOUNCE_MSG_PATH_SEQ_TYPE htons(0x8) +#define GPTP_ANNOUNCE_MSG_PATH_SEQ_TYPE net_htons(0x8) /* Organization Id used for TLV. */ #define GPTP_FUP_TLV_ORG_ID_BYTE_0 0x00 diff --git a/subsys/net/l2/ethernet/gptp/gptp_mi.c b/subsys/net/l2/ethernet/gptp/gptp_mi.c index d1e7ea8b64dfe..50e5bac1ca96c 100644 --- a/subsys/net/l2/ethernet/gptp/gptp_mi.c +++ b/subsys/net/l2/ethernet/gptp/gptp_mi.c @@ -1200,7 +1200,7 @@ static void gptp_mi_clk_master_sync_rcv_state_machine(void) static void copy_path_trace(struct gptp_announce *announce) { - int len = ntohs(announce->tlv.len); + int len = net_ntohs(announce->tlv.len); struct gptp_path_trace *sys_path_trace; if (len > GPTP_MAX_PATHTRACE_SIZE) { @@ -1211,7 +1211,7 @@ static void copy_path_trace(struct gptp_announce *announce) sys_path_trace = &GPTP_GLOBAL_DS()->path_trace; - sys_path_trace->len = htons(len + GPTP_CLOCK_ID_LEN); + sys_path_trace->len = net_htons(len + GPTP_CLOCK_ID_LEN); memcpy(sys_path_trace->path_sequence, announce->tlv.path_sequence, len); @@ -1236,7 +1236,7 @@ static bool gptp_mi_qualify_announce(int port, struct net_pkt *announce_msg) return false; } - len = ntohs(announce->steps_removed); + len = net_ntohs(announce->steps_removed); if (len >= 255U) { return false; } @@ -1331,7 +1331,7 @@ static enum gptp_received_info compare_priority_vectors( spi_cmp = memcmp(&hdr->port_id, &vector->src_port_id, sizeof(struct gptp_port_identity)); - port_cmp = (int)port - ntohs(vector->port_number); + port_cmp = (int)port - net_ntohs(vector->port_number); if (spi_cmp == 0) { if (rsi_cmp == 0) { @@ -1392,7 +1392,7 @@ static void record_other_announce_info(int port) */ bmca_data->ann_flags.octets[1] = hdr->flags.octets[1]; - bmca_data->ann_current_utc_offset = ntohs(announce->cur_utc_offset); + bmca_data->ann_current_utc_offset = net_ntohs(announce->cur_utc_offset); bmca_data->ann_time_source = announce->time_source; } @@ -1412,7 +1412,7 @@ static void copy_priority_vector(struct gptp_priority_vector *vector, sizeof(struct gptp_port_identity)); vector->steps_removed = announce->steps_removed; - vector->port_number = htons(port); + vector->port_number = net_htons(port); } static void gptp_mi_port_announce_information_state_machine(int port) @@ -1541,7 +1541,7 @@ static void gptp_mi_port_announce_information_state_machine(int port) bmca_data->rcvd_announce_ptr, port); announce = GPTP_ANNOUNCE(bmca_data->rcvd_announce_ptr); - bmca_data->port_steps_removed = ntohs(announce->steps_removed); + bmca_data->port_steps_removed = net_ntohs(announce->steps_removed); record_other_announce_info(port); hdr = GPTP_HDR(bmca_data->rcvd_announce_ptr); gptp_set_time_itv(&bmca_data->ann_rcpt_timeout_time_interval, @@ -1590,7 +1590,7 @@ static void gptp_updt_role_disabled_tree(void) sizeof(struct gptp_priority_vector)); /* Set pathTrace array to contain the single element thisClock. */ - global_ds->path_trace.len = htons(GPTP_CLOCK_ID_LEN); + global_ds->path_trace.len = net_htons(GPTP_CLOCK_ID_LEN); memcpy(global_ds->path_trace.path_sequence, GPTP_DEFAULT_DS()->clk_id, GPTP_CLOCK_ID_LEN); } @@ -1625,7 +1625,7 @@ static int compute_best_vector(void) gm_prio->root_system_id.clk_quality.clock_accuracy = default_ds->clk_quality.clock_accuracy; gm_prio->root_system_id.clk_quality.offset_scaled_log_var = - htons(default_ds->clk_quality.offset_scaled_log_var); + net_htons(default_ds->clk_quality.offset_scaled_log_var); memcpy(gm_prio->src_port_id.clk_id, default_ds->clk_id, GPTP_CLOCK_ID_LEN); @@ -1663,7 +1663,7 @@ static int compute_best_vector(void) } tmp = (int)(challenger->steps_removed + 1) - - (int)ntohs(best_vector->steps_removed); + (int)net_ntohs(best_vector->steps_removed); if (tmp < 0) { best_vector = challenger; best_port = port; @@ -1681,8 +1681,8 @@ static int compute_best_vector(void) continue; } - if (ntohs(challenger->port_number) < - ntohs(best_vector->port_number)) { + if (net_ntohs(challenger->port_number) < + net_ntohs(best_vector->port_number)) { best_vector = challenger; best_port = port; } @@ -1708,7 +1708,7 @@ static int compute_best_vector(void) } global_ds->gm_priority.steps_removed = - ntohs(best_vector->steps_removed) + 1; + net_ntohs(best_vector->steps_removed) + 1; if (&global_ds->gm_priority.src_port_id != &best_vector->src_port_id) { @@ -1736,18 +1736,18 @@ static void update_bmca(int port, memcpy(&bmca_data->master_priority, gm_prio, sizeof(struct gptp_priority_vector)); - bmca_data->master_priority.port_number = htons(port); + bmca_data->master_priority.port_number = net_htons(port); bmca_data->master_priority.src_port_id.port_number = - htons(port); + net_htons(port); } else { memcpy(&bmca_data->master_priority.root_system_id, &gm_prio->root_system_id, sizeof(struct gptp_root_system_identity)); memcpy(bmca_data->master_priority.src_port_id.clk_id, default_ds->clk_id, GPTP_CLOCK_ID_LEN); - bmca_data->master_priority.port_number = htons(port); + bmca_data->master_priority.port_number = net_htons(port); bmca_data->master_priority.src_port_id.port_number = - htons(port); + net_htons(port); bmca_data->master_priority.steps_removed = gm_prio->steps_removed; } @@ -1852,7 +1852,7 @@ static void gptp_updt_roles_tree(void) global_ds->sys_current_utc_offset; global_ds->time_source = bmca_data->ann_time_source; global_ds->master_steps_removed = - htons(ntohs(bmca_data->message_steps_removed) + 1); + net_htons(net_ntohs(bmca_data->message_steps_removed) + 1); } for (port = GPTP_PORT_START; port < GPTP_PORT_END; port++) { @@ -1879,7 +1879,7 @@ static void gptp_updt_roles_tree(void) /* If current system is the Grand Master, set pathTrace array. */ if (memcmp(default_ds->clk_id, gm_prio->root_system_id.grand_master_id, GPTP_CLOCK_ID_LEN) == 0) { - global_ds->path_trace.len = htons(GPTP_CLOCK_ID_LEN); + global_ds->path_trace.len = net_htons(GPTP_CLOCK_ID_LEN); memcpy(global_ds->path_trace.path_sequence, default_ds->clk_id, GPTP_CLOCK_ID_LEN); } diff --git a/subsys/net/l2/ethernet/lldp/lldp.c b/subsys/net/l2/ethernet/lldp/lldp.c index 230e69eb6b811..a75bff9371025 100644 --- a/subsys/net/l2/ethernet/lldp/lldp.c +++ b/subsys/net/l2/ethernet/lldp/lldp.c @@ -106,7 +106,7 @@ static int lldp_send(struct ethernet_lldp *lldp) len += sizeof(uint16_t); } - pkt = net_pkt_alloc_with_buffer(lldp->iface, len, AF_UNSPEC, 0, + pkt = net_pkt_alloc_with_buffer(lldp->iface, len, NET_AF_UNSPEC, 0, BUF_ALLOC_TIMEOUT); if (!pkt) { ret = -ENOMEM; @@ -133,7 +133,7 @@ static int lldp_send(struct ethernet_lldp *lldp) } if (IS_ENABLED(CONFIG_NET_LLDP_END_LLDPDU_TLV_ENABLED)) { - uint16_t tlv_end = htons(NET_LLDP_END_LLDPDU_VALUE); + uint16_t tlv_end = net_htons(NET_LLDP_END_LLDPDU_VALUE); ret = net_pkt_write(pkt, (uint8_t *)&tlv_end, sizeof(tlv_end)); if (ret < 0) { @@ -377,21 +377,21 @@ int net_lldp_config_optional(struct net_if *iface, const uint8_t *tlv, size_t le static const struct net_lldpdu lldpdu = { .chassis_id = { - .type_length = htons((LLDP_TLV_CHASSIS_ID << 9) | + .type_length = net_htons((LLDP_TLV_CHASSIS_ID << 9) | NET_LLDP_CHASSIS_ID_TLV_LEN), .subtype = CONFIG_NET_LLDP_CHASSIS_ID_SUBTYPE, .value = NET_LLDP_CHASSIS_ID_VALUE }, .port_id = { - .type_length = htons((LLDP_TLV_PORT_ID << 9) | + .type_length = net_htons((LLDP_TLV_PORT_ID << 9) | NET_LLDP_PORT_ID_TLV_LEN), .subtype = CONFIG_NET_LLDP_PORT_ID_SUBTYPE, .value = NET_LLDP_PORT_ID_VALUE }, .ttl = { - .type_length = htons((LLDP_TLV_TTL << 9) | + .type_length = net_htons((LLDP_TLV_TTL << 9) | NET_LLDP_TTL_TLV_LEN), - .ttl = htons(NET_LLDP_TTL) + .ttl = net_htons(NET_LLDP_TTL) }, }; diff --git a/subsys/net/l2/ieee802154/ieee802154.c b/subsys/net/l2/ieee802154/ieee802154.c index a613222bc7368..10e639cec4287 100644 --- a/subsys/net/l2/ieee802154/ieee802154.c +++ b/subsys/net/l2/ieee802154/ieee802154.c @@ -81,7 +81,7 @@ static inline void ieee802154_acknowledge(struct net_if *iface, struct ieee80215 return; } - pkt = net_pkt_alloc_with_buffer(iface, IEEE802154_ACK_PKT_LENGTH, AF_UNSPEC, 0, + pkt = net_pkt_alloc_with_buffer(iface, IEEE802154_ACK_PKT_LENGTH, NET_AF_UNSPEC, 0, BUF_TIMEOUT); if (!pkt) { return; @@ -493,7 +493,7 @@ static int ieee802154_send(struct net_if *iface, struct net_pkt *pkt) frame_buf = net_buf_alloc(&tx_frame_buf_pool, K_FOREVER); } - if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && net_pkt_family(pkt) == AF_PACKET) { + if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && net_pkt_family(pkt) == NET_AF_PACKET) { enum net_sock_type socket_type; struct net_context *context; @@ -503,13 +503,14 @@ static int ieee802154_send(struct net_if *iface, struct net_pkt *pkt) } socket_type = net_context_get_type(context); - if (socket_type == SOCK_RAW) { + if (socket_type == NET_SOCK_RAW) { send_raw = true; } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET_DGRAM) && - socket_type == SOCK_DGRAM) { - struct sockaddr_ll *dst_addr = (struct sockaddr_ll *)&context->remote; - struct sockaddr_ll_ptr *src_addr = - (struct sockaddr_ll_ptr *)&context->local; + socket_type == NET_SOCK_DGRAM) { + struct net_sockaddr_ll *dst_addr = + (struct net_sockaddr_ll *)&context->remote; + struct net_sockaddr_ll_ptr *src_addr = + (struct net_sockaddr_ll_ptr *)&context->local; (void)net_linkaddr_set(net_pkt_lladdr_dst(pkt), dst_addr->sll_addr, diff --git a/subsys/net/l2/ieee802154/ieee802154_6lo.c b/subsys/net/l2/ieee802154/ieee802154_6lo.c index dbbc7a06a206a..b7554e2cac8c5 100644 --- a/subsys/net/l2/ieee802154/ieee802154_6lo.c +++ b/subsys/net/l2/ieee802154/ieee802154_6lo.c @@ -39,7 +39,7 @@ int ieee802154_6lo_encode_pkt(struct net_if *iface, struct net_pkt *pkt, struct ieee802154_6lo_fragment_ctx *frag_ctx, uint8_t ll_hdr_len, uint8_t authtag_len) { - if (net_pkt_family(pkt) != AF_INET6) { + if (net_pkt_family(pkt) != NET_AF_INET6) { return 0; } diff --git a/subsys/net/l2/ieee802154/ieee802154_6lo_fragment.c b/subsys/net/l2/ieee802154/ieee802154_6lo_fragment.c index 5d09ba6db1ebd..cc53bc50e6c89 100644 --- a/subsys/net/l2/ieee802154/ieee802154_6lo_fragment.c +++ b/subsys/net/l2/ieee802154/ieee802154_6lo_fragment.c @@ -238,17 +238,17 @@ static void update_protocol_header_lengths(struct net_pkt *pkt, uint16_t size) } net_pkt_set_ip_hdr_len(pkt, NET_IPV6H_LEN); - ipv6->len = htons(size - NET_IPV6H_LEN); + ipv6->len = net_htons(size - NET_IPV6H_LEN); net_pkt_set_data(pkt, &ipv6_access); - if (ipv6->nexthdr == IPPROTO_UDP) { + if (ipv6->nexthdr == NET_IPPROTO_UDP) { NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr); struct net_udp_hdr *udp; udp = (struct net_udp_hdr *)net_pkt_get_data(pkt, &udp_access); if (udp) { - udp->len = htons(size - NET_IPV6H_LEN); + udp->len = net_htons(size - NET_IPV6H_LEN); net_pkt_set_data(pkt, &udp_access); } else { NET_ERR("Could not get UDP header"); diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.c b/subsys/net/l2/ieee802154/ieee802154_frame.c index 73be90d048ac8..a4a3793081159 100644 --- a/subsys/net/l2/ieee802154/ieee802154_frame.c +++ b/subsys/net/l2/ieee802154/ieee802154_frame.c @@ -546,7 +546,7 @@ static inline enum ieee802154_addressing_mode get_dst_addr_mode(struct net_linka } if (dst->len == IEEE802154_SHORT_ADDR_LENGTH) { - uint16_t short_addr = ntohs(*(uint16_t *)(dst->addr)); + uint16_t short_addr = net_ntohs(*(uint16_t *)(dst->addr)); *broadcast = (short_addr == IEEE802154_BROADCAST_ADDRESS); return IEEE802154_ADDR_MODE_SHORT; } else { @@ -574,7 +574,7 @@ static inline bool data_addr_to_fs_settings(struct net_linkaddr *dst, struct iee params->dst.len = IEEE802154_SHORT_ADDR_LENGTH; fs->fc.ar = 0U; } else if (dst->len == IEEE802154_SHORT_ADDR_LENGTH) { - params->dst.short_addr = ntohs(*(uint16_t *)(dst->addr)); + params->dst.short_addr = net_ntohs(*(uint16_t *)(dst->addr)); params->dst.len = IEEE802154_SHORT_ADDR_LENGTH; } else { __ASSERT_NO_MSG(dst->len == IEEE802154_EXT_ADDR_LENGTH); @@ -689,7 +689,7 @@ bool ieee802154_create_data_frame(struct ieee802154_context *ctx, struct net_lin params.dst.pan_id = ctx->pan_id; params.pan_id = ctx->pan_id; if (src->len == IEEE802154_SHORT_ADDR_LENGTH) { - params.short_addr = ntohs(*(uint16_t *)(src->addr)); + params.short_addr = net_ntohs(*(uint16_t *)(src->addr)); if (ctx->short_addr != params.short_addr) { goto out; } @@ -861,7 +861,7 @@ struct net_pkt *ieee802154_create_mac_cmd_frame(struct net_if *iface, enum ieee8 * bigger than IEEE802154_MTU bytes less the FCS size, so let's allocate that * size as buffer. */ - pkt = net_pkt_alloc_with_buffer(iface, IEEE802154_MTU, AF_UNSPEC, 0, BUF_TIMEOUT); + pkt = net_pkt_alloc_with_buffer(iface, IEEE802154_MTU, NET_AF_UNSPEC, 0, BUF_TIMEOUT); if (!pkt) { goto out; } diff --git a/subsys/net/l2/ieee802154/ieee802154_mgmt.c b/subsys/net/l2/ieee802154/ieee802154_mgmt.c index 10136ed609ac5..cfd8cae625044 100644 --- a/subsys/net/l2/ieee802154/ieee802154_mgmt.c +++ b/subsys/net/l2/ieee802154/ieee802154_mgmt.c @@ -268,7 +268,7 @@ static inline void set_association(struct net_if *iface, struct ieee802154_conte set_linkaddr_to_ext_addr(iface, ctx); } else { ctx->linkaddr.len = IEEE802154_SHORT_ADDR_LENGTH; - short_addr_be = htons(short_addr); + short_addr_be = net_htons(short_addr); memcpy(ctx->linkaddr.addr, &short_addr_be, IEEE802154_SHORT_ADDR_LENGTH); update_net_if_link_addr(iface, ctx); ieee802154_radio_filter_short_addr(iface, ctx->short_addr); diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c index b1d5b740f4bd7..d7635c5b5b6a8 100644 --- a/subsys/net/l2/openthread/openthread.c +++ b/subsys/net/l2/openthread/openthread.c @@ -54,14 +54,14 @@ static void ipv6_addr_event_handler(struct net_mgmt_event_callback *cb, uint64_t #ifdef CONFIG_NET_MGMT_EVENT_INFO struct openthread_context *ot_context = net_if_l2_data(iface); - if (cb->info == NULL || cb->info_length != sizeof(struct in6_addr)) { + if (cb->info == NULL || cb->info_length != sizeof(struct net_in6_addr)) { return; } if (mgmt_event == NET_EVENT_IPV6_ADDR_ADD) { - add_ipv6_addr_to_ot(ot_context, (const struct in6_addr *)cb->info); + add_ipv6_addr_to_ot(ot_context, (const struct net_in6_addr *)cb->info); } else if (mgmt_event == NET_EVENT_IPV6_MADDR_ADD) { - add_ipv6_maddr_to_ot(ot_context, (const struct in6_addr *)cb->info); + add_ipv6_maddr_to_ot(ot_context, (const struct net_in6_addr *)cb->info); } #else NET_WARN("No address info provided with event, " @@ -157,7 +157,7 @@ static void ot_receive_handler(otMessage *message, void *context) struct net_buf *pkt_buf; pkt = net_pkt_rx_alloc_with_buffer(ot_context->iface, otMessageGetLength(message), - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { NET_ERR("Failed to reserve net pkt"); goto out; diff --git a/subsys/net/l2/openthread/openthread_border_router.c b/subsys/net/l2/openthread/openthread_border_router.c index 22f207fb4663c..2576f468d141c 100644 --- a/subsys/net/l2/openthread/openthread_border_router.c +++ b/subsys/net/l2/openthread/openthread_border_router.c @@ -295,7 +295,7 @@ static void ot_bbr_multicast_listener_handler(void *context, const otIp6Address *address) { struct openthread_context *ot_context = (struct openthread_context *)context; - struct in6_addr recv_addr = {0}; + struct net_in6_addr recv_addr = {0}; struct net_if_mcast_addr *mcast_addr = NULL; struct net_route_entry_mcast *entry = NULL; @@ -303,7 +303,7 @@ static void ot_bbr_multicast_listener_handler(void *context, if (event == OT_BACKBONE_ROUTER_MULTICAST_LISTENER_ADDED) { entry = net_route_mcast_add(ot_context->iface, &recv_addr, - NUM_BITS(struct in6_addr)); + NUM_BITS(struct net_in6_addr)); if (entry != NULL) { /* * No need to perform mcast_lookup explicitly as it's already done in @@ -311,7 +311,7 @@ static void ot_bbr_multicast_listener_handler(void *context, * and maddr_join will not be performed. */ mcast_addr = net_if_ipv6_maddr_add(ot_context->iface, - (const struct in6_addr *)&recv_addr); + (const struct net_in6_addr *)&recv_addr); if (mcast_addr != NULL) { net_if_ipv6_maddr_join(ot_context->iface, mcast_addr); } @@ -329,7 +329,7 @@ static void ot_bbr_multicast_listener_handler(void *context, if (addr_to_del != NULL && net_if_ipv6_maddr_is_joined(addr_to_del)) { net_if_ipv6_maddr_leave(ot_context->iface, addr_to_del); net_if_ipv6_maddr_rm(ot_context->iface, - (const struct in6_addr *)&recv_addr); + (const struct net_in6_addr *)&recv_addr); } } } @@ -614,7 +614,7 @@ static void openthread_border_router_add_route_to_multicast_groups(void) 0x08, /** Organization-Local scope multicast address */ 0x0e, /** Global scope multicast address */ }; - struct in6_addr addr = {0}; + struct net_in6_addr addr = {0}; struct net_if_mcast_addr *mcast_addr = NULL; struct net_route_entry_mcast *entry = NULL; @@ -624,7 +624,7 @@ static void openthread_border_router_add_route_to_multicast_groups(void) entry = net_route_mcast_add(ail_iface_ptr, &addr, 16); if (entry != NULL) { mcast_addr = net_if_ipv6_maddr_add(ail_iface_ptr, - (const struct in6_addr *)&addr); + (const struct net_in6_addr *)&addr); if (mcast_addr != NULL) { net_if_ipv6_maddr_join(ail_iface_ptr, mcast_addr); } diff --git a/subsys/net/l2/openthread/openthread_utils.c b/subsys/net/l2/openthread/openthread_utils.c index 8aacc864f69b6..373102af6b043 100644 --- a/subsys/net/l2/openthread/openthread_utils.c +++ b/subsys/net/l2/openthread/openthread_utils.c @@ -21,9 +21,9 @@ LOG_MODULE_DECLARE(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL); static bool is_anycast_locator(const otNetifAddress *address) { - return address->mAddress.mFields.m16[4] == htons(0x0000) && - address->mAddress.mFields.m16[5] == htons(0x00ff) && - address->mAddress.mFields.m16[6] == htons(0xfe00) && + return address->mAddress.mFields.m16[4] == net_htons(0x0000) && + address->mAddress.mFields.m16[5] == net_htons(0x00ff) && + address->mAddress.mFields.m16[6] == net_htons(0xfe00) && address->mAddress.mFields.m8[14] == ALOC16_MASK; } @@ -117,8 +117,8 @@ void add_ipv6_addr_to_zephyr(struct openthread_context *context) char buf[NET_IPV6_ADDR_LEN]; NET_DBG("Adding %s", - net_addr_ntop(AF_INET6, - (struct in6_addr *)(&address->mAddress), + net_addr_ntop(NET_AF_INET6, + (struct net_in6_addr *)(&address->mAddress), buf, sizeof(buf))); } @@ -129,19 +129,19 @@ void add_ipv6_addr_to_zephyr(struct openthread_context *context) (address->mAddressOrigin == OT_ADDRESS_ORIGIN_SLAAC)) { if_addr = net_if_ipv6_addr_add( context->iface, - (struct in6_addr *)(&address->mAddress), + (struct net_in6_addr *)(&address->mAddress), NET_ADDR_AUTOCONF, 0); } else if (address->mAddressOrigin == OT_ADDRESS_ORIGIN_DHCPV6) { if_addr = net_if_ipv6_addr_add( context->iface, - (struct in6_addr *)(&address->mAddress), + (struct net_in6_addr *)(&address->mAddress), NET_ADDR_DHCP, 0); } else if (address->mAddressOrigin == OT_ADDRESS_ORIGIN_MANUAL) { if_addr = net_if_ipv6_addr_add( context->iface, - (struct in6_addr *)(&address->mAddress), + (struct net_in6_addr *)(&address->mAddress), NET_ADDR_MANUAL, 0); } else { NET_ERR("Unknown OpenThread address origin ignored."); @@ -163,7 +163,7 @@ void add_ipv6_addr_to_zephyr(struct openthread_context *context) } void add_ipv6_addr_to_ot(struct openthread_context *context, - const struct in6_addr *addr6) + const struct net_in6_addr *addr6) { struct otNetifAddress addr = { 0 }; struct net_if_ipv6 *ipv6; @@ -238,7 +238,7 @@ void add_ipv6_addr_to_ot(struct openthread_context *context, } void add_ipv6_maddr_to_ot(struct openthread_context *context, - const struct in6_addr *addr6) + const struct net_in6_addr *addr6) { struct otIp6Address addr; otError error; @@ -269,7 +269,7 @@ void add_ipv6_maddr_to_zephyr(struct openthread_context *context) for (maddress = otIp6GetMulticastAddresses(openthread_get_default_instance()); maddress; maddress = maddress->mNext) { if (net_if_ipv6_maddr_lookup( - (struct in6_addr *)(&maddress->mAddress), + (struct net_in6_addr *)(&maddress->mAddress), &context->iface) != NULL) { continue; } @@ -278,21 +278,21 @@ void add_ipv6_maddr_to_zephyr(struct openthread_context *context) char buf[NET_IPV6_ADDR_LEN]; NET_DBG("Adding multicast %s", - net_addr_ntop(AF_INET6, - (struct in6_addr *) + net_addr_ntop(NET_AF_INET6, + (struct net_in6_addr *) (&maddress->mAddress), buf, sizeof(buf))); } zmaddr = net_if_ipv6_maddr_add(context->iface, - (struct in6_addr *)(&maddress->mAddress)); + (struct net_in6_addr *)(&maddress->mAddress)); if (zmaddr && !(net_if_ipv6_maddr_is_joined(zmaddr) || net_ipv6_is_addr_mcast_iface( - (struct in6_addr *)(&maddress->mAddress)) || + (struct net_in6_addr *)(&maddress->mAddress)) || net_ipv6_is_addr_mcast_link_all_nodes( - (struct in6_addr *)(&maddress->mAddress)))) { + (struct net_in6_addr *)(&maddress->mAddress)))) { net_if_ipv6_maddr_join(context->iface, zmaddr); } @@ -301,7 +301,7 @@ void add_ipv6_maddr_to_zephyr(struct openthread_context *context) void rm_ipv6_addr_from_zephyr(struct openthread_context *context) { - struct in6_addr *ot_addr; + struct net_in6_addr *ot_addr; struct net_if_addr *zephyr_addr; struct net_if_ipv6 *ipv6; int i; @@ -323,7 +323,7 @@ void rm_ipv6_addr_from_zephyr(struct openthread_context *context) for (address = otIp6GetUnicastAddresses(openthread_get_default_instance()); address; address = address->mNext) { - ot_addr = (struct in6_addr *)(&address->mAddress); + ot_addr = (struct net_in6_addr *)(&address->mAddress); if (net_ipv6_addr_cmp(ot_addr, &zephyr_addr->address.in6_addr)) { @@ -336,7 +336,7 @@ void rm_ipv6_addr_from_zephyr(struct openthread_context *context) char buf[NET_IPV6_ADDR_LEN]; NET_DBG("Removing %s", - net_addr_ntop(AF_INET6, + net_addr_ntop(NET_AF_INET6, &zephyr_addr->address.in6_addr, buf, sizeof(buf))); } @@ -349,7 +349,7 @@ void rm_ipv6_addr_from_zephyr(struct openthread_context *context) void rm_ipv6_maddr_from_zephyr(struct openthread_context *context) { - struct in6_addr *ot_addr; + struct net_in6_addr *ot_addr; struct net_if_mcast_addr *zephyr_addr; struct net_if_ipv6 *ipv6; int i; @@ -371,7 +371,7 @@ void rm_ipv6_maddr_from_zephyr(struct openthread_context *context) for (maddress = otIp6GetMulticastAddresses(openthread_get_default_instance()); maddress; maddress = maddress->mNext) { - ot_addr = (struct in6_addr *)(&maddress->mAddress); + ot_addr = (struct net_in6_addr *)(&maddress->mAddress); if (net_ipv6_addr_cmp(ot_addr, &zephyr_addr->address.in6_addr)) { @@ -384,7 +384,7 @@ void rm_ipv6_maddr_from_zephyr(struct openthread_context *context) char buf[NET_IPV6_ADDR_LEN]; NET_DBG("Removing multicast %s", - net_addr_ntop(AF_INET6, + net_addr_ntop(NET_AF_INET6, &zephyr_addr->address.in6_addr, buf, sizeof(buf))); } diff --git a/subsys/net/l2/openthread/openthread_utils.h b/subsys/net/l2/openthread/openthread_utils.h index dc60e9ad0e52d..d00ff6aad497d 100644 --- a/subsys/net/l2/openthread/openthread_utils.h +++ b/subsys/net/l2/openthread/openthread_utils.h @@ -21,9 +21,9 @@ void dump_pkt(const char *str, struct net_pkt *pkt); void add_ipv6_addr_to_zephyr(struct openthread_context *context); void add_ipv6_addr_to_ot(struct openthread_context *context, - const struct in6_addr *addr6); + const struct net_in6_addr *addr6); void add_ipv6_maddr_to_ot(struct openthread_context *context, - const struct in6_addr *addr6); + const struct net_in6_addr *addr6); void add_ipv6_maddr_to_zephyr(struct openthread_context *context); void rm_ipv6_addr_from_zephyr(struct openthread_context *context); void rm_ipv6_maddr_from_zephyr(struct openthread_context *context); diff --git a/subsys/net/l2/ppp/fsm.c b/subsys/net/l2/ppp/fsm.c index e5ca056e1c035..28d58c3a129cf 100644 --- a/subsys/net/l2/ppp/fsm.c +++ b/subsys/net/l2/ppp/fsm.c @@ -462,12 +462,12 @@ int ppp_send_pkt(struct ppp_fsm *fsm, struct net_if *iface, ppp.code = type; ppp.id = id; - ppp.length = htons(len); + ppp.length = net_htons(len); if (!pkt) { pkt = net_pkt_alloc_with_buffer(iface, sizeof(uint16_t) + len, - AF_UNSPEC, 0, + NET_AF_UNSPEC, 0, PPP_BUF_ALLOC_TIMEOUT); if (!pkt) { goto out_of_mem; @@ -620,7 +620,7 @@ static enum net_verdict fsm_recv_configure_req(struct ppp_fsm *fsm, sizeof(uint16_t) + sizeof(uint16_t) + sizeof(uint8_t) + sizeof(uint8_t) + remaining_len, - AF_UNSPEC, 0, PPP_BUF_ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, PPP_BUF_ALLOC_TIMEOUT); if (!out) { return NET_DROP; } diff --git a/subsys/net/l2/ppp/ipcp.c b/subsys/net/l2/ppp/ipcp.c index 320b78a0c0c31..03272cea0b9d6 100644 --- a/subsys/net/l2/ppp/ipcp.c +++ b/subsys/net/l2/ppp/ipcp.c @@ -31,7 +31,7 @@ static enum net_verdict ipcp_handle(struct ppp_context *ctx, #define IP_ADDRESS_OPTION_LEN (1 + 1 + 4) static int ipcp_add_address(struct ppp_context *ctx, struct net_pkt *pkt, - struct in_addr *addr) + struct net_in_addr *addr) { net_pkt_write_u8(pkt, 1 + 1 + sizeof(addr->s_addr)); return net_pkt_write(pkt, &addr->s_addr, sizeof(addr->s_addr)); @@ -43,9 +43,9 @@ static int ipcp_add_ip_address(struct ppp_context *ctx, struct net_pkt *pkt) } static int ipcp_ack_check_address(struct net_pkt *pkt, size_t oplen, - struct in_addr *addr) + struct net_in_addr *addr) { - struct in_addr ack_addr; + struct net_in_addr ack_addr; int ret; if (oplen != sizeof(ack_addr)) { @@ -72,7 +72,7 @@ static int ipcp_ack_ip_address(struct ppp_context *ctx, struct net_pkt *pkt, } static int ipcp_nak_override_address(struct net_pkt *pkt, size_t oplen, - struct in_addr *addr) + struct net_in_addr *addr) { if (oplen != sizeof(*addr)) { return -EINVAL; @@ -148,7 +148,7 @@ static struct net_pkt *ipcp_config_info_add(struct ppp_fsm *fsm) struct ipcp_peer_option_data { bool addr_present; - struct in_addr addr; + struct net_in_addr addr; }; #if defined(CONFIG_NET_L2_PPP_OPTION_SERVE_DNS) @@ -165,7 +165,7 @@ static int ipcp_dns_address_parse(struct ppp_fsm *fsm, struct net_pkt *pkt, } /* Request is zeros? Give our dns address in ConfNak */ - if (data->addr.s_addr == INADDR_ANY) { + if (data->addr.s_addr == NET_INADDR_ANY) { NET_DBG("[IPCP] zeroes rcvd as %s addr, sending NAK with our %s addr", "DNS", "DNS"); return -EINVAL; @@ -191,7 +191,7 @@ static int ipcp_ip_address_parse(struct ppp_fsm *fsm, struct net_pkt *pkt, #if defined(CONFIG_NET_L2_PPP_OPTION_SERVE_IP) /* Request is zeros? Give our IP address in ConfNak */ - if (data->addr.s_addr == INADDR_ANY) { + if (data->addr.s_addr == NET_INADDR_ANY) { NET_DBG("[IPCP] zeroes rcvd as %s addr, sending NAK with our %s addr", "IP", "IP"); return -EINVAL; @@ -201,7 +201,7 @@ static int ipcp_ip_address_parse(struct ppp_fsm *fsm, struct net_pkt *pkt, char dst[INET_ADDRSTRLEN]; char *addr_str; - addr_str = net_addr_ntop(AF_INET, &data->addr, dst, + addr_str = net_addr_ntop(NET_AF_INET, &data->addr, dst, sizeof(dst)); NET_DBG("[IPCP] Received peer address %s", @@ -238,7 +238,7 @@ static int ipcp_dns1_address_parse(struct ppp_fsm *fsm, struct net_pkt *pkt, ret = ipcp_dns_address_parse(fsm, pkt, user_data); - if (ret == -EINVAL && ctx->ipcp.peer_options.dns1_address.s_addr == INADDR_ANY) { + if (ret == -EINVAL && ctx->ipcp.peer_options.dns1_address.s_addr == NET_INADDR_ANY) { return -ENOTSUP; } return ret; @@ -253,7 +253,7 @@ static int ipcp_dns2_address_parse(struct ppp_fsm *fsm, struct net_pkt *pkt, ret = ipcp_dns_address_parse(fsm, pkt, user_data); - if (ret == -EINVAL && ctx->ipcp.peer_options.dns2_address.s_addr == INADDR_ANY) { + if (ret == -EINVAL && ctx->ipcp.peer_options.dns2_address.s_addr == NET_INADDR_ANY) { return -ENOTSUP; } return ret; @@ -347,19 +347,19 @@ static void ipcp_set_dns_servers(struct ppp_fsm *fsm) ipcp.fsm); struct dns_resolve_context *dnsctx; - struct sockaddr_in dns1 = { - .sin_family = AF_INET, - .sin_port = htons(53), + struct net_sockaddr_in dns1 = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(53), .sin_addr = ctx->ipcp.my_options.dns1_address }; - struct sockaddr_in dns2 = { - .sin_family = AF_INET, - .sin_port = htons(53), + struct net_sockaddr_in dns2 = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(53), .sin_addr = ctx->ipcp.my_options.dns2_address }; - const struct sockaddr *dns_servers[] = { - (struct sockaddr *) &dns1, - (struct sockaddr *) &dns2, + const struct net_sockaddr *dns_servers[] = { + (struct net_sockaddr *) &dns1, + (struct net_sockaddr *) &dns2, NULL }; int ifindex = net_if_get_by_iface(ctx->iface); @@ -440,7 +440,7 @@ static void ipcp_up(struct ppp_fsm *fsm) return; } - addr_str = net_addr_ntop(AF_INET, &ctx->ipcp.my_options.address, + addr_str = net_addr_ntop(NET_AF_INET, &ctx->ipcp.my_options.address, dst, sizeof(dst)); addr = net_if_ipv4_addr_add(ctx->iface, diff --git a/subsys/net/l2/ppp/ipv6cp.c b/subsys/net/l2/ppp/ipv6cp.c index b1e81775f9493..2f882efa9ec1c 100644 --- a/subsys/net/l2/ppp/ipv6cp.c +++ b/subsys/net/l2/ppp/ipv6cp.c @@ -206,7 +206,7 @@ static void ipv6cp_close(struct ppp_context *ctx, const uint8_t *reason) ppp_fsm_close(&ctx->ipv6cp.fsm, reason); } -static void setup_iid_address(uint8_t *iid, struct in6_addr *addr) +static void setup_iid_address(uint8_t *iid, struct net_in6_addr *addr) { addr->s6_addr[0] = 0xfe; addr->s6_addr[1] = 0x80; @@ -221,7 +221,7 @@ static void setup_iid_address(uint8_t *iid, struct in6_addr *addr) static void add_iid_address(struct net_if *iface, uint8_t *iid) { struct net_if_addr *ifaddr; - struct in6_addr addr; + struct net_in6_addr addr; setup_iid_address(iid, &addr); @@ -242,7 +242,7 @@ static void ipv6cp_up(struct ppp_fsm *fsm) struct ppp_context *ctx = CONTAINER_OF(fsm, struct ppp_context, ipv6cp.fsm); struct net_nbr *nbr; - struct in6_addr peer_addr; + struct net_in6_addr peer_addr; struct net_linkaddr peer_lladdr; if (ctx->is_ipv6cp_up) { @@ -270,7 +270,7 @@ static void ipv6cp_up(struct ppp_fsm *fsm) if (!nbr) { NET_ERR("[%s/%p] Cannot add peer %s to nbr table", fsm->name, fsm, - net_sprint_addr(AF_INET6, (const void *)&peer_addr)); + net_sprint_addr(NET_AF_INET6, (const void *)&peer_addr)); } else { if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) { uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")]; @@ -281,7 +281,7 @@ static void ipv6cp_up(struct ppp_fsm *fsm) peer_lladdr.len, iid_str, sizeof(iid_str)); - addr_str = net_addr_ntop(AF_INET6, &peer_addr, dst, + addr_str = net_addr_ntop(NET_AF_INET6, &peer_addr, dst, sizeof(dst)); NET_DBG("[%s/%p] Peer %s [%s] %s nbr cache", @@ -296,8 +296,8 @@ static void ipv6cp_down(struct ppp_fsm *fsm) struct ppp_context *ctx = CONTAINER_OF(fsm, struct ppp_context, ipv6cp.fsm); struct net_linkaddr peer_lladdr; - struct in6_addr my_addr; - struct in6_addr peer_addr; + struct net_in6_addr my_addr; + struct net_in6_addr peer_addr; int ret; if (!ctx->is_ipv6cp_up) { @@ -323,7 +323,7 @@ static void ipv6cp_down(struct ppp_fsm *fsm) if (!ret) { NET_ERR("[%s/%p] Cannot rm peer %s from nbr table", fsm->name, fsm, - net_sprint_addr(AF_INET6, (const void *)&peer_addr)); + net_sprint_addr(NET_AF_INET6, (const void *)&peer_addr)); } else { if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) { uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")]; @@ -334,7 +334,7 @@ static void ipv6cp_down(struct ppp_fsm *fsm) sizeof(ctx->ipv6cp.peer_options.iid), iid_str, sizeof(iid_str)); - addr_str = net_addr_ntop(AF_INET6, &peer_addr, dst, + addr_str = net_addr_ntop(NET_AF_INET6, &peer_addr, dst, sizeof(dst)); NET_DBG("[%s/%p] Peer %s [%s] %s nbr cache", diff --git a/subsys/net/l2/ppp/options.c b/subsys/net/l2/ppp/options.c index 694d338c9b767..644cd50e55384 100644 --- a/subsys/net/l2/ppp/options.c +++ b/subsys/net/l2/ppp/options.c @@ -250,7 +250,7 @@ struct net_pkt *ppp_my_options_add(struct ppp_fsm *fsm, size_t packet_len) int err; pkt = net_pkt_alloc_with_buffer(ppp_fsm_iface(fsm), packet_len, - AF_UNSPEC, 0, PPP_BUF_ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, PPP_BUF_ALLOC_TIMEOUT); if (!pkt) { return NULL; } diff --git a/subsys/net/l2/ppp/pap.c b/subsys/net/l2/ppp/pap.c index a3cd9d5fc7e34..c3961beeadd0b 100644 --- a/subsys/net/l2/ppp/pap.c +++ b/subsys/net/l2/ppp/pap.c @@ -25,7 +25,7 @@ static struct net_pkt *pap_config_info_add(struct ppp_fsm *fsm) struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(ppp_fsm_iface(fsm), sizeof(payload), - AF_UNSPEC, 0, PPP_BUF_ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, PPP_BUF_ALLOC_TIMEOUT); if (!pkt) { return NULL; } diff --git a/subsys/net/l2/ppp/ppp_l2.c b/subsys/net/l2/ppp/ppp_l2.c index 0a2018ead71f0..f765abc5deeb4 100644 --- a/subsys/net/l2/ppp/ppp_l2.c +++ b/subsys/net/l2/ppp/ppp_l2.c @@ -183,17 +183,17 @@ static int ppp_send(struct net_if *iface, struct net_pkt *pkt) } /* PPP drivers only support IP packet types, therefore in order to be - * able to use AF_PACKET family sockets with PPP, we need to translate + * able to use NET_AF_PACKET family sockets with PPP, we need to translate * L2 proto type to packet family. */ if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - net_pkt_family(pkt) == AF_PACKET) { + net_pkt_family(pkt) == NET_AF_PACKET) { switch (net_pkt_ll_proto_type(pkt)) { case ETH_P_IP: - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); break; case ETH_P_IPV6: - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); break; default: return -EPROTONOSUPPORT; diff --git a/subsys/net/l2/virtual/ipip/ipip.c b/subsys/net/l2/virtual/ipip/ipip.c index bd339ea213260..97e1aeb7a36d3 100644 --- a/subsys/net/l2/virtual/ipip/ipip.c +++ b/subsys/net/l2/virtual/ipip/ipip.c @@ -40,13 +40,13 @@ struct ipip_context { struct net_if *iface; struct net_if *attached_to; union { - sa_family_t family; + net_sa_family_t family; struct net_addr peer; }; union { - const struct in_addr *my4addr; - const struct in6_addr *my6addr; + const struct net_in_addr *my4addr; + const struct net_in6_addr *my6addr; }; bool is_used; @@ -143,20 +143,20 @@ static int interface_send(struct net_if *iface, struct net_pkt *pkt) return -ENOENT; } - if (net_pkt_family(pkt) == AF_INET) { - nexthdr = IPPROTO_IPIP; + if (net_pkt_family(pkt) == NET_AF_INET) { + nexthdr = NET_IPPROTO_IPIP; tos = ipv4_get_tos(pkt); - } else if (net_pkt_family(pkt) == AF_INET6) { - nexthdr = IPPROTO_IPV6; + } else if (net_pkt_family(pkt) == NET_AF_INET6) { + nexthdr = NET_IPPROTO_IPV6; } else { return -EINVAL; } /* Add new IP header */ - if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->family == NET_AF_INET6) { tmp = net_pkt_alloc_with_buffer(iface, sizeof(struct net_ipv6_hdr), - AF_INET6, IPPROTO_IPV6, + NET_AF_INET6, NET_IPPROTO_IPV6, PKT_ALLOC_TIME); if (tmp == NULL) { return -ENOMEM; @@ -191,12 +191,12 @@ static int interface_send(struct net_if *iface, struct net_pkt *pkt) goto out; } - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->family == NET_AF_INET) { tmp = net_pkt_alloc_with_buffer(iface, sizeof(struct net_ipv4_hdr), - AF_INET, IPPROTO_IP, + NET_AF_INET, NET_IPPROTO_IP, PKT_ALLOC_TIME); if (tmp == NULL) { return -ENOMEM; @@ -244,7 +244,7 @@ static int interface_send(struct net_if *iface, struct net_pkt *pkt) goto out; } - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); } if (DEBUG_TX) { @@ -267,20 +267,20 @@ static int interface_send(struct net_if *iface, struct net_pkt *pkt) } static bool verify_remote_addr(struct ipip_context *ctx, - struct sockaddr *remote_addr) + struct net_sockaddr *remote_addr) { if (ctx->family != remote_addr->sa_family) { return false; } - if (ctx->family == AF_INET) { + if (ctx->family == NET_AF_INET) { if (memcmp(&ctx->peer.in_addr, &net_sin(remote_addr)->sin_addr, - sizeof(struct in_addr)) == 0) { + sizeof(struct net_in_addr)) == 0) { return true; } } else { if (memcmp(&ctx->peer.in6_addr, &net_sin6(remote_addr)->sin6_addr, - sizeof(struct in6_addr)) == 0) { + sizeof(struct net_in6_addr)) == 0) { return true; } } @@ -305,10 +305,10 @@ static enum net_verdict interface_recv(struct net_if *iface, switch (iptype & 0xf0) { case 0x60: - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); break; case 0x40: - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); break; default: return NET_DROP; @@ -319,7 +319,7 @@ static enum net_verdict interface_recv(struct net_if *iface, */ if (!verify_remote_addr(ctx, net_pkt_remote_address(pkt))) { NET_DBG("DROP: remote address %s unknown", - net_pkt_remote_address(pkt)->sa_family == AF_INET6 ? + net_pkt_remote_address(pkt)->sa_family == NET_AF_INET6 ? net_sprint_ipv6_addr(&net_sin6(net_pkt_remote_address(pkt))->sin6_addr) : net_sprint_ipv4_addr(&net_sin(net_pkt_remote_address(pkt))->sin_addr)); return NET_DROP; @@ -337,7 +337,7 @@ static enum net_verdict interface_recv(struct net_if *iface, /* net_pkt cursor must point to correct place so that we can fetch * the network header. */ - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { NET_PKT_DATA_ACCESS_DEFINE(access, struct net_ipv6_hdr); struct net_ipv6_hdr *hdr; struct net_if *iface_test; @@ -350,7 +350,7 @@ static enum net_verdict interface_recv(struct net_if *iface, } /* RFC4213 chapter 3.6 */ - iface_test = net_if_ipv6_select_src_iface((struct in6_addr *)hdr->dst); + iface_test = net_if_ipv6_select_src_iface((struct net_in6_addr *)hdr->dst); if (iface_test == NULL) { NET_DBG("DROP: not for me (dst %s)", net_sprint_ipv6_addr(&hdr->dst)); @@ -380,7 +380,7 @@ static enum net_verdict interface_recv(struct net_if *iface, return net_ipv6_input(pkt); } - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { NET_PKT_DATA_ACCESS_DEFINE(access, struct net_ipv4_hdr); struct net_ipv4_hdr *hdr; struct net_if *iface_test; @@ -393,7 +393,7 @@ static enum net_verdict interface_recv(struct net_if *iface, return NET_DROP; } - iface_test = net_if_ipv4_select_src_iface((struct in_addr *)hdr->dst); + iface_test = net_if_ipv4_select_src_iface((struct net_in_addr *)hdr->dst); if (iface_test == NULL) { NET_DBG("DROP: not for me (dst %s)", net_sprint_ipv4_addr(&hdr->dst)); @@ -414,7 +414,7 @@ static enum net_verdict interface_recv(struct net_if *iface, hdr->chksum = 0U; sum = calc_chksum(0, access.data, access.size); - sum = (sum == 0U) ? 0xffff : htons(sum); + sum = (sum == 0U) ? 0xffff : net_htons(sum); hdr->chksum = ~sum; @@ -452,9 +452,9 @@ static int interface_attach(struct net_if *iface, struct net_if *lower_iface) } else { ctx->is_used = true; - if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->family == NET_AF_INET6) { struct net_if_addr *ifaddr; - struct in6_addr iid; + struct net_in6_addr iid; int ret; /* RFC4213 chapter 3.7 */ @@ -494,16 +494,16 @@ static int interface_set_config(struct net_if *iface, switch (type) { case VIRTUAL_INTERFACE_CONFIG_TYPE_PEER_ADDRESS: - if (IS_ENABLED(CONFIG_NET_IPV4) && config->family == AF_INET) { - char peer[INET_ADDRSTRLEN]; + if (IS_ENABLED(CONFIG_NET_IPV4) && config->family == NET_AF_INET) { + char peer[NET_INET_ADDRSTRLEN]; char *addr_str; net_ipaddr_copy(&ctx->peer.in_addr, &config->peer4addr); - addr_str = net_addr_ntop(AF_INET, &ctx->peer.in_addr, + addr_str = net_addr_ntop(NET_AF_INET, &ctx->peer.in_addr, peer, sizeof(peer)); - ctx->family = AF_INET; + ctx->family = NET_AF_INET; net_virtual_set_name(iface, "IPv4 tunnel"); if (ctx->attached_to == NULL) { @@ -525,17 +525,17 @@ static int interface_set_config(struct net_if *iface, ctx->my4addr = NULL; } else if (IS_ENABLED(CONFIG_NET_IPV6) && - config->family == AF_INET6) { - char peer[INET6_ADDRSTRLEN]; + config->family == NET_AF_INET6) { + char peer[NET_INET6_ADDRSTRLEN]; char *addr_str; net_ipaddr_copy(&ctx->peer.in6_addr, &config->peer6addr); - addr_str = net_addr_ntop(AF_INET6, &ctx->peer.in6_addr, + addr_str = net_addr_ntop(NET_AF_INET6, &ctx->peer.in6_addr, peer, sizeof(peer)); - ctx->family = AF_INET6; + ctx->family = NET_AF_INET6; net_virtual_set_name(iface, "IPv6 tunnel"); net_if_ipv6_set_hop_limit(iface, 64); @@ -580,12 +580,12 @@ static int interface_get_config(struct net_if *iface, switch (type) { case VIRTUAL_INTERFACE_CONFIG_TYPE_PEER_ADDRESS: if (IS_ENABLED(CONFIG_NET_IPV6) && - ctx->family == AF_INET6) { + ctx->family == NET_AF_INET6) { net_ipaddr_copy(&config->peer6addr, &ctx->peer.in6_addr); } else if (IS_ENABLED(CONFIG_NET_IPV4) && - ctx->family == AF_INET) { + ctx->family == NET_AF_INET) { net_ipaddr_copy(&config->peer4addr, &ctx->peer.in_addr); diff --git a/subsys/net/lib/capture/capture.c b/subsys/net/lib/capture/capture.c index 122096c96fcb5..8956db45b463d 100644 --- a/subsys/net/lib/capture/capture.c +++ b/subsys/net/lib/capture/capture.c @@ -76,13 +76,13 @@ struct net_capture { /** * Peer (inner) tunnel IP address. */ - struct sockaddr peer; + struct net_sockaddr peer; /** * Local (inner) tunnel IP address. This will be set * as a local address to tunnel network interface. */ - struct sockaddr local; + struct net_sockaddr local; /** * Is this context setup already @@ -192,7 +192,7 @@ static void iface_cb(struct net_if *iface, void *user_data) } static int setup_iface(struct net_if *iface, const char *ipaddr, - struct sockaddr *addr, int *addr_len) + struct net_sockaddr *addr, int *addr_len) { struct net_if_addr *ifaddr; @@ -202,7 +202,7 @@ static int setup_iface(struct net_if *iface, const char *ipaddr, return -EINVAL; } - if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { /* No need to have dual address for IPIP tunnel interface */ net_if_flag_clear(iface, NET_IF_IPV4); net_if_flag_set(iface, NET_IF_IPV6); @@ -215,10 +215,10 @@ static int setup_iface(struct net_if *iface, const char *ipaddr, return -EINVAL; } - *addr_len = sizeof(struct sockaddr_in6); + *addr_len = sizeof(struct net_sockaddr_in6); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) { - struct in_addr netmask = { { { 255, 255, 255, 255 } } }; + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { + struct net_in_addr netmask = { { { 255, 255, 255, 255 } } }; net_if_flag_clear(iface, NET_IF_IPV6); net_if_flag_set(iface, NET_IF_IPV4); @@ -238,7 +238,7 @@ static int setup_iface(struct net_if *iface, const char *ipaddr, &net_sin(addr)->sin_addr, &netmask); - *addr_len = sizeof(struct sockaddr_in); + *addr_len = sizeof(struct net_sockaddr_in); } else { return -EINVAL; } @@ -246,11 +246,11 @@ static int setup_iface(struct net_if *iface, const char *ipaddr, return 0; } -static int cleanup_iface(struct net_if *iface, struct sockaddr *addr) +static int cleanup_iface(struct net_if *iface, struct net_sockaddr *addr) { int ret = -EINVAL; - if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { ret = net_if_ipv6_addr_rm(iface, &net_sin6(addr)->sin6_addr); if (!ret) { NET_ERR("Cannot remove %s from interface %d", @@ -261,7 +261,7 @@ static int cleanup_iface(struct net_if *iface, struct sockaddr *addr) net_if_flag_clear(iface, NET_IF_IPV6); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { ret = net_if_ipv4_addr_rm(iface, &net_sin(addr)->sin_addr); if (!ret) { NET_ERR("Cannot remove %s from interface %d", @@ -281,9 +281,9 @@ int net_capture_setup(const char *remote_addr, const char *my_local_addr, struct virtual_interface_req_params params = { 0 }; struct net_context *context = NULL; struct net_if *ipip_iface = NULL; - struct sockaddr remote = { 0 }; - struct sockaddr local = { 0 }; - struct sockaddr peer = { 0 }; + struct net_sockaddr remote = { 0 }; + struct net_sockaddr local = { 0 }; + struct net_sockaddr peer = { 0 }; struct net_if *remote_iface; struct net_capture *ctx; int local_addr_len; @@ -311,19 +311,19 @@ int net_capture_setup(const char *remote_addr, const char *my_local_addr, goto fail; } - if (IS_ENABLED(CONFIG_NET_IPV6) && remote.sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && remote.sa_family == NET_AF_INET6) { remote_iface = net_if_ipv6_select_src_iface( &net_sin6(&remote)->sin6_addr); - params.family = AF_INET6; + params.family = NET_AF_INET6; net_ipaddr_copy(¶ms.peer6addr, &net_sin6(&remote)->sin6_addr); orig_mtu = net_if_get_mtu(remote_iface); mtu = orig_mtu - sizeof(struct net_ipv6_hdr) - sizeof(struct net_udp_hdr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && remote.sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && remote.sa_family == NET_AF_INET) { remote_iface = net_if_ipv4_select_src_iface( &net_sin(&remote)->sin_addr); - params.family = AF_INET; + params.family = NET_AF_INET; net_ipaddr_copy(¶ms.peer4addr, &net_sin(&remote)->sin_addr); orig_mtu = net_if_get_mtu(remote_iface); @@ -344,7 +344,7 @@ int net_capture_setup(const char *remote_addr, const char *my_local_addr, /* We only get net_context so that net_pkt allocation routines * can allocate net_buf's from our net_buf pool. */ - ret = net_context_get(params.family, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(params.family, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &context); if (ret < 0) { NET_ERR("Cannot allocate net_context (%d)", ret); @@ -412,11 +412,11 @@ int net_capture_setup(const char *remote_addr, const char *my_local_addr, memcpy(&ctx->local, &local, local_addr_len); if (net_sin(&ctx->peer)->sin_port == 0) { - net_sin(&ctx->peer)->sin_port = htons(DEFAULT_PORT); + net_sin(&ctx->peer)->sin_port = net_htons(DEFAULT_PORT); } if (net_sin(&ctx->local)->sin_port == 0) { - net_sin(&ctx->local)->sin_port = htons(DEFAULT_PORT); + net_sin(&ctx->local)->sin_port = net_htons(DEFAULT_PORT); } ret = net_virtual_interface_attach(ctx->tunnel_iface, remote_iface); @@ -619,9 +619,9 @@ static int capture_send(const struct device *dev, struct net_if *iface, return -ENOENT; } - if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.sa_family == NET_AF_INET) { len = sizeof(struct net_ipv4_hdr); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.sa_family == AF_INET6) { + } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.sa_family == NET_AF_INET6) { len = sizeof(struct net_ipv6_hdr); } else { return -EINVAL; @@ -639,19 +639,19 @@ static int capture_send(const struct device *dev, struct net_if *iface, net_pkt_set_family(ip, ctx->local.sa_family); net_pkt_set_iface(ip, ctx->tunnel_iface); - ret = net_pkt_alloc_buffer(ip, len, IPPROTO_UDP, PKT_ALLOC_TIME); + ret = net_pkt_alloc_buffer(ip, len, NET_IPPROTO_UDP, PKT_ALLOC_TIME); if (ret < 0) { net_pkt_unref(ip); return ret; } - if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.sa_family == NET_AF_INET) { net_pkt_set_ipv4_ttl(ip, net_if_ipv4_get_ttl(ctx->tunnel_iface)); ret = net_ipv4_create(ip, &net_sin(&ctx->local)->sin_addr, &net_sin(&ctx->peer)->sin_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.sa_family == AF_INET6) { + } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.sa_family == NET_AF_INET6) { ret = net_ipv6_create(ip, &net_sin6(&ctx->local)->sin6_addr, &net_sin6(&ctx->peer)->sin6_addr); } else { @@ -682,16 +682,16 @@ static int capture_send(const struct device *dev, struct net_if *iface, net_pkt_cursor_init(pkt); - if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.sa_family == NET_AF_INET) { net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv4_hdr)); net_pkt_set_ipv4_opts_len(pkt, 0); - net_ipv4_finalize(pkt, IPPROTO_UDP); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.sa_family == AF_INET6) { + net_ipv4_finalize(pkt, NET_IPPROTO_UDP); + } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.sa_family == NET_AF_INET6) { net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_set_ipv6_ext_opt_len(pkt, 0); - net_ipv6_finalize(pkt, IPPROTO_UDP); + net_ipv6_finalize(pkt, NET_IPPROTO_UDP); } else { CODE_UNREACHABLE; } diff --git a/subsys/net/lib/capture/cooked.c b/subsys/net/lib/capture/cooked.c index b4f44034138e3..cfb624293fdb8 100644 --- a/subsys/net/lib/capture/cooked.c +++ b/subsys/net/lib/capture/cooked.c @@ -322,22 +322,22 @@ static int create_sll_header(struct net_if *iface, int ret; if (IS_ENABLED(CONFIG_NET_CAPTURE_COOKED_MODE_SLLV1)) { - hdr1.sll_pkttype = htons(type); - hdr1.sll_hatype = htons(ctx->hatype); - hdr1.sll_halen = htons(ctx->halen); + hdr1.sll_pkttype = net_htons(type); + hdr1.sll_hatype = net_htons(ctx->hatype); + hdr1.sll_halen = net_htons(ctx->halen); memcpy(hdr1.sll_addr, ctx->addr, sizeof(ctx->addr)); - hdr1.sll_protocol = htons(ptype); + hdr1.sll_protocol = net_htons(ptype); hdr = (uint8_t *)&hdr1; hdr_len = sizeof(hdr1); } else { - hdr2.sll2_protocol = htons(ptype); + hdr2.sll2_protocol = net_htons(ptype); hdr2.sll2_reserved_mbz = 0; hdr2.sll2_if_index = net_if_get_by_iface(iface); - hdr2.sll2_hatype = htons(ctx->hatype); - hdr2.sll2_pkttype = htons(type); - hdr2.sll2_halen = htons(ctx->halen); + hdr2.sll2_hatype = net_htons(ctx->hatype); + hdr2.sll2_pkttype = net_htons(type); + hdr2.sll2_halen = net_htons(ctx->halen); memcpy(hdr2.sll2_addr, ctx->addr, sizeof(ctx->addr)); hdr = (uint8_t *)&hdr2; diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c index 91e11cbe82326..2ba8f8746b03f 100644 --- a/subsys/net/lib/coap/coap.c +++ b/subsys/net/lib/coap/coap.c @@ -1181,7 +1181,7 @@ int coap_handle_request_len(struct coap_packet *cpkt, size_t resources_len, struct coap_option *options, uint8_t opt_num, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, net_socklen_t addr_len) { if (!coap_packet_is_request(cpkt)) { return -ENOTSUP; @@ -1215,7 +1215,7 @@ int coap_handle_request(struct coap_packet *cpkt, struct coap_resource *resources, struct coap_option *options, uint8_t opt_num, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, net_socklen_t addr_len) { size_t resources_len = 0; struct coap_resource *resource; @@ -1601,7 +1601,7 @@ size_t coap_next_block(const struct coap_packet *cpkt, int coap_pending_init(struct coap_pending *pending, const struct coap_packet *request, - const struct sockaddr *addr, + const struct net_sockaddr *addr, const struct coap_transmission_parameters *params) { memset(pending, 0, sizeof(*pending)); @@ -1654,16 +1654,16 @@ struct coap_reply *coap_reply_next_unused( return NULL; } -static inline bool is_addr_unspecified(const struct sockaddr *addr) +static inline bool is_addr_unspecified(const struct net_sockaddr *addr) { - if (addr->sa_family == AF_UNSPEC) { + if (addr->sa_family == NET_AF_UNSPEC) { return true; } - if (addr->sa_family == AF_INET6) { + if (addr->sa_family == NET_AF_INET6) { return net_ipv6_is_addr_unspecified( &(net_sin6(addr)->sin6_addr)); - } else if (addr->sa_family == AF_INET) { + } else if (addr->sa_family == NET_AF_INET) { return net_sin(addr)->sin_addr.s4_addr32[0] == 0U; } @@ -1816,7 +1816,7 @@ static inline void coap_observer_increment_age(struct coap_resource *resource) struct coap_reply *coap_response_received( const struct coap_packet *response, - const struct sockaddr *from, + const struct net_sockaddr *from, struct coap_reply *replies, size_t len) { struct coap_reply *r; @@ -1958,7 +1958,7 @@ bool coap_request_is_observe(const struct coap_packet *request) void coap_observer_init(struct coap_observer *observer, const struct coap_packet *request, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { observer->tkl = coap_header_get_token(request, observer->token); @@ -2013,8 +2013,8 @@ bool coap_remove_observer(struct coap_resource *resource, return true; } -static bool sockaddr_equal(const struct sockaddr *a, - const struct sockaddr *b) +static bool sockaddr_equal(const struct net_sockaddr *a, + const struct net_sockaddr *b) { /* FIXME: Should we consider ipv6-mapped ipv4 addresses as equal to * ipv4 addresses? @@ -2023,9 +2023,9 @@ static bool sockaddr_equal(const struct sockaddr *a, return false; } - if (a->sa_family == AF_INET) { - const struct sockaddr_in *a4 = net_sin(a); - const struct sockaddr_in *b4 = net_sin(b); + if (a->sa_family == NET_AF_INET) { + const struct net_sockaddr_in *a4 = net_sin(a); + const struct net_sockaddr_in *b4 = net_sin(b); if (a4->sin_port != b4->sin_port) { return false; @@ -2034,9 +2034,9 @@ static bool sockaddr_equal(const struct sockaddr *a, return net_ipv4_addr_cmp(&a4->sin_addr, &b4->sin_addr); } - if (b->sa_family == AF_INET6) { - const struct sockaddr_in6 *a6 = net_sin6(a); - const struct sockaddr_in6 *b6 = net_sin6(b); + if (b->sa_family == NET_AF_INET6) { + const struct net_sockaddr_in6 *a6 = net_sin6(a); + const struct net_sockaddr_in6 *b6 = net_sin6(b); if (a6->sin6_port != b6->sin6_port) { return false; @@ -2051,7 +2051,7 @@ static bool sockaddr_equal(const struct sockaddr *a, struct coap_observer *coap_find_observer( struct coap_observer *observers, size_t len, - const struct sockaddr *addr, + const struct net_sockaddr *addr, const uint8_t *token, uint8_t token_len) { if (token_len == 0U || token_len > COAP_TOKEN_MAX_LEN) { @@ -2073,7 +2073,7 @@ struct coap_observer *coap_find_observer( struct coap_observer *coap_find_observer_by_addr( struct coap_observer *observers, size_t len, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { size_t i; diff --git a/subsys/net/lib/coap/coap_client.c b/subsys/net/lib/coap/coap_client.c index 9f6e689d9107d..8a5ee85416ee2 100644 --- a/subsys/net/lib/coap/coap_client.c +++ b/subsys/net/lib/coap/coap_client.c @@ -37,7 +37,7 @@ static struct coap_client_internal_request *get_request_with_mid(struct coap_cli uint16_t mid); static int send_request(int sock, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, net_socklen_t addrlen) { int ret; @@ -52,7 +52,7 @@ static int send_request(int sock, const void *buf, size_t len, int flags, } static int receive(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, net_socklen_t *addrlen) { ssize_t err; @@ -414,7 +414,7 @@ static int coap_client_init_request(struct coap_client *client, return ret; } -int coap_client_req(struct coap_client *client, int sock, const struct sockaddr *addr, +int coap_client_req(struct coap_client *client, int sock, const struct net_sockaddr *addr, struct coap_client_request *req, struct coap_transmission_parameters *params) { int ret; diff --git a/subsys/net/lib/coap/coap_server.c b/subsys/net/lib/coap/coap_server.c index 27e4267167ffd..e085ef9dfb8f4 100644 --- a/subsys/net/lib/coap/coap_server.c +++ b/subsys/net/lib/coap/coap_server.c @@ -27,8 +27,8 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL); #endif #define ADDRLEN(sock) \ - (((struct sockaddr *)sock)->sa_family == AF_INET ? \ - sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)) + (((struct net_sockaddr *)sock)->sa_family == NET_AF_INET ? \ + sizeof(struct net_sockaddr_in) : sizeof(struct net_sockaddr_in6)) /* Shortened defines */ #define MAX_OPTIONS CONFIG_COAP_SERVER_MESSAGE_OPTIONS @@ -84,7 +84,7 @@ static inline void coap_server_free(void *ptr) static int coap_service_remove_observer(const struct coap_service *service, struct coap_resource *resource, - const struct sockaddr *addr, + const struct net_sockaddr *addr, const uint8_t *token, uint8_t tkl) { struct coap_observer *obs; @@ -126,8 +126,8 @@ static int coap_server_process(int sock_fd) { static uint8_t buf[CONFIG_COAP_SERVER_MESSAGE_SIZE]; - struct sockaddr client_addr; - socklen_t client_addr_len = sizeof(client_addr); + struct net_sockaddr client_addr; + net_socklen_t client_addr_len = sizeof(client_addr); struct coap_service *service = NULL; struct coap_packet request; struct coap_pending *pending; @@ -405,16 +405,16 @@ int coap_service_start(const struct coap_service *service) int ret; uint8_t af; - socklen_t len; - struct sockaddr_storage addr_storage; + net_socklen_t len; + struct net_sockaddr_storage addr_storage; union { - struct sockaddr *addr; - struct sockaddr_in *addr4; - struct sockaddr_in6 *addr6; + struct net_sockaddr *addr; + struct net_sockaddr_in *addr4; + struct net_sockaddr_in6 *addr6; } addr_ptrs = { - .addr = (struct sockaddr *)&addr_storage, + .addr = (struct net_sockaddr *)&addr_storage, }; - int proto = IPPROTO_UDP; + int proto = NET_IPPROTO_UDP; if (!coap_service_in_section(service)) { __ASSERT_NO_MSG(false); @@ -428,37 +428,37 @@ int coap_service_start(const struct coap_service *service) goto end; } - /* set the default address (in6addr_any / INADDR_ANY are all 0) */ - addr_storage = (struct sockaddr_storage){0}; + /* set the default address (in6addr_any / NET_INADDR_ANY are all 0) */ + addr_storage = (struct net_sockaddr_storage){0}; if (IS_ENABLED(CONFIG_NET_IPV6) && service->host != NULL && - zsock_inet_pton(AF_INET6, service->host, &addr_ptrs.addr6->sin6_addr) == 1) { + zsock_inet_pton(NET_AF_INET6, service->host, &addr_ptrs.addr6->sin6_addr) == 1) { /* if a literal IPv6 address is provided as the host, use IPv6 */ - af = AF_INET6; - len = sizeof(struct sockaddr_in6); + af = NET_AF_INET6; + len = sizeof(struct net_sockaddr_in6); - addr_ptrs.addr6->sin6_family = AF_INET6; - addr_ptrs.addr6->sin6_port = htons(*service->port); + addr_ptrs.addr6->sin6_family = NET_AF_INET6; + addr_ptrs.addr6->sin6_port = net_htons(*service->port); } else if (IS_ENABLED(CONFIG_NET_IPV4) && service->host != NULL && - zsock_inet_pton(AF_INET, service->host, &addr_ptrs.addr4->sin_addr) == 1) { + zsock_inet_pton(NET_AF_INET, service->host, &addr_ptrs.addr4->sin_addr) == 1) { /* if a literal IPv4 address is provided as the host, use IPv4 */ - af = AF_INET; - len = sizeof(struct sockaddr_in); + af = NET_AF_INET; + len = sizeof(struct net_sockaddr_in); - addr_ptrs.addr4->sin_family = AF_INET; - addr_ptrs.addr4->sin_port = htons(*service->port); + addr_ptrs.addr4->sin_family = NET_AF_INET; + addr_ptrs.addr4->sin_port = net_htons(*service->port); } else if (IS_ENABLED(CONFIG_NET_IPV6)) { /* prefer IPv6 if both IPv6 and IPv4 are supported */ - af = AF_INET6; - len = sizeof(struct sockaddr_in6); + af = NET_AF_INET6; + len = sizeof(struct net_sockaddr_in6); - addr_ptrs.addr6->sin6_family = AF_INET6; - addr_ptrs.addr6->sin6_port = htons(*service->port); + addr_ptrs.addr6->sin6_family = NET_AF_INET6; + addr_ptrs.addr6->sin6_port = net_htons(*service->port); } else if (IS_ENABLED(CONFIG_NET_IPV4)) { - af = AF_INET; - len = sizeof(struct sockaddr_in); + af = NET_AF_INET; + len = sizeof(struct net_sockaddr_in); - addr_ptrs.addr4->sin_family = AF_INET; - addr_ptrs.addr4->sin_port = htons(*service->port); + addr_ptrs.addr4->sin_family = NET_AF_INET; + addr_ptrs.addr4->sin_port = net_htons(*service->port); } else { ret = -ENOTSUP; goto end; @@ -466,11 +466,11 @@ int coap_service_start(const struct coap_service *service) #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) if (service->sec_tag_list != NULL) { - proto = IPPROTO_DTLS_1_2; + proto = NET_IPPROTO_DTLS_1_2; } #endif - service->data->sock_fd = zsock_socket(af, SOCK_DGRAM, proto); + service->data->sock_fd = zsock_socket(af, NET_SOCK_DGRAM, proto); if (service->data->sock_fd < 0) { ret = -errno; goto end; @@ -478,16 +478,17 @@ int coap_service_start(const struct coap_service *service) #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) if (service->sec_tag_list != NULL) { - int role = TLS_DTLS_ROLE_SERVER; + int role = ZSOCK_TLS_DTLS_ROLE_SERVER; - ret = zsock_setsockopt(service->data->sock_fd, SOL_TLS, TLS_SEC_TAG_LIST, + ret = zsock_setsockopt(service->data->sock_fd, ZSOCK_SOL_TLS, + ZSOCK_TLS_SEC_TAG_LIST, service->sec_tag_list, service->sec_tag_list_size); if (ret < 0) { ret = -errno; goto close; } - ret = zsock_setsockopt(service->data->sock_fd, SOL_TLS, TLS_DTLS_ROLE, + ret = zsock_setsockopt(service->data->sock_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_DTLS_ROLE, &role, sizeof(role)); if (ret < 0) { ret = -errno; @@ -516,7 +517,7 @@ int coap_service_start(const struct coap_service *service) goto close; } - if (af == AF_INET6) { + if (af == NET_AF_INET6) { *service->port = addr_ptrs.addr6->sin6_port; } else { *service->port = addr_ptrs.addr4->sin_port; @@ -587,7 +588,7 @@ int coap_service_is_running(const struct coap_service *service) } int coap_service_send(const struct coap_service *service, const struct coap_packet *cpkt, - const struct sockaddr *addr, socklen_t addr_len, + const struct net_sockaddr *addr, net_socklen_t addr_len, const struct coap_transmission_parameters *params) { int ret; @@ -652,7 +653,7 @@ int coap_service_send(const struct coap_service *service, const struct coap_pack } int coap_resource_send(const struct coap_resource *resource, const struct coap_packet *cpkt, - const struct sockaddr *addr, socklen_t addr_len, + const struct net_sockaddr *addr, net_socklen_t addr_len, const struct coap_transmission_parameters *params) { /* Find owning service */ @@ -666,7 +667,7 @@ int coap_resource_send(const struct coap_resource *resource, const struct coap_p } int coap_resource_parse_observe(struct coap_resource *resource, const struct coap_packet *request, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { const struct coap_service *service = NULL; int ret; @@ -741,7 +742,7 @@ int coap_resource_parse_observe(struct coap_resource *resource, const struct coa } static int coap_resource_remove_observer(struct coap_resource *resource, - const struct sockaddr *addr, + const struct net_sockaddr *addr, const uint8_t *token, uint8_t token_len) { const struct coap_service *service = NULL; @@ -776,7 +777,7 @@ static int coap_resource_remove_observer(struct coap_resource *resource, } int coap_resource_remove_observer_by_addr(struct coap_resource *resource, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { return coap_resource_remove_observer(resource, addr, NULL, 0); } diff --git a/subsys/net/lib/config/init.c b/subsys/net/lib/config/init.c index 22500fd8f8443..77af9e9fc9e1c 100644 --- a/subsys/net/lib/config/init.c +++ b/subsys/net/lib/config/init.c @@ -78,16 +78,16 @@ static void print_dhcpv4_info(struct net_if *iface) #if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF NET_INFO("IPv4 address: %s", - net_addr_ntop(AF_INET, &if_addr->address.in_addr, + net_addr_ntop(NET_AF_INET, &if_addr->address.in_addr, hr_addr, sizeof(hr_addr))); NET_INFO("Lease time: %u seconds", iface->config.dhcpv4.lease_time); NET_INFO("Subnet: %s", - net_addr_ntop(AF_INET, + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->unicast[i].netmask, hr_addr, sizeof(hr_addr))); NET_INFO("Router: %s", - net_addr_ntop(AF_INET, &iface->config.ip.ipv4->gw, + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->gw, hr_addr, sizeof(hr_addr))); #endif break; @@ -144,7 +144,7 @@ static void setup_ipv4(struct net_if *iface) #if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF char hr_addr[NET_IPV4_ADDR_LEN]; #endif - struct in_addr addr, netmask; + struct net_in_addr addr, netmask; if (IS_ENABLED(CONFIG_NET_IPV4_ACD) || IS_ENABLED(CONFIG_NET_DHCPV4)) { net_mgmt_init_event_callback(&mgmt4_cb, ipv4_addr_add_handler, @@ -158,7 +158,7 @@ static void setup_ipv4(struct net_if *iface) return; } - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) { + if (net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_MY_IPV4_ADDR, &addr)) { NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV4_ADDR); return; } @@ -181,12 +181,12 @@ static void setup_ipv4(struct net_if *iface) #if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF NET_INFO("IPv4 address: %s", - net_addr_ntop(AF_INET, &addr, hr_addr, sizeof(hr_addr))); + net_addr_ntop(NET_AF_INET, &addr, hr_addr, sizeof(hr_addr))); #endif if (sizeof(CONFIG_NET_CONFIG_MY_IPV4_NETMASK) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, + if (net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_MY_IPV4_NETMASK, &netmask)) { NET_ERR("Invalid netmask: %s", CONFIG_NET_CONFIG_MY_IPV4_NETMASK); @@ -197,7 +197,7 @@ static void setup_ipv4(struct net_if *iface) if (sizeof(CONFIG_NET_CONFIG_MY_IPV4_GW) > 1) { /* If not empty */ - if (net_addr_pton(AF_INET, CONFIG_NET_CONFIG_MY_IPV4_GW, + if (net_addr_pton(NET_AF_INET, CONFIG_NET_CONFIG_MY_IPV4_GW, &addr)) { NET_ERR("Invalid gateway: %s", CONFIG_NET_CONFIG_MY_IPV4_GW); @@ -241,7 +241,7 @@ static void setup_dhcpv6(struct net_if *iface) #endif static struct net_mgmt_event_callback mgmt6_cb; -static struct in6_addr laddr; +static struct net_in6_addr laddr; static void ipv6_event_handler(struct net_mgmt_event_callback *cb, uint64_t mgmt_event, struct net_if *iface) @@ -281,7 +281,7 @@ static void ipv6_event_handler(struct net_mgmt_event_callback *cb, #if CONFIG_NET_CONFIG_LOG_LEVEL >= LOG_LEVEL_INF NET_INFO("IPv6 address: %s", - net_addr_ntop(AF_INET6, &laddr, hr_addr, NET_IPV6_ADDR_LEN)); + net_addr_ntop(NET_AF_INET6, &laddr, hr_addr, NET_IPV6_ADDR_LEN)); if (ifaddr->addr_type == NET_ADDR_DHCP) { char remaining_str[] = "infinite"; @@ -317,7 +317,7 @@ static void setup_ipv6(struct net_if *iface, uint32_t flags) goto exit; } - if (net_addr_pton(AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &laddr)) { + if (net_addr_pton(NET_AF_INET6, CONFIG_NET_CONFIG_MY_IPV6_ADDR, &laddr)) { NET_ERR("Invalid address: %s", CONFIG_NET_CONFIG_MY_IPV6_ADDR); /* some interfaces may add IP address later */ mask |= NET_EVENT_IPV6_ADDR_ADD; diff --git a/subsys/net/lib/config/init_clock_sntp.c b/subsys/net/lib/config/init_clock_sntp.c index e0b3063eb1db0..2deff9423001d 100644 --- a/subsys/net/lib/config/init_clock_sntp.c +++ b/subsys/net/lib/config/init_clock_sntp.c @@ -31,11 +31,11 @@ static int sntp_init_helper(struct sntp_time *tm) struct net_if *iface = net_if_get_default(); if (!net_ipv4_is_addr_unspecified(&iface->config.dhcpv4.ntp_addr)) { - struct sockaddr_in sntp_addr = {0}; + struct net_sockaddr_in sntp_addr = {0}; - sntp_addr.sin_family = AF_INET; + sntp_addr.sin_family = NET_AF_INET; sntp_addr.sin_addr.s_addr = iface->config.dhcpv4.ntp_addr.s_addr; - return sntp_simple_addr((struct sockaddr *)&sntp_addr, sizeof(sntp_addr), + return sntp_simple_addr((struct net_sockaddr *)&sntp_addr, sizeof(sntp_addr), CONFIG_NET_CONFIG_SNTP_INIT_TIMEOUT, tm); } if (sizeof(CONFIG_NET_CONFIG_SNTP_INIT_SERVER) == 1) { diff --git a/subsys/net/lib/dhcpv4/dhcpv4.c b/subsys/net/lib/dhcpv4/dhcpv4.c index 52b64e9746a89..6505309c91a2c 100644 --- a/subsys/net/lib/dhcpv4/dhcpv4.c +++ b/subsys/net/lib/dhcpv4/dhcpv4.c @@ -170,14 +170,14 @@ static bool dhcpv4_add_req_options(struct net_pkt *pkt) } static bool dhcpv4_add_server_id(struct net_pkt *pkt, - const struct in_addr *addr) + const struct net_in_addr *addr) { return dhcpv4_add_option_length_value(pkt, DHCPV4_OPTIONS_SERVER_ID, 4, addr->s4_addr); } static bool dhcpv4_add_req_ipaddr(struct net_pkt *pkt, - const struct in_addr *addr) + const struct net_in_addr *addr) { return dhcpv4_add_option_length_value(pkt, DHCPV4_OPTIONS_REQ_IPADDR, 4, addr->s4_addr); @@ -233,13 +233,13 @@ static inline bool dhcpv4_add_sname(struct net_pkt *pkt) /* Create DHCPv4 message and add options as per message type */ static struct net_pkt *dhcpv4_create_message(struct net_if *iface, uint8_t type, - const struct in_addr *ciaddr, - const struct in_addr *src_addr, - const struct in_addr *server_addr, + const struct net_in_addr *ciaddr, + const struct net_in_addr *src_addr, + const struct net_in_addr *server_addr, bool server_id, bool requested_ip) { NET_PKT_DATA_ACCESS_DEFINE(dhcp_access, struct dhcp_msg); - const struct in_addr *addr; + const struct net_in_addr *addr; size_t size = DHCPV4_MESSAGE_SIZE; struct net_pkt *pkt; struct dhcp_msg *msg; @@ -285,8 +285,8 @@ static struct net_pkt *dhcpv4_create_message(struct net_if *iface, uint8_t type, } #endif - pkt = net_pkt_alloc_with_buffer(iface, size, AF_INET, - IPPROTO_UDP, PKT_WAIT_TIME); + pkt = net_pkt_alloc_with_buffer(iface, size, NET_AF_INET, + NET_IPPROTO_UDP, PKT_WAIT_TIME); if (!pkt) { return NULL; } @@ -294,8 +294,8 @@ static struct net_pkt *dhcpv4_create_message(struct net_if *iface, uint8_t type, net_pkt_set_ipv4_ttl(pkt, 0xFF); if (net_ipv4_create(pkt, addr, server_addr) || - net_udp_create(pkt, htons(DHCPV4_CLIENT_PORT), - htons(DHCPV4_SERVER_PORT))) { + net_udp_create(pkt, net_htons(DHCPV4_CLIENT_PORT), + net_htons(DHCPV4_SERVER_PORT))) { goto fail; } @@ -306,9 +306,9 @@ static struct net_pkt *dhcpv4_create_message(struct net_if *iface, uint8_t type, msg->op = DHCPV4_MSG_BOOT_REQUEST; msg->htype = HARDWARE_ETHERNET_TYPE; msg->hlen = net_if_get_link_addr(iface)->len; - msg->xid = htonl(iface->config.dhcpv4.xid); + msg->xid = net_htonl(iface->config.dhcpv4.xid); msg->flags = IS_ENABLED(CONFIG_NET_DHCPV4_ACCEPT_UNICAST) ? - htons(DHCPV4_MSG_UNICAST) : htons(DHCPV4_MSG_BROADCAST); + net_htons(DHCPV4_MSG_UNICAST) : net_htons(DHCPV4_MSG_BROADCAST); if (ciaddr) { /* The ciaddr field was zero'd out above, if we are @@ -363,7 +363,7 @@ static struct net_pkt *dhcpv4_create_message(struct net_if *iface, uint8_t type, net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_UDP); + net_ipv4_finalize(pkt, NET_IPPROTO_UDP); return pkt; @@ -537,9 +537,9 @@ static uint32_t dhcpv4_update_rebind_timeout(struct net_if *iface) */ static uint32_t dhcpv4_send_request(struct net_if *iface) { - const struct in_addr *server_addr = net_ipv4_broadcast_address(); - const struct in_addr *ciaddr = NULL; - const struct in_addr *src_addr = NULL; + const struct net_in_addr *server_addr = net_ipv4_broadcast_address(); + const struct net_in_addr *ciaddr = NULL; + const struct net_in_addr *src_addr = NULL; bool with_server_id = false; bool with_requested_ip = false; struct net_pkt *pkt = NULL; @@ -564,7 +564,7 @@ static uint32_t dhcpv4_send_request(struct net_if *iface) with_server_id = true; with_requested_ip = true; memcpy(&iface->config.dhcpv4.request_server_addr, &iface->config.dhcpv4.server_id, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); timeout = dhcpv4_update_message_timeout(&iface->config.dhcpv4); break; case NET_DHCPV4_RENEWING: @@ -697,8 +697,8 @@ static void dhcpv4_enter_selecting(struct net_if *iface) iface->config.dhcpv4.renewal_time = 0U; iface->config.dhcpv4.rebinding_time = 0U; - iface->config.dhcpv4.server_id.s_addr = INADDR_ANY; - iface->config.dhcpv4.requested_ip.s_addr = INADDR_ANY; + iface->config.dhcpv4.server_id.s_addr = NET_INADDR_ANY; + iface->config.dhcpv4.requested_ip.s_addr = NET_INADDR_ANY; iface->config.dhcpv4.state = NET_DHCPV4_SELECTING; NET_DBG("enter state=%s", @@ -1019,7 +1019,7 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, switch (type) { case DHCPV4_OPTIONS_SUBNET_MASK: { - struct in_addr netmask; + struct net_in_addr netmask; if (length != 4U) { NET_ERR("options_subnet_mask, bad length"); @@ -1038,7 +1038,7 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, break; } case DHCPV4_OPTIONS_ROUTER: { - struct in_addr router; + struct net_in_addr router; /* Router option may present 1 or more * addresses for routers on the clients @@ -1067,7 +1067,7 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, #if defined(CONFIG_NET_DHCPV4_OPTION_PRINT_IGNORED) case DHCPV4_OPTIONS_BROADCAST: { - struct in_addr bcast; + struct net_in_addr bcast; /* Broadcast address option may present 1 address */ if (length != 4) { @@ -1130,13 +1130,13 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, #define MAX_DNS_SERVERS CONFIG_DNS_RESOLVER_MAX_SERVERS case DHCPV4_OPTIONS_DNS_SERVER: { struct dns_resolve_context *ctx; - struct sockaddr_in dnses[MAX_DNS_SERVERS] = { 0 }; - const struct sockaddr *dns_servers[MAX_DNS_SERVERS + 1] = { 0 }; + struct net_sockaddr_in dnses[MAX_DNS_SERVERS] = { 0 }; + const struct net_sockaddr *dns_servers[MAX_DNS_SERVERS + 1] = { 0 }; const uint8_t addr_size = 4U; int status; for (uint8_t i = 0; i < MAX_DNS_SERVERS; i++) { - dns_servers[i] = (struct sockaddr *)&dnses[i]; + dns_servers[i] = (struct net_sockaddr *)&dnses[i]; } /* DNS server option may present 1 or more @@ -1178,7 +1178,7 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, ctx = dns_resolve_get_default(); for (uint8_t i = 0; i < dns_servers_cnt; i++) { - dnses[i].sin_family = AF_INET; + dnses[i].sin_family = NET_AF_INET; } if (IS_ENABLED(CONFIG_NET_DHCPV4_DNS_SERVER_VIA_INTERFACE)) { @@ -1212,7 +1212,7 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, #endif #if defined(CONFIG_LOG_BACKEND_NET_USE_DHCPV4_OPTION) case DHCPV4_OPTIONS_LOG_SERVER: { - struct sockaddr_in log_server = { 0 }; + struct net_sockaddr_in log_server = { 0 }; /* Log server option may present 1 or more * addresses. Each 4 bytes in length. Log @@ -1231,8 +1231,8 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, return false; } - log_server.sin_family = AF_INET; - log_backend_net_set_ip((struct sockaddr *)&log_server); + log_server.sin_family = NET_AF_INET; + log_backend_net_set_ip((struct net_sockaddr *)&log_server); if (IS_ENABLED(CONFIG_LOG_BACKEND_NET_AUTOSTART) && !IS_ENABLED(CONFIG_NET_CONFIG_SETTINGS) && @@ -1400,7 +1400,7 @@ static bool dhcpv4_parse_options(struct net_pkt *pkt, end: if (*msg_type == NET_DHCPV4_MSG_TYPE_OFFER && !router_present) { - struct in_addr any = INADDR_ANY_INIT; + struct net_in_addr any = NET_INADDR_ANY_INIT; net_if_ipv4_set_gw(iface, &any); } @@ -1592,7 +1592,7 @@ static enum net_verdict net_dhcpv4_input(struct net_conn *conn, NET_DBG("Received dhcp msg [op=0x%x htype=0x%x hlen=%u xid=0x%x " "secs=%u flags=0x%x chaddr=%s", - msg->op, msg->htype, msg->hlen, ntohl(msg->xid), + msg->op, msg->htype, msg->hlen, net_ntohl(msg->xid), msg->secs, msg->flags, net_sprint_ll_addr(msg->chaddr, 6)); NET_DBG(" ciaddr=%d.%d.%d.%d", @@ -1607,12 +1607,12 @@ static enum net_verdict net_dhcpv4_input(struct net_conn *conn, k_mutex_lock(&lock, K_FOREVER); if (!(msg->op == DHCPV4_MSG_BOOT_REPLY && - iface->config.dhcpv4.xid == ntohl(msg->xid) && + iface->config.dhcpv4.xid == net_ntohl(msg->xid) && !memcmp(msg->chaddr, net_if_get_link_addr(iface)->addr, net_if_get_link_addr(iface)->len))) { NET_DBG("Unexpected op (%d), xid (%x vs %x) or chaddr", - msg->op, iface->config.dhcpv4.xid, ntohl(msg->xid)); + msg->op, iface->config.dhcpv4.xid, net_ntohl(msg->xid)); goto drop; } @@ -1634,7 +1634,7 @@ static enum net_verdict net_dhcpv4_input(struct net_conn *conn, } memcpy(&iface->config.dhcpv4.response_src_addr, ip_hdr->ipv4->src, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); dhcpv4_handle_reply(iface, msg_type, msg); @@ -1716,18 +1716,18 @@ static void dhcpv4_acd_event_handler(struct net_mgmt_event_callback *cb, uint64_t mgmt_event, struct net_if *iface) { sys_snode_t *node = NULL; - struct in_addr *addr; + struct net_in_addr *addr; if (mgmt_event != NET_EVENT_IPV4_ACD_FAILED && mgmt_event != NET_EVENT_IPV4_ACD_CONFLICT) { return; } - if (cb->info_length != sizeof(struct in_addr)) { + if (cb->info_length != sizeof(struct net_in_addr)) { return; } - addr = (struct in_addr *)cb->info; + addr = (struct net_in_addr *)cb->info; k_mutex_lock(&lock, K_FOREVER); @@ -1811,7 +1811,7 @@ static void dhcpv4_start_internal(struct net_if *iface, bool first_start) switch (iface->config.dhcpv4.state) { case NET_DHCPV4_DISABLED: if (IS_ENABLED(CONFIG_NET_DHCPV4_INIT_REBOOT) && - iface->config.dhcpv4.requested_ip.s_addr != INADDR_ANY) { + iface->config.dhcpv4.requested_ip.s_addr != NET_INADDR_ANY) { iface->config.dhcpv4.state = NET_DHCPV4_INIT_REBOOT; } else { iface->config.dhcpv4.state = NET_DHCPV4_INIT; @@ -2003,20 +2003,20 @@ void net_dhcpv4_restart(struct net_if *iface) int net_dhcpv4_init(void) { - struct sockaddr local_addr; + struct net_sockaddr local_addr; int ret; NET_DBG(""); net_ipaddr_copy(&net_sin(&local_addr)->sin_addr, net_ipv4_unspecified_address()); - local_addr.sa_family = AF_INET; + local_addr.sa_family = NET_AF_INET; /* Register UDP input callback on * DHCPV4_SERVER_PORT(67) and DHCPV4_CLIENT_PORT(68) for * all dhcpv4 related incoming packets. */ - ret = net_udp_register(AF_INET, NULL, &local_addr, + ret = net_udp_register(NET_AF_INET, NULL, &local_addr, 0, DHCPV4_CLIENT_PORT, NULL, net_dhcpv4_input, NULL, NULL); if (ret < 0) { @@ -2078,7 +2078,7 @@ bool net_dhcpv4_accept_unicast(struct net_pkt *pkt) goto out; } - if (udp_hdr->dst_port != htons(DHCPV4_CLIENT_PORT)) { + if (udp_hdr->dst_port != net_htons(DHCPV4_CLIENT_PORT)) { goto out; } diff --git a/subsys/net/lib/dhcpv4/dhcpv4_server.c b/subsys/net/lib/dhcpv4/dhcpv4_server.c index 3ecf8c5686f74..bef61c72c54c9 100644 --- a/subsys/net/lib/dhcpv4/dhcpv4_server.c +++ b/subsys/net/lib/dhcpv4/dhcpv4_server.c @@ -64,8 +64,8 @@ struct dhcpv4_server_ctx { int sock; struct k_work_delayable timeout_work; struct dhcpv4_addr_slot addr_pool[CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT]; - struct in_addr server_addr; - struct in_addr netmask; + struct net_in_addr server_addr; + struct net_in_addr netmask; #if defined(DHCPV4_SERVER_ICMP_PROBE) struct dhcpv4_server_probe_ctx probe_ctx; #endif @@ -175,7 +175,7 @@ static int dhcpv4_find_message_type_option(uint8_t *data, size_t datalen, } static int dhcpv4_find_server_id_option(uint8_t *data, size_t datalen, - struct in_addr *server_id) + struct net_in_addr *server_id) { uint8_t *opt; uint8_t optlen; @@ -186,11 +186,11 @@ static int dhcpv4_find_server_id_option(uint8_t *data, size_t datalen, return -ENOENT; } - if (optlen != sizeof(struct in_addr)) { + if (optlen != sizeof(struct net_in_addr)) { return -EINVAL; } - memcpy(server_id, opt, sizeof(struct in_addr)); + memcpy(server_id, opt, sizeof(struct net_in_addr)); return 0; } @@ -223,7 +223,7 @@ static int dhcpv4_find_client_id_option(uint8_t *data, size_t datalen, } static int dhcpv4_find_requested_ip_option(uint8_t *data, size_t datalen, - struct in_addr *requested_ip) + struct net_in_addr *requested_ip) { uint8_t *opt; uint8_t optlen; @@ -234,11 +234,11 @@ static int dhcpv4_find_requested_ip_option(uint8_t *data, size_t datalen, return -ENOENT; } - if (optlen != sizeof(struct in_addr)) { + if (optlen != sizeof(struct net_in_addr)) { return -EINVAL; } - memcpy(requested_ip, opt, sizeof(struct in_addr)); + memcpy(requested_ip, opt, sizeof(struct net_in_addr)); return 0; } @@ -336,15 +336,15 @@ static uint8_t *dhcpv4_encode_message_type_option(uint8_t *buf, size_t *buflen, } static uint8_t *dhcpv4_encode_server_id_option(uint8_t *buf, size_t *buflen, - struct in_addr *server_id) + struct net_in_addr *server_id) { if (buf == NULL || *buflen < DHCPV4_OPTIONS_SERVER_ID_SIZE) { return NULL; } buf[0] = DHCPV4_OPTIONS_SERVER_ID; - buf[1] = sizeof(struct in_addr); - memcpy(&buf[2], server_id->s4_addr, sizeof(struct in_addr)); + buf[1] = sizeof(struct net_in_addr); + memcpy(&buf[2], server_id->s4_addr, sizeof(struct net_in_addr)); *buflen -= DHCPV4_OPTIONS_SERVER_ID_SIZE; @@ -368,15 +368,15 @@ static uint8_t *dhcpv4_encode_client_id_option(uint8_t *buf, size_t *buflen, } static uint8_t *dhcpv4_encode_subnet_mask_option(uint8_t *buf, size_t *buflen, - struct in_addr *mask) + struct net_in_addr *mask) { if (buf == NULL || *buflen < DHCPV4_OPTIONS_SUBNET_MASK_SIZE) { return NULL; } buf[0] = DHCPV4_OPTIONS_SUBNET_MASK; - buf[1] = sizeof(struct in_addr); - memcpy(&buf[2], mask->s4_addr, sizeof(struct in_addr)); + buf[1] = sizeof(struct net_in_addr); + memcpy(&buf[2], mask->s4_addr, sizeof(struct net_in_addr)); *buflen -= DHCPV4_OPTIONS_SUBNET_MASK_SIZE; @@ -384,15 +384,15 @@ static uint8_t *dhcpv4_encode_subnet_mask_option(uint8_t *buf, size_t *buflen, } static uint8_t *dhcpv4_encode_router_option(uint8_t *buf, size_t *buflen, - struct in_addr *router) + struct net_in_addr *router) { if (buf == NULL || *buflen < DHCPV4_OPTIONS_ROUTER_SIZE) { return NULL; } buf[0] = DHCPV4_OPTIONS_ROUTER; - buf[1] = sizeof(struct in_addr); - memcpy(&buf[2], router->s4_addr, sizeof(struct in_addr)); + buf[1] = sizeof(struct net_in_addr); + memcpy(&buf[2], router->s4_addr, sizeof(struct net_in_addr)); *buflen -= DHCPV4_OPTIONS_ROUTER_SIZE; @@ -401,21 +401,21 @@ static uint8_t *dhcpv4_encode_router_option(uint8_t *buf, size_t *buflen, static uint8_t *dhcpv4_encode_dns_server_option(uint8_t *buf, size_t *buflen) { - struct in_addr dns_address; + struct net_in_addr dns_address; if (buf == NULL || *buflen < DHCPV4_OPTIONS_DNS_SERVER_SIZE) { return NULL; } - if (net_addr_pton(AF_INET, CONFIG_NET_DHCPV4_SERVER_OPTION_DNS_ADDRESS, &dns_address)) { + if (net_addr_pton(NET_AF_INET, CONFIG_NET_DHCPV4_SERVER_OPTION_DNS_ADDRESS, &dns_address)) { LOG_ERR("Invalid DNS server address: %s", CONFIG_NET_DHCPV4_SERVER_OPTION_DNS_ADDRESS); return NULL; } buf[0] = DHCPV4_OPTIONS_DNS_SERVER; - buf[1] = sizeof(struct in_addr); - memcpy(&buf[2], dns_address.s4_addr, sizeof(struct in_addr)); + buf[1] = sizeof(struct net_in_addr); + memcpy(&buf[2], dns_address.s4_addr, sizeof(struct net_in_addr)); *buflen -= DHCPV4_OPTIONS_DNS_SERVER_SIZE; @@ -439,7 +439,7 @@ static uint8_t *dhcpv4_encode_end_option(uint8_t *buf, size_t *buflen) static uint8_t *dhcpv4_encode_header(uint8_t *buf, size_t *buflen, struct dhcp_msg *msg, - struct in_addr *yiaddr) + struct net_in_addr *yiaddr) { struct dhcp_msg *reply_msg = (struct dhcp_msg *)buf; @@ -456,7 +456,7 @@ static uint8_t *dhcpv4_encode_header(uint8_t *buf, size_t *buflen, reply_msg->flags = msg->flags; memcpy(reply_msg->ciaddr, msg->ciaddr, sizeof(reply_msg->ciaddr)); if (yiaddr != NULL) { - memcpy(reply_msg->yiaddr, yiaddr, sizeof(struct in_addr)); + memcpy(reply_msg->yiaddr, yiaddr, sizeof(struct net_in_addr)); } else { memset(reply_msg->yiaddr, 0, sizeof(reply_msg->ciaddr)); } @@ -549,14 +549,14 @@ static uint8_t *dhcpv4_encode_requested_params( static int dhcpv4_send(struct dhcpv4_server_ctx *ctx, enum net_dhcpv4_msg_type type, uint8_t *reply, size_t len, struct dhcp_msg *msg, - struct in_addr *yiaddr) + struct net_in_addr *yiaddr) { - struct sockaddr_in dst_addr = { - .sin_family = AF_INET, - .sin_port = htons(DHCPV4_CLIENT_PORT), + struct net_sockaddr_in dst_addr = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(DHCPV4_CLIENT_PORT), }; - struct in_addr giaddr; /* Relay agent address */ - struct in_addr ciaddr; /* Client address */ + struct net_in_addr giaddr; /* Relay agent address */ + struct net_in_addr ciaddr; /* Client address */ int ret; memcpy(&giaddr, msg->giaddr, sizeof(giaddr)); @@ -570,7 +570,7 @@ static int dhcpv4_send(struct dhcpv4_server_ctx *ctx, enum net_dhcpv4_msg_type t * appears in 'giaddr'. */ dst_addr.sin_addr = giaddr; - dst_addr.sin_port = htons(DHCPV4_SERVER_PORT); + dst_addr.sin_port = net_htons(DHCPV4_SERVER_PORT); } else if (type == NET_DHCPV4_MSG_TYPE_NAK) { /* In all cases, when 'giaddr' is zero, the server broadcasts * any DHCPNAK messages to 0xffffffff. @@ -582,7 +582,7 @@ static int dhcpv4_send(struct dhcpv4_server_ctx *ctx, enum net_dhcpv4_msg_type t * messages to the address in 'ciaddr'. */ dst_addr.sin_addr = ciaddr; - } else if (ntohs(msg->flags) & DHCPV4_MSG_BROADCAST) { + } else if (net_ntohs(msg->flags) & DHCPV4_MSG_BROADCAST) { /* If 'giaddr' is zero and 'ciaddr' is zero, and the broadcast * bit is set, then the server broadcasts DHCPOFFER and DHCPACK * messages to 0xffffffff. @@ -604,7 +604,7 @@ static int dhcpv4_send(struct dhcpv4_server_ctx *ctx, enum net_dhcpv4_msg_type t return -EDESTADDRREQ; } - ret = zsock_sendto(ctx->sock, reply, len, 0, (struct sockaddr *)&dst_addr, + ret = zsock_sendto(ctx->sock, reply, len, 0, (struct net_sockaddr *)&dst_addr, sizeof(dst_addr)); if (ret < 0) { return -errno; @@ -614,7 +614,7 @@ static int dhcpv4_send(struct dhcpv4_server_ctx *ctx, enum net_dhcpv4_msg_type t } static int dhcpv4_send_offer(struct dhcpv4_server_ctx *ctx, struct dhcp_msg *msg, - struct in_addr *addr, uint32_t lease_time, + struct net_in_addr *addr, uint32_t lease_time, struct dhcpv4_parameter_request_list *params, struct dhcpv4_client_id *client_id) { @@ -654,7 +654,7 @@ static int dhcpv4_send_offer(struct dhcpv4_server_ctx *ctx, struct dhcp_msg *msg } static int dhcpv4_send_ack(struct dhcpv4_server_ctx *ctx, struct dhcp_msg *msg, - struct in_addr *addr, uint32_t lease_time, + struct net_in_addr *addr, uint32_t lease_time, struct dhcpv4_parameter_request_list *params, struct dhcpv4_client_id *client_id, bool inform) @@ -778,14 +778,14 @@ static uint32_t dhcpv4_get_lease_time(uint8_t *options, uint8_t optlen) static int dhcpv4_probe_address(struct dhcpv4_server_ctx *ctx, struct dhcpv4_addr_slot *slot) { - struct sockaddr_in dest_addr = { - .sin_family = AF_INET, + struct net_sockaddr_in dest_addr = { + .sin_family = NET_AF_INET, .sin_addr = slot->addr, }; int ret; ret = net_icmp_send_echo_request(&ctx->probe_ctx.icmp_ctx, ctx->iface, - (struct sockaddr *)&dest_addr, + (struct net_sockaddr *)&dest_addr, NULL, ctx); if (ret < 0) { LOG_ERR("Failed to send ICMP probe"); @@ -803,7 +803,7 @@ static int echo_reply_handler(struct net_icmp_ctx *icmp_ctx, struct dhcpv4_server_ctx *ctx = user_data; struct dhcpv4_server_probe_ctx *probe_ctx; struct dhcpv4_addr_slot *new_slot = NULL; - struct in_addr peer_addr; + struct net_in_addr peer_addr; ARG_UNUSED(icmp_ctx); ARG_UNUSED(pkt); @@ -822,7 +822,7 @@ static int echo_reply_handler(struct net_icmp_ctx *icmp_ctx, goto out; } - if (ip_hdr->family != AF_INET) { + if (ip_hdr->family != NET_AF_INET) { goto out; } @@ -879,7 +879,7 @@ static int echo_reply_handler(struct net_icmp_ctx *icmp_ctx, static int dhcpv4_server_probing_init(struct dhcpv4_server_ctx *ctx) { - return net_icmp_init_ctx(&ctx->probe_ctx.icmp_ctx, AF_INET, + return net_icmp_init_ctx(&ctx->probe_ctx.icmp_ctx, NET_AF_INET, NET_ICMPV4_ECHO_REPLY, 0, echo_reply_handler); } @@ -985,7 +985,7 @@ static void dhcpv4_handle_discover(struct dhcpv4_server_ctx *ctx, selected = slot; break; } - struct in_addr addr = { 0 }; + struct net_in_addr addr = { 0 }; if (slot->state == DHCPV4_SERVER_ADDR_FREE && address_provider_callback) { @@ -1003,7 +1003,7 @@ static void dhcpv4_handle_discover(struct dhcpv4_server_ctx *ctx, /* 3. Check Requested IP Address option. */ if (selected == NULL) { - struct in_addr requested_ip; + struct net_in_addr requested_ip; ret = dhcpv4_find_requested_ip_option(options, optlen, &requested_ip); @@ -1026,7 +1026,7 @@ static void dhcpv4_handle_discover(struct dhcpv4_server_ctx *ctx, /* 4. Allocate new address from pool, if available. */ if (selected == NULL) { - struct in_addr giaddr; + struct net_in_addr giaddr; memcpy(&giaddr, msg->giaddr, sizeof(giaddr)); if (!net_ipv4_is_addr_unspecified(&giaddr)) { @@ -1112,7 +1112,7 @@ static void dhcpv4_handle_request(struct dhcpv4_server_ctx *ctx, struct dhcpv4_parameter_request_list params = { 0 }; struct dhcpv4_addr_slot *selected = NULL; struct dhcpv4_client_id client_id; - struct in_addr requested_ip, server_id, ciaddr, giaddr; + struct net_in_addr requested_ip, server_id, ciaddr, giaddr; int ret; memcpy(&ciaddr, msg->ciaddr, sizeof(ciaddr)); @@ -1287,7 +1287,7 @@ static void dhcpv4_handle_decline(struct dhcpv4_server_ctx *ctx, uint8_t optlen) { struct dhcpv4_client_id client_id; - struct in_addr requested_ip, server_id; + struct net_in_addr requested_ip, server_id; int ret; ret = dhcpv4_find_server_id_option(options, optlen, &server_id); @@ -1340,7 +1340,7 @@ static void dhcpv4_handle_release(struct dhcpv4_server_ctx *ctx, uint8_t optlen) { struct dhcpv4_client_id client_id; - struct in_addr ciaddr, server_id; + struct net_in_addr ciaddr, server_id; int ret; ret = dhcpv4_find_server_id_option(options, optlen, &server_id); @@ -1389,7 +1389,7 @@ static void dhcpv4_handle_inform(struct dhcpv4_server_ctx *ctx, struct dhcpv4_parameter_request_list params = { 0 }; (void)dhcpv4_find_parameter_request_list_option(options, optlen, ¶ms); - (void)dhcpv4_send_ack(ctx, msg, (struct in_addr *)msg->ciaddr, 0, + (void)dhcpv4_send_ack(ctx, msg, (struct net_in_addr *)msg->ciaddr, 0, ¶ms, NULL, true); } @@ -1543,17 +1543,17 @@ static void dhcpv4_server_cb(struct net_socket_service_event *evt) NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(dhcpv4_server, dhcpv4_server_cb, CONFIG_NET_DHCPV4_SERVER_INSTANCES); -int net_dhcpv4_server_start(struct net_if *iface, struct in_addr *base_addr) +int net_dhcpv4_server_start(struct net_if *iface, struct net_in_addr *base_addr) { - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_addr = INADDR_ANY_INIT, - .sin_port = htons(DHCPV4_SERVER_PORT), + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET, + .sin_addr = NET_INADDR_ANY_INIT, + .sin_port = net_htons(DHCPV4_SERVER_PORT), }; struct ifreq ifreq = { 0 }; int ret, sock = -1, slot = -1; - const struct in_addr *server_addr; - struct in_addr netmask; + const struct net_in_addr *server_addr; + struct net_in_addr netmask; if (iface == NULL || base_addr == NULL) { return -EINVAL; @@ -1570,9 +1570,9 @@ int net_dhcpv4_server_start(struct net_if *iface, struct in_addr *base_addr) return -EINVAL; } - if ((htonl(server_addr->s_addr) >= htonl(base_addr->s_addr)) && - (htonl(server_addr->s_addr) < - htonl(base_addr->s_addr) + CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT)) { + if ((net_htonl(server_addr->s_addr) >= net_htonl(base_addr->s_addr)) && + (net_htonl(server_addr->s_addr) < + net_htonl(base_addr->s_addr) + CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT)) { LOG_ERR("Address pool overlaps with server address."); return -EINVAL; } @@ -1611,7 +1611,7 @@ int net_dhcpv4_server_start(struct net_if *iface, struct in_addr *base_addr) goto error; } - sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (sock < 0) { ret = -errno; LOG_ERR("Failed to create DHCPv4 server socket, %d", ret); @@ -1627,7 +1627,7 @@ int net_dhcpv4_server_start(struct net_if *iface, struct in_addr *base_addr) goto error; } - ret = zsock_bind(sock, (struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_bind(sock, (struct net_sockaddr *)&addr, sizeof(addr)); if (ret < 0) { ret = -errno; LOG_ERR("Failed to bind DHCPv4 server socket, %d", ret); @@ -1649,7 +1649,7 @@ int net_dhcpv4_server_start(struct net_if *iface, struct in_addr *base_addr) for (int i = 0; i < ARRAY_SIZE(server_ctx[slot].addr_pool); i++) { server_ctx[slot].addr_pool[i].state = DHCPV4_SERVER_ADDR_FREE; server_ctx[slot].addr_pool[i].addr.s_addr = - htonl(ntohl(base_addr->s_addr) + i); + net_htonl(net_ntohl(base_addr->s_addr) + i); LOG_DBG("\t%2d: %s", i, net_sprint_ipv4_addr( diff --git a/subsys/net/lib/dhcpv6/dhcpv6.c b/subsys/net/lib/dhcpv6/dhcpv6.c index d87d1ca0e4ad5..f5317d65942b8 100644 --- a/subsys/net/lib/dhcpv6/dhcpv6.c +++ b/subsys/net/lib/dhcpv6/dhcpv6.c @@ -47,7 +47,7 @@ struct dhcpv6_options_include { static K_MUTEX_DEFINE(lock); /* All_DHCP_Relay_Agents_and_Servers (ff02::1:2) */ -static const struct in6_addr all_dhcpv6_ra_and_servers = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, +static const struct net_in6_addr all_dhcpv6_ra_and_servers = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0, 0x02 } } }; static sys_slist_t dhcpv6_ifaces = SYS_SLIST_STATIC_INIT(&dhcpv6_ifaces); @@ -578,7 +578,7 @@ static struct net_pkt *dhcpv6_create_message(struct net_if *iface, enum dhcpv6_msg_type msg_type, struct dhcpv6_options_include *options) { - struct in6_addr *local_addr; + struct net_in6_addr *local_addr; struct net_pkt *pkt; size_t msg_size; @@ -590,15 +590,15 @@ static struct net_pkt *dhcpv6_create_message(struct net_if *iface, msg_size = dhcpv6_calculate_message_size(options); - pkt = net_pkt_alloc_with_buffer(iface, msg_size, AF_INET6, - IPPROTO_UDP, PKT_WAIT_TIME); + pkt = net_pkt_alloc_with_buffer(iface, msg_size, NET_AF_INET6, + NET_IPPROTO_UDP, PKT_WAIT_TIME); if (pkt == NULL) { return NULL; } if (net_ipv6_create(pkt, local_addr, &all_dhcpv6_ra_and_servers) < 0 || - net_udp_create(pkt, htons(DHCPV6_CLIENT_PORT), - htons(DHCPV6_SERVER_PORT)) < 0) { + net_udp_create(pkt, net_htons(DHCPV6_CLIENT_PORT), + net_htons(DHCPV6_SERVER_PORT)) < 0) { goto fail; } @@ -613,7 +613,7 @@ static struct net_pkt *dhcpv6_create_message(struct net_if *iface, } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_UDP); + net_ipv6_finalize(pkt, NET_IPPROTO_UDP); return pkt; @@ -1196,11 +1196,11 @@ static int dhcpv6_parse_option_ia_pd(struct net_pkt *pkt, uint16_t length, } static int dhcpv6_parse_option_dns_servers(struct net_pkt *pkt, uint16_t length, - struct sockaddr_in6 *servers, + struct net_sockaddr_in6 *servers, uint16_t *server_count) { - const uint8_t addr_size = sizeof(struct in6_addr); + const uint8_t addr_size = sizeof(struct net_in6_addr); uint16_t addr_count; int ret; @@ -1382,8 +1382,8 @@ static int dhcpv6_find_status_code(struct net_pkt *pkt, uint16_t *status) static int dhcpv6_handle_dns_server_option(struct net_pkt *pkt) { - const struct sockaddr *dns_servers[MAX_DNS_SERVERS + 1] = { 0 }; - struct sockaddr_in6 dns_saddr[MAX_DNS_SERVERS] = { 0 }; + const struct net_sockaddr *dns_servers[MAX_DNS_SERVERS + 1] = { 0 }; + struct net_sockaddr_in6 dns_saddr[MAX_DNS_SERVERS] = { 0 }; uint16_t server_count = MAX_DNS_SERVERS; struct dns_resolve_context *ctx; struct net_pkt_cursor backup; @@ -1407,8 +1407,8 @@ static int dhcpv6_handle_dns_server_option(struct net_pkt *pkt) } for (uint8_t i = 0; i < server_count; i++) { - dns_saddr[i].sin6_family = AF_INET6; - dns_servers[i] = (struct sockaddr *)&dns_saddr[i]; + dns_saddr[i].sin6_family = NET_AF_INET6; + dns_servers[i] = (struct net_sockaddr *)&dns_saddr[i]; } ctx = dns_resolve_get_default(); @@ -1801,7 +1801,7 @@ static int dhcpv6_handle_reply(struct net_if *iface, struct net_pkt *pkt, ia_na.iaaddr.valid_lifetime == 0) { /* Remove old lease. */ net_if_ipv6_addr_rm(iface, &iface->config.dhcpv6.addr); - memset(&iface->config.dhcpv6.addr, 0, sizeof(struct in6_addr)); + memset(&iface->config.dhcpv6.addr, 0, sizeof(struct net_in6_addr)); rediscover = true; goto prefix; } @@ -1845,7 +1845,7 @@ static int dhcpv6_handle_reply(struct net_if *iface, struct net_pkt *pkt, /* Remove old lease. */ net_if_ipv6_prefix_rm(iface, &iface->config.dhcpv6.prefix, iface->config.dhcpv6.prefix_len); - memset(&iface->config.dhcpv6.prefix, 0, sizeof(struct in6_addr)); + memset(&iface->config.dhcpv6.prefix, 0, sizeof(struct net_in6_addr)); iface->config.dhcpv6.prefix_len = 0; rediscover = true; goto out; @@ -2250,9 +2250,9 @@ static void dhcpv6_generate_client_duid(struct net_if *iface) memset(clientid, 0, sizeof(*clientid)); - UNALIGNED_PUT(htons(DHCPV6_DUID_TYPE_LL), + UNALIGNED_PUT(net_htons(DHCPV6_DUID_TYPE_LL), UNALIGNED_MEMBER_ADDR(clientid, duid.type)); - UNALIGNED_PUT(htons(DHCPV6_HARDWARE_ETHERNET_TYPE), + UNALIGNED_PUT(net_htons(DHCPV6_HARDWARE_ETHERNET_TYPE), UNALIGNED_MEMBER_ADDR(duid_ll, hw_type)); memcpy(duid_ll->ll_addr, lladdr->addr, lladdr->len); @@ -2358,14 +2358,14 @@ void net_dhcpv6_restart(struct net_if *iface) int net_dhcpv6_init(void) { - struct sockaddr unspec_addr; + struct net_sockaddr unspec_addr; int ret; net_ipaddr_copy(&net_sin6(&unspec_addr)->sin6_addr, net_ipv6_unspecified_address()); - unspec_addr.sa_family = AF_INET6; + unspec_addr.sa_family = NET_AF_INET6; - ret = net_udp_register(AF_INET6, NULL, &unspec_addr, + ret = net_udp_register(NET_AF_INET6, NULL, &unspec_addr, 0, DHCPV6_CLIENT_PORT, NULL, dhcpv6_input, NULL, NULL); if (ret < 0) { diff --git a/subsys/net/lib/dhcpv6/dhcpv6_internal.h b/subsys/net/lib/dhcpv6/dhcpv6_internal.h index df935e59a28bc..fc6fc6bec4e39 100644 --- a/subsys/net/lib/dhcpv6/dhcpv6_internal.h +++ b/subsys/net/lib/dhcpv6/dhcpv6_internal.h @@ -92,7 +92,7 @@ struct dhcpv6_msg_hdr { struct dhcpv6_iaaddr { uint32_t preferred_lifetime; uint32_t valid_lifetime; - struct in6_addr addr; + struct net_in6_addr addr; uint16_t status; }; @@ -107,7 +107,7 @@ struct dhcpv6_ia_na { struct dhcpv6_iaprefix { uint32_t preferred_lifetime; uint32_t valid_lifetime; - struct in6_addr prefix; + struct net_in6_addr prefix; uint8_t prefix_len; uint16_t status; }; diff --git a/subsys/net/lib/dns/dispatcher.c b/subsys/net/lib/dns/dispatcher.c index 9c71bc6353d8b..e959028be700c 100644 --- a/subsys/net/lib/dns/dispatcher.c +++ b/subsys/net/lib/dns/dispatcher.c @@ -34,7 +34,7 @@ static struct socket_dispatch_table { } dispatch_table[ZVFS_OPEN_SIZE]; static int dns_dispatch(struct dns_socket_dispatcher *dispatcher, - int sock, struct sockaddr *addr, size_t addrlen, + int sock, struct net_sockaddr *addr, size_t addrlen, struct net_buf *dns_data, size_t buf_len) { /* Helper struct to track the dns msg received from the server */ @@ -100,9 +100,9 @@ static int dns_dispatch(struct dns_socket_dispatcher *dispatcher, if (IS_ENABLED(CONFIG_NET_STATISTICS_DNS)) { struct net_if *iface = NULL; - if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface(&net_sin6(addr)->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { iface = net_if_ipv4_select_src_iface(&net_sin(addr)->sin_addr); } @@ -122,10 +122,10 @@ static int recv_data(struct net_socket_service_event *pev) { struct socket_dispatch_table *table = pev->user_data; struct dns_socket_dispatcher *dispatcher; - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); struct net_buf *dns_data = NULL; - struct sockaddr addr; - socklen_t addrlen; + struct net_sockaddr addr; + net_socklen_t addrlen; int family, sock_error; int ret = 0, len; @@ -133,24 +133,24 @@ static int recv_data(struct net_socket_service_event *pev) k_mutex_lock(&dispatcher->lock, K_FOREVER); - (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, - SO_DOMAIN, &family, &optlen); + (void)zsock_getsockopt(pev->event.fd, ZSOCK_SOL_SOCKET, + ZSOCK_SO_DOMAIN, &family, &optlen); if ((pev->event.revents & ZSOCK_POLLERR) || (pev->event.revents & ZSOCK_POLLNVAL)) { - (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, - SO_ERROR, &sock_error, &optlen); + (void)zsock_getsockopt(pev->event.fd, ZSOCK_SOL_SOCKET, + ZSOCK_SO_ERROR, &sock_error, &optlen); if (sock_error > 0) { NET_ERR("Receiver IPv%d socket error (%d)", - family == AF_INET ? 4 : 6, sock_error); + family == NET_AF_INET ? 4 : 6, sock_error); ret = DNS_EAI_SYSTEM; } goto unlock; } - addrlen = (family == AF_INET) ? sizeof(struct sockaddr_in) : - sizeof(struct sockaddr_in6); + addrlen = (family == NET_AF_INET) ? sizeof(struct net_sockaddr_in) : + sizeof(struct net_sockaddr_in6); dns_data = net_buf_alloc(&dns_msg_pool, dispatcher->buf_timeout); if (!dns_data) { @@ -160,18 +160,18 @@ static int recv_data(struct net_socket_service_event *pev) ret = zsock_recvfrom(pev->event.fd, dns_data->data, net_buf_max_len(dns_data), 0, - (struct sockaddr *)&addr, &addrlen); + (struct net_sockaddr *)&addr, &addrlen); if (ret < 0) { ret = -errno; NET_ERR("recv failed on IPv%d socket (%d)", - family == AF_INET ? 4 : 6, -ret); + family == NET_AF_INET ? 4 : 6, -ret); goto free_buf; } len = ret; ret = dns_dispatch(dispatcher, pev->event.fd, - (struct sockaddr *)&addr, addrlen, + (struct net_sockaddr *)&addr, addrlen, dns_data, len); free_buf: if (dns_data) { @@ -281,10 +281,10 @@ int dns_dispatcher_register(struct dns_socket_dispatcher *ctx) ctx->buf_timeout = DNS_BUF_TIMEOUT; - if (ctx->local_addr.sa_family == AF_INET) { - addrlen = sizeof(struct sockaddr_in); + if (ctx->local_addr.sa_family == NET_AF_INET) { + addrlen = sizeof(struct net_sockaddr_in); } else { - addrlen = sizeof(struct sockaddr_in6); + addrlen = sizeof(struct net_sockaddr_in6); } /* Bind and then register a socket service with this combo */ diff --git a/subsys/net/lib/dns/dns_cache.c b/subsys/net/lib/dns/dns_cache.c index 1eba3e0ca8006..a3146ea794b45 100644 --- a/subsys/net/lib/dns/dns_cache.c +++ b/subsys/net/lib/dns/dns_cache.c @@ -106,16 +106,16 @@ int dns_cache_find(struct dns_cache const *cache, const char *query, enum dns_qu struct dns_addrinfo *addrinfo, size_t addrinfo_array_len) { size_t found = 0; - sa_family_t family; + net_sa_family_t family; NET_DBG("Find \"%s\"", query); if (cache == NULL || query == NULL || addrinfo == NULL || addrinfo_array_len <= 0) { return -EINVAL; } if (type == DNS_QUERY_TYPE_A) { - family = AF_INET; + family = NET_AF_INET; } else if (type == DNS_QUERY_TYPE_AAAA) { - family = AF_INET6; + family = NET_AF_INET6; } else { return -EINVAL; } diff --git a/subsys/net/lib/dns/dns_pack.c b/subsys/net/lib/dns/dns_pack.c index 80b6103acdf30..0e65412fcf614 100644 --- a/subsys/net/lib/dns/dns_pack.c +++ b/subsys/net/lib/dns/dns_pack.c @@ -240,7 +240,7 @@ static int dns_msg_pack_query_header(uint8_t *buf, uint16_t size, uint16_t id) return -ENOMEM; } - UNALIGNED_PUT(htons(id), (uint16_t *)(buf)); + UNALIGNED_PUT(net_htons(id), (uint16_t *)(buf)); /* RD = 1, TC = 0, AA = 0, Opcode = 0, QR = 0 <-> 0x01 (1B) * RCode = 0, Z = 0, RA = 0 <-> 0x00 (1B) @@ -257,7 +257,7 @@ static int dns_msg_pack_query_header(uint8_t *buf, uint16_t size, uint16_t id) offset += DNS_HEADER_FLAGS_LEN; /* set question counter */ - UNALIGNED_PUT(htons(1), (uint16_t *)(buf + offset)); + UNALIGNED_PUT(net_htons(1), (uint16_t *)(buf + offset)); offset += DNS_QDCOUNT_LEN; /* set answer and ns rr */ @@ -294,11 +294,11 @@ int dns_msg_pack_query(uint8_t *buf, uint16_t *len, uint16_t size, offset += qname_len; /* QType */ - UNALIGNED_PUT(htons(qtype), (uint16_t *)(buf + offset + 0)); + UNALIGNED_PUT(net_htons(qtype), (uint16_t *)(buf + offset + 0)); offset += DNS_QTYPE_LEN; /* QClass */ - UNALIGNED_PUT(htons(DNS_CLASS_IN), (uint16_t *)(buf + offset)); + UNALIGNED_PUT(net_htons(DNS_CLASS_IN), (uint16_t *)(buf + offset)); *len = offset + DNS_QCLASS_LEN; diff --git a/subsys/net/lib/dns/dns_pack.h b/subsys/net/lib/dns/dns_pack.h index fc953a01c6d05..1fe738bbcf6a7 100644 --- a/subsys/net/lib/dns/dns_pack.h +++ b/subsys/net/lib/dns/dns_pack.h @@ -187,7 +187,7 @@ struct dns_aaaa_rdata { /** It returns the ID field in the DNS msg header */ static inline int dns_header_id(uint8_t *header) { - return htons(UNALIGNED_GET((uint16_t *)(header))); + return net_htons(UNALIGNED_GET((uint16_t *)(header))); } /* inline unpack routines are used to unpack data from network @@ -196,7 +196,7 @@ static inline int dns_header_id(uint8_t *header) */ static inline int dns_unpack_header_id(uint8_t *header) { - return ntohs(UNALIGNED_GET((uint16_t *)(header))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(header))); } /** It returns the QR field in the DNS msg header */ @@ -250,93 +250,93 @@ static inline int dns_header_rcode(uint8_t *header) /** It returns the QDCOUNT field in the DNS msg header */ static inline int dns_header_qdcount(uint8_t *header) { - return htons(UNALIGNED_GET((uint16_t *)(header + 4))); + return net_htons(UNALIGNED_GET((uint16_t *)(header + 4))); } static inline int dns_unpack_header_qdcount(uint8_t *header) { - return ntohs(UNALIGNED_GET((uint16_t *)(header + 4))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(header + 4))); } /** It returns the ANCOUNT field in the DNS msg header */ static inline int dns_header_ancount(uint8_t *header) { - return htons(UNALIGNED_GET((uint16_t *)(header + 6))); + return net_htons(UNALIGNED_GET((uint16_t *)(header + 6))); } static inline int dns_unpack_header_ancount(uint8_t *header) { - return ntohs(UNALIGNED_GET((uint16_t *)(header + 6))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(header + 6))); } /** It returns the NSCOUNT field in the DNS msg header */ static inline int dns_header_nscount(uint8_t *header) { - return htons(UNALIGNED_GET((uint16_t *)(header + 8))); + return net_htons(UNALIGNED_GET((uint16_t *)(header + 8))); } /** It returns the ARCOUNT field in the DNS msg header */ static inline int dns_header_arcount(uint8_t *header) { - return htons(UNALIGNED_GET((uint16_t *)(header + 10))); + return net_htons(UNALIGNED_GET((uint16_t *)(header + 10))); } static inline int dns_query_qtype(uint8_t *question) { - return htons(UNALIGNED_GET((uint16_t *)(question + 0))); + return net_htons(UNALIGNED_GET((uint16_t *)(question + 0))); } static inline int dns_unpack_query_qtype(const uint8_t *question) { - return ntohs(UNALIGNED_GET((uint16_t *)(question + 0))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(question + 0))); } static inline int dns_query_qclass(uint8_t *question) { - return htons(UNALIGNED_GET((uint16_t *)(question + 2))); + return net_htons(UNALIGNED_GET((uint16_t *)(question + 2))); } static inline int dns_unpack_query_qclass(const uint8_t *question) { - return ntohs(UNALIGNED_GET((uint16_t *)(question + 2))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(question + 2))); } static inline int dns_answer_type(uint16_t dname_size, uint8_t *answer) { /* 4.1.3. Resource record format */ - return ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 0))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 0))); } static inline int dns_answer_class(uint16_t dname_size, uint8_t *answer) { /* 4.1.3. Resource record format */ - return ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 2))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 2))); } static inline int dns_answer_ttl(uint16_t dname_size, uint8_t *answer) { - return ntohl(UNALIGNED_GET((uint32_t *)(answer + dname_size + 4))); + return net_ntohl(UNALIGNED_GET((uint32_t *)(answer + dname_size + 4))); } static inline int dns_answer_rdlength(uint16_t dname_size, uint8_t *answer) { - return ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 8))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(answer + dname_size + 8))); } static inline int dns_unpack_srv_priority(const uint8_t *srv) { - return ntohs(UNALIGNED_GET((uint16_t *)(srv + 0))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(srv + 0))); } static inline int dns_unpack_srv_weight(const uint8_t *srv) { - return ntohs(UNALIGNED_GET((uint16_t *)(srv + 2))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(srv + 2))); } static inline int dns_unpack_srv_port(const uint8_t *srv) { - return ntohs(UNALIGNED_GET((uint16_t *)(srv + 4))); + return net_ntohs(UNALIGNED_GET((uint16_t *)(srv + 4))); } /** diff --git a/subsys/net/lib/dns/dns_sd.c b/subsys/net/lib/dns/dns_sd.c index 9a51a2e3c1ed9..b140947135a15 100644 --- a/subsys/net/lib/dns/dns_sd.c +++ b/subsys/net/lib/dns/dns_sd.c @@ -332,19 +332,19 @@ int add_a_record(const struct dns_sd_rec *inst, uint32_t ttl, /* insert a pointer to the instance + service name */ inst_offs = host_offset; inst_offs |= DNS_SD_PTR_MASK; - inst_offs = htons(inst_offs); + inst_offs = net_htons(inst_offs); memcpy(&buf[offset], &inst_offs, sizeof(inst_offs)); offset += sizeof(inst_offs); rr = (struct dns_rr *)&buf[offset]; - rr->type = htons(DNS_RR_TYPE_A); - rr->class_ = htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); - rr->ttl = htonl(ttl); - rr->rdlength = htons(sizeof(*rdata)); + rr->type = net_htons(DNS_RR_TYPE_A); + rr->class_ = net_htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); + rr->ttl = net_htonl(ttl); + rr->rdlength = net_htons(sizeof(*rdata)); offset += sizeof(*rr); rdata = (struct dns_a_rdata *)&buf[offset]; - rdata->address = htonl(addr); + rdata->address = net_htonl(addr); offset += sizeof(*rdata); __ASSERT_NO_MSG(total_size == offset - buf_offset); @@ -444,10 +444,10 @@ int add_ptr_record(const struct dns_sd_rec *inst, uint32_t ttl, __ASSERT_NO_MSG(svc_offs + sp_size == offset); rr = (struct dns_rr *)&buf[offset]; - rr->type = htons(DNS_RR_TYPE_PTR); - rr->class_ = htons(DNS_CLASS_IN); - rr->ttl = htonl(ttl); - rr->rdlength = htons( + rr->type = net_htons(DNS_RR_TYPE_PTR); + rr->class_ = net_htons(DNS_CLASS_IN); + rr->ttl = net_htonl(ttl); + rr->rdlength = net_htons( DNS_LABEL_LEN_SIZE + strlen(inst->instance) + DNS_POINTER_SIZE); @@ -462,7 +462,7 @@ int add_ptr_record(const struct dns_sd_rec *inst, uint32_t ttl, offset += label_size; svc_offs |= DNS_SD_PTR_MASK; - svc_offs = htons(svc_offs); + svc_offs = net_htons(svc_offs); memcpy(&buf[offset], &svc_offs, sizeof(svc_offs)); offset += sizeof(svc_offs); @@ -500,15 +500,15 @@ int add_txt_record(const struct dns_sd_rec *inst, uint32_t ttl, /* insert a pointer to the instance + service name */ inst_offs = instance_offset; inst_offs |= DNS_SD_PTR_MASK; - inst_offs = htons(inst_offs); + inst_offs = net_htons(inst_offs); memcpy(&buf[offset], &inst_offs, sizeof(inst_offs)); offset += sizeof(inst_offs); rr = (struct dns_rr *)&buf[offset]; - rr->type = htons(DNS_RR_TYPE_TXT); - rr->class_ = htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); - rr->ttl = htonl(ttl); - rr->rdlength = htons(dns_sd_txt_size(inst)); + rr->type = net_htons(DNS_RR_TYPE_TXT); + rr->class_ = net_htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); + rr->ttl = net_htonl(ttl); + rr->rdlength = net_htons(dns_sd_txt_size(inst)); offset += sizeof(*rr); memcpy(&buf[offset], inst->text, dns_sd_txt_size(inst)); @@ -549,15 +549,15 @@ int add_aaaa_record(const struct dns_sd_rec *inst, uint32_t ttl, /* insert a pointer to the instance + service name */ inst_offs = host_offset; inst_offs |= DNS_SD_PTR_MASK; - inst_offs = htons(inst_offs); + inst_offs = net_htons(inst_offs); memcpy(&buf[offset], &inst_offs, sizeof(inst_offs)); offset += sizeof(inst_offs); rr = (struct dns_rr *)&buf[offset]; - rr->type = htons(DNS_RR_TYPE_AAAA); - rr->class_ = htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); - rr->ttl = htonl(ttl); - rr->rdlength = htons(sizeof(*rdata)); + rr->type = net_htons(DNS_RR_TYPE_AAAA); + rr->class_ = net_htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); + rr->ttl = net_htonl(ttl); + rr->rdlength = net_htons(sizeof(*rdata)); offset += sizeof(*rr); rdata = (struct dns_aaaa_rdata *)&buf[offset]; @@ -613,16 +613,16 @@ int add_srv_record(const struct dns_sd_rec *inst, uint32_t ttl, /* insert a pointer to the instance + service name */ inst_offs = instance_offset; inst_offs |= DNS_SD_PTR_MASK; - inst_offs = htons(inst_offs); + inst_offs = net_htons(inst_offs); memcpy(&buf[offset], &inst_offs, sizeof(inst_offs)); offset += sizeof(inst_offs); rr = (struct dns_rr *)&buf[offset]; - rr->type = htons(DNS_RR_TYPE_SRV); - rr->class_ = htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); - rr->ttl = htonl(ttl); + rr->type = net_htons(DNS_RR_TYPE_SRV); + rr->class_ = net_htons(DNS_CLASS_IN | DNS_CLASS_FLUSH); + rr->ttl = net_htonl(ttl); /* ..local. */ - rr->rdlength = htons(sizeof(*rdata) + DNS_LABEL_LEN_SIZE + rr->rdlength = net_htons(sizeof(*rdata) + DNS_LABEL_LEN_SIZE + strlen(inst->instance) + DNS_POINTER_SIZE); offset += sizeof(*rr); @@ -641,7 +641,7 @@ int add_srv_record(const struct dns_sd_rec *inst, uint32_t ttl, offset += label_size; domain_offset |= DNS_SD_PTR_MASK; - domain_offset = htons(domain_offset); + domain_offset = net_htons(domain_offset); memcpy(&buf[offset], &domain_offset, sizeof(domain_offset)); offset += sizeof(domain_offset); @@ -652,20 +652,20 @@ int add_srv_record(const struct dns_sd_rec *inst, uint32_t ttl, #ifndef CONFIG_NET_TEST static bool port_in_use_sockaddr(uint16_t proto, uint16_t port, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { - const struct sockaddr_in any = { - .sin_family = AF_INET, - .sin_addr.s_addr = INADDR_ANY, + const struct net_sockaddr_in any = { + .sin_family = NET_AF_INET, + .sin_addr.s_addr = NET_INADDR_ANY, }; - const struct sockaddr_in6 any6 = { - .sin6_family = AF_INET6, - .sin6_addr = in6addr_any, + const struct net_sockaddr_in6 any6 = { + .sin6_family = NET_AF_INET6, + .sin6_addr = net_in6addr_any, }; - const struct sockaddr *anyp = - (addr->sa_family == AF_INET) - ? (const struct sockaddr *) &any - : (const struct sockaddr *) &any6; + const struct net_sockaddr *anyp = + (addr->sa_family == NET_AF_INET) + ? (const struct net_sockaddr *) &any + : (const struct net_sockaddr *) &any6; return net_context_port_in_use(proto, port, addr) @@ -673,32 +673,32 @@ static bool port_in_use_sockaddr(uint16_t proto, uint16_t port, } static bool port_in_use(uint16_t proto, uint16_t port, - const struct in_addr *addr4, - const struct in6_addr *addr6) + const struct net_in_addr *addr4, + const struct net_in6_addr *addr6) { bool ret = false; if (addr4 != NULL) { - struct sockaddr_in sa = { 0 }; + struct net_sockaddr_in sa = { 0 }; - sa.sin_family = AF_INET; + sa.sin_family = NET_AF_INET; sa.sin_addr = *addr4; ret = port_in_use_sockaddr(proto, port, - (struct sockaddr *)&sa); + (struct net_sockaddr *)&sa); if (ret) { goto out; } } if (addr6 != NULL) { - struct sockaddr_in6 sa = { 0 }; + struct net_sockaddr_in6 sa = { 0 }; - sa.sin6_family = AF_INET6; + sa.sin6_family = NET_AF_INET6; sa.sin6_addr = *addr6; ret = port_in_use_sockaddr(proto, port, - (struct sockaddr *)&sa); + (struct net_sockaddr *)&sa); if (ret) { goto out; } @@ -708,8 +708,8 @@ static bool port_in_use(uint16_t proto, uint16_t port, return ret; } #else /* CONFIG_NET_TEST */ -static inline bool port_in_use(uint16_t proto, uint16_t port, const struct in_addr *addr4, - const struct in6_addr *addr6) +static inline bool port_in_use(uint16_t proto, uint16_t port, const struct net_in_addr *addr4, + const struct net_in6_addr *addr6) { ARG_UNUSED(port); ARG_UNUSED(addr4); @@ -719,8 +719,8 @@ static inline bool port_in_use(uint16_t proto, uint16_t port, const struct in_ad #endif /* CONFIG_NET_TEST */ -int dns_sd_handle_ptr_query(const struct dns_sd_rec *inst, const struct in_addr *addr4, - const struct in6_addr *addr6, uint8_t *buf, uint16_t buf_size) +int dns_sd_handle_ptr_query(const struct dns_sd_rec *inst, const struct net_in_addr *addr4, + const struct net_in6_addr *addr6, uint8_t *buf, uint16_t buf_size) { /* * RFC 6763 Section 12.1 @@ -754,21 +754,21 @@ int dns_sd_handle_ptr_query(const struct dns_sd_rec *inst, const struct in_addr if (*(inst->port) == 0) { NET_DBG("Ephemeral port %u for %s.%s.%s.%s not initialized", - ntohs(*(inst->port)), inst->instance, inst->service, inst->proto, + net_ntohs(*(inst->port)), inst->instance, inst->service, inst->proto, inst->domain); return -EHOSTDOWN; } if (strncmp("_tcp", inst->proto, DNS_SD_PROTO_SIZE) == 0) { - proto = IPPROTO_TCP; + proto = NET_IPPROTO_TCP; } else if (strncmp("_udp", inst->proto, DNS_SD_PROTO_SIZE) == 0) { - proto = IPPROTO_UDP; + proto = NET_IPPROTO_UDP; } else { NET_DBG("invalid protocol %s", inst->proto); return -EINVAL; } - if (!port_in_use(proto, ntohs(*(inst->port)), addr4, addr6)) { + if (!port_in_use(proto, net_ntohs(*(inst->port)), addr4, addr6)) { /* Service is not yet bound, so do not advertise */ return -EHOSTDOWN; } @@ -813,7 +813,7 @@ int dns_sd_handle_ptr_query(const struct dns_sd_rec *inst, const struct in_addr } if (addr4 != NULL) { - tmp = htonl(*(addr4->s4_addr32)); + tmp = net_htonl(*(addr4->s4_addr32)); r = add_a_record(inst, DNS_SD_A_TTL, host_offset, tmp, buf, offset, buf_size - offset); if (r < 0) { @@ -825,15 +825,16 @@ int dns_sd_handle_ptr_query(const struct dns_sd_rec *inst, const struct in_addr } /* Set the Response and AA bits */ - rsp->flags = htons(BIT(15) | BIT(10)); - rsp->ancount = htons(rsp->ancount); - rsp->arcount = htons(rsp->arcount); + rsp->flags = net_htons(BIT(15) | BIT(10)); + rsp->ancount = net_htons(rsp->ancount); + rsp->arcount = net_htons(rsp->arcount); return offset; } int dns_sd_handle_service_type_enum(const struct dns_sd_rec *inst, - const struct in_addr *addr4, const struct in6_addr *addr6, + const struct net_in_addr *addr4, + const struct net_in6_addr *addr6, uint8_t *buf, uint16_t buf_size) { static const char query[] = { "\x09_services\x07_dns-sd\x04_udp\x05local" }; @@ -853,21 +854,21 @@ int dns_sd_handle_service_type_enum(const struct dns_sd_rec *inst, if (*(inst->port) == 0) { NET_DBG("Ephemeral port %u for %s.%s.%s.%s " "not initialized", - ntohs(*(inst->port)), inst->instance, inst->service, inst->proto, + net_ntohs(*(inst->port)), inst->instance, inst->service, inst->proto, inst->domain); return -EHOSTDOWN; } if (strncmp("_tcp", inst->proto, DNS_SD_PROTO_SIZE) == 0) { - proto = IPPROTO_TCP; + proto = NET_IPPROTO_TCP; } else if (strncmp("_udp", inst->proto, DNS_SD_PROTO_SIZE) == 0) { - proto = IPPROTO_UDP; + proto = NET_IPPROTO_UDP; } else { NET_DBG("invalid protocol %s", inst->proto); return -EINVAL; } - if (!port_in_use(proto, ntohs(*(inst->port)), addr4, addr6)) { + if (!port_in_use(proto, net_ntohs(*(inst->port)), addr4, addr6)) { /* Service is not yet bound, so do not advertise */ NET_DBG("service not bound"); return -EHOSTDOWN; @@ -894,10 +895,10 @@ int dns_sd_handle_service_type_enum(const struct dns_sd_rec *inst, offset += sizeof(query); rr = (struct dns_rr *)&buf[offset]; - rr->type = htons(DNS_RR_TYPE_PTR); - rr->class_ = htons(DNS_CLASS_IN); - rr->ttl = htonl(DNS_SD_PTR_TTL); - rr->rdlength = htons(0 + rr->type = net_htons(DNS_RR_TYPE_PTR); + rr->class_ = net_htons(DNS_CLASS_IN); + rr->ttl = net_htonl(DNS_SD_PTR_TTL); + rr->rdlength = net_htons(0 + DNS_LABEL_LEN_SIZE + service_size + DNS_LABEL_LEN_SIZE + DNS_SD_PROTO_SIZE + DNS_POINTER_SIZE); @@ -909,13 +910,13 @@ int dns_sd_handle_service_type_enum(const struct dns_sd_rec *inst, buf[offset++] = DNS_SD_PROTO_SIZE; memcpy(&buf[offset], inst->proto, DNS_SD_PROTO_SIZE); offset += DNS_SD_PROTO_SIZE; - domain_offset = htons(domain_offset); + domain_offset = net_htons(domain_offset); memcpy(&buf[offset], &domain_offset, sizeof(domain_offset)); offset += sizeof(domain_offset); /* Set the Response and AA bits */ - rsp->flags = htons(BIT(15) | BIT(10)); - rsp->ancount = htons(1); + rsp->flags = net_htons(BIT(15) | BIT(10)); + rsp->ancount = net_htons(1); return offset; } diff --git a/subsys/net/lib/dns/dns_sd.h b/subsys/net/lib/dns/dns_sd.h index be39a22f14138..653fbd9c82e9e 100644 --- a/subsys/net/lib/dns/dns_sd.h +++ b/subsys/net/lib/dns/dns_sd.h @@ -137,7 +137,7 @@ bool dns_sd_rec_match(const struct dns_sd_rec *record, * @return on failure, a negative errno value */ int dns_sd_handle_ptr_query(const struct dns_sd_rec *inst, - const struct in_addr *addr4, const struct in6_addr *addr6, + const struct net_in_addr *addr4, const struct net_in6_addr *addr6, uint8_t *buf, uint16_t buf_size); /** @@ -155,7 +155,7 @@ int dns_sd_handle_ptr_query(const struct dns_sd_rec *inst, * @return on failure, a negative errno value */ int dns_sd_handle_service_type_enum(const struct dns_sd_rec *service, - const struct in_addr *addr4, const struct in6_addr *addr6, + const struct net_in_addr *addr4, const struct net_in6_addr *addr6, uint8_t *buf, uint16_t buf_size); /** diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c index 7dfa682f53d69..af98cb32b3ffe 100644 --- a/subsys/net/lib/dns/llmnr_responder.c +++ b/subsys/net/lib/dns/llmnr_responder.c @@ -41,7 +41,7 @@ LOG_MODULE_REGISTER(net_llmnr_responder, CONFIG_LLMNR_RESPONDER_LOG_LEVEL); #if defined(CONFIG_NET_IPV4) static int ipv4; -static struct sockaddr_in local_addr4; +static struct net_sockaddr_in local_addr4; #endif #if defined(CONFIG_NET_IPV6) @@ -73,20 +73,20 @@ NET_BUF_POOL_DEFINE(llmnr_msg_pool, DNS_RESOLVER_BUF_CTR, DNS_RESOLVER_MAX_BUF_SIZE, 0, NULL); #if defined(CONFIG_NET_IPV6) -static void create_ipv6_addr(struct sockaddr_in6 *addr) +static void create_ipv6_addr(struct net_sockaddr_in6 *addr) { - addr->sin6_family = AF_INET6; - addr->sin6_port = htons(LLMNR_LISTEN_PORT); + addr->sin6_family = NET_AF_INET6; + addr->sin6_port = net_htons(LLMNR_LISTEN_PORT); /* Well known IPv6 ff02::1:3 address */ net_ipv6_addr_create(&addr->sin6_addr, 0xff02, 0, 0, 0, 0, 0, 0x01, 0x03); } -static void create_ipv6_dst_addr(struct sockaddr_in6 *src_addr, - struct sockaddr_in6 *addr) +static void create_ipv6_dst_addr(struct net_sockaddr_in6 *src_addr, + struct net_sockaddr_in6 *addr) { - addr->sin6_family = AF_INET6; + addr->sin6_family = NET_AF_INET6; addr->sin6_port = src_addr->sin6_port; net_ipv6_addr_copy_raw((uint8_t *)&addr->sin6_addr, @@ -95,19 +95,19 @@ static void create_ipv6_dst_addr(struct sockaddr_in6 *src_addr, #endif #if defined(CONFIG_NET_IPV4) -static void create_ipv4_addr(struct sockaddr_in *addr) +static void create_ipv4_addr(struct net_sockaddr_in *addr) { - addr->sin_family = AF_INET; - addr->sin_port = htons(LLMNR_LISTEN_PORT); + addr->sin_family = NET_AF_INET; + addr->sin_port = net_htons(LLMNR_LISTEN_PORT); /* Well known IPv4 224.0.0.252 address */ - addr->sin_addr.s_addr = htonl(0xE00000FC); + addr->sin_addr.s_addr = net_htonl(0xE00000FC); } -static void create_ipv4_dst_addr(struct sockaddr_in *src_addr, - struct sockaddr_in *addr) +static void create_ipv4_dst_addr(struct net_sockaddr_in *src_addr, + struct net_sockaddr_in *addr) { - addr->sin_family = AF_INET; + addr->sin_family = NET_AF_INET; addr->sin_port = src_addr->sin_port; net_ipv4_addr_copy_raw((uint8_t *)&addr->sin_addr, @@ -130,11 +130,11 @@ static void llmnr_iface_event_handler(struct net_mgmt_event_callback *cb, } } -static int get_socket(sa_family_t family) +static int get_socket(net_sa_family_t family) { int ret; - ret = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + ret = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (ret < 0) { NET_DBG("Cannot get context (%d)", ret); } @@ -143,8 +143,8 @@ static int get_socket(sa_family_t family) } static int bind_ctx(int sock, - struct sockaddr *local_addr, - socklen_t addrlen) + struct net_sockaddr *local_addr, + net_socklen_t addrlen) { int ret; @@ -155,7 +155,7 @@ static int bind_ctx(int sock, ret = zsock_bind(sock, local_addr, addrlen); if (ret < 0) { NET_DBG("Cannot bind to %s %s port (%d)", "LLMNR", - local_addr->sa_family == AF_INET ? + local_addr->sa_family == NET_AF_INET ? "IPv4" : "IPv6", ret); return ret; } @@ -172,16 +172,16 @@ static void setup_dns_hdr(uint8_t *buf, uint16_t answers, uint16_t dns_id) flags = BIT(15); /* This is response */ - UNALIGNED_PUT(htons(dns_id), (uint16_t *)(buf)); + UNALIGNED_PUT(net_htons(dns_id), (uint16_t *)(buf)); offset = DNS_HEADER_ID_LEN; - UNALIGNED_PUT(htons(flags), (uint16_t *)(buf+offset)); + UNALIGNED_PUT(net_htons(flags), (uint16_t *)(buf+offset)); offset += DNS_HEADER_FLAGS_LEN; - UNALIGNED_PUT(htons(1), (uint16_t *)(buf + offset)); + UNALIGNED_PUT(net_htons(1), (uint16_t *)(buf + offset)); offset += DNS_QDCOUNT_LEN; - UNALIGNED_PUT(htons(answers), (uint16_t *)(buf + offset)); + UNALIGNED_PUT(net_htons(answers), (uint16_t *)(buf + offset)); offset += DNS_ANCOUNT_LEN; UNALIGNED_PUT(0, (uint16_t *)(buf + offset)); @@ -207,10 +207,10 @@ static void add_question(struct net_buf *query, enum dns_rr_type qtype) *prev = strlen(prev + 1); offset = DNS_MSG_HEADER_SIZE + query->len + 1; - UNALIGNED_PUT(htons(qtype), (uint16_t *)(query->data+offset)); + UNALIGNED_PUT(net_htons(qtype), (uint16_t *)(query->data+offset)); offset += DNS_QTYPE_LEN; - UNALIGNED_PUT(htons(DNS_CLASS_IN), (uint16_t *)(query->data+offset)); + UNALIGNED_PUT(net_htons(DNS_CLASS_IN), (uint16_t *)(query->data+offset)); } static int add_answer(struct net_buf *query, uint32_t ttl, @@ -222,10 +222,10 @@ static int add_answer(struct net_buf *query, uint32_t ttl, memcpy(query->data + offset, query->data + DNS_MSG_HEADER_SIZE, q_len); offset += q_len; - UNALIGNED_PUT(htonl(ttl), query->data + offset); + UNALIGNED_PUT(net_htonl(ttl), query->data + offset); offset += DNS_TTL_LEN; - UNALIGNED_PUT(htons(addr_len), query->data + offset); + UNALIGNED_PUT(net_htons(addr_len), query->data + offset); offset += DNS_RDLENGTH_LEN; memcpy(query->data + offset, addr, addr_len); @@ -261,9 +261,9 @@ static int create_answer(enum dns_rr_type qtype, } #if defined(CONFIG_NET_IPV4) -static const uint8_t *get_ipv4_src(struct net_if *iface, struct in_addr *dst) +static const uint8_t *get_ipv4_src(struct net_if *iface, struct net_in_addr *dst) { - const struct in_addr *addr; + const struct net_in_addr *addr; addr = net_if_ipv4_select_src_addr(iface, dst); if (!addr || net_ipv4_is_addr_unspecified(addr)) { @@ -275,9 +275,9 @@ static const uint8_t *get_ipv4_src(struct net_if *iface, struct in_addr *dst) #endif #if defined(CONFIG_NET_IPV6) -static const uint8_t *get_ipv6_src(struct net_if *iface, struct in6_addr *dst) +static const uint8_t *get_ipv6_src(struct net_if *iface, struct net_in6_addr *dst) { - const struct in6_addr *addr; + const struct net_in6_addr *addr; addr = net_if_ipv6_select_src_addr(iface, dst); if (!addr || net_ipv6_is_addr_unspecified(addr)) { @@ -295,19 +295,19 @@ static int set_ttl_hop_limit(int sock, int level, int option, int new_limit) #if defined(CONFIG_NET_IPV4) static int create_ipv4_answer(int sock, - struct sockaddr_in *src_addr, + struct net_sockaddr_in *src_addr, enum dns_rr_type qtype, struct net_buf *query, uint16_t dns_id, - struct sockaddr *dst, - socklen_t *dst_len) + struct net_sockaddr *dst, + net_socklen_t *dst_len) { const uint8_t *addr; int addr_len; create_ipv4_dst_addr(src_addr, net_sin(dst)); - *dst_len = sizeof(struct sockaddr_in); + *dst_len = sizeof(struct net_sockaddr_in); /* Select proper address according to destination */ addr = get_ipv4_src(NULL, &net_sin(dst)->sin_addr); @@ -315,25 +315,25 @@ static int create_ipv4_answer(int sock, return -ENOENT; } - addr_len = sizeof(struct in_addr); + addr_len = sizeof(struct net_in_addr); if (create_answer(qtype, query, dns_id, addr_len, addr)) { return -ENOMEM; } - (void)set_ttl_hop_limit(sock, IPPROTO_IP, IP_MULTICAST_TTL, 255); + (void)set_ttl_hop_limit(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, 255); return 0; } #endif /* CONFIG_NET_IPV4 */ static int create_ipv6_answer(int sock, - struct sockaddr_in6 *src_addr, + struct net_sockaddr_in6 *src_addr, enum dns_rr_type qtype, struct net_buf *query, uint16_t dns_id, - struct sockaddr *dst, - socklen_t *dst_len) + struct net_sockaddr *dst, + net_socklen_t *dst_len) { #if defined(CONFIG_NET_IPV6) const uint8_t *addr; @@ -341,48 +341,48 @@ static int create_ipv6_answer(int sock, create_ipv6_dst_addr(src_addr, net_sin6(dst)); - *dst_len = sizeof(struct sockaddr_in6); + *dst_len = sizeof(struct net_sockaddr_in6); addr = get_ipv6_src(NULL, &src_addr->sin6_addr); if (!addr) { return -ENOENT; } - addr_len = sizeof(struct in6_addr); + addr_len = sizeof(struct net_in6_addr); if (create_answer(qtype, query, dns_id, addr_len, addr)) { return -ENOMEM; } - (void)set_ttl_hop_limit(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, 255); + (void)set_ttl_hop_limit(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, 255); #endif /* CONFIG_NET_IPV6 */ return 0; } static int send_response(int sock, - struct sockaddr *src_addr, + struct net_sockaddr *src_addr, size_t addrlen, struct net_buf *reply, enum dns_rr_type qtype, uint16_t dns_id) { - socklen_t dst_len; + net_socklen_t dst_len; int ret; COND_CODE_1(IS_ENABLED(CONFIG_NET_IPV6), - (struct sockaddr_in6), (struct sockaddr_in)) dst; + (struct net_sockaddr_in6), (struct net_sockaddr_in)) dst; - if (IS_ENABLED(CONFIG_NET_IPV4) && src_addr->sa_family == AF_INET) { - ret = create_ipv4_answer(sock, (struct sockaddr_in *)src_addr, + if (IS_ENABLED(CONFIG_NET_IPV4) && src_addr->sa_family == NET_AF_INET) { + ret = create_ipv4_answer(sock, (struct net_sockaddr_in *)src_addr, qtype, reply, dns_id, - (struct sockaddr *)&dst, &dst_len); + (struct net_sockaddr *)&dst, &dst_len); if (ret < 0) { return ret; } - } else if (IS_ENABLED(CONFIG_NET_IPV6) && src_addr->sa_family == AF_INET6) { - ret = create_ipv6_answer(sock, (struct sockaddr_in6 *)src_addr, + } else if (IS_ENABLED(CONFIG_NET_IPV6) && src_addr->sa_family == NET_AF_INET6) { + ret = create_ipv6_answer(sock, (struct net_sockaddr_in6 *)src_addr, qtype, reply, dns_id, - (struct sockaddr *)&dst, &dst_len); + (struct net_sockaddr *)&dst, &dst_len); if (ret < 0) { return ret; } @@ -392,20 +392,20 @@ static int send_response(int sock, } ret = zsock_sendto(sock, reply->data, reply->len, 0, - (struct sockaddr *)&dst, dst_len); + (struct net_sockaddr *)&dst, dst_len); if (ret < 0) { NET_DBG("Cannot send %s reply to %s (%d)", "LLMNR", - src_addr->sa_family == AF_INET ? - net_sprint_ipv4_addr(&net_sin((struct sockaddr *)&dst)->sin_addr) : - net_sprint_ipv6_addr(&net_sin6((struct sockaddr *)&dst)->sin6_addr), + src_addr->sa_family == NET_AF_INET ? + net_sprint_ipv4_addr(&net_sin((struct net_sockaddr *)&dst)->sin_addr) : + net_sprint_ipv6_addr(&net_sin6((struct net_sockaddr *)&dst)->sin6_addr), ret); } else { struct net_if *iface = NULL; - struct sockaddr *addr = (struct sockaddr *)&dst; + struct net_sockaddr *addr = (struct net_sockaddr *)&dst; - if (IS_ENABLED(CONFIG_NET_IPV6) && src_addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && src_addr->sa_family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface(&net_sin6(addr)->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && src_addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && src_addr->sa_family == NET_AF_INET) { iface = net_if_ipv4_select_src_iface(&net_sin(addr)->sin_addr); } @@ -420,7 +420,7 @@ static int send_response(int sock, static int dns_read(int sock, struct net_buf *dns_data, size_t len, - struct sockaddr *src_addr, + struct net_sockaddr *src_addr, size_t addrlen, struct dns_addrinfo *info) { @@ -430,7 +430,7 @@ static int dns_read(int sock, struct net_buf *result; struct dns_msg_t dns_msg; uint16_t dns_id = 0U; - socklen_t optlen; + net_socklen_t optlen; int data_len; int queries; int family; @@ -459,11 +459,11 @@ static int dns_read(int sock, queries = ret; optlen = sizeof(int); - (void)zsock_getsockopt(sock, SOL_SOCKET, SO_DOMAIN, &family, &optlen); + (void)zsock_getsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_DOMAIN, &family, &optlen); NET_DBG("Received %d %s from %s (id 0x%04x)", queries, queries > 1 ? "queries" : "query", - family == AF_INET ? + family == NET_AF_INET ? net_sprint_ipv4_addr(&net_sin(src_addr)->sin_addr) : net_sprint_ipv6_addr(&net_sin6(src_addr)->sin6_addr), dns_id); @@ -510,21 +510,21 @@ static int dns_read(int sock, static int recv_data(struct net_socket_service_event *pev) { COND_CODE_1(IS_ENABLED(CONFIG_NET_IPV6), - (struct sockaddr_in6), (struct sockaddr_in)) addr; + (struct net_sockaddr_in6), (struct net_sockaddr_in)) addr; struct net_buf *dns_data = NULL; struct dns_addrinfo info = { 0 }; size_t addrlen = sizeof(addr); - int ret, family = AF_UNSPEC, sock_error, len; - socklen_t optlen; + int ret, family = NET_AF_UNSPEC, sock_error, len; + net_socklen_t optlen; if ((pev->event.revents & ZSOCK_POLLERR) || (pev->event.revents & ZSOCK_POLLNVAL)) { - (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, - SO_DOMAIN, &family, &optlen); - (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, - SO_ERROR, &sock_error, &optlen); + (void)zsock_getsockopt(pev->event.fd, ZSOCK_SOL_SOCKET, + ZSOCK_SO_DOMAIN, &family, &optlen); + (void)zsock_getsockopt(pev->event.fd, ZSOCK_SOL_SOCKET, + ZSOCK_SO_ERROR, &sock_error, &optlen); NET_ERR("Receiver IPv%d socket error (%d)", - family == AF_INET ? 4 : 6, sock_error); + family == NET_AF_INET ? 4 : 6, sock_error); ret = DNS_EAI_SYSTEM; goto quit; } @@ -537,18 +537,18 @@ static int recv_data(struct net_socket_service_event *pev) ret = zsock_recvfrom(pev->event.fd, dns_data->data, net_buf_max_len(dns_data), 0, - (struct sockaddr *)&addr, &addrlen); + (struct net_sockaddr *)&addr, &addrlen); if (ret < 0) { ret = -errno; NET_ERR("recv failed on IPv%d socket (%d)", - family == AF_INET ? 4 : 6, -ret); + family == NET_AF_INET ? 4 : 6, -ret); goto free_buf; } len = ret; ret = dns_read(pev->event.fd, dns_data, len, - (struct sockaddr *)&addr, addrlen, &info); + (struct net_sockaddr *)&addr, addrlen, &info); if (ret < 0 && ret != -EINVAL) { NET_DBG("%s read failed (%d)", "LLMNR", ret); } @@ -573,7 +573,7 @@ static void svc_handler(struct net_socket_service_event *pev) #if defined(CONFIG_NET_IPV6) static void iface_ipv6_cb(struct net_if *iface, void *user_data) { - struct in6_addr *addr = user_data; + struct net_in6_addr *addr = user_data; int ret; ret = net_ipv6_mld_join(iface, addr); @@ -585,7 +585,7 @@ static void iface_ipv6_cb(struct net_if *iface, void *user_data) } } -static void setup_ipv6_addr(struct sockaddr_in6 *local_addr) +static void setup_ipv6_addr(struct net_sockaddr_in6 *local_addr) { create_ipv6_addr(local_addr); @@ -596,7 +596,7 @@ static void setup_ipv6_addr(struct sockaddr_in6 *local_addr) #if defined(CONFIG_NET_IPV4) static void iface_ipv4_cb(struct net_if *iface, void *user_data) { - struct in_addr *addr = user_data; + struct net_in_addr *addr = user_data; int ret; ret = net_ipv4_igmp_join(iface, addr, NULL); @@ -606,7 +606,7 @@ static void iface_ipv4_cb(struct net_if *iface, void *user_data) } } -static void setup_ipv4_addr(struct sockaddr_in *local_addr) +static void setup_ipv4_addr(struct net_sockaddr_in *local_addr) { create_ipv4_addr(local_addr); @@ -624,13 +624,13 @@ static int init_listener(void) #if defined(CONFIG_NET_IPV6) { - static struct sockaddr_in6 local_addr; + static struct net_sockaddr_in6 local_addr; setup_ipv6_addr(&local_addr); - ipv6 = get_socket(AF_INET6); + ipv6 = get_socket(NET_AF_INET6); - ret = bind_ctx(ipv6, (struct sockaddr *)&local_addr, + ret = bind_ctx(ipv6, (struct net_sockaddr *)&local_addr, sizeof(local_addr)); if (ret < 0) { zsock_close(ipv6); @@ -675,9 +675,9 @@ static int init_listener(void) { setup_ipv4_addr(&local_addr4); - ipv4 = get_socket(AF_INET); + ipv4 = get_socket(NET_AF_INET); - ret = bind_ctx(ipv4, (struct sockaddr *)&local_addr4, + ret = bind_ctx(ipv4, (struct net_sockaddr *)&local_addr4, sizeof(local_addr4)); if (ret < 0) { zsock_close(ipv4); diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c index e60ab9b700290..d36bc5ebbcccf 100644 --- a/subsys/net/lib/dns/mdns_responder.c +++ b/subsys/net/lib/dns/mdns_responder.c @@ -40,7 +40,7 @@ LOG_MODULE_REGISTER(net_mdns_responder, CONFIG_MDNS_RESPONDER_LOG_LEVEL); #include "net_private.h" /* - * GCC complains about struct sockaddr accesses due to the various + * GCC complains about struct net_sockaddr accesses due to the various * address-family-specific variants being of differing sizes. Let's not * mess with code (which looks correct), just silence the compiler. */ @@ -106,9 +106,9 @@ static size_t external_records_count; #define BUF_ALLOC_TIMEOUT K_MSEC(100) #ifndef CONFIG_NET_TEST -static int setup_dst_addr(int sock, sa_family_t family, - struct sockaddr *src, socklen_t src_len, - struct sockaddr *dst, socklen_t *dst_len); +static int setup_dst_addr(int sock, net_sa_family_t family, + struct net_sockaddr *src, net_socklen_t src_len, + struct net_sockaddr *dst, net_socklen_t *dst_len); #endif /* CONFIG_NET_TEST */ #define DNS_RESOLVER_MIN_BUF 2 @@ -119,23 +119,23 @@ static int setup_dst_addr(int sock, sa_family_t family, NET_BUF_POOL_DEFINE(mdns_msg_pool, DNS_RESOLVER_BUF_CTR, MDNS_RESOLVER_BUF_SIZE, 0, NULL); -static void create_ipv6_addr(struct sockaddr_in6 *addr) +static void create_ipv6_addr(struct net_sockaddr_in6 *addr) { - addr->sin6_family = AF_INET6; - addr->sin6_port = htons(MDNS_LISTEN_PORT); + addr->sin6_family = NET_AF_INET6; + addr->sin6_port = net_htons(MDNS_LISTEN_PORT); /* Well known IPv6 ff02::fb address */ net_ipv6_addr_create(&addr->sin6_addr, 0xff02, 0, 0, 0, 0, 0, 0, 0x00fb); } -static void create_ipv4_addr(struct sockaddr_in *addr) +static void create_ipv4_addr(struct net_sockaddr_in *addr) { - addr->sin_family = AF_INET; - addr->sin_port = htons(MDNS_LISTEN_PORT); + addr->sin_family = NET_AF_INET; + addr->sin_port = net_htons(MDNS_LISTEN_PORT); /* Well known IPv4 224.0.0.251 address */ - addr->sin_addr.s_addr = htonl(0xE00000FB); + addr->sin_addr.s_addr = net_htonl(0xE00000FB); } #if defined(CONFIG_MDNS_RESPONDER_PROBE) @@ -192,34 +192,35 @@ static int set_ttl_hop_limit(int sock, int level, int option, int new_limit) return zsock_setsockopt(sock, level, option, &new_limit, sizeof(new_limit)); } -int setup_dst_addr(int sock, sa_family_t family, - struct sockaddr *src, socklen_t src_len, - struct sockaddr *dst, socklen_t *dst_len) +int setup_dst_addr(int sock, net_sa_family_t family, + struct net_sockaddr *src, net_socklen_t src_len, + struct net_sockaddr *dst, net_socklen_t *dst_len) { int ret; - if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { - if ((src != NULL) && (net_sin(src)->sin_port != htons(MDNS_LISTEN_PORT))) { + if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { + if ((src != NULL) && (net_sin(src)->sin_port != net_htons(MDNS_LISTEN_PORT))) { memcpy(dst, src, src_len); *dst_len = src_len; } else { create_ipv4_addr(net_sin(dst)); - *dst_len = sizeof(struct sockaddr_in); + *dst_len = sizeof(struct net_sockaddr_in); - ret = set_ttl_hop_limit(sock, IPPROTO_IP, IP_MULTICAST_TTL, 255); + ret = set_ttl_hop_limit(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, 255); if (ret < 0) { NET_DBG("Cannot set %s multicast %s (%d)", "IPv4", "TTL", ret); } } - } else if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { - if ((src != NULL) && (net_sin6(src)->sin6_port != htons(MDNS_LISTEN_PORT))) { + } else if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { + if ((src != NULL) && (net_sin6(src)->sin6_port != net_htons(MDNS_LISTEN_PORT))) { memcpy(dst, src, src_len); *dst_len = src_len; } else { create_ipv6_addr(net_sin6(dst)); - *dst_len = sizeof(struct sockaddr_in6); + *dst_len = sizeof(struct net_sockaddr_in6); - ret = set_ttl_hop_limit(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, 255); + ret = set_ttl_hop_limit(sock, NET_IPPROTO_IPV6, + ZSOCK_IPV6_MULTICAST_HOPS, 255); if (ret < 0) { NET_DBG("Cannot set %s multicast %s (%d)", "IPv6", "hoplimit", ret); } @@ -231,11 +232,11 @@ int setup_dst_addr(int sock, sa_family_t family, return 0; } -static int get_socket(sa_family_t family) +static int get_socket(net_sa_family_t family) { int ret; - ret = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + ret = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (ret < 0) { ret = -errno; } @@ -256,13 +257,13 @@ static void setup_dns_hdr(uint8_t *buf, uint16_t answers) UNALIGNED_PUT(0, (uint16_t *)(buf)); /* Identifier, RFC 6762 ch 18.1 */ offset = DNS_HEADER_ID_LEN; - UNALIGNED_PUT(htons(flags), (uint16_t *)(buf+offset)); + UNALIGNED_PUT(net_htons(flags), (uint16_t *)(buf+offset)); offset += DNS_HEADER_FLAGS_LEN; UNALIGNED_PUT(0, (uint16_t *)(buf + offset)); offset += DNS_QDCOUNT_LEN; - UNALIGNED_PUT(htons(answers), (uint16_t *)(buf + offset)); + UNALIGNED_PUT(net_htons(answers), (uint16_t *)(buf + offset)); offset += DNS_ANCOUNT_LEN; UNALIGNED_PUT(0, (uint16_t *)(buf + offset)); @@ -292,19 +293,19 @@ static void add_answer(struct net_buf *query, enum dns_rr_type qtype, query->len += 1; offset = DNS_MSG_HEADER_SIZE + query->len; - UNALIGNED_PUT(htons(qtype), (uint16_t *)(query->data+offset)); + UNALIGNED_PUT(net_htons(qtype), (uint16_t *)(query->data+offset)); /* Bit 15 tells to flush the cache */ offset += DNS_QTYPE_LEN; - UNALIGNED_PUT(htons(DNS_CLASS_IN | BIT(15)), + UNALIGNED_PUT(net_htons(DNS_CLASS_IN | BIT(15)), (uint16_t *)(query->data+offset)); offset += DNS_QCLASS_LEN; - UNALIGNED_PUT(htonl(ttl), query->data + offset); + UNALIGNED_PUT(net_htonl(ttl), query->data + offset); offset += DNS_TTL_LEN; - UNALIGNED_PUT(htons(addr_len), query->data + offset); + UNALIGNED_PUT(net_htons(addr_len), query->data + offset); offset += DNS_RDLENGTH_LEN; memcpy(query->data + offset, addr, addr_len); @@ -340,61 +341,64 @@ static int create_answer(int sock, } static int send_response(int sock, - sa_family_t family, - struct sockaddr *src_addr, + net_sa_family_t family, + struct net_sockaddr *src_addr, size_t addrlen, struct net_buf *query, enum dns_rr_type qtype) { struct net_if *iface; - socklen_t dst_len; + net_socklen_t dst_len; int ret; COND_CODE_1(IS_ENABLED(CONFIG_NET_IPV6), - (struct sockaddr_in6), (struct sockaddr_in)) dst; + (struct net_sockaddr_in6), (struct net_sockaddr_in)) dst; - ret = setup_dst_addr(sock, family, src_addr, addrlen, (struct sockaddr *)&dst, &dst_len); + ret = setup_dst_addr(sock, family, src_addr, addrlen, + (struct net_sockaddr *)&dst, &dst_len); if (ret < 0) { NET_DBG("unable to set up the response address"); return ret; } - if (family == AF_INET6) { + if (family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface(&net_sin6(src_addr)->sin6_addr); } else { iface = net_if_ipv4_select_src_iface(&net_sin(src_addr)->sin_addr); } if (IS_ENABLED(CONFIG_NET_IPV4) && qtype == DNS_RR_TYPE_A) { - const struct in_addr *addr; + const struct net_in_addr *addr; - if (family == AF_INET) { + if (family == NET_AF_INET) { addr = net_if_ipv4_select_src_addr(iface, &net_sin(src_addr)->sin_addr); } else { - struct sockaddr_in tmp_addr; + struct net_sockaddr_in tmp_addr; create_ipv4_addr(&tmp_addr); addr = net_if_ipv4_select_src_addr(iface, &tmp_addr.sin_addr); } - ret = create_answer(sock, query, qtype, sizeof(struct in_addr), (uint8_t *)addr); + ret = create_answer(sock, query, qtype, sizeof(struct net_in_addr), + (uint8_t *)addr); if (ret != 0) { return ret; } } else if (IS_ENABLED(CONFIG_NET_IPV6) && qtype == DNS_RR_TYPE_AAAA) { - const struct in6_addr *addr; + const struct net_in6_addr *addr; - if (family == AF_INET6) { + if (family == NET_AF_INET6) { addr = net_if_ipv6_select_src_addr(iface, &net_sin6(src_addr)->sin6_addr); } else { - struct sockaddr_in6 tmp_addr; + struct net_sockaddr_in6 tmp_addr; create_ipv6_addr(&tmp_addr); addr = net_if_ipv6_select_src_addr(iface, &tmp_addr.sin6_addr); } - ret = create_answer(sock, query, qtype, sizeof(struct in6_addr), (uint8_t *)addr); + ret = create_answer(sock, query, qtype, sizeof(struct net_in6_addr), + (uint8_t *)addr); if (ret != 0) { return -ENOMEM; } @@ -404,7 +408,7 @@ static int send_response(int sock, } ret = zsock_sendto(sock, query->data, query->len, 0, - (struct sockaddr *)&dst, dst_len); + (struct net_sockaddr *)&dst, dst_len); if (ret < 0) { ret = -errno; NET_DBG("Cannot send %s reply (%d)", "mDNS", ret); @@ -416,21 +420,21 @@ static int send_response(int sock, } static void send_sd_response(int sock, - sa_family_t family, - struct sockaddr *src_addr, + net_sa_family_t family, + struct net_sockaddr *src_addr, size_t addrlen, struct dns_msg_t *dns_msg, struct net_buf *result) { struct net_if *iface; - socklen_t dst_len; + net_socklen_t dst_len; int ret; const struct dns_sd_rec *record; /* filter must be zero-initialized for "wildcard" port */ struct dns_sd_rec filter = {0}; bool service_type_enum = false; - const struct in6_addr *addr6 = NULL; - const struct in_addr *addr4 = NULL; + const struct net_in6_addr *addr6 = NULL; + const struct net_in_addr *addr4 = NULL; char instance_buf[DNS_SD_INSTANCE_MAX_SIZE + 1]; char service_buf[DNS_SD_SERVICE_MAX_SIZE + 1]; /* Depending on segment count in the query, third buffer could hold @@ -449,7 +453,7 @@ static void send_sd_response(int sock, size_t rec_num; size_t ext_rec_num = external_records_count; COND_CODE_1(IS_ENABLED(CONFIG_NET_IPV6), - (struct sockaddr_in6), (struct sockaddr_in)) dst; + (struct net_sockaddr_in6), (struct net_sockaddr_in)) dst; BUILD_ASSERT(ARRAY_SIZE(label) == ARRAY_SIZE(size), ""); @@ -462,13 +466,14 @@ static void send_sd_response(int sock, label[2] = proto_buf; label[3] = domain_buf; - ret = setup_dst_addr(sock, family, src_addr, addrlen, (struct sockaddr *)&dst, &dst_len); + ret = setup_dst_addr(sock, family, src_addr, addrlen, + (struct net_sockaddr *)&dst, &dst_len); if (ret < 0) { NET_DBG("unable to set up the response address"); return; } - if (family == AF_INET6) { + if (family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface(&net_sin6(src_addr)->sin6_addr); } else { iface = net_if_ipv4_select_src_iface(&net_sin(src_addr)->sin_addr); @@ -476,11 +481,11 @@ static void send_sd_response(int sock, if (IS_ENABLED(CONFIG_NET_IPV4)) { /* Look up the local IPv4 address */ - if (family == AF_INET) { + if (family == NET_AF_INET) { addr4 = net_if_ipv4_select_src_addr(iface, &net_sin(src_addr)->sin_addr); } else { - struct sockaddr_in tmp_addr; + struct net_sockaddr_in tmp_addr; create_ipv4_addr(&tmp_addr); addr4 = net_if_ipv4_select_src_addr(iface, &tmp_addr.sin_addr); @@ -489,11 +494,11 @@ static void send_sd_response(int sock, if (IS_ENABLED(CONFIG_NET_IPV6)) { /* Look up the local IPv6 address */ - if (family == AF_INET6) { + if (family == NET_AF_INET6) { addr6 = net_if_ipv6_select_src_addr(iface, &net_sin6(src_addr)->sin6_addr); } else { - struct sockaddr_in6 tmp_addr; + struct net_sockaddr_in6 tmp_addr; create_ipv6_addr(&tmp_addr); addr6 = net_if_ipv6_select_src_addr(iface, &tmp_addr.sin6_addr); @@ -542,7 +547,7 @@ static void send_sd_response(int sock, NET_DBG("matched query: %s.%s.%s.%s port: %u", record->instance, record->service, record->proto, record->domain, - ntohs(*(record->port))); + net_ntohs(*(record->port))); /* Construct the response */ if (service_type_enum) { @@ -566,7 +571,7 @@ static void send_sd_response(int sock, /* Send the response */ ret = zsock_sendto(sock, result->data, result->len, 0, - (struct sockaddr *)&dst, dst_len); + (struct net_sockaddr *)&dst, dst_len); if (ret < 0) { NET_DBG("Cannot send %s reply (%d)", "mDNS", ret); continue; @@ -580,7 +585,7 @@ static void send_sd_response(int sock, static int dns_read(int sock, struct net_buf *dns_data, size_t len, - struct sockaddr *src_addr, + struct net_sockaddr *src_addr, size_t addrlen) { /* Helper struct to track the dns msg received from the server */ @@ -617,10 +622,10 @@ static int dns_read(int sock, NET_DBG("Received %d %s from %s:%u", queries, queries > 1 ? "queries" : "query", net_sprint_addr(family, - family == AF_INET ? + family == NET_AF_INET ? (const void *)&net_sin(src_addr)->sin_addr : (const void *)&net_sin6(src_addr)->sin6_addr), - ntohs(family == AF_INET ? + net_ntohs(family == NET_AF_INET ? net_sin(src_addr)->sin_port : net_sin6(src_addr)->sin6_port)); @@ -655,7 +660,7 @@ static int dns_read(int sock, (result->len) >= hostname_len && &result->data[hostname_len] == lquery) { NET_DBG("%s %s %s to our hostname %s%s", "mDNS", - family == AF_INET ? "IPv4" : "IPv6", "query", + family == NET_AF_INET ? "IPv4" : "IPv6", "query", hostname, ".local"); send_response(sock, family, src_addr, addrlen, result, qtype); @@ -682,20 +687,20 @@ static int dns_read(int sock, */ #if defined(CONFIG_MDNS_RESPONDER_PROBE) -static int add_address(struct net_if *iface, sa_family_t family, +static int add_address(struct net_if *iface, net_sa_family_t family, const void *address, size_t addrlen) { size_t expected_len; int first_free; - if (family != AF_INET && family != AF_INET6) { + if (family != NET_AF_INET && family != NET_AF_INET6) { return -EINVAL; } - if (family == AF_INET) { - expected_len = sizeof(struct in_addr); + if (family == NET_AF_INET) { + expected_len = sizeof(struct net_in_addr); } else { - expected_len = sizeof(struct in6_addr); + expected_len = sizeof(struct net_in6_addr); } if (addrlen != expected_len) { @@ -732,8 +737,8 @@ static int add_address(struct net_if *iface, sa_family_t family, memcpy(&mon_if[first_free].addr.in_addr, address, expected_len); NET_DBG("%s added %s address %s to iface %d in slot %d", - "mDNS", family == AF_INET ? "IPv4" : "IPv6", - family == AF_INET ? net_sprint_ipv4_addr(address) : + "mDNS", family == NET_AF_INET ? "IPv4" : "IPv6", + family == NET_AF_INET ? net_sprint_ipv4_addr(address) : net_sprint_ipv6_addr(address), net_if_get_by_iface(iface), first_free); return 0; @@ -742,19 +747,19 @@ static int add_address(struct net_if *iface, sa_family_t family, return -ENOENT; } -static int del_address(struct net_if *iface, sa_family_t family, +static int del_address(struct net_if *iface, net_sa_family_t family, const void *address, size_t addrlen) { size_t expected_len; - if (family != AF_INET && family != AF_INET6) { + if (family != NET_AF_INET && family != NET_AF_INET6) { return -EINVAL; } - if (family == AF_INET) { - expected_len = sizeof(struct in_addr); + if (family == NET_AF_INET) { + expected_len = sizeof(struct net_in_addr); } else { - expected_len = sizeof(struct in6_addr); + expected_len = sizeof(struct net_in6_addr); } ARRAY_FOR_EACH(mon_if, j) { @@ -825,21 +830,21 @@ static void probe_cb(enum dns_resolve_status status, static int send_probe(struct mdns_responder_context *ctx) { const char *hostname = net_hostname_get(); - struct sockaddr *servers[2] = { 0 }; - struct sockaddr_in6 server = { 0 }; + struct net_sockaddr *servers[2] = { 0 }; + struct net_sockaddr_in6 server = { 0 }; int interfaces[ARRAY_SIZE(servers)] = { 0 }; uint16_t local_port; int ret; NET_DBG("%s %s %s to our hostname %s%s iface %d", "mDNS", - ctx->dispatcher.local_addr.sa_family == AF_INET ? "IPv4" : "IPv6", + ctx->dispatcher.local_addr.sa_family == NET_AF_INET ? "IPv4" : "IPv6", "probe", hostname, ".local", net_if_get_by_iface(ctx->iface)); ret = 0; do { local_port = sys_rand16_get() | 0x8000; ret++; - } while (net_context_port_in_use(IPPROTO_UDP, local_port, + } while (net_context_port_in_use(NET_IPPROTO_UDP, local_port, &ctx->dispatcher.local_addr) && ret < PORT_COUNT); if (ret >= PORT_COUNT) { NET_ERR("No available port, %s probe fails!", "mDNS"); @@ -847,17 +852,17 @@ static int send_probe(struct mdns_responder_context *ctx) goto out; } - if (ctx->dispatcher.local_addr.sa_family == AF_INET) { - create_ipv4_addr((struct sockaddr_in *)&server); + if (ctx->dispatcher.local_addr.sa_family == NET_AF_INET) { + create_ipv4_addr((struct net_sockaddr_in *)&server); } else { create_ipv6_addr(&server); } - servers[0] = (struct sockaddr *)&server; + servers[0] = (struct net_sockaddr *)&server; interfaces[0] = net_if_get_by_iface(ctx->iface); ret = dns_resolve_init_with_svc(&ctx->probe_ctx, NULL, - (const struct sockaddr **)servers, + (const struct net_sockaddr **)servers, ctx->dispatcher.svc, local_port, interfaces); if (ret < 0) { @@ -948,8 +953,8 @@ static void probing(struct k_work *work) } NET_DBG("Cannot send %s mDNS probe (%d, errno %d)", - ctx->dispatcher.local_addr.sa_family == AF_INET ? "IPv4" : - (ctx->dispatcher.local_addr.sa_family == AF_INET6 ? "IPv6" : + ctx->dispatcher.local_addr.sa_family == NET_AF_INET ? "IPv4" : + (ctx->dispatcher.local_addr.sa_family == NET_AF_INET6 ? "IPv6" : ""), ret, errno); } @@ -969,7 +974,7 @@ static void mdns_addr_event_handler(struct net_mgmt_event_callback *cb, continue; } - ret = add_address(iface, AF_INET, cb->info, cb->info_length); + ret = add_address(iface, NET_AF_INET, cb->info, cb->info_length); if (ret < 0 && ret != -EALREADY) { NET_DBG("Cannot %s %s address (%d)", "add", "IPv4", ret); return; @@ -1000,7 +1005,7 @@ static void mdns_addr_event_handler(struct net_mgmt_event_callback *cb, continue; } - ret = del_address(iface, AF_INET, cb->info, cb->info_length); + ret = del_address(iface, NET_AF_INET, cb->info, cb->info_length); if (ret < 0) { if (ret == -ENOENT) { continue; @@ -1041,7 +1046,7 @@ static void mdns_addr_event_handler(struct net_mgmt_event_callback *cb, continue; } - ret = add_address(iface, AF_INET6, cb->info, cb->info_length); + ret = add_address(iface, NET_AF_INET6, cb->info, cb->info_length); if (ret < 0 && ret != -EALREADY) { NET_DBG("Cannot %s %s address (%d)", "add", "IPv6", ret); return; @@ -1072,7 +1077,7 @@ static void mdns_addr_event_handler(struct net_mgmt_event_callback *cb, continue; } - ret = del_address(iface, AF_INET6, cb->info, cb->info_length); + ret = del_address(iface, NET_AF_INET6, cb->info, cb->info_length); if (ret < 0) { if (ret == -ENOENT) { continue; @@ -1122,7 +1127,7 @@ static void mdns_conn_event_handler(struct net_mgmt_event_callback *cb, #if defined(CONFIG_NET_IPV6) static void iface_ipv6_cb(struct net_if *iface, void *user_data) { - struct in6_addr *addr = user_data; + struct net_in6_addr *addr = user_data; int ret; ret = net_ipv6_mld_join(iface, addr); @@ -1132,7 +1137,7 @@ static void iface_ipv6_cb(struct net_if *iface, void *user_data) } } -static void setup_ipv6_addr(struct sockaddr_in6 *local_addr) +static void setup_ipv6_addr(struct net_sockaddr_in6 *local_addr) { create_ipv6_addr(local_addr); @@ -1143,7 +1148,7 @@ static void setup_ipv6_addr(struct sockaddr_in6 *local_addr) #if defined(CONFIG_NET_IPV4) static void iface_ipv4_cb(struct net_if *iface, void *user_data) { - struct in_addr *addr = user_data; + struct net_in_addr *addr = user_data; int ret; if (!net_if_is_up(iface)) { @@ -1168,7 +1173,7 @@ static void iface_ipv4_cb(struct net_if *iface, void *user_data) } } -static void setup_ipv4_addr(struct sockaddr_in *local_addr) +static void setup_ipv4_addr(struct net_sockaddr_in *local_addr) { create_ipv4_addr(local_addr); @@ -1183,7 +1188,7 @@ static void setup_ipv4_addr(struct sockaddr_in *local_addr) #endif static int dispatcher_cb(struct dns_socket_dispatcher *ctx, int sock, - struct sockaddr *addr, size_t addrlen, + struct net_sockaddr *addr, size_t addrlen, struct net_buf *dns_data, size_t len) { int ret; @@ -1198,7 +1203,7 @@ static int dispatcher_cb(struct dns_socket_dispatcher *ctx, int sock, static int register_dispatcher(struct mdns_responder_context *ctx, const struct net_socket_service_desc *svc, - struct sockaddr *local, + struct net_sockaddr *local, int ifindex, struct zsock_pollfd *fds, size_t fds_len) @@ -1220,12 +1225,12 @@ static int register_dispatcher(struct mdns_responder_context *ctx, */ svc->pev[0].event.fd = ctx->sock; - if (IS_ENABLED(CONFIG_NET_IPV6) && local->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && local->sa_family == NET_AF_INET6) { memcpy(&ctx->dispatcher.local_addr, local, - sizeof(struct sockaddr_in6)); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && local->sa_family == AF_INET) { + sizeof(struct net_sockaddr_in6)); + } else if (IS_ENABLED(CONFIG_NET_IPV4) && local->sa_family == NET_AF_INET) { memcpy(&ctx->dispatcher.local_addr, local, - sizeof(struct sockaddr_in)); + sizeof(struct net_sockaddr_in)); } else { return -ENOTSUP; } @@ -1259,7 +1264,7 @@ static int pre_init_listener(void) } v6_ctx[i].iface = iface; - v6_ctx[i].dispatcher.local_addr.sa_family = AF_INET6; + v6_ctx[i].dispatcher.local_addr.sa_family = NET_AF_INET6; v6_ctx[i].dispatcher.svc = &v6_svc; k_work_init_delayable(&v6_ctx[i].probe_timer, probing); @@ -1282,7 +1287,7 @@ static int pre_init_listener(void) } v4_ctx[i].iface = iface; - v4_ctx[i].dispatcher.local_addr.sa_family = AF_INET; + v4_ctx[i].dispatcher.local_addr.sa_family = NET_AF_INET; v4_ctx[i].dispatcher.svc = &v4_svc; k_work_init_delayable(&v4_ctx[i].probe_timer, probing); @@ -1304,7 +1309,7 @@ static int init_listener(void) { int ret, ok = 0, ifindex; char name[INTERFACE_NAME_LEN + 1]; - struct ifreq if_req; + struct net_ifreq if_req; struct net_if *iface; int iface_count, fds_pos; @@ -1317,7 +1322,7 @@ static int init_listener(void) * IPv6 sockets, we must collect the sockets in one place. */ struct zsock_pollfd ipv6_fds[MAX_IPV6_IFACE_COUNT]; - struct sockaddr_in6 local_addr6; + struct net_sockaddr_in6 local_addr6; int v6; if ((iface_count > MAX_IPV6_IFACE_COUNT && MAX_IPV6_IFACE_COUNT > 0)) { @@ -1339,7 +1344,7 @@ static int init_listener(void) v6_ctx[i].fds[j].fd = -1; } - v6 = get_socket(AF_INET6); + v6 = get_socket(NET_AF_INET6); if (v6 < 0) { NET_ERR("Cannot get %s socket (%d %s interfaces). Max sockets is %d (%d)", "IPv6", MAX_IPV6_IFACE_COUNT, @@ -1364,7 +1369,7 @@ static int init_listener(void) memcpy(if_req.ifr_name, name, MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1)); - ret = zsock_setsockopt(v6, SOL_SOCKET, SO_BINDTODEVICE, + ret = zsock_setsockopt(v6, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &if_req, sizeof(if_req)); if (ret < 0) { NET_DBG("Cannot bind sock %d to interface %d (%d)", @@ -1400,7 +1405,7 @@ static int init_listener(void) continue; } - ret = register_dispatcher(&v6_ctx[i], &v6_svc, (struct sockaddr *)&local_addr6, + ret = register_dispatcher(&v6_ctx[i], &v6_svc, (struct net_sockaddr *)&local_addr6, ifindex, ipv6_fds, ARRAY_SIZE(ipv6_fds)); if (ret < 0 && ret != -EALREADY) { NET_DBG("Cannot register %s %s socket service (%d)", @@ -1414,7 +1419,7 @@ static int init_listener(void) #if defined(CONFIG_NET_IPV4) struct zsock_pollfd ipv4_fds[MAX_IPV4_IFACE_COUNT]; - struct sockaddr_in local_addr4; + struct net_sockaddr_in local_addr4; int v4; if ((iface_count > MAX_IPV4_IFACE_COUNT && MAX_IPV4_IFACE_COUNT > 0)) { @@ -1436,7 +1441,7 @@ static int init_listener(void) v4_ctx[i].fds[j].fd = -1; } - v4 = get_socket(AF_INET); + v4 = get_socket(NET_AF_INET); if (v4 < 0) { NET_ERR("Cannot get %s socket (%d %s interfaces). Max sockets is %d (%d)", "IPv4", MAX_IPV4_IFACE_COUNT, @@ -1461,7 +1466,7 @@ static int init_listener(void) memcpy(if_req.ifr_name, name, MIN(sizeof(name) - 1, sizeof(if_req.ifr_name) - 1)); - ret = zsock_setsockopt(v4, SOL_SOCKET, SO_BINDTODEVICE, + ret = zsock_setsockopt(v4, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &if_req, sizeof(if_req)); if (ret < 0) { NET_DBG("Cannot bind sock %d to interface %d (%d)", @@ -1497,7 +1502,7 @@ static int init_listener(void) continue; } - ret = register_dispatcher(&v4_ctx[i], &v4_svc, (struct sockaddr *)&local_addr4, + ret = register_dispatcher(&v4_ctx[i], &v4_svc, (struct net_sockaddr *)&local_addr4, ifindex, ipv4_fds, ARRAY_SIZE(ipv4_fds)); if (ret < 0 && ret != -EALREADY) { NET_DBG("Cannot register %s %s socket service (%d)", @@ -1525,25 +1530,25 @@ static int init_listener(void) static int send_unsolicited_response(struct net_if *iface, int sock, - sa_family_t family, - struct sockaddr *src_addr, + net_sa_family_t family, + struct net_sockaddr *src_addr, size_t addrlen, struct net_buf *answer) { - socklen_t dst_len; + net_socklen_t dst_len; int ret; COND_CODE_1(IS_ENABLED(CONFIG_NET_IPV6), - (struct sockaddr_in6), (struct sockaddr_in)) dst; + (struct net_sockaddr_in6), (struct net_sockaddr_in)) dst; - ret = setup_dst_addr(sock, family, NULL, 0, (struct sockaddr *)&dst, &dst_len); + ret = setup_dst_addr(sock, family, NULL, 0, (struct net_sockaddr *)&dst, &dst_len); if (ret < 0) { NET_DBG("unable to set up the response address"); return ret; } ret = zsock_sendto(sock, answer->data, answer->len, 0, - (struct sockaddr *)&dst, dst_len); + (struct net_sockaddr *)&dst, dst_len); if (ret < 0) { ret = -errno; } else { @@ -1585,9 +1590,9 @@ static struct net_buf *create_unsolicited_mdns_answer(struct net_if *iface, continue; } - if (addr_list[i].addr.family == AF_INET) { + if (addr_list[i].addr.family == NET_AF_INET) { type = DNS_RR_TYPE_A; - } else if (addr_list[i].addr.family == AF_INET6) { + } else if (addr_list[i].addr.family == NET_AF_INET6) { type = DNS_RR_TYPE_AAAA; } else { NET_DBG("Unknown family %d", addr_list[i].addr.family); @@ -1603,12 +1608,12 @@ static struct net_buf *create_unsolicited_mdns_answer(struct net_if *iface, left = net_buf_tailroom(answer); if ((answer_count == 0 && left < (1 + len + 1 + 5 + 1 + 2 + 2 + 4 + 4 + - (type == DNS_RR_TYPE_A ? sizeof(struct in_addr) : - sizeof(struct in6_addr)))) || + (type == DNS_RR_TYPE_A ? sizeof(struct net_in_addr) : + sizeof(struct net_in6_addr)))) || (answer_count > 0 && left < (1 + 1 + 2 + 2 + 4 + 4 + - (type == DNS_RR_TYPE_A ? sizeof(struct in_addr) : - sizeof(struct in6_addr))))) { + (type == DNS_RR_TYPE_A ? sizeof(struct net_in_addr) : + sizeof(struct net_in6_addr))))) { NET_DBG("No more space (%u left)", left); net_buf_unref(answer); return NULL; @@ -1631,13 +1636,13 @@ static struct net_buf *create_unsolicited_mdns_answer(struct net_if *iface, net_buf_add_be32(answer, ttl); if (type == DNS_RR_TYPE_A) { - net_buf_add_be16(answer, sizeof(struct in_addr)); + net_buf_add_be16(answer, sizeof(struct net_in_addr)); net_buf_add_mem(answer, &addr_list[i].addr.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } else if (type == DNS_RR_TYPE_AAAA) { - net_buf_add_be16(answer, sizeof(struct in6_addr)); + net_buf_add_be16(answer, sizeof(struct net_in6_addr)); net_buf_add_mem(answer, &addr_list[i].addr.in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } answer_count++; @@ -1645,7 +1650,7 @@ static struct net_buf *create_unsolicited_mdns_answer(struct net_if *iface, /* Adjust the answer count in the header */ if (answer_count > 1) { - UNALIGNED_PUT(htons(answer_count), (uint16_t *)&answer->data[6]); + UNALIGNED_PUT(net_htons(answer_count), (uint16_t *)&answer->data[6]); } return answer; @@ -1676,7 +1681,7 @@ static int send_announce(const char *name) int ret; #if defined(CONFIG_NET_IPV4) - struct sockaddr_in dst_addr4; + struct net_sockaddr_in dst_addr4; create_ipv4_addr(&dst_addr4); @@ -1701,8 +1706,8 @@ static int send_announce(const char *name) ret = send_unsolicited_response(v4_ctx[i].iface, v4_ctx[i].sock, - AF_INET, - (struct sockaddr *)&dst_addr4, + NET_AF_INET, + (struct net_sockaddr *)&dst_addr4, sizeof(dst_addr4), answer); @@ -1719,7 +1724,7 @@ static int send_announce(const char *name) #endif /* defined(CONFIG_NET_IPV4) */ #if defined(CONFIG_NET_IPV6) - struct sockaddr_in6 dst_addr6; + struct net_sockaddr_in6 dst_addr6; create_ipv6_addr(&dst_addr6); @@ -1744,8 +1749,8 @@ static int send_announce(const char *name) ret = send_unsolicited_response(v6_ctx[i].iface, v6_ctx[i].sock, - AF_INET6, - (struct sockaddr *)&dst_addr6, + NET_AF_INET6, + (struct net_sockaddr *)&dst_addr6, sizeof(dst_addr6), answer); diff --git a/subsys/net/lib/dns/resolve.c b/subsys/net/lib/dns/resolve.c index e7acf692a38b4..8b929faeee81f 100644 --- a/subsys/net/lib/dns/resolve.c +++ b/subsys/net/lib/dns/resolve.c @@ -64,8 +64,8 @@ NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(resolve_svc, dns_dispatcher_svc_handler, */ #define DNS_QUERY_POS 0x0c -#define DNS_IPV4_LEN sizeof(struct in_addr) -#define DNS_IPV6_LEN sizeof(struct in6_addr) +#define DNS_IPV4_LEN sizeof(struct net_in_addr) +#define DNS_IPV6_LEN sizeof(struct net_in6_addr) #define DNS_RESOLVER_MIN_BUF 1 #define DNS_RESOLVER_BUF_CTR (DNS_RESOLVER_MIN_BUF + \ @@ -106,9 +106,9 @@ static inline void invoke_query_callback(int status, struct dns_pending_query *pending_query); static void release_query(struct dns_pending_query *pending_query); -static bool server_is_mdns(sa_family_t family, struct sockaddr *addr) +static bool server_is_mdns(net_sa_family_t family, struct net_sockaddr *addr) { - if (family == AF_INET) { + if (family == NET_AF_INET) { if (net_ipv4_is_addr_mcast(&net_sin(addr)->sin_addr) && net_sin(addr)->sin_addr.s4_addr[3] == 251U) { return true; @@ -117,7 +117,7 @@ static bool server_is_mdns(sa_family_t family, struct sockaddr *addr) return false; } - if (family == AF_INET6) { + if (family == NET_AF_INET6) { if (net_ipv6_is_addr_mcast(&net_sin6(addr)->sin6_addr) && net_sin6(addr)->sin6_addr.s6_addr[15] == 0xfb) { return true; @@ -129,9 +129,9 @@ static bool server_is_mdns(sa_family_t family, struct sockaddr *addr) return false; } -static bool server_is_llmnr(sa_family_t family, struct sockaddr *addr) +static bool server_is_llmnr(net_sa_family_t family, struct net_sockaddr *addr) { - if (family == AF_INET) { + if (family == NET_AF_INET) { if (net_ipv4_is_addr_mcast(&net_sin(addr)->sin_addr) && net_sin(addr)->sin_addr.s4_addr[3] == 252U) { return true; @@ -140,7 +140,7 @@ static bool server_is_llmnr(sa_family_t family, struct sockaddr *addr) return false; } - if (family == AF_INET6) { + if (family == NET_AF_INET6) { if (net_ipv6_is_addr_mcast(&net_sin6(addr)->sin6_addr) && net_sin6(addr)->sin6_addr.s6_addr[15] == 0x03) { return true; @@ -154,7 +154,7 @@ static bool server_is_llmnr(sa_family_t family, struct sockaddr *addr) static void join_ipv4_mcast_group(struct net_if *iface, void *user_data) { - struct sockaddr *addr = user_data; + struct net_sockaddr *addr = user_data; int ret; ret = net_ipv4_igmp_join(iface, &net_sin(addr)->sin_addr, NULL); @@ -168,7 +168,7 @@ static void join_ipv4_mcast_group(struct net_if *iface, void *user_data) static void join_ipv6_mcast_group(struct net_if *iface, void *user_data) { - struct sockaddr *addr = user_data; + struct net_sockaddr *addr = user_data; int ret; ret = net_ipv6_mld_join(iface, &net_sin6(addr)->sin6_addr); @@ -182,13 +182,13 @@ static void join_ipv6_mcast_group(struct net_if *iface, void *user_data) static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx) { - struct sockaddr *addr = &ctx->servers[idx].dns_server; + struct net_sockaddr *addr = &ctx->servers[idx].dns_server; - if (addr->sa_family == AF_INET) { - ctx->servers[idx].is_mdns = server_is_mdns(AF_INET, addr); + if (addr->sa_family == NET_AF_INET) { + ctx->servers[idx].is_mdns = server_is_mdns(NET_AF_INET, addr); if (!ctx->servers[idx].is_mdns) { ctx->servers[idx].is_llmnr = - server_is_llmnr(AF_INET, addr); + server_is_llmnr(NET_AF_INET, addr); } if (net_sin(addr)->sin_port == 0U) { @@ -199,7 +199,7 @@ static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx) * override this by defining the port * in config file. */ - net_sin(addr)->sin_port = htons(5353); + net_sin(addr)->sin_port = net_htons(5353); } else if (IS_ENABLED(CONFIG_LLMNR_RESOLVER) && ctx->servers[idx].is_llmnr) { /* We only use 5355 as a default port @@ -207,9 +207,9 @@ static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx) * override this by defining the port * in config file. */ - net_sin(addr)->sin_port = htons(5355); + net_sin(addr)->sin_port = net_htons(5355); } else { - net_sin(addr)->sin_port = htons(53); + net_sin(addr)->sin_port = net_htons(53); } } @@ -217,7 +217,7 @@ static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx) * because it will join the group itself. */ if (!IS_ENABLED(CONFIG_MDNS_RESPONDER) && ctx->servers[idx].is_mdns) { - struct in_addr mcast_addr = { { { 224, 0, 0, 251 } } }; + struct net_in_addr mcast_addr = { { { 224, 0, 0, 251 } } }; if (net_sin(addr)->sin_addr.s_addr == mcast_addr.s_addr) { struct net_if *iface; @@ -233,30 +233,30 @@ static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx) } } } else { - ctx->servers[idx].is_mdns = server_is_mdns(AF_INET6, addr); + ctx->servers[idx].is_mdns = server_is_mdns(NET_AF_INET6, addr); if (!ctx->servers[idx].is_mdns) { ctx->servers[idx].is_llmnr = - server_is_llmnr(AF_INET6, addr); + server_is_llmnr(NET_AF_INET6, addr); } if (net_sin6(addr)->sin6_port == 0U) { if (IS_ENABLED(CONFIG_MDNS_RESOLVER) && ctx->servers[idx].is_mdns) { - net_sin6(addr)->sin6_port = htons(5353); + net_sin6(addr)->sin6_port = net_htons(5353); } else if (IS_ENABLED(CONFIG_LLMNR_RESOLVER) && ctx->servers[idx].is_llmnr) { - net_sin6(addr)->sin6_port = htons(5355); + net_sin6(addr)->sin6_port = net_htons(5355); } else { - net_sin6(addr)->sin6_port = htons(53); + net_sin6(addr)->sin6_port = net_htons(53); } } if (!IS_ENABLED(CONFIG_MDNS_RESPONDER) && ctx->servers[idx].is_mdns) { - struct in6_addr mcast_addr = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, + struct net_in6_addr mcast_addr = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xfb } } }; if (memcmp(&net_sin6(addr)->sin6_addr, &mcast_addr, - sizeof(struct in6_addr)) == 0) { + sizeof(struct net_in6_addr)) == 0) { struct net_if *iface; iface = net_if_get_by_index(ctx->servers[idx].if_index); @@ -273,7 +273,7 @@ static void dns_postprocess_server(struct dns_resolve_context *ctx, int idx) } static int dispatcher_cb(struct dns_socket_dispatcher *my_ctx, int sock, - struct sockaddr *addr, size_t addrlen, + struct net_sockaddr *addr, size_t addrlen, struct net_buf *dns_data, size_t len) { struct dns_resolve_context *ctx = my_ctx->resolve_ctx; @@ -369,9 +369,9 @@ static int dispatcher_cb(struct dns_socket_dispatcher *my_ctx, int sock, static int register_dispatcher(struct dns_resolve_context *ctx, const struct net_socket_service_desc *svc, struct dns_server *server, - struct sockaddr *local, - const struct in6_addr *addr6, - const struct in_addr *addr4) + struct net_sockaddr *local, + const struct net_in6_addr *addr6, + const struct net_in_addr *addr4) { server->dispatcher.type = DNS_SOCKET_RESOLVER; server->dispatcher.cb = dispatcher_cb; @@ -382,15 +382,15 @@ static int register_dispatcher(struct dns_resolve_context *ctx, server->dispatcher.resolve_ctx = ctx; if (IS_ENABLED(CONFIG_NET_IPV6) && - server->dns_server.sa_family == AF_INET6) { + server->dns_server.sa_family == NET_AF_INET6) { memcpy(&server->dispatcher.local_addr, local, - sizeof(struct sockaddr_in6)); + sizeof(struct net_sockaddr_in6)); } else if (IS_ENABLED(CONFIG_NET_IPV4) && - server->dns_server.sa_family == AF_INET) { + server->dns_server.sa_family == NET_AF_INET) { memcpy(&server->dispatcher.local_addr, local, - sizeof(struct sockaddr_in)); + sizeof(struct net_sockaddr_in)); } else { return -ENOTSUP; } @@ -398,9 +398,9 @@ static int register_dispatcher(struct dns_resolve_context *ctx, return dns_dispatcher_register(&server->dispatcher); } -static int bind_to_iface(int sock, const struct sockaddr *addr, int if_index) +static int bind_to_iface(int sock, const struct net_sockaddr *addr, int if_index) { - struct ifreq ifreq = { 0 }; + struct net_ifreq ifreq = { 0 }; int ret; ret = net_if_get_name(net_if_get_by_index(if_index), ifreq.ifr_name, @@ -410,7 +410,7 @@ static int bind_to_iface(int sock, const struct sockaddr *addr, int if_index) return ret; } - ret = zsock_setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, + ret = zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); if (ret < 0) { ret = -errno; @@ -428,9 +428,9 @@ static bool is_server_name_found(struct dns_resolve_context *ctx, const char *iface_str) { ARRAY_FOR_EACH(ctx->servers, i) { - if (ctx->servers[i].dns_server.sa_family == AF_INET || - ctx->servers[i].dns_server.sa_family == AF_INET6) { - char addr_str[INET6_ADDRSTRLEN]; + if (ctx->servers[i].dns_server.sa_family == NET_AF_INET || + ctx->servers[i].dns_server.sa_family == NET_AF_INET6) { + char addr_str[NET_INET6_ADDRSTRLEN]; size_t addr_len; if (net_addr_ntop(ctx->servers[i].dns_server.sa_family, @@ -446,7 +446,7 @@ static bool is_server_name_found(struct dns_resolve_context *ctx, } if (iface_str != NULL && ctx->servers[i].if_index > 0) { - char iface_name[IFNAMSIZ]; + char iface_name[NET_IFNAMSIZ]; net_if_get_name(net_if_get_by_index( ctx->servers[i].if_index), @@ -465,7 +465,7 @@ static bool is_server_name_found(struct dns_resolve_context *ctx, } static int idx_of_server_addr(struct dns_resolve_context *ctx, - const struct sockaddr *addr, + const struct net_sockaddr *addr, int if_index) { ARRAY_FOR_EACH(ctx->servers, i) { @@ -519,29 +519,29 @@ const char *dns_get_source_str(enum dns_server_source source) /* Must be invoked with context lock held */ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], const struct net_socket_service_desc *svc, uint16_t port, int interfaces[], bool do_cleanup, enum dns_server_source source) { #if defined(CONFIG_NET_IPV6) - struct sockaddr_in6 local_addr6 = { - .sin6_family = AF_INET6, - .sin6_port = htons(port), + struct net_sockaddr_in6 local_addr6 = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(port), }; #endif #if defined(CONFIG_NET_IPV4) - struct sockaddr_in local_addr4 = { - .sin_family = AF_INET, - .sin_port = htons(port), + struct net_sockaddr_in local_addr4 = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(port), }; #endif - struct sockaddr *local_addr = NULL; - socklen_t addr_len = 0; + struct net_sockaddr *local_addr = NULL; + net_socklen_t addr_len = 0; int i = 0, idx = 0; - const struct in6_addr *addr6 = NULL; - const struct in_addr *addr4 = NULL; + const struct net_in6_addr *addr6 = NULL; + const struct net_in_addr *addr4 = NULL; struct net_if *iface; int ret, count; @@ -567,14 +567,14 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, /* If user has provided a list of servers in string format, then * figure out the network interface from that list. If user used - * list of sockaddr servers, then use the interfaces parameter. + * list of net_sockaddr servers, then use the interfaces parameter. * The interfaces parameter should point to an array that is the * the same length as the servers_sa parameter array. */ for (i = 0; servers != NULL && idx < SERVER_COUNT && servers[i] != NULL; i++) { const char *iface_str; size_t server_len; - struct sockaddr *addr; + struct net_sockaddr *addr; bool found; iface_str = strstr(servers[i], "%"); @@ -669,7 +669,7 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, } for (i = 0; servers_sa != NULL && idx < SERVER_COUNT && servers_sa[i] != NULL; i++) { - char iface_str[IFNAMSIZ] = { 0 }; + char iface_str[NET_IFNAMSIZ] = { 0 }; int found_idx; found_idx = idx_of_server_addr(ctx, servers_sa[i], @@ -723,28 +723,28 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, for (i = 0, count = 0; i < SERVER_COUNT && ctx->servers[i].dns_server.sa_family != 0; i++) { - if (ctx->servers[i].dns_server.sa_family == AF_INET6) { + if (ctx->servers[i].dns_server.sa_family == NET_AF_INET6) { #if defined(CONFIG_NET_IPV6) - local_addr = (struct sockaddr *)&local_addr6; - addr_len = sizeof(struct sockaddr_in6); + local_addr = (struct net_sockaddr *)&local_addr6; + addr_len = sizeof(struct net_sockaddr_in6); if (IS_ENABLED(CONFIG_MDNS_RESOLVER) && ctx->servers[i].is_mdns && port == 0) { - local_addr6.sin6_port = htons(5353); + local_addr6.sin6_port = net_htons(5353); } #else continue; #endif } - if (ctx->servers[i].dns_server.sa_family == AF_INET) { + if (ctx->servers[i].dns_server.sa_family == NET_AF_INET) { #if defined(CONFIG_NET_IPV4) - local_addr = (struct sockaddr *)&local_addr4; - addr_len = sizeof(struct sockaddr_in); + local_addr = (struct net_sockaddr *)&local_addr4; + addr_len = sizeof(struct net_sockaddr_in); if (IS_ENABLED(CONFIG_MDNS_RESOLVER) && ctx->servers[i].is_mdns && port == 0) { - local_addr4.sin_port = htons(5353); + local_addr4.sin_port = net_htons(5353); } #else continue; @@ -768,7 +768,7 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, } ret = zsock_socket(ctx->servers[i].dns_server.sa_family, - SOCK_DGRAM, IPPROTO_UDP); + NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (ret < 0) { ret = -errno; NET_ERR("Cannot get socket (%d)", ret); @@ -798,7 +798,7 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, iface = NULL; } - if (ctx->servers[i].dns_server.sa_family == AF_INET6) { + if (ctx->servers[i].dns_server.sa_family == NET_AF_INET6) { if (iface == NULL) { iface = net_if_ipv6_select_src_iface( &net_sin6(&ctx->servers[i].dns_server)->sin6_addr); @@ -855,7 +855,7 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, net_mgmt_event_notify_with_info( NET_EVENT_DNS_SERVER_ADD, iface, (void *)&ctx->servers[i].dns_server, - sizeof(struct sockaddr)); + sizeof(struct net_sockaddr)); } else { net_mgmt_event_notify(NET_EVENT_DNS_SERVER_ADD, iface); } @@ -863,11 +863,11 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, skip_event: #if defined(CONFIG_NET_IPV6) - local_addr6.sin6_port = htons(port); + local_addr6.sin6_port = net_htons(port); #endif #if defined(CONFIG_NET_IPV4) - local_addr4.sin_port = htons(port); + local_addr4.sin_port = net_htons(port); #endif count++; @@ -890,7 +890,7 @@ static int dns_resolve_init_locked(struct dns_resolve_context *ctx, } int dns_resolve_init_with_svc(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], const struct net_socket_service_desc *svc, uint16_t port, int interfaces[]) { @@ -919,7 +919,7 @@ int dns_resolve_init_with_svc(struct dns_resolve_context *ctx, const char *serve } int dns_resolve_init(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[]) + const struct net_sockaddr *servers_sa[]) { return dns_resolve_init_with_svc(ctx, servers, servers_sa, &resolve_svc, 0, NULL); @@ -1233,9 +1233,9 @@ int dns_validate_msg(struct dns_resolve_context *ctx, address_size = DNS_IPV4_LEN; addr = (uint8_t *)&net_sin(&info.ai_addr)-> sin_addr; - info.ai_family = AF_INET; - info.ai_addr.sa_family = AF_INET; - info.ai_addrlen = sizeof(struct sockaddr_in); + info.ai_family = NET_AF_INET; + info.ai_addr.sa_family = NET_AF_INET; + info.ai_addrlen = sizeof(struct net_sockaddr_in); } else if (ctx->queries[*query_idx].query_type == DNS_QUERY_TYPE_AAAA) { @@ -1247,16 +1247,16 @@ int dns_validate_msg(struct dns_resolve_context *ctx, rr_qtype_aaaa: /* We cannot resolve IPv6 address if IPv6 is * disabled. The reason being that - * "struct sockaddr" does not have enough space + * "struct net_sockaddr" does not have enough space * for IPv6 address in that case. */ #if defined(CONFIG_NET_IPV6) address_size = DNS_IPV6_LEN; addr = (uint8_t *)&net_sin6(&info.ai_addr)-> sin6_addr; - info.ai_family = AF_INET6; - info.ai_addr.sa_family = AF_INET6; - info.ai_addrlen = sizeof(struct sockaddr_in6); + info.ai_family = NET_AF_INET6; + info.ai_addr.sa_family = NET_AF_INET6; + info.ai_addrlen = sizeof(struct net_sockaddr_in6); #else ret = DNS_EAI_FAMILY; goto quit; @@ -1308,7 +1308,7 @@ int dns_validate_msg(struct dns_resolve_context *ctx, goto quit; } - info.ai_family = AF_LOCAL; + info.ai_family = NET_AF_LOCAL; info.ai_addrlen = MIN(result->len, DNS_MAX_NAME_SIZE); memcpy(info.ai_canonname, result->data, info.ai_addrlen); info.ai_canonname[info.ai_addrlen] = '\0'; @@ -1367,7 +1367,7 @@ int dns_validate_msg(struct dns_resolve_context *ctx, pos = dns_msg->msg + dns_msg->response_position; - info.ai_family = AF_UNSPEC; + info.ai_family = NET_AF_UNSPEC; info.ai_extension = DNS_RESOLVE_TXT; info.ai_txt.textlen = MIN(dns_msg->response_length, DNS_MAX_TEXT_SIZE); @@ -1429,7 +1429,7 @@ int dns_validate_msg(struct dns_resolve_context *ctx, goto quit; } - info.ai_family = AF_UNSPEC; + info.ai_family = NET_AF_UNSPEC; info.ai_extension = DNS_RESOLVE_SRV; info.ai_srv.priority = priority; info.ai_srv.weight = weight; @@ -1584,7 +1584,7 @@ static int dns_write(struct dns_resolve_context *ctx, int hop_limit) { enum dns_query_type query_type; - struct sockaddr *server; + struct net_sockaddr *server; int server_addr_len; uint16_t dns_id, len; int ret, sock, family; @@ -1621,12 +1621,12 @@ static int dns_write(struct dns_resolve_context *ctx, crc16_ansi(query_name, dns_qname->len + 2); if (hop_limit > 0) { - if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) { - ret = set_ttl_hop_limit(sock, IPPROTO_IPV6, - IPV6_UNICAST_HOPS, + if (IS_ENABLED(CONFIG_NET_IPV6) && family == NET_AF_INET6) { + ret = set_ttl_hop_limit(sock, NET_IPPROTO_IPV6, + ZSOCK_IPV6_UNICAST_HOPS, hop_limit); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) { - ret = set_ttl_hop_limit(sock, IPPROTO_IP, IP_TTL, + } else if (IS_ENABLED(CONFIG_NET_IPV4) && family == NET_AF_INET) { + ret = set_ttl_hop_limit(sock, NET_IPPROTO_IP, ZSOCK_IP_TTL, hop_limit); } else { ret = -ENOTSUP; @@ -1634,8 +1634,8 @@ static int dns_write(struct dns_resolve_context *ctx, if (ret < 0) { NET_DBG("Cannot set %s to socket (%d)", - family == AF_INET6 ? "hop limit" : - (family == AF_INET ? "TTL" : ""), + family == NET_AF_INET6 ? "hop limit" : + (family == NET_AF_INET ? "TTL" : ""), ret); return ret; } @@ -1663,10 +1663,10 @@ static int dns_write(struct dns_resolve_context *ctx, return ret; } - if (family == AF_INET) { - server_addr_len = sizeof(struct sockaddr_in); + if (family == NET_AF_INET) { + server_addr_len = sizeof(struct net_sockaddr_in); } else { - server_addr_len = sizeof(struct sockaddr_in6); + server_addr_len = sizeof(struct net_sockaddr_in6); } ret = k_work_reschedule(&ctx->queries[query_idx].timer, @@ -1689,9 +1689,11 @@ static int dns_write(struct dns_resolve_context *ctx, if (IS_ENABLED(CONFIG_NET_STATISTICS_DNS)) { struct net_if *iface = NULL; - if (IS_ENABLED(CONFIG_NET_IPV6) && server->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && + server->sa_family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface(&net_sin6(server)->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && server->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && + server->sa_family == NET_AF_INET) { iface = net_if_ipv4_select_src_iface(&net_sin(server)->sin_addr); } @@ -1874,7 +1876,7 @@ int dns_resolve_name_internal(struct dns_resolve_context *ctx, k_timeout_t tout; struct net_buf *dns_data = NULL; struct net_buf *dns_qname = NULL; - struct sockaddr addr; + struct net_sockaddr addr; int ret, i = -1, j = 0; int ntry = 0, nfail = 0; bool mdns_query = false; @@ -1903,15 +1905,15 @@ int dns_resolve_name_internal(struct dns_resolve_context *ctx, struct dns_addrinfo info = { 0 }; if (type == DNS_QUERY_TYPE_A) { - if (net_sin(&addr)->sin_family == AF_INET6) { + if (net_sin(&addr)->sin_family == NET_AF_INET6) { return -EPFNOSUPPORT; } memcpy(net_sin(&info.ai_addr), net_sin(&addr), - sizeof(struct sockaddr_in)); - info.ai_family = AF_INET; - info.ai_addr.sa_family = AF_INET; - info.ai_addrlen = sizeof(struct sockaddr_in); + sizeof(struct net_sockaddr_in)); + info.ai_family = NET_AF_INET; + info.ai_addr.sa_family = NET_AF_INET; + info.ai_addrlen = sizeof(struct net_sockaddr_in); } else if (type == DNS_QUERY_TYPE_AAAA) { /* We do not support AI_V4MAPPED atm, so if the user * asks an IPv6 address but it is an IPv4 one, then @@ -1919,16 +1921,16 @@ int dns_resolve_name_internal(struct dns_resolve_context *ctx, * the error to EINVAL, the EPFNOSUPPORT is returned * here so that we can find it easily. */ - if (net_sin(&addr)->sin_family == AF_INET) { + if (net_sin(&addr)->sin_family == NET_AF_INET) { return -EPFNOSUPPORT; } #if defined(CONFIG_NET_IPV6) memcpy(net_sin6(&info.ai_addr), net_sin6(&addr), - sizeof(struct sockaddr_in6)); - info.ai_family = AF_INET6; - info.ai_addr.sa_family = AF_INET6; - info.ai_addrlen = sizeof(struct sockaddr_in6); + sizeof(struct net_sockaddr_in6)); + info.ai_family = NET_AF_INET6; + info.ai_addr.sa_family = NET_AF_INET6; + info.ai_addrlen = sizeof(struct net_sockaddr_in6); #else return -EAFNOSUPPORT; #endif @@ -1974,28 +1976,28 @@ int dns_resolve_name_internal(struct dns_resolve_context *ctx, return -EAFNOSUPPORT; } - struct in_addr addr4 = INADDR_LOOPBACK_INIT; + struct net_in_addr addr4 = NET_INADDR_LOOPBACK_INIT; memcpy(&net_sin(&info.ai_addr)->sin_addr, &addr4, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); - info.ai_family = AF_INET; - info.ai_addr.sa_family = AF_INET; - info.ai_addrlen = sizeof(struct sockaddr_in); + info.ai_family = NET_AF_INET; + info.ai_addr.sa_family = NET_AF_INET; + info.ai_addrlen = sizeof(struct net_sockaddr_in); } else if (type == DNS_QUERY_TYPE_AAAA) { if (!IS_ENABLED(CONFIG_NET_IPV6)) { return -EAFNOSUPPORT; } - struct in6_addr addr6 = IN6ADDR_LOOPBACK_INIT; + struct net_in6_addr addr6 = NET_IN6ADDR_LOOPBACK_INIT; memcpy(&net_sin6(&info.ai_addr)->sin6_addr, &addr6, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); - info.ai_family = AF_INET6; - info.ai_addr.sa_family = AF_INET6; - info.ai_addrlen = sizeof(struct sockaddr_in6); + info.ai_family = NET_AF_INET6; + info.ai_addr.sa_family = NET_AF_INET6; + info.ai_addrlen = sizeof(struct net_sockaddr_in6); } else { return -EINVAL; } @@ -2020,8 +2022,8 @@ int dns_resolve_name_internal(struct dns_resolve_context *ctx, return -EAFNOSUPPORT; } - struct in_addr addr4 = INADDR_LOOPBACK_INIT; - const struct in_addr *paddr; + struct net_in_addr addr4 = NET_INADDR_LOOPBACK_INIT; + const struct net_in_addr *paddr; paddr = net_if_ipv4_select_src_addr(NULL, &addr4); if (paddr == NULL) { @@ -2029,19 +2031,19 @@ int dns_resolve_name_internal(struct dns_resolve_context *ctx, } memcpy(&net_sin(&info.ai_addr)->sin_addr, paddr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); - info.ai_family = AF_INET; - info.ai_addr.sa_family = AF_INET; - info.ai_addrlen = sizeof(struct sockaddr_in); + info.ai_family = NET_AF_INET; + info.ai_addr.sa_family = NET_AF_INET; + info.ai_addrlen = sizeof(struct net_sockaddr_in); } else if (type == DNS_QUERY_TYPE_AAAA) { if (!IS_ENABLED(CONFIG_NET_IPV6)) { return -EAFNOSUPPORT; } - struct in6_addr addr6 = IN6ADDR_LOOPBACK_INIT; - const struct in6_addr *paddr; + struct net_in6_addr addr6 = NET_IN6ADDR_LOOPBACK_INIT; + const struct net_in6_addr *paddr; paddr = net_if_ipv6_select_src_addr(NULL, &addr6); if (paddr == NULL) { @@ -2049,11 +2051,11 @@ int dns_resolve_name_internal(struct dns_resolve_context *ctx, } memcpy(&net_sin6(&info.ai_addr)->sin6_addr, paddr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); - info.ai_family = AF_INET6; - info.ai_addr.sa_family = AF_INET6; - info.ai_addrlen = sizeof(struct sockaddr_in6); + info.ai_family = NET_AF_INET6; + info.ai_addr.sa_family = NET_AF_INET6; + info.ai_addrlen = sizeof(struct net_sockaddr_in6); } else { return -EINVAL; } @@ -2233,7 +2235,7 @@ static int dns_server_close(struct dns_resolve_context *ctx, (void)dns_dispatcher_unregister(&ctx->servers[server_idx].dispatcher); - if (ctx->servers[server_idx].dns_server.sa_family == AF_INET6) { + if (ctx->servers[server_idx].dns_server.sa_family == NET_AF_INET6) { iface = net_if_ipv6_select_src_iface( &net_sin6(&ctx->servers[server_idx].dns_server)->sin6_addr); } else { @@ -2246,7 +2248,7 @@ static int dns_server_close(struct dns_resolve_context *ctx, NET_EVENT_DNS_SERVER_DEL, iface, (void *)&ctx->servers[server_idx].dns_server, - sizeof(struct sockaddr)); + sizeof(struct net_sockaddr)); } else { net_mgmt_event_notify(NET_EVENT_DNS_SERVER_DEL, iface); } @@ -2315,19 +2317,19 @@ int dns_resolve_close(struct dns_resolve_context *ctx) } static bool dns_server_exists(struct dns_resolve_context *ctx, - const struct sockaddr *addr) + const struct net_sockaddr *addr) { for (int i = 0; i < SERVER_COUNT; i++) { - if (IS_ENABLED(CONFIG_NET_IPV4) && (addr->sa_family == AF_INET) && - (ctx->servers[i].dns_server.sa_family == AF_INET)) { + if (IS_ENABLED(CONFIG_NET_IPV4) && (addr->sa_family == NET_AF_INET) && + (ctx->servers[i].dns_server.sa_family == NET_AF_INET)) { if (net_ipv4_addr_cmp(&net_sin(addr)->sin_addr, &net_sin(&ctx->servers[i].dns_server)->sin_addr)) { return true; } } - if (IS_ENABLED(CONFIG_NET_IPV6) && (addr->sa_family == AF_INET6) && - (ctx->servers[i].dns_server.sa_family == AF_INET6)) { + if (IS_ENABLED(CONFIG_NET_IPV6) && (addr->sa_family == NET_AF_INET6) && + (ctx->servers[i].dns_server.sa_family == NET_AF_INET6)) { if (net_ipv6_addr_cmp(&net_sin6(addr)->sin6_addr, &net_sin6(&ctx->servers[i].dns_server)->sin6_addr)) { return true; @@ -2340,11 +2342,11 @@ static bool dns_server_exists(struct dns_resolve_context *ctx, static bool dns_servers_exists(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[]) + const struct net_sockaddr *servers_sa[]) { if (servers) { for (int i = 0; i < SERVER_COUNT && servers[i]; i++) { - struct sockaddr addr; + struct net_sockaddr addr; if (!net_ipaddr_parse(servers[i], strlen(servers[i]), &addr)) { continue; @@ -2369,7 +2371,7 @@ static bool dns_servers_exists(struct dns_resolve_context *ctx, static int do_dns_resolve_reconfigure(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], int interfaces[], bool do_close, enum dns_server_source source) @@ -2421,7 +2423,7 @@ static int do_dns_resolve_reconfigure(struct dns_resolve_context *ctx, int dns_resolve_reconfigure_with_interfaces(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], int interfaces[], enum dns_server_source source) { @@ -2436,7 +2438,7 @@ int dns_resolve_reconfigure_with_interfaces(struct dns_resolve_context *ctx, int dns_resolve_reconfigure(struct dns_resolve_context *ctx, const char *servers[], - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], enum dns_server_source source) { return do_dns_resolve_reconfigure(ctx, @@ -2513,7 +2515,7 @@ int dns_resolve_remove_source(struct dns_resolve_context *ctx, int if_index, } int dns_resolve_remove_server_addresses(struct dns_resolve_context *ctx, - const struct sockaddr *servers_sa[], + const struct net_sockaddr *servers_sa[], int interfaces[]) { int ret = -ENOENT; diff --git a/subsys/net/lib/http/http_client.c b/subsys/net/lib/http/http_client.c index 235e1ef51c290..07c0ba3d8fe6b 100644 --- a/subsys/net/lib/http/http_client.c +++ b/subsys/net/lib/http/http_client.c @@ -509,9 +509,10 @@ static int http_wait_data(int sock, struct http_request *req, const k_timepoint_ if (fds[0].revents & ZSOCK_POLLERR) { int sock_err; - socklen_t optlen = sizeof(sock_err); + net_socklen_t optlen = sizeof(sock_err); - (void)zsock_getsockopt(sock, SOL_SOCKET, SO_ERROR, &sock_err, &optlen); + (void)zsock_getsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_ERROR, + &sock_err, &optlen); ret = -sock_err; goto error; } else if (fds[0].revents & ZSOCK_POLLNVAL) { diff --git a/subsys/net/lib/http/http_server_core.c b/subsys/net/lib/http/http_server_core.c index ca8f5fad44b61..de8c22d22c45f 100644 --- a/subsys/net/lib/http/http_server_core.c +++ b/subsys/net/lib/http/http_server_core.c @@ -76,15 +76,15 @@ int http_server_init(struct http_server_ctx *ctx) int proto; int failed = 0, count = 0; int svc_count; - socklen_t len; + net_socklen_t len; int fd, af, i; - struct sockaddr_storage addr_storage; + struct net_sockaddr_storage addr_storage; const union { - struct sockaddr *addr; - struct sockaddr_in *addr4; - struct sockaddr_in6 *addr6; + struct net_sockaddr *addr; + struct net_sockaddr_in *addr4; + struct net_sockaddr_in6 *addr6; } addr = { - .addr = (struct sockaddr *)&addr_storage + .addr = (struct net_sockaddr *)&addr_storage }; HTTP_SERVICE_COUNT(&svc_count); @@ -110,37 +110,37 @@ int http_server_init(struct http_server_ctx *ctx) count++; HTTP_SERVICE_FOREACH(svc) { - /* set the default address (in6addr_any / INADDR_ANY are all 0) */ - memset(&addr_storage, 0, sizeof(struct sockaddr_storage)); + /* set the default address (in6addr_any / NET_INADDR_ANY are all 0) */ + memset(&addr_storage, 0, sizeof(struct net_sockaddr_storage)); /* Set up the server address struct according to address family */ if (IS_ENABLED(CONFIG_NET_IPV6) && svc->host != NULL && - zsock_inet_pton(AF_INET6, svc->host, &addr.addr6->sin6_addr) == 1) { - af = AF_INET6; + zsock_inet_pton(NET_AF_INET6, svc->host, &addr.addr6->sin6_addr) == 1) { + af = NET_AF_INET6; len = sizeof(*addr.addr6); - addr.addr6->sin6_family = AF_INET6; - addr.addr6->sin6_port = htons(*svc->port); + addr.addr6->sin6_family = NET_AF_INET6; + addr.addr6->sin6_port = net_htons(*svc->port); } else if (IS_ENABLED(CONFIG_NET_IPV4) && svc->host != NULL && - zsock_inet_pton(AF_INET, svc->host, &addr.addr4->sin_addr) == 1) { - af = AF_INET; + zsock_inet_pton(NET_AF_INET, svc->host, &addr.addr4->sin_addr) == 1) { + af = NET_AF_INET; len = sizeof(*addr.addr4); - addr.addr4->sin_family = AF_INET; - addr.addr4->sin_port = htons(*svc->port); + addr.addr4->sin_family = NET_AF_INET; + addr.addr4->sin_port = net_htons(*svc->port); } else if (IS_ENABLED(CONFIG_NET_IPV6)) { /* prefer IPv6 if both IPv6 and IPv4 are supported */ - af = AF_INET6; + af = NET_AF_INET6; len = sizeof(*addr.addr6); - addr.addr6->sin6_family = AF_INET6; - addr.addr6->sin6_port = htons(*svc->port); + addr.addr6->sin6_family = NET_AF_INET6; + addr.addr6->sin6_port = net_htons(*svc->port); } else if (IS_ENABLED(CONFIG_NET_IPV4)) { - af = AF_INET; + af = NET_AF_INET; len = sizeof(*addr.addr4); - addr.addr4->sin_family = AF_INET; - addr.addr4->sin_port = htons(*svc->port); + addr.addr4->sin_family = NET_AF_INET; + addr.addr4->sin_port = net_htons(*svc->port); } else { LOG_ERR("Neither IPv4 nor IPv6 is enabled"); failed++; @@ -151,15 +151,15 @@ int http_server_init(struct http_server_ctx *ctx) if (COND_CODE_1(CONFIG_NET_SOCKETS_SOCKOPT_TLS, (svc->sec_tag_list != NULL), (0))) { - proto = IPPROTO_TLS_1_2; + proto = NET_IPPROTO_TLS_1_2; } else { - proto = IPPROTO_TCP; + proto = NET_IPPROTO_TCP; } if (svc->config != NULL && svc->config->socket_create != NULL) { fd = svc->config->socket_create(svc, af, proto); } else { - fd = zsock_socket(af, SOCK_STREAM, proto); + fd = zsock_socket(af, NET_SOCK_STREAM, proto); } if (fd < 0) { LOG_ERR("socket: %d", errno); @@ -173,13 +173,13 @@ int http_server_init(struct http_server_ctx *ctx) if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) { int optval = 0; - (void)zsock_setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, + (void)zsock_setsockopt(fd, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &optval, sizeof(optval)); } #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS) if (svc->sec_tag_list != NULL) { - if (zsock_setsockopt(fd, SOL_TLS, TLS_SEC_TAG_LIST, + if (zsock_setsockopt(fd, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, svc->sec_tag_list, svc->sec_tag_list_size) < 0) { LOG_ERR("setsockopt: %d", errno); @@ -187,7 +187,7 @@ int http_server_init(struct http_server_ctx *ctx) continue; } - if (zsock_setsockopt(fd, SOL_TLS, TLS_HOSTNAME, "localhost", + if (zsock_setsockopt(fd, ZSOCK_SOL_TLS, ZSOCK_TLS_HOSTNAME, "localhost", sizeof("localhost")) < 0) { LOG_ERR("setsockopt: %d", errno); zsock_close(fd); @@ -195,7 +195,7 @@ int http_server_init(struct http_server_ctx *ctx) } #if defined(CONFIG_HTTP_SERVER_TLS_USE_ALPN) - if (zsock_setsockopt(fd, SOL_TLS, TLS_ALPN_LIST, alpn_list, + if (zsock_setsockopt(fd, ZSOCK_SOL_TLS, ZSOCK_TLS_ALPN_LIST, alpn_list, sizeof(alpn_list)) < 0) { LOG_ERR("setsockopt: %d", errno); zsock_close(fd); @@ -205,7 +205,7 @@ int http_server_init(struct http_server_ctx *ctx) } #endif /* defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS) */ - if (zsock_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, + if (zsock_setsockopt(fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, &(int){1}, sizeof(int)) < 0) { LOG_ERR("setsockopt: %d", errno); zsock_close(fd); @@ -228,7 +228,7 @@ int http_server_init(struct http_server_ctx *ctx) continue; } - *svc->port = ntohs(addr.addr4->sin_port); + *svc->port = net_ntohs(addr.addr4->sin_port); } svc->data->num_clients = 0; @@ -263,13 +263,13 @@ int http_server_init(struct http_server_ctx *ctx) static int accept_new_client(int server_fd) { int new_socket; - socklen_t addrlen; - struct sockaddr_storage sa; + net_socklen_t addrlen; + struct net_sockaddr_storage sa; memset(&sa, 0, sizeof(sa)); addrlen = sizeof(sa); - new_socket = zsock_accept(server_fd, (struct sockaddr *)&sa, &addrlen); + new_socket = zsock_accept(server_fd, (struct net_sockaddr *)&sa, &addrlen); if (new_socket < 0) { new_socket = -errno; LOG_DBG("[%d] accept failed (%d)", server_fd, new_socket); @@ -277,9 +277,9 @@ static int accept_new_client(int server_fd) } const char * const addrstr = - net_sprint_addr(sa.ss_family, &net_sin((struct sockaddr *)&sa)->sin_addr); + net_sprint_addr(sa.ss_family, &net_sin((struct net_sockaddr *)&sa)->sin_addr); LOG_DBG("New client from %s:%d", addrstr != NULL ? addrstr : "", - ntohs(net_sin((struct sockaddr *)&sa)->sin_port)); + net_ntohs(net_sin((struct net_sockaddr *)&sa)->sin_port)); return new_socket; } @@ -560,7 +560,7 @@ static int http_server_run(struct http_server_ctx *ctx) int new_socket; int ret, i, j; int sock_error; - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); value = 0; @@ -602,8 +602,8 @@ static int http_server_run(struct http_server_ctx *ctx) } if (ctx->fds[i].revents & ZSOCK_POLLERR) { - (void)zsock_getsockopt(ctx->fds[i].fd, SOL_SOCKET, - SO_ERROR, &sock_error, &optlen); + (void)zsock_getsockopt(ctx->fds[i].fd, ZSOCK_SOL_SOCKET, + ZSOCK_SO_ERROR, &sock_error, &optlen); LOG_DBG("Error on fd %d %d", ctx->fds[i].fd, sock_error); if (i >= ctx->listen_fds) { diff --git a/subsys/net/lib/http/http_server_http2.c b/subsys/net/lib/http/http_server_http2.c index ef311f1786577..771ada1e7419f 100644 --- a/subsys/net/lib/http/http_server_http2.c +++ b/subsys/net/lib/http/http_server_http2.c @@ -260,14 +260,14 @@ int send_settings_frame(struct http_client_ctx *client, bool ack) setting = (struct http2_settings_field *) (settings_frame + HTTP2_FRAME_HEADER_SIZE); - UNALIGNED_PUT(htons(HTTP2_SETTINGS_HEADER_TABLE_SIZE), + UNALIGNED_PUT(net_htons(HTTP2_SETTINGS_HEADER_TABLE_SIZE), UNALIGNED_MEMBER_ADDR(setting, id)); UNALIGNED_PUT(0, UNALIGNED_MEMBER_ADDR(setting, value)); setting++; - UNALIGNED_PUT(htons(HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS), + UNALIGNED_PUT(net_htons(HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS), UNALIGNED_MEMBER_ADDR(setting, id)); - UNALIGNED_PUT(htonl(CONFIG_HTTP_SERVER_MAX_STREAMS), + UNALIGNED_PUT(net_htonl(CONFIG_HTTP_SERVER_MAX_STREAMS), UNALIGNED_MEMBER_ADDR(setting, value)); len = HTTP2_FRAME_HEADER_SIZE + diff --git a/subsys/net/lib/latmon/latmon.c b/subsys/net/lib/latmon/latmon.c index 7b6fddc97c0df..64fcb707fb86f 100644 --- a/subsys/net/lib/latmon/latmon.c +++ b/subsys/net/lib/latmon/latmon.c @@ -118,12 +118,12 @@ static ssize_t send_net_data(int latmus, const void *buf, size_t count) static int send_sample_data(int latmus, struct latmon_data *data) { struct latmon_net_data ndata = { - .sum_lat_lo = htonl(data->sum_lat & 0xffffffff), - .sum_lat_hi = htonl(data->sum_lat >> 32), - .samples = htonl(data->current_samples), - .overruns = htonl(data->overruns), - .min_lat = htonl(data->min_lat), - .max_lat = htonl(data->max_lat), + .sum_lat_lo = net_htonl(data->sum_lat & 0xffffffff), + .sum_lat_hi = net_htonl(data->sum_lat >> 32), + .samples = net_htonl(data->current_samples), + .overruns = net_htonl(data->overruns), + .min_lat = net_htonl(data->min_lat), + .max_lat = net_htonl(data->max_lat), }; /* Reset the data */ @@ -153,7 +153,7 @@ static int send_trailing_data(int latmus, struct latmus_conf *conf, /* send histogram if enabled (ie, conf->cells > 0) */ for (int cell = 0; cell < conf->cells; cell++) { - data->histogram[cell] = htonl(data->histogram[cell]); + data->histogram[cell] = net_htonl(data->histogram[cell]); } ret = send_net_data(latmus, data->histogram, count); @@ -324,36 +324,36 @@ static void monitor_thread_func(void *p1, void *p2, void *p3) LOG_INF("\tmonitoring stopped"); } -static int broadcast_ip_address(struct in_addr *ip_addr) +static int broadcast_ip_address(struct net_in_addr *ip_addr) { char ip_str[NET_IPV4_ADDR_LEN]; - struct sockaddr_in broadcast; + struct net_sockaddr_in broadcast; int sock = -1; int ret = -1; - if (ip_addr == NULL || ip_addr->s_addr == INADDR_ANY) { + if (ip_addr == NULL || ip_addr->s_addr == NET_INADDR_ANY) { LOG_ERR("Invalid IP address for broadcast"); return -1; } - sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (sock < 0) { LOG_ERR("Failed to create broadcast socket : %d", errno); return -1; } - broadcast.sin_addr.s_addr = htonl(INADDR_BROADCAST); - broadcast.sin_port = htons(LATMON_NET_PORT); - broadcast.sin_family = AF_INET; + broadcast.sin_addr.s_addr = net_htonl(INADDR_BROADCAST); + broadcast.sin_port = net_htons(LATMON_NET_PORT); + broadcast.sin_family = NET_AF_INET; - if (net_addr_ntop(AF_INET, ip_addr, ip_str, sizeof(ip_str)) == NULL) { + if (net_addr_ntop(NET_AF_INET, ip_addr, ip_str, sizeof(ip_str)) == NULL) { LOG_ERR("Failed to convert IP address to string"); ret = -1; goto out; } ret = zsock_sendto(sock, ip_str, strlen(ip_str), 0, - (struct sockaddr *)&broadcast, sizeof(broadcast)); + (struct net_sockaddr *)&broadcast, sizeof(broadcast)); out: zsock_close(sock); @@ -362,12 +362,12 @@ static int broadcast_ip_address(struct in_addr *ip_addr) } /* Get a socket to listen to Latmus requests */ -int net_latmon_get_socket(struct sockaddr *connection_addr) +int net_latmon_get_socket(struct net_sockaddr *connection_addr) { - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_addr.s_addr = htonl(INADDR_ANY), - .sin_port = htons(LATMON_NET_PORT) + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET, + .sin_addr.s_addr = net_htonl(NET_INADDR_ANY), + .sin_port = net_htons(LATMON_NET_PORT) }; int s, on = 1; @@ -375,14 +375,14 @@ int net_latmon_get_socket(struct sockaddr *connection_addr) memcpy(&addr, connection_addr, sizeof(addr)); } - s = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + s = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); if (s < 0) { LOG_ERR("failed to create latmon socket : %d", errno); return -1; } zsock_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (zsock_bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + if (zsock_bind(s, (struct net_sockaddr *)&addr, sizeof(addr)) < 0) { LOG_ERR("failed to bind latmon socket : %d", errno); zsock_close(s); return -1; @@ -398,12 +398,12 @@ int net_latmon_get_socket(struct sockaddr *connection_addr) } /* Waits for connection from Latmus */ -int net_latmon_connect(int socket, struct in_addr *ip) +int net_latmon_connect(int socket, struct net_in_addr *ip) { struct zsock_pollfd fd[1] = { {.fd = socket, .events = ZSOCK_POLLIN } }; - struct sockaddr_in clnt_addr; + struct net_sockaddr_in clnt_addr; const int timeout = 5000; - socklen_t len; + net_socklen_t len; int latmus = -1; int ret; @@ -430,7 +430,7 @@ int net_latmon_connect(int socket, struct in_addr *ip) * chose to prioritize adherence to the project's code style guidelines. */ len = sizeof(clnt_addr); - latmus = zsock_accept(socket, (struct sockaddr *)&clnt_addr, &len); + latmus = zsock_accept(socket, (struct net_sockaddr *)&clnt_addr, &len); if (latmus < 0) { LOG_INF("Failed accepting new connection..."); return -1; @@ -462,25 +462,25 @@ static int get_latmus_conf(ssize_t len, struct latmon_net_request *req, return -1; } - if (ntohl(req->period_usecs) == 0) { + if (net_ntohl(req->period_usecs) == 0) { LOG_ERR("null period received, invalid\n"); return -1; } - if (ntohl(req->period_usecs) > MAX_SAMPLING_PERIOD_USEC) { + if (net_ntohl(req->period_usecs) > MAX_SAMPLING_PERIOD_USEC) { LOG_ERR("invalid period received: %u usecs\n", - ntohl(req->period_usecs)); + net_ntohl(req->period_usecs)); return -1; } - if (ntohl(req->histogram_cells) > HISTOGRAM_CELLS_MAX) { + if (net_ntohl(req->histogram_cells) > HISTOGRAM_CELLS_MAX) { LOG_ERR("invalid histogram size received: %u > %u cells\n", - ntohl(req->histogram_cells), HISTOGRAM_CELLS_MAX); + net_ntohl(req->histogram_cells), HISTOGRAM_CELLS_MAX); return -1; } - conf->period = ntohl(req->period_usecs); - conf->cells = ntohl(req->histogram_cells); + conf->period = net_ntohl(req->period_usecs); + conf->cells = net_ntohl(req->histogram_cells); conf->max_samples = MAX_SAMPLING_PERIOD_USEC / conf->period; return 0; diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c index b4dc1d7f5361f..55cca231827ac 100644 --- a/subsys/net/lib/lwm2m/lwm2m_engine.c +++ b/subsys/net/lib/lwm2m/lwm2m_engine.c @@ -140,11 +140,11 @@ int lwm2m_open_socket(struct lwm2m_ctx *client_ctx) if (IS_ENABLED(CONFIG_LWM2M_DTLS_SUPPORT) && client_ctx->use_dtls) { client_ctx->sock_fd = zsock_socket(client_ctx->remote_addr.sa_family, - SOCK_DGRAM, IPPROTO_DTLS_1_2); + NET_SOCK_DGRAM, NET_IPPROTO_DTLS_1_2); } else { client_ctx->sock_fd = - zsock_socket(client_ctx->remote_addr.sa_family, SOCK_DGRAM, - IPPROTO_UDP); + zsock_socket(client_ctx->remote_addr.sa_family, NET_SOCK_DGRAM, + NET_IPPROTO_UDP); } if (client_ctx->sock_fd < 0) { @@ -701,9 +701,9 @@ static void hint_socket_state(struct lwm2m_ctx *ctx, struct lwm2m_message *ongoi static int socket_recv_message(struct lwm2m_ctx *client_ctx) { static uint8_t in_buf[NET_IPV6_MTU]; - socklen_t from_addr_len; + net_socklen_t from_addr_len; ssize_t len; - static struct sockaddr from_addr; + static struct net_sockaddr from_addr; from_addr_len = sizeof(from_addr); len = zsock_recvfrom(client_ctx->sock_fd, in_buf, sizeof(in_buf) - 1, ZSOCK_MSG_DONTWAIT, @@ -1081,8 +1081,8 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx) ctx->tls_tag, }; - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_SEC_TAG_LIST, tls_tag_list, - sizeof(tls_tag_list)); + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, + tls_tag_list, sizeof(tls_tag_list)); if (ret < 0) { ret = -errno; LOG_ERR("Failed to set TLS_SEC_TAG_LIST option: %d", ret); @@ -1090,9 +1090,9 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx) } if (IS_ENABLED(CONFIG_LWM2M_TLS_SESSION_CACHING)) { - int session_cache = TLS_SESSION_CACHE_ENABLED; + int session_cache = ZSOCK_TLS_SESSION_CACHE_ENABLED; - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_SESSION_CACHE, + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_SESSION_CACHE, &session_cache, sizeof(session_cache)); if (ret < 0) { ret = -errno; @@ -1102,10 +1102,10 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx) } if (IS_ENABLED(CONFIG_LWM2M_DTLS_CID)) { /* Enable CID */ - int cid = TLS_DTLS_CID_SUPPORTED; + int cid = ZSOCK_TLS_DTLS_CID_SUPPORTED; - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_DTLS_CID, &cid, - sizeof(cid)); + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_DTLS_CID, + &cid, sizeof(cid)); if (ret) { ret = -errno; LOG_ERR("Failed to enable TLS_DTLS_CID: %d", ret); @@ -1121,7 +1121,7 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx) ctx->desthostname[ctx->desthostnamelen] = '\0'; /** mbedtls ignores length */ - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_HOSTNAME, + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_HOSTNAME, ctx->desthostname, ctx->desthostnamelen); /** restore character */ @@ -1132,20 +1132,20 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx) return ret; } - int verify = TLS_PEER_VERIFY_REQUIRED; + int verify = ZSOCK_TLS_PEER_VERIFY_REQUIRED; - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_PEER_VERIFY, &verify, - sizeof(verify)); + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_PEER_VERIFY, + &verify, sizeof(verify)); if (ret) { LOG_ERR("Failed to set TLS_PEER_VERIFY"); } } else { /* By default, Mbed TLS tries to verify peer hostname, disable it */ - int verify = TLS_PEER_VERIFY_NONE; + int verify = ZSOCK_TLS_PEER_VERIFY_NONE; - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_PEER_VERIFY, &verify, - sizeof(verify)); + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_PEER_VERIFY, + &verify, sizeof(verify)); if (ret) { LOG_ERR("Failed to set TLS_PEER_VERIFY"); } @@ -1153,14 +1153,16 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx) switch (lwm2m_security_mode(ctx)) { case LWM2M_SECURITY_PSK: - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_CIPHERSUITE_LIST, + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, + ZSOCK_TLS_CIPHERSUITE_LIST, cipher_list_psk, sizeof(cipher_list_psk)); if (ret) { LOG_ERR("Failed to set TLS_CIPHERSUITE_LIST"); } break; case LWM2M_SECURITY_CERT: - ret = zsock_setsockopt(ctx->sock_fd, SOL_TLS, TLS_CIPHERSUITE_LIST, + ret = zsock_setsockopt(ctx->sock_fd, ZSOCK_SOL_TLS, + ZSOCK_TLS_CIPHERSUITE_LIST, cipher_list_cert, sizeof(cipher_list_cert)); if (ret) { LOG_ERR("Failed to set TLS_CIPHERSUITE_LIST (rc %d, errno %d)", ret, @@ -1181,7 +1183,7 @@ int lwm2m_set_default_sockopt(struct lwm2m_ctx *ctx) int lwm2m_socket_start(struct lwm2m_ctx *client_ctx) { - socklen_t addr_len; + net_socklen_t addr_len; int flags; int ret; @@ -1214,10 +1216,10 @@ int lwm2m_socket_start(struct lwm2m_ctx *client_ctx) goto error; } - if ((client_ctx->remote_addr).sa_family == AF_INET) { - addr_len = sizeof(struct sockaddr_in); - } else if ((client_ctx->remote_addr).sa_family == AF_INET6) { - addr_len = sizeof(struct sockaddr_in6); + if ((client_ctx->remote_addr).sa_family == NET_AF_INET) { + addr_len = sizeof(struct net_sockaddr_in); + } else if ((client_ctx->remote_addr).sa_family == NET_AF_INET6) { + addr_len = sizeof(struct net_sockaddr_in6); } else { ret = -EPROTONOSUPPORT; goto error; diff --git a/subsys/net/lib/lwm2m/lwm2m_message_handling.c b/subsys/net/lib/lwm2m/lwm2m_message_handling.c index adda5c4fc9370..fd7cb70d8f1d7 100644 --- a/subsys/net/lib/lwm2m/lwm2m_message_handling.c +++ b/subsys/net/lib/lwm2m/lwm2m_message_handling.c @@ -2740,7 +2740,7 @@ static void handle_ongoing_block2_tx(struct lwm2m_message *msg, struct coap_pack } void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx, uint8_t *buf, uint16_t buf_len, - struct sockaddr *from_addr) + struct net_sockaddr *from_addr) { struct lwm2m_message *msg = NULL; struct coap_pending *pending; @@ -3007,7 +3007,7 @@ static void notify_cached_pending_data_trig(struct observe_node *obs) } static int notify_message_reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { int ret = 0; uint8_t type, code; @@ -3386,28 +3386,28 @@ int lwm2m_parse_peerinfo(char *url, struct lwm2m_ctx *client_ctx, bool is_firmwa (void)memset(&client_ctx->remote_addr, 0, sizeof(client_ctx->remote_addr)); /* try and set IP address directly */ - client_ctx->remote_addr.sa_family = AF_INET6; - ret = net_addr_pton(AF_INET6, url + off, - &((struct sockaddr_in6 *)&client_ctx->remote_addr)->sin6_addr); - /* Try to parse again using AF_INET */ + client_ctx->remote_addr.sa_family = NET_AF_INET6; + ret = net_addr_pton(NET_AF_INET6, url + off, + &((struct net_sockaddr_in6 *)&client_ctx->remote_addr)->sin6_addr); + /* Try to parse again using NET_AF_INET */ if (ret < 0) { - client_ctx->remote_addr.sa_family = AF_INET; - ret = net_addr_pton(AF_INET, url + off, - &((struct sockaddr_in *)&client_ctx->remote_addr)->sin_addr); + client_ctx->remote_addr.sa_family = NET_AF_INET; + ret = net_addr_pton(NET_AF_INET, url + off, + &((struct net_sockaddr_in *)&client_ctx->remote_addr)->sin_addr); } if (ret < 0) { #if defined(CONFIG_LWM2M_DNS_SUPPORT) #if defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_IPV4) - hints.ai_family = AF_UNSPEC; + hints.ai_family = NET_AF_UNSPEC; #elif defined(CONFIG_NET_IPV6) - hints.ai_family = AF_INET6; + hints.ai_family = NET_AF_INET6; #elif defined(CONFIG_NET_IPV4) - hints.ai_family = AF_INET; + hints.ai_family = NET_AF_INET; #else - hints.ai_family = AF_UNSPEC; + hints.ai_family = NET_AF_UNSPEC; #endif /* defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_IPV4) */ - hints.ai_socktype = SOCK_DGRAM; + hints.ai_socktype = NET_SOCK_DGRAM; ret = zsock_getaddrinfo(url + off, NULL, &hints, &res); if (ret != 0) { LOG_ERR("Unable to resolve address"); @@ -3431,10 +3431,10 @@ int lwm2m_parse_peerinfo(char *url, struct lwm2m_ctx *client_ctx, bool is_firmwa } /* set port */ - if (client_ctx->remote_addr.sa_family == AF_INET6) { - net_sin6(&client_ctx->remote_addr)->sin6_port = htons(parser.port); - } else if (client_ctx->remote_addr.sa_family == AF_INET) { - net_sin(&client_ctx->remote_addr)->sin_port = htons(parser.port); + if (client_ctx->remote_addr.sa_family == NET_AF_INET6) { + net_sin6(&client_ctx->remote_addr)->sin6_port = net_htons(parser.port); + } else if (client_ctx->remote_addr.sa_family == NET_AF_INET) { + net_sin(&client_ctx->remote_addr)->sin_port = net_htons(parser.port); } else { ret = -EPROTONOSUPPORT; } @@ -3478,7 +3478,7 @@ int do_composite_read_op_for_parsed_list(struct lwm2m_message *msg, uint16_t con #if defined(CONFIG_LWM2M_VERSION_1_1) static int do_send_reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { uint8_t code; struct lwm2m_message *msg = (struct lwm2m_message *)reply->user_data; diff --git a/subsys/net/lib/lwm2m/lwm2m_message_handling.h b/subsys/net/lib/lwm2m/lwm2m_message_handling.h index 3ac014b5db8bf..57507d757c4c1 100644 --- a/subsys/net/lib/lwm2m/lwm2m_message_handling.h +++ b/subsys/net/lib/lwm2m/lwm2m_message_handling.h @@ -50,7 +50,7 @@ int lwm2m_init_message(struct lwm2m_message *msg); int lwm2m_send_message_async(struct lwm2m_message *msg); void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx, uint8_t *buf, uint16_t buf_len, - struct sockaddr *from_addr); + struct net_sockaddr *from_addr); int generate_notify_message(struct lwm2m_ctx *ctx, struct observe_node *obs, void *user_data); /* Notification and Send operation */ diff --git a/subsys/net/lib/lwm2m/lwm2m_pull_context.c b/subsys/net/lib/lwm2m/lwm2m_pull_context.c index a8efd933a5442..600ddb6e294fe 100644 --- a/subsys/net/lib/lwm2m/lwm2m_pull_context.c +++ b/subsys/net/lib/lwm2m/lwm2m_pull_context.c @@ -217,7 +217,7 @@ static int transfer_request(struct coap_block_context *ctx, uint8_t *token, uint } static int do_firmware_transfer_reply_cb(const struct coap_packet *response, - struct coap_reply *reply, const struct sockaddr *from) + struct coap_reply *reply, const struct net_sockaddr *from) { int ret; bool last_block; diff --git a/subsys/net/lib/lwm2m/lwm2m_rd_client.c b/subsys/net/lib/lwm2m/lwm2m_rd_client.c index 07dcc88dcee5f..e310f87f1793b 100644 --- a/subsys/net/lib/lwm2m/lwm2m_rd_client.c +++ b/subsys/net/lib/lwm2m/lwm2m_rd_client.c @@ -458,7 +458,7 @@ static inline const char *code2str(uint8_t code) #if defined(CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP) static int do_bootstrap_reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { uint8_t code; @@ -514,7 +514,7 @@ int engine_trigger_bootstrap(void) } static int do_registration_reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { struct coap_option options[2]; uint8_t code; @@ -580,7 +580,7 @@ static void do_registration_timeout_cb(struct lwm2m_message *msg) static int do_update_reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { uint8_t code; @@ -623,7 +623,7 @@ static void do_update_timeout_cb(struct lwm2m_message *msg) static int do_deregister_reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { uint8_t code; diff --git a/subsys/net/lib/lwm2m/lwm2m_util.c b/subsys/net/lib/lwm2m/lwm2m_util.c index a7a5f3d32d89b..4f58b1c0ee3c9 100644 --- a/subsys/net/lib/lwm2m/lwm2m_util.c +++ b/subsys/net/lib/lwm2m/lwm2m_util.c @@ -530,16 +530,16 @@ bool lwm2m_obj_path_equal(const struct lwm2m_obj_path *a, const struct lwm2m_obj } /* for debugging: to print IP addresses */ -char *lwm2m_sprint_ip_addr(const struct sockaddr *addr) +char *lwm2m_sprint_ip_addr(const struct net_sockaddr *addr) { static char buf[NET_IPV6_ADDR_LEN]; - if (addr->sa_family == AF_INET6) { - return net_addr_ntop(AF_INET6, &net_sin6(addr)->sin6_addr, buf, sizeof(buf)); + if (addr->sa_family == NET_AF_INET6) { + return net_addr_ntop(NET_AF_INET6, &net_sin6(addr)->sin6_addr, buf, sizeof(buf)); } - if (addr->sa_family == AF_INET) { - return net_addr_ntop(AF_INET, &net_sin(addr)->sin_addr, buf, sizeof(buf)); + if (addr->sa_family == NET_AF_INET) { + return net_addr_ntop(NET_AF_INET, &net_sin(addr)->sin_addr, buf, sizeof(buf)); } return "::"; diff --git a/subsys/net/lib/lwm2m/lwm2m_util.h b/subsys/net/lib/lwm2m/lwm2m_util.h index fa70b61716356..262504074fe12 100644 --- a/subsys/net/lib/lwm2m/lwm2m_util.h +++ b/subsys/net/lib/lwm2m/lwm2m_util.h @@ -31,10 +31,10 @@ bool lwm2m_obj_path_equal(const struct lwm2m_obj_path *a, const struct lwm2m_obj /** * @brief Used for debugging to print ip addresses. * - * @param addr sockaddr for socket using ipv4 or ipv6 + * @param addr net_sockaddr for socket using ipv4 or ipv6 * @return ip address in readable form */ -char *lwm2m_sprint_ip_addr(const struct sockaddr *addr); +char *lwm2m_sprint_ip_addr(const struct net_sockaddr *addr); /** * @brief Converts the token to a printable format. diff --git a/subsys/net/lib/midi2/netmidi2.c b/subsys/net/lib/midi2/netmidi2.c index 32ced2166b20d..33b8e5b6d4cca 100644 --- a/subsys/net/lib/midi2/netmidi2.c +++ b/subsys/net/lib/midi2/netmidi2.c @@ -67,8 +67,8 @@ NET_BUF_POOL_DEFINE(netmidi2_pool, 2 + CONFIG_NETMIDI2_HOST_MAX_CLIENTS, #define SESS_LOG(_lvl, _s, _fmt, ...) \ do { \ - const struct sockaddr *addr = net_sad(&(_s)->addr); \ - const struct sockaddr_in6 *addr6 = net_sin6(addr); \ + const struct net_sockaddr *addr = net_sad(&(_s)->addr); \ + const struct net_sockaddr_in6 *addr6 = net_sin6(addr); \ char __pn[INET6_ADDRSTRLEN]; \ net_addr_ntop(addr->sa_family, &addr6->sin6_addr, __pn, sizeof(__pn)); \ NET_##_lvl("%s:%d " _fmt, __pn, addr6->sin6_port, ##__VA_ARGS__); \ @@ -193,8 +193,8 @@ static inline void netmidi2_free_session(struct netmidi2_session *session) } static inline struct netmidi2_session *netmidi2_match_session(struct netmidi2_ep *ep, - struct sockaddr *peer_addr, - socklen_t peer_addr_len) + struct net_sockaddr *peer_addr, + net_socklen_t peer_addr_len) { for (size_t i = 0; i < CONFIG_NETMIDI2_HOST_MAX_CLIENTS; i++) { if (ep->peers[i].addr_len == peer_addr_len && @@ -225,8 +225,8 @@ static inline void netmidi2_free_inactive_sessions(struct netmidi2_ep *ep) } static inline struct netmidi2_session *netmidi2_try_alloc_session(struct netmidi2_ep *ep, - struct sockaddr *peer_addr, - socklen_t peer_addr_len) + struct net_sockaddr *peer_addr, + net_socklen_t peer_addr_len) { struct netmidi2_session *sess; @@ -246,8 +246,8 @@ static inline struct netmidi2_session *netmidi2_try_alloc_session(struct netmidi } static inline struct netmidi2_session *netmidi2_alloc_session(struct netmidi2_ep *ep, - struct sockaddr *peer_addr, - socklen_t peer_addr_len) + struct net_sockaddr *peer_addr, + net_socklen_t peer_addr_len) { struct netmidi2_session *session; @@ -406,8 +406,8 @@ static int netmidi2_session_sendcmd(struct netmidi2_session *sess, * @param[in] payload_len_words Payload length, in words (4B) */ static int netmidi2_quick_reply(struct netmidi2_ep *ep, - const struct sockaddr *peer_addr, - const socklen_t peer_addr_len, + const struct net_sockaddr *peer_addr, + const net_socklen_t peer_addr_len, const uint8_t command_code, const uint16_t command_specific_data, const uint32_t *payload, @@ -445,8 +445,8 @@ static int netmidi2_quick_reply(struct netmidi2_ep *ep, * @param[in] nakd_cmd_header The command packet header this NAK is replying to */ static inline int netmidi2_quick_nak(struct netmidi2_ep *ep, - const struct sockaddr *peer_addr, - const socklen_t peer_addr_len, + const struct net_sockaddr *peer_addr, + const net_socklen_t peer_addr_len, const uint8_t nak_reason, const uint32_t nakd_cmd_header) { @@ -532,8 +532,8 @@ static int netmidi2_send_invitation_reply(struct netmidi2_session *session, * rx buffer is at the next Command Packet (or empty) */ static int netmidi2_dispatch_cmdpkt(struct netmidi2_ep *ep, - struct sockaddr *peer_addr, - socklen_t peer_addr_len, + struct net_sockaddr *peer_addr, + net_socklen_t peer_addr_len, struct net_buf *rx) { struct midi_ump ump; @@ -715,8 +715,8 @@ static void netmidi2_service_handler(struct net_socket_service_event *pev) int ret; struct netmidi2_ep *ep = pev->user_data; struct zsock_pollfd *pfd = &pev->event; - struct sockaddr peer_addr; - socklen_t peer_addr_len = sizeof(peer_addr); + struct net_sockaddr peer_addr; + net_socklen_t peer_addr_len = sizeof(peer_addr); struct net_buf *rxbuf; rxbuf = net_buf_alloc(&netmidi2_pool, K_FOREVER); @@ -757,30 +757,30 @@ NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(netmidi2_service, netmidi2_service_handler int netmidi2_host_ep_start(struct netmidi2_ep *ep) { - socklen_t addr_len = 0; + net_socklen_t addr_len = 0; int ret, sock, af; #if defined(CONFIG_NET_IPV6) - af = AF_INET6; - addr_len = sizeof(struct sockaddr_in6); + af = NET_AF_INET6; + addr_len = sizeof(struct net_sockaddr_in6); #else - af = AF_INET; - addr_len = sizeof(struct sockaddr_in); + af = NET_AF_INET; + addr_len = sizeof(struct net_sockaddr_in); #endif ep->addr.sa_family = af; - sock = zsock_socket(af, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(af, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (sock < 0) { LOG_ERR("Unable to create socket: %d", errno); return -ENOMEM; } #if defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_IPV4) - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); int opt = 0; /* Enable sharing of IPv4 and IPv6 on same socket */ - ret = zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &opt, optlen); + ret = zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &opt, optlen); if (ret < 0) { LOG_WRN("Cannot turn off IPV6_V6ONLY option"); } @@ -806,7 +806,7 @@ int netmidi2_host_ep_start(struct netmidi2_ep *ep) return -EIO; } - LOG_INF("Started UDP-MIDI2 server (%d)", ntohs(ep->addr4.sin_port)); + LOG_INF("Started UDP-MIDI2 server (%d)", net_ntohs(ep->addr4.sin_port)); return 0; } diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c index 3af78b13f015c..1da7978a9fe29 100644 --- a/subsys/net/lib/mqtt/mqtt.c +++ b/subsys/net/lib/mqtt/mqtt.c @@ -203,7 +203,7 @@ static int client_write(struct mqtt_client *client, const uint8_t *data, } static int client_write_msg(struct mqtt_client *client, - const struct msghdr *message) + const struct net_msghdr *message) { int err_code; @@ -240,8 +240,8 @@ void mqtt_client_init(struct mqtt_client *client) #if defined(CONFIG_SOCKS) int mqtt_client_set_proxy(struct mqtt_client *client, - struct sockaddr *proxy_addr, - socklen_t addrlen) + struct net_sockaddr *proxy_addr, + net_socklen_t addrlen) { if (IS_ENABLED(CONFIG_SOCKS)) { if (!client || !proxy_addr) { @@ -298,8 +298,8 @@ int mqtt_publish(struct mqtt_client *client, { int err_code; struct buf_ctx packet; - struct iovec io_vector[2]; - struct msghdr msg; + struct net_iovec io_vector[2]; + struct net_msghdr msg; NULL_PARAM_CHECK(client); NULL_PARAM_CHECK(param); diff --git a/subsys/net/lib/mqtt/mqtt_transport.c b/subsys/net/lib/mqtt/mqtt_transport.c index 57bcce6a057ae..7992d2d5350b1 100644 --- a/subsys/net/lib/mqtt/mqtt_transport.c +++ b/subsys/net/lib/mqtt/mqtt_transport.c @@ -71,7 +71,7 @@ int mqtt_transport_write(struct mqtt_client *client, const uint8_t *data, } int mqtt_transport_write_msg(struct mqtt_client *client, - const struct msghdr *message) + const struct net_msghdr *message) { return transport_fn[client->transport.type].write_msg(client, message); } diff --git a/subsys/net/lib/mqtt/mqtt_transport.h b/subsys/net/lib/mqtt/mqtt_transport.h index 3342ef0194646..bdae04ebfe3f1 100644 --- a/subsys/net/lib/mqtt/mqtt_transport.h +++ b/subsys/net/lib/mqtt/mqtt_transport.h @@ -27,7 +27,7 @@ typedef int (*transport_write_handler_t)(struct mqtt_client *client, /**@brief Transport write message handler, similar to POSIX sendmsg function. */ typedef int (*transport_write_msg_handler_t)(struct mqtt_client *client, - const struct msghdr *message); + const struct net_msghdr *message); /**@brief Transport read handler. */ typedef int (*transport_read_handler_t)(struct mqtt_client *client, uint8_t *data, @@ -86,13 +86,13 @@ int mqtt_transport_write(struct mqtt_client *client, const uint8_t *data, /**@brief Handles write message requests on configured transport. * * @param[in] client Identifies the client on which the procedure is requested. - * @param[in] message Pointer to the `struct msghdr` structure, containing data + * @param[in] message Pointer to the `struct net_msghdr` structure, containing data * to be written on the transport. * * @retval 0 or an error code indicating reason for failure. */ int mqtt_transport_write_msg(struct mqtt_client *client, - const struct msghdr *message); + const struct net_msghdr *message); /**@brief Handles read requests on configured transport. * @@ -120,7 +120,7 @@ int mqtt_client_tcp_connect(struct mqtt_client *client); int mqtt_client_tcp_write(struct mqtt_client *client, const uint8_t *data, uint32_t datalen); int mqtt_client_tcp_write_msg(struct mqtt_client *client, - const struct msghdr *message); + const struct net_msghdr *message); int mqtt_client_tcp_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen, bool shall_block); int mqtt_client_tcp_disconnect(struct mqtt_client *client); @@ -131,7 +131,7 @@ int mqtt_client_tls_connect(struct mqtt_client *client); int mqtt_client_tls_write(struct mqtt_client *client, const uint8_t *data, uint32_t datalen); int mqtt_client_tls_write_msg(struct mqtt_client *client, - const struct msghdr *message); + const struct net_msghdr *message); int mqtt_client_tls_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen, bool shall_block); int mqtt_client_tls_disconnect(struct mqtt_client *client); @@ -142,7 +142,7 @@ int mqtt_client_websocket_connect(struct mqtt_client *client); int mqtt_client_websocket_write(struct mqtt_client *client, const uint8_t *data, uint32_t datalen); int mqtt_client_websocket_write_msg(struct mqtt_client *client, - const struct msghdr *message); + const struct net_msghdr *message); int mqtt_client_websocket_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen, bool shall_block); int mqtt_client_websocket_disconnect(struct mqtt_client *client); @@ -153,7 +153,7 @@ int mqtt_client_custom_transport_connect(struct mqtt_client *client); int mqtt_client_custom_transport_write(struct mqtt_client *client, const uint8_t *data, uint32_t datalen); int mqtt_client_custom_transport_write_msg(struct mqtt_client *client, - const struct msghdr *message); + const struct net_msghdr *message); int mqtt_client_custom_transport_read(struct mqtt_client *client, uint8_t *data, uint32_t buflen, bool shall_block); int mqtt_client_custom_transport_disconnect(struct mqtt_client *client); diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c index 58f37857bb227..a55466d14d3ec 100644 --- a/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c +++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c @@ -20,11 +20,11 @@ LOG_MODULE_REGISTER(net_mqtt_sock_tcp, CONFIG_MQTT_LOG_LEVEL); int mqtt_client_tcp_connect(struct mqtt_client *client) { - const struct sockaddr *broker = client->broker; + const struct net_sockaddr *broker = client->broker; int ret; - client->transport.tcp.sock = zsock_socket(broker->sa_family, SOCK_STREAM, - IPPROTO_TCP); + client->transport.tcp.sock = zsock_socket(broker->sa_family, NET_SOCK_STREAM, + NET_IPPROTO_TCP); if (client->transport.tcp.sock < 0) { return -errno; } @@ -32,14 +32,14 @@ int mqtt_client_tcp_connect(struct mqtt_client *client) NET_DBG("Created socket %d", client->transport.tcp.sock); if (client->transport.if_name != NULL) { - struct ifreq ifname = { 0 }; + struct net_ifreq ifname = { 0 }; strncpy(ifname.ifr_name, client->transport.if_name, sizeof(ifname.ifr_name) - 1); - ret = zsock_setsockopt(client->transport.tcp.sock, SOL_SOCKET, - SO_BINDTODEVICE, &ifname, - sizeof(struct ifreq)); + ret = zsock_setsockopt(client->transport.tcp.sock, ZSOCK_SOL_SOCKET, + ZSOCK_SO_BINDTODEVICE, &ifname, + sizeof(struct net_ifreq)); if (ret < 0) { NET_ERR("Failed to bind ot interface %s error (%d)", ifname.ifr_name, -errno); @@ -52,7 +52,7 @@ int mqtt_client_tcp_connect(struct mqtt_client *client) #if defined(CONFIG_SOCKS) if (client->transport.proxy.addrlen != 0) { ret = setsockopt(client->transport.tcp.sock, - SOL_SOCKET, SO_SOCKS5, + ZSOCK_SOL_SOCKET, ZSOCK_SO_SOCKS5, &client->transport.proxy.addr, client->transport.proxy.addrlen); if (ret < 0) { @@ -61,10 +61,10 @@ int mqtt_client_tcp_connect(struct mqtt_client *client) } #endif - size_t peer_addr_size = sizeof(struct sockaddr_in6); + size_t peer_addr_size = sizeof(struct net_sockaddr_in6); - if (broker->sa_family == AF_INET) { - peer_addr_size = sizeof(struct sockaddr_in); + if (broker->sa_family == NET_AF_INET) { + peer_addr_size = sizeof(struct net_sockaddr_in); } ret = zsock_connect(client->transport.tcp.sock, client->broker, @@ -101,7 +101,7 @@ int mqtt_client_tcp_write(struct mqtt_client *client, const uint8_t *data, } int mqtt_client_tcp_write_msg(struct mqtt_client *client, - const struct msghdr *message) + const struct net_msghdr *message) { int ret, i; @@ -123,7 +123,7 @@ int mqtt_client_tcp_write_msg(struct mqtt_client *client, break; } - /* Update msghdr for the next iteration. */ + /* Update net_msghdr for the next iteration. */ for (i = 0; i < message->msg_iovlen; i++) { if (ret < message->msg_iov[i].iov_len) { message->msg_iov[i].iov_len -= ret; diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c index 2ff337eef343f..4f300e390f39d 100644 --- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c +++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c @@ -20,12 +20,12 @@ LOG_MODULE_REGISTER(net_mqtt_sock_tls, CONFIG_MQTT_LOG_LEVEL); int mqtt_client_tls_connect(struct mqtt_client *client) { - const struct sockaddr *broker = client->broker; + const struct net_sockaddr *broker = client->broker; struct mqtt_sec_config *tls_config = &client->transport.tls.config; int ret; client->transport.tls.sock = zsock_socket(broker->sa_family, - SOCK_STREAM, IPPROTO_TLS_1_2); + NET_SOCK_STREAM, NET_IPPROTO_TLS_1_2); if (client->transport.tls.sock < 0) { return -errno; } @@ -33,14 +33,14 @@ int mqtt_client_tls_connect(struct mqtt_client *client) NET_DBG("Created socket %d", client->transport.tls.sock); if (client->transport.if_name != NULL) { - struct ifreq ifname = { 0 }; + struct net_ifreq ifname = { 0 }; strncpy(ifname.ifr_name, client->transport.if_name, sizeof(ifname.ifr_name) - 1); - ret = zsock_setsockopt(client->transport.tls.sock, SOL_SOCKET, - SO_BINDTODEVICE, &ifname, - sizeof(struct ifreq)); + ret = zsock_setsockopt(client->transport.tls.sock, ZSOCK_SOL_SOCKET, + ZSOCK_SO_BINDTODEVICE, &ifname, + sizeof(struct net_ifreq)); if (ret < 0) { NET_ERR("Failed to bind ot interface %s error (%d)", ifname.ifr_name, -errno); @@ -53,7 +53,7 @@ int mqtt_client_tls_connect(struct mqtt_client *client) #if defined(CONFIG_SOCKS) if (client->transport.proxy.addrlen != 0) { ret = setsockopt(client->transport.tls.sock, - SOL_SOCKET, SO_SOCKS5, + ZSOCK_SOL_SOCKET, ZSOCK_SO_SOCKS5, &client->transport.proxy.addr, client->transport.proxy.addrlen); if (ret < 0) { @@ -62,7 +62,7 @@ int mqtt_client_tls_connect(struct mqtt_client *client) } #endif /* Set secure socket options. */ - ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS, TLS_PEER_VERIFY, + ret = zsock_setsockopt(client->transport.tls.sock, ZSOCK_SOL_TLS, ZSOCK_TLS_PEER_VERIFY, &tls_config->peer_verify, sizeof(tls_config->peer_verify)); if (ret < 0) { @@ -70,8 +70,8 @@ int mqtt_client_tls_connect(struct mqtt_client *client) } if (tls_config->cipher_list != NULL && tls_config->cipher_count > 0) { - ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS, - TLS_CIPHERSUITE_LIST, tls_config->cipher_list, + ret = zsock_setsockopt(client->transport.tls.sock, ZSOCK_SOL_TLS, + ZSOCK_TLS_CIPHERSUITE_LIST, tls_config->cipher_list, sizeof(int) * tls_config->cipher_count); if (ret < 0) { goto error; @@ -79,8 +79,8 @@ int mqtt_client_tls_connect(struct mqtt_client *client) } if (tls_config->sec_tag_list != NULL && tls_config->sec_tag_count > 0) { - ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS, - TLS_SEC_TAG_LIST, tls_config->sec_tag_list, + ret = zsock_setsockopt(client->transport.tls.sock, ZSOCK_SOL_TLS, + ZSOCK_TLS_SEC_TAG_LIST, tls_config->sec_tag_list, sizeof(sec_tag_t) * tls_config->sec_tag_count); if (ret < 0) { goto error; @@ -90,8 +90,8 @@ int mqtt_client_tls_connect(struct mqtt_client *client) #if defined(CONFIG_MQTT_LIB_TLS_USE_ALPN) if (tls_config->alpn_protocol_name_list != NULL && tls_config->alpn_protocol_name_count > 0) { - ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS, - TLS_ALPN_LIST, tls_config->alpn_protocol_name_list, + ret = zsock_setsockopt(client->transport.tls.sock, ZSOCK_SOL_TLS, + ZSOCK_TLS_ALPN_LIST, tls_config->alpn_protocol_name_list, sizeof(const char *) * tls_config->alpn_protocol_name_count); if (ret < 0) { goto error; @@ -101,27 +101,27 @@ int mqtt_client_tls_connect(struct mqtt_client *client) #endif if (tls_config->hostname) { - ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS, - TLS_HOSTNAME, tls_config->hostname, + ret = zsock_setsockopt(client->transport.tls.sock, ZSOCK_SOL_TLS, + ZSOCK_TLS_HOSTNAME, tls_config->hostname, strlen(tls_config->hostname) + 1); if (ret < 0) { goto error; } } - if (tls_config->cert_nocopy != TLS_CERT_NOCOPY_NONE) { - ret = zsock_setsockopt(client->transport.tls.sock, SOL_TLS, - TLS_CERT_NOCOPY, &tls_config->cert_nocopy, + if (tls_config->cert_nocopy != ZSOCK_TLS_CERT_NOCOPY_NONE) { + ret = zsock_setsockopt(client->transport.tls.sock, ZSOCK_SOL_TLS, + ZSOCK_TLS_CERT_NOCOPY, &tls_config->cert_nocopy, sizeof(tls_config->cert_nocopy)); if (ret < 0) { goto error; } } - size_t peer_addr_size = sizeof(struct sockaddr_in6); + size_t peer_addr_size = sizeof(struct net_sockaddr_in6); - if (broker->sa_family == AF_INET) { - peer_addr_size = sizeof(struct sockaddr_in); + if (broker->sa_family == NET_AF_INET) { + peer_addr_size = sizeof(struct net_sockaddr_in); } ret = zsock_connect(client->transport.tls.sock, client->broker, @@ -158,7 +158,7 @@ int mqtt_client_tls_write(struct mqtt_client *client, const uint8_t *data, } int mqtt_client_tls_write_msg(struct mqtt_client *client, - const struct msghdr *message) + const struct net_msghdr *message) { int ret, i; size_t offset = 0; diff --git a/subsys/net/lib/mqtt/mqtt_transport_websocket.c b/subsys/net/lib/mqtt/mqtt_transport_websocket.c index 22050d4c40679..52cb186676798 100644 --- a/subsys/net/lib/mqtt/mqtt_transport_websocket.c +++ b/subsys/net/lib/mqtt/mqtt_transport_websocket.c @@ -108,7 +108,7 @@ int mqtt_client_websocket_write(struct mqtt_client *client, const uint8_t *data, } int mqtt_client_websocket_write_msg(struct mqtt_client *client, - const struct msghdr *message) + const struct net_msghdr *message) { enum websocket_opcode opcode = WEBSOCKET_OPCODE_DATA_BINARY; bool final = false; diff --git a/subsys/net/lib/mqtt_sn/mqtt_sn_transport_udp.c b/subsys/net/lib/mqtt_sn/mqtt_sn_transport_udp.c index 630aa24f03354..471a0135a31b9 100644 --- a/subsys/net/lib/mqtt_sn/mqtt_sn_transport_udp.c +++ b/subsys/net/lib/mqtt_sn/mqtt_sn_transport_udp.c @@ -19,16 +19,16 @@ #include LOG_MODULE_DECLARE(net_mqtt_sn, CONFIG_MQTT_SN_LOG_LEVEL); -static char *get_ip_str(const struct sockaddr *sa, char *s, size_t maxlen) +static char *get_ip_str(const struct net_sockaddr *sa, char *s, size_t maxlen) { switch (sa->sa_family) { - case AF_INET: - zsock_inet_ntop(AF_INET, &(((struct sockaddr_in *)sa)->sin_addr), + case NET_AF_INET: + zsock_inet_ntop(NET_AF_INET, &(((struct net_sockaddr_in *)sa)->sin_addr), s, maxlen); break; - case AF_INET6: - zsock_inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)sa)->sin6_addr), + case NET_AF_INET6: + zsock_inet_ntop(NET_AF_INET6, &(((struct net_sockaddr_in6 *)sa)->sin6_addr), s, maxlen); break; @@ -44,11 +44,11 @@ static int tp_udp_init(struct mqtt_sn_transport *transport) { struct mqtt_sn_transport_udp *udp = UDP_TRANSPORT(transport); int err; - struct sockaddr addrm; + struct net_sockaddr addrm; int optval; struct net_if *iface; - udp->sock = zsock_socket(udp->bcaddr.sa_family, SOCK_DGRAM, 0); + udp->sock = zsock_socket(udp->bcaddr.sa_family, NET_SOCK_DGRAM, 0); if (udp->sock < 0) { return errno; } @@ -56,7 +56,8 @@ static int tp_udp_init(struct mqtt_sn_transport *transport) LOG_DBG("Socket %d", udp->sock); optval = 1; - err = zsock_setsockopt(udp->sock, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)); + err = zsock_setsockopt(udp->sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, + &optval, sizeof(optval)); if (err < 0) { return errno; } @@ -65,13 +66,13 @@ static int tp_udp_init(struct mqtt_sn_transport *transport) char ip[30], *out; uint16_t port = 0; - out = get_ip_str((struct sockaddr *)&udp->bcaddr, ip, sizeof(ip)); + out = get_ip_str((struct net_sockaddr *)&udp->bcaddr, ip, sizeof(ip)); switch (udp->bcaddr.sa_family) { - case AF_INET: - port = ntohs(((struct sockaddr_in *)&udp->bcaddr)->sin_port); + case NET_AF_INET: + port = net_ntohs(((struct net_sockaddr_in *)&udp->bcaddr)->sin_port); break; - case AF_INET6: - port = ntohs(((struct sockaddr_in6 *)&udp->bcaddr)->sin6_port); + case NET_AF_INET6: + port = net_ntohs(((struct net_sockaddr_in6 *)&udp->bcaddr)->sin6_port); break; default: break; @@ -83,21 +84,21 @@ static int tp_udp_init(struct mqtt_sn_transport *transport) } switch (udp->bcaddr.sa_family) { - case AF_INET: + case NET_AF_INET: if (IS_ENABLED(CONFIG_NET_IPV4)) { - addrm.sa_family = AF_INET; - ((struct sockaddr_in *)&addrm)->sin_port = - ((struct sockaddr_in *)&udp->bcaddr)->sin_port; - ((struct sockaddr_in *)&addrm)->sin_addr.s_addr = INADDR_ANY; + addrm.sa_family = NET_AF_INET; + ((struct net_sockaddr_in *)&addrm)->sin_port = + ((struct net_sockaddr_in *)&udp->bcaddr)->sin_port; + ((struct net_sockaddr_in *)&addrm)->sin_addr.s_addr = NET_INADDR_ANY; } break; - case AF_INET6: + case NET_AF_INET6: if (IS_ENABLED(CONFIG_NET_IPV6)) { - addrm.sa_family = AF_INET6; - ((struct sockaddr_in6 *)&addrm)->sin6_port = - ((struct sockaddr_in6 *)&udp->bcaddr)->sin6_port; - memcpy(&((struct sockaddr_in6 *)&addrm)->sin6_addr, &in6addr_any, - sizeof(struct in6_addr)); + addrm.sa_family = NET_AF_INET6; + ((struct net_sockaddr_in6 *)&addrm)->sin6_port = + ((struct net_sockaddr_in6 *)&udp->bcaddr)->sin6_port; + memcpy(&((struct net_sockaddr_in6 *)&addrm)->sin6_addr, &net_in6addr_any, + sizeof(struct net_in6_addr)); break; } default: @@ -111,36 +112,37 @@ static int tp_udp_init(struct mqtt_sn_transport *transport) return errno; } - if (udp->bcaddr.sa_family == AF_INET && IS_ENABLED(CONFIG_NET_IPV4)) { - struct sockaddr_in *bcaddr_in = (struct sockaddr_in *)&udp->bcaddr; - struct ip_mreqn mreqn; + if (udp->bcaddr.sa_family == NET_AF_INET && IS_ENABLED(CONFIG_NET_IPV4)) { + struct net_sockaddr_in *bcaddr_in = (struct net_sockaddr_in *)&udp->bcaddr; + struct net_ip_mreqn mreqn; iface = net_if_ipv4_select_src_iface( - &((struct sockaddr_in *)&udp->bcaddr)->sin_addr); + &((struct net_sockaddr_in *)&udp->bcaddr)->sin_addr); - mreqn = (struct ip_mreqn) { + mreqn = (struct net_ip_mreqn) { .imr_multiaddr = bcaddr_in->sin_addr, .imr_ifindex = net_if_get_by_iface(iface), }; - err = zsock_setsockopt(udp->sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreqn, - sizeof(mreqn)); + err = zsock_setsockopt(udp->sock, NET_IPPROTO_IP, ZSOCK_IP_ADD_MEMBERSHIP, + &mreqn, sizeof(mreqn)); if (err < 0) { return errno; } - } else if (udp->bcaddr.sa_family == AF_INET6 && IS_ENABLED(CONFIG_NET_IPV6)) { - struct sockaddr_in6 *bcaddr_in6 = (struct sockaddr_in6 *)&udp->bcaddr; - struct ipv6_mreq mreq; + } else if (udp->bcaddr.sa_family == NET_AF_INET6 && IS_ENABLED(CONFIG_NET_IPV6)) { + struct net_sockaddr_in6 *bcaddr_in6 = (struct net_sockaddr_in6 *)&udp->bcaddr; + struct net_ipv6_mreq mreq; - iface = net_if_ipv6_select_src_iface(&((struct sockaddr_in6 *)&addrm)->sin6_addr); + iface = net_if_ipv6_select_src_iface( + &((struct net_sockaddr_in6 *)&addrm)->sin6_addr); - mreq = (struct ipv6_mreq) { + mreq = (struct net_ipv6_mreq) { .ipv6mr_multiaddr = bcaddr_in6->sin6_addr, .ipv6mr_ifindex = net_if_get_by_iface(iface), }; - err = zsock_setsockopt(udp->sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq, - sizeof(mreq)); + err = zsock_setsockopt(udp->sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_ADD_MEMBERSHIP, + &mreq, sizeof(mreq)); if (err < 0) { return errno; } @@ -150,7 +152,8 @@ static int tp_udp_init(struct mqtt_sn_transport *transport) } optval = CONFIG_MQTT_SN_LIB_BROADCAST_RADIUS; - err = zsock_setsockopt(udp->sock, IPPROTO_IP, IP_MULTICAST_TTL, &optval, sizeof(optval)); + err = zsock_setsockopt(udp->sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, + &optval, sizeof(optval)); if (err < 0) { return errno; } @@ -171,20 +174,21 @@ static int tp_udp_sendto(struct mqtt_sn_client *client, void *buf, size_t sz, co struct mqtt_sn_transport_udp *udp = UDP_TRANSPORT(client->transport); int rc; int ttl; - socklen_t ttl_len; + net_socklen_t ttl_len; if (dest_addr == NULL) { LOG_HEXDUMP_DBG(buf, sz, "Sending Broadcast UDP packet"); /* Set ttl if requested value does not match existing*/ - rc = zsock_getsockopt(udp->sock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, &ttl_len); + rc = zsock_getsockopt(udp->sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, + &ttl, &ttl_len); if (rc < 0) { return -errno; } if (ttl != addrlen) { ttl = addrlen; - rc = zsock_setsockopt(udp->sock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, - sizeof(ttl)); + rc = zsock_setsockopt(udp->sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, + &ttl, sizeof(ttl)); if (rc < 0) { return -errno; } @@ -212,8 +216,8 @@ static ssize_t tp_udp_recvfrom(struct mqtt_sn_client *client, void *buffer, size { struct mqtt_sn_transport_udp *udp = UDP_TRANSPORT(client->transport); int rc; - struct sockaddr *srcaddr = src_addr; - socklen_t addrlen_local = *addrlen; + struct net_sockaddr *srcaddr = src_addr; + net_socklen_t addrlen_local = *addrlen; rc = zsock_recvfrom(udp->sock, buffer, length, 0, src_addr, &addrlen_local); LOG_DBG("recv %d", rc); @@ -257,8 +261,8 @@ static int tp_udp_poll(struct mqtt_sn_client *client) return pollfd.revents & ZSOCK_POLLIN; } -int mqtt_sn_transport_udp_init(struct mqtt_sn_transport_udp *udp, struct sockaddr *bcaddr, - socklen_t addrlen) +int mqtt_sn_transport_udp_init(struct mqtt_sn_transport_udp *udp, struct net_sockaddr *bcaddr, + net_socklen_t addrlen) { if (!udp || !bcaddr || !addrlen) { return -EINVAL; diff --git a/subsys/net/lib/ocpp/ocpp.c b/subsys/net/lib/ocpp/ocpp.c index 11f90e9f7f462..f91df3a3d8165 100644 --- a/subsys/net/lib/ocpp/ocpp.c +++ b/subsys/net/lib/ocpp/ocpp.c @@ -123,15 +123,15 @@ static int ocpp_connect_to_cs(struct ocpp_info *ctx) int ret; struct websocket_request config = {0}; struct ocpp_upstream_info *ui = &ctx->ui; - struct sockaddr addr_buf; - struct sockaddr *addr = &addr_buf; + struct net_sockaddr addr_buf; + struct net_sockaddr *addr = &addr_buf; int addr_size; - if (ui->csi.sa_family == AF_INET) { + if (ui->csi.sa_family == NET_AF_INET) { #if defined(CONFIG_NET_IPV4) - addr_size = sizeof(struct sockaddr_in); + addr_size = sizeof(struct net_sockaddr_in); addr->sa_family = ui->csi.sa_family; - net_sin(addr)->sin_port = htons(ui->csi.port); + net_sin(addr)->sin_port = net_htons(ui->csi.port); zsock_inet_pton(addr->sa_family, ui->csi.cs_ip, &net_sin(addr)->sin_addr); #else @@ -139,9 +139,9 @@ static int ocpp_connect_to_cs(struct ocpp_info *ctx) #endif } else { #if defined(CONFIG_NET_IPV6) - addr_size = sizeof(struct sockaddr_in6); + addr_size = sizeof(struct net_sockaddr_in6); addr->sa_family = ui->csi.sa_family; - net_sin6(addr)->sin6_port = htons(ui->csi.port); + net_sin6(addr)->sin6_port = net_htons(ui->csi.port); zsock_inet_pton(addr->sa_family, ui->csi.cs_ip, &net_sin6(addr)->sin6_addr); #else @@ -153,8 +153,8 @@ static int ocpp_connect_to_cs(struct ocpp_info *ctx) zsock_close(ui->tcpsock); } - ui->tcpsock = zsock_socket(ui->csi.sa_family, SOCK_STREAM, - IPPROTO_TCP); + ui->tcpsock = zsock_socket(ui->csi.sa_family, NET_SOCK_STREAM, + NET_IPPROTO_TCP); if (ui->tcpsock < 0) { return -errno; } diff --git a/subsys/net/lib/ptp/msg.c b/subsys/net/lib/ptp/msg.c index 3fb78a40edb45..fc4ffa0d2cfb1 100644 --- a/subsys/net/lib/ptp/msg.c +++ b/subsys/net/lib/ptp/msg.c @@ -51,26 +51,26 @@ static const char *msg_type_str(struct ptp_msg *msg) static void msg_timestamp_post_recv(struct ptp_msg *msg, struct ptp_timestamp *ts) { - msg->timestamp.protocol._sec.high = ntohs(ts->seconds_high); - msg->timestamp.protocol._sec.low = ntohl(ts->seconds_low); - msg->timestamp.protocol.nanosecond = ntohl(ts->nanoseconds); + msg->timestamp.protocol._sec.high = net_ntohs(ts->seconds_high); + msg->timestamp.protocol._sec.low = net_ntohl(ts->seconds_low); + msg->timestamp.protocol.nanosecond = net_ntohl(ts->nanoseconds); } static void msg_timestamp_pre_send(struct ptp_timestamp *ts) { - ts->seconds_high = htons(ts->seconds_high); - ts->seconds_low = htonl(ts->seconds_low); - ts->nanoseconds = htonl(ts->nanoseconds); + ts->seconds_high = net_htons(ts->seconds_high); + ts->seconds_low = net_htonl(ts->seconds_low); + ts->nanoseconds = net_htonl(ts->nanoseconds); } static void msg_port_id_post_recv(struct ptp_port_id *port_id) { - port_id->port_number = ntohs(port_id->port_number); + port_id->port_number = net_ntohs(port_id->port_number); } static void msg_port_id_pre_send(struct ptp_port_id *port_id) { - port_id->port_number = htons(port_id->port_number); + port_id->port_number = net_htons(port_id->port_number); } static int msg_header_post_recv(struct ptp_header *header) @@ -80,9 +80,9 @@ static int msg_header_post_recv(struct ptp_header *header) return -1; } - header->msg_length = ntohs(header->msg_length); - header->correction = ntohll(header->correction); - header->sequence_id = ntohs(header->sequence_id); + header->msg_length = net_ntohs(header->msg_length); + header->correction = net_ntohll(header->correction); + header->sequence_id = net_ntohs(header->sequence_id); msg_port_id_post_recv(&header->src_port_id); @@ -91,9 +91,9 @@ static int msg_header_post_recv(struct ptp_header *header) static void msg_header_pre_send(struct ptp_header *header) { - header->msg_length = htons(header->msg_length); - header->correction = htonll(header->correction); - header->sequence_id = htons(header->sequence_id); + header->msg_length = net_htons(header->msg_length); + header->correction = net_htonll(header->correction); + header->sequence_id = net_htons(header->sequence_id); msg_port_id_pre_send(&header->src_port_id); } @@ -156,8 +156,8 @@ static int msg_tlv_post_recv(struct ptp_msg *msg, int length) } tlv_container->tlv = (struct ptp_tlv *)suffix; - tlv_container->tlv->type = ntohs(tlv_container->tlv->type); - tlv_container->tlv->length = ntohs(tlv_container->tlv->length); + tlv_container->tlv->type = net_ntohs(tlv_container->tlv->type); + tlv_container->tlv->length = net_ntohs(tlv_container->tlv->length); if (tlv_container->tlv->length % 2) { /* IEEE 1588-2019 Section 5.3.8 - length is an even number */ @@ -290,8 +290,8 @@ struct ptp_msg *ptp_msg_from_pkt(struct net_pkt *pkt) return NULL; } - payload = ntohs(hdr->len) - NET_UDPH_LEN; - port = ntohs(hdr->dst_port); + payload = net_ntohs(hdr->len) - NET_UDPH_LEN; + port = net_ntohs(hdr->dst_port); if (port != PTP_SOCKET_PORT_EVENT && port != PTP_SOCKET_PORT_GENERAL) { LOG_ERR("Couldn't retrieve PTP message from the net packet"); @@ -300,7 +300,7 @@ struct ptp_msg *ptp_msg_from_pkt(struct net_pkt *pkt) msg = (struct ptp_msg *)((uintptr_t)hdr + NET_UDPH_LEN); - if (payload == ntohs(msg->header.msg_length)) { + if (payload == net_ntohs(msg->header.msg_length)) { return msg; } @@ -340,10 +340,10 @@ void ptp_msg_pre_send(struct ptp_msg *msg) msg_port_id_pre_send(&msg->pdelay_resp_follow_up.req_port_id); break; case PTP_MSG_ANNOUNCE: - msg->announce.current_utc_offset = htons(msg->announce.current_utc_offset); + msg->announce.current_utc_offset = net_htons(msg->announce.current_utc_offset); msg->announce.gm_clk_quality.offset_scaled_log_variance = - htons(msg->announce.gm_clk_quality.offset_scaled_log_variance); - msg->announce.steps_rm = htons(msg->announce.steps_rm); + net_htons(msg->announce.gm_clk_quality.offset_scaled_log_variance); + msg->announce.steps_rm = net_htons(msg->announce.steps_rm); break; case PTP_MSG_SIGNALING: msg_port_id_pre_send(&msg->signaling.target_port_id); @@ -415,10 +415,10 @@ int ptp_msg_post_recv(struct ptp_port *port, struct ptp_msg *msg, int cnt) msg->timestamp.host.second = (uint64_t)(current / MSEC_PER_SEC); msg->timestamp.host.nanosecond = (current % MSEC_PER_SEC) * NSEC_PER_MSEC; msg_timestamp_post_recv(msg, &msg->announce.origin_timestamp); - msg->announce.current_utc_offset = ntohs(msg->announce.current_utc_offset); + msg->announce.current_utc_offset = net_ntohs(msg->announce.current_utc_offset); msg->announce.gm_clk_quality.offset_scaled_log_variance = - ntohs(msg->announce.gm_clk_quality.offset_scaled_log_variance); - msg->announce.steps_rm = ntohs(msg->announce.steps_rm); + net_ntohs(msg->announce.gm_clk_quality.offset_scaled_log_variance); + msg->announce.steps_rm = net_ntohs(msg->announce.steps_rm); break; case PTP_MSG_SIGNALING: msg_port_id_post_recv(&msg->signaling.target_port_id); diff --git a/subsys/net/lib/ptp/msg.h b/subsys/net/lib/ptp/msg.h index 26030052fa929..9ce55f245d508 100644 --- a/subsys/net/lib/ptp/msg.h +++ b/subsys/net/lib/ptp/msg.h @@ -299,7 +299,7 @@ struct ptp_msg { /** Single-linked list of TLVs attached to the message. */ sys_slist_t tlvs; /** Protocol address of the sender/receiver of the message. */ - struct sockaddr addr; + struct net_sockaddr addr; }; /** diff --git a/subsys/net/lib/ptp/port.c b/subsys/net/lib/ptp/port.c index 89a848fbc5838..750d5cd225189 100644 --- a/subsys/net/lib/ptp/port.c +++ b/subsys/net/lib/ptp/port.c @@ -162,7 +162,7 @@ static void port_delay_req_timestamp_cb(struct net_pkt *pkt) return; } - msg->header.src_port_id.port_number = ntohs(msg->header.src_port_id.port_number); + msg->header.src_port_id.port_number = net_ntohs(msg->header.src_port_id.port_number); if (!ptp_port_id_eq(&port->port_ds.id, &msg->header.src_port_id) || ptp_msg_type(msg) != PTP_MSG_DELAY_REQ) { @@ -193,7 +193,7 @@ static void port_delay_req_timestamp_cb(struct net_pkt *pkt) LOG_DBG("Port %d registered timestamp for %d Delay_Req", port->port_ds.id.port_number, - ntohs(msg->header.sequence_id)); + net_ntohs(msg->header.sequence_id)); if (iter == sys_slist_peek_tail(&port->delay_req_list)) { net_if_unregister_timestamp_cb(&port->delay_req_ts_cb); @@ -210,7 +210,7 @@ static void port_sync_timestamp_cb(struct net_pkt *pkt) return; } - msg->header.src_port_id.port_number = ntohs(msg->header.src_port_id.port_number); + msg->header.src_port_id.port_number = net_ntohs(msg->header.src_port_id.port_number); if (ptp_port_id_eq(&port->port_ds.id, &msg->header.src_port_id) && ptp_msg_type(msg) == PTP_MSG_SYNC) { @@ -669,7 +669,7 @@ static void port_delay_resp_msg_process(struct ptp_port *port, struct ptp_msg *m } SYS_SLIST_FOR_EACH_CONTAINER(&port->delay_req_list, req, node) { - if (msg->header.sequence_id == ntohs(req->header.sequence_id)) { + if (msg->header.sequence_id == net_ntohs(req->header.sequence_id)) { break; } prev = &req->node; diff --git a/subsys/net/lib/ptp/ptp.c b/subsys/net/lib/ptp/ptp.c index 2097121072d80..24265775e24f8 100644 --- a/subsys/net/lib/ptp/ptp.c +++ b/subsys/net/lib/ptp/ptp.c @@ -121,7 +121,7 @@ static enum net_verdict ptp_recv(struct net_if *iface, uint16_t ptype, ARG_UNUSED(iface); ARG_UNUSED(ptype); - net_pkt_set_family(pkt, AF_UNSPEC); + net_pkt_set_family(pkt, NET_AF_UNSPEC); return NET_CONTINUE; } diff --git a/subsys/net/lib/ptp/tlv.c b/subsys/net/lib/ptp/tlv.c index 22bec57fd0bbc..7145a670010cf 100644 --- a/subsys/net/lib/ptp/tlv.c +++ b/subsys/net/lib/ptp/tlv.c @@ -26,7 +26,7 @@ static inline void tlv_ntohs(void *ptr) { uint16_t val = *(uint16_t *)ptr; - val = ntohs(val); + val = net_ntohs(val); memcpy(ptr, &val, sizeof(val)); } @@ -34,7 +34,7 @@ static inline void tlv_htons(void *ptr) { uint16_t val = *(uint16_t *)ptr; - val = htons(val); + val = net_htons(val); memcpy(ptr, &val, sizeof(val)); } @@ -195,9 +195,9 @@ static int tlv_mgmt_post_recv(struct ptp_tlv_mgmt *mgmt_tlv, uint16_t length) } default_ds = (struct ptp_tlv_default_ds *)mgmt_tlv->data; - default_ds->n_ports = ntohs(default_ds->n_ports); + default_ds->n_ports = net_ntohs(default_ds->n_ports); default_ds->clk_quality.offset_scaled_log_variance = - ntohs(default_ds->clk_quality.offset_scaled_log_variance); + net_ntohs(default_ds->clk_quality.offset_scaled_log_variance); break; case PTP_MGMT_CURRENT_DATA_SET: if (length != sizeof(struct ptp_tlv_current_ds)) { @@ -205,9 +205,9 @@ static int tlv_mgmt_post_recv(struct ptp_tlv_mgmt *mgmt_tlv, uint16_t length) } current_ds = (struct ptp_tlv_current_ds *)mgmt_tlv->data; - current_ds->steps_rm = ntohs(current_ds->steps_rm); - current_ds->offset_from_tt = ntohll(current_ds->offset_from_tt); - current_ds->mean_delay = ntohll(current_ds->mean_delay); + current_ds->steps_rm = net_ntohs(current_ds->steps_rm); + current_ds->offset_from_tt = net_ntohll(current_ds->offset_from_tt); + current_ds->mean_delay = net_ntohll(current_ds->mean_delay); break; case PTP_MGMT_PARENT_DATA_SET: if (length != sizeof(struct ptp_tlv_parent_ds)) { @@ -215,13 +215,13 @@ static int tlv_mgmt_post_recv(struct ptp_tlv_mgmt *mgmt_tlv, uint16_t length) } parent_ds = (struct ptp_tlv_parent_ds *)mgmt_tlv->data; - parent_ds->port_id.port_number = ntohs(parent_ds->port_id.port_number); + parent_ds->port_id.port_number = net_ntohs(parent_ds->port_id.port_number); parent_ds->obsreved_parent_offset_scaled_log_variance = - ntohs(parent_ds->obsreved_parent_offset_scaled_log_variance); + net_ntohs(parent_ds->obsreved_parent_offset_scaled_log_variance); parent_ds->obsreved_parent_clk_phase_change_rate = - ntohl(parent_ds->obsreved_parent_clk_phase_change_rate); + net_ntohl(parent_ds->obsreved_parent_clk_phase_change_rate); parent_ds->gm_clk_quality.offset_scaled_log_variance = - ntohs(parent_ds->gm_clk_quality.offset_scaled_log_variance); + net_ntohs(parent_ds->gm_clk_quality.offset_scaled_log_variance); break; case PTP_MGMT_TIME_PROPERTIES_DATA_SET: if (length != sizeof(struct ptp_tlv_time_prop_ds)) { @@ -229,7 +229,7 @@ static int tlv_mgmt_post_recv(struct ptp_tlv_mgmt *mgmt_tlv, uint16_t length) } time_prop_ds = (struct ptp_tlv_time_prop_ds *)mgmt_tlv->data; - time_prop_ds->current_utc_offset = ntohs(time_prop_ds->current_utc_offset); + time_prop_ds->current_utc_offset = net_ntohs(time_prop_ds->current_utc_offset); break; case PTP_MGMT_PORT_DATA_SET: if (length != sizeof(struct ptp_tlv_port_ds)) { @@ -237,15 +237,15 @@ static int tlv_mgmt_post_recv(struct ptp_tlv_mgmt *mgmt_tlv, uint16_t length) } port_ds = (struct ptp_tlv_port_ds *)mgmt_tlv->data; - port_ds->id.port_number = ntohs(port_ds->id.port_number); - port_ds->mean_link_delay = ntohll(port_ds->mean_link_delay); + port_ds->id.port_number = net_ntohs(port_ds->id.port_number); + port_ds->mean_link_delay = net_ntohll(port_ds->mean_link_delay); break; case PTP_MGMT_TIME: ts = *(struct ptp_timestamp *)mgmt_tlv->data; - ts.seconds_high = ntohs(ts.seconds_high); - ts.seconds_low = ntohl(ts.seconds_low); - ts.nanoseconds = ntohl(ts.nanoseconds); + ts.seconds_high = net_ntohs(ts.seconds_high); + ts.seconds_low = net_ntohl(ts.seconds_low); + ts.nanoseconds = net_ntohl(ts.nanoseconds); memcpy(mgmt_tlv->data, &ts, sizeof(ts)); break; @@ -281,45 +281,45 @@ static void tlv_mgmt_pre_send(struct ptp_tlv_mgmt *mgmt_tlv) case PTP_MGMT_DEFAULT_DATA_SET: default_ds = (struct ptp_tlv_default_ds *)mgmt_tlv->data; - default_ds->n_ports = htons(default_ds->n_ports); + default_ds->n_ports = net_htons(default_ds->n_ports); default_ds->clk_quality.offset_scaled_log_variance = - htons(default_ds->clk_quality.offset_scaled_log_variance); + net_htons(default_ds->clk_quality.offset_scaled_log_variance); break; case PTP_MGMT_CURRENT_DATA_SET: current_ds = (struct ptp_tlv_current_ds *)mgmt_tlv->data; - current_ds->steps_rm = htons(current_ds->steps_rm); - current_ds->offset_from_tt = htonll(current_ds->offset_from_tt); - current_ds->mean_delay = htonll(current_ds->mean_delay); + current_ds->steps_rm = net_htons(current_ds->steps_rm); + current_ds->offset_from_tt = net_htonll(current_ds->offset_from_tt); + current_ds->mean_delay = net_htonll(current_ds->mean_delay); break; case PTP_MGMT_PARENT_DATA_SET: parent_ds = (struct ptp_tlv_parent_ds *)mgmt_tlv->data; - parent_ds->port_id.port_number = htons(parent_ds->port_id.port_number); + parent_ds->port_id.port_number = net_htons(parent_ds->port_id.port_number); parent_ds->obsreved_parent_offset_scaled_log_variance = - htons(parent_ds->obsreved_parent_offset_scaled_log_variance); + net_htons(parent_ds->obsreved_parent_offset_scaled_log_variance); parent_ds->obsreved_parent_clk_phase_change_rate = - htons(parent_ds->obsreved_parent_clk_phase_change_rate); + net_htons(parent_ds->obsreved_parent_clk_phase_change_rate); parent_ds->gm_clk_quality.offset_scaled_log_variance = - htons(parent_ds->gm_clk_quality.offset_scaled_log_variance); + net_htons(parent_ds->gm_clk_quality.offset_scaled_log_variance); break; case PTP_MGMT_TIME_PROPERTIES_DATA_SET: time_prop_ds = (struct ptp_tlv_time_prop_ds *)mgmt_tlv->data; - time_prop_ds->current_utc_offset = htons(time_prop_ds->current_utc_offset); + time_prop_ds->current_utc_offset = net_htons(time_prop_ds->current_utc_offset); break; case PTP_MGMT_PORT_DATA_SET: port_ds = (struct ptp_tlv_port_ds *)mgmt_tlv->data; - port_ds->id.port_number = htons(port_ds->id.port_number); - port_ds->mean_link_delay = htonll(port_ds->mean_link_delay); + port_ds->id.port_number = net_htons(port_ds->id.port_number); + port_ds->mean_link_delay = net_htonll(port_ds->mean_link_delay); break; case PTP_MGMT_TIME: ts = *(struct ptp_timestamp *)mgmt_tlv->data; - ts.seconds_high = htons(ts.seconds_high); - ts.seconds_low = htonl(ts.seconds_low); - ts.nanoseconds = htonl(ts.nanoseconds); + ts.seconds_high = net_htons(ts.seconds_high); + ts.seconds_low = net_htonl(ts.seconds_low); + ts.nanoseconds = net_htonl(ts.nanoseconds); memcpy(mgmt_tlv->data, &ts, sizeof(ts)); break; @@ -369,7 +369,7 @@ int ptp_tlv_post_recv(struct ptp_tlv *tlv) return -EBADMSG; } mgmt = (struct ptp_tlv_mgmt *)tlv; - mgmt->id = ntohs(mgmt->id); + mgmt->id = net_ntohs(mgmt->id); /* Value of length is 2 + N, where N is length of data field * based on IEEE 1588-2019 Section 15.5.2.2. @@ -383,8 +383,8 @@ int ptp_tlv_post_recv(struct ptp_tlv *tlv) return -EBADMSG; } mgmt_err = (struct ptp_tlv_mgmt_err *)tlv; - mgmt_err->err_id = ntohs(mgmt_err->err_id); - mgmt_err->id = ntohs(mgmt_err->id); + mgmt_err->err_id = net_ntohs(mgmt_err->err_id); + mgmt_err->id = net_ntohs(mgmt_err->id); break; default: break; @@ -406,18 +406,18 @@ void ptp_tlv_pre_send(struct ptp_tlv *tlv) if (tlv->length > sizeof(mgmt->id)) { tlv_mgmt_pre_send(mgmt); } - mgmt->id = htons(mgmt->id); + mgmt->id = net_htons(mgmt->id); break; case PTP_TLV_TYPE_MANAGEMENT_ERROR_STATUS: mgmt_err = (struct ptp_tlv_mgmt_err *)tlv; - mgmt_err->err_id = htons(mgmt_err->err_id); - mgmt_err->id = htons(mgmt_err->id); + mgmt_err->err_id = net_htons(mgmt_err->err_id); + mgmt_err->id = net_htons(mgmt_err->id); break; default: break; } - tlv->length = htons(tlv->length); - tlv->type = htons(tlv->type); + tlv->length = net_htons(tlv->length); + tlv->type = net_htons(tlv->type); } diff --git a/subsys/net/lib/ptp/transport.c b/subsys/net/lib/ptp/transport.c index 2fa6e3d35e417..69eb1023958ec 100644 --- a/subsys/net/lib/ptp/transport.c +++ b/subsys/net/lib/ptp/transport.c @@ -16,9 +16,9 @@ LOG_MODULE_REGISTER(ptp_transport, CONFIG_PTP_LOG_LEVEL); #define INTERFACE_NAME_LEN (32) union mcast_addr { - struct in_addr ipv4; + struct net_in_addr ipv4; #if defined(CONFIG_PTP_UDP_IPv6_PROTOCOL) - struct in6_addr ipv6; + struct net_in6_addr ipv6; #endif }; @@ -31,14 +31,15 @@ static union mcast_addr mcast_addr = {.ipv6 = {{{0xff, 0xe, 0x0, 0x0, 0x0, 0x0, #error "Chosen PTP transport protocol not implemented" #endif -static int transport_socket_open(struct net_if *iface, struct sockaddr *addr) +static int transport_socket_open(struct net_if *iface, struct net_sockaddr *addr) { static const int feature_on = 1; static const uint8_t priority = NET_PRIORITY_CA; - static const uint8_t ts_mask = SOF_TIMESTAMPING_TX_HARDWARE | SOF_TIMESTAMPING_RX_HARDWARE; - struct ifreq ifreq = { 0 }; + static const uint8_t ts_mask = ZSOCK_SOF_TIMESTAMPING_TX_HARDWARE | + ZSOCK_SOF_TIMESTAMPING_RX_HARDWARE; + struct net_ifreq ifreq = { 0 }; int cnt; - int socket = zsock_socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP); + int socket = zsock_socket(addr->sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (net_if_get_by_iface(iface) < 0) { LOG_ERR("Failed to obtain interface index"); @@ -49,7 +50,8 @@ static int transport_socket_open(struct net_if *iface, struct sockaddr *addr) return -1; } - if (zsock_setsockopt(socket, SOL_SOCKET, SO_REUSEADDR, &feature_on, sizeof(feature_on))) { + if (zsock_setsockopt(socket, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, + &feature_on, sizeof(feature_on))) { LOG_ERR("Failed to set SO_REUSEADDR"); goto error; } @@ -61,20 +63,22 @@ static int transport_socket_open(struct net_if *iface, struct sockaddr *addr) cnt = net_if_get_name(iface, ifreq.ifr_name, INTERFACE_NAME_LEN); if (cnt > 0 && zsock_setsockopt(socket, - SOL_SOCKET, - SO_BINDTODEVICE, + ZSOCK_SOL_SOCKET, + ZSOCK_SO_BINDTODEVICE, ifreq.ifr_name, sizeof(ifreq.ifr_name))) { LOG_ERR("Failed to set socket binding to an interface"); goto error; } - if (zsock_setsockopt(socket, SOL_SOCKET, SO_TIMESTAMPING, &ts_mask, sizeof(ts_mask))) { + if (zsock_setsockopt(socket, ZSOCK_SOL_SOCKET, ZSOCK_SO_TIMESTAMPING, + &ts_mask, sizeof(ts_mask))) { LOG_ERR("Failed to set SO_TIMESTAMPING"); goto error; } - if (zsock_setsockopt(socket, SOL_SOCKET, SO_PRIORITY, &priority, sizeof(priority))) { + if (zsock_setsockopt(socket, ZSOCK_SOL_SOCKET, ZSOCK_SO_PRIORITY, + &priority, sizeof(priority))) { LOG_ERR("Failed to set SO_PRIORITY"); goto error; } @@ -90,19 +94,19 @@ static int transport_join_multicast(struct ptp_port *port) if (IS_ENABLED(CONFIG_PTP_UDP_IPv4_PROTOCOL)) { struct ip_mreqn mreqn = {0}; - memcpy(&mreqn.imr_multiaddr, &mcast_addr, sizeof(struct in_addr)); + memcpy(&mreqn.imr_multiaddr, &mcast_addr, sizeof(struct net_in_addr)); mreqn.imr_ifindex = net_if_get_by_iface(port->iface); - zsock_setsockopt(port->socket[1], IPPROTO_IP, - IP_ADD_MEMBERSHIP, &mreqn, sizeof(mreqn)); + zsock_setsockopt(port->socket[1], NET_IPPROTO_IP, + ZSOCK_IP_ADD_MEMBERSHIP, &mreqn, sizeof(mreqn)); } else { struct ipv6_mreq mreqn = {0}; - memcpy(&mreqn.ipv6mr_multiaddr, &mcast_addr, sizeof(struct in6_addr)); + memcpy(&mreqn.ipv6mr_multiaddr, &mcast_addr, sizeof(struct net_in6_addr)); mreqn.ipv6mr_ifindex = net_if_get_by_iface(port->iface); - zsock_setsockopt(port->socket[0], IPPROTO_IPV6, - IPV6_ADD_MEMBERSHIP, &mreqn, sizeof(mreqn)); + zsock_setsockopt(port->socket[0], NET_IPPROTO_IPV6, + ZSOCK_IPV6_ADD_MEMBERSHIP, &mreqn, sizeof(mreqn)); } return 0; @@ -111,25 +115,25 @@ static int transport_join_multicast(struct ptp_port *port) static int transport_udp_ipv4_open(struct net_if *iface, uint16_t port) { uint8_t tos; - socklen_t length; + net_socklen_t length; int socket, ttl = 1; - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_addr = INADDR_ANY_INIT, - .sin_port = htons(port), + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET, + .sin_addr = NET_INADDR_ANY_INIT, + .sin_port = net_htons(port), }; - socket = transport_socket_open(iface, (struct sockaddr *)&addr); + socket = transport_socket_open(iface, (struct net_sockaddr *)&addr); if (socket < 0) { return -1; } - if (zsock_setsockopt(socket, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl))) { + if (zsock_setsockopt(socket, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, &ttl, sizeof(ttl))) { LOG_ERR("Failed to set ip multicast ttl socket option"); goto error; } - if (zsock_getsockopt(socket, IPPROTO_IP, IP_TOS, &tos, &length)) { + if (zsock_getsockopt(socket, NET_IPPROTO_IP, ZSOCK_IP_TOS, &tos, &length)) { tos = 0; } @@ -137,7 +141,7 @@ static int transport_udp_ipv4_open(struct net_if *iface, uint16_t port) tos |= CONFIG_PTP_DSCP_VALUE << 2; length = sizeof(tos); - if (zsock_setsockopt(socket, IPPROTO_IP, IP_TOS, &tos, length)) { + if (zsock_setsockopt(socket, NET_IPPROTO_IP, ZSOCK_IP_TOS, &tos, length)) { LOG_WRN("Failed to set DSCP priority"); } @@ -150,34 +154,35 @@ static int transport_udp_ipv4_open(struct net_if *iface, uint16_t port) static int transport_udp_ipv6_open(struct net_if *iface, uint16_t port) { uint8_t tclass; - socklen_t length; + net_socklen_t length; int socket, hops = 1, feature_on = 1; - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, - .sin6_addr = IN6ADDR_ANY_INIT, - .sin6_port = htons(port) + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, + .sin6_addr = NET_IN6ADDR_ANY_INIT, + .sin6_port = net_htons(port) }; - socket = transport_socket_open(iface, (struct sockaddr *)&addr); + socket = transport_socket_open(iface, (struct net_sockaddr *)&addr); if (socket < 0) { return -1; } if (zsock_setsockopt(socket, - IPPROTO_IPV6, - IPV6_RECVPKTINFO, + NET_IPPROTO_IPV6, + ZSOCK_IPV6_RECVPKTINFO, &feature_on, sizeof(feature_on))) { LOG_ERR("Failed to set IPV6_RECVPKTINFO"); goto error; } - if (zsock_setsockopt(socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &hops, sizeof(hops))) { + if (zsock_setsockopt(socket, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, + &hops, sizeof(hops))) { LOG_ERR("Failed to set ip multicast hops socket option"); goto error; } - if (zsock_getsockopt(socket, IPPROTO_IPV6, IPV6_TCLASS, &tclass, &length)) { + if (zsock_getsockopt(socket, NET_IPPROTO_IPV6, ZSOCK_IPV6_TCLASS, &tclass, &length)) { tclass = 0; } @@ -185,7 +190,7 @@ static int transport_udp_ipv6_open(struct net_if *iface, uint16_t port) tclass |= CONFIG_PTP_DSCP_VALUE << 2; length = sizeof(tclass); - if (zsock_setsockopt(socket, IPPROTO_IPV6, IPV6_TCLASS, &tclass, length)) { + if (zsock_setsockopt(socket, NET_IPPROTO_IPV6, ZSOCK_IPV6_TCLASS, &tclass, length)) { LOG_WRN("Failed to set priority"); } @@ -195,30 +200,30 @@ static int transport_udp_ipv6_open(struct net_if *iface, uint16_t port) return -1; } -static int transport_send(int socket, int port, void *buf, int length, struct sockaddr *addr) +static int transport_send(int socket, int port, void *buf, int length, struct net_sockaddr *addr) { - struct sockaddr m_addr; - socklen_t addrlen; + struct net_sockaddr m_addr; + net_socklen_t addrlen; int cnt; if (!addr) { if (IS_ENABLED(CONFIG_PTP_UDP_IPv4_PROTOCOL)) { - m_addr.sa_family = AF_INET; - net_sin(&m_addr)->sin_port = htons(port); + m_addr.sa_family = NET_AF_INET; + net_sin(&m_addr)->sin_port = net_htons(port); net_sin(&m_addr)->sin_addr.s_addr = mcast_addr.ipv4.s_addr; } else if (IS_ENABLED(CONFIG_PTP_UDP_IPv6_PROTOCOL)) { - m_addr.sa_family = AF_INET6; - net_sin6(&m_addr)->sin6_port = htons(port); + m_addr.sa_family = NET_AF_INET6; + net_sin6(&m_addr)->sin6_port = net_htons(port); memcpy(&net_sin6(&m_addr)->sin6_addr, &mcast_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } addr = &m_addr; } - addrlen = IS_ENABLED(CONFIG_PTP_UDP_IPv4_PROTOCOL) ? sizeof(struct sockaddr_in) : - sizeof(struct sockaddr_in6); + addrlen = IS_ENABLED(CONFIG_PTP_UDP_IPv4_PROTOCOL) ? sizeof(struct net_sockaddr_in) : + sizeof(struct net_sockaddr_in6); cnt = zsock_sendto(socket, buf, length, 0, addr, addrlen); if (cnt < 1) { LOG_ERR("Failed to send message"); @@ -276,7 +281,7 @@ int ptp_transport_send(struct ptp_port *port, struct ptp_msg *msg, enum ptp_sock __ASSERT(PTP_SOCKET_CNT > idx, "Invalid socket index"); static const int socket_port[] = {PTP_SOCKET_PORT_EVENT, PTP_SOCKET_PORT_GENERAL}; - int length = ntohs(msg->header.msg_length); + int length = net_ntohs(msg->header.msg_length); return transport_send(port->socket[idx], socket_port[idx], msg, length, NULL); } @@ -286,7 +291,7 @@ int ptp_transport_sendto(struct ptp_port *port, struct ptp_msg *msg, enum ptp_so __ASSERT(PTP_SOCKET_CNT > idx, "Invalid socket index"); static const int socket_port[] = {PTP_SOCKET_PORT_EVENT, PTP_SOCKET_PORT_GENERAL}; - int length = ntohs(msg->header.msg_length); + int length = net_ntohs(msg->header.msg_length); return transport_send(port->socket[idx], socket_port[idx], msg, length, &msg->addr); } @@ -297,9 +302,9 @@ int ptp_transport_recv(struct ptp_port *port, struct ptp_msg *msg, enum ptp_sock int cnt = 0; uint8_t ctrl[CMSG_SPACE(sizeof(struct net_ptp_time))] = {0}; - struct cmsghdr *cmsg; - struct msghdr msghdr = {0}; - struct iovec iov = { + struct net_cmsghdr *cmsg; + struct net_msghdr msghdr = {0}; + struct net_iovec iov = { .iov_base = msg, .iov_len = sizeof(msg->mtu), }; @@ -314,9 +319,12 @@ int ptp_transport_recv(struct ptp_port *port, struct ptp_msg *msg, enum ptp_sock LOG_ERR("Failed receive PTP message"); } - for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg != NULL; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) { - if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMPING) { - memcpy(&msg->timestamp.host, CMSG_DATA(cmsg), sizeof(struct net_ptp_time)); + for (cmsg = NET_CMSG_FIRSTHDR(&msghdr); cmsg != NULL; + cmsg = NET_CMSG_NXTHDR(&msghdr, cmsg)) { + if (cmsg->cmsg_level == ZSOCK_SOL_SOCKET && + cmsg->cmsg_type == ZSOCK_SO_TIMESTAMPING) { + memcpy(&msg->timestamp.host, NET_CMSG_DATA(cmsg), + sizeof(struct net_ptp_time)); } } @@ -330,14 +338,16 @@ int ptp_transport_protocol_addr(struct ptp_port *port, uint8_t *addr) int length = 0; if (IS_ENABLED(CONFIG_PTP_UDP_IPv4_PROTOCOL)) { - struct in_addr *ip = net_if_ipv4_get_global_addr(port->iface, NET_ADDR_PREFERRED); + struct net_in_addr *ip = net_if_ipv4_get_global_addr(port->iface, + NET_ADDR_PREFERRED); if (ip) { length = NET_IPV4_ADDR_SIZE; *addr = ip->s_addr; } } else if (IS_ENABLED(CONFIG_PTP_UDP_IPv6_PROTOCOL)) { - struct in6_addr *ip = net_if_ipv6_get_global_addr(NET_ADDR_PREFERRED, &port->iface); + struct net_in6_addr *ip = net_if_ipv6_get_global_addr(NET_ADDR_PREFERRED, + &port->iface); if (ip) { length = NET_IPV6_ADDR_SIZE; diff --git a/subsys/net/lib/shell/capture.c b/subsys/net/lib/shell/capture.c index 4ea9e4790f6be..4c0cff381b75c 100644 --- a/subsys/net/lib/shell/capture.c +++ b/subsys/net/lib/shell/capture.c @@ -18,26 +18,26 @@ LOG_MODULE_DECLARE(net_shell); #define DEFAULT_DEV_NAME "NET_CAPTURE0" static const struct device *capture_dev; -static void get_address_str(const struct sockaddr *addr, +static void get_address_str(const struct net_sockaddr *addr, char *str, int str_len) { - if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && addr->sa_family == NET_AF_INET6) { snprintk(str, str_len, "[%s]:%u", net_sprint_ipv6_addr(&net_sin6(addr)->sin6_addr), - ntohs(net_sin6(addr)->sin6_port)); + net_ntohs(net_sin6(addr)->sin6_port)); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { snprintk(str, str_len, "%s:%d", net_sprint_ipv4_addr(&net_sin(addr)->sin_addr), - ntohs(net_sin(addr)->sin_port)); + net_ntohs(net_sin(addr)->sin_port)); } else if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET) && - addr->sa_family == AF_PACKET) { + addr->sa_family == NET_AF_PACKET) { snprintk(str, str_len, "AF_PACKET"); } else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && - addr->sa_family == AF_CAN) { + addr->sa_family == NET_AF_CAN) { snprintk(str, str_len, "AF_CAN"); - } else if (addr->sa_family == AF_UNSPEC) { + } else if (addr->sa_family == NET_AF_UNSPEC) { snprintk(str, str_len, "AF_UNSPEC"); } else { snprintk(str, str_len, "AF_UNK(%d)", addr->sa_family); diff --git a/subsys/net/lib/shell/conn.c b/subsys/net/lib/shell/conn.c index ca852f1d15d08..bd0a5b28b1071 100644 --- a/subsys/net/lib/shell/conn.c +++ b/subsys/net/lib/shell/conn.c @@ -38,13 +38,13 @@ static void context_cb(struct net_context *context, void *user_data) PR("[%2d] %p\t%d %c%c%c %16s\t%16s\n", (*count) + 1, context, net_if_get_by_iface(net_context_get_iface(context)), - net_context_get_family(context) == AF_INET6 ? '6' : - (net_context_get_family(context) == AF_INET ? '4' : ' '), - net_context_get_type(context) == SOCK_DGRAM ? 'D' : - (net_context_get_type(context) == SOCK_STREAM ? 'S' : - (net_context_get_type(context) == SOCK_RAW ? 'R' : ' ')), - net_context_get_proto(context) == IPPROTO_UDP ? 'U' : - (net_context_get_proto(context) == IPPROTO_TCP ? 'T' : ' '), + net_context_get_family(context) == NET_AF_INET6 ? '6' : + (net_context_get_family(context) == NET_AF_INET ? '4' : ' '), + net_context_get_type(context) == NET_SOCK_DGRAM ? 'D' : + (net_context_get_type(context) == NET_SOCK_STREAM ? 'S' : + (net_context_get_type(context) == NET_SOCK_RAW ? 'R' : ' ')), + net_context_get_proto(context) == NET_IPPROTO_UDP ? 'U' : + (net_context_get_proto(context) == NET_IPPROTO_TCP ? 'T' : ' '), addr_local, addr_remote); (*count)++; @@ -67,29 +67,29 @@ static void conn_handler_cb(struct net_conn *conn, void *user_data) char addr_local[ADDR_LEN + 7]; char addr_remote[ADDR_LEN + 7] = ""; - if (IS_ENABLED(CONFIG_NET_IPV6) && conn->local_addr.sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && conn->local_addr.sa_family == NET_AF_INET6) { snprintk(addr_local, sizeof(addr_local), "[%s]:%u", net_sprint_ipv6_addr( &net_sin6(&conn->local_addr)->sin6_addr), - ntohs(net_sin6(&conn->local_addr)->sin6_port)); + net_ntohs(net_sin6(&conn->local_addr)->sin6_port)); snprintk(addr_remote, sizeof(addr_remote), "[%s]:%u", net_sprint_ipv6_addr( &net_sin6(&conn->remote_addr)->sin6_addr), - ntohs(net_sin6(&conn->remote_addr)->sin6_port)); + net_ntohs(net_sin6(&conn->remote_addr)->sin6_port)); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && conn->local_addr.sa_family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && conn->local_addr.sa_family == NET_AF_INET) { snprintk(addr_local, sizeof(addr_local), "%s:%d", net_sprint_ipv4_addr( &net_sin(&conn->local_addr)->sin_addr), - ntohs(net_sin(&conn->local_addr)->sin_port)); + net_ntohs(net_sin(&conn->local_addr)->sin_port)); snprintk(addr_remote, sizeof(addr_remote), "%s:%d", net_sprint_ipv4_addr( &net_sin(&conn->remote_addr)->sin_addr), - ntohs(net_sin(&conn->remote_addr)->sin_port)); + net_ntohs(net_sin(&conn->remote_addr)->sin_port)); - } else if (conn->local_addr.sa_family == AF_UNSPEC) { + } else if (conn->local_addr.sa_family == NET_AF_UNSPEC) { snprintk(addr_local, sizeof(addr_local), "AF_UNSPEC"); - } else if (conn->local_addr.sa_family == AF_PACKET) { + } else if (conn->local_addr.sa_family == NET_AF_PACKET) { snprintk(addr_local, sizeof(addr_local), "AF_PACKET"); } else { snprintk(addr_local, sizeof(addr_local), "AF_UNK(%d)", @@ -123,8 +123,8 @@ static void tcp_cb(struct tcp *conn, void *user_data) PR("%p %p %5u %5u %10u %10u %5u %s\n", conn, conn->context, - ntohs(net_sin6_ptr(&conn->context->local)->sin6_port), - ntohs(net_sin6(&conn->context->remote)->sin6_port), + net_ntohs(net_sin6_ptr(&conn->context->local)->sin6_port), + net_ntohs(net_sin6(&conn->context->remote)->sin6_port), conn->seq, conn->ack, recv_mss, net_tcp_state_str(net_tcp_get_state(conn))); diff --git a/subsys/net/lib/shell/dhcpv4.c b/subsys/net/lib/shell/dhcpv4.c index fc6e737ad7ab5..2b2acc2f0c47b 100644 --- a/subsys/net/lib/shell/dhcpv4.c +++ b/subsys/net/lib/shell/dhcpv4.c @@ -17,7 +17,7 @@ static int cmd_net_dhcpv4_server_start(const struct shell *sh, size_t argc, char { #if defined(CONFIG_NET_DHCPV4_SERVER) struct net_if *iface = NULL; - struct in_addr base_addr; + struct net_in_addr base_addr; int idx, ret; idx = get_iface_idx(sh, argv[1]); @@ -31,7 +31,7 @@ static int cmd_net_dhcpv4_server_start(const struct shell *sh, size_t argc, char return -ENOEXEC; } - if (net_addr_pton(AF_INET, argv[2], &base_addr)) { + if (net_addr_pton(NET_AF_INET, argv[2], &base_addr)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } @@ -127,7 +127,7 @@ static void dhcpv4_lease_cb(struct net_if *iface, char expiry_str[] = "4294967295"; /* Lease time is uint32_t, so take * theoretical max. */ - char iface_name[IFNAMSIZ] = ""; + char iface_name[NET_IFNAMSIZ] = ""; if (*count == 0) { PR(" Iface Address\t State\tExpiry (sec)\n"); diff --git a/subsys/net/lib/shell/dns.c b/subsys/net/lib/shell/dns.c index b29562218e194..f74309086392b 100644 --- a/subsys/net/lib/shell/dns.c +++ b/subsys/net/lib/shell/dns.c @@ -35,26 +35,26 @@ static void dns_result_cb(enum dns_resolve_status status, char str[MAX_STR_LEN + 1]; switch (info->ai_family) { - case AF_INET: - net_addr_ntop(AF_INET, + case NET_AF_INET: + net_addr_ntop(NET_AF_INET, &net_sin(&info->ai_addr)->sin_addr, str, sizeof(str)); break; - case AF_INET6: - net_addr_ntop(AF_INET6, + case NET_AF_INET6: + net_addr_ntop(NET_AF_INET6, &net_sin6(&info->ai_addr)->sin6_addr, str, sizeof(str)); break; - case AF_LOCAL: + case NET_AF_LOCAL: /* service discovery */ memset(str, 0, MAX_STR_LEN); memcpy(str, info->ai_canonname, MIN(info->ai_addrlen, MAX_STR_LEN)); break; - case AF_UNSPEC: + case NET_AF_UNSPEC: if (info->ai_extension == DNS_RESOLVE_TXT) { memset(str, 0, MAX_STR_LEN); memcpy(str, info->ai_txt.text, @@ -140,7 +140,7 @@ static void print_dns_info(const struct shell *sh, for (i = 0; i < CONFIG_DNS_RESOLVER_MAX_SERVERS + DNS_MAX_MCAST_SERVERS; i++) { - char iface_name[IFNAMSIZ] = { 0 }; + char iface_name[NET_IFNAMSIZ] = { 0 }; if (ctx->servers[i].if_index > 0) { ret = net_if_get_name( @@ -152,12 +152,12 @@ static void print_dns_info(const struct shell *sh, } } - if (ctx->servers[i].dns_server.sa_family == AF_INET) { + if (ctx->servers[i].dns_server.sa_family == NET_AF_INET) { PR("\t%s:%u%s%s%s%s%s\n", net_sprint_ipv4_addr( &net_sin(&ctx->servers[i].dns_server)-> sin_addr), - ntohs(net_sin(&ctx->servers[i].dns_server)->sin_port), + net_ntohs(net_sin(&ctx->servers[i].dns_server)->sin_port), printable_iface(iface_name, " via ", ""), printable_iface(iface_name, iface_name, ""), ctx->servers[i].source != DNS_SOURCE_UNKNOWN ? " (" : "", @@ -165,12 +165,12 @@ static void print_dns_info(const struct shell *sh, dns_get_source_str(ctx->servers[i].source) : "", ctx->servers[i].source != DNS_SOURCE_UNKNOWN ? ")" : ""); - } else if (ctx->servers[i].dns_server.sa_family == AF_INET6) { + } else if (ctx->servers[i].dns_server.sa_family == NET_AF_INET6) { PR("\t[%s]:%u%s%s%s%s%s\n", net_sprint_ipv6_addr( &net_sin6(&ctx->servers[i].dns_server)-> sin6_addr), - ntohs(net_sin6(&ctx->servers[i].dns_server)->sin6_port), + net_ntohs(net_sin6(&ctx->servers[i].dns_server)->sin6_port), printable_iface(iface_name, " via ", ""), printable_iface(iface_name, iface_name, ""), ctx->servers[i].source != DNS_SOURCE_UNKNOWN ? " (" : "", @@ -373,7 +373,7 @@ static int cmd_net_dns_list(const struct shell *sh, size_t argc, char *argv[]) ++n_records; if (record->port != NULL) { - snprintk(buf, sizeof(buf), "%u", ntohs(*record->port)); + snprintk(buf, sizeof(buf), "%u", net_ntohs(*record->port)); } PR("[%2d] %s.%s%s%s%s%s%s%s\n", @@ -440,8 +440,8 @@ static int cmd_net_dns_service(const struct shell *sh, size_t argc, char *argv[] enum dns_query_type qtype; char query[DNS_MAX_NAME_SIZE + 1]; union { - char in4[INET_ADDRSTRLEN]; - char in6[INET6_ADDRSTRLEN]; + char in4[NET_INET_ADDRSTRLEN]; + char in6[NET_INET6_ADDRSTRLEN]; } str; ret = k_msgq_get(&dns_infoq, &info, K_MSEC(DNS_SERVICE_TIMEOUT)); @@ -451,21 +451,21 @@ static int cmd_net_dns_service(const struct shell *sh, size_t argc, char *argv[] } switch (info.ai_family) { - case AF_INET: - cp = net_addr_ntop(AF_INET, + case NET_AF_INET: + cp = net_addr_ntop(NET_AF_INET, &net_sin(&info.ai_addr)->sin_addr, str.in4, sizeof(str.in4)); PR("AF_INET %s:%u\n", cp ? cp : "", port); break; - case AF_INET6: - cp = net_addr_ntop(AF_INET6, + case NET_AF_INET6: + cp = net_addr_ntop(NET_AF_INET6, &net_sin6(&info.ai_addr)->sin6_addr, str.in6, sizeof(str.in6)); PR("AF_INET6 [%s]:%u\n", cp ? cp : "", port); break; - case AF_LOCAL: + case NET_AF_LOCAL: PR("AF_LOCAL %.*s\n", (int)info.ai_addrlen, info.ai_canonname); @@ -482,7 +482,7 @@ static int cmd_net_dns_service(const struct shell *sh, size_t argc, char *argv[] } break; - case AF_UNSPEC: + case NET_AF_UNSPEC: if (info.ai_extension == DNS_RESOLVE_SRV) { PR("SRV %d %d %d %.*s\n", info.ai_srv.priority, diff --git a/subsys/net/lib/shell/events.c b/subsys/net/lib/shell/events.c index 51afbc85fc9f8..53d8499248468 100644 --- a/subsys/net/lib/shell/events.c +++ b/subsys/net/lib/shell/events.c @@ -161,103 +161,103 @@ static char *get_l3_desc(struct event_msg *msg, case NET_EVENT_IPV6_ADDR_ADD: *desc = "IPv6 address"; *desc2 = "add"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_ADDR_DEPRECATED: *desc = "IPv6 address"; *desc2 = "deprecated"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_ADDR_DEL: *desc = "IPv6 address"; *desc2 = "del"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_MADDR_ADD: *desc = "IPv6 mcast address"; *desc2 = "add"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_MADDR_DEL: *desc = "IPv6 mcast address"; *desc2 = "del"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_PREFIX_ADD: *desc = "IPv6 prefix"; *desc2 = "add"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_PREFIX_DEL: *desc = "IPv6 prefix"; *desc2 = "del"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_MCAST_JOIN: *desc = "IPv6 mcast"; *desc2 = "join"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_MCAST_LEAVE: *desc = "IPv6 mcast"; *desc2 = "leave"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_ROUTER_ADD: *desc = "IPv6 router"; *desc2 = "add"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_ROUTER_DEL: *desc = "IPv6 router"; *desc2 = "del"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_ROUTE_ADD: *desc = "IPv6 route"; *desc2 = "add"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_ROUTE_DEL: *desc = "IPv6 route"; *desc2 = "del"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_DAD_SUCCEED: *desc = "IPv6 DAD"; *desc2 = "ok"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_DAD_FAILED: *desc = "IPv6 DAD"; *desc2 = "fail"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_NBR_ADD: *desc = "IPv6 neighbor"; *desc2 = "add"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_NBR_DEL: *desc = "IPv6 neighbor"; *desc2 = "del"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_PE_ENABLED: @@ -271,49 +271,49 @@ static char *get_l3_desc(struct event_msg *msg, case NET_EVENT_IPV6_PE_FILTER_ADD: *desc = "IPv6 PE filter"; *desc2 = "add"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV6_PE_FILTER_DEL: *desc = "IPv6 PE filter"; *desc2 = "del"; - info = net_addr_ntop(AF_INET6, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET6, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_ADDR_ADD: *desc = "IPv4 address"; *desc2 = "add"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_ADDR_DEL: *desc = "IPv4 address"; *desc2 = "del"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_MADDR_ADD: *desc = "IPv4 mcast address"; *desc2 = "add"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_MADDR_DEL: *desc = "IPv4 mcast address"; *desc2 = "del"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_ROUTER_ADD: *desc = "IPv4 router"; *desc2 = "add"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_ROUTER_DEL: *desc = "IPv4 router"; *desc2 = "del"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_DHCP_START: @@ -326,7 +326,7 @@ static char *get_l3_desc(struct event_msg *msg, #if defined(CONFIG_NET_DHCPV4) struct net_if_dhcpv4 *data = (struct net_if_dhcpv4 *)msg->data; - info = net_addr_ntop(AF_INET, &data->requested_ip, extra_info, + info = net_addr_ntop(NET_AF_INET, &data->requested_ip, extra_info, extra_info_len); #endif break; @@ -337,25 +337,25 @@ static char *get_l3_desc(struct event_msg *msg, case NET_EVENT_IPV4_MCAST_JOIN: *desc = "IPv4 mcast"; *desc2 = "join"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_MCAST_LEAVE: *desc = "IPv4 mcast"; *desc2 = "leave"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_ACD_SUCCEED: *desc = "IPv4 ACD"; *desc2 = "ok"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_ACD_FAILED: *desc = "IPv4 ACD"; *desc2 = "fail"; - info = net_addr_ntop(AF_INET, msg->data, extra_info, + info = net_addr_ntop(NET_AF_INET, msg->data, extra_info, extra_info_len); break; case NET_EVENT_IPV4_PMTU_CHANGED: { @@ -367,7 +367,7 @@ static char *get_l3_desc(struct event_msg *msg, *desc2 = pmtu_buf; snprintk(pmtu_buf, MAX_PMTU_INFO_STR_LEN, "changed MTU %u for", (uint16_t)pmtu_info->mtu); - info = net_addr_ntop(AF_INET, &pmtu_info->dst, extra_info, + info = net_addr_ntop(NET_AF_INET, &pmtu_info->dst, extra_info, extra_info_len); #endif break; @@ -381,7 +381,7 @@ static char *get_l3_desc(struct event_msg *msg, *desc2 = pmtu_buf; snprintk(pmtu_buf, MAX_PMTU_INFO_STR_LEN, "changed MTU %u for", (uint16_t)pmtu_info->mtu); - info = net_addr_ntop(AF_INET6, &pmtu_info->dst, extra_info, + info = net_addr_ntop(NET_AF_INET6, &pmtu_info->dst, extra_info, extra_info_len); #endif break; @@ -391,12 +391,12 @@ static char *get_l3_desc(struct event_msg *msg, return info; } -static char *sockaddr_ntop(const struct sockaddr *addr, char *dst, size_t size) +static char *sockaddr_ntop(const struct net_sockaddr *addr, char *dst, size_t size) { - if (addr->sa_family == AF_INET) { - return net_addr_ntop(AF_INET, &net_sin(addr)->sin_addr, dst, size); - } else if (addr->sa_family == AF_INET6) { - return net_addr_ntop(AF_INET6, &net_sin6(addr)->sin6_addr, dst, size); + if (addr->sa_family == NET_AF_INET) { + return net_addr_ntop(NET_AF_INET, &net_sin(addr)->sin_addr, dst, size); + } else if (addr->sa_family == NET_AF_INET6) { + return net_addr_ntop(NET_AF_INET6, &net_sin6(addr)->sin6_addr, dst, size); } return NULL; @@ -435,7 +435,7 @@ static char *get_l4_desc(struct event_msg *msg, *desc2 = "lost"; break; case NET_EVENT_DNS_SERVER_ADD: { - struct sockaddr *addr = (struct sockaddr *)msg->data; + struct net_sockaddr *addr = (struct net_sockaddr *)msg->data; *desc = "DNS server"; *desc2 = "add"; @@ -445,7 +445,7 @@ static char *get_l4_desc(struct event_msg *msg, break; } case NET_EVENT_DNS_SERVER_DEL: { - struct sockaddr *addr = (struct sockaddr *)msg->data; + struct net_sockaddr *addr = (struct net_sockaddr *)msg->data; *desc = "DNS server"; *desc2 = "del"; diff --git a/subsys/net/lib/shell/ipv4.c b/subsys/net/lib/shell/ipv4.c index 966783182a657..fe81036e70a3b 100644 --- a/subsys/net/lib/shell/ipv4.c +++ b/subsys/net/lib/shell/ipv4.c @@ -36,7 +36,7 @@ static void ip_address_lifetime_cb(struct net_if *iface, void *user_data) ARRAY_FOR_EACH(ipv4->unicast, i) { if (!ipv4->unicast[i].ipv4.is_used || - ipv4->unicast[i].ipv4.address.family != AF_INET) { + ipv4->unicast[i].ipv4.address.family != NET_AF_INET) { continue; } @@ -100,7 +100,7 @@ static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[]) #if defined(CONFIG_NET_IPV4) struct net_if *iface = NULL; int idx; - struct in_addr addr; + struct net_in_addr addr; if (argc < 3) { PR_ERROR("Correct usage: net ipv4 add
[]\n"); @@ -118,7 +118,7 @@ static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[]) return -ENOEXEC; } - if (net_addr_pton(AF_INET, argv[2], &addr)) { + if (net_addr_pton(NET_AF_INET, argv[2], &addr)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } @@ -134,7 +134,7 @@ static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[]) } } else { struct net_if_addr *ifaddr; - struct in_addr netmask; + struct net_in_addr netmask; if (argc < 4) { PR_ERROR("Netmask is missing.\n"); @@ -148,7 +148,7 @@ static int cmd_net_ip_add(const struct shell *sh, size_t argc, char *argv[]) return -ENOMEM; } - if (net_addr_pton(AF_INET, argv[3], &netmask)) { + if (net_addr_pton(NET_AF_INET, argv[3], &netmask)) { PR_ERROR("Invalid netmask: %s", argv[3]); return -EINVAL; } @@ -167,7 +167,7 @@ static int cmd_net_ip_del(const struct shell *sh, size_t argc, char *argv[]) #if defined(CONFIG_NET_IPV4) struct net_if *iface = NULL; int idx; - struct in_addr addr; + struct net_in_addr addr; if (argc != 3) { PR_ERROR("Correct usage: net ipv4 del
"); @@ -185,7 +185,7 @@ static int cmd_net_ip_del(const struct shell *sh, size_t argc, char *argv[]) return -ENOEXEC; } - if (net_addr_pton(AF_INET, argv[2], &addr)) { + if (net_addr_pton(NET_AF_INET, argv[2], &addr)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } @@ -216,7 +216,7 @@ static int cmd_net_ip_gateway(const struct shell *sh, size_t argc, char *argv[]) #if defined(CONFIG_NET_IPV4) struct net_if *iface; int idx; - struct in_addr addr; + struct net_in_addr addr; if (argc != 3) { PR_ERROR("Correct usage: net ipv4 gateway \n"); @@ -234,7 +234,7 @@ static int cmd_net_ip_gateway(const struct shell *sh, size_t argc, char *argv[]) return -ENOEXEC; } - if (net_addr_pton(AF_INET, argv[2], &addr)) { + if (net_addr_pton(NET_AF_INET, argv[2], &addr)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } diff --git a/subsys/net/lib/shell/ipv6.c b/subsys/net/lib/shell/ipv6.c index 744ea6a07043d..2b0af563455ba 100644 --- a/subsys/net/lib/shell/ipv6.c +++ b/subsys/net/lib/shell/ipv6.c @@ -57,15 +57,15 @@ void ipv6_frag_cb(struct net_ipv6_reassembly *reass, void *user_data) #endif /* CONFIG_NET_IPV6_FRAGMENT */ #if defined(CONFIG_NET_IPV6_PE) -static void ipv6_pe_filter_cb(struct in6_addr *prefix, bool is_denylist, +static void ipv6_pe_filter_cb(struct net_in6_addr *prefix, bool is_denylist, void *user_data) { struct net_shell_user_data *data = user_data; const struct shell *sh = data->sh; int *count = data->user_data; - char ipaddr[INET6_ADDRSTRLEN + 1]; + char ipaddr[NET_INET6_ADDRSTRLEN + 1]; - net_addr_ntop(AF_INET6, prefix, ipaddr, sizeof(ipaddr) - 1); + net_addr_ntop(NET_AF_INET6, prefix, ipaddr, sizeof(ipaddr) - 1); if (*count == 0) { PR("IPv6 privacy extension %s list filters :\n", @@ -104,7 +104,7 @@ static void address_lifetime_cb(struct net_if *iface, void *user_data) uint8_t prefix_len = 128U; if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6) { + ipv6->unicast[i].address.family != NET_AF_INET6) { continue; } @@ -232,7 +232,7 @@ static int cmd_net_ip6_add(const struct shell *sh, size_t argc, char *argv[]) #if defined(CONFIG_NET_IPV6) struct net_if *iface = NULL; int idx; - struct in6_addr addr; + struct net_in6_addr addr; if (argc != 3) { PR_ERROR("Correct usage: net ipv6 add
\n"); @@ -250,7 +250,7 @@ static int cmd_net_ip6_add(const struct shell *sh, size_t argc, char *argv[]) return -ENOENT; } - if (net_addr_pton(AF_INET6, argv[2], &addr)) { + if (net_addr_pton(NET_AF_INET6, argv[2], &addr)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } @@ -285,7 +285,7 @@ static int cmd_net_ip6_del(const struct shell *sh, size_t argc, char *argv[]) #if defined(CONFIG_NET_IPV6) struct net_if *iface = NULL; int idx; - struct in6_addr addr; + struct net_in6_addr addr; if (argc != 3) { PR_ERROR("Correct usage: net ipv6 del
\n"); @@ -303,7 +303,7 @@ static int cmd_net_ip6_del(const struct shell *sh, size_t argc, char *argv[]) return -ENOENT; } - if (net_addr_pton(AF_INET6, argv[2], &addr)) { + if (net_addr_pton(NET_AF_INET6, argv[2], &addr)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } @@ -339,7 +339,7 @@ static int cmd_net_ip6_pe(const struct shell *sh, size_t argc, char *argv[]) #if defined(CONFIG_NET_NATIVE_IPV6) #if CONFIG_NET_IPV6_PE_FILTER_PREFIX_COUNT > 0 bool do_allowlisting = true; - struct in6_addr prefix; + struct net_in6_addr prefix; bool do_add; int arg = 1; int ret; @@ -394,7 +394,7 @@ static int cmd_net_ip6_pe(const struct shell *sh, size_t argc, char *argv[]) return 0; } - ret = net_addr_pton(AF_INET6, argv[arg], &prefix); + ret = net_addr_pton(NET_AF_INET6, argv[arg], &prefix); if (ret < 0) { PR("Invalid prefix \"%s\"\n", argv[arg]); if (strstr(argv[arg], "/")) { diff --git a/subsys/net/lib/shell/nbr.c b/subsys/net/lib/shell/nbr.c index 809bba9277fce..55fc9afb8aec5 100644 --- a/subsys/net/lib/shell/nbr.c +++ b/subsys/net/lib/shell/nbr.c @@ -13,7 +13,7 @@ LOG_MODULE_DECLARE(net_shell); static int cmd_net_nbr_rm(const struct shell *sh, size_t argc, char *argv[]) { #if defined(CONFIG_NET_NATIVE_IPV6) - struct in6_addr addr; + struct net_in6_addr addr; int ret; if (!argv[1]) { @@ -21,7 +21,7 @@ static int cmd_net_nbr_rm(const struct shell *sh, size_t argc, char *argv[]) return -ENOEXEC; } - ret = net_addr_pton(AF_INET6, argv[1], &addr); + ret = net_addr_pton(NET_AF_INET6, argv[1], &addr); if (ret < 0) { PR_WARNING("Cannot parse '%s'\n", argv[1]); return -ENOEXEC; diff --git a/subsys/net/lib/shell/net_shell.c b/subsys/net/lib/shell/net_shell.c index 1ba64041d1eea..d906aac86e7d6 100644 --- a/subsys/net/lib/shell/net_shell.c +++ b/subsys/net/lib/shell/net_shell.c @@ -86,42 +86,42 @@ void get_addresses(struct net_context *context, char addr_local[], int local_len, char addr_remote[], int remote_len) { - if (IS_ENABLED(CONFIG_NET_IPV6) && context->local.family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && context->local.family == NET_AF_INET6) { snprintk(addr_local, local_len, "[%s]:%u", net_sprint_ipv6_addr( net_sin6_ptr(&context->local)->sin6_addr), - ntohs(net_sin6_ptr(&context->local)->sin6_port)); + net_ntohs(net_sin6_ptr(&context->local)->sin6_port)); snprintk(addr_remote, remote_len, "[%s]:%u", net_sprint_ipv6_addr( &net_sin6(&context->remote)->sin6_addr), - ntohs(net_sin6(&context->remote)->sin6_port)); + net_ntohs(net_sin6(&context->remote)->sin6_port)); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && context->local.family == AF_INET) { + } else if (IS_ENABLED(CONFIG_NET_IPV4) && context->local.family == NET_AF_INET) { snprintk(addr_local, local_len, "%s:%d", net_sprint_ipv4_addr( net_sin_ptr(&context->local)->sin_addr), - ntohs(net_sin_ptr(&context->local)->sin_port)); + net_ntohs(net_sin_ptr(&context->local)->sin_port)); /* Check if we need to print the v4-mapping-to-v6 address */ if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) && - net_sin(&context->remote)->sin_family == AF_INET6 && + net_sin(&context->remote)->sin_family == NET_AF_INET6 && net_ipv6_addr_is_v4_mapped(&net_sin6(&context->remote)->sin6_addr)) { snprintk(addr_remote, remote_len, "[%s]:%d", net_sprint_ipv6_addr( &net_sin6(&context->remote)->sin6_addr), - ntohs(net_sin6(&context->remote)->sin6_port)); + net_ntohs(net_sin6(&context->remote)->sin6_port)); } else { snprintk(addr_remote, remote_len, "%s:%d", net_sprint_ipv4_addr( &net_sin(&context->remote)->sin_addr), - ntohs(net_sin(&context->remote)->sin_port)); + net_ntohs(net_sin(&context->remote)->sin_port)); } - } else if (context->local.family == AF_UNSPEC) { + } else if (context->local.family == NET_AF_UNSPEC) { snprintk(addr_local, local_len, "AF_UNSPEC"); - } else if (context->local.family == AF_PACKET) { + } else if (context->local.family == NET_AF_PACKET) { snprintk(addr_local, local_len, "AF_PACKET"); - } else if (context->local.family == AF_CAN) { + } else if (context->local.family == NET_AF_CAN) { snprintk(addr_local, local_len, "AF_CAN"); } else { snprintk(addr_local, local_len, "AF_UNK(%d)", diff --git a/subsys/net/lib/shell/ping.c b/subsys/net/lib/shell/ping.c index 3ccc62a8e6332..97271664136ec 100644 --- a/subsys/net/lib/shell/ping.c +++ b/subsys/net/lib/shell/ping.c @@ -25,9 +25,9 @@ static struct ping_context { struct k_work_delayable work; struct net_icmp_ctx icmp; union { - struct sockaddr_in addr4; - struct sockaddr_in6 addr6; - struct sockaddr addr; + struct net_sockaddr_in addr4; + struct net_sockaddr_in6 addr6; + struct net_sockaddr addr; }; struct net_if *iface; const struct shell *sh; @@ -89,18 +89,18 @@ static int handle_ipv6_echo_reply(struct net_icmp_ctx *ctx, "rssi=%d " #endif "%s\n", - ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) - + net_ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) - NET_ICMPH_LEN, net_sprint_ipv6_addr(&ip_hdr->src), net_sprint_ipv6_addr(&ip_hdr->dst), - ntohs(icmp_echo->sequence), + net_ntohs(icmp_echo->sequence), ip_hdr->hop_limit, #ifdef CONFIG_IEEE802154 net_pkt_ieee802154_rssi_dbm(pkt), #endif time_buf); - if (ntohs(icmp_echo->sequence) == ping_ctx.count) { + if (net_ntohs(icmp_echo->sequence) == ping_ctx.count) { ping_done(&ping_ctx); } @@ -166,15 +166,15 @@ static int handle_ipv4_echo_reply(struct net_icmp_ctx *ctx, PR_SHELL(ping_ctx.sh, "%d bytes from %s to %s: icmp_seq=%d ttl=%d " "%s\n", - ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) - + net_ntohs(ip_hdr->len) - net_pkt_ipv6_ext_len(pkt) - NET_ICMPH_LEN, net_sprint_ipv4_addr(&ip_hdr->src), net_sprint_ipv4_addr(&ip_hdr->dst), - ntohs(icmp_echo->sequence), + net_ntohs(icmp_echo->sequence), ip_hdr->ttl, time_buf); - if (ntohs(icmp_echo->sequence) == ping_ctx.count) { + if (net_ntohs(icmp_echo->sequence) == ping_ctx.count) { ping_done(&ping_ctx); } @@ -299,7 +299,7 @@ static void ping_bypass(const struct shell *sh, uint8_t *data, size_t len) } } -static struct net_if *ping_select_iface(int id, struct sockaddr *target) +static struct net_if *ping_select_iface(int id, struct net_sockaddr *target) { struct net_if *iface = net_if_get_by_index(id); @@ -307,7 +307,7 @@ static struct net_if *ping_select_iface(int id, struct sockaddr *target) goto out; } - if (IS_ENABLED(CONFIG_NET_IPV4) && target->sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && target->sa_family == NET_AF_INET) { iface = net_if_ipv4_select_src_iface(&net_sin(target)->sin_addr); if (iface != NULL) { goto out; @@ -317,7 +317,7 @@ static struct net_if *ping_select_iface(int id, struct sockaddr *target) goto out; } - if (IS_ENABLED(CONFIG_NET_IPV6) && target->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && target->sa_family == NET_AF_INET6) { struct net_nbr *nbr; #if defined(CONFIG_NET_ROUTE) struct net_route_entry *route; @@ -453,20 +453,20 @@ static int cmd_net_ping(const struct shell *sh, size_t argc, char *argv[]) ping_ctx.payload_size = payload_size; if (IS_ENABLED(CONFIG_NET_IPV6) && - net_addr_pton(AF_INET6, host, &ping_ctx.addr6.sin6_addr) == 0) { - ping_ctx.addr6.sin6_family = AF_INET6; + net_addr_pton(NET_AF_INET6, host, &ping_ctx.addr6.sin6_addr) == 0) { + ping_ctx.addr6.sin6_family = NET_AF_INET6; - ret = net_icmp_init_ctx(&ping_ctx.icmp, AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, + ret = net_icmp_init_ctx(&ping_ctx.icmp, NET_AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, handle_ipv6_echo_reply); if (ret < 0) { PR_WARNING("Cannot initialize ICMP context for %s\n", "IPv6"); return 0; } } else if (IS_ENABLED(CONFIG_NET_IPV4) && - net_addr_pton(AF_INET, host, &ping_ctx.addr4.sin_addr) == 0) { - ping_ctx.addr4.sin_family = AF_INET; + net_addr_pton(NET_AF_INET, host, &ping_ctx.addr4.sin_addr) == 0) { + ping_ctx.addr4.sin_family = NET_AF_INET; - ret = net_icmp_init_ctx(&ping_ctx.icmp, AF_INET, NET_ICMPV4_ECHO_REPLY, 0, + ret = net_icmp_init_ctx(&ping_ctx.icmp, NET_AF_INET, NET_ICMPV4_ECHO_REPLY, 0, handle_ipv4_echo_reply); if (ret < 0) { PR_WARNING("Cannot initialize ICMP context for %s\n", "IPv4"); diff --git a/subsys/net/lib/shell/route.c b/subsys/net/lib/shell/route.c index f690beafd9881..941fadb290797 100644 --- a/subsys/net/lib/shell/route.c +++ b/subsys/net/lib/shell/route.c @@ -116,8 +116,8 @@ static int cmd_net_ip6_route_add(const struct shell *sh, size_t argc, char *argv struct net_if *iface = NULL; int idx; struct net_route_entry *route; - struct in6_addr gw = {0}; - struct in6_addr prefix = {0}; + struct net_in6_addr gw = {0}; + struct net_in6_addr prefix = {0}; if (argc != 4) { PR_ERROR("Correct usage: net route add " @@ -136,12 +136,12 @@ static int cmd_net_ip6_route_add(const struct shell *sh, size_t argc, char *argv return -ENOEXEC; } - if (net_addr_pton(AF_INET6, argv[2], &prefix)) { + if (net_addr_pton(NET_AF_INET6, argv[2], &prefix)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } - if (net_addr_pton(AF_INET6, argv[3], &gw)) { + if (net_addr_pton(NET_AF_INET6, argv[3], &gw)) { PR_ERROR("Invalid gateway: %s\n", argv[3]); return -EINVAL; } @@ -168,7 +168,7 @@ static int cmd_net_ip6_route_del(const struct shell *sh, size_t argc, char *argv struct net_if *iface = NULL; int idx; struct net_route_entry *route; - struct in6_addr prefix = { 0 }; + struct net_in6_addr prefix = { 0 }; if (argc != 3) { PR_ERROR("Correct usage: net route del \n"); @@ -185,7 +185,7 @@ static int cmd_net_ip6_route_del(const struct shell *sh, size_t argc, char *argv return -ENOEXEC; } - if (net_addr_pton(AF_INET6, argv[2], &prefix)) { + if (net_addr_pton(NET_AF_INET6, argv[2], &prefix)) { PR_ERROR("Invalid address: %s\n", argv[2]); return -EINVAL; } diff --git a/subsys/net/lib/shell/sockets.c b/subsys/net/lib/shell/sockets.c index f92a8b74ebde3..1eb32bf4619d5 100644 --- a/subsys/net/lib/shell/sockets.c +++ b/subsys/net/lib/shell/sockets.c @@ -67,14 +67,14 @@ int walk_sockets(struct k_obj_core *obj_core, void *user_data) PR("%25s %-12s %c%c%c\t%-5s%-13d %-10" PRId64 "%-10" PRId64 "\n", thread_name, obj->reg->name, - obj->socket_family == AF_INET6 ? '6' : - (obj->socket_family == AF_INET ? '4' : + obj->socket_family == NET_AF_INET6 ? '6' : + (obj->socket_family == NET_AF_INET ? '4' : (obj->socket_family == AF_NET_MGMT ? 'M' : ' ')), - obj->socket_type == SOCK_DGRAM ? 'D' : - (obj->socket_type == SOCK_STREAM ? 'S' : - (obj->socket_type == SOCK_RAW ? 'R' : ' ')), - obj->socket_proto == IPPROTO_UDP ? 'U' : - (obj->socket_proto == IPPROTO_TCP ? 'T' : ' '), + obj->socket_type == NET_SOCK_DGRAM ? 'D' : + (obj->socket_type == NET_SOCK_STREAM ? 'S' : + (obj->socket_type == NET_SOCK_RAW ? 'R' : ' ')), + obj->socket_proto == NET_IPPROTO_UDP ? 'U' : + (obj->socket_proto == NET_IPPROTO_TCP ? 'T' : ' '), fd, lifetime, stats.sent, stats.received); return 0; diff --git a/subsys/net/lib/shell/tcp.c b/subsys/net/lib/shell/tcp.c index 300f0f3fa52ca..664684c75d9d1 100644 --- a/subsys/net/lib/shell/tcp.c +++ b/subsys/net/lib/shell/tcp.c @@ -31,28 +31,28 @@ static void tcp_connected(struct net_context *context, } static void get_my_ipv6_addr(struct net_if *iface, - struct sockaddr *myaddr) + struct net_sockaddr *myaddr) { #if defined(CONFIG_NET_IPV6) - const struct in6_addr *my6addr; + const struct net_in6_addr *my6addr; my6addr = net_if_ipv6_select_src_addr(iface, &net_sin6(myaddr)->sin6_addr); - memcpy(&net_sin6(myaddr)->sin6_addr, my6addr, sizeof(struct in6_addr)); + memcpy(&net_sin6(myaddr)->sin6_addr, my6addr, sizeof(struct net_in6_addr)); net_sin6(myaddr)->sin6_port = 0U; /* let the IP stack to select */ #endif } static void get_my_ipv4_addr(struct net_if *iface, - struct sockaddr *myaddr) + struct net_sockaddr *myaddr) { #if defined(CONFIG_NET_NATIVE_IPV4) /* Just take the first IPv4 address of an interface. */ memcpy(&net_sin(myaddr)->sin_addr, &iface->config.ip.ipv4->unicast[0].ipv4.address.in_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); net_sin(myaddr)->sin_port = 0U; /* let the IP stack to select */ #endif @@ -60,32 +60,32 @@ static void get_my_ipv4_addr(struct net_if *iface, static void print_connect_info(const struct shell *sh, int family, - struct sockaddr *myaddr, - struct sockaddr *addr) + struct net_sockaddr *myaddr, + struct net_sockaddr *addr) { switch (family) { - case AF_INET: + case NET_AF_INET: if (IS_ENABLED(CONFIG_NET_IPV4)) { PR("Connecting from %s:%u ", net_sprint_ipv4_addr(&net_sin(myaddr)->sin_addr), - ntohs(net_sin(myaddr)->sin_port)); + net_ntohs(net_sin(myaddr)->sin_port)); PR("to %s:%u\n", net_sprint_ipv4_addr(&net_sin(addr)->sin_addr), - ntohs(net_sin(addr)->sin_port)); + net_ntohs(net_sin(addr)->sin_port)); } else { PR_INFO("IPv4 not supported\n"); } break; - case AF_INET6: + case NET_AF_INET6: if (IS_ENABLED(CONFIG_NET_IPV6)) { PR("Connecting from [%s]:%u ", net_sprint_ipv6_addr(&net_sin6(myaddr)->sin6_addr), - ntohs(net_sin6(myaddr)->sin6_port)); + net_ntohs(net_sin6(myaddr)->sin6_port)); PR("to [%s]:%u\n", net_sprint_ipv6_addr(&net_sin6(addr)->sin6_addr), - ntohs(net_sin6(addr)->sin6_port)); + net_ntohs(net_sin6(addr)->sin6_port)); } else { PR_INFO("IPv6 not supported\n"); } @@ -102,23 +102,23 @@ static void tcp_connect(const struct shell *sh, char *host, uint16_t port, struct net_context **ctx) { struct net_if *iface = net_if_get_default(); - struct sockaddr myaddr; - struct sockaddr addr; + struct net_sockaddr myaddr; + struct net_sockaddr addr; struct net_nbr *nbr; int addrlen; int family; int ret; if (IS_ENABLED(CONFIG_NET_IPV6) && !IS_ENABLED(CONFIG_NET_IPV4)) { - ret = net_addr_pton(AF_INET6, host, + ret = net_addr_pton(NET_AF_INET6, host, &net_sin6(&addr)->sin6_addr); if (ret < 0) { PR_WARNING("Invalid IPv6 address\n"); return; } - net_sin6(&addr)->sin6_port = htons(port); - addrlen = sizeof(struct sockaddr_in6); + net_sin6(&addr)->sin6_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in6); nbr = net_ipv6_nbr_lookup(NULL, &net_sin6(&addr)->sin6_addr); if (nbr) { @@ -126,42 +126,42 @@ static void tcp_connect(const struct shell *sh, char *host, uint16_t port, } get_my_ipv6_addr(iface, &myaddr); - family = addr.sa_family = myaddr.sa_family = AF_INET6; + family = addr.sa_family = myaddr.sa_family = NET_AF_INET6; } else if (IS_ENABLED(CONFIG_NET_IPV4) && !IS_ENABLED(CONFIG_NET_IPV6)) { ARG_UNUSED(nbr); - ret = net_addr_pton(AF_INET, host, &net_sin(&addr)->sin_addr); + ret = net_addr_pton(NET_AF_INET, host, &net_sin(&addr)->sin_addr); if (ret < 0) { PR_WARNING("Invalid IPv4 address\n"); return; } get_my_ipv4_addr(iface, &myaddr); - net_sin(&addr)->sin_port = htons(port); - addrlen = sizeof(struct sockaddr_in); - family = addr.sa_family = myaddr.sa_family = AF_INET; + net_sin(&addr)->sin_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in); + family = addr.sa_family = myaddr.sa_family = NET_AF_INET; } else if (IS_ENABLED(CONFIG_NET_IPV6) && IS_ENABLED(CONFIG_NET_IPV4)) { - ret = net_addr_pton(AF_INET6, host, + ret = net_addr_pton(NET_AF_INET6, host, &net_sin6(&addr)->sin6_addr); if (ret < 0) { - ret = net_addr_pton(AF_INET, host, + ret = net_addr_pton(NET_AF_INET, host, &net_sin(&addr)->sin_addr); if (ret < 0) { PR_WARNING("Invalid IP address\n"); return; } - net_sin(&addr)->sin_port = htons(port); - addrlen = sizeof(struct sockaddr_in); + net_sin(&addr)->sin_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in); get_my_ipv4_addr(iface, &myaddr); - family = addr.sa_family = myaddr.sa_family = AF_INET; + family = addr.sa_family = myaddr.sa_family = NET_AF_INET; } else { - net_sin6(&addr)->sin6_port = htons(port); - addrlen = sizeof(struct sockaddr_in6); + net_sin6(&addr)->sin6_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in6); nbr = net_ipv6_nbr_lookup(NULL, &net_sin6(&addr)->sin6_addr); @@ -170,7 +170,7 @@ static void tcp_connect(const struct shell *sh, char *host, uint16_t port, } get_my_ipv6_addr(iface, &myaddr); - family = addr.sa_family = myaddr.sa_family = AF_INET6; + family = addr.sa_family = myaddr.sa_family = NET_AF_INET6; } } else { PR_WARNING("No IPv6 nor IPv4 is enabled\n"); @@ -179,7 +179,7 @@ static void tcp_connect(const struct shell *sh, char *host, uint16_t port, print_connect_info(sh, family, &myaddr, &addr); - ret = net_context_get(family, SOCK_STREAM, IPPROTO_TCP, ctx); + ret = net_context_get(family, NET_SOCK_STREAM, NET_IPPROTO_TCP, ctx); if (ret < 0) { PR_WARNING("Cannot get TCP context (%d)\n", ret); return; diff --git a/subsys/net/lib/shell/udp.c b/subsys/net/lib/shell/udp.c index c2ce2d65f6413..44f36fb526bd0 100644 --- a/subsys/net/lib/shell/udp.c +++ b/subsys/net/lib/shell/udp.c @@ -66,7 +66,7 @@ static int cmd_net_udp_bind(const struct shell *sh, size_t argc, char *argv[]) int ret; struct net_if *iface; - struct sockaddr addr; + struct net_sockaddr addr; int addrlen; if (argc < 3) { @@ -95,7 +95,7 @@ static int cmd_net_udp_bind(const struct shell *sh, size_t argc, char *argv[]) return ret; } - ret = net_context_get(addr.sa_family, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(addr.sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_ctx); if (ret < 0) { PR_WARNING("Cannot get UDP context (%d)\n", ret); @@ -104,15 +104,15 @@ static int cmd_net_udp_bind(const struct shell *sh, size_t argc, char *argv[]) udp_shell = sh; - if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == AF_INET6) { - net_sin6(&addr)->sin6_port = htons(port); - addrlen = sizeof(struct sockaddr_in6); + if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == NET_AF_INET6) { + net_sin6(&addr)->sin6_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in6); iface = net_if_ipv6_select_src_iface( &net_sin6(&addr)->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == AF_INET) { - net_sin(&addr)->sin_port = htons(port); - addrlen = sizeof(struct sockaddr_in); + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == NET_AF_INET) { + net_sin(&addr)->sin_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in); iface = net_if_ipv4_select_src_iface( &net_sin(&addr)->sin_addr); @@ -194,7 +194,7 @@ static int cmd_net_udp_send(const struct shell *sh, size_t argc, char *argv[]) bool should_release_ctx = false; struct net_if *iface; - struct sockaddr addr; + struct net_sockaddr addr; int addrlen; if (argc < 4) { @@ -220,7 +220,7 @@ static int cmd_net_udp_send(const struct shell *sh, size_t argc, char *argv[]) /* Re-use already bound context if possible, or allocate temporary one. */ if (udp_ctx == NULL || !net_context_is_used(udp_ctx)) { - ret = net_context_get(addr.sa_family, SOCK_DGRAM, IPPROTO_UDP, &udp_ctx); + ret = net_context_get(addr.sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_ctx); if (ret < 0) { PR_WARNING("Cannot get UDP context (%d)\n", ret); return ret; @@ -230,15 +230,15 @@ static int cmd_net_udp_send(const struct shell *sh, size_t argc, char *argv[]) udp_shell = sh; - if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == AF_INET6) { - net_sin6(&addr)->sin6_port = htons(port); - addrlen = sizeof(struct sockaddr_in6); + if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == NET_AF_INET6) { + net_sin6(&addr)->sin6_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in6); iface = net_if_ipv6_select_src_iface( &net_sin6(&addr)->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == AF_INET) { - net_sin(&addr)->sin_port = htons(port); - addrlen = sizeof(struct sockaddr_in); + } else if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == NET_AF_INET) { + net_sin(&addr)->sin_port = net_htons(port); + addrlen = sizeof(struct net_sockaddr_in); iface = net_if_ipv4_select_src_iface( &net_sin(&addr)->sin_addr); diff --git a/subsys/net/lib/shell/vlan.c b/subsys/net/lib/shell/vlan.c index b0a52afca0d7e..a39dc8f51d54e 100644 --- a/subsys/net/lib/shell/vlan.c +++ b/subsys/net/lib/shell/vlan.c @@ -49,7 +49,7 @@ static void iface_vlan_cb(struct net_if *iface, void *user_data) struct net_shell_user_data *data = user_data; const struct shell *sh = data->sh; int *count = data->user_data; - char name[IFNAMSIZ]; + char name[NET_IFNAMSIZ]; if (!net_eth_is_vlan_interface(iface)) { return; diff --git a/subsys/net/lib/sntp/sntp.c b/subsys/net/lib/sntp/sntp.c index 2563308cbf471..022dc1bb9398d 100644 --- a/subsys/net/lib/sntp/sntp.c +++ b/subsys/net/lib/sntp/sntp.c @@ -33,17 +33,17 @@ static void sntp_pkt_dump(struct sntp_pkt *pkt) NET_DBG("stratum: %x", pkt->stratum); NET_DBG("poll: %x", pkt->poll); NET_DBG("precision: %x", pkt->precision); - NET_DBG("root_delay: %x", ntohl(pkt->root_delay)); - NET_DBG("root_dispersion: %x", ntohl(pkt->root_dispersion)); - NET_DBG("ref_id: %x", ntohl(pkt->ref_id)); - NET_DBG("ref_tm_s: %x", ntohl(pkt->ref_tm_s)); - NET_DBG("ref_tm_f: %x", ntohl(pkt->ref_tm_f)); - NET_DBG("orig_tm_s: %x", ntohl(pkt->orig_tm_s)); - NET_DBG("orig_tm_f: %x", ntohl(pkt->orig_tm_f)); - NET_DBG("rx_tm_s: %x", ntohl(pkt->rx_tm_s)); - NET_DBG("rx_tm_f: %x", ntohl(pkt->rx_tm_f)); - NET_DBG("tx_tm_s: %x", ntohl(pkt->tx_tm_s)); - NET_DBG("tx_tm_f: %x", ntohl(pkt->tx_tm_f)); + NET_DBG("root_delay: %x", net_ntohl(pkt->root_delay)); + NET_DBG("root_dispersion: %x", net_ntohl(pkt->root_dispersion)); + NET_DBG("ref_id: %x", net_ntohl(pkt->ref_id)); + NET_DBG("ref_tm_s: %x", net_ntohl(pkt->ref_tm_s)); + NET_DBG("ref_tm_f: %x", net_ntohl(pkt->ref_tm_f)); + NET_DBG("orig_tm_s: %x", net_ntohl(pkt->orig_tm_s)); + NET_DBG("orig_tm_f: %x", net_ntohl(pkt->orig_tm_f)); + NET_DBG("rx_tm_s: %x", net_ntohl(pkt->rx_tm_s)); + NET_DBG("rx_tm_f: %x", net_ntohl(pkt->rx_tm_f)); + NET_DBG("tx_tm_s: %x", net_ntohl(pkt->tx_tm_s)); + NET_DBG("tx_tm_f: %x", net_ntohl(pkt->tx_tm_f)); } #if defined(CONFIG_SNTP_UNCERTAINTY) @@ -67,10 +67,11 @@ static int32_t parse_response(uint8_t *data, uint16_t len, struct sntp_time *exp sntp_pkt_dump(pkt); - if (ntohl(pkt->orig_tm_s) != expected_orig_ts->seconds || - ntohl(pkt->orig_tm_f) != expected_orig_ts->fraction) { + if (net_ntohl(pkt->orig_tm_s) != expected_orig_ts->seconds || + net_ntohl(pkt->orig_tm_f) != expected_orig_ts->fraction) { NET_DBG("Mismatch originate timestamp: %d.%09d, expect: %llu.%09u", - ntohl(pkt->orig_tm_s), ntohl(pkt->orig_tm_f), expected_orig_ts->seconds, + net_ntohl(pkt->orig_tm_s), net_ntohl(pkt->orig_tm_f), + expected_orig_ts->seconds, expected_orig_ts->fraction); return -ERANGE; } @@ -89,7 +90,7 @@ static int32_t parse_response(uint8_t *data, uint16_t len, struct sntp_time *exp return -EBUSY; } - if (ntohl(pkt->tx_tm_s) == 0 && ntohl(pkt->tx_tm_f) == 0) { + if (net_ntohl(pkt->tx_tm_s) == 0 && net_ntohl(pkt->tx_tm_f) == 0) { NET_DBG("zero transmit timestamp"); return -EINVAL; } @@ -100,8 +101,8 @@ static int32_t parse_response(uint8_t *data, uint16_t len, struct sntp_time *exp int64_t orig_ts_us = q32_32_s_to_ll_us(expected_orig_ts->seconds, expected_orig_ts->fraction); - int64_t rx_ts_us = q32_32_s_to_ll_us(ntohl(pkt->rx_tm_s), ntohl(pkt->rx_tm_f)); - int64_t tx_ts_us = q32_32_s_to_ll_us(ntohl(pkt->tx_tm_s), ntohl(pkt->tx_tm_f)); + int64_t rx_ts_us = q32_32_s_to_ll_us(net_ntohl(pkt->rx_tm_s), net_ntohl(pkt->rx_tm_f)); + int64_t tx_ts_us = q32_32_s_to_ll_us(net_ntohl(pkt->tx_tm_s), net_ntohl(pkt->tx_tm_f)); if (rx_ts_us > tx_ts_us || orig_ts_us > dest_ts_us) { NET_DBG("Invalid timestamps from SNTP server"); @@ -110,8 +111,8 @@ static int32_t parse_response(uint8_t *data, uint16_t len, struct sntp_time *exp int64_t d_us = (dest_ts_us - orig_ts_us) - (tx_ts_us - rx_ts_us); int64_t clk_offset_us = ((rx_ts_us - orig_ts_us) + (tx_ts_us - dest_ts_us)) / 2; - int64_t root_dispersion_us = q16_16_s_to_ll_us(ntohl(pkt->root_dispersion)); - int64_t root_delay_us = q16_16_s_to_ll_us(ntohl(pkt->root_delay)); + int64_t root_dispersion_us = q16_16_s_to_ll_us(net_ntohl(pkt->root_dispersion)); + int64_t root_delay_us = q16_16_s_to_ll_us(net_ntohl(pkt->root_delay)); uint32_t precision_us; if (pkt->precision <= 0) { @@ -128,10 +129,10 @@ static int32_t parse_response(uint8_t *data, uint16_t len, struct sntp_time *exp res->fraction = (res->uptime_us + clk_offset_us) % USEC_PER_SEC; res->uncertainty_us = (d_us + root_delay_us + precision_us) / 2 + root_dispersion_us; #else - res->fraction = ntohl(pkt->tx_tm_f); - res->seconds = ntohl(pkt->tx_tm_s); + res->fraction = net_ntohl(pkt->tx_tm_f); + res->seconds = net_ntohl(pkt->tx_tm_s); #endif - ts = ntohl(pkt->tx_tm_s); + ts = net_ntohl(pkt->tx_tm_s); /* Check if most significant bit is set */ if (ts & 0x80000000) { @@ -153,7 +154,7 @@ static int32_t parse_response(uint8_t *data, uint16_t len, struct sntp_time *exp return 0; } -int sntp_init(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len) +int sntp_init(struct sntp_ctx *ctx, struct net_sockaddr *addr, net_socklen_t addr_len) { int ret; @@ -163,7 +164,7 @@ int sntp_init(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len) memset(ctx, 0, sizeof(struct sntp_ctx)); - ctx->sock.fd = zsock_socket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP); + ctx->sock.fd = zsock_socket(addr->sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (ctx->sock.fd < 0) { NET_ERR("Failed to create UDP socket %d", errno); return -errno; @@ -201,8 +202,8 @@ static int sntp_query_send(struct sntp_ctx *ctx) ctx->expected_orig_ts.seconds = (uint32_t)(ts.tv_sec + OFFSET_1970_JAN_1); ctx->expected_orig_ts.fraction = (uint32_t)((uint64_t)ts.tv_nsec * UINT32_MAX / NSEC_PER_SEC); - tx_pkt.tx_tm_s = htonl(ctx->expected_orig_ts.seconds); - tx_pkt.tx_tm_f = htonl(ctx->expected_orig_ts.fraction); + tx_pkt.tx_tm_s = net_htonl(ctx->expected_orig_ts.seconds); + tx_pkt.tx_tm_f = net_htonl(ctx->expected_orig_ts.fraction); return zsock_send(ctx->sock.fd, (uint8_t *)&tx_pkt, sizeof(tx_pkt), 0); } @@ -265,7 +266,7 @@ void sntp_close(struct sntp_ctx *ctx) #ifdef CONFIG_NET_SOCKETS_SERVICE -int sntp_init_async(struct sntp_ctx *ctx, struct sockaddr *addr, socklen_t addr_len, +int sntp_init_async(struct sntp_ctx *ctx, struct net_sockaddr *addr, net_socklen_t addr_len, const struct net_socket_service_desc *service) { int ret; diff --git a/subsys/net/lib/sntp/sntp_simple.c b/subsys/net/lib/sntp/sntp_simple.c index cd8d280758516..a17667bea3035 100644 --- a/subsys/net/lib/sntp/sntp_simple.c +++ b/subsys/net/lib/sntp/sntp_simple.c @@ -9,7 +9,7 @@ #include #include -static int sntp_simple_helper(struct sockaddr *addr, socklen_t addr_len, uint32_t timeout, +static int sntp_simple_helper(struct net_sockaddr *addr, net_socklen_t addr_len, uint32_t timeout, struct sntp_time *ts) { int res; @@ -71,7 +71,7 @@ static int sntp_simple_helper(struct sockaddr *addr, socklen_t addr_len, uint32_ return res; } -int sntp_simple_addr(struct sockaddr *addr, socklen_t addr_len, uint32_t timeout, +int sntp_simple_addr(struct net_sockaddr *addr, net_socklen_t addr_len, uint32_t timeout, struct sntp_time *ts) { /* 123 is the standard SNTP port per RFC4330 */ @@ -90,8 +90,8 @@ int sntp_simple(const char *server, uint32_t timeout, struct sntp_time *ts) static struct zsock_addrinfo hints; struct zsock_addrinfo *addr; - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_DGRAM; + hints.ai_family = NET_AF_UNSPEC; + hints.ai_socktype = NET_SOCK_DGRAM; hints.ai_protocol = 0; /* 123 is the standard SNTP port per RFC4330 */ res = net_getaddrinfo_addr_str(server, "123", &hints, &addr); diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig index c676c32ddf15e..4ff216f2796ab 100644 --- a/subsys/net/lib/sockets/Kconfig +++ b/subsys/net/lib/sockets/Kconfig @@ -334,7 +334,7 @@ config NET_SOCKETS_PACKET_DGRAM For AF_PACKET sockets with SOCK_DGRAM type, the L2 header is removed before the packet is passed to the user. Packets sent through a SOCK_DGRAM packet socket get a suitable L2 header based - on the information in the sockaddr_ll destination address before + on the information in the net_sockaddr_ll destination address before they are queued. config NET_SOCKETS_INET_RAW diff --git a/subsys/net/lib/sockets/getaddrinfo.c b/subsys/net/lib/sockets/getaddrinfo.c index 51698f026cc75..fe8debe451cfd 100644 --- a/subsys/net/lib/sockets/getaddrinfo.c +++ b/subsys/net/lib/sockets/getaddrinfo.c @@ -30,7 +30,7 @@ LOG_MODULE_REGISTER(net_sock_addr, CONFIG_NET_SOCKETS_LOG_LEVEL); #endif /* defined(CONFIG_DNS_RESOLVER_AI_MAX_ENTRIES) */ /* Initialize static fields of addrinfo structure. A macro to let it work - * with any sockaddr_* type. + * with any net_sockaddr_* type. */ #define INIT_ADDRINFO(addrinfo, sockaddr) { \ (addrinfo)->ai_addr = &(addrinfo)->_ai_addr; \ @@ -59,7 +59,7 @@ static void dns_resolve_cb(enum dns_resolve_status status, { struct getaddrinfo_state *state = user_data; struct zsock_addrinfo *ai; - int socktype = SOCK_STREAM; + int socktype = NET_SOCK_STREAM; NET_DBG("dns status: %d", status); @@ -98,7 +98,7 @@ static void dns_resolve_cb(enum dns_resolve_status status, } ai->ai_socktype = socktype; - ai->ai_protocol = (socktype == SOCK_DGRAM) ? IPPROTO_UDP : IPPROTO_TCP; + ai->ai_protocol = (socktype == NET_SOCK_DGRAM) ? NET_IPPROTO_UDP : NET_IPPROTO_TCP; state->idx++; } @@ -128,7 +128,7 @@ static int exec_query(const char *host, int family, int timeout_ms; int st, ret; - if (family == AF_INET6) { + if (family == NET_AF_INET6) { qtype = DNS_QUERY_TYPE_AAAA; } @@ -182,35 +182,37 @@ static int exec_query(const char *host, int family, static int getaddrinfo_null_host(int port, const struct zsock_addrinfo *hints, struct zsock_addrinfo *res) { - if (!hints || !(hints->ai_flags & AI_PASSIVE)) { + if (!hints || !(hints->ai_flags & ZSOCK_AI_PASSIVE)) { return DNS_EAI_FAIL; } - /* For AF_UNSPEC, should we default to IPv6 or IPv4? */ - if (hints->ai_family == AF_INET || hints->ai_family == AF_UNSPEC) { - struct sockaddr_in *addr = net_sin(&res->_ai_addr); - addr->sin_addr.s_addr = INADDR_ANY; - addr->sin_port = htons(port); - addr->sin_family = AF_INET; + /* For NET_AF_UNSPEC, should we default to IPv6 or IPv4? */ + if (hints->ai_family == NET_AF_INET || hints->ai_family == NET_AF_UNSPEC) { + struct net_sockaddr_in *addr = net_sin(&res->_ai_addr); + + addr->sin_addr.s_addr = NET_INADDR_ANY; + addr->sin_port = net_htons(port); + addr->sin_family = NET_AF_INET; INIT_ADDRINFO(res, addr); - res->ai_family = AF_INET; - } else if (hints->ai_family == AF_INET6) { - struct sockaddr_in6 *addr6 = net_sin6(&res->_ai_addr); - addr6->sin6_addr = in6addr_any; - addr6->sin6_port = htons(port); - addr6->sin6_family = AF_INET6; + res->ai_family = NET_AF_INET; + } else if (hints->ai_family == NET_AF_INET6) { + struct net_sockaddr_in6 *addr6 = net_sin6(&res->_ai_addr); + + addr6->sin6_addr = net_in6addr_any; + addr6->sin6_port = net_htons(port); + addr6->sin6_family = NET_AF_INET6; INIT_ADDRINFO(res, addr6); - res->ai_family = AF_INET6; + res->ai_family = NET_AF_INET6; } else { return DNS_EAI_FAIL; } - if (hints->ai_socktype == SOCK_DGRAM) { - res->ai_socktype = SOCK_DGRAM; - res->ai_protocol = IPPROTO_UDP; + if (hints->ai_socktype == NET_SOCK_DGRAM) { + res->ai_socktype = NET_SOCK_DGRAM; + res->ai_protocol = NET_IPPROTO_UDP; } else { - res->ai_socktype = SOCK_STREAM; - res->ai_protocol = IPPROTO_TCP; + res->ai_socktype = NET_SOCK_STREAM; + res->ai_protocol = NET_IPPROTO_TCP; } return 0; } @@ -219,23 +221,24 @@ int z_impl_z_zsock_getaddrinfo_internal(const char *host, const char *service, const struct zsock_addrinfo *hints, struct zsock_addrinfo *res) { - int family = AF_UNSPEC; + int family = NET_AF_UNSPEC; int ai_flags = 0; long int port = 0; int st1 = DNS_EAI_ADDRFAMILY, st2 = DNS_EAI_ADDRFAMILY; - struct sockaddr *ai_addr; + struct net_sockaddr *ai_addr; struct getaddrinfo_state ai_state; if (hints) { family = hints->ai_family; ai_flags = hints->ai_flags; - if ((family != AF_UNSPEC) && (family != AF_INET) && (family != AF_INET6)) { + if ((family != NET_AF_UNSPEC) && (family != NET_AF_INET) && + (family != NET_AF_INET6)) { return DNS_EAI_ADDRFAMILY; } } - if (ai_flags & AI_NUMERICHOST) { + if (ai_flags & ZSOCK_AI_NUMERICHOST) { /* Asked to resolve host as numeric, but it wasn't possible * to do that. */ @@ -261,26 +264,26 @@ int z_impl_z_zsock_getaddrinfo_internal(const char *host, const char *service, ai_state.hints = hints; ai_state.idx = 0U; - ai_state.port = htons(port); + ai_state.port = net_htons(port); ai_state.ai_arr = res; ai_state.dns_id = 0; k_sem_init(&ai_state.sem, 0, K_SEM_MAX_LIMIT); - /* If family is AF_UNSPEC, then we query IPv4 address first + /* If family is NET_AF_UNSPEC, then we query IPv4 address first * if IPv4 is enabled in the config. */ - if ((family != AF_INET6) && IS_ENABLED(CONFIG_NET_IPV4)) { - st1 = exec_query(host, AF_INET, &ai_state); + if ((family != NET_AF_INET6) && IS_ENABLED(CONFIG_NET_IPV4)) { + st1 = exec_query(host, NET_AF_INET, &ai_state); if (st1 == DNS_EAI_AGAIN) { return st1; } } - /* If family is AF_UNSPEC, the IPv4 query has been already done + /* If family is NET_AF_UNSPEC, the IPv4 query has been already done * so we can do IPv6 query next if IPv6 is enabled in the config. */ - if ((family != AF_INET) && IS_ENABLED(CONFIG_NET_IPV6)) { - st2 = exec_query(host, AF_INET6, &ai_state); + if ((family != NET_AF_INET) && IS_ENABLED(CONFIG_NET_IPV6)) { + st2 = exec_query(host, NET_AF_INET6, &ai_state); if (st2 == DNS_EAI_AGAIN) { return st2; } @@ -288,7 +291,7 @@ int z_impl_z_zsock_getaddrinfo_internal(const char *host, const char *service, for (uint16_t idx = 0; idx < ai_state.idx; idx++) { ai_addr = &ai_state.ai_arr[idx]._ai_addr; - net_sin(ai_addr)->sin_port = htons(port); + net_sin(ai_addr)->sin_port = net_htons(port); } /* If both attempts failed, it's error */ @@ -356,12 +359,12 @@ static int try_resolve_literal_addr(const char *host, const char *service, const struct zsock_addrinfo *hints, struct zsock_addrinfo *res) { - int family = AF_UNSPEC; - int resolved_family = AF_UNSPEC; + int family = NET_AF_UNSPEC; + int resolved_family = NET_AF_UNSPEC; long port = 0; bool result; - int socktype = SOCK_STREAM; - int protocol = IPPROTO_TCP; + int socktype = NET_SOCK_STREAM; + int protocol = NET_IPPROTO_TCP; if (!host) { return DNS_EAI_NONAME; @@ -369,9 +372,9 @@ static int try_resolve_literal_addr(const char *host, const char *service, if (hints) { family = hints->ai_family; - if (hints->ai_socktype == SOCK_DGRAM) { - socktype = SOCK_DGRAM; - protocol = IPPROTO_UDP; + if (hints->ai_socktype == NET_SOCK_DGRAM) { + socktype = NET_SOCK_DGRAM; + protocol = NET_IPPROTO_UDP; } } @@ -383,7 +386,7 @@ static int try_resolve_literal_addr(const char *host, const char *service, resolved_family = res->_ai_addr.sa_family; - if ((family != AF_UNSPEC) && (resolved_family != family)) { + if ((family != NET_AF_UNSPEC) && (resolved_family != family)) { return DNS_EAI_NONAME; } @@ -399,25 +402,25 @@ static int try_resolve_literal_addr(const char *host, const char *service, res->ai_protocol = protocol; switch (resolved_family) { - case AF_INET: + case NET_AF_INET: { - struct sockaddr_in *addr = - (struct sockaddr_in *)&res->_ai_addr; + struct net_sockaddr_in *addr = + (struct net_sockaddr_in *)&res->_ai_addr; INIT_ADDRINFO(res, addr); - addr->sin_port = htons(port); - addr->sin_family = AF_INET; + addr->sin_port = net_htons(port); + addr->sin_family = NET_AF_INET; break; } - case AF_INET6: + case NET_AF_INET6: { - struct sockaddr_in6 *addr = - (struct sockaddr_in6 *)&res->_ai_addr; + struct net_sockaddr_in6 *addr = + (struct net_sockaddr_in6 *)&res->_ai_addr; INIT_ADDRINFO(res, addr); - addr->sin6_port = htons(port); - addr->sin6_family = AF_INET6; + addr->sin6_port = net_htons(port); + addr->sin6_family = NET_AF_INET6; break; } diff --git a/subsys/net/lib/sockets/getnameinfo.c b/subsys/net/lib/sockets/getnameinfo.c index 0c96b1e4e546f..b03dd8f1bd966 100644 --- a/subsys/net/lib/sockets/getnameinfo.c +++ b/subsys/net/lib/sockets/getnameinfo.c @@ -8,12 +8,12 @@ #include #include -int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen, - char *host, socklen_t hostlen, - char *serv, socklen_t servlen, int flags) +int zsock_getnameinfo(const struct net_sockaddr *addr, net_socklen_t addrlen, + char *host, net_socklen_t hostlen, + char *serv, net_socklen_t servlen, int flags) { - /* Both sockaddr_in & _in6 have same offsets for family and address. */ - struct sockaddr_in *a = (struct sockaddr_in *)addr; + /* Both net_sockaddr_in & _in6 have same offsets for family and address. */ + struct net_sockaddr_in *a = (struct net_sockaddr_in *)addr; if (host != NULL) { void *res = zsock_inet_ntop(a->sin_family, &a->sin_addr, @@ -25,7 +25,7 @@ int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen, } if (serv != NULL) { - snprintk(serv, servlen, "%hu", ntohs(a->sin_port)); + snprintk(serv, servlen, "%hu", net_ntohs(a->sin_port)); } return 0; diff --git a/subsys/net/lib/sockets/socket_dispatcher.c b/subsys/net/lib/sockets/socket_dispatcher.c index c37e929ffa91a..4a4a1329ea5df 100644 --- a/subsys/net/lib/sockets/socket_dispatcher.c +++ b/subsys/net/lib/sockets/socket_dispatcher.c @@ -29,8 +29,8 @@ static int sock_dispatch_create(int family, int type, int proto); static bool is_tls(int proto) { - if ((proto >= IPPROTO_TLS_1_0 && proto <= IPPROTO_TLS_1_2) || - (proto >= IPPROTO_DTLS_1_0 && proto <= IPPROTO_DTLS_1_2)) { + if ((proto >= NET_IPPROTO_TLS_1_0 && proto <= NET_IPPROTO_TLS_1_2) || + (proto >= NET_IPPROTO_DTLS_1_0 && proto <= NET_IPPROTO_DTLS_1_2)) { return true; } @@ -93,7 +93,7 @@ static struct net_socket_register *sock_dispatch_find(int family, int type, } if (sock_family->family != family && - sock_family->family != AF_UNSPEC) { + sock_family->family != NET_AF_UNSPEC) { continue; } @@ -212,8 +212,8 @@ static int sock_dispatch_shutdown_vmeth(void *obj, int how) return zsock_shutdown(fd, how); } -static int sock_dispatch_bind_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int sock_dispatch_bind_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int fd = sock_dispatch_default(obj); @@ -224,8 +224,8 @@ static int sock_dispatch_bind_vmeth(void *obj, const struct sockaddr *addr, return zsock_bind(fd, addr, addrlen); } -static int sock_dispatch_connect_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int sock_dispatch_connect_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int fd = sock_dispatch_default(obj); @@ -247,8 +247,8 @@ static int sock_dispatch_listen_vmeth(void *obj, int backlog) return zsock_listen(fd, backlog); } -static int sock_dispatch_accept_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int sock_dispatch_accept_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int fd = sock_dispatch_default(obj); @@ -261,8 +261,8 @@ static int sock_dispatch_accept_vmeth(void *obj, struct sockaddr *addr, static ssize_t sock_dispatch_sendto_vmeth(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *addr, - socklen_t addrlen) + const struct net_sockaddr *addr, + net_socklen_t addrlen) { int fd = sock_dispatch_default(obj); @@ -273,7 +273,7 @@ static ssize_t sock_dispatch_sendto_vmeth(void *obj, const void *buf, return zsock_sendto(fd, buf, len, flags, addr, addrlen); } -static ssize_t sock_dispatch_sendmsg_vmeth(void *obj, const struct msghdr *msg, +static ssize_t sock_dispatch_sendmsg_vmeth(void *obj, const struct net_msghdr *msg, int flags) { int fd = sock_dispatch_default(obj); @@ -287,8 +287,8 @@ static ssize_t sock_dispatch_sendmsg_vmeth(void *obj, const struct msghdr *msg, static ssize_t sock_dispatch_recvfrom_vmeth(void *obj, void *buf, size_t max_len, int flags, - struct sockaddr *addr, - socklen_t *addrlen) + struct net_sockaddr *addr, + net_socklen_t *addrlen) { int fd = sock_dispatch_default(obj); @@ -300,7 +300,7 @@ static ssize_t sock_dispatch_recvfrom_vmeth(void *obj, void *buf, } static int sock_dispatch_getsockopt_vmeth(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int fd = sock_dispatch_default(obj); @@ -312,13 +312,13 @@ static int sock_dispatch_getsockopt_vmeth(void *obj, int level, int optname, } static int sock_dispatch_setsockopt_vmeth(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int fd; - if ((level == SOL_SOCKET) && (optname == SO_BINDTODEVICE)) { + if ((level == ZSOCK_SOL_SOCKET) && (optname == ZSOCK_SO_BINDTODEVICE)) { struct net_if *iface; - const struct ifreq *ifreq = optval; + const struct net_ifreq *ifreq = optval; if ((ifreq == NULL) || (optlen != sizeof(*ifreq))) { errno = EINVAL; @@ -362,7 +362,7 @@ static int sock_dispatch_setsockopt_vmeth(void *obj, int level, int optname, /* Native interface - use native socket implementation. */ fd = sock_dispatch_native(obj); } - } else if ((level == SOL_TLS) && (optname == TLS_NATIVE)) { + } else if ((level == ZSOCK_SOL_TLS) && (optname == ZSOCK_TLS_NATIVE)) { const int *tls_native = optval; struct dispatcher_context *ctx = obj; @@ -402,8 +402,8 @@ static int sock_dispatch_close_vmeth(void *obj, int fd) return 0; } -static int sock_dispatch_getpeername_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int sock_dispatch_getpeername_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int fd = sock_dispatch_default(obj); @@ -414,8 +414,8 @@ static int sock_dispatch_getpeername_vmeth(void *obj, struct sockaddr *addr, return zsock_getpeername(fd, addr, addrlen); } -static int sock_dispatch_getsockname_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int sock_dispatch_getsockname_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int fd = sock_dispatch_default(obj); @@ -497,5 +497,5 @@ static bool is_supported(int family, int type, int proto) return true; } -NET_SOCKET_REGISTER(sock_dispatch, 0, AF_UNSPEC, is_supported, +NET_SOCKET_REGISTER(sock_dispatch, 0, NET_AF_UNSPEC, is_supported, sock_dispatch_create); diff --git a/subsys/net/lib/sockets/socket_obj_core.c b/subsys/net/lib/sockets/socket_obj_core.c index 7138b63fcdd42..de484b9b6850a 100644 --- a/subsys/net/lib/sockets/socket_obj_core.c +++ b/subsys/net/lib/sockets/socket_obj_core.c @@ -161,7 +161,7 @@ int sock_obj_core_alloc(int sock, struct net_socket_register *reg, int sock_obj_core_alloc_find(int sock, int new_sock, int type) { struct net_socket_register *reg = NULL; - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); int family; int ret; diff --git a/subsys/net/lib/sockets/socketpair.c b/subsys/net/lib/sockets/socketpair.c index d7fbe6e162306..409a5f25b7600 100644 --- a/subsys/net/lib/sockets/socketpair.c +++ b/subsys/net/lib/sockets/socketpair.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -285,13 +284,13 @@ int z_impl_zsock_socketpair(int family, int type, int proto, int *sv) SYS_PORT_TRACING_FUNC_ENTER(socket, socketpair, family, type, proto, sv); - if (family != AF_UNIX) { + if (family != NET_AF_UNIX) { errno = EAFNOSUPPORT; res = -1; goto errout; } - if (type != SOCK_STREAM) { + if (type != NET_SOCK_STREAM) { errno = EPROTOTYPE; res = -1; goto errout; @@ -929,19 +928,19 @@ static int spair_ioctl(void *obj, unsigned int request, va_list args) have_local_sem = true; switch (request) { - case F_GETFL: { + case ZVFS_F_GETFL: { if (sock_is_nonblock(spair)) { - flags |= O_NONBLOCK; + flags |= ZVFS_O_NONBLOCK; } res = flags; goto out; } - case F_SETFL: { + case ZVFS_F_SETFL: { flags = va_arg(args, int); - if (flags & O_NONBLOCK) { + if (flags & ZVFS_O_NONBLOCK) { spair->flags |= SPAIR_FLAG_NONBLOCK; } else { spair->flags &= ~SPAIR_FLAG_NONBLOCK; @@ -999,8 +998,8 @@ static int spair_ioctl(void *obj, unsigned int request, va_list args) return res; } -static int spair_bind(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int spair_bind(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { ARG_UNUSED(obj); ARG_UNUSED(addr); @@ -1010,8 +1009,8 @@ static int spair_bind(void *obj, const struct sockaddr *addr, return -1; } -static int spair_connect(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int spair_connect(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { ARG_UNUSED(obj); ARG_UNUSED(addr); @@ -1030,8 +1029,8 @@ static int spair_listen(void *obj, int backlog) return -1; } -static int spair_accept(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int spair_accept(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { ARG_UNUSED(obj); ARG_UNUSED(addr); @@ -1042,8 +1041,8 @@ static int spair_accept(void *obj, struct sockaddr *addr, } static ssize_t spair_sendto(void *obj, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen) + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { ARG_UNUSED(flags); ARG_UNUSED(dest_addr); @@ -1052,7 +1051,7 @@ static ssize_t spair_sendto(void *obj, const void *buf, size_t len, return spair_write(obj, buf, len); } -static ssize_t spair_sendmsg(void *obj, const struct msghdr *msg, +static ssize_t spair_sendmsg(void *obj, const struct net_msghdr *msg, int flags) { ARG_UNUSED(flags); @@ -1112,8 +1111,8 @@ static ssize_t spair_sendmsg(void *obj, const struct msghdr *msg, } static ssize_t spair_recvfrom(void *obj, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { (void)flags; (void)src_addr; @@ -1136,7 +1135,7 @@ static ssize_t spair_recvfrom(void *obj, void *buf, size_t max_len, } static int spair_getsockopt(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { ARG_UNUSED(obj); ARG_UNUSED(level); @@ -1149,7 +1148,7 @@ static int spair_getsockopt(void *obj, int level, int optname, } static int spair_setsockopt(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { ARG_UNUSED(obj); ARG_UNUSED(level); diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c index 441ed438472b4..2dd83dd1da1f4 100644 --- a/subsys/net/lib/sockets/sockets.c +++ b/subsys/net/lib/sockets/sockets.c @@ -74,7 +74,7 @@ static inline void *get_sock_vtable(int sock, return ctx; } -size_t msghdr_non_empty_iov_count(const struct msghdr *msg) +size_t msghdr_non_empty_iov_count(const struct net_msghdr *msg) { size_t non_empty_iov_count = 0; @@ -110,7 +110,7 @@ int z_impl_zsock_socket(int family, int type, int proto) int ret; if (sock_family->family != family && - sock_family->family != AF_UNSPEC) { + sock_family->family != NET_AF_UNSPEC) { continue; } @@ -215,7 +215,7 @@ static inline int z_vrfy_zsock_shutdown(int sock, int how) #include #endif /* CONFIG_USERSPACE */ -int z_impl_zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen) +int z_impl_zsock_bind(int sock, const struct net_sockaddr *addr, net_socklen_t addrlen) { int ret; @@ -229,22 +229,22 @@ int z_impl_zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen) } #ifdef CONFIG_USERSPACE -static inline int z_vrfy_zsock_bind(int sock, const struct sockaddr *addr, - socklen_t addrlen) +static inline int z_vrfy_zsock_bind(int sock, const struct net_sockaddr *addr, + net_socklen_t addrlen) { - struct sockaddr_storage dest_addr_copy; + struct net_sockaddr_storage dest_addr_copy; K_OOPS(K_SYSCALL_VERIFY(addrlen <= sizeof(dest_addr_copy))); K_OOPS(k_usermode_from_copy(&dest_addr_copy, (void *)addr, addrlen)); - return z_impl_zsock_bind(sock, (struct sockaddr *)&dest_addr_copy, + return z_impl_zsock_bind(sock, (struct net_sockaddr *)&dest_addr_copy, addrlen); } #include #endif /* CONFIG_USERSPACE */ -int z_impl_zsock_connect(int sock, const struct sockaddr *addr, - socklen_t addrlen) +int z_impl_zsock_connect(int sock, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int ret; @@ -258,15 +258,15 @@ int z_impl_zsock_connect(int sock, const struct sockaddr *addr, } #ifdef CONFIG_USERSPACE -int z_vrfy_zsock_connect(int sock, const struct sockaddr *addr, - socklen_t addrlen) +int z_vrfy_zsock_connect(int sock, const struct net_sockaddr *addr, + net_socklen_t addrlen) { - struct sockaddr_storage dest_addr_copy; + struct net_sockaddr_storage dest_addr_copy; K_OOPS(K_SYSCALL_VERIFY(addrlen <= sizeof(dest_addr_copy))); K_OOPS(k_usermode_from_copy(&dest_addr_copy, (void *)addr, addrlen)); - return z_impl_zsock_connect(sock, (struct sockaddr *)&dest_addr_copy, + return z_impl_zsock_connect(sock, (struct net_sockaddr *)&dest_addr_copy, addrlen); } #include @@ -293,7 +293,7 @@ static inline int z_vrfy_zsock_listen(int sock, int backlog) #include #endif /* CONFIG_USERSPACE */ -int z_impl_zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen) +int z_impl_zsock_accept(int sock, struct net_sockaddr *addr, net_socklen_t *addrlen) { int new_sock; @@ -304,27 +304,27 @@ int z_impl_zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen) SYS_PORT_TRACING_OBJ_FUNC_EXIT(socket, accept, new_sock, addr, addrlen, new_sock < 0 ? -errno : 0); - (void)sock_obj_core_alloc_find(sock, new_sock, SOCK_STREAM); + (void)sock_obj_core_alloc_find(sock, new_sock, NET_SOCK_STREAM); return new_sock; } #ifdef CONFIG_USERSPACE -static inline int z_vrfy_zsock_accept(int sock, struct sockaddr *addr, - socklen_t *addrlen) +static inline int z_vrfy_zsock_accept(int sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { - socklen_t addrlen_copy; + net_socklen_t addrlen_copy; int ret; K_OOPS(addrlen && k_usermode_from_copy(&addrlen_copy, addrlen, - sizeof(socklen_t))); + sizeof(net_socklen_t))); K_OOPS(addr && K_SYSCALL_MEMORY_WRITE(addr, addrlen ? addrlen_copy : 0)); - ret = z_impl_zsock_accept(sock, (struct sockaddr *)addr, + ret = z_impl_zsock_accept(sock, (struct net_sockaddr *)addr, addrlen ? &addrlen_copy : NULL); K_OOPS(ret >= 0 && addrlen && k_usermode_to_copy(addrlen, &addrlen_copy, - sizeof(socklen_t))); + sizeof(net_socklen_t))); return ret; } @@ -332,7 +332,7 @@ static inline int z_vrfy_zsock_accept(int sock, struct sockaddr *addr, #endif /* CONFIG_USERSPACE */ ssize_t z_impl_zsock_sendto(int sock, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, net_socklen_t addrlen) { int bytes_sent; @@ -351,9 +351,9 @@ ssize_t z_impl_zsock_sendto(int sock, const void *buf, size_t len, int flags, #ifdef CONFIG_USERSPACE ssize_t z_vrfy_zsock_sendto(int sock, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, net_socklen_t addrlen) { - struct sockaddr_storage dest_addr_copy; + struct net_sockaddr_storage dest_addr_copy; K_OOPS(K_SYSCALL_MEMORY_READ(buf, len)); if (dest_addr) { @@ -363,13 +363,13 @@ ssize_t z_vrfy_zsock_sendto(int sock, const void *buf, size_t len, int flags, } return z_impl_zsock_sendto(sock, (const void *)buf, len, flags, - dest_addr ? (struct sockaddr *)&dest_addr_copy : NULL, + dest_addr ? (struct net_sockaddr *)&dest_addr_copy : NULL, addrlen); } #include #endif /* CONFIG_USERSPACE */ -ssize_t z_impl_zsock_sendmsg(int sock, const struct msghdr *msg, int flags) +ssize_t z_impl_zsock_sendmsg(int sock, const struct net_msghdr *msg, int flags) { int bytes_sent; @@ -387,10 +387,10 @@ ssize_t z_impl_zsock_sendmsg(int sock, const struct msghdr *msg, int flags) #ifdef CONFIG_USERSPACE static inline ssize_t z_vrfy_zsock_sendmsg(int sock, - const struct msghdr *msg, + const struct net_msghdr *msg, int flags) { - struct msghdr msg_copy; + struct net_msghdr msg_copy; size_t i; int ret; @@ -400,7 +400,7 @@ static inline ssize_t z_vrfy_zsock_sendmsg(int sock, msg_copy.msg_control = NULL; msg_copy.msg_iov = k_usermode_alloc_from_copy(msg->msg_iov, - msg->msg_iovlen * sizeof(struct iovec)); + msg->msg_iovlen * sizeof(struct net_iovec)); if (!msg_copy.msg_iov) { errno = ENOMEM; goto fail; @@ -436,7 +436,7 @@ static inline ssize_t z_vrfy_zsock_sendmsg(int sock, } } - ret = z_impl_zsock_sendmsg(sock, (const struct msghdr *)&msg_copy, + ret = z_impl_zsock_sendmsg(sock, (const struct net_msghdr *)&msg_copy, flags); k_free(msg_copy.msg_name); @@ -475,7 +475,7 @@ static inline ssize_t z_vrfy_zsock_sendmsg(int sock, #endif /* CONFIG_USERSPACE */ ssize_t z_impl_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, net_socklen_t *addrlen) { int bytes_received; @@ -494,9 +494,9 @@ ssize_t z_impl_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags, #ifdef CONFIG_USERSPACE ssize_t z_vrfy_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, net_socklen_t *addrlen) { - socklen_t addrlen_copy; + net_socklen_t addrlen_copy; ssize_t ret; if (K_SYSCALL_MEMORY_WRITE(buf, max_len)) { @@ -506,17 +506,17 @@ ssize_t z_vrfy_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags, if (addrlen) { K_OOPS(k_usermode_from_copy(&addrlen_copy, addrlen, - sizeof(socklen_t))); + sizeof(net_socklen_t))); } K_OOPS(src_addr && K_SYSCALL_MEMORY_WRITE(src_addr, addrlen_copy)); ret = z_impl_zsock_recvfrom(sock, (void *)buf, max_len, flags, - (struct sockaddr *)src_addr, + (struct net_sockaddr *)src_addr, addrlen ? &addrlen_copy : NULL); if (addrlen) { K_OOPS(k_usermode_to_copy(addrlen, &addrlen_copy, - sizeof(socklen_t))); + sizeof(net_socklen_t))); } return ret; @@ -524,7 +524,7 @@ ssize_t z_vrfy_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags, #include #endif /* CONFIG_USERSPACE */ -ssize_t z_impl_zsock_recvmsg(int sock, struct msghdr *msg, int flags) +ssize_t z_impl_zsock_recvmsg(int sock, struct net_msghdr *msg, int flags) { int bytes_received; @@ -541,9 +541,9 @@ ssize_t z_impl_zsock_recvmsg(int sock, struct msghdr *msg, int flags) } #ifdef CONFIG_USERSPACE -ssize_t z_vrfy_zsock_recvmsg(int sock, struct msghdr *msg, int flags) +ssize_t z_vrfy_zsock_recvmsg(int sock, struct net_msghdr *msg, int flags) { - struct msghdr msg_copy; + struct net_msghdr msg_copy; size_t iovlen; size_t i; int ret; @@ -566,7 +566,7 @@ ssize_t z_vrfy_zsock_recvmsg(int sock, struct msghdr *msg, int flags) msg_copy.msg_control = NULL; msg_copy.msg_iov = k_usermode_alloc_from_copy(msg->msg_iov, - msg->msg_iovlen * sizeof(struct iovec)); + msg->msg_iovlen * sizeof(struct net_iovec)); if (!msg_copy.msg_iov) { errno = ENOMEM; goto fail; @@ -576,7 +576,7 @@ ssize_t z_vrfy_zsock_recvmsg(int sock, struct msghdr *msg, int flags) * next loop fails, we do not try to free non allocated memory * in fail branch. */ - memset(msg_copy.msg_iov, 0, msg->msg_iovlen * sizeof(struct iovec)); + memset(msg_copy.msg_iov, 0, msg->msg_iovlen * sizeof(struct net_iovec)); for (i = 0; i < iovlen; i++) { /* TODO: In practice we do not need to copy the actual data @@ -805,7 +805,7 @@ static inline int z_vrfy_zsock_ioctl_impl(int sock, unsigned long request, va_li #include #endif -int z_impl_zsock_inet_pton(sa_family_t family, const char *src, void *dst) +int z_impl_zsock_inet_pton(net_sa_family_t family, const char *src, void *dst) { if (net_addr_pton(family, src, dst) == 0) { return 1; @@ -815,20 +815,20 @@ int z_impl_zsock_inet_pton(sa_family_t family, const char *src, void *dst) } #ifdef CONFIG_USERSPACE -static inline int z_vrfy_zsock_inet_pton(sa_family_t family, +static inline int z_vrfy_zsock_inet_pton(net_sa_family_t family, const char *src, void *dst) { int dst_size; char src_copy[NET_IPV6_ADDR_LEN]; - char dst_copy[sizeof(struct in6_addr)]; + char dst_copy[sizeof(struct net_in6_addr)]; int ret; switch (family) { - case AF_INET: - dst_size = sizeof(struct in_addr); + case NET_AF_INET: + dst_size = sizeof(struct net_in_addr); break; - case AF_INET6: - dst_size = sizeof(struct in6_addr); + case NET_AF_INET6: + dst_size = sizeof(struct net_in6_addr); break; default: errno = EAFNOSUPPORT; @@ -845,7 +845,7 @@ static inline int z_vrfy_zsock_inet_pton(sa_family_t family, #endif int z_impl_zsock_getsockopt(int sock, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int ret; @@ -860,9 +860,9 @@ int z_impl_zsock_getsockopt(int sock, int level, int optname, #ifdef CONFIG_USERSPACE int z_vrfy_zsock_getsockopt(int sock, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { - socklen_t kernel_optlen = *(socklen_t *)optlen; + net_socklen_t kernel_optlen = *(net_socklen_t *)optlen; void *kernel_optval; int ret; @@ -880,7 +880,7 @@ int z_vrfy_zsock_getsockopt(int sock, int level, int optname, K_OOPS(k_usermode_to_copy((void *)optval, kernel_optval, kernel_optlen)); K_OOPS(k_usermode_to_copy((void *)optlen, &kernel_optlen, - sizeof(socklen_t))); + sizeof(net_socklen_t))); k_free(kernel_optval); @@ -890,7 +890,7 @@ int z_vrfy_zsock_getsockopt(int sock, int level, int optname, #endif /* CONFIG_USERSPACE */ int z_impl_zsock_setsockopt(int sock, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int ret; @@ -906,7 +906,7 @@ int z_impl_zsock_setsockopt(int sock, int level, int optname, #ifdef CONFIG_USERSPACE int z_vrfy_zsock_setsockopt(int sock, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { void *kernel_optval; int ret; @@ -924,8 +924,8 @@ int z_vrfy_zsock_setsockopt(int sock, int level, int optname, #include #endif /* CONFIG_USERSPACE */ -int z_impl_zsock_getpeername(int sock, struct sockaddr *addr, - socklen_t *addrlen) +int z_impl_zsock_getpeername(int sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int ret; @@ -940,26 +940,26 @@ int z_impl_zsock_getpeername(int sock, struct sockaddr *addr, } #ifdef CONFIG_USERSPACE -static inline int z_vrfy_zsock_getpeername(int sock, struct sockaddr *addr, - socklen_t *addrlen) +static inline int z_vrfy_zsock_getpeername(int sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { - socklen_t addrlen_copy; + net_socklen_t addrlen_copy; int ret; K_OOPS(k_usermode_from_copy(&addrlen_copy, (void *)addrlen, - sizeof(socklen_t))); + sizeof(net_socklen_t))); if (K_SYSCALL_MEMORY_WRITE(addr, addrlen_copy)) { errno = EFAULT; return -1; } - ret = z_impl_zsock_getpeername(sock, (struct sockaddr *)addr, + ret = z_impl_zsock_getpeername(sock, (struct net_sockaddr *)addr, &addrlen_copy); if (ret == 0 && k_usermode_to_copy((void *)addrlen, &addrlen_copy, - sizeof(socklen_t))) { + sizeof(net_socklen_t))) { errno = EINVAL; return -1; } @@ -969,8 +969,8 @@ static inline int z_vrfy_zsock_getpeername(int sock, struct sockaddr *addr, #include #endif /* CONFIG_USERSPACE */ -int z_impl_zsock_getsockname(int sock, struct sockaddr *addr, - socklen_t *addrlen) +int z_impl_zsock_getsockname(int sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { int ret; @@ -985,26 +985,26 @@ int z_impl_zsock_getsockname(int sock, struct sockaddr *addr, } #ifdef CONFIG_USERSPACE -static inline int z_vrfy_zsock_getsockname(int sock, struct sockaddr *addr, - socklen_t *addrlen) +static inline int z_vrfy_zsock_getsockname(int sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { - socklen_t addrlen_copy; + net_socklen_t addrlen_copy; int ret; K_OOPS(k_usermode_from_copy(&addrlen_copy, (void *)addrlen, - sizeof(socklen_t))); + sizeof(net_socklen_t))); if (K_SYSCALL_MEMORY_WRITE(addr, addrlen_copy)) { errno = EFAULT; return -1; } - ret = z_impl_zsock_getsockname(sock, (struct sockaddr *)addr, + ret = z_impl_zsock_getsockname(sock, (struct net_sockaddr *)addr, &addrlen_copy); if (ret == 0 && k_usermode_to_copy((void *)addrlen, &addrlen_copy, - sizeof(socklen_t))) { + sizeof(net_socklen_t))) { errno = EINVAL; return -1; } diff --git a/subsys/net/lib/sockets/sockets_can.c b/subsys/net/lib/sockets/sockets_can.c index 70659c0284108..36926f21cf9d6 100644 --- a/subsys/net/lib/sockets/sockets_can.c +++ b/subsys/net/lib/sockets/sockets_can.c @@ -6,7 +6,6 @@ */ #include -#include #include LOG_MODULE_REGISTER(net_sock_can, CONFIG_NET_SOCKETS_LOG_LEVEL); @@ -186,14 +185,14 @@ static void zcan_received_cb(struct net_context *ctx, struct net_pkt *pkt, } } -static int zcan_bind_ctx(struct net_context *ctx, const struct sockaddr *addr, - socklen_t addrlen) +static int zcan_bind_ctx(struct net_context *ctx, const struct net_sockaddr *addr, + net_socklen_t addrlen) { - struct sockaddr_can *can_addr = (struct sockaddr_can *)addr; + struct net_sockaddr_can *can_addr = (struct net_sockaddr_can *)addr; struct net_if *iface; int ret; - if (addrlen != sizeof(struct sockaddr_can)) { + if (addrlen != sizeof(struct net_sockaddr_can)) { return -EINVAL; } @@ -223,10 +222,10 @@ static int zcan_bind_ctx(struct net_context *ctx, const struct sockaddr *addr, } ssize_t zcan_sendto_ctx(struct net_context *ctx, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen) + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { - struct sockaddr_can can_addr; + struct net_sockaddr_can can_addr; struct can_frame zframe; k_timeout_t timeout = K_FOREVER; int ret; @@ -245,16 +244,16 @@ ssize_t zcan_sendto_ctx(struct net_context *ctx, const void *buf, size_t len, } if (addrlen == 0) { - addrlen = sizeof(struct sockaddr_can); + addrlen = sizeof(struct net_sockaddr_can); } if (dest_addr == NULL) { memset(&can_addr, 0, sizeof(can_addr)); can_addr.can_ifindex = -1; - can_addr.can_family = AF_CAN; + can_addr.can_family = NET_AF_CAN; - dest_addr = (struct sockaddr *)&can_addr; + dest_addr = (struct net_sockaddr *)&can_addr; } NET_ASSERT(len == sizeof(struct socketcan_frame)); @@ -274,8 +273,8 @@ ssize_t zcan_sendto_ctx(struct net_context *ctx, const void *buf, size_t len, static ssize_t zcan_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { struct can_frame zframe; size_t recv_len = 0; @@ -345,7 +344,7 @@ static ssize_t zcan_recvfrom_ctx(struct net_context *ctx, void *buf, } static int zcan_getsockopt_ctx(struct net_context *ctx, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { if (!optval || !optlen) { errno = EINVAL; @@ -357,7 +356,7 @@ static int zcan_getsockopt_ctx(struct net_context *ctx, int level, int optname, } static int zcan_setsockopt_ctx(struct net_context *ctx, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { return sock_fd_op_vtable.setsockopt(ctx, level, optname, optval, optlen); @@ -466,15 +465,15 @@ static int can_sock_ioctl_vmeth(void *obj, unsigned int request, va_list args) /* * TODO: A CAN socket can be bound to a network device using SO_BINDTODEVICE. */ -static int can_sock_bind_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int can_sock_bind_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return zcan_bind_ctx(obj, addr, addrlen); } /* The connect() function is no longer necessary. */ -static int can_sock_connect_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int can_sock_connect_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return 0; } @@ -489,32 +488,32 @@ static int can_sock_listen_vmeth(void *obj, int backlog) return 0; } -static int can_sock_accept_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int can_sock_accept_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { return 0; } static ssize_t can_sock_sendto_vmeth(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { return zcan_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen); } static ssize_t can_sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { return zcan_recvfrom_ctx(obj, buf, max_len, flags, src_addr, addrlen); } static int can_sock_getsockopt_vmeth(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { - if (level == SOL_CAN_RAW) { + if (level == NET_SOL_CAN_RAW) { const struct canbus_api *api; struct net_if *iface; const struct device *dev; @@ -622,21 +621,21 @@ static void can_unregister_filters(struct net_if *iface, } static int can_sock_setsockopt_vmeth(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { const struct canbus_api *api; struct net_if *iface; const struct device *dev; int ret; - if (level != SOL_CAN_RAW) { + if (level != NET_SOL_CAN_RAW) { return zcan_setsockopt_ctx(obj, level, optname, optval, optlen); } /* The application must use CAN_filter and then we convert * it to zcan_filter as the CANBUS drivers expects that. */ - if (optname == CAN_RAW_FILTER && optlen != sizeof(struct socketcan_filter)) { + if (optname == NET_CAN_RAW_FILTER && optlen != sizeof(struct socketcan_filter)) { errno = EINVAL; return -1; } @@ -655,7 +654,7 @@ static int can_sock_setsockopt_vmeth(void *obj, int level, int optname, return -1; } - if (optname == CAN_RAW_FILTER) { + if (optname == NET_CAN_RAW_FILTER) { int count, i; if (optlen % sizeof(struct socketcan_filter) != 0) { @@ -727,12 +726,12 @@ static const struct socket_op_vtable can_sock_fd_op_vtable = { static bool can_is_supported(int family, int type, int proto) { - if (type != SOCK_RAW || proto != CAN_RAW) { + if (type != NET_SOCK_RAW || proto != NET_CAN_RAW) { return false; } return true; } -NET_SOCKET_REGISTER(af_can, NET_SOCKET_DEFAULT_PRIO, AF_CAN, can_is_supported, +NET_SOCKET_REGISTER(af_can, NET_SOCKET_DEFAULT_PRIO, NET_AF_CAN, can_is_supported, zcan_socket); diff --git a/subsys/net/lib/sockets/sockets_inet.c b/subsys/net/lib/sockets/sockets_inet.c index 21a99841d1b16..d54557c79876f 100644 --- a/subsys/net/lib/sockets/sockets_inet.c +++ b/subsys/net/lib/sockets/sockets_inet.c @@ -19,7 +19,6 @@ LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL); #include #include #include -#include #include #include #include @@ -38,11 +37,11 @@ LOG_MODULE_DECLARE(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL); #include "../../ip/net_private.h" #if defined(CONFIG_NET_SOCKETS_INET_RAW) -BUILD_ASSERT(IPPROTO_IP == 0, "Wildcard IPPROTO_IP must equal 0."); +BUILD_ASSERT(NET_IPPROTO_IP == 0, "Wildcard IPPROTO_IP must equal 0."); #endif -BUILD_ASSERT(sizeof(socklen_t) == sizeof(uint32_t), - "socklen_t must be 32-bit wide"); +BUILD_ASSERT(sizeof(net_socklen_t) == sizeof(uint32_t), + "net_socklen_t must be 32-bit wide"); const struct socket_op_vtable sock_fd_op_vtable; @@ -102,11 +101,11 @@ static int zsock_socket_internal(int family, int type, int proto) } if (proto == 0) { - if (family == AF_INET || family == AF_INET6) { - if (type == SOCK_DGRAM) { - proto = IPPROTO_UDP; - } else if (type == SOCK_STREAM) { - proto = IPPROTO_TCP; + if (family == NET_AF_INET || family == NET_AF_INET6) { + if (type == NET_SOCK_DGRAM) { + proto = NET_IPPROTO_UDP; + } else if (type == NET_SOCK_STREAM) { + proto = NET_IPPROTO_TCP; } } } @@ -139,7 +138,7 @@ static int zsock_socket_internal(int family, int type, int proto) * context, it's not disposed of immediately - there's yet * closing handshake for stack to perform. */ - if (proto == IPPROTO_TCP) { + if (proto == NET_IPPROTO_TCP) { net_context_ref(ctx); } @@ -191,7 +190,7 @@ int zsock_close_ctx(struct net_context *ctx, int sock) } static void zsock_accepted_cb(struct net_context *new_ctx, - struct sockaddr *addr, socklen_t addrlen, + struct net_sockaddr *addr, net_socklen_t addrlen, int status, void *user_data) { struct net_context *parent = user_data; @@ -326,8 +325,8 @@ int zsock_shutdown_ctx(struct net_context *ctx, int how) return -1; } -int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr, - socklen_t addrlen) +int zsock_bind_ctx(struct net_context *ctx, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int ret; @@ -341,8 +340,8 @@ int zsock_bind_ctx(struct net_context *ctx, const struct sockaddr *addr, * bind(), but for STREAM socket, next expected operation is * listen(), which doesn't work if recv callback is set. */ - if (net_context_get_type(ctx) == SOCK_DGRAM || - net_context_get_type(ctx) == SOCK_RAW) { + if (net_context_get_type(ctx) == NET_SOCK_DGRAM || + net_context_get_type(ctx) == NET_SOCK_RAW) { ret = net_context_recv(ctx, zsock_received_cb, K_NO_WAIT, ctx->user_data); if (ret < 0) { @@ -362,14 +361,14 @@ static void zsock_connected_cb(struct net_context *ctx, int status, void *user_d } } -int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr, - socklen_t addrlen) +int zsock_connect_ctx(struct net_context *ctx, const struct net_sockaddr *addr, + net_socklen_t addrlen) { k_timeout_t timeout = K_MSEC(CONFIG_NET_SOCKETS_CONNECT_TIMEOUT); net_context_connect_cb_t cb = NULL; int ret; - if (net_context_get_type(ctx) == SOCK_RAW) { + if (net_context_get_type(ctx) == NET_SOCK_RAW) { errno = EOPNOTSUPP; return -1; } @@ -413,7 +412,7 @@ int zsock_connect_ctx(struct net_context *ctx, const struct sockaddr *addr, cb = zsock_connected_cb; } - if (net_context_get_type(ctx) == SOCK_STREAM) { + if (net_context_get_type(ctx) == NET_SOCK_STREAM) { /* For STREAM sockets net_context_recv() only installs * recv callback w/o side effects, and it has to be done * first to avoid race condition, when TCP stream data @@ -456,7 +455,7 @@ int zsock_listen_ctx(struct net_context *ctx, int backlog) { int ret; - if (net_context_get_type(ctx) == SOCK_RAW) { + if (net_context_get_type(ctx) == NET_SOCK_RAW) { errno = EOPNOTSUPP; return -1; } @@ -476,14 +475,14 @@ int zsock_listen_ctx(struct net_context *ctx, int backlog) return 0; } -int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr, - socklen_t *addrlen) +int zsock_accept_ctx(struct net_context *parent, struct net_sockaddr *addr, + net_socklen_t *addrlen) { struct net_context *ctx; struct net_pkt *last_pkt; int fd, ret; - if (net_context_get_type(parent) == SOCK_RAW) { + if (net_context_get_type(parent) == NET_SOCK_RAW) { errno = EOPNOTSUPP; return -1; } @@ -547,10 +546,10 @@ int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr, /* addrlen is a value-result argument, set to actual * size of source address */ - if (ctx->remote.sa_family == AF_INET) { - *addrlen = sizeof(struct sockaddr_in); - } else if (ctx->remote.sa_family == AF_INET6) { - *addrlen = sizeof(struct sockaddr_in6); + if (ctx->remote.sa_family == NET_AF_INET) { + *addrlen = sizeof(struct net_sockaddr_in); + } else if (ctx->remote.sa_family == NET_AF_INET6) { + *addrlen = sizeof(struct net_sockaddr_in6); } else { zvfs_free_fd(fd); errno = ENOTSUP; @@ -617,7 +616,7 @@ static int send_check_and_wait(struct net_context *ctx, int status, if (status == -EAGAIN) { if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) && - net_context_get_type(ctx) == SOCK_STREAM && + net_context_get_type(ctx) == NET_SOCK_STREAM && !net_if_is_ip_offloaded(net_context_get_iface(ctx))) { struct k_poll_event event; @@ -649,7 +648,7 @@ static int send_check_and_wait(struct net_context *ctx, int status, ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, net_socklen_t addrlen) { k_timeout_t timeout = K_FOREVER; uint32_t retry_timeout = WAIT_BUFS_INITIAL_MS; @@ -706,7 +705,7 @@ ssize_t zsock_sendto_ctx(struct net_context *ctx, const void *buf, size_t len, return status; } -ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg, +ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct net_msghdr *msg, int flags) { k_timeout_t timeout = K_FOREVER; @@ -747,8 +746,8 @@ ssize_t zsock_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg, static int sock_get_pkt_src_addr(struct net_context *ctx, struct net_pkt *pkt, - struct sockaddr *addr, - socklen_t addrlen) + struct net_sockaddr *addr, + net_socklen_t addrlen) { int ret = 0; struct net_pkt_cursor backup; @@ -766,13 +765,13 @@ static int sock_get_pkt_src_addr(struct net_context *ctx, addr->sa_family = net_pkt_family(pkt); if (IS_ENABLED(CONFIG_NET_IPV4) && - net_pkt_family(pkt) == AF_INET) { + net_pkt_family(pkt) == NET_AF_INET) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access, struct net_ipv4_hdr); - struct sockaddr_in *addr4 = net_sin(addr); + struct net_sockaddr_in *addr4 = net_sin(addr); struct net_ipv4_hdr *ipv4_hdr; - if (addrlen < sizeof(struct sockaddr_in)) { + if (addrlen < sizeof(struct net_sockaddr_in)) { ret = -EINVAL; goto error; } @@ -789,13 +788,13 @@ static int sock_get_pkt_src_addr(struct net_context *ctx, net_ipv4_addr_copy_raw((uint8_t *)&addr4->sin_addr, ipv4_hdr->src); port = &addr4->sin_port; } else if (IS_ENABLED(CONFIG_NET_IPV6) && - net_pkt_family(pkt) == AF_INET6) { + net_pkt_family(pkt) == NET_AF_INET6) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr); - struct sockaddr_in6 *addr6 = net_sin6(addr); + struct net_sockaddr_in6 *addr6 = net_sin6(addr); struct net_ipv6_hdr *ipv6_hdr; - if (addrlen < sizeof(struct sockaddr_in6)) { + if (addrlen < sizeof(struct net_sockaddr_in6)) { ret = -EINVAL; goto error; } @@ -816,7 +815,7 @@ static int sock_get_pkt_src_addr(struct net_context *ctx, goto error; } - if (IS_ENABLED(CONFIG_NET_UDP) && proto == IPPROTO_UDP) { + if (IS_ENABLED(CONFIG_NET_UDP) && proto == NET_IPPROTO_UDP) { NET_PKT_DATA_ACCESS_DEFINE(udp_access, struct net_udp_hdr); struct net_udp_hdr *udp_hdr; @@ -828,7 +827,7 @@ static int sock_get_pkt_src_addr(struct net_context *ctx, } *port = udp_hdr->src_port; - } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == IPPROTO_TCP) { + } else if (IS_ENABLED(CONFIG_NET_TCP) && proto == NET_IPPROTO_TCP) { NET_PKT_DATA_ACCESS_DEFINE(tcp_access, struct net_tcp_hdr); struct net_tcp_hdr *tcp_hdr; @@ -840,19 +839,19 @@ static int sock_get_pkt_src_addr(struct net_context *ctx, } *port = tcp_hdr->src_port; - } else if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && type == SOCK_RAW) { + } else if (IS_ENABLED(CONFIG_NET_SOCKETS_INET_RAW) && type == NET_SOCK_RAW) { *port = 0; } else { ret = -ENOTSUP; } - if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) && net_pkt_family(pkt) == AF_INET && - net_context_get_family(ctx) == AF_INET6 && !net_context_is_v6only_set(ctx)) { - struct sockaddr_in6 mapped_addr; + if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6) && net_pkt_family(pkt) == NET_AF_INET && + net_context_get_family(ctx) == NET_AF_INET6 && !net_context_is_v6only_set(ctx)) { + struct net_sockaddr_in6 mapped_addr; net_ipv6_addr_create_v4_mapped(&net_sin(addr)->sin_addr, &(mapped_addr.sin6_addr)); net_ipaddr_copy(&net_sin6(addr)->sin6_addr, &mapped_addr.sin6_addr); - addr->sa_family = AF_INET6; + addr->sa_family = NET_AF_INET6; } error: @@ -866,9 +865,9 @@ static bool net_pkt_remote_addr_is_unspecified(struct net_pkt *pkt) { bool ret = true; - if (net_pkt_family(pkt) == AF_INET) { + if (net_pkt_family(pkt) == NET_AF_INET) { ret = net_ipv4_is_addr_unspecified(&net_sin(&pkt->remote)->sin_addr); - } else if (net_pkt_family(pkt) == AF_INET6) { + } else if (net_pkt_family(pkt) == NET_AF_INET6) { ret = net_ipv6_is_addr_unspecified(&net_sin6(&pkt->remote)->sin6_addr); } @@ -877,8 +876,8 @@ static bool net_pkt_remote_addr_is_unspecified(struct net_pkt *pkt) static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt, struct net_context *ctx, - struct sockaddr *addr, - socklen_t addrlen) + struct net_sockaddr *addr, + net_socklen_t addrlen) { int ret = 0; @@ -888,21 +887,21 @@ static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt, if (!net_pkt_remote_addr_is_unspecified(pkt)) { if (IS_ENABLED(CONFIG_NET_IPV4) && - net_pkt_family(pkt) == AF_INET) { - if (addrlen < sizeof(struct sockaddr_in)) { + net_pkt_family(pkt) == NET_AF_INET) { + if (addrlen < sizeof(struct net_sockaddr_in)) { ret = -EINVAL; goto error; } - memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in)); + memcpy(addr, &pkt->remote, sizeof(struct net_sockaddr_in)); } else if (IS_ENABLED(CONFIG_NET_IPV6) && - net_pkt_family(pkt) == AF_INET6) { - if (addrlen < sizeof(struct sockaddr_in6)) { + net_pkt_family(pkt) == NET_AF_INET6) { + if (addrlen < sizeof(struct net_sockaddr_in6)) { ret = -EINVAL; goto error; } - memcpy(addr, &pkt->remote, sizeof(struct sockaddr_in6)); + memcpy(addr, &pkt->remote, sizeof(struct net_sockaddr_in6)); } } else if (ctx->flags & NET_CONTEXT_REMOTE_ADDR_SET) { memcpy(addr, &ctx->remote, MIN(addrlen, sizeof(ctx->remote))); @@ -916,8 +915,8 @@ static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt, #else static int sock_get_offload_pkt_src_addr(struct net_pkt *pkt, struct net_context *ctx, - struct sockaddr *addr, - socklen_t addrlen) + struct net_sockaddr *addr, + net_socklen_t addrlen) { ARG_UNUSED(pkt); ARG_UNUSED(ctx); @@ -990,16 +989,16 @@ int zsock_wait_data(struct net_context *ctx, k_timeout_t *timeout) return 0; } -static int insert_pktinfo(struct msghdr *msg, int level, int type, +static int insert_pktinfo(struct net_msghdr *msg, int level, int type, void *pktinfo, size_t pktinfo_len) { - struct cmsghdr *cmsg; + struct net_cmsghdr *cmsg; if (msg->msg_controllen < pktinfo_len) { return -EINVAL; } - for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) { + for (cmsg = NET_CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = NET_CMSG_NXTHDR(msg, cmsg)) { if (cmsg->cmsg_len == 0) { break; } @@ -1009,25 +1008,25 @@ static int insert_pktinfo(struct msghdr *msg, int level, int type, return -EINVAL; } - cmsg->cmsg_len = CMSG_LEN(pktinfo_len); + cmsg->cmsg_len = NET_CMSG_LEN(pktinfo_len); cmsg->cmsg_level = level; cmsg->cmsg_type = type; - memcpy(CMSG_DATA(cmsg), pktinfo, pktinfo_len); + memcpy(NET_CMSG_DATA(cmsg), pktinfo, pktinfo_len); return 0; } static int add_timestamping(struct net_context *ctx, struct net_pkt *pkt, - struct msghdr *msg) + struct net_msghdr *msg) { uint8_t timestamping = 0; net_context_get_option(ctx, NET_OPT_TIMESTAMPING, ×tamping, NULL); if (timestamping) { - return insert_pktinfo(msg, SOL_SOCKET, SO_TIMESTAMPING, + return insert_pktinfo(msg, ZSOCK_SOL_SOCKET, ZSOCK_SO_TIMESTAMPING, net_pkt_timestamp(pkt), sizeof(struct net_ptp_time)); } @@ -1036,7 +1035,7 @@ static int add_timestamping(struct net_context *ctx, static int add_pktinfo(struct net_context *ctx, struct net_pkt *pkt, - struct msghdr *msg) + struct net_msghdr *msg) { int ret = -ENOTSUP; struct net_pkt_cursor backup; @@ -1044,10 +1043,10 @@ static int add_pktinfo(struct net_context *ctx, net_pkt_cursor_backup(pkt, &backup); net_pkt_cursor_init(pkt); - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access, struct net_ipv4_hdr); - struct in_pktinfo info; + struct net_in_pktinfo info; struct net_ipv4_hdr *ipv4_hdr; ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data( @@ -1064,16 +1063,16 @@ static int add_pktinfo(struct net_context *ctx, (uint8_t *)net_sin_ptr(&ctx->local)->sin_addr); info.ipi_ifindex = ctx->iface; - ret = insert_pktinfo(msg, IPPROTO_IP, IP_PKTINFO, + ret = insert_pktinfo(msg, NET_IPPROTO_IP, ZSOCK_IP_PKTINFO, &info, sizeof(info)); goto out; } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr); - struct in6_pktinfo info; + struct net_in6_pktinfo info; struct net_ipv6_hdr *ipv6_hdr; ipv6_hdr = (struct net_ipv6_hdr *)net_pkt_get_data( @@ -1088,7 +1087,7 @@ static int add_pktinfo(struct net_context *ctx, net_ipv6_addr_copy_raw((uint8_t *)&info.ipi6_addr, ipv6_hdr->dst); info.ipi6_ifindex = ctx->iface; - ret = insert_pktinfo(msg, IPPROTO_IPV6, IPV6_PKTINFO, + ret = insert_pktinfo(msg, NET_IPPROTO_IPV6, ZSOCK_IPV6_PKTINFO, &info, sizeof(info)); goto out; @@ -1102,23 +1101,23 @@ static int add_pktinfo(struct net_context *ctx, static int add_hoplimit(struct net_context *ctx, struct net_pkt *pkt, - struct msghdr *msg) + struct net_msghdr *msg) { int ret = -ENOTSUP; - if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == NET_AF_INET) { int ttl = net_pkt_ipv4_ttl(pkt); - ret = insert_pktinfo(msg, IPPROTO_IP, IP_TTL, + ret = insert_pktinfo(msg, NET_IPPROTO_IP, ZSOCK_IP_TTL, &ttl, sizeof(ttl)); goto out; } - if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && net_pkt_family(pkt) == NET_AF_INET6) { int hop_limit = net_pkt_ipv6_hop_limit(pkt); - ret = insert_pktinfo(msg, IPPROTO_IPV6, IPV6_HOPLIMIT, + ret = insert_pktinfo(msg, NET_IPPROTO_IPV6, ZSOCK_IPV6_HOPLIMIT, &hop_limit, sizeof(hop_limit)); goto out; @@ -1129,12 +1128,12 @@ static int add_hoplimit(struct net_context *ctx, return ret; } -static int update_msg_controllen(struct msghdr *msg) +static int update_msg_controllen(struct net_msghdr *msg) { - struct cmsghdr *cmsg; + struct net_cmsghdr *cmsg; size_t cmsg_space = 0; - for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) { + for (cmsg = NET_CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = NET_CMSG_NXTHDR(msg, cmsg)) { if (cmsg->cmsg_len == 0) { break; } @@ -1146,12 +1145,12 @@ static int update_msg_controllen(struct msghdr *msg) } static ssize_t zsock_recv_dgram(struct net_context *ctx, - struct msghdr *msg, + struct net_msghdr *msg, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { k_timeout_t timeout = K_FOREVER; size_t recv_len = 0; @@ -1221,10 +1220,10 @@ static ssize_t zsock_recv_dgram(struct net_context *ctx, /* addrlen is a value-result argument, set to actual * size of source address */ - if (src_addr->sa_family == AF_INET) { - *addrlen = sizeof(struct sockaddr_in); - } else if (src_addr->sa_family == AF_INET6) { - *addrlen = sizeof(struct sockaddr_in6); + if (src_addr->sa_family == NET_AF_INET) { + *addrlen = sizeof(struct net_sockaddr_in); + } else if (src_addr->sa_family == NET_AF_INET6) { + *addrlen = sizeof(struct net_sockaddr_in6); } else { errno = ENOTSUP; goto fail; @@ -1420,7 +1419,7 @@ static int zsock_fionread_ctx(struct net_context *ctx) return MIN(ret, INT_MAX); } -static ssize_t zsock_recv_stream_timed(struct net_context *ctx, struct msghdr *msg, +static ssize_t zsock_recv_stream_timed(struct net_context *ctx, struct net_msghdr *msg, uint8_t *buf, size_t max_len, int flags, k_timeout_t timeout) { @@ -1505,7 +1504,7 @@ static ssize_t zsock_recv_stream_timed(struct net_context *ctx, struct msghdr *m return recv_len; } -static ssize_t zsock_recv_stream(struct net_context *ctx, struct msghdr *msg, +static ssize_t zsock_recv_stream(struct net_context *ctx, struct net_msghdr *msg, void *buf, size_t max_len, int flags) { ssize_t res; @@ -1550,7 +1549,7 @@ static ssize_t zsock_recv_stream(struct net_context *ctx, struct msghdr *msg, ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, net_socklen_t *addrlen) { enum net_sock_type sock_type = net_context_get_type(ctx); @@ -1558,9 +1557,9 @@ ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len, return 0; } - if (sock_type == SOCK_DGRAM || sock_type == SOCK_RAW) { + if (sock_type == NET_SOCK_DGRAM || sock_type == NET_SOCK_RAW) { return zsock_recv_dgram(ctx, NULL, buf, max_len, flags, src_addr, addrlen); - } else if (sock_type == SOCK_STREAM) { + } else if (sock_type == NET_SOCK_STREAM) { return zsock_recv_stream(ctx, NULL, buf, max_len, flags); } @@ -1571,7 +1570,7 @@ ssize_t zsock_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len, return -1; } -ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg, +ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct net_msghdr *msg, int flags) { enum net_sock_type sock_type = net_context_get_type(ctx); @@ -1591,10 +1590,10 @@ ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg, max_len += msg->msg_iov[i].iov_len; } - if (sock_type == SOCK_DGRAM || sock_type == SOCK_RAW) { + if (sock_type == NET_SOCK_DGRAM || sock_type == NET_SOCK_RAW) { return zsock_recv_dgram(ctx, msg, NULL, max_len, flags, msg->msg_name, &msg->msg_namelen); - } else if (sock_type == SOCK_STREAM) { + } else if (sock_type == NET_SOCK_STREAM) { return zsock_recv_stream(ctx, msg, NULL, max_len, flags); } @@ -1624,7 +1623,7 @@ static int zsock_poll_prepare_ctx(struct net_context *ctx, if (pfd->events & ZSOCK_POLLOUT) { if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) && - net_context_get_type(ctx) == SOCK_STREAM && + net_context_get_type(ctx) == NET_SOCK_STREAM && !net_if_is_ip_offloaded(net_context_get_iface(ctx))) { if (*pev == pev_end) { return -ENOMEM; @@ -1672,7 +1671,7 @@ static int zsock_poll_update_ctx(struct net_context *ctx, } if (pfd->events & ZSOCK_POLLOUT) { if (IS_ENABLED(CONFIG_NET_NATIVE_TCP) && - net_context_get_type(ctx) == SOCK_STREAM && + net_context_get_type(ctx) == NET_SOCK_STREAM && !net_if_is_ip_offloaded(net_context_get_iface(ctx))) { if ((*pev)->state != K_POLL_STATE_NOT_READY && !sock_is_eof(ctx) && @@ -1699,11 +1698,11 @@ static int zsock_poll_update_ctx(struct net_context *ctx, static enum tcp_conn_option get_tcp_option(int optname) { switch (optname) { - case TCP_KEEPIDLE: + case ZSOCK_TCP_KEEPIDLE: return TCP_OPT_KEEPIDLE; - case TCP_KEEPINTVL: + case ZSOCK_TCP_KEEPINTVL: return TCP_OPT_KEEPINTVL; - case TCP_KEEPCNT: + case ZSOCK_TCP_KEEPCNT: return TCP_OPT_KEEPCNT; } @@ -1711,7 +1710,7 @@ static enum tcp_conn_option get_tcp_option(int optname) } static int ipv4_multicast_if(struct net_context *ctx, const void *optval, - socklen_t optlen, bool do_get) + net_socklen_t optlen, bool do_get) { struct net_if *iface = NULL; int ifindex, ret; @@ -1720,7 +1719,7 @@ static int ipv4_multicast_if(struct net_context *ctx, const void *optval, struct net_if_addr *ifaddr; uint32_t len = sizeof(ifindex); - if (optval == NULL || (optlen != sizeof(struct in_addr))) { + if (optval == NULL || (optlen != sizeof(struct net_in_addr))) { errno = EINVAL; return -1; } @@ -1734,7 +1733,7 @@ static int ipv4_multicast_if(struct net_context *ctx, const void *optval, if (ifindex == 0) { /* No interface set */ - ((struct in_addr *)optval)->s_addr = INADDR_ANY; + ((struct net_in_addr *)optval)->s_addr = NET_INADDR_ANY; return 0; } @@ -1744,7 +1743,7 @@ static int ipv4_multicast_if(struct net_context *ctx, const void *optval, return -1; } - net_ipaddr_copy((struct in_addr *)optval, &ifaddr->address.in_addr); + net_ipaddr_copy((struct net_in_addr *)optval, &ifaddr->address.in_addr); return 0; } @@ -1752,19 +1751,19 @@ static int ipv4_multicast_if(struct net_context *ctx, const void *optval, /* setsockopt() can accept either struct ip_mreqn or * struct ip_mreq. We need to handle both cases. */ - if (optval == NULL || (optlen != sizeof(struct ip_mreqn) && - optlen != sizeof(struct ip_mreq))) { + if (optval == NULL || (optlen != sizeof(struct net_ip_mreqn) && + optlen != sizeof(struct net_ip_mreq))) { errno = EINVAL; return -1; } - if (optlen == sizeof(struct ip_mreqn)) { - struct ip_mreqn *mreqn = (struct ip_mreqn *)optval; + if (optlen == sizeof(struct net_ip_mreqn)) { + struct net_ip_mreqn *mreqn = (struct net_ip_mreqn *)optval; if (mreqn->imr_ifindex != 0) { iface = net_if_get_by_index(mreqn->imr_ifindex); - } else if (mreqn->imr_address.s_addr != INADDR_ANY) { + } else if (mreqn->imr_address.s_addr != NET_INADDR_ANY) { struct net_if_addr *ifaddr; ifaddr = net_if_ipv4_addr_lookup(&mreqn->imr_address, &iface); @@ -1774,9 +1773,9 @@ static int ipv4_multicast_if(struct net_context *ctx, const void *optval, } } } else { - struct ip_mreq *mreq = (struct ip_mreq *)optval; + struct net_ip_mreq *mreq = (struct net_ip_mreq *)optval; - if (mreq->imr_interface.s_addr != INADDR_ANY) { + if (mreq->imr_interface.s_addr != NET_INADDR_ANY) { struct net_if_addr *ifaddr; ifaddr = net_if_ipv4_addr_lookup(&mreq->imr_interface, &iface); @@ -1804,14 +1803,14 @@ static int ipv4_multicast_if(struct net_context *ctx, const void *optval, } int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int ret; switch (level) { - case SOL_SOCKET: + case ZSOCK_SOL_SOCKET: switch (optname) { - case SO_ERROR: { + case ZSOCK_SO_ERROR: { if (*optlen != sizeof(int)) { errno = EINVAL; return -1; @@ -1822,7 +1821,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; } - case SO_TYPE: { + case ZSOCK_SO_TYPE: { int type = (int)net_context_get_type(ctx); if (*optlen != sizeof(type)) { @@ -1835,7 +1834,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; } - case SO_TXTIME: + case ZSOCK_SO_TXTIME: if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) { ret = net_context_get_option(ctx, NET_OPT_TXTIME, @@ -1849,7 +1848,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, } break; - case SO_PROTOCOL: { + case ZSOCK_SO_PROTOCOL: { int proto = (int)net_context_get_proto(ctx); if (*optlen != sizeof(proto)) { @@ -1862,7 +1861,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; } - case SO_DOMAIN: { + case ZSOCK_SO_DOMAIN: { if (*optlen != sizeof(int)) { errno = EINVAL; return -1; @@ -1875,7 +1874,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_RCVBUF: + case ZSOCK_SO_RCVBUF: if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) { ret = net_context_get_option(ctx, NET_OPT_RCVBUF, @@ -1889,7 +1888,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, } break; - case SO_SNDBUF: + case ZSOCK_SO_SNDBUF: if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) { ret = net_context_get_option(ctx, NET_OPT_SNDBUF, @@ -1903,7 +1902,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, } break; - case SO_REUSEADDR: + case ZSOCK_SO_REUSEADDR: if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) { ret = net_context_get_option(ctx, NET_OPT_REUSEADDR, @@ -1917,7 +1916,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, } break; - case SO_REUSEPORT: + case ZSOCK_SO_REUSEPORT: if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) { ret = net_context_get_option(ctx, NET_OPT_REUSEPORT, @@ -1931,9 +1930,9 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, } break; - case SO_KEEPALIVE: + case ZSOCK_SO_KEEPALIVE: if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) && - net_context_get_proto(ctx) == IPPROTO_TCP) { + net_context_get_proto(ctx) == NET_IPPROTO_TCP) { ret = net_tcp_get_option(ctx, TCP_OPT_KEEPALIVE, optval, optlen); @@ -1947,7 +1946,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_TIMESTAMPING: + case ZSOCK_SO_TIMESTAMPING: if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) { ret = net_context_get_option(ctx, NET_OPT_TIMESTAMPING, @@ -1966,17 +1965,17 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPPROTO_TCP: + case NET_IPPROTO_TCP: switch (optname) { - case TCP_NODELAY: + case ZSOCK_TCP_NODELAY: ret = net_tcp_get_option(ctx, TCP_OPT_NODELAY, optval, optlen); return ret; - case TCP_KEEPIDLE: + case ZSOCK_TCP_KEEPIDLE: __fallthrough; - case TCP_KEEPINTVL: + case ZSOCK_TCP_KEEPINTVL: __fallthrough; - case TCP_KEEPCNT: + case ZSOCK_TCP_KEEPCNT: if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) { ret = net_tcp_get_option(ctx, get_tcp_option(optname), @@ -1994,9 +1993,9 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPPROTO_IP: + case NET_IPPROTO_IP: switch (optname) { - case IP_TOS: + case ZSOCK_IP_TOS: if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) { ret = net_context_get_option(ctx, NET_OPT_DSCP_ECN, @@ -2012,7 +2011,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_TTL: + case ZSOCK_IP_TTL: ret = net_context_get_option(ctx, NET_OPT_TTL, optval, optlen); if (ret < 0) { @@ -2022,9 +2021,9 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IP_MULTICAST_IF: + case ZSOCK_IP_MULTICAST_IF: if (IS_ENABLED(CONFIG_NET_IPV4)) { - if (net_context_get_family(ctx) != AF_INET) { + if (net_context_get_family(ctx) != NET_AF_INET) { errno = EAFNOSUPPORT; return -1; } @@ -2034,7 +2033,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_MULTICAST_TTL: + case ZSOCK_IP_MULTICAST_TTL: ret = net_context_get_option(ctx, NET_OPT_MCAST_TTL, optval, optlen); if (ret < 0) { @@ -2044,7 +2043,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IP_MTU: + case ZSOCK_IP_MTU: if (IS_ENABLED(CONFIG_NET_IPV4)) { ret = net_context_get_option(ctx, NET_OPT_MTU, optval, optlen); @@ -2058,7 +2057,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_LOCAL_PORT_RANGE: + case ZSOCK_IP_LOCAL_PORT_RANGE: if (IS_ENABLED(CONFIG_NET_CONTEXT_CLAMP_PORT_RANGE)) { ret = net_context_get_option(ctx, NET_OPT_LOCAL_PORT_RANGE, @@ -2073,7 +2072,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; #if defined(CONFIG_NET_IPV4) - case IP_MULTICAST_LOOP: + case ZSOCK_IP_MULTICAST_LOOP: ret = net_context_get_option(ctx, NET_OPT_IPV4_MCAST_LOOP, optval, optlen); @@ -2088,9 +2087,9 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPPROTO_IPV6: + case NET_IPPROTO_IPV6: switch (optname) { - case IPV6_MTU: + case ZSOCK_IPV6_MTU: if (IS_ENABLED(CONFIG_NET_IPV6)) { ret = net_context_get_option(ctx, NET_OPT_MTU, optval, optlen); @@ -2104,7 +2103,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_V6ONLY: + case ZSOCK_IPV6_V6ONLY: if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) { ret = net_context_get_option(ctx, NET_OPT_IPV6_V6ONLY, @@ -2120,7 +2119,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_ADDR_PREFERENCES: + case ZSOCK_IPV6_ADDR_PREFERENCES: if (IS_ENABLED(CONFIG_NET_IPV6)) { ret = net_context_get_option(ctx, NET_OPT_ADDR_PREFERENCES, @@ -2136,7 +2135,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_TCLASS: + case ZSOCK_IPV6_TCLASS: if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) { ret = net_context_get_option(ctx, NET_OPT_DSCP_ECN, @@ -2152,7 +2151,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_UNICAST_HOPS: + case ZSOCK_IPV6_UNICAST_HOPS: ret = net_context_get_option(ctx, NET_OPT_UNICAST_HOP_LIMIT, optval, optlen); @@ -2163,9 +2162,9 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IPV6_MULTICAST_IF: + case ZSOCK_IPV6_MULTICAST_IF: if (IS_ENABLED(CONFIG_NET_IPV6)) { - if (net_context_get_family(ctx) != AF_INET6) { + if (net_context_get_family(ctx) != NET_AF_INET6) { errno = EAFNOSUPPORT; return -1; } @@ -2183,7 +2182,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_MULTICAST_HOPS: + case ZSOCK_IPV6_MULTICAST_HOPS: ret = net_context_get_option(ctx, NET_OPT_MCAST_HOP_LIMIT, optval, optlen); @@ -2194,7 +2193,7 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IPV6_MULTICAST_LOOP: + case ZSOCK_IPV6_MULTICAST_LOOP: ret = net_context_get_option(ctx, NET_OPT_IPV6_MCAST_LOOP, optval, optlen); @@ -2215,20 +2214,20 @@ int zsock_getsockopt_ctx(struct net_context *ctx, int level, int optname, } static int ipv4_multicast_group(struct net_context *ctx, const void *optval, - socklen_t optlen, bool do_join) + net_socklen_t optlen, bool do_join) { - struct ip_mreqn *mreqn; + struct net_ip_mreqn *mreqn; struct net_if *iface; int ifindex, ret; - if (optval == NULL || optlen != sizeof(struct ip_mreqn)) { + if (optval == NULL || optlen != sizeof(struct net_ip_mreqn)) { errno = EINVAL; return -1; } - mreqn = (struct ip_mreqn *)optval; + mreqn = (struct net_ip_mreqn *)optval; - if (mreqn->imr_multiaddr.s_addr == INADDR_ANY) { + if (mreqn->imr_multiaddr.s_addr == NET_INADDR_ANY) { errno = EINVAL; return -1; } @@ -2271,18 +2270,18 @@ static int ipv4_multicast_group(struct net_context *ctx, const void *optval, } static int ipv6_multicast_group(struct net_context *ctx, const void *optval, - socklen_t optlen, bool do_join) + net_socklen_t optlen, bool do_join) { - struct ipv6_mreq *mreq; + struct net_ipv6_mreq *mreq; struct net_if *iface; int ret; - if (optval == NULL || optlen != sizeof(struct ipv6_mreq)) { + if (optval == NULL || optlen != sizeof(struct net_ipv6_mreq)) { errno = EINVAL; return -1; } - mreq = (struct ipv6_mreq *)optval; + mreq = (struct net_ipv6_mreq *)optval; if (memcmp(&mreq->ipv6mr_multiaddr, net_ipv6_unspecified_address(), @@ -2323,14 +2322,14 @@ static int ipv6_multicast_group(struct net_context *ctx, const void *optval, } int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int ret; switch (level) { - case SOL_SOCKET: + case ZSOCK_SOL_SOCKET: switch (optname) { - case SO_RCVBUF: + case ZSOCK_SO_RCVBUF: if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVBUF)) { ret = net_context_set_option(ctx, NET_OPT_RCVBUF, @@ -2345,7 +2344,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_SNDBUF: + case ZSOCK_SO_SNDBUF: if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDBUF)) { ret = net_context_set_option(ctx, NET_OPT_SNDBUF, @@ -2360,7 +2359,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_REUSEADDR: + case ZSOCK_SO_REUSEADDR: if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEADDR)) { ret = net_context_set_option(ctx, NET_OPT_REUSEADDR, @@ -2375,7 +2374,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_REUSEPORT: + case ZSOCK_SO_REUSEPORT: if (IS_ENABLED(CONFIG_NET_CONTEXT_REUSEPORT)) { ret = net_context_set_option(ctx, NET_OPT_REUSEPORT, @@ -2390,7 +2389,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_PRIORITY: + case ZSOCK_SO_PRIORITY: if (IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) { ret = net_context_set_option(ctx, NET_OPT_PRIORITY, @@ -2405,7 +2404,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_RCVTIMEO: + case ZSOCK_SO_RCVTIMEO: if (IS_ENABLED(CONFIG_NET_CONTEXT_RCVTIMEO)) { const struct zsock_timeval *tv = optval; k_timeout_t timeout; @@ -2437,7 +2436,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_SNDTIMEO: + case ZSOCK_SO_SNDTIMEO: if (IS_ENABLED(CONFIG_NET_CONTEXT_SNDTIMEO)) { const struct zsock_timeval *tv = optval; k_timeout_t timeout; @@ -2468,7 +2467,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_TXTIME: + case ZSOCK_SO_TXTIME: if (IS_ENABLED(CONFIG_NET_CONTEXT_TXTIME)) { ret = net_context_set_option(ctx, NET_OPT_TXTIME, @@ -2483,7 +2482,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_SOCKS5: + case ZSOCK_SO_SOCKS5: if (IS_ENABLED(CONFIG_SOCKS)) { ret = net_context_set_option(ctx, NET_OPT_SOCKS5, @@ -2500,12 +2499,12 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_BINDTODEVICE: { + case ZSOCK_SO_BINDTODEVICE: { struct net_if *iface; - const struct ifreq *ifreq = optval; + const struct net_ifreq *ifreq = optval; - if (net_context_get_family(ctx) != AF_INET && - net_context_get_family(ctx) != AF_INET6) { + if (net_context_get_family(ctx) != NET_AF_INET && + net_context_get_family(ctx) != NET_AF_INET6) { errno = EAFNOSUPPORT; return -1; } @@ -2557,13 +2556,13 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; } - case SO_LINGER: + case ZSOCK_SO_LINGER: /* ignored. for compatibility purposes only */ return 0; - case SO_KEEPALIVE: + case ZSOCK_SO_KEEPALIVE: if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE) && - net_context_get_proto(ctx) == IPPROTO_TCP) { + net_context_get_proto(ctx) == NET_IPPROTO_TCP) { ret = net_tcp_set_option(ctx, TCP_OPT_KEEPALIVE, optval, optlen); @@ -2577,7 +2576,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case SO_TIMESTAMPING: + case ZSOCK_SO_TIMESTAMPING: if (IS_ENABLED(CONFIG_NET_CONTEXT_TIMESTAMPING)) { ret = net_context_set_option(ctx, NET_OPT_TIMESTAMPING, @@ -2596,18 +2595,18 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPPROTO_TCP: + case NET_IPPROTO_TCP: switch (optname) { - case TCP_NODELAY: + case ZSOCK_TCP_NODELAY: ret = net_tcp_set_option(ctx, TCP_OPT_NODELAY, optval, optlen); return ret; - case TCP_KEEPIDLE: + case ZSOCK_TCP_KEEPIDLE: __fallthrough; - case TCP_KEEPINTVL: + case ZSOCK_TCP_KEEPINTVL: __fallthrough; - case TCP_KEEPCNT: + case ZSOCK_TCP_KEEPCNT: if (IS_ENABLED(CONFIG_NET_TCP_KEEPALIVE)) { ret = net_tcp_set_option(ctx, get_tcp_option(optname), @@ -2624,9 +2623,9 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, } break; - case IPPROTO_IP: + case NET_IPPROTO_IP: switch (optname) { - case IP_TOS: + case ZSOCK_IP_TOS: if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) { ret = net_context_set_option(ctx, NET_OPT_DSCP_ECN, @@ -2642,7 +2641,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_PKTINFO: + case ZSOCK_IP_PKTINFO: if (IS_ENABLED(CONFIG_NET_IPV4) && IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) { ret = net_context_set_option(ctx, @@ -2659,7 +2658,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_RECVTTL: + case ZSOCK_IP_RECVTTL: if (IS_ENABLED(CONFIG_NET_IPV4) && IS_ENABLED(CONFIG_NET_CONTEXT_RECV_HOPLIMIT)) { ret = net_context_set_option(ctx, @@ -2676,14 +2675,14 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_MULTICAST_IF: + case ZSOCK_IP_MULTICAST_IF: if (IS_ENABLED(CONFIG_NET_IPV4)) { return ipv4_multicast_if(ctx, optval, optlen, false); } break; - case IP_MULTICAST_TTL: + case ZSOCK_IP_MULTICAST_TTL: ret = net_context_set_option(ctx, NET_OPT_MCAST_TTL, optval, optlen); if (ret < 0) { @@ -2693,7 +2692,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IP_TTL: + case ZSOCK_IP_TTL: ret = net_context_set_option(ctx, NET_OPT_TTL, optval, optlen); if (ret < 0) { @@ -2703,7 +2702,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IP_ADD_MEMBERSHIP: + case ZSOCK_IP_ADD_MEMBERSHIP: if (IS_ENABLED(CONFIG_NET_IPV4)) { return ipv4_multicast_group(ctx, optval, optlen, true); @@ -2711,7 +2710,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_DROP_MEMBERSHIP: + case ZSOCK_IP_DROP_MEMBERSHIP: if (IS_ENABLED(CONFIG_NET_IPV4)) { return ipv4_multicast_group(ctx, optval, optlen, false); @@ -2719,7 +2718,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IP_LOCAL_PORT_RANGE: + case ZSOCK_IP_LOCAL_PORT_RANGE: if (IS_ENABLED(CONFIG_NET_CONTEXT_CLAMP_PORT_RANGE)) { ret = net_context_set_option(ctx, NET_OPT_LOCAL_PORT_RANGE, @@ -2734,7 +2733,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; #if defined(CONFIG_NET_IPV4) - case IP_MULTICAST_LOOP: + case ZSOCK_IP_MULTICAST_LOOP: ret = net_context_set_option(ctx, NET_OPT_IPV4_MCAST_LOOP, optval, optlen); @@ -2749,9 +2748,9 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPPROTO_IPV6: + case NET_IPPROTO_IPV6: switch (optname) { - case IPV6_MTU: + case ZSOCK_IPV6_MTU: if (IS_ENABLED(CONFIG_NET_IPV6)) { ret = net_context_set_option(ctx, NET_OPT_MTU, optval, optlen); @@ -2765,7 +2764,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_V6ONLY: + case ZSOCK_IPV6_V6ONLY: if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) { ret = net_context_set_option(ctx, NET_OPT_IPV6_V6ONLY, @@ -2779,7 +2778,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IPV6_RECVPKTINFO: + case ZSOCK_IPV6_RECVPKTINFO: if (IS_ENABLED(CONFIG_NET_IPV6) && IS_ENABLED(CONFIG_NET_CONTEXT_RECV_PKTINFO)) { ret = net_context_set_option(ctx, @@ -2796,7 +2795,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_RECVHOPLIMIT: + case ZSOCK_IPV6_RECVHOPLIMIT: if (IS_ENABLED(CONFIG_NET_IPV6) && IS_ENABLED(CONFIG_NET_CONTEXT_RECV_HOPLIMIT)) { ret = net_context_set_option(ctx, @@ -2813,7 +2812,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_ADDR_PREFERENCES: + case ZSOCK_IPV6_ADDR_PREFERENCES: if (IS_ENABLED(CONFIG_NET_IPV6)) { ret = net_context_set_option(ctx, NET_OPT_ADDR_PREFERENCES, @@ -2829,7 +2828,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_TCLASS: + case ZSOCK_IPV6_TCLASS: if (IS_ENABLED(CONFIG_NET_CONTEXT_DSCP_ECN)) { ret = net_context_set_option(ctx, NET_OPT_DSCP_ECN, @@ -2845,7 +2844,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_UNICAST_HOPS: + case ZSOCK_IPV6_UNICAST_HOPS: ret = net_context_set_option(ctx, NET_OPT_UNICAST_HOP_LIMIT, optval, optlen); @@ -2856,7 +2855,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IPV6_MULTICAST_IF: + case ZSOCK_IPV6_MULTICAST_IF: ret = net_context_set_option(ctx, NET_OPT_MCAST_IFINDEX, optval, optlen); @@ -2867,7 +2866,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IPV6_MULTICAST_HOPS: + case ZSOCK_IPV6_MULTICAST_HOPS: ret = net_context_set_option(ctx, NET_OPT_MCAST_HOP_LIMIT, optval, optlen); @@ -2878,7 +2877,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return 0; - case IPV6_ADD_MEMBERSHIP: + case ZSOCK_IPV6_ADD_MEMBERSHIP: if (IS_ENABLED(CONFIG_NET_IPV6)) { return ipv6_multicast_group(ctx, optval, optlen, true); @@ -2886,7 +2885,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_DROP_MEMBERSHIP: + case ZSOCK_IPV6_DROP_MEMBERSHIP: if (IS_ENABLED(CONFIG_NET_IPV6)) { return ipv6_multicast_group(ctx, optval, optlen, false); @@ -2894,7 +2893,7 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, break; - case IPV6_MULTICAST_LOOP: + case ZSOCK_IPV6_MULTICAST_LOOP: ret = net_context_set_option(ctx, NET_OPT_IPV6_MCAST_LOOP, optval, optlen); @@ -2913,12 +2912,12 @@ int zsock_setsockopt_ctx(struct net_context *ctx, int level, int optname, return -1; } -int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr, - socklen_t *addrlen) +int zsock_getpeername_ctx(struct net_context *ctx, struct net_sockaddr *addr, + net_socklen_t *addrlen) { - socklen_t newlen = 0; + net_socklen_t newlen = 0; - if (net_context_get_type(ctx) == SOCK_RAW) { + if (net_context_get_type(ctx) == NET_SOCK_RAW) { errno = EOPNOTSUPP; return -1; } @@ -2933,31 +2932,31 @@ int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr, return -1; } - if (net_context_get_type(ctx) == SOCK_STREAM && + if (net_context_get_type(ctx) == NET_SOCK_STREAM && net_context_get_state(ctx) != NET_CONTEXT_CONNECTED) { errno = ENOTCONN; return -1; } - if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == AF_INET) { - struct sockaddr_in addr4 = { 0 }; + if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->remote.sa_family == NET_AF_INET) { + struct net_sockaddr_in addr4 = { 0 }; - addr4.sin_family = AF_INET; + addr4.sin_family = NET_AF_INET; addr4.sin_port = net_sin(&ctx->remote)->sin_port; memcpy(&addr4.sin_addr, &net_sin(&ctx->remote)->sin_addr, - sizeof(struct in_addr)); - newlen = sizeof(struct sockaddr_in); + sizeof(struct net_in_addr)); + newlen = sizeof(struct net_sockaddr_in); memcpy(addr, &addr4, MIN(*addrlen, newlen)); } else if (IS_ENABLED(CONFIG_NET_IPV6) && - ctx->remote.sa_family == AF_INET6) { - struct sockaddr_in6 addr6 = { 0 }; + ctx->remote.sa_family == NET_AF_INET6) { + struct net_sockaddr_in6 addr6 = { 0 }; - addr6.sin6_family = AF_INET6; + addr6.sin6_family = NET_AF_INET6; addr6.sin6_port = net_sin6(&ctx->remote)->sin6_port; memcpy(&addr6.sin6_addr, &net_sin6(&ctx->remote)->sin6_addr, - sizeof(struct in6_addr)); - newlen = sizeof(struct sockaddr_in6); + sizeof(struct net_in6_addr)); + newlen = sizeof(struct net_sockaddr_in6); memcpy(addr, &addr6, MIN(*addrlen, newlen)); } else { @@ -2970,24 +2969,24 @@ int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr, return 0; } -int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr, - socklen_t *addrlen) +int zsock_getsockname_ctx(struct net_context *ctx, struct net_sockaddr *addr, + net_socklen_t *addrlen) { - socklen_t newlen = 0; + net_socklen_t newlen = 0; int ret; - if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == AF_INET) { - struct sockaddr_in addr4 = { 0 }; + if (IS_ENABLED(CONFIG_NET_IPV4) && ctx->local.family == NET_AF_INET) { + struct net_sockaddr_in addr4 = { 0 }; if (net_sin_ptr(&ctx->local)->sin_addr == NULL) { errno = EINVAL; return -1; } - newlen = sizeof(struct sockaddr_in); + newlen = sizeof(struct net_sockaddr_in); ret = net_context_get_local_addr(ctx, - (struct sockaddr *)&addr4, + (struct net_sockaddr *)&addr4, &newlen); if (ret < 0) { errno = -ret; @@ -2996,18 +2995,18 @@ int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr, memcpy(addr, &addr4, MIN(*addrlen, newlen)); - } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == AF_INET6) { - struct sockaddr_in6 addr6 = { 0 }; + } else if (IS_ENABLED(CONFIG_NET_IPV6) && ctx->local.family == NET_AF_INET6) { + struct net_sockaddr_in6 addr6 = { 0 }; if (net_sin6_ptr(&ctx->local)->sin6_addr == NULL) { errno = EINVAL; return -1; } - newlen = sizeof(struct sockaddr_in6); + newlen = sizeof(struct net_sockaddr_in6); ret = net_context_get_local_addr(ctx, - (struct sockaddr *)&addr6, + (struct net_sockaddr *)&addr6, &newlen); if (ret < 0) { errno = -ret; @@ -3045,19 +3044,19 @@ static int sock_ioctl_vmeth(void *obj, unsigned int request, va_list args) switch (request) { /* In Zephyr, fcntl() is just an alias of ioctl(). */ - case F_GETFL: + case ZVFS_F_GETFL: if (sock_is_nonblock(obj)) { - return O_NONBLOCK; + return ZVFS_O_NONBLOCK; } return 0; - case F_SETFL: { + case ZVFS_F_SETFL: { int flags; flags = va_arg(args, int); - if (flags & O_NONBLOCK) { + if (flags & ZVFS_O_NONBLOCK) { sock_set_flag(obj, SOCK_NONBLOCK, SOCK_NONBLOCK); } else { sock_set_flag(obj, SOCK_NONBLOCK, 0); @@ -3119,14 +3118,14 @@ static int sock_shutdown_vmeth(void *obj, int how) return zsock_shutdown_ctx(obj, how); } -static int sock_bind_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int sock_bind_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return zsock_bind_ctx(obj, addr, addrlen); } -static int sock_connect_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int sock_connect_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return zsock_connect_ctx(obj, addr, addrlen); } @@ -3136,46 +3135,46 @@ static int sock_listen_vmeth(void *obj, int backlog) return zsock_listen_ctx(obj, backlog); } -static int sock_accept_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int sock_accept_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { return zsock_accept_ctx(obj, addr, addrlen); } static ssize_t sock_sendto_vmeth(void *obj, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen) + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { return zsock_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen); } -static ssize_t sock_sendmsg_vmeth(void *obj, const struct msghdr *msg, +static ssize_t sock_sendmsg_vmeth(void *obj, const struct net_msghdr *msg, int flags) { return zsock_sendmsg_ctx(obj, msg, flags); } -static ssize_t sock_recvmsg_vmeth(void *obj, struct msghdr *msg, int flags) +static ssize_t sock_recvmsg_vmeth(void *obj, struct net_msghdr *msg, int flags) { return zsock_recvmsg_ctx(obj, msg, flags); } static ssize_t sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { return zsock_recvfrom_ctx(obj, buf, max_len, flags, src_addr, addrlen); } static int sock_getsockopt_vmeth(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { return zsock_getsockopt_ctx(obj, level, optname, optval, optlen); } static int sock_setsockopt_vmeth(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { return zsock_setsockopt_ctx(obj, level, optname, optval, optlen); } @@ -3184,14 +3183,14 @@ static int sock_close2_vmeth(void *obj, int fd) { return zsock_close_ctx(obj, fd); } -static int sock_getpeername_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int sock_getpeername_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { return zsock_getpeername_ctx(obj, addr, addrlen); } -static int sock_getsockname_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int sock_getsockname_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { return zsock_getsockname_ctx(obj, addr, addrlen); } @@ -3220,12 +3219,12 @@ const struct socket_op_vtable sock_fd_op_vtable = { static bool inet_is_supported(int family, int type, int proto) { - if (family != AF_INET && family != AF_INET6) { + if (family != NET_AF_INET && family != NET_AF_INET6) { return false; } return true; } -NET_SOCKET_REGISTER(af_inet46, NET_SOCKET_DEFAULT_PRIO, AF_UNSPEC, +NET_SOCKET_REGISTER(af_inet46, NET_SOCKET_DEFAULT_PRIO, NET_AF_UNSPEC, inet_is_supported, zsock_socket_internal); diff --git a/subsys/net/lib/sockets/sockets_internal.h b/subsys/net/lib/sockets/sockets_internal.h index dd5a4d5060f7b..647e2c4700586 100644 --- a/subsys/net/lib/sockets/sockets_internal.h +++ b/subsys/net/lib/sockets/sockets_internal.h @@ -53,7 +53,7 @@ static inline bool net_socket_is_tls(void *obj) #define sock_is_error(ctx) sock_get_flag(ctx, SOCK_ERROR) #define sock_set_error(ctx) sock_set_flag(ctx, SOCK_ERROR, SOCK_ERROR) -size_t msghdr_non_empty_iov_count(const struct msghdr *msg); +size_t msghdr_non_empty_iov_count(const struct net_msghdr *msg); #if defined(CONFIG_NET_SOCKETS_OBJ_CORE) int sock_obj_core_alloc(int sock, struct net_socket_register *reg, diff --git a/subsys/net/lib/sockets/sockets_net_mgmt.c b/subsys/net/lib/sockets/sockets_net_mgmt.c index dcb4194ec85df..c7dbb93d8a51d 100644 --- a/subsys/net/lib/sockets/sockets_net_mgmt.c +++ b/subsys/net/lib/sockets/sockets_net_mgmt.c @@ -5,7 +5,6 @@ */ #include -#include #include LOG_MODULE_REGISTER(net_sock_mgmt, CONFIG_NET_SOCKETS_LOG_LEVEL); @@ -87,12 +86,12 @@ int znet_mgmt_socket(int family, int type, int proto) } static int znet_mgmt_bind(struct net_mgmt_socket *mgmt, - const struct sockaddr *addr, - socklen_t addrlen) + const struct net_sockaddr *addr, + net_socklen_t addrlen) { - struct sockaddr_nm *nm_addr = (struct sockaddr_nm *)addr; + struct net_sockaddr_nm *nm_addr = (struct net_sockaddr_nm *)addr; - if (addrlen != sizeof(struct sockaddr_nm)) { + if (addrlen != sizeof(struct net_sockaddr_nm)) { return -EINVAL; } @@ -121,8 +120,8 @@ static int znet_mgmt_bind(struct net_mgmt_socket *mgmt, ssize_t znet_mgmt_sendto(struct net_mgmt_socket *mgmt, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen) + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { if (mgmt->proto == NET_MGMT_EVENT_PROTO) { /* For net_mgmt events, we only listen and never send */ @@ -140,10 +139,10 @@ ssize_t znet_mgmt_sendto(struct net_mgmt_socket *mgmt, static ssize_t znet_mgmt_recvfrom(struct net_mgmt_socket *mgmt, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { - struct sockaddr_nm *nm_addr = (struct sockaddr_nm *)src_addr; + struct net_sockaddr_nm *nm_addr = (struct net_sockaddr_nm *)src_addr; k_timeout_t timeout = mgmt->wait_timeout; uint64_t raised_event = 0; uint8_t *copy_to = buf; @@ -224,7 +223,7 @@ static ssize_t znet_mgmt_recvfrom(struct net_mgmt_socket *mgmt, void *buf, } static int znet_mgmt_getsockopt(struct net_mgmt_socket *mgmt, int level, - int optname, void *optval, socklen_t *optlen) + int optname, void *optval, net_socklen_t *optlen) { if (level != SOL_NET_MGMT_RAW || !optval || !optlen) { errno = EINVAL; @@ -261,7 +260,7 @@ static int znet_mgmt_getsockopt(struct net_mgmt_socket *mgmt, int level, static int znet_mgmt_setsockopt(struct net_mgmt_socket *mgmt, int level, int optname, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { if (level != SOL_NET_MGMT_RAW || !optval || !optlen) { errno = EINVAL; @@ -313,15 +312,15 @@ static int net_mgmt_sock_ioctl(void *obj, unsigned int request, return -1; } -static int net_mgmt_sock_bind(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int net_mgmt_sock_bind(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return znet_mgmt_bind(obj, addr, addrlen); } /* The connect() function is not needed */ -static int net_mgmt_sock_connect(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int net_mgmt_sock_connect(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return 0; } @@ -334,37 +333,37 @@ static int net_mgmt_sock_listen(void *obj, int backlog) return 0; } -static int net_mgmt_sock_accept(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int net_mgmt_sock_accept(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { return 0; } static ssize_t net_mgmt_sock_sendto(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { return znet_mgmt_sendto(obj, buf, len, flags, dest_addr, addrlen); } static ssize_t net_mgmt_sock_recvfrom(void *obj, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { return znet_mgmt_recvfrom(obj, buf, max_len, flags, src_addr, addrlen); } static int net_mgmt_sock_getsockopt(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { return znet_mgmt_getsockopt(obj, level, optname, optval, optlen); } static int net_mgmt_sock_setsockopt(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { return znet_mgmt_setsockopt(obj, level, optname, optval, optlen); } @@ -387,7 +386,7 @@ static const struct socket_op_vtable net_mgmt_sock_fd_op_vtable = { static bool net_mgmt_is_supported(int family, int type, int proto) { - if ((type != SOCK_RAW && type != SOCK_DGRAM) || + if ((type != NET_SOCK_RAW && type != NET_SOCK_DGRAM) || (proto != NET_MGMT_EVENT_PROTO)) { return false; } diff --git a/subsys/net/lib/sockets/sockets_packet.c b/subsys/net/lib/sockets/sockets_packet.c index 5ea90a00272e8..e047f81edb270 100644 --- a/subsys/net/lib/sockets/sockets_packet.c +++ b/subsys/net/lib/sockets/sockets_packet.c @@ -6,7 +6,6 @@ */ #include -#include #include LOG_MODULE_REGISTER(net_sock_packet, CONFIG_NET_SOCKETS_LOG_LEVEL); @@ -95,7 +94,7 @@ static int zpacket_socket(int family, int type, int proto) * we do not need to change the protocol field handling in * other part of the network stack. */ - proto = ntohs(proto); + proto = net_ntohs(proto); } ret = net_context_get(family, type, proto, &ctx); @@ -130,8 +129,8 @@ static int zpacket_socket(int family, int type, int proto) } static int zpacket_bind_ctx(struct net_context *ctx, - const struct sockaddr *addr, - socklen_t addrlen) + const struct net_sockaddr *addr, + net_socklen_t addrlen) { int ret = 0; @@ -155,7 +154,7 @@ static int zpacket_bind_ctx(struct net_context *ctx, } static void zpacket_set_eth_pkttype(struct net_if *iface, - struct sockaddr_ll *addr, + struct net_sockaddr_ll *addr, struct net_linkaddr *lladdr) { if (lladdr == NULL || lladdr->len == 0) { @@ -163,30 +162,30 @@ static void zpacket_set_eth_pkttype(struct net_if *iface, } if (net_eth_is_addr_broadcast((struct net_eth_addr *)lladdr->addr)) { - addr->sll_pkttype = PACKET_BROADCAST; + addr->sll_pkttype = NET_PACKET_BROADCAST; } else if (net_eth_is_addr_multicast( (struct net_eth_addr *)lladdr->addr)) { - addr->sll_pkttype = PACKET_MULTICAST; + addr->sll_pkttype = NET_PACKET_MULTICAST; } else if (!net_linkaddr_cmp(net_if_get_link_addr(iface), lladdr)) { - addr->sll_pkttype = PACKET_HOST; + addr->sll_pkttype = NET_PACKET_HOST; } else { - addr->sll_pkttype = PACKET_OTHERHOST; + addr->sll_pkttype = NET_PACKET_OTHERHOST; } } static void zpacket_set_source_addr(struct net_context *ctx, struct net_pkt *pkt, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { - struct sockaddr_ll addr = {0}; + struct net_sockaddr_ll addr = {0}; struct net_if *iface = net_context_get_iface(ctx); if (iface == NULL) { return; } - addr.sll_family = AF_PACKET; + addr.sll_family = NET_AF_PACKET; addr.sll_ifindex = net_if_get_by_iface(iface); if (net_pkt_is_l2_processed(pkt)) { @@ -197,10 +196,10 @@ static void zpacket_set_source_addr(struct net_context *ctx, memcpy(addr.sll_addr, pkt->lladdr_src.addr, MIN(sizeof(addr.sll_addr), pkt->lladdr_src.len)); - addr.sll_protocol = htons(net_pkt_ll_proto_type(pkt)); + addr.sll_protocol = net_htons(net_pkt_ll_proto_type(pkt)); if (net_if_get_link_addr(iface)->type == NET_LINK_ETHERNET) { - addr.sll_hatype = ARPHRD_ETHER; + addr.sll_hatype = NET_ARPHRD_ETHER; zpacket_set_eth_pkttype(iface, &addr, net_pkt_lladdr_dst(pkt)); } @@ -227,7 +226,7 @@ static void zpacket_set_source_addr(struct net_context *ctx, sizeof(struct net_eth_addr)); addr.sll_protocol = hdr->type; - addr.sll_hatype = ARPHRD_ETHER; + addr.sll_hatype = NET_ARPHRD_ETHER; (void)net_linkaddr_create(&dst_addr, hdr->dst.addr, sizeof(struct net_eth_addr), @@ -237,16 +236,16 @@ static void zpacket_set_source_addr(struct net_context *ctx, net_pkt_cursor_restore(pkt, &cur); } - /* Copy the result sockaddr_ll structure into provided buffer. If the + /* Copy the result net_sockaddr_ll structure into provided buffer. If the * buffer is smaller than the structure size, it will be truncated. */ - memcpy(src_addr, &addr, MIN(sizeof(struct sockaddr_ll), *addrlen)); - *addrlen = sizeof(struct sockaddr_ll); + memcpy(src_addr, &addr, MIN(sizeof(struct net_sockaddr_ll), *addrlen)); + *addrlen = sizeof(struct net_sockaddr_ll); } ssize_t zpacket_sendto_ctx(struct net_context *ctx, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen) + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { k_timeout_t timeout = K_FOREVER; int status; @@ -272,7 +271,7 @@ ssize_t zpacket_sendto_ctx(struct net_context *ctx, const void *buf, size_t len, return status; } -ssize_t zpacket_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg, +ssize_t zpacket_sendmsg_ctx(struct net_context *ctx, const struct net_msghdr *msg, int flags) { k_timeout_t timeout = K_FOREVER; @@ -294,8 +293,8 @@ ssize_t zpacket_sendmsg_ctx(struct net_context *ctx, const struct msghdr *msg, } ssize_t zpacket_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { size_t recv_len = 0; k_timeout_t timeout = K_FOREVER; @@ -360,7 +359,7 @@ ssize_t zpacket_recvfrom_ctx(struct net_context *ctx, void *buf, size_t max_len, } int zpacket_getsockopt_ctx(struct net_context *ctx, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { if (!optval || !optlen) { errno = EINVAL; @@ -372,7 +371,7 @@ int zpacket_getsockopt_ctx(struct net_context *ctx, int level, int optname, } int zpacket_setsockopt_ctx(struct net_context *ctx, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { return sock_fd_op_vtable.setsockopt(ctx, level, optname, optval, optlen); @@ -398,15 +397,15 @@ static int packet_sock_ioctl_vmeth(void *obj, unsigned int request, /* * TODO: A packet socket can be bound to a network device using SO_BINDTODEVICE. */ -static int packet_sock_bind_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int packet_sock_bind_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return zpacket_bind_ctx(obj, addr, addrlen); } /* The connect() function is no longer necessary. */ -static int packet_sock_connect_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int packet_sock_connect_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return -EOPNOTSUPP; } @@ -421,42 +420,42 @@ static int packet_sock_listen_vmeth(void *obj, int backlog) return -EOPNOTSUPP; } -static int packet_sock_accept_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int packet_sock_accept_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { return -EOPNOTSUPP; } static ssize_t packet_sock_sendto_vmeth(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { return zpacket_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen); } -static ssize_t packet_sock_sendmsg_vmeth(void *obj, const struct msghdr *msg, +static ssize_t packet_sock_sendmsg_vmeth(void *obj, const struct net_msghdr *msg, int flags) { return zpacket_sendmsg_ctx(obj, msg, flags); } static ssize_t packet_sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { return zpacket_recvfrom_ctx(obj, buf, max_len, flags, src_addr, addrlen); } static int packet_sock_getsockopt_vmeth(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { return zpacket_getsockopt_ctx(obj, level, optname, optval, optlen); } static int packet_sock_setsockopt_vmeth(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { return zpacket_setsockopt_ctx(obj, level, optname, optval, optlen); } @@ -487,14 +486,14 @@ static const struct socket_op_vtable packet_sock_fd_op_vtable = { static bool packet_is_supported(int family, int type, int proto) { switch (type) { - case SOCK_RAW: - proto = ntohs(proto); + case NET_SOCK_RAW: + proto = net_ntohs(proto); return proto == 0 || proto == ETH_P_ALL || proto == ETH_P_ECAT || proto == ETH_P_IEEE802154; - case SOCK_DGRAM: + case NET_SOCK_DGRAM: return true; default: @@ -502,5 +501,5 @@ static bool packet_is_supported(int family, int type, int proto) } } -NET_SOCKET_REGISTER(af_packet, NET_SOCKET_DEFAULT_PRIO, AF_PACKET, +NET_SOCKET_REGISTER(af_packet, NET_SOCKET_DEFAULT_PRIO, NET_AF_PACKET, packet_is_supported, zpacket_socket); diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c index 2ccca60a34df5..da94cced70d6b 100644 --- a/subsys/net/lib/sockets/sockets_tls.c +++ b/subsys/net/lib/sockets/sockets_tls.c @@ -6,7 +6,6 @@ */ #include -#include #include LOG_MODULE_REGISTER(net_sock_tls, CONFIG_NET_SOCKETS_LOG_LEVEL); @@ -105,7 +104,7 @@ struct tls_session_cache { int64_t timestamp; /** Peer address. */ - struct sockaddr peer_addr; + struct net_sockaddr peer_addr; /** Session buffer. */ uint8_t *session; @@ -221,10 +220,10 @@ __net_socket struct tls_context { mbedtls_ssl_cookie_ctx cookie; /** DTLS peer address. */ - struct sockaddr dtls_peer_addr; + struct net_sockaddr dtls_peer_addr; /** DTLS peer address length. */ - socklen_t dtls_peer_addrlen; + net_socklen_t dtls_peer_addrlen; #endif /* CONFIG_NET_SOCKETS_ENABLE_DTLS */ #if defined(CONFIG_MBEDTLS) @@ -428,7 +427,7 @@ static inline void tls_set_max_frag_len(mbedtls_ssl_config *config, enum net_soc size_t len = MBEDTLS_TLS_EXT_ADV_CONTENT_LEN; #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) - if (type == SOCK_DGRAM && len > CONFIG_NET_SOCKETS_DTLS_MAX_FRAGMENT_LENGTH) { + if (type == NET_SOCK_DGRAM && len > CONFIG_NET_SOCKETS_DTLS_MAX_FRAGMENT_LENGTH) { len = CONFIG_NET_SOCKETS_DTLS_MAX_FRAGMENT_LENGTH; } #endif @@ -551,22 +550,22 @@ static int tls_release(struct tls_context *tls) return 0; } -static bool peer_addr_cmp(const struct sockaddr *addr, - const struct sockaddr *peer_addr) +static bool peer_addr_cmp(const struct net_sockaddr *addr, + const struct net_sockaddr *peer_addr) { if (addr->sa_family != peer_addr->sa_family) { return false; } - if (IS_ENABLED(CONFIG_NET_IPV6) && peer_addr->sa_family == AF_INET6) { - struct sockaddr_in6 *addr1 = net_sin6(peer_addr); - struct sockaddr_in6 *addr2 = net_sin6(addr); + if (IS_ENABLED(CONFIG_NET_IPV6) && peer_addr->sa_family == NET_AF_INET6) { + struct net_sockaddr_in6 *addr1 = net_sin6(peer_addr); + struct net_sockaddr_in6 *addr2 = net_sin6(addr); return (addr1->sin6_port == addr2->sin6_port) && net_ipv6_addr_cmp(&addr1->sin6_addr, &addr2->sin6_addr); - } else if (IS_ENABLED(CONFIG_NET_IPV4) && peer_addr->sa_family == AF_INET) { - struct sockaddr_in *addr1 = net_sin(peer_addr); - struct sockaddr_in *addr2 = net_sin(addr); + } else if (IS_ENABLED(CONFIG_NET_IPV4) && peer_addr->sa_family == NET_AF_INET) { + struct net_sockaddr_in *addr1 = net_sin(peer_addr); + struct net_sockaddr_in *addr2 = net_sin(addr); return (addr1->sin_port == addr2->sin_port) && net_ipv4_addr_cmp(&addr1->sin_addr, &addr2->sin_addr); @@ -575,7 +574,7 @@ static bool peer_addr_cmp(const struct sockaddr *addr, return false; } -static int tls_session_save(const struct sockaddr *peer_addr, +static int tls_session_save(const struct net_sockaddr *peer_addr, mbedtls_ssl_session *session) { struct tls_session_cache *entry = NULL; @@ -635,7 +634,7 @@ static int tls_session_save(const struct sockaddr *peer_addr, return 0; } -static int tls_session_get(const struct sockaddr *peer_addr, +static int tls_session_get(const struct net_sockaddr *peer_addr, mbedtls_ssl_session *session) { struct tls_session_cache *entry = NULL; @@ -667,11 +666,11 @@ static int tls_session_get(const struct sockaddr *peer_addr, } static void tls_session_store(struct tls_context *context, - const struct sockaddr *addr, - socklen_t addrlen) + const struct net_sockaddr *addr, + net_socklen_t addrlen) { mbedtls_ssl_session session; - struct sockaddr peer_addr = { 0 }; + struct net_sockaddr peer_addr = { 0 }; int ret; if (!context->options.cache_enabled) { @@ -697,11 +696,11 @@ static void tls_session_store(struct tls_context *context, } static void tls_session_restore(struct tls_context *context, - const struct sockaddr *addr, - socklen_t addrlen) + const struct net_sockaddr *addr, + net_socklen_t addrlen) { mbedtls_ssl_session session; - struct sockaddr peer_addr = { 0 }; + struct net_sockaddr peer_addr = { 0 }; int ret; if (!context->options.cache_enabled) { @@ -763,9 +762,9 @@ static int wait(int sock, int timeout, int event) if (fds.revents & ZSOCK_POLLERR) { int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); - if (zsock_getsockopt(fds.fd, SOL_SOCKET, SO_ERROR, + if (zsock_getsockopt(fds.fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_ERROR, &optval, &optlen) == 0) { NET_ERR("TLS underlying socket poll error %d", -optval); @@ -797,13 +796,13 @@ static int wait_for_reason(int sock, int timeout, int reason) static bool is_blocking(int sock, int flags) { - int sock_flags = zsock_fcntl(sock, F_GETFL, 0); + int sock_flags = zsock_fcntl(sock, ZVFS_F_GETFL, 0); if (sock_flags == -1) { return false; } - return !((flags & ZSOCK_MSG_DONTWAIT) || (sock_flags & O_NONBLOCK)); + return !((flags & ZSOCK_MSG_DONTWAIT) || (sock_flags & ZVFS_O_NONBLOCK)); } static int timeout_to_ms(k_timeout_t *timeout) @@ -824,8 +823,8 @@ static void ctx_set_lock(struct tls_context *ctx, struct k_mutex *lock) #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) static bool dtls_is_peer_addr_valid(struct tls_context *context, - const struct sockaddr *peer_addr, - socklen_t addrlen) + const struct net_sockaddr *peer_addr, + net_socklen_t addrlen) { if (context->dtls_peer_addrlen != addrlen) { return false; @@ -835,8 +834,8 @@ static bool dtls_is_peer_addr_valid(struct tls_context *context, } static void dtls_peer_address_set(struct tls_context *context, - const struct sockaddr *peer_addr, - socklen_t addrlen) + const struct net_sockaddr *peer_addr, + net_socklen_t addrlen) { if (addrlen <= sizeof(context->dtls_peer_addr)) { memcpy(&context->dtls_peer_addr, peer_addr, addrlen); @@ -845,10 +844,10 @@ static void dtls_peer_address_set(struct tls_context *context, } static void dtls_peer_address_get(struct tls_context *context, - struct sockaddr *peer_addr, - socklen_t *addrlen) + struct net_sockaddr *peer_addr, + net_socklen_t *addrlen) { - socklen_t len = MIN(context->dtls_peer_addrlen, *addrlen); + net_socklen_t len = MIN(context->dtls_peer_addrlen, *addrlen); memcpy(peer_addr, &context->dtls_peer_addr, len); *addrlen = len; @@ -876,8 +875,8 @@ static int dtls_tx(void *ctx, const unsigned char *buf, size_t len) static int dtls_rx(void *ctx, unsigned char *buf, size_t len) { struct tls_context *tls_ctx = ctx; - socklen_t addrlen = sizeof(struct sockaddr); - struct sockaddr addr; + net_socklen_t addrlen = sizeof(struct net_sockaddr); + struct net_sockaddr addr; int err; ssize_t received; @@ -966,7 +965,7 @@ static int tls_add_ca_certificate(struct tls_context *tls, #if defined(MBEDTLS_X509_CRT_PARSE_C) int err; - if (tls->options.cert_nocopy == TLS_CERT_NOCOPY_NONE || + if (tls->options.cert_nocopy == ZSOCK_TLS_CERT_NOCOPY_NONE || crt_is_pem(ca_cert->buf, ca_cert->len)) { err = mbedtls_x509_crt_parse(&tls->ca_chain, ca_cert->buf, ca_cert->len); @@ -1002,7 +1001,7 @@ static int tls_add_own_cert(struct tls_context *tls, #if defined(MBEDTLS_X509_CRT_PARSE_C) int err; - if (tls->options.cert_nocopy == TLS_CERT_NOCOPY_NONE || + if (tls->options.cert_nocopy == ZSOCK_TLS_CERT_NOCOPY_NONE || crt_is_pem(own_cert->buf, own_cert->len)) { err = mbedtls_x509_crt_parse(&tls->own_cert, own_cert->buf, own_cert->len); @@ -1218,7 +1217,7 @@ static int tls_mbedtls_handshake(struct tls_context *context, timeout_ms = timeout_to_ms(&timeout); #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) - if (context->type == SOCK_DGRAM) { + if (context->type == NET_SOCK_DGRAM) { int timeout_dtls = dtls_get_remaining_timeout(context); @@ -1295,7 +1294,7 @@ static int tls_mbedtls_init(struct tls_context *context, bool is_server) role = is_server ? MBEDTLS_SSL_IS_SERVER : MBEDTLS_SSL_IS_CLIENT; - type = (context->type == SOCK_STREAM) ? + type = (context->type == NET_SOCK_STREAM) ? MBEDTLS_SSL_TRANSPORT_STREAM : MBEDTLS_SSL_TRANSPORT_DATAGRAM; @@ -1615,7 +1614,7 @@ static int tls_check_credentials(const sec_tag_t *sec_tags, int sec_tag_count) } static int tls_opt_sec_tag_list_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int sec_tag_cnt; int ret; @@ -1646,7 +1645,7 @@ static int tls_opt_sec_tag_list_set(struct tls_context *context, } static int sock_opt_protocol_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int protocol = (int)context->tls_version; @@ -1660,7 +1659,7 @@ static int sock_opt_protocol_get(struct tls_context *context, } static int tls_opt_sec_tag_list_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int len; @@ -1678,7 +1677,7 @@ static int tls_opt_sec_tag_list_get(struct tls_context *context, } static int tls_opt_hostname_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { ARG_UNUSED(optlen); @@ -1696,7 +1695,7 @@ static int tls_opt_hostname_set(struct tls_context *context, } static int tls_opt_ciphersuite_list_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int cipher_cnt; @@ -1724,7 +1723,7 @@ static int tls_opt_ciphersuite_list_set(struct tls_context *context, } static int tls_opt_ciphersuite_list_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { const int *selected_ciphers; int cipher_cnt, i = 0; @@ -1756,7 +1755,7 @@ static int tls_opt_ciphersuite_list_get(struct tls_context *context, } static int tls_opt_ciphersuite_used_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { const char *ciph; @@ -1775,7 +1774,7 @@ static int tls_opt_ciphersuite_used_get(struct tls_context *context, } static int tls_opt_alpn_list_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int alpn_cnt; @@ -1805,7 +1804,7 @@ static int tls_opt_alpn_list_set(struct tls_context *context, #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) static int tls_opt_dtls_handshake_timeout_get(struct tls_context *context, - void *optval, socklen_t *optlen, + void *optval, net_socklen_t *optlen, bool is_max) { uint32_t *val = (uint32_t *)optval; @@ -1825,7 +1824,7 @@ static int tls_opt_dtls_handshake_timeout_get(struct tls_context *context, static int tls_opt_dtls_handshake_timeout_set(struct tls_context *context, const void *optval, - socklen_t optlen, bool is_max) + net_socklen_t optlen, bool is_max) { uint32_t *val = (uint32_t *)optval; @@ -1857,7 +1856,7 @@ static int tls_opt_dtls_handshake_timeout_set(struct tls_context *context, } static int tls_opt_dtls_connection_id_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { #if defined(CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID) int value; @@ -1907,7 +1906,7 @@ static int tls_opt_dtls_connection_id_set(struct tls_context *context, static int tls_opt_dtls_connection_id_value_set(struct tls_context *context, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { #if defined(CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID) if (optlen > 0 && optval == NULL) { @@ -1928,7 +1927,7 @@ static int tls_opt_dtls_connection_id_value_set(struct tls_context *context, } static int tls_opt_dtls_connection_id_value_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { #if defined(CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID) @@ -1947,7 +1946,7 @@ static int tls_opt_dtls_connection_id_value_get(struct tls_context *context, static int tls_opt_dtls_peer_connection_id_value_get(struct tls_context *context, void *optval, - socklen_t *optlen) + net_socklen_t *optlen) { #if defined(CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID) int enabled = false; @@ -1971,7 +1970,7 @@ static int tls_opt_dtls_peer_connection_id_value_get(struct tls_context *context } static int tls_opt_dtls_connection_id_status_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { #if defined(CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID) struct tls_dtls_cid cid; @@ -2022,7 +2021,7 @@ static int tls_opt_dtls_connection_id_status_get(struct tls_context *context, static int tls_opt_dtls_handshake_on_connect_set(struct tls_context *context, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { int *val = (int *)optval; @@ -2041,7 +2040,7 @@ static int tls_opt_dtls_handshake_on_connect_set(struct tls_context *context, static int tls_opt_dtls_handshake_on_connect_get(struct tls_context *context, void *optval, - socklen_t *optlen) + net_socklen_t *optlen) { if (*optlen != sizeof(int)) { return -EINVAL; @@ -2054,7 +2053,7 @@ static int tls_opt_dtls_handshake_on_connect_get(struct tls_context *context, #endif /* CONFIG_NET_SOCKETS_ENABLE_DTLS */ static int tls_opt_alpn_list_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { const char **alpn_list = context->options.alpn_list; int alpn_cnt, i = 0; @@ -2083,7 +2082,7 @@ static int tls_opt_alpn_list_get(struct tls_context *context, } static int tls_opt_session_cache_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int *val = (int *)optval; @@ -2095,17 +2094,17 @@ static int tls_opt_session_cache_set(struct tls_context *context, return -EINVAL; } - context->options.cache_enabled = (*val == TLS_SESSION_CACHE_ENABLED); + context->options.cache_enabled = (*val == ZSOCK_TLS_SESSION_CACHE_ENABLED); return 0; } static int tls_opt_session_cache_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int cache_enabled = context->options.cache_enabled ? - TLS_SESSION_CACHE_ENABLED : - TLS_SESSION_CACHE_DISABLED; + ZSOCK_TLS_SESSION_CACHE_ENABLED : + ZSOCK_TLS_SESSION_CACHE_DISABLED; if (*optlen != sizeof(cache_enabled)) { return -EINVAL; @@ -2117,7 +2116,7 @@ static int tls_opt_session_cache_get(struct tls_context *context, } static int tls_opt_cert_verify_result_get(struct tls_context *context, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { if (*optlen != sizeof(uint32_t)) { return -EINVAL; @@ -2129,7 +2128,7 @@ static int tls_opt_cert_verify_result_get(struct tls_context *context, } static int tls_opt_session_cache_purge_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { ARG_UNUSED(context); ARG_UNUSED(optval); @@ -2141,7 +2140,7 @@ static int tls_opt_session_cache_purge_set(struct tls_context *context, } static int tls_opt_peer_verify_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int *peer_verify; @@ -2167,7 +2166,7 @@ static int tls_opt_peer_verify_set(struct tls_context *context, } static int tls_opt_cert_nocopy_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int *cert_nocopy; @@ -2181,8 +2180,8 @@ static int tls_opt_cert_nocopy_set(struct tls_context *context, cert_nocopy = (int *)optval; - if (*cert_nocopy != TLS_CERT_NOCOPY_NONE && - *cert_nocopy != TLS_CERT_NOCOPY_OPTIONAL) { + if (*cert_nocopy != ZSOCK_TLS_CERT_NOCOPY_NONE && + *cert_nocopy != ZSOCK_TLS_CERT_NOCOPY_OPTIONAL) { return -EINVAL; } @@ -2192,7 +2191,7 @@ static int tls_opt_cert_nocopy_set(struct tls_context *context, } static int tls_opt_dtls_role_set(struct tls_context *context, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int *role; @@ -2218,7 +2217,7 @@ static int tls_opt_dtls_role_set(struct tls_context *context, #if defined(CONFIG_NET_SOCKETS_TLS_CERT_VERIFY_CALLBACK) static int tls_opt_cert_verify_callback_set(struct tls_context *context, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { struct tls_cert_verify_cb *cert_verify; @@ -2242,7 +2241,7 @@ static int tls_opt_cert_verify_callback_set(struct tls_context *context, #else /* CONFIG_NET_SOCKETS_TLS_CERT_VERIFY_CALLBACK */ static int tls_opt_cert_verify_callback_set(struct tls_context *context, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { NET_ERR("TLS_CERT_VERIFY_CALLBACK option requires " "CONFIG_NET_SOCKETS_TLS_CERT_VERIFY_CALLBACK enabled"); @@ -2253,26 +2252,26 @@ static int tls_opt_cert_verify_callback_set(struct tls_context *context, static int protocol_check(int family, int type, int *proto) { - if (family != AF_INET && family != AF_INET6) { + if (family != NET_AF_INET && family != NET_AF_INET6) { return -EAFNOSUPPORT; } - if (*proto >= IPPROTO_TLS_1_0 && *proto <= IPPROTO_TLS_1_3) { - if (type != SOCK_STREAM) { + if (*proto >= NET_IPPROTO_TLS_1_0 && *proto <= NET_IPPROTO_TLS_1_3) { + if (type != NET_SOCK_STREAM) { return -EPROTOTYPE; } - *proto = IPPROTO_TCP; - } else if (*proto >= IPPROTO_DTLS_1_0 && *proto <= IPPROTO_DTLS_1_2) { + *proto = NET_IPPROTO_TCP; + } else if (*proto >= NET_IPPROTO_DTLS_1_0 && *proto <= NET_IPPROTO_DTLS_1_2) { if (!IS_ENABLED(CONFIG_NET_SOCKETS_ENABLE_DTLS)) { return -EPROTONOSUPPORT; } - if (type != SOCK_DGRAM) { + if (type != NET_SOCK_DGRAM) { return -EPROTOTYPE; } - *proto = IPPROTO_UDP; + *proto = NET_IPPROTO_UDP; } else { return -EPROTONOSUPPORT; } @@ -2310,7 +2309,7 @@ static int ztls_socket(int family, int type, int proto) } ctx->tls_version = tls_proto; - ctx->type = (proto == IPPROTO_TCP) ? SOCK_STREAM : SOCK_DGRAM; + ctx->type = (proto == NET_IPPROTO_TCP) ? NET_SOCK_STREAM : NET_SOCK_DGRAM; ctx->sock = sock; zvfs_finalize_typed_fd(fd, ctx, (const struct fd_op_vtable *)&tls_sock_fd_op_vtable, @@ -2355,22 +2354,22 @@ int ztls_close_ctx(struct tls_context *ctx, int sock) return ret; } -int ztls_connect_ctx(struct tls_context *ctx, const struct sockaddr *addr, - socklen_t addrlen) +int ztls_connect_ctx(struct tls_context *ctx, const struct net_sockaddr *addr, + net_socklen_t addrlen) { int ret; int sock_flags; bool is_non_block; - sock_flags = zsock_fcntl(ctx->sock, F_GETFL, 0); + sock_flags = zsock_fcntl(ctx->sock, ZVFS_F_GETFL, 0); if (sock_flags < 0) { return -EIO; } - is_non_block = sock_flags & O_NONBLOCK; + is_non_block = sock_flags & ZVFS_O_NONBLOCK; if (is_non_block) { - (void)zsock_fcntl(ctx->sock, F_SETFL, - sock_flags & ~O_NONBLOCK); + (void)zsock_fcntl(ctx->sock, ZVFS_F_SETFL, + sock_flags & ~ZVFS_O_NONBLOCK); } ret = zsock_connect(ctx->sock, addr, addrlen); @@ -2379,18 +2378,18 @@ int ztls_connect_ctx(struct tls_context *ctx, const struct sockaddr *addr, } if (is_non_block) { - (void)zsock_fcntl(ctx->sock, F_SETFL, sock_flags); + (void)zsock_fcntl(ctx->sock, ZVFS_F_SETFL, sock_flags); } #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) - if (ctx->type == SOCK_DGRAM) { + if (ctx->type == NET_SOCK_DGRAM) { dtls_peer_address_set(ctx, addr, addrlen); } #endif - if (ctx->type == SOCK_STREAM + if (ctx->type == NET_SOCK_STREAM #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) - || (ctx->type == SOCK_DGRAM && ctx->options.dtls_handshake_on_connect) + || (ctx->type == NET_SOCK_DGRAM && ctx->options.dtls_handshake_on_connect) #endif ) { ret = tls_mbedtls_init(ctx, false); @@ -2426,8 +2425,8 @@ int ztls_connect_ctx(struct tls_context *ctx, const struct sockaddr *addr, return -1; } -int ztls_accept_ctx(struct tls_context *parent, struct sockaddr *addr, - socklen_t *addrlen) +int ztls_accept_ctx(struct tls_context *parent, struct net_sockaddr *addr, + net_socklen_t *addrlen) { struct tls_context *child = NULL; int ret, err, fd, sock; @@ -2575,8 +2574,8 @@ static ssize_t send_tls(struct tls_context *ctx, const void *buf, #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) static ssize_t sendto_dtls_client(struct tls_context *ctx, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { int ret; @@ -2635,8 +2634,8 @@ static ssize_t sendto_dtls_client(struct tls_context *ctx, const void *buf, static ssize_t sendto_dtls_server(struct tls_context *ctx, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { /* For DTLS server, require to have established DTLS connection * in order to send data. @@ -2658,13 +2657,13 @@ static ssize_t sendto_dtls_server(struct tls_context *ctx, const void *buf, #endif /* CONFIG_NET_SOCKETS_ENABLE_DTLS */ ssize_t ztls_sendto_ctx(struct tls_context *ctx, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen) + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { ctx->flags = flags; /* TLS */ - if (ctx->type == SOCK_STREAM) { + if (ctx->type == NET_SOCK_STREAM) { return send_tls(ctx, buf, len, flags); } @@ -2683,7 +2682,7 @@ ssize_t ztls_sendto_ctx(struct tls_context *ctx, const void *buf, size_t len, } static ssize_t dtls_sendmsg_merge_and_send(struct tls_context *ctx, - const struct msghdr *msg, + const struct net_msghdr *msg, int flags) { static K_MUTEX_DEFINE(sendmsg_lock); @@ -2693,7 +2692,7 @@ static ssize_t dtls_sendmsg_merge_and_send(struct tls_context *ctx, k_mutex_lock(&sendmsg_lock, K_FOREVER); for (int i = 0; i < msg->msg_iovlen; i++) { - struct iovec *vec = msg->msg_iov + i; + struct net_iovec *vec = msg->msg_iov + i; if (vec->iov_len > 0) { if (len + vec->iov_len > sizeof(sendmsg_buf)) { @@ -2718,14 +2717,14 @@ static ssize_t dtls_sendmsg_merge_and_send(struct tls_context *ctx, } static ssize_t tls_sendmsg_loop_and_send(struct tls_context *ctx, - const struct msghdr *msg, + const struct net_msghdr *msg, int flags) { ssize_t len = 0; ssize_t ret; for (int i = 0; i < msg->msg_iovlen; i++) { - struct iovec *vec = msg->msg_iov + i; + struct net_iovec *vec = msg->msg_iov + i; size_t sent = 0; if (vec->iov_len == 0) { @@ -2749,7 +2748,7 @@ static ssize_t tls_sendmsg_loop_and_send(struct tls_context *ctx, return len; } -ssize_t ztls_sendmsg_ctx(struct tls_context *ctx, const struct msghdr *msg, +ssize_t ztls_sendmsg_ctx(struct tls_context *ctx, const struct net_msghdr *msg, int flags) { if (msg == NULL) { @@ -2758,7 +2757,7 @@ ssize_t ztls_sendmsg_ctx(struct tls_context *ctx, const struct msghdr *msg, } if (IS_ENABLED(CONFIG_NET_SOCKETS_ENABLE_DTLS) && - ctx->type == SOCK_DGRAM) { + ctx->type == NET_SOCK_DGRAM) { if (DTLS_SENDMSG_BUF_SIZE > 0) { /* With one buffer only, there's no need to use * intermediate buffer. @@ -2888,8 +2887,8 @@ static ssize_t recv_tls(struct tls_context *ctx, void *buf, #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) static ssize_t recvfrom_dtls_common(struct tls_context *ctx, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { int ret; bool is_block = is_blocking(ctx->sock, flags); @@ -2995,8 +2994,8 @@ static ssize_t recvfrom_dtls_common(struct tls_context *ctx, void *buf, static ssize_t recvfrom_dtls_client(struct tls_context *ctx, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { int ret; @@ -3061,8 +3060,8 @@ static ssize_t recvfrom_dtls_client(struct tls_context *ctx, void *buf, static ssize_t recvfrom_dtls_server(struct tls_context *ctx, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { int ret; bool repeat; @@ -3162,8 +3161,8 @@ static ssize_t recvfrom_dtls_server(struct tls_context *ctx, void *buf, #endif /* CONFIG_NET_SOCKETS_ENABLE_DTLS */ ssize_t ztls_recvfrom_ctx(struct tls_context *ctx, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { if (flags & ZSOCK_MSG_PEEK) { /* TODO mbedTLS does not support 'peeking' This could be @@ -3176,7 +3175,7 @@ ssize_t ztls_recvfrom_ctx(struct tls_context *ctx, void *buf, size_t max_len, ctx->flags = flags; /* TLS */ - if (ctx->type == SOCK_STREAM) { + if (ctx->type == NET_SOCK_STREAM) { return recv_tls(ctx, buf, max_len, flags); } @@ -3224,7 +3223,7 @@ static int ztls_poll_prepare_ctx(struct tls_context *ctx, /* DTLS client should wait for the handshake to complete before * it actually starts to poll for data. */ - if ((pfd->events & ZSOCK_POLLIN) && (ctx->type == SOCK_DGRAM) && + if ((pfd->events & ZSOCK_POLLIN) && (ctx->type == NET_SOCK_DGRAM) && (ctx->options.role == MBEDTLS_SSL_IS_CLIENT) && !is_handshake_complete(ctx)) { (*pev)->obj = &ctx->tls_established; @@ -3273,7 +3272,7 @@ static int ztls_socket_data_check(struct tls_context *ctx) { int ret; - if (ctx->type == SOCK_STREAM) { + if (ctx->type == NET_SOCK_STREAM) { if (!ctx->is_initialized) { return -ENOTCONN; } @@ -3322,7 +3321,7 @@ static int ztls_socket_data_check(struct tls_context *ctx) * resetting the context would result in an error instead * of 0 in a consecutive recv() call. */ - if (ctx->type == SOCK_DGRAM) { + if (ctx->type == NET_SOCK_DGRAM) { ret = tls_mbedtls_reset(ctx); if (ret != 0) { return -ENOMEM; @@ -3349,7 +3348,7 @@ static int ztls_socket_data_check(struct tls_context *ctx) } #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) - if (ret == MBEDTLS_ERR_SSL_TIMEOUT && ctx->type == SOCK_DGRAM) { + if (ret == MBEDTLS_ERR_SSL_TIMEOUT && ctx->type == NET_SOCK_DGRAM) { /* DTLS timeout interpreted as closing of connection. */ return -ENOTCONN; } @@ -3373,7 +3372,7 @@ static int ztls_poll_update_pollin(int fd, struct tls_context *ctx, } } - if (ctx->type == SOCK_STREAM) { + if (ctx->type == NET_SOCK_STREAM) { if (!(pfd->revents & ZSOCK_POLLIN)) { /* No new data on a socket. */ goto next; @@ -3398,7 +3397,7 @@ static int ztls_poll_update_pollin(int fd, struct tls_context *ctx, /* Datagram does not return 0 on consecutive recv, but an error * code, hence clear POLLIN. */ - if (ctx->type == SOCK_DGRAM) { + if (ctx->type == NET_SOCK_DGRAM) { pfd->revents &= ~ZSOCK_POLLIN; } pfd->revents |= ZSOCK_POLLHUP; @@ -3503,7 +3502,7 @@ static bool poll_offload_dtls_client_retry(struct tls_context *ctx, /* DTLS client should wait for the handshake to complete before it * reports that data is ready. */ - if ((ctx->type != SOCK_DGRAM) || + if ((ctx->type != NET_SOCK_DGRAM) || (ctx->options.role != MBEDTLS_SSL_IS_CLIENT)) { return false; } @@ -3649,7 +3648,7 @@ static int ztls_poll_offload(struct zsock_pollfd *fds, int nfds, int timeout) } int ztls_getsockopt_ctx(struct tls_context *ctx, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { int err; @@ -3658,7 +3657,7 @@ int ztls_getsockopt_ctx(struct tls_context *ctx, int level, int optname, return -1; } - if ((level == SOL_SOCKET) && (optname == SO_PROTOCOL)) { + if ((level == ZSOCK_SOL_SOCKET) && (optname == ZSOCK_SO_PROTOCOL)) { /* Protocol type is overridden during socket creation. Its * value is restored here to return current value. */ @@ -3675,7 +3674,7 @@ int ztls_getsockopt_ctx(struct tls_context *ctx, int level, int optname, * Otherwise, forward the SO_ERROR option request to the underlying * TCP/UDP socket to handle. */ - if ((level == SOL_SOCKET) && (optname == SO_ERROR) && ctx->error != 0) { + if ((level == ZSOCK_SOL_SOCKET) && (optname == ZSOCK_SO_ERROR) && ctx->error != 0) { if (*optlen != sizeof(int)) { errno = EINVAL; return -1; @@ -3686,62 +3685,62 @@ int ztls_getsockopt_ctx(struct tls_context *ctx, int level, int optname, return 0; } - if (level != SOL_TLS) { + if (level != ZSOCK_SOL_TLS) { return zsock_getsockopt(ctx->sock, level, optname, optval, optlen); } switch (optname) { - case TLS_SEC_TAG_LIST: + case ZSOCK_TLS_SEC_TAG_LIST: err = tls_opt_sec_tag_list_get(ctx, optval, optlen); break; - case TLS_CIPHERSUITE_LIST: + case ZSOCK_TLS_CIPHERSUITE_LIST: err = tls_opt_ciphersuite_list_get(ctx, optval, optlen); break; - case TLS_CIPHERSUITE_USED: + case ZSOCK_TLS_CIPHERSUITE_USED: err = tls_opt_ciphersuite_used_get(ctx, optval, optlen); break; - case TLS_ALPN_LIST: + case ZSOCK_TLS_ALPN_LIST: err = tls_opt_alpn_list_get(ctx, optval, optlen); break; - case TLS_SESSION_CACHE: + case ZSOCK_TLS_SESSION_CACHE: err = tls_opt_session_cache_get(ctx, optval, optlen); break; - case TLS_CERT_VERIFY_RESULT: + case ZSOCK_TLS_CERT_VERIFY_RESULT: err = tls_opt_cert_verify_result_get(ctx, optval, optlen); break; #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) - case TLS_DTLS_HANDSHAKE_TIMEOUT_MIN: + case ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MIN: err = tls_opt_dtls_handshake_timeout_get(ctx, optval, optlen, false); break; - case TLS_DTLS_HANDSHAKE_TIMEOUT_MAX: + case ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MAX: err = tls_opt_dtls_handshake_timeout_get(ctx, optval, optlen, true); break; - case TLS_DTLS_CID_STATUS: + case ZSOCK_TLS_DTLS_CID_STATUS: err = tls_opt_dtls_connection_id_status_get(ctx, optval, optlen); break; - case TLS_DTLS_CID_VALUE: + case ZSOCK_TLS_DTLS_CID_VALUE: err = tls_opt_dtls_connection_id_value_get(ctx, optval, optlen); break; - case TLS_DTLS_PEER_CID_VALUE: + case ZSOCK_TLS_DTLS_PEER_CID_VALUE: err = tls_opt_dtls_peer_connection_id_value_get(ctx, optval, optlen); break; - case TLS_DTLS_HANDSHAKE_ON_CONNECT: + case ZSOCK_TLS_DTLS_HANDSHAKE_ON_CONNECT: err = tls_opt_dtls_handshake_on_connect_get(ctx, optval, optlen); break; #endif /* CONFIG_NET_SOCKETS_ENABLE_DTLS */ @@ -3761,7 +3760,7 @@ int ztls_getsockopt_ctx(struct tls_context *ctx, int level, int optname, } static int set_timeout_opt(k_timeout_t *timeout, const void *optval, - socklen_t optlen) + net_socklen_t optlen) { const struct zsock_timeval *tval = optval; @@ -3779,95 +3778,95 @@ static int set_timeout_opt(k_timeout_t *timeout, const void *optval, } int ztls_setsockopt_ctx(struct tls_context *ctx, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { int err; /* Underlying socket is used in non-blocking mode, hence implement * timeout at the TLS socket level. */ - if ((level == SOL_SOCKET) && (optname == SO_SNDTIMEO)) { + if ((level == ZSOCK_SOL_SOCKET) && (optname == ZSOCK_SO_SNDTIMEO)) { err = set_timeout_opt(&ctx->options.timeout_tx, optval, optlen); goto out; } - if ((level == SOL_SOCKET) && (optname == SO_RCVTIMEO)) { + if ((level == ZSOCK_SOL_SOCKET) && (optname == ZSOCK_SO_RCVTIMEO)) { err = set_timeout_opt(&ctx->options.timeout_rx, optval, optlen); goto out; } - if (level != SOL_TLS) { + if (level != ZSOCK_SOL_TLS) { return zsock_setsockopt(ctx->sock, level, optname, optval, optlen); } switch (optname) { - case TLS_SEC_TAG_LIST: + case ZSOCK_TLS_SEC_TAG_LIST: err = tls_opt_sec_tag_list_set(ctx, optval, optlen); break; - case TLS_HOSTNAME: + case ZSOCK_TLS_HOSTNAME: err = tls_opt_hostname_set(ctx, optval, optlen); break; - case TLS_CIPHERSUITE_LIST: + case ZSOCK_TLS_CIPHERSUITE_LIST: err = tls_opt_ciphersuite_list_set(ctx, optval, optlen); break; - case TLS_PEER_VERIFY: + case ZSOCK_TLS_PEER_VERIFY: err = tls_opt_peer_verify_set(ctx, optval, optlen); break; - case TLS_CERT_NOCOPY: + case ZSOCK_TLS_CERT_NOCOPY: err = tls_opt_cert_nocopy_set(ctx, optval, optlen); break; - case TLS_DTLS_ROLE: + case ZSOCK_TLS_DTLS_ROLE: err = tls_opt_dtls_role_set(ctx, optval, optlen); break; - case TLS_ALPN_LIST: + case ZSOCK_TLS_ALPN_LIST: err = tls_opt_alpn_list_set(ctx, optval, optlen); break; - case TLS_SESSION_CACHE: + case ZSOCK_TLS_SESSION_CACHE: err = tls_opt_session_cache_set(ctx, optval, optlen); break; - case TLS_SESSION_CACHE_PURGE: + case ZSOCK_TLS_SESSION_CACHE_PURGE: err = tls_opt_session_cache_purge_set(ctx, optval, optlen); break; - case TLS_CERT_VERIFY_CALLBACK: + case ZSOCK_TLS_CERT_VERIFY_CALLBACK: err = tls_opt_cert_verify_callback_set(ctx, optval, optlen); break; #if defined(CONFIG_NET_SOCKETS_ENABLE_DTLS) - case TLS_DTLS_HANDSHAKE_TIMEOUT_MIN: + case ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MIN: err = tls_opt_dtls_handshake_timeout_set(ctx, optval, optlen, false); break; - case TLS_DTLS_HANDSHAKE_TIMEOUT_MAX: + case ZSOCK_TLS_DTLS_HANDSHAKE_TIMEOUT_MAX: err = tls_opt_dtls_handshake_timeout_set(ctx, optval, optlen, true); break; - case TLS_DTLS_CID: + case ZSOCK_TLS_DTLS_CID: err = tls_opt_dtls_connection_id_set(ctx, optval, optlen); break; - case TLS_DTLS_CID_VALUE: + case ZSOCK_TLS_DTLS_CID_VALUE: err = tls_opt_dtls_connection_id_value_set(ctx, optval, optlen); break; - case TLS_DTLS_HANDSHAKE_ON_CONNECT: + case ZSOCK_TLS_DTLS_HANDSHAKE_ON_CONNECT: err = tls_opt_dtls_handshake_on_connect_set(ctx, optval, optlen); break; #endif /* CONFIG_NET_SOCKETS_ENABLE_DTLS */ - case TLS_NATIVE: + case ZSOCK_TLS_NATIVE: /* Option handled at the socket dispatcher level. */ err = 0; break; @@ -3919,8 +3918,8 @@ static int tls_sock_ioctl_vmeth(void *obj, unsigned int request, va_list args) switch (request) { /* fcntl() commands */ - case F_GETFL: - case F_SETFL: { + case ZVFS_F_GETFL: + case ZVFS_F_SETFL: { const struct fd_op_vtable *vtable; struct k_mutex *lock; void *fd_obj; @@ -4000,16 +3999,16 @@ static int tls_sock_shutdown_vmeth(void *obj, int how) return zsock_shutdown(ctx->sock, how); } -static int tls_sock_bind_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int tls_sock_bind_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { struct tls_context *ctx = obj; return zsock_bind(ctx->sock, addr, addrlen); } -static int tls_sock_connect_vmeth(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int tls_sock_connect_vmeth(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { return ztls_connect_ctx(obj, addr, addrlen); } @@ -4023,42 +4022,42 @@ static int tls_sock_listen_vmeth(void *obj, int backlog) return zsock_listen(ctx->sock, backlog); } -static int tls_sock_accept_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int tls_sock_accept_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { return ztls_accept_ctx(obj, addr, addrlen); } static ssize_t tls_sock_sendto_vmeth(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { return ztls_sendto_ctx(obj, buf, len, flags, dest_addr, addrlen); } -static ssize_t tls_sock_sendmsg_vmeth(void *obj, const struct msghdr *msg, +static ssize_t tls_sock_sendmsg_vmeth(void *obj, const struct net_msghdr *msg, int flags) { return ztls_sendmsg_ctx(obj, msg, flags); } static ssize_t tls_sock_recvfrom_vmeth(void *obj, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { return ztls_recvfrom_ctx(obj, buf, max_len, flags, src_addr, addrlen); } static int tls_sock_getsockopt_vmeth(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { return ztls_getsockopt_ctx(obj, level, optname, optval, optlen); } static int tls_sock_setsockopt_vmeth(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { return ztls_setsockopt_ctx(obj, level, optname, optval, optlen); } @@ -4068,16 +4067,16 @@ static int tls_sock_close2_vmeth(void *obj, int sock) return ztls_close_ctx(obj, sock); } -static int tls_sock_getpeername_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int tls_sock_getpeername_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { struct tls_context *ctx = obj; return zsock_getpeername(ctx->sock, addr, addrlen); } -static int tls_sock_getsockname_vmeth(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int tls_sock_getsockname_vmeth(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { struct tls_context *ctx = obj; @@ -4116,11 +4115,11 @@ static bool tls_is_supported(int family, int type, int proto) /* Since both, TLS sockets and regular ones fall under the same address family, * it's required to process TLS first in order to capture socket calls which - * create sockets for secure protocols. Every other call for AF_INET/AF_INET6 + * create sockets for secure protocols. Every other call for NET_AF_INET/NET_AF_INET6 * will be forwarded to regular socket implementation. */ BUILD_ASSERT(CONFIG_NET_SOCKETS_TLS_PRIORITY < CONFIG_NET_SOCKETS_PRIORITY_DEFAULT, "CONFIG_NET_SOCKETS_TLS_PRIORITY have to be smaller than CONFIG_NET_SOCKETS_PRIORITY_DEFAULT"); -NET_SOCKET_REGISTER(tls, CONFIG_NET_SOCKETS_TLS_PRIORITY, AF_UNSPEC, +NET_SOCKET_REGISTER(tls, CONFIG_NET_SOCKETS_TLS_PRIORITY, NET_AF_UNSPEC, tls_is_supported, ztls_socket); diff --git a/subsys/net/lib/socks/socks.c b/subsys/net/lib/socks/socks.c index 847537d02d041..5030ea3bc4107 100644 --- a/subsys/net/lib/socks/socks.c +++ b/subsys/net/lib/socks/socks.c @@ -69,10 +69,10 @@ static void socks5_cmd_rsp_cb(struct net_context *ctx, } static int socks5_tcp_connect(struct net_context *ctx, - const struct sockaddr *proxy, - socklen_t proxy_len, - const struct sockaddr *dest, - socklen_t dest_len) + const struct net_sockaddr *proxy, + net_socklen_t proxy_len, + const struct net_sockaddr *dest, + net_socklen_t dest_len) { struct socks5_method_request method_req; struct socks5_method_response method_rsp; @@ -122,9 +122,9 @@ static int socks5_tcp_connect(struct net_context *ctx, cmd_req.r.cmd = SOCKS5_CMD_CONNECT; cmd_req.r.rsv = SOCKS5_PKT_RSV; - if (proxy->sa_family == AF_INET) { - const struct sockaddr_in *d4 = - (struct sockaddr_in *)dest; + if (proxy->sa_family == NET_AF_INET) { + const struct net_sockaddr_in *d4 = + (struct net_sockaddr_in *)dest; cmd_req.r.atyp = SOCKS5_ATYP_IPV4; @@ -136,9 +136,9 @@ static int socks5_tcp_connect(struct net_context *ctx, size = sizeof(struct socks5_command_request_common) + sizeof(struct socks5_ipv4_addr); - } else if (proxy->sa_family == AF_INET6) { - const struct sockaddr_in6 *d6 = - (struct sockaddr_in6 *)dest; + } else if (proxy->sa_family == NET_AF_INET6) { + const struct net_sockaddr_in6 *d6 = + (struct net_sockaddr_in6 *)dest; cmd_req.r.atyp = SOCKS5_ATYP_IPV6; @@ -185,17 +185,17 @@ static int socks5_tcp_connect(struct net_context *ctx, return 0; } -int net_socks5_connect(struct net_context *ctx, const struct sockaddr *addr, - socklen_t addrlen) +int net_socks5_connect(struct net_context *ctx, const struct net_sockaddr *addr, + net_socklen_t addrlen) { - struct sockaddr proxy; - socklen_t proxy_len; + struct net_sockaddr proxy; + net_socklen_t proxy_len; int type; int ret; type = net_context_get_type(ctx); /* TODO: Only TCP and TLS supported, UDP and DTLS yet to support. */ - if (type != SOCK_STREAM) { + if (type != NET_SOCK_STREAM) { return -ENOTSUP; } diff --git a/subsys/net/lib/socks/socks.h b/subsys/net/lib/socks/socks.h index 65f93226333af..327b670cf9b83 100644 --- a/subsys/net/lib/socks/socks.h +++ b/subsys/net/lib/socks/socks.h @@ -21,12 +21,12 @@ */ #if defined(CONFIG_SOCKS) int net_socks5_connect(struct net_context *ctx, - const struct sockaddr *dest, - socklen_t dest_len); + const struct net_sockaddr *dest, + net_socklen_t dest_len); #else inline int net_socks5_connect(struct net_context *ctx, - const struct sockaddr *dest, - socklen_t dest_len) + const struct net_sockaddr *dest, + net_socklen_t dest_len) { ARG_UNUSED(ctx); ARG_UNUSED(dest); diff --git a/subsys/net/lib/tftp/tftp_client.c b/subsys/net/lib/tftp/tftp_client.c index d26172f0e3f86..666952412cc75 100644 --- a/subsys/net/lib/tftp/tftp_client.c +++ b/subsys/net/lib/tftp/tftp_client.c @@ -12,8 +12,8 @@ LOG_MODULE_REGISTER(tftp_client, CONFIG_TFTP_LOG_LEVEL); #include "tftp_client.h" #define ADDRLEN(sa) \ - (sa.sa_family == AF_INET ? \ - sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)) + (sa.sa_family == NET_AF_INET ? \ + sizeof(struct net_sockaddr_in) : sizeof(struct net_sockaddr_in6)) /* * Prepare a request as required by RFC1350. This packet can be sent @@ -174,7 +174,7 @@ static inline int send_err(int sock, struct tftpc *client, int err_code, char *e */ static inline int send_ack(int sock, struct tftphdr_ack *ackhdr) { - LOG_DBG("Client acking block number: %d", ntohs(ackhdr->block)); + LOG_DBG("Client acking block number: %d", net_ntohs(ackhdr->block)); return zsock_send(sock, ackhdr, sizeof(struct tftphdr_ack), 0); } @@ -216,8 +216,8 @@ static int send_request(int sock, struct tftpc *client, } /* Receive data from the TFTP Server. */ - struct sockaddr from_addr; - socklen_t from_addr_len = sizeof(from_addr); + struct net_sockaddr from_addr; + net_socklen_t from_addr_len = sizeof(from_addr); ret = zsock_recvfrom(sock, client->tftp_buf, TFTPC_MAX_BUF_SIZE, 0, &from_addr, &from_addr_len); @@ -248,8 +248,8 @@ int tftp_get(struct tftpc *client, const char *remote_file, const char *mode) uint32_t tftpc_index = 0; int tx_count = 0; struct tftphdr_ack ackhdr = { - .opcode = htons(ACK_OPCODE), - .block = htons(1) + .opcode = net_htons(ACK_OPCODE), + .block = net_htons(1) }; int rcv_size; int ret; @@ -258,7 +258,7 @@ int tftp_get(struct tftpc *client, const char *remote_file, const char *mode) return -EINVAL; } - sock = zsock_socket(client->server.sa_family, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(client->server.sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (sock < 0) { LOG_ERR("Failed to create UDP socket: %d", errno); return -errno; @@ -298,7 +298,7 @@ int tftp_get(struct tftpc *client, const char *remote_file, const char *mode) uint32_t data_size = rcv_size - TFTP_HEADER_SIZE; tftpc_block_no++; - ackhdr.block = htons(block_no); + ackhdr.block = net_htons(block_no); tx_count = 0; if (client->callback == NULL) { @@ -383,7 +383,7 @@ int tftp_put(struct tftpc *client, const char *remote_file, const char *mode, return -EINVAL; } - sock = zsock_socket(client->server.sa_family, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(client->server.sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); if (sock < 0) { LOG_ERR("Failed to create UDP socket: %d", errno); return -errno; diff --git a/subsys/net/lib/utils/addr_utils.c b/subsys/net/lib/utils/addr_utils.c index a5e59c6e9c15b..9a917069fe836 100644 --- a/subsys/net/lib/utils/addr_utils.c +++ b/subsys/net/lib/utils/addr_utils.c @@ -35,7 +35,7 @@ int net_getaddrinfo_addr_str(const char *addr_str, const char *def_port, struct zsock_addrinfo **res) { const char *port; - char host[NI_MAXHOST]; + char host[ZSOCK_NI_MAXHOST]; if (addr_str == NULL) { errno = EINVAL; diff --git a/subsys/net/lib/websocket/websocket.c b/subsys/net/lib/websocket/websocket.c index bf395190744a2..c3ff31f33a5d2 100644 --- a/subsys/net/lib/websocket/websocket.c +++ b/subsys/net/lib/websocket/websocket.c @@ -59,7 +59,7 @@ static struct k_sem contexts_lock; static const struct socket_op_vtable websocket_fd_op_vtable; #if defined(CONFIG_NET_TEST) -int verify_sent_and_received_msg(struct msghdr *msg, bool split_msg); +int verify_sent_and_received_msg(struct net_msghdr *msg, bool split_msg); #endif static const char *opcode2str(enum websocket_opcode opcode) @@ -434,7 +434,7 @@ int websocket_connect(int sock, struct websocket_request *wreq, /* Init parser FSM */ ctx->parser_state = WEBSOCKET_PARSER_STATE_OPCODE; - (void)sock_obj_core_alloc_find(ctx->real_sock, fd, SOCK_STREAM); + (void)sock_obj_core_alloc_find(ctx->real_sock, fd, NET_SOCK_STREAM); return fd; @@ -585,7 +585,7 @@ static int websocket_ioctl_vmeth(void *obj, unsigned int request, va_list args) } #if !defined(CONFIG_NET_TEST) -static int sendmsg_all(int sock, const struct msghdr *message, int flags, +static int sendmsg_all(int sock, const struct net_msghdr *message, int flags, const k_timepoint_t req_end_timepoint) { int ret, i; @@ -648,8 +648,8 @@ static int websocket_prepare_and_send(struct websocket_context *ctx, uint8_t *payload, size_t payload_len, int32_t timeout) { - struct iovec io_vector[2]; - struct msghdr msg; + struct net_iovec io_vector[2]; + struct net_msghdr msg; io_vector[0].iov_base = header; io_vector[0].iov_len = header_len; @@ -1175,8 +1175,8 @@ static ssize_t websocket_write_vmeth(void *obj, const void *buffer, static ssize_t websocket_sendto_ctx(void *obj, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { struct websocket_context *ctx = obj; int32_t timeout = SYS_FOREVER_MS; @@ -1192,8 +1192,8 @@ static ssize_t websocket_sendto_ctx(void *obj, const void *buf, size_t len, } static ssize_t websocket_recvfrom_ctx(void *obj, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { struct websocket_context *ctx = obj; int32_t timeout = SYS_FOREVER_MS; @@ -1248,7 +1248,7 @@ int websocket_register(int sock, uint8_t *recv_buf, size_t recv_buf_len) ctx->recv_buf.count = 0; ctx->parser_state = WEBSOCKET_PARSER_STATE_OPCODE; - (void)sock_obj_core_alloc_find(ctx->real_sock, fd, SOCK_STREAM); + (void)sock_obj_core_alloc_find(ctx->real_sock, fd, NET_SOCK_STREAM); return fd; diff --git a/subsys/net/lib/zperf/zperf_common.c b/subsys/net/lib/zperf/zperf_common.c index fa73252c47f75..d90ea56080e44 100644 --- a/subsys/net/lib/zperf/zperf_common.c +++ b/subsys/net/lib/zperf/zperf_common.c @@ -21,24 +21,24 @@ LOG_MODULE_REGISTER(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL); #include "ipv6.h" /* to get infinite lifetime */ -static struct sockaddr_in6 in6_addr_my = { - .sin6_family = AF_INET6, - .sin6_port = htons(MY_SRC_PORT), +static struct net_sockaddr_in6 ipv6_addr_my = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(MY_SRC_PORT), }; -static struct sockaddr_in in4_addr_my = { - .sin_family = AF_INET, - .sin_port = htons(MY_SRC_PORT), +static struct net_sockaddr_in ipv4_addr_my = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(MY_SRC_PORT), }; -struct sockaddr_in6 *zperf_get_sin6(void) +struct net_sockaddr_in6 *zperf_get_sin6(void) { - return &in6_addr_my; + return &ipv6_addr_my; } -struct sockaddr_in *zperf_get_sin(void) +struct net_sockaddr_in *zperf_get_sin(void) { - return &in4_addr_my; + return &ipv4_addr_my; } #define ZPERF_WORK_Q_THREAD_PRIORITY \ @@ -106,7 +106,7 @@ static struct k_work_q zperf_work_q; #endif /* CONFIG_ZPERF_SESSION_PER_THREAD */ -int zperf_get_ipv6_addr(char *host, char *prefix_str, struct in6_addr *addr) +int zperf_get_ipv6_addr(char *host, char *prefix_str, struct net_in6_addr *addr) { struct net_if_ipv6_prefix *prefix; struct net_if_addr *ifaddr; @@ -117,7 +117,7 @@ int zperf_get_ipv6_addr(char *host, char *prefix_str, struct in6_addr *addr) return -EINVAL; } - ret = net_addr_pton(AF_INET6, host, addr); + ret = net_addr_pton(NET_AF_INET6, host, addr); if (ret < 0) { return -EINVAL; } @@ -143,7 +143,7 @@ int zperf_get_ipv6_addr(char *host, char *prefix_str, struct in6_addr *addr) } -int zperf_get_ipv4_addr(char *host, struct in_addr *addr) +int zperf_get_ipv4_addr(char *host, struct net_in_addr *addr) { struct net_if_addr *ifaddr; int ret; @@ -152,7 +152,7 @@ int zperf_get_ipv4_addr(char *host, struct in_addr *addr) return -EINVAL; } - ret = net_addr_pton(AF_INET, host, addr); + ret = net_addr_pton(NET_AF_INET, host, addr); if (ret < 0) { return -EINVAL; } @@ -167,24 +167,24 @@ int zperf_get_ipv4_addr(char *host, struct in_addr *addr) return 0; } -int zperf_prepare_upload_sock(const struct sockaddr *peer_addr, uint8_t tos, +int zperf_prepare_upload_sock(const struct net_sockaddr *peer_addr, uint8_t tos, int priority, int tcp_nodelay, int proto) { - socklen_t addrlen = peer_addr->sa_family == AF_INET6 ? - sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); - int type = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM; + net_socklen_t addrlen = peer_addr->sa_family == NET_AF_INET6 ? + sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); + int type = (proto == NET_IPPROTO_UDP) ? NET_SOCK_DGRAM : NET_SOCK_STREAM; int sock = -1; int ret; switch (peer_addr->sa_family) { - case AF_INET: + case NET_AF_INET: if (!IS_ENABLED(CONFIG_NET_IPV4)) { NET_ERR("IPv4 not available."); return -EINVAL; } - sock = zsock_socket(AF_INET, type, proto); + sock = zsock_socket(NET_AF_INET, type, proto); if (sock < 0) { NET_ERR("Cannot create IPv4 network socket (%d)", errno); @@ -192,7 +192,7 @@ int zperf_prepare_upload_sock(const struct sockaddr *peer_addr, uint8_t tos, } if (tos > 0) { - if (zsock_setsockopt(sock, IPPROTO_IP, IP_TOS, + if (zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_TOS, &tos, sizeof(tos)) != 0) { NET_WARN("Failed to set IP_TOS socket option. " "Please enable CONFIG_NET_CONTEXT_DSCP_ECN."); @@ -201,13 +201,13 @@ int zperf_prepare_upload_sock(const struct sockaddr *peer_addr, uint8_t tos, break; - case AF_INET6: + case NET_AF_INET6: if (!IS_ENABLED(CONFIG_NET_IPV6)) { NET_ERR("IPv6 not available."); return -EINVAL; } - sock = zsock_socket(AF_INET6, type, proto); + sock = zsock_socket(NET_AF_INET6, type, proto); if (sock < 0) { NET_ERR("Cannot create IPv6 network socket (%d)", errno); @@ -215,7 +215,7 @@ int zperf_prepare_upload_sock(const struct sockaddr *peer_addr, uint8_t tos, } if (tos >= 0) { - if (zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, + if (zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_TCLASS, &tos, sizeof(tos)) != 0) { NET_WARN("Failed to set IPV6_TCLASS socket option. " "Please enable CONFIG_NET_CONTEXT_DSCP_ECN."); @@ -249,11 +249,11 @@ int zperf_prepare_upload_sock(const struct sockaddr *peer_addr, uint8_t tos, } } - if (proto == IPPROTO_TCP && tcp_nodelay && - zsock_setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + if (proto == NET_IPPROTO_TCP && tcp_nodelay && + zsock_setsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_NODELAY, &tcp_nodelay, sizeof(tcp_nodelay)) != 0) { - NET_WARN("Failed to set IPPROTO_TCP - TCP_NODELAY socket option."); + NET_WARN("Failed to set NET_IPPROTO_TCP - TCP_NODELAY socket option."); ret = -errno; goto error; } diff --git a/subsys/net/lib/zperf/zperf_internal.h b/subsys/net/lib/zperf/zperf_internal.h index 1f4abb2000dbb..843c5eef13807 100644 --- a/subsys/net/lib/zperf/zperf_internal.h +++ b/subsys/net/lib/zperf/zperf_internal.h @@ -109,11 +109,11 @@ static inline uint32_t time_delta(uint32_t ts, uint32_t t) return (t >= ts) ? (t - ts) : (ULONG_MAX - ts + t); } -int zperf_get_ipv6_addr(char *host, char *prefix_str, struct in6_addr *addr); -struct sockaddr_in6 *zperf_get_sin6(void); +int zperf_get_ipv6_addr(char *host, char *prefix_str, struct net_in6_addr *addr); +struct net_sockaddr_in6 *zperf_get_sin6(void); -int zperf_get_ipv4_addr(char *host, struct in_addr *addr); -struct sockaddr_in *zperf_get_sin(void); +int zperf_get_ipv4_addr(char *host, struct net_in_addr *addr); +struct net_sockaddr_in *zperf_get_sin(void); extern void connect_ap(char *ssid); @@ -128,7 +128,7 @@ struct zperf_work { extern void start_jobs(void); extern struct zperf_work *get_queue(enum session_proto proto, int session_id); -int zperf_prepare_upload_sock(const struct sockaddr *peer_addr, uint8_t tos, +int zperf_prepare_upload_sock(const struct net_sockaddr *peer_addr, uint8_t tos, int priority, int tcp_nodelay, int proto); uint32_t zperf_packet_duration(uint32_t packet_size, uint32_t rate_in_kbps); diff --git a/subsys/net/lib/zperf/zperf_session.c b/subsys/net/lib/zperf/zperf_session.c index d824057931d5d..b6bef44532913 100644 --- a/subsys/net/lib/zperf/zperf_session.c +++ b/subsys/net/lib/zperf/zperf_session.c @@ -19,7 +19,7 @@ LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL); static struct session sessions[SESSION_PROTO_END][SESSION_MAX]; -struct session *get_free_session(const struct sockaddr *addr, +struct session *get_free_session(const struct net_sockaddr *addr, enum session_proto proto) { struct session *ptr; @@ -27,8 +27,8 @@ struct session *get_free_session(const struct sockaddr *addr, int oldest_completed_index = -1, oldest_free_index = -1; int i = 0; - const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; + const struct net_sockaddr_in *addr4 = (const struct net_sockaddr_in *)addr; + const struct net_sockaddr_in6 *addr6 = (const struct net_sockaddr_in6 *)addr; /* Check whether we already have an active session */ while (i < SESSION_MAX) { @@ -66,14 +66,14 @@ struct session *get_free_session(const struct sockaddr *addr, if (ptr != NULL) { if (IS_ENABLED(CONFIG_NET_IPV4) && - addr->sa_family == AF_INET) { + addr->sa_family == NET_AF_INET) { ptr->port = addr4->sin_port; - ptr->ip.family = AF_INET; + ptr->ip.family = NET_AF_INET; net_ipaddr_copy(&ptr->ip.in_addr, &addr4->sin_addr); } else if (IS_ENABLED(CONFIG_NET_IPV6) && - addr->sa_family == AF_INET6) { + addr->sa_family == NET_AF_INET6) { ptr->port = addr6->sin6_port; - ptr->ip.family = AF_INET6; + ptr->ip.family = NET_AF_INET6; net_ipaddr_copy(&ptr->ip.in6_addr, &addr6->sin6_addr); } @@ -84,14 +84,14 @@ struct session *get_free_session(const struct sockaddr *addr, } /* Get session from a given packet */ -struct session *get_session(const struct sockaddr *addr, +struct session *get_session(const struct net_sockaddr *addr, enum session_proto proto) { struct session *active = NULL; struct session *free = NULL; int i = 0; - const struct sockaddr_in *addr4 = (const struct sockaddr_in *)addr; - const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr; + const struct net_sockaddr_in *addr4 = (const struct net_sockaddr_in *)addr; + const struct net_sockaddr_in6 *addr6 = (const struct net_sockaddr_in6 *)addr; if (proto != SESSION_TCP && proto != SESSION_UDP) { NET_ERR("Error! unsupported proto.\n"); @@ -103,8 +103,8 @@ struct session *get_session(const struct sockaddr *addr, struct session *ptr = &sessions[proto][i]; if (IS_ENABLED(CONFIG_NET_IPV4) && - addr->sa_family == AF_INET && - ptr->ip.family == AF_INET && + addr->sa_family == NET_AF_INET && + ptr->ip.family == NET_AF_INET && ptr->port == addr4->sin_port && net_ipv4_addr_cmp(&ptr->ip.in_addr, &addr4->sin_addr)) { /* We found an active session */ @@ -113,8 +113,8 @@ struct session *get_session(const struct sockaddr *addr, } if (IS_ENABLED(CONFIG_NET_IPV6) && - addr->sa_family == AF_INET6 && - ptr->ip.family == AF_INET6 && + addr->sa_family == NET_AF_INET6 && + ptr->ip.family == NET_AF_INET6 && ptr->port == addr6->sin6_port && net_ipv6_addr_cmp(&ptr->ip.in6_addr, &addr6->sin6_addr)) { /* We found an active session */ @@ -135,14 +135,14 @@ struct session *get_session(const struct sockaddr *addr, if (!active && free) { active = free; - if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && addr->sa_family == NET_AF_INET) { active->port = addr4->sin_port; - active->ip.family = AF_INET; + active->ip.family = NET_AF_INET; net_ipaddr_copy(&active->ip.in_addr, &addr4->sin_addr); } else if (IS_ENABLED(CONFIG_NET_IPV6) && - addr->sa_family == AF_INET6) { + addr->sa_family == NET_AF_INET6) { active->port = addr6->sin6_port; - active->ip.family = AF_INET6; + active->ip.family = NET_AF_INET6; net_ipaddr_copy(&active->ip.in6_addr, &addr6->sin6_addr); } } diff --git a/subsys/net/lib/zperf/zperf_session.h b/subsys/net/lib/zperf/zperf_session.h index c6f9e4177392c..9bfa36c518616 100644 --- a/subsys/net/lib/zperf/zperf_session.h +++ b/subsys/net/lib/zperf/zperf_session.h @@ -63,9 +63,9 @@ struct session { typedef void (*session_cb_t)(struct session *ses, enum session_proto proto, void *user_data); -struct session *get_session(const struct sockaddr *addr, +struct session *get_session(const struct net_sockaddr *addr, enum session_proto proto); -struct session *get_free_session(const struct sockaddr *addr, +struct session *get_free_session(const struct net_sockaddr *addr, enum session_proto proto); void zperf_session_init(void); void zperf_reset_session_stats(struct session *session); diff --git a/subsys/net/lib/zperf/zperf_shell.c b/subsys/net/lib/zperf/zperf_shell.c index fc38ed42521d2..6ab73c10cfce5 100644 --- a/subsys/net/lib/zperf/zperf_shell.c +++ b/subsys/net/lib/zperf/zperf_shell.c @@ -49,29 +49,29 @@ static const char *CONFIG = #endif ""; -static struct sockaddr_in6 in6_addr_my = { - .sin6_family = AF_INET6, - .sin6_port = htons(MY_SRC_PORT), +static struct net_sockaddr_in6 ipv6_addr_my = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(MY_SRC_PORT), }; -static struct sockaddr_in6 in6_addr_dst = { - .sin6_family = AF_INET6, - .sin6_port = htons(DEF_PORT), +static struct net_sockaddr_in6 ipv6_addr_dst = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(DEF_PORT), }; -static struct sockaddr_in in4_addr_dst = { - .sin_family = AF_INET, - .sin_port = htons(DEF_PORT), +static struct net_sockaddr_in ipv4_addr_dst = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(DEF_PORT), }; -static struct sockaddr_in in4_addr_my = { - .sin_family = AF_INET, - .sin_port = htons(MY_SRC_PORT), +static struct net_sockaddr_in ipv4_addr_my = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(MY_SRC_PORT), }; -static struct in6_addr shell_ipv6; +static struct net_in6_addr shell_ipv6; -static struct in_addr shell_ipv4; +static struct net_in_addr shell_ipv4; #define DEVICE_NAME "zperf shell" @@ -154,7 +154,7 @@ static long parse_number(const char *string, const uint32_t *divisor_arr, } static int parse_ipv6_addr(const struct shell *sh, char *host, char *port, - struct sockaddr_in6 *addr) + struct net_sockaddr_in6 *addr) { int ret; @@ -162,12 +162,12 @@ static int parse_ipv6_addr(const struct shell *sh, char *host, char *port, return -EINVAL; } - ret = net_addr_pton(AF_INET6, host, &addr->sin6_addr); + ret = net_addr_pton(NET_AF_INET6, host, &addr->sin6_addr); if (ret < 0) { return -EDESTADDRREQ; } - addr->sin6_port = htons(strtoul(port, NULL, 10)); + addr->sin6_port = net_htons(strtoul(port, NULL, 10)); if (!addr->sin6_port) { shell_fprintf(sh, SHELL_WARNING, "Invalid port %s\n", port); @@ -178,7 +178,7 @@ static int parse_ipv6_addr(const struct shell *sh, char *host, char *port, } static int parse_ipv4_addr(const struct shell *sh, char *host, char *port, - struct sockaddr_in *addr) + struct net_sockaddr_in *addr) { int ret; @@ -186,12 +186,12 @@ static int parse_ipv4_addr(const struct shell *sh, char *host, char *port, return -EINVAL; } - ret = net_addr_pton(AF_INET, host, &addr->sin_addr); + ret = net_addr_pton(NET_AF_INET, host, &addr->sin_addr); if (ret < 0) { return -EDESTADDRREQ; } - addr->sin_port = htons(strtoul(port, NULL, 10)); + addr->sin_port = net_htons(strtoul(port, NULL, 10)); if (!addr->sin_port) { shell_fprintf(sh, SHELL_WARNING, "Invalid port %s\n", port); @@ -218,7 +218,7 @@ static int zperf_bind_host(const struct shell *sh, if (argc >= 3) { char *addr_str = argv[2]; - struct sockaddr addr; + struct net_sockaddr addr; memset(&addr, 0, sizeof(addr)); @@ -278,7 +278,7 @@ static int cmd_setip(const struct shell *sh, size_t argc, char *argv[]) } if (IS_ENABLED(CONFIG_NET_IPV6) && IS_ENABLED(CONFIG_NET_IPV4)) { - if (net_addr_pton(AF_INET6, argv[start + 1], &shell_ipv6) < 0) { + if (net_addr_pton(NET_AF_INET6, argv[start + 1], &shell_ipv6) < 0) { if (argc != 2) { shell_help(sh); return -ENOEXEC; @@ -396,7 +396,7 @@ static int shell_cmd_download(const struct shell *sh, size_t argc, switch (argv[i][1]) { case 'I': /* - * IFNAMSIZ by default CONFIG_NET_INTERFACE_NAME_LEN + * NET_IFNAMSIZ by default CONFIG_NET_INTERFACE_NAME_LEN * is at least 1 so no overflow risk here */ i++; @@ -405,8 +405,8 @@ static int shell_cmd_download(const struct shell *sh, size_t argc, "-I \n"); return -ENOEXEC; } - (void)memset(param->if_name, 0x0, IFNAMSIZ); - strncpy(param->if_name, argv[i], IFNAMSIZ - 1); + (void)memset(param->if_name, 0x0, NET_IFNAMSIZ); + strncpy(param->if_name, argv[i], NET_IFNAMSIZ - 1); opt_cnt += 2; break; @@ -778,28 +778,28 @@ static int ping_handler(struct net_icmp_ctx *ctx, } static void send_ping(const struct shell *sh, - struct in6_addr *addr, + struct net_in6_addr *addr, int timeout_ms) { static struct k_sem sem_wait; - struct sockaddr_in6 dest_addr = { 0 }; + struct net_sockaddr_in6 dest_addr = { 0 }; struct net_icmp_ctx ctx; int ret; - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, ping_handler); + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, ping_handler); if (ret < 0) { shell_fprintf(sh, SHELL_WARNING, "Cannot send ping (%d)\n", ret); return; } - dest_addr.sin6_family = AF_INET6; + dest_addr.sin6_family = NET_AF_INET6; net_ipv6_addr_copy_raw((uint8_t *)&dest_addr.sin6_addr, (uint8_t *)addr); k_sem_init(&sem_wait, 0, 1); (void)net_icmp_send_echo_request(&ctx, net_if_get_default(), - (struct sockaddr *)&dest_addr, + (struct net_sockaddr *)&dest_addr, NULL, &sem_wait); ret = k_sem_take(&sem_wait, K_MSEC(timeout_ms)); @@ -836,9 +836,9 @@ static int execute_upload(const struct shell *sh, shell_fprintf(sh, SHELL_NORMAL, "Starting...\n"); } - if (IS_ENABLED(CONFIG_NET_IPV6) && param->peer_addr.sa_family == AF_INET6) { - struct sockaddr_in6 *ipv6 = - (struct sockaddr_in6 *)¶m->peer_addr; + if (IS_ENABLED(CONFIG_NET_IPV6) && param->peer_addr.sa_family == NET_AF_INET6) { + struct net_sockaddr_in6 *ipv6 = + (struct net_sockaddr_in6 *)¶m->peer_addr; /* For IPv6, we should make sure that neighbor discovery * has been done for the peer. So send ping here, wait * some time and start the test after that. @@ -968,8 +968,8 @@ static int shell_cmd_upload(const struct shell *sh, size_t argc, char *argv[], enum net_ip_protocol proto) { struct zperf_upload_params param = { 0 }; - struct sockaddr_in6 ipv6 = { .sin6_family = AF_INET6 }; - struct sockaddr_in ipv4 = { .sin_family = AF_INET }; + struct net_sockaddr_in6 ipv6 = { .sin6_family = NET_AF_INET6 }; + struct net_sockaddr_in ipv4 = { .sin_family = NET_AF_INET }; char *port_str; bool async = false; bool is_udp; @@ -980,7 +980,7 @@ static int shell_cmd_upload(const struct shell *sh, size_t argc, param.unix_offset_us = k_uptime_get() * USEC_PER_MSEC; param.options.priority = -1; - is_udp = proto == IPPROTO_UDP; + is_udp = proto == NET_IPPROTO_UDP; /* Parse options */ for (size_t i = 1; i < argc; ++i) { @@ -1056,8 +1056,8 @@ static int shell_cmd_upload(const struct shell *sh, size_t argc, "-I \n"); return -ENOEXEC; } - (void)memset(param.if_name, 0x0, IFNAMSIZ); - strncpy(param.if_name, argv[i], IFNAMSIZ - 1); + (void)memset(param.if_name, 0x0, NET_IFNAMSIZ); + strncpy(param.if_name, argv[i], NET_IFNAMSIZ - 1); opt_cnt += 2; break; @@ -1213,19 +1213,19 @@ static int shell_cmd_upload(const struct shell *sh, size_t argc, static int cmd_tcp_upload(const struct shell *sh, size_t argc, char *argv[]) { - return shell_cmd_upload(sh, argc, argv, IPPROTO_TCP); + return shell_cmd_upload(sh, argc, argv, NET_IPPROTO_TCP); } static int cmd_udp_upload(const struct shell *sh, size_t argc, char *argv[]) { - return shell_cmd_upload(sh, argc, argv, IPPROTO_UDP); + return shell_cmd_upload(sh, argc, argv, NET_IPPROTO_UDP); } static int shell_cmd_upload2(const struct shell *sh, size_t argc, char *argv[], enum net_ip_protocol proto) { struct zperf_upload_params param = { 0 }; - sa_family_t family; + net_sa_family_t family; uint8_t is_udp; bool async = false; int start = 0; @@ -1233,7 +1233,7 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc, int seconds; param.unix_offset_us = k_uptime_get() * USEC_PER_MSEC; - is_udp = proto == IPPROTO_UDP; + is_udp = proto == NET_IPPROTO_UDP; /* Parse options */ for (size_t i = 1; i < argc; ++i) { @@ -1309,8 +1309,8 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc, "-I \n"); return -ENOEXEC; } - (void)memset(param.if_name, 0x0, IFNAMSIZ); - strncpy(param.if_name, argv[i], IFNAMSIZ - 1); + (void)memset(param.if_name, 0x0, NET_IFNAMSIZ); + strncpy(param.if_name, argv[i], NET_IFNAMSIZ - 1); opt_cnt += 2; break; @@ -1362,10 +1362,10 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc, return -ENOEXEC; } - family = !strcmp(argv[start + 1], "v4") ? AF_INET : AF_INET6; + family = !strcmp(argv[start + 1], "v4") ? NET_AF_INET : NET_AF_INET6; - if (family == AF_INET6) { - if (net_ipv6_is_addr_unspecified(&in6_addr_dst.sin6_addr)) { + if (family == NET_AF_INET6) { + if (net_ipv6_is_addr_unspecified(&ipv6_addr_dst.sin6_addr)) { shell_fprintf(sh, SHELL_WARNING, "Invalid destination IPv6 address.\n"); return -ENOEXEC; @@ -1373,11 +1373,11 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc, shell_fprintf(sh, SHELL_NORMAL, "Connecting to %s\n", - net_sprint_ipv6_addr(&in6_addr_dst.sin6_addr)); + net_sprint_ipv6_addr(&ipv6_addr_dst.sin6_addr)); - memcpy(¶m.peer_addr, &in6_addr_dst, sizeof(in6_addr_dst)); + memcpy(¶m.peer_addr, &ipv6_addr_dst, sizeof(ipv6_addr_dst)); } else { - if (net_ipv4_is_addr_unspecified(&in4_addr_dst.sin_addr)) { + if (net_ipv4_is_addr_unspecified(&ipv4_addr_dst.sin_addr)) { shell_fprintf(sh, SHELL_WARNING, "Invalid destination IPv4 address.\n"); return -ENOEXEC; @@ -1385,9 +1385,9 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc, shell_fprintf(sh, SHELL_NORMAL, "Connecting to %s\n", - net_sprint_ipv4_addr(&in4_addr_dst.sin_addr)); + net_sprint_ipv4_addr(&ipv4_addr_dst.sin_addr)); - memcpy(¶m.peer_addr, &in4_addr_dst, sizeof(in4_addr_dst)); + memcpy(¶m.peer_addr, &ipv4_addr_dst, sizeof(ipv4_addr_dst)); } if (argc > 2) { @@ -1420,13 +1420,13 @@ static int shell_cmd_upload2(const struct shell *sh, size_t argc, static int cmd_tcp_upload2(const struct shell *sh, size_t argc, char *argv[]) { - return shell_cmd_upload2(sh, argc, argv, IPPROTO_TCP); + return shell_cmd_upload2(sh, argc, argv, NET_IPPROTO_TCP); } static int cmd_udp_upload2(const struct shell *sh, size_t argc, char *argv[]) { - return shell_cmd_upload2(sh, argc, argv, IPPROTO_UDP); + return shell_cmd_upload2(sh, argc, argv, NET_IPPROTO_UDP); } static int cmd_tcp(const struct shell *sh, size_t argc, char *argv[]) @@ -1851,17 +1851,17 @@ void zperf_shell_init(void) int ret; if (IS_ENABLED(MY_IP6ADDR_SET) && MY_IP6ADDR) { - ret = net_addr_pton(AF_INET6, MY_IP6ADDR, - &in6_addr_my.sin6_addr); + ret = net_addr_pton(NET_AF_INET6, MY_IP6ADDR, + &ipv6_addr_my.sin6_addr); if (ret < 0) { NET_WARN("Unable to set %s address\n", "IPv6"); } else { NET_INFO("Setting IP address %s", - net_sprint_ipv6_addr(&in6_addr_my.sin6_addr)); + net_sprint_ipv6_addr(&ipv6_addr_my.sin6_addr)); } - ret = net_addr_pton(AF_INET6, DST_IP6ADDR, - &in6_addr_dst.sin6_addr); + ret = net_addr_pton(NET_AF_INET6, DST_IP6ADDR, + &ipv6_addr_dst.sin6_addr); if (ret < 0) { NET_WARN("Unable to set destination %s address %s", "IPv6", @@ -1869,22 +1869,22 @@ void zperf_shell_init(void) : "(not set)"); } else { NET_INFO("Setting destination IP address %s", - net_sprint_ipv6_addr(&in6_addr_dst.sin6_addr)); + net_sprint_ipv6_addr(&ipv6_addr_dst.sin6_addr)); } } if (IS_ENABLED(MY_IP4ADDR_SET) && MY_IP4ADDR) { - ret = net_addr_pton(AF_INET, MY_IP4ADDR, - &in4_addr_my.sin_addr); + ret = net_addr_pton(NET_AF_INET, MY_IP4ADDR, + &ipv4_addr_my.sin_addr); if (ret < 0) { NET_WARN("Unable to set %s address\n", "IPv4"); } else { NET_INFO("Setting IP address %s", - net_sprint_ipv4_addr(&in4_addr_my.sin_addr)); + net_sprint_ipv4_addr(&ipv4_addr_my.sin_addr)); } - ret = net_addr_pton(AF_INET, DST_IP4ADDR, - &in4_addr_dst.sin_addr); + ret = net_addr_pton(NET_AF_INET, DST_IP4ADDR, + &ipv4_addr_dst.sin_addr); if (ret < 0) { NET_WARN("Unable to set destination %s address %s", "IPv4", @@ -1892,7 +1892,7 @@ void zperf_shell_init(void) : "(not set)"); } else { NET_INFO("Setting destination IP address %s", - net_sprint_ipv4_addr(&in4_addr_dst.sin_addr)); + net_sprint_ipv4_addr(&ipv4_addr_dst.sin_addr)); } } } diff --git a/subsys/net/lib/zperf/zperf_tcp_receiver.c b/subsys/net/lib/zperf/zperf_tcp_receiver.c index 3d7504313852d..e1907c9c5f496 100644 --- a/subsys/net/lib/zperf/zperf_tcp_receiver.c +++ b/subsys/net/lib/zperf/zperf_tcp_receiver.c @@ -34,17 +34,17 @@ static zperf_callback tcp_session_cb; static void *tcp_user_data; static bool tcp_server_running; static uint16_t tcp_server_port; -static struct sockaddr tcp_server_addr; +static struct net_sockaddr tcp_server_addr; static struct zsock_pollfd fds[SOCK_ID_MAX]; -static struct sockaddr sock_addr[SOCK_ID_MAX]; +static struct net_sockaddr sock_addr[SOCK_ID_MAX]; static void tcp_svc_handler(struct net_socket_service_event *pev); NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(svc_tcp, tcp_svc_handler, SOCK_ID_MAX); -static void tcp_received(const struct sockaddr *addr, size_t datalen) +static void tcp_received(const struct net_sockaddr *addr, size_t datalen) { struct session *session; int64_t time; @@ -111,7 +111,7 @@ static void tcp_receiver_cleanup(void) if (fds[i].fd >= 0) { zsock_close(fds[i].fd); fds[i].fd = -1; - memset(&sock_addr[i], 0, sizeof(struct sockaddr)); + memset(&sock_addr[i], 0, sizeof(struct net_sockaddr)); } } @@ -126,9 +126,9 @@ static int tcp_recv_data(struct net_socket_service_event *pev) static uint8_t buf[TCP_RECEIVER_BUF_SIZE]; int i, ret = 0; int family, sock, sock_error; - struct sockaddr addr_incoming_conn; - socklen_t optlen = sizeof(int); - socklen_t addrlen = sizeof(struct sockaddr); + struct net_sockaddr addr_incoming_conn; + net_socklen_t optlen = sizeof(int); + net_socklen_t addrlen = sizeof(struct net_sockaddr); if (!tcp_server_running) { return -ENOENT; @@ -141,7 +141,7 @@ static int tcp_recv_data(struct net_socket_service_event *pev) (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, SO_ERROR, &sock_error, &optlen); NET_ERR("TCP receiver IPv%d socket error (%d)", - family == AF_INET ? 4 : 6, sock_error); + family == NET_AF_INET ? 4 : 6, sock_error); ret = -sock_error; goto error; } @@ -164,7 +164,7 @@ static int tcp_recv_data(struct net_socket_service_event *pev) (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, SO_DOMAIN, &family, &optlen); NET_ERR("TCP receiver IPv%d accept error (%d)", - family == AF_INET ? 4 : 6, ret); + family == NET_AF_INET ? 4 : 6, ret); goto error; } @@ -194,7 +194,7 @@ static int tcp_recv_data(struct net_socket_service_event *pev) (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, SO_DOMAIN, &family, &optlen); NET_ERR("recv failed on IPv%d socket (%d)", - family == AF_INET ? 4 : 6, + family == NET_AF_INET ? 4 : 6, errno); tcp_session_error_report(); /* This will close the zperf session */ @@ -214,7 +214,7 @@ static int tcp_recv_data(struct net_socket_service_event *pev) if (ret == 0) { zsock_close(fds[i].fd); fds[i].fd = -1; - memset(&sock_addr[i], 0, sizeof(struct sockaddr)); + memset(&sock_addr[i], 0, sizeof(struct net_sockaddr)); (void)net_socket_service_register(&svc_tcp, fds, ARRAY_SIZE(fds), @@ -242,28 +242,28 @@ static void tcp_svc_handler(struct net_socket_service_event *pev) } static int tcp_bind_listen_connection(struct zsock_pollfd *pollfd, - struct sockaddr *address) + struct net_sockaddr *address) { uint16_t port; int ret; - if (address->sa_family == AF_INET) { - port = ntohs(net_sin(address)->sin_port); + if (address->sa_family == NET_AF_INET) { + port = net_ntohs(net_sin(address)->sin_port); } else { - port = ntohs(net_sin6(address)->sin6_port); + port = net_ntohs(net_sin6(address)->sin6_port); } ret = zsock_bind(pollfd->fd, address, sizeof(*address)); if (ret < 0) { NET_ERR("Cannot bind IPv%d TCP port %d (%d)", - address->sa_family == AF_INET ? 4 : 6, port, errno); + address->sa_family == NET_AF_INET ? 4 : 6, port, errno); goto out; } ret = zsock_listen(pollfd->fd, 1); if (ret < 0) { NET_ERR("Cannot listen IPv%d TCP (%d)", - address->sa_family == AF_INET ? 4 : 6, errno); + address->sa_family == NET_AF_INET ? 4 : 6, errno); goto out; } @@ -284,12 +284,12 @@ static int zperf_tcp_receiver_init(void) family = tcp_server_addr.sa_family; - if (IS_ENABLED(CONFIG_NET_IPV4) && (family == AF_INET || family == AF_UNSPEC)) { - struct sockaddr_in *in4_addr = zperf_get_sin(); - const struct in_addr *addr = NULL; + if (IS_ENABLED(CONFIG_NET_IPV4) && (family == NET_AF_INET || family == NET_AF_UNSPEC)) { + struct net_sockaddr_in *in4_addr = zperf_get_sin(); + const struct net_in_addr *addr = NULL; - fds[SOCK_ID_IPV4_LISTEN].fd = zsock_socket(AF_INET, SOCK_STREAM, - IPPROTO_TCP); + fds[SOCK_ID_IPV4_LISTEN].fd = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, + NET_IPPROTO_TCP); if (fds[SOCK_ID_IPV4_LISTEN].fd < 0) { ret = -errno; NET_ERR("Cannot create IPv4 network socket."); @@ -300,7 +300,7 @@ static int zperf_tcp_receiver_init(void) if (!net_ipv4_is_addr_unspecified(addr)) { memcpy(&in4_addr->sin_addr, addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } else if (strlen(MY_IP4ADDR ? MY_IP4ADDR : "")) { /* Use Setting IP */ ret = zperf_get_ipv4_addr(MY_IP4ADDR, @@ -311,16 +311,16 @@ static int zperf_tcp_receiver_init(void) } } else { use_any_ipv4: - in4_addr->sin_addr.s_addr = INADDR_ANY; + in4_addr->sin_addr.s_addr = NET_INADDR_ANY; } - in4_addr->sin_port = htons(tcp_server_port); + in4_addr->sin_port = net_htons(tcp_server_port); NET_INFO("Binding to %s", net_sprint_ipv4_addr(&in4_addr->sin_addr)); memcpy(net_sin(&sock_addr[SOCK_ID_IPV4_LISTEN]), in4_addr, - sizeof(struct sockaddr_in)); + sizeof(struct net_sockaddr_in)); ret = tcp_bind_listen_connection( &fds[SOCK_ID_IPV4_LISTEN], @@ -330,12 +330,12 @@ static int zperf_tcp_receiver_init(void) } } - if (IS_ENABLED(CONFIG_NET_IPV6) && (family == AF_INET6 || family == AF_UNSPEC)) { - struct sockaddr_in6 *in6_addr = zperf_get_sin6(); - const struct in6_addr *addr = NULL; + if (IS_ENABLED(CONFIG_NET_IPV6) && (family == NET_AF_INET6 || family == NET_AF_UNSPEC)) { + struct net_sockaddr_in6 *in6_addr = zperf_get_sin6(); + const struct net_in6_addr *addr = NULL; - fds[SOCK_ID_IPV6_LISTEN].fd = zsock_socket(AF_INET6, SOCK_STREAM, - IPPROTO_TCP); + fds[SOCK_ID_IPV6_LISTEN].fd = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, + NET_IPPROTO_TCP); if (fds[SOCK_ID_IPV6_LISTEN].fd < 0) { ret = -errno; NET_ERR("Cannot create IPv6 network socket."); @@ -346,7 +346,7 @@ static int zperf_tcp_receiver_init(void) if (!net_ipv6_is_addr_unspecified(addr)) { memcpy(&in6_addr->sin6_addr, addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } else if (strlen(MY_IP6ADDR ? MY_IP6ADDR : "")) { /* Use Setting IP */ ret = zperf_get_ipv6_addr(MY_IP6ADDR, @@ -359,16 +359,16 @@ static int zperf_tcp_receiver_init(void) } else { use_any_ipv6: memcpy(&in6_addr->sin6_addr, net_ipv6_unspecified_address(), - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } - in6_addr->sin6_port = htons(tcp_server_port); + in6_addr->sin6_port = net_htons(tcp_server_port); NET_INFO("Binding to %s", net_sprint_ipv6_addr(&in6_addr->sin6_addr)); memcpy(net_sin6(&sock_addr[SOCK_ID_IPV6_LISTEN]), in6_addr, - sizeof(struct sockaddr_in6)); + sizeof(struct net_sockaddr_in6)); ret = tcp_bind_listen_connection( &fds[SOCK_ID_IPV6_LISTEN], @@ -406,7 +406,7 @@ int zperf_tcp_download(const struct zperf_download_params *param, tcp_session_cb = callback; tcp_user_data = user_data; tcp_server_port = param->port; - memcpy(&tcp_server_addr, ¶m->addr, sizeof(struct sockaddr)); + memcpy(&tcp_server_addr, ¶m->addr, sizeof(struct net_sockaddr)); ret = zperf_tcp_receiver_init(); if (ret < 0) { diff --git a/subsys/net/lib/zperf/zperf_tcp_uploader.c b/subsys/net/lib/zperf/zperf_tcp_uploader.c index a115a4597feee..a8ad53112f4f2 100644 --- a/subsys/net/lib/zperf/zperf_tcp_uploader.c +++ b/subsys/net/lib/zperf/zperf_tcp_uploader.c @@ -152,7 +152,7 @@ int zperf_tcp_upload(const struct zperf_upload_params *param, sock = zperf_prepare_upload_sock(¶m->peer_addr, param->options.tos, param->options.priority, param->options.tcp_nodelay, - IPPROTO_TCP); + NET_IPPROTO_TCP); if (sock < 0) { return sock; } @@ -206,7 +206,7 @@ static void tcp_upload_async_work(struct k_work *work) sock = zperf_prepare_upload_sock(¶m.peer_addr, param.options.tos, param.options.priority, param.options.tcp_nodelay, - IPPROTO_TCP); + NET_IPPROTO_TCP); if (sock < 0) { upload_ctx->callback(ZPERF_SESSION_ERROR, NULL, diff --git a/subsys/net/lib/zperf/zperf_udp_receiver.c b/subsys/net/lib/zperf/zperf_udp_receiver.c index 62ce71da724ae..4ae7024336f94 100644 --- a/subsys/net/lib/zperf/zperf_udp_receiver.c +++ b/subsys/net/lib/zperf/zperf_udp_receiver.c @@ -28,8 +28,8 @@ LOG_MODULE_DECLARE(net_zperf, CONFIG_NET_ZPERF_LOG_LEVEL); #include "ipv6.h" #include "zephyr/net/igmp.h" -static struct sockaddr_in6 *in6_addr_my; -static struct sockaddr_in *in4_addr_my; +static struct net_sockaddr_in6 *in6_addr_my; +static struct net_sockaddr_in *in4_addr_my; #define SOCK_ID_IPV4 0 #define SOCK_ID_IPV6 1 @@ -42,7 +42,7 @@ static zperf_callback udp_session_cb; static void *udp_user_data; static bool udp_server_running; static uint16_t udp_server_port; -static struct sockaddr udp_server_addr; +static struct net_sockaddr udp_server_addr; struct zsock_pollfd fds[SOCK_ID_MAX] = { 0 }; @@ -50,7 +50,7 @@ static void udp_svc_handler(struct net_socket_service_event *pev); NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(svc_udp, udp_svc_handler, SOCK_ID_MAX); -static char udp_server_iface_name[IFNAMSIZ]; +static char udp_server_iface_name[NET_IFNAMSIZ]; static inline void build_reply(struct zperf_udp_datagram *hdr, struct zperf_server_hdr *stat, @@ -64,23 +64,23 @@ static inline void build_reply(struct zperf_udp_datagram *hdr, stat_hdr = (struct zperf_server_hdr *)&buf[pos]; - stat_hdr->flags = htonl(stat->flags); - stat_hdr->total_len1 = htonl(stat->total_len1); - stat_hdr->total_len2 = htonl(stat->total_len2); - stat_hdr->stop_sec = htonl(stat->stop_sec); - stat_hdr->stop_usec = htonl(stat->stop_usec); - stat_hdr->error_cnt = htonl(stat->error_cnt); - stat_hdr->outorder_cnt = htonl(stat->outorder_cnt); - stat_hdr->datagrams = htonl(stat->datagrams); - stat_hdr->jitter1 = htonl(stat->jitter1); - stat_hdr->jitter2 = htonl(stat->jitter2); + stat_hdr->flags = net_htonl(stat->flags); + stat_hdr->total_len1 = net_htonl(stat->total_len1); + stat_hdr->total_len2 = net_htonl(stat->total_len2); + stat_hdr->stop_sec = net_htonl(stat->stop_sec); + stat_hdr->stop_usec = net_htonl(stat->stop_usec); + stat_hdr->error_cnt = net_htonl(stat->error_cnt); + stat_hdr->outorder_cnt = net_htonl(stat->outorder_cnt); + stat_hdr->datagrams = net_htonl(stat->datagrams); + stat_hdr->jitter1 = net_htonl(stat->jitter1); + stat_hdr->jitter2 = net_htonl(stat->jitter2); } /* Send statistics to the remote client */ #define BUF_SIZE sizeof(struct zperf_udp_datagram) + \ sizeof(struct zperf_server_hdr) -static int zperf_receiver_send_stat(int sock, const struct sockaddr *addr, +static int zperf_receiver_send_stat(int sock, const struct net_sockaddr *addr, struct zperf_udp_datagram *hdr, struct zperf_server_hdr *stat) { @@ -90,9 +90,9 @@ static int zperf_receiver_send_stat(int sock, const struct sockaddr *addr, build_reply(hdr, stat, reply); ret = zsock_sendto(sock, reply, sizeof(reply), 0, addr, - addr->sa_family == AF_INET6 ? - sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in)); + addr->sa_family == NET_AF_INET6 ? + sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in)); if (ret < 0) { NET_ERR("Cannot send data to peer (%d)", errno); } @@ -100,7 +100,7 @@ static int zperf_receiver_send_stat(int sock, const struct sockaddr *addr, return ret; } -static void udp_received(int sock, const struct sockaddr *addr, uint8_t *data, +static void udp_received(int sock, const struct net_sockaddr *addr, uint8_t *data, size_t datalen) { struct zperf_udp_datagram *hdr; @@ -123,7 +123,7 @@ static void udp_received(int sock, const struct sockaddr *addr, uint8_t *data, return; } - id = ntohl(hdr->id); + id = net_ntohl(hdr->id); switch (session->state) { case STATE_COMPLETED: @@ -197,8 +197,8 @@ static void udp_received(int sock, const struct sockaddr *addr, uint8_t *data, /* Compute jitter */ transit_time = time_delta( k_ticks_to_us_ceil32(time), - ntohl(hdr->tv_sec) * USEC_PER_SEC + - ntohl(hdr->tv_usec)); + net_ntohl(hdr->tv_sec) * USEC_PER_SEC + + net_ntohl(hdr->tv_usec)); if (session->last_transit_time != 0) { int32_t delta_transit = transit_time - session->last_transit_time; @@ -231,7 +231,7 @@ static void udp_received(int sock, const struct sockaddr *addr, uint8_t *data, } } -static void zperf_udp_join_mcast_ipv4(char *if_name, struct in_addr *addr) +static void zperf_udp_join_mcast_ipv4(char *if_name, struct net_in_addr *addr) { struct net_if *iface = NULL; @@ -249,7 +249,7 @@ static void zperf_udp_join_mcast_ipv4(char *if_name, struct in_addr *addr) } } -static void zperf_udp_join_mcast_ipv6(char *if_name, struct in6_addr *addr) +static void zperf_udp_join_mcast_ipv6(char *if_name, struct net_in6_addr *addr) { struct net_if *iface = NULL; @@ -270,21 +270,21 @@ static void zperf_udp_join_mcast_ipv6(char *if_name, struct in6_addr *addr) static void zperf_udp_leave_mcast(int sock) { struct net_if *iface = NULL; - struct sockaddr addr = {0}; - socklen_t addr_len = NET_IPV6_ADDR_SIZE; + struct net_sockaddr addr = {0}; + net_socklen_t addr_len = NET_IPV6_ADDR_SIZE; zsock_getsockname(sock, &addr, &addr_len); - if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == AF_INET) { - struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr; + if (IS_ENABLED(CONFIG_NET_IPV4) && addr.sa_family == NET_AF_INET) { + struct net_sockaddr_in *addr4 = (struct net_sockaddr_in *)&addr; if (net_ipv4_is_addr_mcast(&addr4->sin_addr)) { net_ipv4_igmp_leave(iface, &addr4->sin_addr); } } - if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == AF_INET6) { - struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr; + if (IS_ENABLED(CONFIG_NET_IPV6) && addr.sa_family == NET_AF_INET6) { + struct net_sockaddr_in6 *addr6 = (struct net_sockaddr_in6 *)&addr; if (net_ipv6_is_addr_mcast(&addr6->sin6_addr)) { net_ipv6_mld_leave(iface, &addr6->sin6_addr); @@ -317,9 +317,9 @@ static int udp_recv_data(struct net_socket_service_event *pev) static uint8_t buf[UDP_RECEIVER_BUF_SIZE]; int ret = 1; int family, sock_error; - struct sockaddr addr; - socklen_t optlen = sizeof(int); - socklen_t addrlen = sizeof(addr); + struct net_sockaddr addr; + net_socklen_t optlen = sizeof(int); + net_socklen_t addrlen = sizeof(addr); if (!udp_server_running) { return -ENOENT; @@ -332,7 +332,7 @@ static int udp_recv_data(struct net_socket_service_event *pev) (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, SO_ERROR, &sock_error, &optlen); NET_ERR("UDP receiver IPv%d socket error (%d)", - family == AF_INET ? 4 : 6, sock_error); + family == NET_AF_INET ? 4 : 6, sock_error); ret = -sock_error; goto error; } @@ -354,7 +354,7 @@ static int udp_recv_data(struct net_socket_service_event *pev) (void)zsock_getsockopt(pev->event.fd, SOL_SOCKET, SO_DOMAIN, &family, &optlen); NET_ERR("recv failed on IPv%d socket (%d)", - family == AF_INET ? 4 : 6, -ret); + family == NET_AF_INET ? 4 : 6, -ret); goto error; } @@ -391,13 +391,13 @@ static int zperf_udp_receiver_init(void) family = udp_server_addr.sa_family; - if (IS_ENABLED(CONFIG_NET_IPV4) && (family == AF_INET || family == AF_UNSPEC)) { - const struct in_addr *in4_addr = NULL; + if (IS_ENABLED(CONFIG_NET_IPV4) && (family == NET_AF_INET || family == NET_AF_UNSPEC)) { + const struct net_in_addr *in4_addr = NULL; in4_addr_my = zperf_get_sin(); - fds[SOCK_ID_IPV4].fd = zsock_socket(AF_INET, SOCK_DGRAM, - IPPROTO_UDP); + fds[SOCK_ID_IPV4].fd = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, + NET_IPPROTO_UDP); if (fds[SOCK_ID_IPV4].fd < 0) { ret = -errno; NET_ERR("Cannot create IPv4 network socket."); @@ -408,7 +408,7 @@ static int zperf_udp_receiver_init(void) if (!net_ipv4_is_addr_unspecified(in4_addr)) { memcpy(&in4_addr_my->sin_addr, in4_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } else if (strlen(MY_IP4ADDR ? MY_IP4ADDR : "")) { /* Use setting IP */ ret = zperf_get_ipv4_addr(MY_IP4ADDR, @@ -419,7 +419,7 @@ static int zperf_udp_receiver_init(void) } } else { use_any_ipv4: - in4_addr_my->sin_addr.s_addr = INADDR_ANY; + in4_addr_my->sin_addr.s_addr = NET_INADDR_ANY; } if (net_ipv4_is_addr_mcast(&in4_addr_my->sin_addr)) { @@ -430,14 +430,14 @@ static int zperf_udp_receiver_init(void) NET_INFO("Binding to %s", net_sprint_ipv4_addr(&in4_addr_my->sin_addr)); - in4_addr_my->sin_port = htons(udp_server_port); + in4_addr_my->sin_port = net_htons(udp_server_port); ret = zsock_bind(fds[SOCK_ID_IPV4].fd, - (struct sockaddr *)in4_addr_my, - sizeof(struct sockaddr_in)); + (struct net_sockaddr *)in4_addr_my, + sizeof(struct net_sockaddr_in)); if (ret < 0) { NET_ERR("Cannot bind IPv4 UDP port %d (%d)", - ntohs(in4_addr_my->sin_port), + net_ntohs(in4_addr_my->sin_port), errno); goto error; } @@ -445,13 +445,13 @@ static int zperf_udp_receiver_init(void) fds[SOCK_ID_IPV4].events = ZSOCK_POLLIN; } - if (IS_ENABLED(CONFIG_NET_IPV6) && (family == AF_INET6 || family == AF_UNSPEC)) { - const struct in6_addr *in6_addr = NULL; + if (IS_ENABLED(CONFIG_NET_IPV6) && (family == NET_AF_INET6 || family == NET_AF_UNSPEC)) { + const struct net_in6_addr *in6_addr = NULL; in6_addr_my = zperf_get_sin6(); - fds[SOCK_ID_IPV6].fd = zsock_socket(AF_INET6, SOCK_DGRAM, - IPPROTO_UDP); + fds[SOCK_ID_IPV6].fd = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, + NET_IPPROTO_UDP); if (fds[SOCK_ID_IPV6].fd < 0) { ret = -errno; NET_ERR("Cannot create IPv4 network socket."); @@ -462,7 +462,7 @@ static int zperf_udp_receiver_init(void) if (!net_ipv6_is_addr_unspecified(in6_addr)) { memcpy(&in6_addr_my->sin6_addr, in6_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } else if (strlen(MY_IP6ADDR ? MY_IP6ADDR : "")) { /* Use setting IP */ ret = zperf_get_ipv6_addr(MY_IP6ADDR, @@ -476,7 +476,7 @@ static int zperf_udp_receiver_init(void) use_any_ipv6: memcpy(&in6_addr_my->sin6_addr, net_ipv6_unspecified_address(), - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } if (net_ipv6_is_addr_mcast(&in6_addr_my->sin6_addr)) { @@ -487,14 +487,14 @@ static int zperf_udp_receiver_init(void) NET_INFO("Binding to %s", net_sprint_ipv6_addr(&in6_addr_my->sin6_addr)); - in6_addr_my->sin6_port = htons(udp_server_port); + in6_addr_my->sin6_port = net_htons(udp_server_port); ret = zsock_bind(fds[SOCK_ID_IPV6].fd, - (struct sockaddr *)in6_addr_my, - sizeof(struct sockaddr_in6)); + (struct net_sockaddr *)in6_addr_my, + sizeof(struct net_sockaddr_in6)); if (ret < 0) { NET_ERR("Cannot bind IPv6 UDP port %d (%d)", - ntohs(in6_addr_my->sin6_port), + net_ntohs(in6_addr_my->sin6_port), ret); goto error; } @@ -531,16 +531,16 @@ int zperf_udp_download(const struct zperf_download_params *param, udp_session_cb = callback; udp_user_data = user_data; udp_server_port = param->port; - memcpy(&udp_server_addr, ¶m->addr, sizeof(struct sockaddr)); + memcpy(&udp_server_addr, ¶m->addr, sizeof(struct net_sockaddr)); if (param->if_name[0]) { /* - * IFNAMSIZ by default CONFIG_NET_INTERFACE_NAME_LEN + * NET_IFNAMSIZ by default CONFIG_NET_INTERFACE_NAME_LEN * is at least 1 so no overflow risk here */ - (void)memset(udp_server_iface_name, 0, IFNAMSIZ); - strncpy(udp_server_iface_name, param->if_name, IFNAMSIZ); - udp_server_iface_name[IFNAMSIZ - 1] = 0; + (void)memset(udp_server_iface_name, 0, NET_IFNAMSIZ); + strncpy(udp_server_iface_name, param->if_name, NET_IFNAMSIZ); + udp_server_iface_name[NET_IFNAMSIZ - 1] = 0; } else { udp_server_iface_name[0] = 0; } diff --git a/subsys/net/lib/zperf/zperf_udp_uploader.c b/subsys/net/lib/zperf/zperf_udp_uploader.c index 500130b4a22d5..f6c33e9623d01 100644 --- a/subsys/net/lib/zperf/zperf_udp_uploader.c +++ b/subsys/net/lib/zperf/zperf_udp_uploader.c @@ -37,21 +37,21 @@ static inline void zperf_upload_decode_stat(const uint8_t *data, stat = (struct zperf_server_hdr *) (data + sizeof(struct zperf_udp_datagram)); - flags = ntohl(UNALIGNED_GET(&stat->flags)); + flags = net_ntohl(UNALIGNED_GET(&stat->flags)); if (!(flags & ZPERF_FLAGS_VERSION1)) { NET_WARN("Unexpected response flags"); } - results->nb_packets_rcvd = ntohl(UNALIGNED_GET(&stat->datagrams)); - results->nb_packets_lost = ntohl(UNALIGNED_GET(&stat->error_cnt)); + results->nb_packets_rcvd = net_ntohl(UNALIGNED_GET(&stat->datagrams)); + results->nb_packets_lost = net_ntohl(UNALIGNED_GET(&stat->error_cnt)); results->nb_packets_outorder = - ntohl(UNALIGNED_GET(&stat->outorder_cnt)); - results->total_len = (((uint64_t)ntohl(UNALIGNED_GET(&stat->total_len1))) << 32) + - ntohl(UNALIGNED_GET(&stat->total_len2)); - results->time_in_us = ntohl(UNALIGNED_GET(&stat->stop_usec)) + - ntohl(UNALIGNED_GET(&stat->stop_sec)) * USEC_PER_SEC; - results->jitter_in_us = ntohl(UNALIGNED_GET(&stat->jitter2)) + - ntohl(UNALIGNED_GET(&stat->jitter1)) * USEC_PER_SEC; + net_ntohl(UNALIGNED_GET(&stat->outorder_cnt)); + results->total_len = (((uint64_t)net_ntohl(UNALIGNED_GET(&stat->total_len1))) << 32) + + net_ntohl(UNALIGNED_GET(&stat->total_len2)); + results->time_in_us = net_ntohl(UNALIGNED_GET(&stat->stop_usec)) + + net_ntohl(UNALIGNED_GET(&stat->stop_sec)) * USEC_PER_SEC; + results->jitter_in_us = net_ntohl(UNALIGNED_GET(&stat->jitter2)) + + net_ntohl(UNALIGNED_GET(&stat->jitter1)) * USEC_PER_SEC; } static inline int zperf_upload_fin(int sock, @@ -78,9 +78,9 @@ static inline int zperf_upload_fin(int sock, datagram = (struct zperf_udp_datagram *)sample_packet; /* Fill the packet header */ - datagram->id = htonl(-nb_packets); - datagram->tv_sec = htonl(secs); - datagram->tv_usec = htonl(usecs); + datagram->id = net_htonl(-nb_packets); + datagram->tv_sec = net_htonl(secs); + datagram->tv_usec = net_htonl(usecs); hdr = (struct zperf_client_hdr_v1 *)(sample_packet + sizeof(*datagram)); @@ -91,12 +91,12 @@ static inline int zperf_upload_fin(int sock, * to set there some meaningful values. */ hdr->flags = 0; - hdr->num_of_threads = htonl(1); + hdr->num_of_threads = net_htonl(1); hdr->port = 0; hdr->buffer_len = sizeof(sample_packet) - sizeof(*datagram) - sizeof(*hdr); hdr->bandwidth = 0; - hdr->num_of_bytes = htonl(packet_size); + hdr->num_of_bytes = net_htonl(packet_size); /* Send the packet */ ret = zsock_send(sock, sample_packet, packet_size, 0); @@ -320,19 +320,19 @@ static int udp_upload(int sock, int port, /* Fill the packet header */ datagram = (struct zperf_udp_datagram *)sample_packet; - datagram->id = htonl(nb_packets); - datagram->tv_sec = htonl(secs); - datagram->tv_usec = htonl(usecs); + datagram->id = net_htonl(nb_packets); + datagram->tv_sec = net_htonl(secs); + datagram->tv_usec = net_htonl(usecs); hdr = (struct zperf_client_hdr_v1 *)(sample_packet + sizeof(*datagram)); hdr->flags = 0; - hdr->num_of_threads = htonl(1); - hdr->port = htonl(port); + hdr->num_of_threads = net_htonl(1); + hdr->port = net_htonl(port); hdr->buffer_len = sizeof(sample_packet) - sizeof(*datagram) - sizeof(*hdr); - hdr->bandwidth = htonl(rate_in_kbps); - hdr->num_of_bytes = htonl(packet_size); + hdr->bandwidth = net_htonl(rate_in_kbps); + hdr->num_of_bytes = net_htonl(packet_size); /* Load custom data payload if requested */ if (param->data_loader != NULL) { @@ -376,11 +376,11 @@ static int udp_upload(int sock, int port, end_time = k_uptime_ticks(); usecs64 = param->unix_offset_us + k_ticks_to_us_floor64(end_time - start_time); - if (param->peer_addr.sa_family == AF_INET) { + if (param->peer_addr.sa_family == NET_AF_INET) { if (net_ipv4_is_addr_mcast(&net_sin(¶m->peer_addr)->sin_addr)) { is_mcast_pkt = true; } - } else if (param->peer_addr.sa_family == AF_INET6) { + } else if (param->peer_addr.sa_family == NET_AF_INET6) { if (net_ipv6_is_addr_mcast(&net_sin6(¶m->peer_addr)->sin6_addr)) { is_mcast_pkt = true; } @@ -414,10 +414,10 @@ int zperf_udp_upload(const struct zperf_upload_params *param, return -EINVAL; } - if (param->peer_addr.sa_family == AF_INET) { - port = ntohs(net_sin(¶m->peer_addr)->sin_port); - } else if (param->peer_addr.sa_family == AF_INET6) { - port = ntohs(net_sin6(¶m->peer_addr)->sin6_port); + if (param->peer_addr.sa_family == NET_AF_INET) { + port = net_ntohs(net_sin(¶m->peer_addr)->sin_port); + } else if (param->peer_addr.sa_family == NET_AF_INET6) { + port = net_ntohs(net_sin6(¶m->peer_addr)->sin6_port); } else { NET_ERR("Invalid address family (%d)", param->peer_addr.sa_family); @@ -425,17 +425,19 @@ int zperf_udp_upload(const struct zperf_upload_params *param, } sock = zperf_prepare_upload_sock(¶m->peer_addr, param->options.tos, - param->options.priority, 0, IPPROTO_UDP); + param->options.priority, 0, + NET_IPPROTO_UDP); if (sock < 0) { return sock; } if (param->if_name[0]) { (void)memset(req.ifr_name, 0, sizeof(req.ifr_name)); - strncpy(req.ifr_name, param->if_name, IFNAMSIZ); - req.ifr_name[IFNAMSIZ - 1] = 0; + strncpy(req.ifr_name, param->if_name, NET_IFNAMSIZ); + req.ifr_name[NET_IFNAMSIZ - 1] = 0; - if (zsock_setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, &req, + if (zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, + ZSOCK_SO_BINDTODEVICE, &req, sizeof(struct ifreq)) != 0) { NET_WARN("setsockopt SO_BINDTODEVICE error (%d)", -errno); } diff --git a/subsys/net/pkt_filter/base.c b/subsys/net/pkt_filter/base.c index 6785cb215d4c6..7825361f23798 100644 --- a/subsys/net/pkt_filter/base.c +++ b/subsys/net/pkt_filter/base.c @@ -53,12 +53,12 @@ struct npf_rule_list npf_ipv6_recv_rules = { static struct npf_rule_list *get_ip_rules(uint8_t pf) { switch (pf) { - case PF_INET: + case NET_PF_INET: #ifdef CONFIG_NET_PKT_FILTER_IPV4_HOOK return &npf_ipv4_recv_rules; #endif break; - case PF_INET6: + case NET_PF_INET6: #ifdef CONFIG_NET_PKT_FILTER_IPV6_HOOK return &npf_ipv6_recv_rules; #endif @@ -294,16 +294,18 @@ bool npf_ip_src_addr_match(struct npf_test *test, struct net_pkt *pkt) uint8_t pkt_family = net_pkt_family(pkt); for (uint32_t ip_it = 0; ip_it < test_ip->ipaddr_num; ip_it++) { - if (IS_ENABLED(CONFIG_NET_IPV4) && pkt_family == AF_INET) { - struct in_addr *addr = (struct in_addr *)NET_IPV4_HDR(pkt)->src; + if (IS_ENABLED(CONFIG_NET_IPV4) && pkt_family == NET_AF_INET) { + struct net_in_addr *addr = (struct net_in_addr *)NET_IPV4_HDR(pkt)->src; - if (net_ipv4_addr_cmp(addr, &((struct in_addr *)test_ip->ipaddr)[ip_it])) { + if (net_ipv4_addr_cmp(addr, + &((struct net_in_addr *)test_ip->ipaddr)[ip_it])) { return true; } - } else if (IS_ENABLED(CONFIG_NET_IPV6) && pkt_family == AF_INET6) { - struct in6_addr *addr = (struct in6_addr *)NET_IPV6_HDR(pkt)->src; + } else if (IS_ENABLED(CONFIG_NET_IPV6) && pkt_family == NET_AF_INET6) { + struct net_in6_addr *addr = (struct net_in6_addr *)NET_IPV6_HDR(pkt)->src; - if (net_ipv6_addr_cmp(addr, &((struct in6_addr *)test_ip->ipaddr)[ip_it])) { + if (net_ipv6_addr_cmp(addr, + &((struct net_in6_addr *)test_ip->ipaddr)[ip_it])) { return true; } } @@ -392,18 +394,18 @@ const char *npf_test_get_str(struct npf_test *test, char *buf, size_t len) for (uint32_t i = 0; i < test_ip->ipaddr_num; i++) { if (IS_ENABLED(CONFIG_NET_IPV4) && - test_ip->addr_family == AF_INET) { - struct in_addr *addr = - &((struct in_addr *)test_ip->ipaddr)[i]; + test_ip->addr_family == NET_AF_INET) { + struct net_in_addr *addr = + &((struct net_in_addr *)test_ip->ipaddr)[i]; pos += snprintk(buf + pos, len - pos, "%s%s", pos > 1 ? "," : "", net_sprint_ipv4_addr(addr)); } else if (IS_ENABLED(CONFIG_NET_IPV6) && - test_ip->addr_family == AF_INET6) { - struct in6_addr *addr = - &((struct in6_addr *)test_ip->ipaddr)[i]; + test_ip->addr_family == NET_AF_INET6) { + struct net_in6_addr *addr = + &((struct net_in6_addr *)test_ip->ipaddr)[i]; pos += snprintk(buf + pos, len - pos, "%s%s", pos > 1 ? "," : "", @@ -459,7 +461,7 @@ const char *npf_test_get_str(struct npf_test *test, char *buf, size_t len) struct npf_test_eth_type *test_eth = CONTAINER_OF(test, struct npf_test_eth_type, test); - snprintk(buf, len, "[0x%04x]", ntohs(test_eth->type)); + snprintk(buf, len, "[0x%04x]", net_ntohs(test_eth->type)); } out: diff --git a/subsys/net/pkt_filter/ethernet.c b/subsys/net/pkt_filter/ethernet.c index 22ddd939dcfea..cb07772cd65d6 100644 --- a/subsys/net/pkt_filter/ethernet.c +++ b/subsys/net/pkt_filter/ethernet.c @@ -73,8 +73,8 @@ bool npf_eth_type_match(struct npf_test *test, struct net_pkt *pkt) /* note: type_match->type is assumed to be in network order already */ NET_DBG("proto type 0x%04x pkt 0x%04x", - ntohs(test_eth_type->type), - ntohs(eth_hdr->type)); + net_ntohs(test_eth_type->type), + net_ntohs(eth_hdr->type)); return eth_hdr->type == test_eth_type->type; } @@ -93,8 +93,8 @@ bool npf_eth_vlan_type_match(struct npf_test *test, struct net_pkt *pkt) /* note: type_match->type is assumed to be in network order already */ NET_DBG("proto type 0x%04x pkt 0x%04x", - ntohs(test_eth_type->type), - ntohs(eth_hdr->type)); + net_ntohs(test_eth_type->type), + net_ntohs(eth_hdr->type)); return eth_hdr->type == test_eth_type->type; } diff --git a/subsys/shell/backends/shell_mqtt.c b/subsys/shell/backends/shell_mqtt.c index 211989f6e2a4c..8d24dc2e42cca 100644 --- a/subsys/shell/backends/shell_mqtt.c +++ b/subsys/shell/backends/shell_mqtt.c @@ -109,8 +109,8 @@ static int wait(struct shell_mqtt *sh, int timeout) static int get_mqtt_broker_addrinfo(struct shell_mqtt *sh) { int rc; - struct zsock_addrinfo hints = { .ai_family = AF_INET, - .ai_socktype = SOCK_STREAM, + struct zsock_addrinfo hints = { .ai_family = NET_AF_INET, + .ai_socktype = NET_SOCK_STREAM, .ai_protocol = 0 }; if (sh->haddr != NULL) { @@ -162,10 +162,10 @@ static void sh_mqtt_close_and_cleanup(struct shell_mqtt *sh) static void broker_init(struct shell_mqtt *sh) { - struct sockaddr_in *broker4 = (struct sockaddr_in *)&sh->broker; + struct net_sockaddr_in *broker4 = (struct net_sockaddr_in *)&sh->broker; - broker4->sin_family = AF_INET; - broker4->sin_port = htons(CONFIG_SHELL_MQTT_SERVER_PORT); + broker4->sin_family = NET_AF_INET; + broker4->sin_port = net_htons(CONFIG_SHELL_MQTT_SERVER_PORT); net_ipaddr_copy(&broker4->sin_addr, &net_sin(sh->haddr->ai_addr)->sin_addr); } diff --git a/subsys/shell/backends/shell_telnet.c b/subsys/shell/backends/shell_telnet.c index d05570f6d0627..cb8401f795fa0 100644 --- a/subsys/shell/backends/shell_telnet.c +++ b/subsys/shell/backends/shell_telnet.c @@ -411,8 +411,8 @@ static void telnet_restart_server(void) static void telnet_accept(struct zsock_pollfd *pollfd) { int sock, ret = 0; - struct sockaddr addr; - socklen_t addrlen = sizeof(struct sockaddr); + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(struct net_sockaddr); sock = zsock_accept(pollfd->fd, &addr, &addrlen); if (sock < 0) { @@ -442,8 +442,8 @@ static void telnet_accept(struct zsock_pollfd *pollfd) goto error; } - LOG_DBG("Telnet client connected (family AF_INET%s)", - addr.sa_family == AF_INET ? "" : "6"); + LOG_DBG("Telnet client connected (family NET_AF_INET%s)", + addr.sa_family == NET_AF_INET ? "" : "6"); /* Disable echo - if command handling is enabled we reply that we * support echo. @@ -465,7 +465,7 @@ static void telnet_accept(struct zsock_pollfd *pollfd) static void telnet_server_cb(struct net_socket_service_event *evt) { int sock_error; - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); if (sh_telnet == NULL) { return; @@ -473,8 +473,8 @@ static void telnet_server_cb(struct net_socket_service_event *evt) if ((evt->event.revents & ZSOCK_POLLERR) || (evt->event.revents & ZSOCK_POLLNVAL)) { - (void)zsock_getsockopt(evt->event.fd, SOL_SOCKET, - SO_ERROR, &sock_error, &optlen); + (void)zsock_getsockopt(evt->event.fd, ZSOCK_SOL_SOCKET, + ZSOCK_SO_ERROR, &sock_error, &optlen); NET_ERR("Telnet socket %d error (%d)", evt->event.fd, sock_error); if (evt->event.fd == sh_telnet->fds[SOCK_ID_CLIENT].fd) { @@ -506,43 +506,43 @@ static void telnet_server_cb(struct net_socket_service_event *evt) telnet_restart_server(); } -static int telnet_setup_server(struct zsock_pollfd *pollfd, sa_family_t family, - struct sockaddr *addr, socklen_t addrlen) +static int telnet_setup_server(struct zsock_pollfd *pollfd, net_sa_family_t family, + struct net_sockaddr *addr, net_socklen_t addrlen) { int ret = 0; - pollfd->fd = zsock_socket(family, SOCK_STREAM, IPPROTO_TCP); + pollfd->fd = zsock_socket(family, NET_SOCK_STREAM, NET_IPPROTO_TCP); if (pollfd->fd < 0) { ret = -errno; - LOG_ERR("Failed to create telnet AF_INET%s socket", - family == AF_INET ? "" : "6"); + LOG_ERR("Failed to create telnet NET_AF_INET%s socket", + family == NET_AF_INET ? "" : "6"); goto error; } if (zsock_bind(pollfd->fd, addr, addrlen) < 0) { ret = -errno; - LOG_ERR("Cannot bind on family AF_INET%s (%d)", - family == AF_INET ? "" : "6", ret); + LOG_ERR("Cannot bind on family NET_AF_INET%s (%d)", + family == NET_AF_INET ? "" : "6", ret); goto error; } if (zsock_listen(pollfd->fd, 1)) { ret = -errno; - LOG_ERR("Cannot listen on family AF_INET%s (%d)", - family == AF_INET ? "" : "6", ret); + LOG_ERR("Cannot listen on family NET_AF_INET%s (%d)", + family == NET_AF_INET ? "" : "6", ret); goto error; } pollfd->events = ZSOCK_POLLIN; - LOG_DBG("Telnet console enabled on AF_INET%s", - family == AF_INET ? "" : "6"); + LOG_DBG("Telnet console enabled on NET_AF_INET%s", + family == NET_AF_INET ? "" : "6"); return 0; error: - LOG_ERR("Unable to start telnet on AF_INET%s (%d)", - family == AF_INET ? "" : "6", ret); + LOG_ERR("Unable to start telnet on NET_AF_INET%s (%d)", + family == NET_AF_INET ? "" : "6", ret); if (pollfd->fd >= 0) { (void)zsock_close(pollfd->fd); @@ -557,14 +557,14 @@ static int telnet_init(struct shell_telnet *ctx) int ret; if (IS_ENABLED(CONFIG_NET_IPV4)) { - struct sockaddr_in any_addr4 = { - .sin_family = AF_INET, - .sin_port = htons(TELNET_PORT), - .sin_addr = INADDR_ANY_INIT + struct net_sockaddr_in any_addr4 = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(TELNET_PORT), + .sin_addr = NET_INADDR_ANY_INIT }; ret = telnet_setup_server(&ctx->fds[SOCK_ID_IPV4_LISTEN], - AF_INET, (struct sockaddr *)&any_addr4, + NET_AF_INET, (struct net_sockaddr *)&any_addr4, sizeof(any_addr4)); if (ret < 0) { goto error; @@ -572,14 +572,14 @@ static int telnet_init(struct shell_telnet *ctx) } if (IS_ENABLED(CONFIG_NET_IPV6)) { - struct sockaddr_in6 any_addr6 = { - .sin6_family = AF_INET6, - .sin6_port = htons(TELNET_PORT), - .sin6_addr = IN6ADDR_ANY_INIT + struct net_sockaddr_in6 any_addr6 = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(TELNET_PORT), + .sin6_addr = NET_IN6ADDR_ANY_INIT }; ret = telnet_setup_server(&ctx->fds[SOCK_ID_IPV6_LISTEN], - AF_INET6, (struct sockaddr *)&any_addr6, + NET_AF_INET6, (struct net_sockaddr *)&any_addr6, sizeof(any_addr6)); if (ret < 0) { goto error; diff --git a/subsys/tracing/ctf/ctf_top.c b/subsys/tracing/ctf/ctf_top.c index 65c41062cfe5b..c9717ddcc173e 100644 --- a/subsys/tracing/ctf/ctf_top.c +++ b/subsys/tracing/ctf/ctf_top.c @@ -965,14 +965,14 @@ void sys_trace_socket_shutdown_exit(int sock, int ret) ctf_top_socket_shutdown_exit(sock, ret); } -void sys_trace_socket_bind_enter(int sock, const struct sockaddr *addr, size_t addrlen) +void sys_trace_socket_bind_enter(int sock, const struct net_sockaddr *addr, size_t addrlen) { ctf_net_bounded_string_t addr_str; (void)net_addr_ntop(addr->sa_family, &net_sin(addr)->sin_addr, addr_str.buf, sizeof(addr_str.buf)); - ctf_top_socket_bind_enter(sock, addr_str, addrlen, ntohs(net_sin(addr)->sin_port)); + ctf_top_socket_bind_enter(sock, addr_str, addrlen, net_ntohs(net_sin(addr)->sin_port)); } void sys_trace_socket_bind_exit(int sock, int ret) @@ -980,7 +980,7 @@ void sys_trace_socket_bind_exit(int sock, int ret) ctf_top_socket_bind_exit(sock, ret); } -void sys_trace_socket_connect_enter(int sock, const struct sockaddr *addr, size_t addrlen) +void sys_trace_socket_connect_enter(int sock, const struct net_sockaddr *addr, size_t addrlen) { ctf_net_bounded_string_t addr_str; @@ -1010,8 +1010,8 @@ void sys_trace_socket_accept_enter(int sock) ctf_top_socket_accept_enter(sock); } -void sys_trace_socket_accept_exit(int sock, const struct sockaddr *addr, const uint32_t *addrlen, - int ret) +void sys_trace_socket_accept_exit(int sock, const struct net_sockaddr *addr, + const uint32_t *addrlen, int ret) { ctf_net_bounded_string_t addr_str = {"unknown"}; uint32_t addr_len = 0U; @@ -1031,7 +1031,7 @@ void sys_trace_socket_accept_exit(int sock, const struct sockaddr *addr, const u } void sys_trace_socket_sendto_enter(int sock, int len, int flags, - const struct sockaddr *dest_addr, uint32_t addrlen) + const struct net_sockaddr *dest_addr, uint32_t addrlen) { ctf_net_bounded_string_t addr_str = {"unknown"}; @@ -1048,7 +1048,7 @@ void sys_trace_socket_sendto_exit(int sock, int ret) ctf_top_socket_sendto_exit(sock, ret); } -void sys_trace_socket_sendmsg_enter(int sock, const struct msghdr *msg, int flags) +void sys_trace_socket_sendmsg_enter(int sock, const struct net_msghdr *msg, int flags) { ctf_net_bounded_string_t addr = {"unknown"}; uint32_t len = 0; @@ -1058,8 +1058,9 @@ void sys_trace_socket_sendmsg_enter(int sock, const struct msghdr *msg, int flag } if (msg->msg_name != NULL) { - (void)net_addr_ntop(((struct sockaddr *)msg->msg_name)->sa_family, - &net_sin((struct sockaddr *)msg->msg_name)->sin_addr, addr.buf, + (void)net_addr_ntop(((struct net_sockaddr *)msg->msg_name)->sa_family, + &net_sin((struct net_sockaddr *)msg->msg_name)->sin_addr, + addr.buf, sizeof(addr.buf)); } @@ -1072,20 +1073,21 @@ void sys_trace_socket_sendmsg_exit(int sock, int ret) } void sys_trace_socket_recvfrom_enter(int sock, int max_len, int flags, - struct sockaddr *addr, uint32_t *addrlen) + struct net_sockaddr *addr, uint32_t *addrlen) { ctf_top_socket_recvfrom_enter(sock, max_len, flags, (uint32_t)(uintptr_t)addr, (uint32_t)(uintptr_t)addrlen); } -void sys_trace_socket_recvfrom_exit(int sock, const struct sockaddr *src_addr, +void sys_trace_socket_recvfrom_exit(int sock, const struct net_sockaddr *src_addr, const uint32_t *addrlen, int ret) { ctf_net_bounded_string_t addr_str = {"unknown"}; int len = 0; if (src_addr != NULL) { - (void)net_addr_ntop(src_addr->sa_family, &net_sin(src_addr)->sin_addr, addr_str.buf, + (void)net_addr_ntop(src_addr->sa_family, &net_sin(src_addr)->sin_addr, + addr_str.buf, sizeof(addr_str.buf)); } @@ -1096,7 +1098,7 @@ void sys_trace_socket_recvfrom_exit(int sock, const struct sockaddr *src_addr, ctf_top_socket_recvfrom_exit(sock, addr_str, len, ret); } -void sys_trace_socket_recvmsg_enter(int sock, const struct msghdr *msg, int flags) +void sys_trace_socket_recvmsg_enter(int sock, const struct net_msghdr *msg, int flags) { uint32_t max_len = 0; @@ -1107,7 +1109,7 @@ void sys_trace_socket_recvmsg_enter(int sock, const struct msghdr *msg, int flag ctf_top_socket_recvmsg_enter(sock, (uint32_t)(uintptr_t)msg, max_len, flags); } -void sys_trace_socket_recvmsg_exit(int sock, const struct msghdr *msg, int ret) +void sys_trace_socket_recvmsg_exit(int sock, const struct net_msghdr *msg, int ret) { uint32_t len = 0; ctf_net_bounded_string_t addr = {"unknown"}; @@ -1117,8 +1119,9 @@ void sys_trace_socket_recvmsg_exit(int sock, const struct msghdr *msg, int ret) } if (msg->msg_name != NULL) { - (void)net_addr_ntop(((struct sockaddr *)msg->msg_name)->sa_family, - &net_sin((struct sockaddr *)msg->msg_name)->sin_addr, addr.buf, + (void)net_addr_ntop(((struct net_sockaddr *)msg->msg_name)->sa_family, + &net_sin((struct net_sockaddr *)msg->msg_name)->sin_addr, + addr.buf, sizeof(addr.buf)); } @@ -1196,7 +1199,7 @@ void sys_trace_socket_getpeername_enter(int sock) ctf_top_socket_getpeername_enter(sock); } -void sys_trace_socket_getpeername_exit(int sock, struct sockaddr *addr, +void sys_trace_socket_getpeername_exit(int sock, struct net_sockaddr *addr, const uint32_t *addrlen, int ret) { ctf_net_bounded_string_t addr_str; @@ -1212,7 +1215,7 @@ void sys_trace_socket_getsockname_enter(int sock) ctf_top_socket_getsockname_enter(sock); } -void sys_trace_socket_getsockname_exit(int sock, const struct sockaddr *addr, +void sys_trace_socket_getsockname_exit(int sock, const struct net_sockaddr *addr, const uint32_t *addrlen, int ret) { ctf_net_bounded_string_t addr_str; diff --git a/subsys/tracing/ctf/tracing_ctf.h b/subsys/tracing/ctf/tracing_ctf.h index 1bfe882ecf3f9..319e76c274882 100644 --- a/subsys/tracing/ctf/tracing_ctf.h +++ b/subsys/tracing/ctf/tracing_ctf.h @@ -685,38 +685,34 @@ void sys_trace_k_event_wait_exit(struct k_event *event, uint32_t events, int ret #define sys_port_trace_socket_socketpair_exit(sockA, sockB, ret) \ sys_trace_socket_socketpair_exit(sockA, sockB, ret) -/* Do not try to include network headers as it just leads to inclusion - * nightmare, just declare couple of structs that are needed. - */ -struct sockaddr; -struct msghdr; -struct zvfs_pollfd; +#include +#include void sys_trace_socket_init(int sock, int family, int type, int proto); void sys_trace_socket_close_enter(int sock); void sys_trace_socket_close_exit(int sock, int ret); void sys_trace_socket_shutdown_enter(int sock, int how); void sys_trace_socket_shutdown_exit(int sock, int ret); -void sys_trace_socket_bind_enter(int sock, const struct sockaddr *addr, size_t addrlen); +void sys_trace_socket_bind_enter(int sock, const struct net_sockaddr *addr, size_t addrlen); void sys_trace_socket_bind_exit(int sock, int ret); -void sys_trace_socket_connect_enter(int sock, const struct sockaddr *addr, size_t addrlen); +void sys_trace_socket_connect_enter(int sock, const struct net_sockaddr *addr, size_t addrlen); void sys_trace_socket_connect_exit(int sock, int ret); void sys_trace_socket_listen_enter(int sock, int backlog); void sys_trace_socket_listen_exit(int sock, int ret); void sys_trace_socket_accept_enter(int sock); -void sys_trace_socket_accept_exit(int sock, const struct sockaddr *addr, const uint32_t *addrlen, - int ret); -void sys_trace_socket_sendto_enter(int sock, int len, int flags, const struct sockaddr *dest_addr, - uint32_t addrlen); +void sys_trace_socket_accept_exit(int sock, const struct net_sockaddr *addr, + const uint32_t *addrlen, int ret); +void sys_trace_socket_sendto_enter(int sock, int len, int flags, + const struct net_sockaddr *dest_addr, uint32_t addrlen); void sys_trace_socket_sendto_exit(int sock, int ret); -void sys_trace_socket_sendmsg_enter(int sock, const struct msghdr *msg, int flags); +void sys_trace_socket_sendmsg_enter(int sock, const struct net_msghdr *msg, int flags); void sys_trace_socket_sendmsg_exit(int sock, int ret); -void sys_trace_socket_recvfrom_enter(int sock, int max_len, int flags, struct sockaddr *addr, +void sys_trace_socket_recvfrom_enter(int sock, int max_len, int flags, struct net_sockaddr *addr, uint32_t *addrlen); -void sys_trace_socket_recvfrom_exit(int sock, const struct sockaddr *src_addr, +void sys_trace_socket_recvfrom_exit(int sock, const struct net_sockaddr *src_addr, const uint32_t *addrlen, int ret); -void sys_trace_socket_recvmsg_enter(int sock, const struct msghdr *msg, int flags); -void sys_trace_socket_recvmsg_exit(int sock, const struct msghdr *msg, int ret); +void sys_trace_socket_recvmsg_enter(int sock, const struct net_msghdr *msg, int flags); +void sys_trace_socket_recvmsg_exit(int sock, const struct net_msghdr *msg, int ret); void sys_trace_socket_fcntl_enter(int sock, int cmd, int flags); void sys_trace_socket_fcntl_exit(int sock, int ret); void sys_trace_socket_ioctl_enter(int sock, int req); @@ -730,10 +726,10 @@ void sys_trace_socket_setsockopt_enter(int sock, int level, int optname, const v size_t optlen); void sys_trace_socket_setsockopt_exit(int sock, int ret); void sys_trace_socket_getpeername_enter(int sock); -void sys_trace_socket_getpeername_exit(int sock, struct sockaddr *addr, const uint32_t *addrlen, +void sys_trace_socket_getpeername_exit(int sock, struct net_sockaddr *addr, const uint32_t *addrlen, int ret); void sys_trace_socket_getsockname_enter(int sock); -void sys_trace_socket_getsockname_exit(int sock, const struct sockaddr *addr, +void sys_trace_socket_getsockname_exit(int sock, const struct net_sockaddr *addr, const uint32_t *addrlen, int ret); void sys_trace_socket_socketpair_enter(int family, int type, int proto, int *sv); void sys_trace_socket_socketpair_exit(int sock_A, int sock_B, int ret); diff --git a/subsys/usb/host/usbip.c b/subsys/usb/host/usbip.c index 395d50466806a..fc6072c65bada 100644 --- a/subsys/usb/host/usbip.c +++ b/subsys/usb/host/usbip.c @@ -649,29 +649,29 @@ static int usbip_handle_connection(struct usbip_bus_ctx *const bus_ctx, int conn static void usbip_thread_handler(void *const a, void *const b, void *const c) { struct usbip_bus_ctx *const bus_ctx = a; - struct sockaddr_in srv; + struct net_sockaddr_in srv; int listenfd; int connfd; int reuse = 1; LOG_DBG("Started connection handling thread"); - listenfd = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + listenfd = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); if (listenfd < 0) { LOG_ERR("socket() failed: %s", strerror(errno)); return; } - if (zsock_setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, + if (zsock_setsockopt(listenfd, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, (const char *)&reuse, sizeof(reuse)) < 0) { LOG_INF("setsockopt() failed: %s", strerror(errno)); } - srv.sin_family = AF_INET; - srv.sin_addr.s_addr = htonl(INADDR_ANY); + srv.sin_family = NET_AF_INET; + srv.sin_addr.s_addr = htonl(NET_INADDR_ANY); srv.sin_port = htons(USBIP_PORT); - if (zsock_bind(listenfd, (struct sockaddr *)&srv, sizeof(srv)) < 0) { + if (zsock_bind(listenfd, (struct net_sockaddr *)&srv, sizeof(srv)) < 0) { LOG_ERR("bind() failed: %s", strerror(errno)); return; } @@ -682,12 +682,12 @@ static void usbip_thread_handler(void *const a, void *const b, void *const c) } while (true) { - struct sockaddr_in client_addr; + struct net_sockaddr_in client_addr; socklen_t client_addr_len = sizeof(client_addr); - char addr_str[INET_ADDRSTRLEN]; + char addr_str[NET_INET_ADDRSTRLEN]; int err; - connfd = zsock_accept(listenfd, (struct sockaddr *)&client_addr, + connfd = zsock_accept(listenfd, (struct net_sockaddr *)&client_addr, &client_addr_len); if (connfd < 0) { LOG_ERR("accept() failed: %d", errno); diff --git a/tests/boards/espressif/ethernet/src/main.c b/tests/boards/espressif/ethernet/src/main.c index 6fbd2e6777cf6..0ea8e0b3e1e59 100644 --- a/tests/boards/espressif/ethernet/src/main.c +++ b/tests/boards/espressif/ethernet/src/main.c @@ -41,13 +41,14 @@ static void ipv4_event(struct net_mgmt_event_callback *cb, uint64_t mgmt_event, char buf[NET_IPV4_ADDR_LEN]; LOG_INF("Address[%d]: %s", net_if_get_by_iface(iface), - net_addr_ntop(AF_INET, &iface->config.ip.ipv4->unicast[0].ipv4.address.in_addr, buf, + net_addr_ntop(NET_AF_INET, + &iface->config.ip.ipv4->unicast[0].ipv4.address.in_addr, buf, sizeof(buf))); LOG_INF("Subnet[%d]: %s", net_if_get_by_iface(iface), - net_addr_ntop(AF_INET, &iface->config.ip.ipv4->unicast[0].netmask, buf, + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->unicast[0].netmask, buf, sizeof(buf))); LOG_INF("Router[%d]: %s", net_if_get_by_iface(iface), - net_addr_ntop(AF_INET, &iface->config.ip.ipv4->gw, buf, sizeof(buf))); + net_addr_ntop(NET_AF_INET, &iface->config.ip.ipv4->gw, buf, sizeof(buf))); LOG_INF("Lease time[%d]: %u seconds", net_if_get_by_iface(iface), iface->config.dhcpv4.lease_time); @@ -73,7 +74,7 @@ static void option_handler(struct net_dhcpv4_option_callback *cb, size_t length, char buf[NET_IPV4_ADDR_LEN]; LOG_INF("DHCP Option %d: %s", cb->option, - net_addr_ntop(AF_INET, cb->data, buf, sizeof(buf))); + net_addr_ntop(NET_AF_INET, cb->data, buf, sizeof(buf))); } ZTEST(ethernet, test_dhcp_check) @@ -91,16 +92,16 @@ ZTEST(ethernet, test_icmp_check) struct net_icmp_ping_params params; struct net_icmp_ctx ctx; struct in_addr gw_addr_4; - struct sockaddr_in dst4 = {0}; + struct net_sockaddr_in dst4 = {0}; int ret; gw_addr_4 = net_if_ipv4_get_gw(iface); zassert_not_equal(gw_addr_4.s_addr, 0, "Gateway address is not set"); - ret = net_icmp_init_ctx(&ctx, AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_event); + ret = net_icmp_init_ctx(&ctx, NET_AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_event); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); - dst4.sin_family = AF_INET; + dst4.sin_family = NET_AF_INET; memcpy(&dst4.sin_addr, &gw_addr_4, sizeof(gw_addr_4)); params.identifier = 1234; @@ -112,7 +113,7 @@ ZTEST(ethernet, test_icmp_check) LOG_INF("Pinging the gateway..."); - ret = net_icmp_send_echo_request(&ctx, iface, (struct sockaddr *)&dst4, ¶ms, NULL); + ret = net_icmp_send_echo_request(&ctx, iface, (struct net_sockaddr *)&dst4, ¶ms, NULL); zassert_equal(ret, 0, "Cannot send ICMP echo request (%d)", ret); zassert_equal(k_sem_take(&net_event, K_SECONDS(CONFIG_GATEWAY_PING_TIMEOUT)), 0, diff --git a/tests/boards/espressif/wifi/src/main.c b/tests/boards/espressif/wifi/src/main.c index c711414d6a227..7009b3aac7f7d 100644 --- a/tests/boards/espressif/wifi/src/main.c +++ b/tests/boards/espressif/wifi/src/main.c @@ -275,17 +275,17 @@ ZTEST(wifi, test_2_icmp) struct net_icmp_ping_params params; struct net_icmp_ctx icmp_ctx; struct in_addr gw_addr_4; - struct sockaddr_in dst4 = {0}; + struct net_sockaddr_in dst4 = {0}; int retry = CONFIG_WIFI_PING_ATTEMPTS; int ret; gw_addr_4 = net_if_ipv4_get_gw(wifi_ctx.iface); zassert_not_equal(gw_addr_4.s_addr, 0, "Gateway address is not set"); - ret = net_icmp_init_ctx(&icmp_ctx, AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_event); + ret = net_icmp_init_ctx(&icmp_ctx, NET_AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_event); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); - dst4.sin_family = AF_INET; + dst4.sin_family = NET_AF_INET; memcpy(&dst4.sin_addr, &gw_addr_4, sizeof(gw_addr_4)); params.identifier = 1234; @@ -299,7 +299,7 @@ ZTEST(wifi, test_2_icmp) do { ret = net_icmp_send_echo_request(&icmp_ctx, wifi_ctx.iface, - (struct sockaddr *)&dst4, ¶ms, NULL); + (struct net_sockaddr *)&dst4, ¶ms, NULL); zassert_equal(ret, 0, "Cannot send ICMP echo request (%d)", ret); int timeout = k_sem_take(&wifi_event, K_SECONDS(CONFIG_WIFI_PING_TIMEOUT)); diff --git a/tests/drivers/modem/modem_socket/src/main.c b/tests/drivers/modem/modem_socket/src/main.c index 33318a199f879..e0932fd04e8ca 100644 --- a/tests/drivers/modem/modem_socket/src/main.c +++ b/tests/drivers/modem/modem_socket/src/main.c @@ -90,7 +90,8 @@ static void test_modem_get_put_all(void) int fds[ARRAY_SIZE(sockets)]; for (int i = 0; i < ARRAY_SIZE(sockets); i++) { - fds[i] = modem_socket_get(&socket_config, AF_INET, SOCK_DGRAM, IPPROTO_TCP); + fds[i] = modem_socket_get(&socket_config, NET_AF_INET, NET_SOCK_DGRAM, + NET_IPPROTO_TCP); zassert_false(fds[i] < 0); } diff --git a/tests/drivers/wifi/nrf_wifi/prj.conf b/tests/drivers/wifi/nrf_wifi/prj.conf index bc04b5d88a08d..2589fe40e8e6d 100644 --- a/tests/drivers/wifi/nrf_wifi/prj.conf +++ b/tests/drivers/wifi/nrf_wifi/prj.conf @@ -53,12 +53,10 @@ CONFIG_REBOOT=y CONFIG_LOG=y CONFIG_PRINTK=y CONFIG_SHELL=y -CONFIG_SHELL_GETOPT=y CONFIG_DEVICE_SHELL=y CONFIG_POSIX_TIMERS=y CONFIG_DATE_SHELL=y CONFIG_NET_CONFIG_AUTO_INIT=n -CONFIG_POSIX_API=y # printing of scan results puts pressure on queues in new locking # design in net_mgmt. So, use a higher timeout for a crowded diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c index d911cda65c89e..e297c183bae9c 100644 --- a/tests/net/6lo/src/main.c +++ b/tests/net/6lo/src/main.c @@ -515,13 +515,13 @@ static struct net_pkt *create_pkt(struct net_6lo_data *data) frag->data[4] = len >> 8; frag->data[5] = (uint8_t) len; - data->ipv6.len = htons(len); + data->ipv6.len = net_htons(len); if (data->nh_udp) { frag->data[44] = len >> 8; frag->data[45] = (uint8_t) len; - data->nh.udp.len = htons(len); + data->nh.udp.len = net_htons(len); } while (remaining > 0) { @@ -554,12 +554,12 @@ static struct net_6lo_data test_data_1 = { .ipv6.tcflow = 0x00, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam00, .ipv6.dst = dst_dam00, - .nh.udp.src_port = htons(udp_src_port_4bit), - .nh.udp.dst_port = htons(udp_dst_port_4bit), + .nh.udp.src_port = net_htons(udp_src_port_4bit), + .nh.udp.dst_port = net_htons(udp_dst_port_4bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -576,12 +576,12 @@ static struct net_6lo_data test_data_2 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam01, .ipv6.dst = dst_dam01, - .nh.udp.src_port = htons(udp_src_port_8bit_y), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit_y), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -598,12 +598,12 @@ static struct net_6lo_data test_data_3 = { .ipv6.tcflow = 0x21, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam10, .ipv6.dst = dst_dam10, - .nh.udp.src_port = htons(udp_src_port_8bit), - .nh.udp.dst_port = htons(udp_dst_port_8bit_y), + .nh.udp.src_port = net_htons(udp_src_port_8bit), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit_y), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -620,12 +620,12 @@ static struct net_6lo_data test_data_4 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam00, .ipv6.dst = dst_m1_dam00, - .nh.udp.src_port = htons(udp_src_port_16bit), - .nh.udp.dst_port = htons(udp_dst_port_16bit), + .nh.udp.src_port = net_htons(udp_src_port_16bit), + .nh.udp.dst_port = net_htons(udp_dst_port_16bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -642,12 +642,12 @@ static struct net_6lo_data test_data_5 = { .ipv6.tcflow = 0x23, .ipv6.flow = 0x4567, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam01, .ipv6.dst = dst_m1_dam01, - .nh.udp.src_port = htons(udp_src_port_16bit), - .nh.udp.dst_port = htons(udp_dst_port_16bit), + .nh.udp.src_port = net_htons(udp_src_port_16bit), + .nh.udp.dst_port = net_htons(udp_dst_port_16bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -664,12 +664,12 @@ static struct net_6lo_data test_data_6 = { .ipv6.tcflow = 0x0, .ipv6.flow = 0x0, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam10, .ipv6.dst = dst_m1_dam10, - .nh.udp.src_port = htons(udp_src_port_8bit), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -703,7 +703,7 @@ static struct net_6lo_data test_data_8 = { .ipv6.tcflow = 0x0, .ipv6.flow = 0x0, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_ICMPV6, + .ipv6.nexthdr = NET_IPPROTO_ICMPV6, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam10, .ipv6.dst = dst_m1_dam10, @@ -723,12 +723,12 @@ static struct net_6lo_data test_data_9 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam00, .ipv6.dst = dst_m1_dam00, - .nh.udp.src_port = htons(udp_src_port_16bit), - .nh.udp.dst_port = htons(udp_dst_port_16bit), + .nh.udp.src_port = net_htons(udp_src_port_16bit), + .nh.udp.dst_port = net_htons(udp_dst_port_16bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = IPV6_DISPATCH_DIFF, @@ -743,12 +743,12 @@ static struct net_6lo_data test_data_10 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam00, .ipv6.dst = dst_m1_dam00, - .nh.udp.src_port = htons(udp_src_port_16bit), - .nh.udp.dst_port = htons(udp_dst_port_16bit), + .nh.udp.src_port = net_htons(udp_src_port_16bit), + .nh.udp.dst_port = net_htons(udp_dst_port_16bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = IPV6_DISPATCH_DIFF, @@ -779,7 +779,7 @@ static struct net_6lo_data test_data_12 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_ICMPV6, + .ipv6.nexthdr = NET_IPPROTO_ICMPV6, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam00, .ipv6.dst = dst_m1_dam00, @@ -798,12 +798,12 @@ static struct net_6lo_data test_data_13 = { .ipv6.tcflow = 0x21, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam11, .ipv6.dst = dst_dam11, - .nh.udp.src_port = htons(udp_src_port_8bit), - .nh.udp.dst_port = htons(udp_dst_port_8bit_y), + .nh.udp.src_port = net_htons(udp_src_port_8bit), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit_y), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -838,12 +838,12 @@ static struct net_6lo_data test_data_15 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam01, .ipv6.dst = dst_dac1_dam01, - .nh.udp.src_port = htons(udp_src_port_8bit_y), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit_y), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -860,12 +860,12 @@ static struct net_6lo_data test_data_16 = { .ipv6.tcflow = 0x21, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam10, .ipv6.dst = dst_dac1_dam10, - .nh.udp.src_port = htons(udp_src_port_8bit), - .nh.udp.dst_port = htons(udp_dst_port_8bit_y), + .nh.udp.src_port = net_htons(udp_src_port_8bit), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit_y), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -882,12 +882,12 @@ static struct net_6lo_data test_data_17 = { .ipv6.tcflow = 0x21, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam11, .ipv6.dst = dst_dac1_dam11, - .nh.udp.src_port = htons(udp_src_port_8bit), - .nh.udp.dst_port = htons(udp_dst_port_8bit_y), + .nh.udp.src_port = net_htons(udp_src_port_8bit), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit_y), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -904,12 +904,12 @@ static struct net_6lo_data test_data_18 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam01, .ipv6.dst = dst_dac1_dam01, - .nh.udp.src_port = htons(udp_src_port_8bit_y), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit_y), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -926,12 +926,12 @@ static struct net_6lo_data test_data_19 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam01, .ipv6.dst = dst_dam01, - .nh.udp.src_port = htons(udp_src_port_8bit_y), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit_y), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -948,12 +948,12 @@ static struct net_6lo_data test_data_20 = { .ipv6.tcflow = 0x23, .ipv6.flow = 0x4567, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam01, .ipv6.dst = dst_m1_dam00, - .nh.udp.src_port = htons(udp_src_port_16bit), - .nh.udp.dst_port = htons(udp_dst_port_16bit), + .nh.udp.src_port = net_htons(udp_src_port_16bit), + .nh.udp.dst_port = net_htons(udp_dst_port_16bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -969,12 +969,12 @@ static struct net_6lo_data test_data_21 = { .ipv6.tcflow = 0x23, .ipv6.flow = 0x4567, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam01, .ipv6.dst = dst_m1_dam01, - .nh.udp.src_port = htons(udp_src_port_16bit), - .nh.udp.dst_port = htons(udp_dst_port_16bit), + .nh.udp.src_port = net_htons(udp_src_port_16bit), + .nh.udp.dst_port = net_htons(udp_dst_port_16bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -991,12 +991,12 @@ static struct net_6lo_data test_data_22 = { .ipv6.tcflow = 0x0, .ipv6.flow = 0x0, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam10, .ipv6.dst = dst_m1_dam10, - .nh.udp.src_port = htons(udp_src_port_8bit), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -1030,12 +1030,12 @@ static struct net_6lo_data test_data_24 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam00, .ipv6.dst = dst_dac1_dam01, - .nh.udp.src_port = htons(udp_src_port_8bit_y), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit_y), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - @@ -1052,12 +1052,12 @@ static struct net_6lo_data test_data_25 = { .ipv6.tcflow = 0x00, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam00, .ipv6.dst = dst_m1_dam00, - .nh.udp.src_port = htons(udp_src_port_8bit_y), - .nh.udp.dst_port = htons(udp_dst_port_8bit), + .nh.udp.src_port = net_htons(udp_src_port_8bit_y), + .nh.udp.dst_port = net_htons(udp_dst_port_8bit), .nh.udp.len = 0x00, .nh.udp.chksum = 0x00, .hdr_diff = NET_IPV6UDPH_LEN - IPHC_SIZE - NHC_SIZE - diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf index f220a6e9a1143..419288b495281 100644 --- a/tests/net/all/prj.conf +++ b/tests/net/all/prj.conf @@ -99,6 +99,7 @@ CONFIG_NET_L2_WIFI_MGMT_LOG_LEVEL_DBG=y CONFIG_NET_L2_WIFI_MGMT=y CONFIG_NET_L2_WIFI_SHELL=y CONFIG_NET_L2_PTP=y +CONFIG_NET_L2_IPIP=y # IP offload support CONFIG_NET_OFFLOAD=y @@ -361,6 +362,8 @@ CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_SOCKETS_TLS_MAX_CIPHERSUITES=10 CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=10 CONFIG_NET_SOCKETS_TLS_MAX_CREDENTIALS=10 +CONFIG_NET_SOCKETS_INET_RAW=y +CONFIG_NET_SOCKETS_OFFLOAD_DISPATCHER=y # Network interface defaults CONFIG_NET_DEFAULT_IF_CANBUS_RAW=y @@ -652,3 +655,29 @@ CONFIG_SHELL_MQTT_INIT_LOG_LEVEL_ERR=y #CONFIG_NET_UTILS_LOG_LEVEL_INF #CONFIG_NET_UTILS_LOG_LEVEL_OFF #CONFIG_NET_UTILS_LOG_LEVEL_WRN + +# syslog backend options +CONFIG_LOG_BACKEND_NET=y +CONFIG_LOG_BACKEND_NET_SERVER="192.0.2.2:1514" +CONFIG_LOG_BACKEND_NET_RFC5424_STRUCTURED_DATA=y +CONFIG_LOG_BACKEND_NET_RFC5424_SDATA_SEQID=y +CONFIG_LOG_BACKEND_NET_RFC5424_SDATA_TZKNOWN=y +CONFIG_LOG_BACKEND_NET_RFC5424_SDATA_ISSYNCED=y +CONFIG_LOG_BACKEND_NET_RFC5424_SDATA_UPTIME=y +CONFIG_LOG_BACKEND_NET_RFC5424_SDATA_SOFTWARE=y +CONFIG_LOG_BACKEND_NET_RFC5424_SDATA_SOFTWARE_VERSION=y +CONFIG_LOG_BACKEND_NET_RFC5424_SDATA_SOFTWARE_VALUE="foo-bar" +CONFIG_LOG_BACKEND_NET_SERVER="tcp://[2001:db8::2]:1514" +#CONFIG_LOG_MODE_IMMEDIATE=n +#CONFIG_LOG_MODE_MINIMAL=n +CONFIG_LOG_MODE_DEFERRED=y +CONFIG_LOG_FRONTEND_ONLY=n + +CONFIG_MQTT_SN_LIB=y +CONFIG_MQTT_SN_TRANSPORT_UDP=y + +CONFIG_COAP=y +CONFIG_COAP_SERVER=y +CONFIG_COAP_CLIENT=y + +CONFIG_SHELL_BACKEND_TELNET=y diff --git a/tests/net/all/testcase.yaml b/tests/net/all/testcase.yaml index d8db7e0c362dd..fc03be2510507 100644 --- a/tests/net/all/testcase.yaml +++ b/tests/net/all/testcase.yaml @@ -13,3 +13,12 @@ tests: net.build.preempt: extra_configs: - CONFIG_NET_TC_THREAD_PREEMPTIVE=y + net.build.no_compat_namespacing: + extra_configs: + - CONFIG_NET_NAMESPACE_COMPAT_MODE=n + - CONFIG_POSIX_API=n + - CONFIG_SHELL_GETOPT=n + - CONFIG_NET_L2_WIFI_SHELL=n + net.build.compat_namespacing: + extra_configs: + - CONFIG_NET_NAMESPACE_COMPAT_MODE=y diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c index abcd037accc4b..3009f17f050b3 100644 --- a/tests/net/arp/src/main.c +++ b/tests/net/arp/src/main.c @@ -94,12 +94,12 @@ static int tester_send(const struct device *dev, struct net_pkt *pkt) hdr = (struct net_eth_hdr *)net_pkt_data(pkt); - if (ntohs(hdr->type) == NET_ETH_PTYPE_ARP) { + if (net_ntohs(hdr->type) == NET_ETH_PTYPE_ARP) { /* First frag has eth hdr */ struct net_arp_hdr *arp_hdr = (struct net_arp_hdr *)pkt->frags->frags; - if (ntohs(arp_hdr->opcode) == NET_ARP_REPLY) { + if (net_ntohs(arp_hdr->opcode) == NET_ARP_REPLY) { if (!req_test && pkt != pending_pkt) { printk("Pending data but to be sent is wrong, " "expecting %p but got %p\n", @@ -124,7 +124,7 @@ static int tester_send(const struct device *dev, struct net_pkt *pkt) return send_status; } - } else if (ntohs(arp_hdr->opcode) == NET_ARP_REQUEST) { + } else if (net_ntohs(arp_hdr->opcode) == NET_ARP_REQUEST) { if (memcmp(&hdr->src, ð_hwaddr, sizeof(struct net_eth_addr))) { char out[sizeof("xx:xx:xx:xx:xx:xx")]; @@ -161,7 +161,7 @@ static inline struct net_pkt *prepare_arp_reply(struct net_if *iface, pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_eth_hdr) + sizeof(struct net_eth_hdr) + sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, K_SECONDS(1)); + NET_AF_UNSPEC, 0, K_SECONDS(1)); zassert_not_null(pkt, "out of mem reply"); eth = NET_ETH_HDR(pkt); @@ -172,7 +172,7 @@ static inline struct net_pkt *prepare_arp_reply(struct net_if *iface, (void)memset(ð->dst.addr, 0xff, sizeof(struct net_eth_addr)); memcpy(ð->src.addr, net_if_get_link_addr(iface)->addr, sizeof(struct net_eth_addr)); - eth->type = htons(NET_ETH_PTYPE_ARP); + eth->type = net_htons(NET_ETH_PTYPE_ARP); *eth_rep = eth; @@ -181,11 +181,11 @@ static inline struct net_pkt *prepare_arp_reply(struct net_if *iface, hdr = NET_ARP_HDR(pkt); - hdr->hwtype = htons(NET_ARP_HTYPE_ETH); - hdr->protocol = htons(NET_ETH_PTYPE_IP); + hdr->hwtype = net_htons(NET_ARP_HTYPE_ETH); + hdr->protocol = net_htons(NET_ETH_PTYPE_IP); hdr->hwlen = sizeof(struct net_eth_addr); - hdr->protolen = sizeof(struct in_addr); - hdr->opcode = htons(NET_ARP_REPLY); + hdr->protolen = sizeof(struct net_in_addr); + hdr->opcode = net_htons(NET_ARP_REPLY); memcpy(&hdr->dst_hwaddr.addr, ð->src.addr, sizeof(struct net_eth_addr)); @@ -213,7 +213,7 @@ static inline struct net_pkt *prepare_arp_request(struct net_if *iface, pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_eth_hdr) + sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, K_SECONDS(1)); + NET_AF_UNSPEC, 0, K_SECONDS(1)); zassert_not_null(pkt, "out of mem request"); eth_req = NET_ETH_HDR(req); @@ -227,7 +227,7 @@ static inline struct net_pkt *prepare_arp_request(struct net_if *iface, (void)memset(ð->dst.addr, 0xff, sizeof(struct net_eth_addr)); memcpy(ð->src.addr, addr, sizeof(struct net_eth_addr)); - eth->type = htons(NET_ETH_PTYPE_ARP); + eth->type = net_htons(NET_ETH_PTYPE_ARP); *eth_hdr = eth; net_buf_add(pkt->buffer, sizeof(struct net_eth_hdr)); @@ -235,11 +235,11 @@ static inline struct net_pkt *prepare_arp_request(struct net_if *iface, hdr = NET_ARP_HDR(pkt); - hdr->hwtype = htons(NET_ARP_HTYPE_ETH); - hdr->protocol = htons(NET_ETH_PTYPE_IP); + hdr->hwtype = net_htons(NET_ARP_HTYPE_ETH); + hdr->protocol = net_htons(NET_ETH_PTYPE_IP); hdr->hwlen = sizeof(struct net_eth_addr); - hdr->protolen = sizeof(struct in_addr); - hdr->opcode = htons(NET_ARP_REQUEST); + hdr->protolen = sizeof(struct net_in_addr); + hdr->opcode = net_htons(NET_ARP_REQUEST); (void)memset(&hdr->dst_hwaddr.addr, 0x00, sizeof(struct net_eth_addr)); memcpy(&hdr->src_hwaddr.addr, addr, sizeof(struct net_eth_addr)); @@ -263,7 +263,7 @@ static void setup_eth_header(struct net_if *iface, struct net_pkt *pkt, memcpy(&hdr->src.addr, net_if_get_link_addr(iface)->addr, sizeof(struct net_eth_addr)); - hdr->type = htons(type); + hdr->type = net_htons(type); } struct net_arp_context net_arp_context_data; @@ -294,9 +294,9 @@ NET_DEVICE_INIT(net_arp_test, "net_arp_test", static void arp_cb(struct arp_entry *entry, void *user_data) { - struct in_addr *addr = user_data; + struct net_in_addr *addr = user_data; - if (memcmp(&entry->ip, addr, sizeof(struct in_addr)) == 0 && + if (memcmp(&entry->ip, addr, sizeof(struct net_in_addr)) == 0 && memcmp(&entry->eth, expected_hwaddr, sizeof(struct net_eth_addr)) == 0) { entry_found = true; @@ -323,12 +323,12 @@ ZTEST(arp_fn_tests, test_arp) struct net_ipv4_hdr *ipv4; int len, ret; - struct in_addr dst = { { { 192, 0, 2, 2 } } }; - struct in_addr dst_far = { { { 10, 11, 12, 13 } } }; - struct in_addr dst_far2 = { { { 172, 16, 14, 186 } } }; - struct in_addr src = { { { 192, 0, 2, 1 } } }; - struct in_addr netmask = { { { 255, 255, 255, 0 } } }; - struct in_addr gw = { { { 192, 0, 2, 42 } } }; + struct net_in_addr dst = { { { 192, 0, 2, 2 } } }; + struct net_in_addr dst_far = { { { 10, 11, 12, 13 } } }; + struct net_in_addr dst_far2 = { { { 172, 16, 14, 186 } } }; + struct net_in_addr src = { { { 192, 0, 2, 1 } } }; + struct net_in_addr netmask = { { { 255, 255, 255, 0 } } }; + struct net_in_addr gw = { { { 192, 0, 2, 42 } } }; net_arp_init(); @@ -352,7 +352,7 @@ ZTEST(arp_fn_tests, test_arp) /* Application data for testing */ pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_ipv4_hdr) + - len, AF_INET, 0, K_SECONDS(1)); + len, NET_AF_INET, 0, K_SECONDS(1)); zassert_not_null(pkt, "out of mem"); (void)net_linkaddr_set(net_pkt_lladdr_src(pkt), @@ -404,15 +404,15 @@ ZTEST(arp_fn_tests, test_arp) /* pkt_arp should contain the arp header, verify it */ arp_hdr = NET_ARP_HDR(pkt_arp); - if (arp_hdr->hwtype != htons(NET_ARP_HTYPE_ETH)) { + if (arp_hdr->hwtype != net_htons(NET_ARP_HTYPE_ETH)) { printk("ARP hwtype 0x%x, should be 0x%x\n", - arp_hdr->hwtype, htons(NET_ARP_HTYPE_ETH)); + arp_hdr->hwtype, net_htons(NET_ARP_HTYPE_ETH)); zassert_true(0, "exiting"); } - if (arp_hdr->protocol != htons(NET_ETH_PTYPE_IP)) { + if (arp_hdr->protocol != net_htons(NET_ETH_PTYPE_IP)) { printk("ARP protocol 0x%x, should be 0x%x\n", - arp_hdr->protocol, htons(NET_ETH_PTYPE_IP)); + arp_hdr->protocol, net_htons(NET_ETH_PTYPE_IP)); zassert_true(0, "exiting"); } @@ -422,15 +422,15 @@ ZTEST(arp_fn_tests, test_arp) zassert_true(0, "exiting"); } - if (arp_hdr->protolen != sizeof(struct in_addr)) { + if (arp_hdr->protolen != sizeof(struct net_in_addr)) { printk("ARP IP addr len 0x%x, should be 0x%zx\n", - arp_hdr->protolen, sizeof(struct in_addr)); + arp_hdr->protolen, sizeof(struct net_in_addr)); zassert_true(0, "exiting"); } - if (arp_hdr->opcode != htons(NET_ARP_REQUEST)) { + if (arp_hdr->opcode != net_htons(NET_ARP_REQUEST)) { printk("ARP opcode 0x%x, should be 0x%x\n", - arp_hdr->opcode, htons(NET_ARP_REQUEST)); + arp_hdr->opcode, net_htons(NET_ARP_REQUEST)); zassert_true(0, "exiting"); } @@ -554,7 +554,7 @@ ZTEST(arp_fn_tests, test_arp) */ pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_eth_hdr) + sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, K_SECONDS(1)); + NET_AF_UNSPEC, 0, K_SECONDS(1)); zassert_not_null(pkt, "out of mem reply"); arp_hdr = NET_ARP_HDR(pkt); @@ -594,7 +594,7 @@ ZTEST(arp_fn_tests, test_arp) /* Then feed in ARP request */ pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_eth_hdr) + sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, K_SECONDS(1)); + NET_AF_UNSPEC, 0, K_SECONDS(1)); zassert_not_null(pkt, "out of mem reply"); send_status = -EINVAL; @@ -651,7 +651,7 @@ ZTEST(arp_fn_tests, test_arp) pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_eth_hdr) + sizeof(struct net_arp_hdr), - AF_UNSPEC, 0, K_SECONDS(1)); + NET_AF_UNSPEC, 0, K_SECONDS(1)); zassert_not_null(pkt, "out of mem request"); setup_eth_header(iface, pkt, net_eth_broadcast_addr(), @@ -662,11 +662,11 @@ ZTEST(arp_fn_tests, test_arp) net_buf_pull(pkt->buffer, sizeof(struct net_eth_hdr)); arp_hdr = NET_ARP_HDR(pkt); - arp_hdr->hwtype = htons(NET_ARP_HTYPE_ETH); - arp_hdr->protocol = htons(NET_ETH_PTYPE_IP); + arp_hdr->hwtype = net_htons(NET_ARP_HTYPE_ETH); + arp_hdr->protocol = net_htons(NET_ETH_PTYPE_IP); arp_hdr->hwlen = sizeof(struct net_eth_addr); - arp_hdr->protolen = sizeof(struct in_addr); - arp_hdr->opcode = htons(NET_ARP_REQUEST); + arp_hdr->protolen = sizeof(struct net_in_addr); + arp_hdr->opcode = net_htons(NET_ARP_REQUEST); memcpy(&arp_hdr->src_hwaddr, &new_hwaddr, 6); memcpy(&arp_hdr->dst_hwaddr, net_eth_broadcast_addr(), 6); net_ipv4_addr_copy_raw(arp_hdr->dst_ipaddr, (uint8_t *)&dst); diff --git a/tests/net/bridge/src/main.c b/tests/net/bridge/src/main.c index d91509b13390a..773aaf1be35fb 100644 --- a/tests/net/bridge/src/main.c +++ b/tests/net/bridge/src/main.c @@ -71,7 +71,7 @@ static int eth_fake_send(const struct device *dev, * Ignore packets we don't care about for this test, like * the IP autoconfig related ones, etc. */ - if (eth_hdr->type != htons(NET_ETH_PTYPE_ALL)) { + if (eth_hdr->type != net_htons(NET_ETH_PTYPE_ALL)) { DBG("Fake send ignoring pkt %p\n", pkt); return 0; } @@ -242,7 +242,7 @@ static void _recv_data(struct net_if *iface) int ret; pkt = net_pkt_rx_alloc_with_buffer(iface, sizeof(eth_hdr) + sizeof(data), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); zassert_not_null(pkt, ""); /* @@ -266,7 +266,7 @@ static void _recv_data(struct net_if *iface) eth_hdr.src.addr[4] = 0x77; eth_hdr.src.addr[5] = 0x88; - eth_hdr.type = htons(NET_ETH_PTYPE_ALL); + eth_hdr.type = net_htons(NET_ETH_PTYPE_ALL); ret = net_pkt_write(pkt, ð_hdr, sizeof(eth_hdr)); zassert_equal(ret, 0, ""); diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c index 52f8dfafb0ddd..5a6372be9343f 100644 --- a/tests/net/checksum_offload/src/main.c +++ b/tests/net/checksum_offload/src/main.c @@ -47,30 +47,30 @@ static uint8_t test_data_large[2000]; static uint8_t verify_buf[2000]; /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Destination address for test packets (interface 1) */ -static struct in6_addr dst_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr dst_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; /* Destination address for test packets (interface 2) */ -static struct in6_addr dst_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr dst_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -static struct in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; -static struct in_addr in4addr_dst = { { { 192, 0, 2, 2 } } }; -static struct in_addr in4addr_my2 = { { { 192, 0, 42, 1 } } }; -static struct in_addr in4addr_dst2 = { { { 192, 0, 42, 2 } } }; +static struct net_in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr in4addr_dst = { { { 192, 0, 2, 2 } } }; +static struct net_in_addr in4addr_my2 = { { { 192, 0, 42, 1 } } }; +static struct net_in_addr in4addr_dst2 = { { { 192, 0, 42, 2 } } }; /* Keep track of all ethernet interfaces. For native_sim board, we need * to increase the count as it has one extra network interface defined in @@ -200,11 +200,11 @@ static void test_receiving(struct net_pkt *pkt) /* Swap IP src and destination address so that we can receive * the packet and the stack will not reject it. */ - if (net_pkt_family(pkt) == AF_INET6) { + if (net_pkt_family(pkt) == NET_AF_INET6) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv6_access, struct net_ipv6_hdr); struct net_ipv6_hdr *ipv6_hdr; - struct in6_addr addr; + struct net_in6_addr addr; ipv6_hdr = (struct net_ipv6_hdr *) net_pkt_get_data(pkt, &ipv6_access); @@ -217,7 +217,7 @@ static void test_receiving(struct net_pkt *pkt) NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE(ipv4_access, struct net_ipv4_hdr); struct net_ipv4_hdr *ipv4_hdr; - struct in_addr addr; + struct net_in_addr addr; ipv4_hdr = (struct net_ipv4_hdr *) net_pkt_get_data(pkt, &ipv4_access); @@ -230,7 +230,7 @@ static void test_receiving(struct net_pkt *pkt) if (!verify_fragment || fragment_count == 1) { net_pkt_skip(pkt, net_pkt_ip_hdr_len(pkt) + net_pkt_ip_opts_len(pkt)); - if (test_proto == IPPROTO_UDP) { + if (test_proto == NET_IPPROTO_UDP) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE( udp_access, struct net_udp_hdr); struct net_udp_hdr *udp_hdr; @@ -246,8 +246,8 @@ static void test_receiving(struct net_pkt *pkt) if (change_chksum) { udp_hdr->chksum++; } - } else if (test_proto == IPPROTO_ICMP || - test_proto == IPPROTO_ICMPV6) { + } else if (test_proto == NET_IPPROTO_ICMP || + test_proto == NET_IPPROTO_ICMPV6) { NET_PKT_DATA_ACCESS_CONTIGUOUS_DEFINE( icmp_access, struct net_icmp_hdr); struct net_icmp_hdr *icmp_hdr; @@ -290,11 +290,11 @@ static void test_fragment(struct net_pkt *pkt, bool offloaded) } if (fragment_count == 1) { - if (test_proto == IPPROTO_UDP) { + if (test_proto == NET_IPPROTO_UDP) { chksum = get_udp_chksum(pkt); hdr_offset += sizeof(struct net_udp_hdr); - } else if (test_proto == IPPROTO_ICMP || - test_proto == IPPROTO_ICMPV6) { + } else if (test_proto == NET_IPPROTO_ICMP || + test_proto == NET_IPPROTO_ICMPV6) { chksum = get_icmp_chksum(pkt); hdr_offset += sizeof(struct net_icmp_hdr) + sizeof(struct net_icmpv6_echo_req); @@ -353,10 +353,10 @@ static int eth_tx_offloading_disabled(const struct device *dev, if (test_started) { uint16_t chksum = 0; - if (test_proto == IPPROTO_UDP) { + if (test_proto == NET_IPPROTO_UDP) { chksum = get_udp_chksum(pkt); - } else if (test_proto == IPPROTO_ICMP || - test_proto == IPPROTO_ICMPV6) { + } else if (test_proto == NET_IPPROTO_ICMP || + test_proto == NET_IPPROTO_ICMPV6) { chksum = get_icmp_chksum(pkt); } @@ -396,10 +396,10 @@ static int eth_tx_offloading_enabled(const struct device *dev, if (test_started) { uint16_t chksum = 0; - if (test_proto == IPPROTO_UDP) { + if (test_proto == NET_IPPROTO_UDP) { chksum = get_udp_chksum(pkt); - } else if (test_proto == IPPROTO_ICMP || - test_proto == IPPROTO_ICMPV6) { + } else if (test_proto == NET_IPPROTO_ICMP || + test_proto == NET_IPPROTO_ICMPV6) { chksum = get_icmp_chksum(pkt); } @@ -543,7 +543,7 @@ static void test_eth_setup(void) static void test_address_setup(void) { - struct in_addr netmask = { { { 255, 255, 255, 0 } } }; + struct net_in_addr netmask = { { { 255, 255, 255, 0 } } }; struct net_if_addr *ifaddr; struct net_if *iface1, *iface2; @@ -606,7 +606,7 @@ static void test_address_setup(void) test_failed = false; } -static void add_neighbor(struct net_if *iface, struct in6_addr *addr) +static void add_neighbor(struct net_if *iface, struct net_in6_addr *addr) { struct net_linkaddr lladdr; struct net_nbr *nbr; @@ -629,70 +629,70 @@ static void add_neighbor(struct net_if *iface, struct in6_addr *addr) } } -static struct net_context *test_udp_context_prepare(sa_family_t family, +static struct net_context *test_udp_context_prepare(net_sa_family_t family, bool offloaded, - struct sockaddr *dst_addr) + struct net_sockaddr *dst_addr) { struct net_context *net_ctx; struct eth_context *ctx; /* This is interface context */ - struct sockaddr src_addr; - socklen_t addrlen; + struct net_sockaddr src_addr; + net_socklen_t addrlen; struct net_if *iface; int ret; - if (family == AF_INET6) { - struct sockaddr_in6 *dst_addr6 = - (struct sockaddr_in6 *)dst_addr; - struct sockaddr_in6 *src_addr6 = - (struct sockaddr_in6 *)&src_addr; + if (family == NET_AF_INET6) { + struct net_sockaddr_in6 *dst_addr6 = + (struct net_sockaddr_in6 *)dst_addr; + struct net_sockaddr_in6 *src_addr6 = + (struct net_sockaddr_in6 *)&src_addr; - dst_addr6->sin6_family = AF_INET6; - dst_addr6->sin6_port = htons(TEST_PORT); - src_addr6->sin6_family = AF_INET6; + dst_addr6->sin6_family = NET_AF_INET6; + dst_addr6->sin6_port = net_htons(TEST_PORT); + src_addr6->sin6_family = NET_AF_INET6; src_addr6->sin6_port = 0; if (offloaded) { memcpy(&src_addr6->sin6_addr, &my_addr2, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); memcpy(&dst_addr6->sin6_addr, &dst_addr2, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } else { memcpy(&src_addr6->sin6_addr, &my_addr1, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); memcpy(&dst_addr6->sin6_addr, &dst_addr1, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } - addrlen = sizeof(struct sockaddr_in6); + addrlen = sizeof(struct net_sockaddr_in6); } else { - struct sockaddr_in *dst_addr4 = - (struct sockaddr_in *)dst_addr; - struct sockaddr_in *src_addr4 = - (struct sockaddr_in *)&src_addr; - - dst_addr4->sin_family = AF_INET; - dst_addr4->sin_port = htons(TEST_PORT); - src_addr4->sin_family = AF_INET; + struct net_sockaddr_in *dst_addr4 = + (struct net_sockaddr_in *)dst_addr; + struct net_sockaddr_in *src_addr4 = + (struct net_sockaddr_in *)&src_addr; + + dst_addr4->sin_family = NET_AF_INET; + dst_addr4->sin_port = net_htons(TEST_PORT); + src_addr4->sin_family = NET_AF_INET; src_addr4->sin_port = 0; if (offloaded) { memcpy(&src_addr4->sin_addr, &in4addr_my2, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); memcpy(&dst_addr4->sin_addr, &in4addr_dst2, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } else { memcpy(&src_addr4->sin_addr, &in4addr_my, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); memcpy(&dst_addr4->sin_addr, &in4addr_dst, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } - addrlen = sizeof(struct sockaddr_in6); + addrlen = sizeof(struct net_sockaddr_in6); } - ret = net_context_get(family, SOCK_DGRAM, IPPROTO_UDP, &net_ctx); + ret = net_context_get(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &net_ctx); zassert_equal(ret, 0, "Create %s UDP context failed", - family == AF_INET6 ? "IPv6" : "IPv4"); + family == NET_AF_INET6 ? "IPv6" : "IPv4"); ret = net_context_bind(net_ctx, &src_addr, addrlen); zassert_equal(ret, 0, "Context bind failure test failed"); @@ -713,20 +713,20 @@ static struct net_context *test_udp_context_prepare(sa_family_t family, return net_ctx; } -static void test_tx_chksum(sa_family_t family, bool offloaded) +static void test_tx_chksum(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; - socklen_t addrlen = (family == AF_INET6) ? sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); + net_socklen_t addrlen = (family == NET_AF_INET6) ? sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); struct net_context *net_ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; int ret, len; net_ctx = test_udp_context_prepare(family, offloaded, &dst_addr); zassert_not_null(net_ctx, "Failed to obtain net_ctx"); test_started = true; - test_proto = IPPROTO_UDP; + test_proto = NET_IPPROTO_UDP; len = strlen(test_data); ret = net_context_sendto(net_ctx, test_data, len, &dst_addr, @@ -743,38 +743,38 @@ static void test_tx_chksum(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v6) { - test_tx_chksum(AF_INET6, false); + test_tx_chksum(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v4) { - test_tx_chksum(AF_INET, false); + test_tx_chksum(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v6) { - test_tx_chksum(AF_INET6, true); + test_tx_chksum(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v4) { - test_tx_chksum(AF_INET, true); + test_tx_chksum(NET_AF_INET, true); } -static void test_tx_chksum_udp_frag(sa_family_t family, bool offloaded) +static void test_tx_chksum_udp_frag(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; - socklen_t addrlen = (family == AF_INET6) ? sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); + net_socklen_t addrlen = (family == NET_AF_INET6) ? sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); struct net_context *net_ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; int ret, len; net_ctx = test_udp_context_prepare(family, offloaded, &dst_addr); zassert_not_null(net_ctx, "Failed to obtain net_ctx"); test_started = true; - test_proto = IPPROTO_UDP; + test_proto = NET_IPPROTO_UDP; verify_fragment = true; len = sizeof(test_data_large); @@ -792,22 +792,22 @@ static void test_tx_chksum_udp_frag(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v6_udp_frag) { - test_tx_chksum_udp_frag(AF_INET6, false); + test_tx_chksum_udp_frag(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v4_udp_frag) { - test_tx_chksum_udp_frag(AF_INET, false); + test_tx_chksum_udp_frag(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v6_udp_frag) { - test_tx_chksum_udp_frag(AF_INET6, true); + test_tx_chksum_udp_frag(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v4_udp_frag) { - test_tx_chksum_udp_frag(AF_INET, true); + test_tx_chksum_udp_frag(NET_AF_INET, true); } static int dummy_icmp_handler(struct net_icmp_ctx *ctx, @@ -825,34 +825,34 @@ static int dummy_icmp_handler(struct net_icmp_ctx *ctx, return 0; } -static void test_icmp_init(sa_family_t family, bool offloaded, - struct sockaddr *dst_addr, struct net_if **iface) +static void test_icmp_init(net_sa_family_t family, bool offloaded, + struct net_sockaddr *dst_addr, struct net_if **iface) { - if (family == AF_INET6) { - struct sockaddr_in6 *dst_addr6 = - (struct sockaddr_in6 *)dst_addr; + if (family == NET_AF_INET6) { + struct net_sockaddr_in6 *dst_addr6 = + (struct net_sockaddr_in6 *)dst_addr; - dst_addr6->sin6_family = AF_INET6; + dst_addr6->sin6_family = NET_AF_INET6; if (offloaded) { memcpy(&dst_addr6->sin6_addr, &dst_addr2, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } else { memcpy(&dst_addr6->sin6_addr, &dst_addr1, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); } } else { - struct sockaddr_in *dst_addr4 = - (struct sockaddr_in *)dst_addr; + struct net_sockaddr_in *dst_addr4 = + (struct net_sockaddr_in *)dst_addr; - dst_addr4->sin_family = AF_INET; + dst_addr4->sin_family = NET_AF_INET; if (offloaded) { memcpy(&dst_addr4->sin_addr, &in4addr_dst2, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } else { memcpy(&dst_addr4->sin_addr, &in4addr_dst, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); } } @@ -863,12 +863,12 @@ static void test_icmp_init(sa_family_t family, bool offloaded, } } -static void test_tx_chksum_icmp_frag(sa_family_t family, bool offloaded) +static void test_tx_chksum_icmp_frag(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; struct net_icmp_ping_params params = { 0 }; struct net_icmp_ctx ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; struct net_if *iface; int ret; @@ -878,7 +878,7 @@ static void test_tx_chksum_icmp_frag(sa_family_t family, bool offloaded) zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); test_started = true; - test_proto = (family == AF_INET6) ? IPPROTO_ICMPV6 : IPPROTO_ICMP; + test_proto = (family == NET_AF_INET6) ? NET_IPPROTO_ICMPV6 : NET_IPPROTO_ICMP; verify_fragment = true; params.data = test_data_large; @@ -897,22 +897,22 @@ static void test_tx_chksum_icmp_frag(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v6_icmp_frag) { - test_tx_chksum_icmp_frag(AF_INET6, false); + test_tx_chksum_icmp_frag(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v4_icmp_frag) { - test_tx_chksum_icmp_frag(AF_INET, false); + test_tx_chksum_icmp_frag(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v6_icmp_frag) { - test_tx_chksum_icmp_frag(AF_INET6, true); + test_tx_chksum_icmp_frag(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v4_icmp_frag) { - test_tx_chksum_icmp_frag(AF_INET, true); + test_tx_chksum_icmp_frag(NET_AF_INET, true); } static void test_fragment_rx_udp(struct net_pkt *pkt, @@ -950,7 +950,7 @@ static void recv_cb_offload_disabled(struct net_context *context, zassert_equal(net_calc_verify_chksum_udp(pkt), 0, "Incorrect checksum"); } - if (net_pkt_family(pkt) == AF_INET) { + if (net_pkt_family(pkt) == NET_AF_INET) { struct net_ipv4_hdr *ipv4 = NET_IPV4_HDR(pkt); zassert_not_equal(ipv4->chksum, 0, @@ -976,7 +976,7 @@ static void recv_cb_offload_enabled(struct net_context *context, } else { zassert_equal(proto_hdr->udp->chksum, 0, "Checksum is set"); - if (net_pkt_family(pkt) == AF_INET) { + if (net_pkt_family(pkt) == NET_AF_INET) { struct net_ipv4_hdr *ipv4 = NET_IPV4_HDR(pkt); zassert_equal(ipv4->chksum, 0, "IPv4 checksum is set"); @@ -988,22 +988,22 @@ static void recv_cb_offload_enabled(struct net_context *context, net_pkt_unref(pkt); } -static void test_rx_chksum(sa_family_t family, bool offloaded) +static void test_rx_chksum(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; net_context_recv_cb_t cb = offloaded ? recv_cb_offload_enabled : recv_cb_offload_disabled; - socklen_t addrlen = (family == AF_INET6) ? sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); + net_socklen_t addrlen = (family == NET_AF_INET6) ? sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); struct net_context *net_ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; int ret, len; net_ctx = test_udp_context_prepare(family, offloaded, &dst_addr); zassert_not_null(net_ctx, "Failed to obtain net_ctx"); test_started = true; - test_proto = IPPROTO_UDP; + test_proto = NET_IPPROTO_UDP; start_receiving = true; ret = net_context_recv(net_ctx, cb, K_NO_WAIT, NULL); @@ -1027,40 +1027,40 @@ static void test_rx_chksum(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v6) { - test_rx_chksum(AF_INET6, false); + test_rx_chksum(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v4) { - test_rx_chksum(AF_INET, false); + test_rx_chksum(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v6) { - test_rx_chksum(AF_INET6, true); + test_rx_chksum(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v4) { - test_rx_chksum(AF_INET, true); + test_rx_chksum(NET_AF_INET, true); } -static void test_rx_chksum_udp_frag(sa_family_t family, bool offloaded) +static void test_rx_chksum_udp_frag(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; net_context_recv_cb_t cb = offloaded ? recv_cb_offload_enabled : recv_cb_offload_disabled; - socklen_t addrlen = (family == AF_INET6) ? sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); + net_socklen_t addrlen = (family == NET_AF_INET6) ? sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); struct net_context *net_ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; int ret, len; net_ctx = test_udp_context_prepare(family, offloaded, &dst_addr); zassert_not_null(net_ctx, "Failed to obtain net_ctx"); test_started = true; - test_proto = IPPROTO_UDP; + test_proto = NET_IPPROTO_UDP; start_receiving = true; verify_fragment = true; @@ -1085,40 +1085,40 @@ static void test_rx_chksum_udp_frag(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v6_udp_frag) { - test_rx_chksum_udp_frag(AF_INET6, false); + test_rx_chksum_udp_frag(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v4_udp_frag) { - test_rx_chksum_udp_frag(AF_INET, false); + test_rx_chksum_udp_frag(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v6_udp_frag) { - test_rx_chksum_udp_frag(AF_INET6, true); + test_rx_chksum_udp_frag(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v4_udp_frag) { - test_rx_chksum_udp_frag(AF_INET, true); + test_rx_chksum_udp_frag(NET_AF_INET, true); } -static void test_rx_chksum_udp_frag_bad(sa_family_t family, bool offloaded) +static void test_rx_chksum_udp_frag_bad(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; net_context_recv_cb_t cb = offloaded ? recv_cb_offload_enabled : recv_cb_offload_disabled; - socklen_t addrlen = (family == AF_INET6) ? sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); + net_socklen_t addrlen = (family == NET_AF_INET6) ? sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); struct net_context *net_ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; int ret, len; net_ctx = test_udp_context_prepare(family, offloaded, &dst_addr); zassert_not_null(net_ctx, "Failed to obtain net_ctx"); test_started = true; - test_proto = IPPROTO_UDP; + test_proto = NET_IPPROTO_UDP; start_receiving = true; verify_fragment = true; change_chksum = true; @@ -1144,22 +1144,22 @@ static void test_rx_chksum_udp_frag_bad(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v6_udp_frag_bad) { - test_rx_chksum_udp_frag_bad(AF_INET6, false); + test_rx_chksum_udp_frag_bad(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_disabled_test_v4_udp_frag_bad) { - test_rx_chksum_udp_frag_bad(AF_INET, false); + test_rx_chksum_udp_frag_bad(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v6_udp_frag_bad) { - test_rx_chksum_udp_frag_bad(AF_INET6, true); + test_rx_chksum_udp_frag_bad(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_tx_chksum_offload_enabled_test_v4_udp_frag_bad) { - test_rx_chksum_udp_frag_bad(AF_INET, true); + test_rx_chksum_udp_frag_bad(NET_AF_INET, true); } static int icmp_handler(struct net_icmp_ctx *ctx, @@ -1181,7 +1181,7 @@ static int icmp_handler(struct net_icmp_ctx *ctx, */ zassert_not_equal(icmp_hdr->chksum, 0, "Checksum is not set"); - if (test_proto == IPPROTO_ICMPV6) { + if (test_proto == NET_IPPROTO_ICMPV6) { zassert_equal(net_calc_chksum_icmpv6(pkt), 0, "Incorrect checksum"); } else { zassert_equal(net_calc_chksum_icmpv4(pkt), 0, "Incorrect checksum"); @@ -1199,25 +1199,25 @@ static int icmp_handler(struct net_icmp_ctx *ctx, return 0; } -static void test_rx_chksum_icmp_frag(sa_family_t family, bool offloaded) +static void test_rx_chksum_icmp_frag(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; struct net_icmp_ping_params params = { 0 }; struct net_icmp_ctx ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; struct net_if *iface; int ret; test_icmp_init(family, offloaded, &dst_addr, &iface); ret = net_icmp_init_ctx(&ctx, family, - family == AF_INET6 ? NET_ICMPV6_ECHO_REPLY : + family == NET_AF_INET6 ? NET_ICMPV6_ECHO_REPLY : NET_ICMPV4_ECHO_REPLY, 0, icmp_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); test_started = true; - test_proto = (family == AF_INET6) ? IPPROTO_ICMPV6 : IPPROTO_ICMP; + test_proto = (family == NET_AF_INET6) ? NET_IPPROTO_ICMPV6 : NET_IPPROTO_ICMP; start_receiving = true; verify_fragment = true; @@ -1238,43 +1238,43 @@ static void test_rx_chksum_icmp_frag(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v6_icmp_frag) { - test_rx_chksum_icmp_frag(AF_INET6, false); + test_rx_chksum_icmp_frag(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v4_icmp_frag) { - test_rx_chksum_icmp_frag(AF_INET, false); + test_rx_chksum_icmp_frag(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v6_icmp_frag) { - test_rx_chksum_icmp_frag(AF_INET6, true); + test_rx_chksum_icmp_frag(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v4_icmp_frag) { - test_rx_chksum_icmp_frag(AF_INET, true); + test_rx_chksum_icmp_frag(NET_AF_INET, true); } -static void test_rx_chksum_icmp_frag_bad(sa_family_t family, bool offloaded) +static void test_rx_chksum_icmp_frag_bad(net_sa_family_t family, bool offloaded) { struct k_sem *wait_data = offloaded ? &wait_data_off : &wait_data_nonoff; struct net_icmp_ping_params params = { 0 }; struct net_icmp_ctx ctx; - struct sockaddr dst_addr; + struct net_sockaddr dst_addr; struct net_if *iface; int ret; test_icmp_init(family, offloaded, &dst_addr, &iface); ret = net_icmp_init_ctx(&ctx, family, - family == AF_INET6 ? NET_ICMPV6_ECHO_REPLY : + family == NET_AF_INET6 ? NET_ICMPV6_ECHO_REPLY : NET_ICMPV4_ECHO_REPLY, 0, icmp_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); test_started = true; - test_proto = (family == AF_INET6) ? IPPROTO_ICMPV6 : IPPROTO_ICMP; + test_proto = (family == NET_AF_INET6) ? NET_IPPROTO_ICMPV6 : NET_IPPROTO_ICMP; start_receiving = true; verify_fragment = true; change_chksum = true; @@ -1296,22 +1296,22 @@ static void test_rx_chksum_icmp_frag_bad(sa_family_t family, bool offloaded) ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v6_icmp_frag_bad) { - test_rx_chksum_icmp_frag_bad(AF_INET6, false); + test_rx_chksum_icmp_frag_bad(NET_AF_INET6, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_disabled_test_v4_icmp_frag_bad) { - test_rx_chksum_icmp_frag_bad(AF_INET, false); + test_rx_chksum_icmp_frag_bad(NET_AF_INET, false); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v6_icmp_frag_bad) { - test_rx_chksum_icmp_frag_bad(AF_INET6, true); + test_rx_chksum_icmp_frag_bad(NET_AF_INET6, true); } ZTEST(net_chksum_offload, test_rx_chksum_offload_enabled_test_v4_icmp_frag_bad) { - test_rx_chksum_icmp_frag_bad(AF_INET, true); + test_rx_chksum_icmp_frag_bad(NET_AF_INET, true); } static void *net_chksum_offload_tests_setup(void) diff --git a/tests/net/conn_mgr_monitor/src/main.c b/tests/net/conn_mgr_monitor/src/main.c index e1e1cd67081bb..49e7f5d0e9a22 100644 --- a/tests/net/conn_mgr_monitor/src/main.c +++ b/tests/net/conn_mgr_monitor/src/main.c @@ -50,12 +50,12 @@ /* IP addresses -- Two of each are needed because address sharing will cause address removal to * fail silently (Address is only removed from one iface). */ -static struct in_addr test_ipv4_a = { { { 10, 0, 0, 1 } } }; -static struct in_addr test_ipv4_b = { { { 10, 0, 0, 2 } } }; -static struct in6_addr test_ipv6_a = { { { +static struct net_in_addr test_ipv4_a = { { { 10, 0, 0, 1 } } }; +static struct net_in_addr test_ipv4_b = { { { 10, 0, 0, 2 } } }; +static struct net_in6_addr test_ipv6_a = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr test_ipv6_b = { { { +static struct net_in6_addr test_ipv6_b = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; @@ -63,7 +63,7 @@ static struct in6_addr test_ipv6_b = { { { /* Helpers */ static void reset_test_iface(struct net_if *iface) { - struct in6_addr *ll_ipv6; + struct net_in6_addr *ll_ipv6; if (net_if_is_admin_up(iface)) { (void)net_if_down(iface); diff --git a/tests/net/conn_mgr_nsos/src/main.c b/tests/net/conn_mgr_nsos/src/main.c index 252bcc4ea43f2..db506ddb9ba81 100644 --- a/tests/net/conn_mgr_nsos/src/main.c +++ b/tests/net/conn_mgr_nsos/src/main.c @@ -130,7 +130,7 @@ ZTEST(conn_mgr_nsos, test_conn_mgr_nsos) ZTEST(conn_mgr_nsos, test_conn_mgr_nsos_idle) { struct net_if *iface = net_if_get_default(); - struct sockaddr_in v4addr; + struct net_sockaddr_in v4addr; int sock, rc; /* 2 second idle timeout */ @@ -149,13 +149,13 @@ ZTEST(conn_mgr_nsos, test_conn_mgr_nsos_idle) zassert_equal(0, k_sem_take(&l4_connected, K_SECONDS(2))); /* Send data after a second (to localhost) */ - rc = zsock_inet_pton(AF_INET, "127.0.0.1", (void *)&v4addr); + rc = zsock_inet_pton(NET_AF_INET, "127.0.0.1", (void *)&v4addr); zassert_equal(1, rc); - v4addr.sin_family = AF_INET; - v4addr.sin_port = htons(1234); + v4addr.sin_family = NET_AF_INET; + v4addr.sin_port = net_htons(1234); - sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - rc = zsock_sendto(sock, "TEST", 4, 0, (const struct sockaddr *)&v4addr, sizeof(v4addr)); + sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); + rc = zsock_sendto(sock, "TEST", 4, 0, (const struct net_sockaddr *)&v4addr, sizeof(v4addr)); zassert_equal(4, rc); /* Should have reset the idle timeout */ @@ -202,7 +202,7 @@ static void *testsuite_init(void) { static struct net_mgmt_event_callback l4_callback; struct net_if *iface = net_if_get_default(); - struct in_addr addr; + struct net_in_addr addr; net_mgmt_init_event_callback(&l4_callback, l4_event_handler, NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED); @@ -211,7 +211,7 @@ static void *testsuite_init(void) conn_mgr_all_if_down(false); /* Add an IP address so that NET_EVENT_L4_CONNECTED can trigger */ - net_addr_pton(AF_INET, "192.0.2.1", &addr); + net_addr_pton(NET_AF_INET, "192.0.2.1", &addr); net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0); return NULL; diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c index 47a553a59340d..ae5b395b0b111 100644 --- a/tests/net/context/src/main.c +++ b/tests/net/context/src/main.c @@ -46,12 +46,12 @@ static struct net_context *tcp_v6_ctx; static struct net_context *tcp_v4_ctx; #endif -static struct in6_addr in6addr_my = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr in6addr_my = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; static char *test_data = "Test data to be sent"; @@ -77,31 +77,31 @@ ZTEST(net_context, test_net_ctx_get_fail) struct net_context *context; int ret; - ret = net_context_get(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, &context); + ret = net_context_get(NET_AF_UNSPEC, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &context); zassert_equal(ret, -EAFNOSUPPORT, "Invalid family test failed"); - ret = net_context_get(AF_INET6, 10, IPPROTO_UDP, &context); + ret = net_context_get(NET_AF_INET6, 10, NET_IPPROTO_UDP, &context); zassert_equal(ret, -EPROTOTYPE, "Invalid context type test failed "); - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6, &context); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_ICMPV6, &context); zassert_equal(ret, -EPROTONOSUPPORT, "Invalid context protocol test failed"); - ret = net_context_get(99, SOCK_DGRAM, IPPROTO_UDP, &context); + ret = net_context_get(99, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &context); zassert_equal(ret, -EAFNOSUPPORT, "Invalid context family test failed"); - ret = net_context_get(AF_INET6, SOCK_STREAM, IPPROTO_TCP, &context); + ret = net_context_get(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP, &context); zassert_equal(ret, -EPROTOTYPE, "Invalid context proto type test failed"); - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_TCP, &context); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_TCP, &context); zassert_equal(ret, -EPROTONOSUPPORT, "Invalid context proto value test failed"); - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, NULL); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, NULL); zassert_equal(ret, -EINVAL, "Invalid context value test failed "); } @@ -111,7 +111,7 @@ ZTEST(net_context, test_net_ctx_get_success) struct net_context *context = NULL; int ret; - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, &context); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &context); zassert_equal(ret, 0, "Context get test failed"); zassert_not_null(context, "Got NULL context"); @@ -131,13 +131,13 @@ ZTEST(net_context, test_net_ctx_get_all) int ret, i; for (i = 0; i < ARRAY_SIZE(contexts); i++) { - ret = net_context_get(AF_INET6, SOCK_DGRAM, - IPPROTO_UDP, &contexts[i]); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, + NET_IPPROTO_UDP, &contexts[i]); zassert_equal(ret, 0, "context get test failed"); } - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, &context); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &context); zassert_equal(ret, -ENOENT, "Context get extra test failed"); @@ -152,28 +152,28 @@ static void net_ctx_create(void) { int ret; - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_v6_ctx); zassert_equal(ret, 0, "Context create IPv6 UDP test failed"); - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &mcast_v6_ctx); zassert_equal(ret, 0, "Context create IPv6 mcast test failed "); - ret = net_context_get(AF_INET, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_v4_ctx); zassert_equal(ret, 0, "Context create IPv4 UDP test failed"); #if defined(CONFIG_NET_TCP) - ret = net_context_get(AF_INET6, SOCK_STREAM, IPPROTO_TCP, + ret = net_context_get(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP, &tcp_v6_ctx); zassert_equal(ret, 0, "Context create IPv6 TCP test failed"); - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &tcp_v4_ctx); zassert_equal(ret, 0, "Context create IPv4 TCP test failed"); @@ -182,47 +182,47 @@ static void net_ctx_create(void) static void net_ctx_bind_fail(void) { - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }, }; int ret; - ret = net_context_bind(udp_v6_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(udp_v6_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6)); zassert_equal(ret, -ENOENT, "Context bind failure test failed"); } static void net_ctx_bind_uni_success_v6(void) { - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(MY_PORT), + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(MY_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }, }; int ret; - ret = net_context_bind(udp_v6_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(udp_v6_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6)); zassert_equal(ret, 0, "Context bind IPv6 test failed"); } static void net_ctx_bind_uni_success_v4(void) { - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_port = htons(MY_PORT), + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(MY_PORT), .sin_addr = { { { 192, 0, 2, 1 } } }, }; int ret; - ret = net_context_bind(udp_v4_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in)); + ret = net_context_bind(udp_v4_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in)); zassert_equal(ret, 0, "Context bind IPv4 test failed"); } @@ -230,16 +230,16 @@ static void net_ctx_bind_uni_success_v4(void) static void net_ctx_bind_mcast_success(void) { int ret; - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(MY_PORT), + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(MY_PORT), .sin6_addr = { { { 0 } } }, }; net_ipv6_addr_create_ll_allnodes_mcast(&addr.sin6_addr); - ret = net_context_bind(mcast_v6_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(mcast_v6_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6)); zassert_equal(ret, 0, "Context bind test failed "); } @@ -263,7 +263,7 @@ static void net_ctx_listen_v4(void) static void connect_cb(struct net_context *context, int status, void *user_data) { - sa_family_t family = POINTER_TO_INT(user_data); + net_sa_family_t family = POINTER_TO_INT(user_data); if (net_context_get_family(context) != family) { TC_ERROR("Connect family mismatch %d should be %d\n", @@ -277,24 +277,24 @@ static void connect_cb(struct net_context *context, int status, static void net_ctx_connect_v6(void) { - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(PEER_PORT), + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(PEER_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }, }; int ret; - ret = net_context_connect(udp_v6_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6), connect_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET6)); + ret = net_context_connect(udp_v6_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6), connect_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET6)); zassert_false((ret || cb_failure), "Context connect IPv6 UDP test failed"); #if defined(CONFIG_NET_TCP) - ret = net_context_connect(tcp_v6_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6), connect_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET6)); + ret = net_context_connect(tcp_v6_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6), connect_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET6)); zassert_false((ret || cb_failure), "Context connect IPv6 TCP test failed"); @@ -303,23 +303,23 @@ static void net_ctx_connect_v6(void) static void net_ctx_connect_v4(void) { - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_port = htons(PEER_PORT), + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(PEER_PORT), .sin_addr = { { { 192, 0, 2, 2 } } }, }; int ret; - ret = net_context_connect(udp_v4_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in), connect_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET)); + ret = net_context_connect(udp_v4_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in), connect_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET)); zassert_false((ret || cb_failure), "Context connect IPv6 UDP test failed"); #if defined(CONFIG_NET_TCP) - ret = net_context_connect(tcp_v4_ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6), connect_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET)); + ret = net_context_connect(tcp_v4_ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6), connect_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET)); zassert_false((ret || cb_failure), "Context connect IPv6 TCP test failed"); #endif /* CONFIG_NET_TCP */ @@ -327,12 +327,12 @@ static void net_ctx_connect_v4(void) #if defined(CONFIG_NET_TCP) static void accept_cb(struct net_context *context, - struct sockaddr *addr, - socklen_t addrlen, + struct net_sockaddr *addr, + net_socklen_t addrlen, int status, void *user_data) { - sa_family_t family = POINTER_TO_INT(user_data); + net_sa_family_t family = POINTER_TO_INT(user_data); if (net_context_get_family(context) != family) { TC_ERROR("Accept family mismatch %d should be %d\n", @@ -350,7 +350,7 @@ static void net_ctx_accept_v6(void) int ret; ret = net_context_accept(udp_v6_ctx, accept_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET6)); + INT_TO_POINTER(NET_AF_INET6)); zassert_false((ret != -EINVAL || cb_failure), "Context accept IPv6 UDP test failed"); #endif @@ -362,7 +362,7 @@ static void net_ctx_accept_v4(void) int ret; ret = net_context_accept(udp_v4_ctx, accept_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET)); + INT_TO_POINTER(NET_AF_INET)); zassert_false((ret != -EINVAL || cb_failure), "Context accept IPv4 UDP test failed"); #endif @@ -411,7 +411,7 @@ static void net_ctx_put(void) static void send_cb(struct net_context *context, int status, void *user_data) { - sa_family_t family = POINTER_TO_INT(user_data); + net_sa_family_t family = POINTER_TO_INT(user_data); if (net_context_get_family(context) != family) { TC_ERROR("Send family mismatch %d should be %d\n", @@ -430,7 +430,7 @@ static void net_ctx_send_v6(void) test_sending = true; ret = net_context_send(udp_v6_ctx, test_data, strlen(test_data), - send_cb, K_FOREVER, INT_TO_POINTER(AF_INET6)); + send_cb, K_FOREVER, INT_TO_POINTER(NET_AF_INET6)); k_yield(); zassert_false(((ret < 0) || cb_failure), @@ -444,7 +444,7 @@ static void net_ctx_send_v4(void) test_sending = true; ret = net_context_send(udp_v4_ctx, test_data, strlen(test_data), - send_cb, K_FOREVER, INT_TO_POINTER(AF_INET)); + send_cb, K_FOREVER, INT_TO_POINTER(NET_AF_INET)); k_yield(); zassert_false(((ret < 0) || cb_failure), @@ -454,9 +454,9 @@ static void net_ctx_send_v4(void) static void net_ctx_sendto_v6(void) { int ret; - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(PEER_PORT), + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(PEER_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }, }; @@ -464,9 +464,9 @@ static void net_ctx_sendto_v6(void) test_sending = true; ret = net_context_sendto(udp_v6_ctx, test_data, strlen(test_data), - (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6), send_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET6)); + (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6), send_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET6)); zassert_false(((ret < 0) || cb_failure), "Context send IPv6 UDP test failed"); } @@ -474,18 +474,18 @@ static void net_ctx_sendto_v6(void) static void net_ctx_sendto_v4(void) { int ret; - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_port = htons(PEER_PORT), + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(PEER_PORT), .sin_addr = { { { 192, 0, 2, 2 } } }, }; test_sending = true; ret = net_context_sendto(udp_v4_ctx, test_data, strlen(test_data), - (struct sockaddr *)&addr, - sizeof(struct sockaddr_in), send_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET)); + (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in), send_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET)); zassert_false(((ret < 0) || cb_failure), "Context send IPv4 UDP test failed"); } @@ -511,7 +511,7 @@ ZTEST(net_context, test_net_ctx_recv_v6) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v6_ctx, recv_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET6)); + INT_TO_POINTER(NET_AF_INET6)); zassert_false((ret || cb_failure), "Context recv IPv6 UDP test failed"); @@ -534,7 +534,7 @@ ZTEST(net_context, test_net_ctx_recv_v4) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v4_ctx, recv_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET)); + INT_TO_POINTER(NET_AF_INET)); zassert_false((ret || cb_failure), "Context recv IPv4 UDP test failed"); @@ -553,9 +553,9 @@ ZTEST(net_context, test_net_ctx_recv_v4) static bool net_ctx_sendto_v6_wrong_src(void) { int ret; - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(PEER_PORT), + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(PEER_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3 } } }, }; @@ -563,9 +563,9 @@ static bool net_ctx_sendto_v6_wrong_src(void) test_sending = true; ret = net_context_sendto(udp_v6_ctx, test_data, strlen(test_data), - (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6), send_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET6)); + (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6), send_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET6)); if ((ret < 0) || cb_failure) { TC_ERROR("Context sendto IPv6 UDP wrong src " "test failed (%d)\n", ret); @@ -583,7 +583,7 @@ ZTEST(net_context, test_net_ctx_recv_v6_fail) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v6_ctx, recv_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET6)); + INT_TO_POINTER(NET_AF_INET6)); zassert_false((ret || cb_failure), "Context recv IPv6 UDP test failed"); @@ -603,18 +603,18 @@ ZTEST(net_context, test_net_ctx_recv_v6_fail) static bool net_ctx_sendto_v4_wrong_src(void) { int ret; - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_port = htons(PEER_PORT), + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(PEER_PORT), .sin_addr = { { { 192, 0, 2, 3 } } }, }; test_sending = true; ret = net_context_sendto(udp_v4_ctx, test_data, strlen(test_data), - (struct sockaddr *)&addr, - sizeof(struct sockaddr_in), send_cb, - K_NO_WAIT, INT_TO_POINTER(AF_INET)); + (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in), send_cb, + K_NO_WAIT, INT_TO_POINTER(NET_AF_INET)); if ((ret < 0) || cb_failure) { TC_ERROR("Context send IPv4 UDP test failed (%d)\n", ret); return false; @@ -631,7 +631,7 @@ ZTEST(net_context, test_net_ctx_recv_v4_fail) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v4_ctx, recv_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET)); + INT_TO_POINTER(NET_AF_INET)); zassert_false((ret || cb_failure), "Context recv IPv4 UDP test failed"); @@ -656,7 +656,7 @@ ZTEST(net_context, test_net_ctx_recv_v6_again) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v6_ctx, recv_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET6)); + INT_TO_POINTER(NET_AF_INET6)); zassert_false((ret || cb_failure), "Context recv IPv6 UDP test failed"); @@ -684,7 +684,7 @@ ZTEST(net_context, test_net_ctx_recv_v4_again) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v4_ctx, recv_cb, K_NO_WAIT, - INT_TO_POINTER(AF_INET)); + INT_TO_POINTER(NET_AF_INET)); zassert_false((ret || cb_failure), "Context recv IPv4 UDP test failed"); @@ -726,7 +726,7 @@ ZTEST(net_context, test_net_ctx_recv_v6_reconfig) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v6_ctx, recv_cb_another, K_NO_WAIT, - INT_TO_POINTER(AF_INET6)); + INT_TO_POINTER(NET_AF_INET6)); zassert_false((ret || cb_failure), "Context recv reconfig IPv6 UDP test failed"); @@ -751,7 +751,7 @@ ZTEST(net_context, test_net_ctx_recv_v4_reconfig) net_ctx_setups_order_dependent(); ret = net_context_recv(udp_v4_ctx, recv_cb_another, K_NO_WAIT, - INT_TO_POINTER(AF_INET)); + INT_TO_POINTER(NET_AF_INET)); zassert_false((ret || cb_failure), "Context recv reconfig IPv4 UDP test failed"); @@ -811,7 +811,7 @@ void timeout_thread(void *p1, void *p2, void *p3) return; } - DBG("Timeout %s\n", family == AF_INET ? "IPv4" : "IPv6"); + DBG("Timeout %s\n", family == NET_AF_INET ? "IPv4" : "IPv6"); k_sem_give(&wait_data); } @@ -820,7 +820,7 @@ static k_tid_t start_timeout_v6_thread(int32_t timeout) { return k_thread_create(&thread_data, thread_stack, STACKSIZE, timeout_thread, - udp_v6_ctx, INT_TO_POINTER(AF_INET6), + udp_v6_ctx, INT_TO_POINTER(NET_AF_INET6), INT_TO_POINTER(timeout), K_PRIO_COOP(7), 0, K_NO_WAIT); } @@ -829,7 +829,7 @@ static k_tid_t start_timeout_v4_thread(int32_t timeout) { return k_thread_create(&thread_data, thread_stack, STACKSIZE, timeout_thread, - udp_v4_ctx, INT_TO_POINTER(AF_INET), + udp_v4_ctx, INT_TO_POINTER(NET_AF_INET), INT_TO_POINTER(timeout), K_PRIO_COOP(7), 0, K_NO_WAIT); } @@ -1021,15 +1021,15 @@ static int tester_send(const struct device *dev, struct net_pkt *pkt) */ uint16_t port; - if (net_pkt_family(pkt) == AF_INET6) { - struct in6_addr addr; + if (net_pkt_family(pkt) == NET_AF_INET6) { + struct net_in6_addr addr; net_ipv6_addr_copy_raw((uint8_t *)&addr, NET_IPV6_HDR(pkt)->src); net_ipv6_addr_copy_raw(NET_IPV6_HDR(pkt)->src, NET_IPV6_HDR(pkt)->dst); net_ipv6_addr_copy_raw(NET_IPV6_HDR(pkt)->dst, (uint8_t *)&addr); } else { - struct in_addr addr; + struct net_in_addr addr; net_ipv4_addr_copy_raw((uint8_t *)&addr, NET_IPV4_HDR(pkt)->src); net_ipv4_addr_copy_raw(NET_IPV4_HDR(pkt)->src, diff --git a/tests/net/dhcpv4/client/src/main.c b/tests/net/dhcpv4/client/src/main.c index c46ad78c29f68..c410bb15f4e74 100644 --- a/tests/net/dhcpv4/client/src/main.c +++ b/tests/net/dhcpv4/client/src/main.c @@ -214,8 +214,8 @@ static const unsigned char ack[] = { 0xff }; -static const struct in_addr server_addr = { { { 192, 0, 2, 1 } } }; -static const struct in_addr client_addr = { { { 255, 255, 255, 255 } } }; +static const struct net_in_addr server_addr = { { { 192, 0, 2, 1 } } }; +static const struct net_in_addr client_addr = { { { 255, 255, 255, 255 } } }; #define SERVER_PORT 67 #define CLIENT_PORT 68 @@ -300,8 +300,8 @@ struct net_pkt *prepare_dhcp_offer(struct net_if *iface, uint32_t xid) { struct net_pkt *pkt; - pkt = net_pkt_alloc_with_buffer(iface, sizeof(offer), AF_INET, - IPPROTO_UDP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, sizeof(offer), NET_AF_INET, + NET_IPPROTO_UDP, K_FOREVER); if (!pkt) { return NULL; } @@ -309,7 +309,7 @@ struct net_pkt *prepare_dhcp_offer(struct net_if *iface, uint32_t xid) net_pkt_set_ipv4_ttl(pkt, 0xFF); if (net_ipv4_create(pkt, &server_addr, &client_addr) || - net_udp_create(pkt, htons(SERVER_PORT), htons(CLIENT_PORT))) { + net_udp_create(pkt, net_htons(SERVER_PORT), net_htons(CLIENT_PORT))) { goto fail; } @@ -328,7 +328,7 @@ struct net_pkt *prepare_dhcp_offer(struct net_if *iface, uint32_t xid) net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_UDP); + net_ipv4_finalize(pkt, NET_IPPROTO_UDP); offer_xid = xid; @@ -343,8 +343,8 @@ struct net_pkt *prepare_dhcp_ack(struct net_if *iface, uint32_t xid) { struct net_pkt *pkt; - pkt = net_pkt_alloc_with_buffer(iface, sizeof(offer), AF_INET, - IPPROTO_UDP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, sizeof(offer), NET_AF_INET, + NET_IPPROTO_UDP, K_FOREVER); if (!pkt) { return NULL; } @@ -352,7 +352,7 @@ struct net_pkt *prepare_dhcp_ack(struct net_if *iface, uint32_t xid) net_pkt_set_ipv4_ttl(pkt, 0xFF); if (net_ipv4_create(pkt, &server_addr, &client_addr) || - net_udp_create(pkt, htons(SERVER_PORT), htons(CLIENT_PORT))) { + net_udp_create(pkt, net_htons(SERVER_PORT), net_htons(CLIENT_PORT))) { goto fail; } @@ -371,7 +371,7 @@ struct net_pkt *prepare_dhcp_ack(struct net_if *iface, uint32_t xid) net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_UDP); + net_ipv4_finalize(pkt, NET_IPPROTO_UDP); return pkt; @@ -510,8 +510,8 @@ static struct net_dhcpv4_option_callback opt_vs_invalid_cb; static void receiver_cb(uint64_t nm_event, struct net_if *iface, void *info, size_t info_length, void *user_data) { - const struct in_addr ip_addr = { { { 10, 237, 72, 158 } } }; - const struct in_addr dns_addrs[3] = { + const struct net_in_addr ip_addr = { { { 10, 237, 72, 158 } } }; + const struct net_in_addr dns_addrs[3] = { { { { 10, 248, 2, 1 } } }, { { { 163, 33, 253, 68 } } }, { { { 10, 184, 9, 1 } } }, @@ -522,15 +522,15 @@ static void receiver_cb(uint64_t nm_event, struct net_if *iface, void *info, siz switch (nm_event) { case NET_EVENT_IPV4_ADDR_ADD: - zassert_equal(info_length, sizeof(struct in_addr)); - zassert_mem_equal(info, &ip_addr, sizeof(struct in_addr)); + zassert_equal(info_length, sizeof(struct net_in_addr)); + zassert_mem_equal(info, &ip_addr, sizeof(struct net_in_addr)); k_event_post(&events, EVT_ADDR_ADD); break; case NET_EVENT_IPV4_ADDR_DEL: k_event_post(&events, EVT_ADDR_DEL); break; case NET_EVENT_DNS_SERVER_ADD: - zassert_equal(info_length, sizeof(struct sockaddr)); + zassert_equal(info_length, sizeof(struct net_sockaddr)); if (net_sin(info)->sin_addr.s_addr == dns_addrs[0].s_addr) { k_event_post(&events, EVT_DNS_SERVER1_ADD); } else if (net_sin(info)->sin_addr.s_addr == dns_addrs[1].s_addr) { @@ -542,7 +542,7 @@ static void receiver_cb(uint64_t nm_event, struct net_if *iface, void *info, siz } break; case NET_EVENT_DNS_SERVER_DEL: - zassert_equal(info_length, sizeof(struct sockaddr)); + zassert_equal(info_length, sizeof(struct net_sockaddr)); if (net_sin(info)->sin_addr.s_addr == dns_addrs[0].s_addr) { k_event_post(&events, EVT_DNS_SERVER1_DEL); } else if (net_sin(info)->sin_addr.s_addr == dns_addrs[1].s_addr) { diff --git a/tests/net/dhcpv4/server/src/main.c b/tests/net/dhcpv4/server/src/main.c index 49478c991d2c2..ec2846584d450 100644 --- a/tests/net/dhcpv4/server/src/main.c +++ b/tests/net/dhcpv4/server/src/main.c @@ -21,12 +21,12 @@ static uint8_t server_mac_addr[] = { 0x00, 0x00, 0x5E, 0x00, 0x53, 0x01 }; static uint8_t client_mac_addr[] = { 0x00, 0x00, 0x5E, 0x00, 0x53, 0x02 }; -static struct in_addr server_addr = { { { 192, 0, 2, 1 } } }; -static struct in_addr netmask = { { { 255, 255, 255, 0 } } }; -static struct in_addr test_base_addr = { { { 192, 0, 2, 10 } } }; +static struct net_in_addr server_addr = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr netmask = { { { 255, 255, 255, 0 } } }; +static struct net_in_addr test_base_addr = { { { 192, 0, 2, 10 } } }; /* Only to test Inform. */ -static struct in_addr client_addr_static = { { { 192, 0, 2, 2 } } }; +static struct net_in_addr client_addr_static = { { { 192, 0, 2, 2 } } }; typedef void (*test_dhcpv4_server_fn_t)(struct net_if *iface, struct net_pkt *pkt); @@ -36,8 +36,8 @@ static struct test_dhcpv4_server_ctx { struct net_if *iface; struct k_sem test_proceed; struct net_pkt *pkt; - struct in_addr assigned_ip; - struct in_addr declined_ip; + struct net_in_addr assigned_ip; + struct net_in_addr declined_ip; /* Request params */ const char *client_id; @@ -78,11 +78,11 @@ static void send_icmp_echo_reply(struct net_pkt *pkt, NET_ICMPH_LEN; reply = net_pkt_alloc_with_buffer(net_pkt_iface(pkt), payload_len, - AF_INET, IPPROTO_ICMP, K_FOREVER); + NET_AF_INET, NET_IPPROTO_ICMP, K_FOREVER); zassert_not_null(reply, "Failed to allocate echo reply"); - zassert_ok(net_ipv4_create(reply, (struct in_addr *)ipv4_hdr->dst, - (struct in_addr *)ipv4_hdr->src), + zassert_ok(net_ipv4_create(reply, (struct net_in_addr *)ipv4_hdr->dst, + (struct net_in_addr *)ipv4_hdr->src), "Failed to create IPv4 header"); zassert_ok(net_icmpv4_create(reply, NET_ICMPV4_ECHO_REPLY, 0), @@ -91,7 +91,7 @@ static void send_icmp_echo_reply(struct net_pkt *pkt, "Failed to copy payload"); net_pkt_cursor_init(reply); - net_ipv4_finalize(reply, IPPROTO_ICMP); + net_ipv4_finalize(reply, NET_IPPROTO_ICMP); zassert_ok(net_recv_data(test_ctx.iface, reply), "Failed to receive data"); } @@ -104,11 +104,11 @@ static int server_send(const struct device *dev, struct net_pkt *pkt) ipv4_hdr = (struct net_ipv4_hdr *)net_pkt_get_data(pkt, &ipv4_access); zassert_not_null(ipv4_hdr, "Failed to access IPv4 header."); - if (ipv4_hdr->proto == IPPROTO_ICMP) { + if (ipv4_hdr->proto == NET_IPPROTO_ICMP) { if (test_ctx.send_echo_reply) { test_ctx.send_echo_reply = false; memcpy(&test_ctx.declined_ip, ipv4_hdr->dst, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); send_icmp_echo_reply(pkt, ipv4_hdr); } @@ -143,32 +143,32 @@ static void test_pkt_free(void) } static void client_prepare_test_msg( - const struct in_addr *src_addr, const struct in_addr *dst_addr, - enum net_dhcpv4_msg_type type, const struct in_addr *server_id, - const struct in_addr *requested_ip, const struct in_addr *ciaddr) + const struct net_in_addr *src_addr, const struct net_in_addr *dst_addr, + enum net_dhcpv4_msg_type type, const struct net_in_addr *server_id, + const struct net_in_addr *requested_ip, const struct net_in_addr *ciaddr) { struct dhcp_msg msg = { 0 }; uint8_t empty_buf[SIZE_OF_FILE] = { 0 }; struct net_pkt *pkt; - pkt = net_pkt_alloc_with_buffer(test_ctx.iface, NET_IPV4_MTU, AF_INET, - IPPROTO_UDP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(test_ctx.iface, NET_IPV4_MTU, NET_AF_INET, + NET_IPPROTO_UDP, K_FOREVER); zassert_not_null(pkt, "Failed to allocate packet"); net_pkt_set_ipv4_ttl(pkt, 1); zassert_ok(net_ipv4_create(pkt, src_addr, dst_addr), "Failed to create IPv4 header"); - zassert_ok(net_udp_create(pkt, htons(DHCPV4_CLIENT_PORT), - htons(DHCPV4_SERVER_PORT)), + zassert_ok(net_udp_create(pkt, net_htons(DHCPV4_CLIENT_PORT), + net_htons(DHCPV4_SERVER_PORT)), "Failed to create UDP header"); msg.op = DHCPV4_MSG_BOOT_REQUEST; msg.htype = HARDWARE_ETHERNET_TYPE; msg.hlen = sizeof(client_mac_addr); - msg.xid = htonl(TEST_XID); + msg.xid = net_htonl(TEST_XID); if (test_ctx.broadcast) { - msg.flags = htons(DHCPV4_MSG_BROADCAST); + msg.flags = net_htons(DHCPV4_MSG_BROADCAST); } if (ciaddr) { @@ -223,7 +223,7 @@ static void client_prepare_test_msg( net_pkt_write_u8(pkt, DHCPV4_OPTIONS_END); net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_UDP); + net_ipv4_finalize(pkt, NET_IPPROTO_UDP); zassert_ok(net_recv_data(test_ctx.iface, pkt), "Failed to receive data"); } @@ -372,14 +372,14 @@ static void get_reserved_cb(struct net_if *iface, struct dhcpv4_addr_slot *lease, void *user_data) { - struct in_addr *reserved = user_data; + struct net_in_addr *reserved = user_data; if (lease->state == DHCPV4_SERVER_ADDR_RESERVED) { reserved->s_addr = lease->addr.s_addr; } } -static void get_reserved_address(struct in_addr *reserved) +static void get_reserved_address(struct net_in_addr *reserved) { int ret; @@ -471,7 +471,7 @@ static void verify_option(struct net_pkt *pkt, uint8_t opt_type, static void verify_option_uint32(struct net_pkt *pkt, uint8_t opt_type, uint32_t optval) { - optval = htonl(optval); + optval = net_htonl(optval); verify_option(pkt, opt_type, &optval, sizeof(optval)); } @@ -508,22 +508,22 @@ static void verify_offer(bool broadcast) /* IPv4 */ zassert_mem_equal(ipv4_hdr->src, server_addr.s4_addr, - sizeof(struct in_addr), "Incorrect source address"); + sizeof(struct net_in_addr), "Incorrect source address"); if (broadcast) { zassert_mem_equal(ipv4_hdr->dst, net_ipv4_broadcast_address(), - sizeof(struct in_addr), + sizeof(struct net_in_addr), "Destination should be broadcast"); } else { zassert_mem_equal(ipv4_hdr->dst, msg->yiaddr, - sizeof(struct in_addr), + sizeof(struct net_in_addr), "Destination should match address lease"); } - zassert_equal(ipv4_hdr->proto, IPPROTO_UDP, "Wrong protocol"); + zassert_equal(ipv4_hdr->proto, NET_IPPROTO_UDP, "Wrong protocol"); /* UDP */ - zassert_equal(udp_hdr->src_port, htons(DHCPV4_SERVER_PORT), + zassert_equal(udp_hdr->src_port, net_htons(DHCPV4_SERVER_PORT), "Wrong source port"); - zassert_equal(udp_hdr->dst_port, htons(DHCPV4_CLIENT_PORT), + zassert_equal(udp_hdr->dst_port, net_htons(DHCPV4_CLIENT_PORT), "Wrong client port"); /* DHCPv4 */ @@ -531,7 +531,7 @@ static void verify_offer(bool broadcast) zassert_equal(msg->htype, HARDWARE_ETHERNET_TYPE, "Incorrect %s value", "htype"); zassert_equal(msg->hlen, sizeof(client_mac_addr), "Incorrect %s value", "hlen"); zassert_equal(msg->hops, 0, "Incorrect %s value", "hops"); - zassert_equal(msg->xid, htonl(TEST_XID), "Incorrect %s value", "xid"); + zassert_equal(msg->xid, net_htonl(TEST_XID), "Incorrect %s value", "xid"); zassert_equal(msg->secs, 0, "Incorrect %s value", "secs"); zassert_equal(sys_get_be32(msg->ciaddr), 0, "Incorrect %s value", "ciaddr"); zassert_true((sys_get_be32(msg->yiaddr) >= @@ -542,7 +542,7 @@ static void verify_offer(bool broadcast) "Assigned DHCP address outside of address pool"); zassert_equal(sys_get_be32(msg->siaddr), 0, "Incorrect %s value", "siaddr"); if (broadcast) { - zassert_equal(msg->flags, htons(DHCPV4_MSG_BROADCAST), + zassert_equal(msg->flags, net_htons(DHCPV4_MSG_BROADCAST), "Incorrect %s value", "flags"); } else { zassert_equal(msg->flags, 0, "Incorrect %s value", "flags"); @@ -551,7 +551,7 @@ static void verify_offer(bool broadcast) zassert_mem_equal(msg->chaddr, client_mac_addr, sizeof(client_mac_addr), "Incorrect %s value", "chaddr"); - memcpy(&test_ctx.assigned_ip, msg->yiaddr, sizeof(struct in_addr)); + memcpy(&test_ctx.assigned_ip, msg->yiaddr, sizeof(struct net_in_addr)); ret = net_pkt_skip(pkt, SIZE_OF_SNAME + SIZE_OF_FILE); zassert_ok(ret, "DHCP Offer too short"); @@ -566,11 +566,11 @@ static void verify_offer(bool broadcast) verify_option_uint8(pkt, DHCPV4_OPTIONS_MSG_TYPE, NET_DHCPV4_MSG_TYPE_OFFER); verify_option(pkt, DHCPV4_OPTIONS_SERVER_ID, server_addr.s4_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); verify_option(pkt, DHCPV4_OPTIONS_CLIENT_ID, test_ctx.client_id, strlen(test_ctx.client_id)); verify_option(pkt, DHCPV4_OPTIONS_SUBNET_MASK, netmask.s4_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); verify_no_option(pkt, DHCPV4_OPTIONS_REQ_IPADDR); verify_no_option(pkt, DHCPV4_OPTIONS_REQ_LIST); } @@ -579,7 +579,7 @@ static void reserved_address_cb(struct net_if *iface, struct dhcpv4_addr_slot *lease, void *user_data) { - struct in_addr *reserved = user_data; + struct net_in_addr *reserved = user_data; zassert_equal(lease->state, DHCPV4_SERVER_ADDR_RESERVED, "Wrong lease state"); @@ -587,7 +587,7 @@ static void reserved_address_cb(struct net_if *iface, "Reserved wrong address"); } -static void verify_reserved_address(struct in_addr *reserved) +static void verify_reserved_address(struct net_in_addr *reserved) { int ret; @@ -613,7 +613,7 @@ ZTEST(dhcpv4_server_tests, test_discover) */ ZTEST(dhcpv4_server_tests, test_discover_repeat) { - struct in_addr first_addr; + struct net_in_addr first_addr; client_send_discover(); verify_offer(false); @@ -682,21 +682,21 @@ static void verify_ack(bool inform, bool renew) /* IPv4 */ zassert_mem_equal(ipv4_hdr->src, server_addr.s4_addr, - sizeof(struct in_addr), "Incorrect source address"); + sizeof(struct net_in_addr), "Incorrect source address"); if (inform || renew) { - zassert_mem_equal(ipv4_hdr->dst, msg->ciaddr, sizeof(struct in_addr), + zassert_mem_equal(ipv4_hdr->dst, msg->ciaddr, sizeof(struct net_in_addr), "Destination should match client address"); } else { - zassert_mem_equal(ipv4_hdr->dst, msg->yiaddr, sizeof(struct in_addr), + zassert_mem_equal(ipv4_hdr->dst, msg->yiaddr, sizeof(struct net_in_addr), "Destination should match client address"); } - zassert_equal(ipv4_hdr->proto, IPPROTO_UDP, "Wrong protocol"); + zassert_equal(ipv4_hdr->proto, NET_IPPROTO_UDP, "Wrong protocol"); /* UDP */ - zassert_equal(udp_hdr->src_port, htons(DHCPV4_SERVER_PORT), + zassert_equal(udp_hdr->src_port, net_htons(DHCPV4_SERVER_PORT), "Wrong source port"); - zassert_equal(udp_hdr->dst_port, htons(DHCPV4_CLIENT_PORT), + zassert_equal(udp_hdr->dst_port, net_htons(DHCPV4_CLIENT_PORT), "Wrong client port"); /* DHCPv4 */ @@ -704,16 +704,16 @@ static void verify_ack(bool inform, bool renew) zassert_equal(msg->htype, HARDWARE_ETHERNET_TYPE, "Incorrect %s value", "htype"); zassert_equal(msg->hlen, sizeof(client_mac_addr), "Incorrect %s value", "hlen"); zassert_equal(msg->hops, 0, "Incorrect %s value", "hops"); - zassert_equal(msg->xid, htonl(TEST_XID), "Incorrect %s value", "xid"); + zassert_equal(msg->xid, net_htonl(TEST_XID), "Incorrect %s value", "xid"); zassert_equal(msg->secs, 0, "Incorrect %s value", "secs"); if (inform) { zassert_mem_equal(msg->ciaddr, client_addr_static.s4_addr, - sizeof(struct in_addr), + sizeof(struct net_in_addr), "Incorrect %s value", "ciaddr"); } else if (renew) { zassert_mem_equal(msg->ciaddr, test_ctx.assigned_ip.s4_addr, - sizeof(struct in_addr), + sizeof(struct net_in_addr), "Incorrect %s value", "ciaddr"); } else { zassert_equal(sys_get_be32(msg->ciaddr), 0, "Incorrect %s value", "ciaddr"); @@ -723,7 +723,7 @@ static void verify_ack(bool inform, bool renew) zassert_equal(sys_get_be32(msg->yiaddr), 0, "Incorrect %s value", "yiaddr"); } else { zassert_mem_equal(msg->yiaddr, test_ctx.assigned_ip.s4_addr, - sizeof(struct in_addr), "Incorrect %s value", "yiaddr"); + sizeof(struct net_in_addr), "Incorrect %s value", "yiaddr"); } zassert_equal(sys_get_be32(msg->siaddr), 0, "Incorrect %s value", "siaddr"); @@ -733,7 +733,7 @@ static void verify_ack(bool inform, bool renew) "Incorrect %s value", "chaddr"); if (!inform) { - memcpy(&test_ctx.assigned_ip, msg->yiaddr, sizeof(struct in_addr)); + memcpy(&test_ctx.assigned_ip, msg->yiaddr, sizeof(struct net_in_addr)); } ret = net_pkt_skip(pkt, SIZE_OF_SNAME + SIZE_OF_FILE); @@ -754,7 +754,7 @@ static void verify_ack(bool inform, bool renew) verify_option_uint8(pkt, DHCPV4_OPTIONS_MSG_TYPE, NET_DHCPV4_MSG_TYPE_ACK); verify_option(pkt, DHCPV4_OPTIONS_SERVER_ID, server_addr.s4_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); if (inform) { verify_no_option(pkt, DHCPV4_OPTIONS_CLIENT_ID); } else { @@ -762,7 +762,7 @@ static void verify_ack(bool inform, bool renew) strlen(test_ctx.client_id)); } verify_option(pkt, DHCPV4_OPTIONS_SUBNET_MASK, netmask.s4_addr, - sizeof(struct in_addr)); + sizeof(struct net_in_addr)); verify_no_option(pkt, DHCPV4_OPTIONS_REQ_IPADDR); verify_no_option(pkt, DHCPV4_OPTIONS_REQ_LIST); } @@ -771,7 +771,7 @@ static void allocated_address_cb(struct net_if *iface, struct dhcpv4_addr_slot *lease, void *user_data) { - struct in_addr *allocated = user_data; + struct net_in_addr *allocated = user_data; zassert_equal(lease->state, DHCPV4_SERVER_ADDR_ALLOCATED, "Wrong lease state"); @@ -779,7 +779,7 @@ static void allocated_address_cb(struct net_if *iface, "Reserved wrong address"); } -static void verify_allocated_address(struct in_addr *allocated) +static void verify_allocated_address(struct net_in_addr *allocated) { int ret; @@ -856,7 +856,7 @@ static void declined_address_cb(struct net_if *iface, struct dhcpv4_addr_slot *lease, void *user_data) { - struct in_addr *declined = user_data; + struct net_in_addr *declined = user_data; zassert_equal(lease->state, DHCPV4_SERVER_ADDR_DECLINED, "Wrong lease state"); @@ -864,7 +864,7 @@ static void declined_address_cb(struct net_if *iface, "Declined wrong address"); } -static void verify_declined_address(struct in_addr *declined) +static void verify_declined_address(struct net_in_addr *declined) { int ret; @@ -896,7 +896,7 @@ ZTEST(dhcpv4_server_tests, test_decline) */ ZTEST(dhcpv4_server_tests, test_declined_reuse) { - struct in_addr oldest_addr; + struct net_in_addr oldest_addr; for (int i = 0; i < CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT; i++) { client_get_lease(false); @@ -983,8 +983,8 @@ ZTEST(dhcpv4_server_tests, test_icmp_probe) /* Verify that the DHCP server can start and validate input properly. */ ZTEST(dhcpv4_server_tests_no_init, test_initialization) { - struct in_addr base_addr_wrong_subnet = { { { 192, 0, 3, 10 } } }; - struct in_addr base_addr_overlap = { { { 192, 0, 2, 1 } } }; + struct net_in_addr base_addr_wrong_subnet = { { { 192, 0, 3, 10 } } }; + struct net_in_addr base_addr_overlap = { { { 192, 0, 2, 1 } } }; int ret; ret = net_dhcpv4_server_start(test_ctx.iface, &base_addr_wrong_subnet); diff --git a/tests/net/dhcpv6/src/main.c b/tests/net/dhcpv6/src/main.c index c8e1b00828f62..12483c012a8e3 100644 --- a/tests/net/dhcpv6/src/main.c +++ b/tests/net/dhcpv6/src/main.c @@ -12,9 +12,9 @@ #include "../../../subsys/net/lib/dhcpv6/dhcpv6.c" -static struct in6_addr test_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr test_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr test_prefix = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr test_prefix = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; static uint8_t test_prefix_len = 64; static uint8_t test_preference; @@ -109,9 +109,9 @@ static void generate_fake_server_duid(void) memset(serverid, 0, sizeof(*serverid)); - UNALIGNED_PUT(htons(DHCPV6_DUID_TYPE_LL), + UNALIGNED_PUT(net_htons(DHCPV6_DUID_TYPE_LL), UNALIGNED_MEMBER_ADDR(serverid, duid.type)); - UNALIGNED_PUT(htons(DHCPV6_HARDWARE_ETHERNET_TYPE), + UNALIGNED_PUT(net_htons(DHCPV6_HARDWARE_ETHERNET_TYPE), UNALIGNED_MEMBER_ADDR(duid_ll, hw_type)); memcpy(duid_ll->ll_addr, fake_mac, sizeof(fake_mac)); @@ -130,8 +130,8 @@ static struct net_pkt *test_dhcpv6_create_message( struct net_if *iface, enum dhcpv6_msg_type msg_type, test_dhcpv6_options_fn_t set_options_fn) { - struct in6_addr *local_addr; - struct in6_addr peer_addr; + struct net_in6_addr *local_addr; + struct net_in6_addr peer_addr; struct net_pkt *pkt; local_addr = net_if_ipv6_get_ll(iface, NET_ADDR_ANY_STATE); @@ -146,15 +146,15 @@ static struct net_pkt *test_dhcpv6_create_message( memcpy(&peer_addr, local_addr, sizeof(peer_addr)); peer_addr.s6_addr[15] = ~peer_addr.s6_addr[15]; - pkt = net_pkt_alloc_with_buffer(iface, TEST_MSG_SIZE, AF_INET6, - IPPROTO_UDP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, TEST_MSG_SIZE, NET_AF_INET6, + NET_IPPROTO_UDP, K_FOREVER); if (pkt == NULL) { return NULL; } if (net_ipv6_create(pkt, &peer_addr, local_addr) < 0 || - net_udp_create(pkt, htons(DHCPV6_SERVER_PORT), - htons(DHCPV6_CLIENT_PORT)) < 0) { + net_udp_create(pkt, net_htons(DHCPV6_SERVER_PORT), + net_htons(DHCPV6_CLIENT_PORT)) < 0) { goto fail; } @@ -169,7 +169,7 @@ static struct net_pkt *test_dhcpv6_create_message( } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_UDP); + net_ipv6_finalize(pkt, NET_IPPROTO_UDP); net_pkt_cursor_init(pkt); return pkt; @@ -186,7 +186,7 @@ static void evt_handler(struct net_mgmt_event_callback *cb, uint64_t mgmt_event, ARG_UNUSED(cb); if (mgmt_event == NET_EVENT_IF_UP) { - struct in6_addr lladdr; + struct net_in6_addr lladdr; net_ipv6_addr_create_iid(&lladdr, net_if_get_link_addr(test_ctx.iface)); (void)net_if_ipv6_addr_add(test_ctx.iface, &lladdr, NET_ADDR_AUTOCONF, 0); @@ -195,7 +195,7 @@ static void evt_handler(struct net_mgmt_event_callback *cb, uint64_t mgmt_event, static void *dhcpv6_tests_setup(void) { - struct in6_addr lladdr; + struct net_in6_addr lladdr; test_ctx.iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); @@ -330,7 +330,7 @@ static void verify_dhcpv6_elapsed_time(struct net_if *iface, struct net_pkt *pkt } static void verify_dhcpv6_ia_na(struct net_if *iface, struct net_pkt *pkt, - struct in6_addr *addr) + struct net_in6_addr *addr) { struct dhcpv6_ia_na ia_na; int ret; @@ -358,7 +358,7 @@ static void verify_dhcpv6_ia_na(struct net_if *iface, struct net_pkt *pkt, } static void verify_dhcpv6_ia_pd(struct net_if *iface, struct net_pkt *pkt, - struct in6_addr *prefix, uint8_t prefix_len) + struct net_in6_addr *prefix, uint8_t prefix_len) { struct dhcpv6_ia_pd ia_pd; int ret; diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c index b5c0664d2ef72..a745c30dc9042 100644 --- a/tests/net/hostname/src/main.c +++ b/tests/net/hostname/src/main.c @@ -37,16 +37,16 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); #endif /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in_addr my_ipv4_addr1 = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr my_ipv4_addr1 = { { { 192, 0, 2, 1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -static struct in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; static struct net_if *iface1; diff --git a/tests/net/icmp/src/main.c b/tests/net/icmp/src/main.c index 7f7990e36514e..29bff78d95afe 100644 --- a/tests/net/icmp/src/main.c +++ b/tests/net/icmp/src/main.c @@ -51,12 +51,12 @@ LOG_MODULE_REGISTER(net_test, ICMP_LOG_LEVEL); #define SEM_WAIT_TIME K_SECONDS(1) #define TEST_DATA "dummy test data" -static struct in6_addr send_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr send_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr recv_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr recv_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; -static struct in_addr send_addr_4 = { { { 192, 0, 2, 1 } } }; -static struct in_addr recv_addr_4 = { { { 192, 0, 2, 2 } } }; +static struct net_in_addr send_addr_4 = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr recv_addr_4 = { { { 192, 0, 2, 2 } } }; static struct net_if *sender, *receiver; @@ -72,12 +72,12 @@ static struct test_icmp_context { static struct test_icmp_context offload_ctx; static struct net_if *offload_sender; -static struct in6_addr offload_send_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr offload_send_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3 } } }; -static struct in6_addr offload_recv_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr offload_recv_addr_6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x4 } } }; -static struct in_addr offload_send_addr_4 = { { { 192, 0, 2, 3 } } }; -static struct in_addr offload_recv_addr_4 = { { { 192, 0, 2, 4 } } }; +static struct net_in_addr offload_send_addr_4 = { { { 192, 0, 2, 3 } } }; +static struct net_in_addr offload_recv_addr_4 = { { { 192, 0, 2, 4 } } }; #endif static void test_iface_init(struct net_if *iface) @@ -148,10 +148,10 @@ NET_DEVICE_INIT(test_receiver_icmp, "test_receiver_icmp", NULL, NULL, &recv_ctx, DUMMY_L2, NET_L2_GET_CTX_TYPE(DUMMY_L2), NET_IPV6_MTU); #if defined(CONFIG_NET_OFFLOADING_SUPPORT) -static int offload_dummy_get(sa_family_t family, - enum net_sock_type type, - enum net_ip_protocol ip_proto, - struct net_context **context) +static int offload_dummy_get(net_sa_family_t family, + enum net_sock_type type, + enum net_ip_protocol ip_proto, + struct net_context **context) { return -1; } @@ -173,7 +173,7 @@ static struct net_icmp_offload offload_data; #if defined(CONFIG_NET_IPV4) static int get_ipv4_reply(struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, struct net_pkt **reply_pkt, struct net_ipv4_hdr **hdr_ipv4, @@ -181,9 +181,9 @@ static int get_ipv4_reply(struct net_if *iface, { struct net_ipv4_hdr *ipv4_hdr = NULL; struct net_icmp_hdr *icmp_hdr; - const struct in_addr *dest4; + const struct net_in_addr *dest4; struct net_pkt *reply; - struct in_addr *src4; + struct net_in_addr *src4; int ret; /* The code below should not be used in real life scenarios @@ -194,7 +194,7 @@ static int get_ipv4_reply(struct net_if *iface, reply = net_pkt_alloc_with_buffer(iface, sizeof(struct net_ipv4_hdr) + sizeof(struct net_icmp_hdr) + params->data_size, - AF_INET, IPPROTO_ICMP, + NET_AF_INET, NET_IPPROTO_ICMP, PKT_WAIT_TIME); if (!reply) { NET_DBG("No buffer"); @@ -232,7 +232,7 @@ static int get_ipv4_reply(struct net_if *iface, } net_pkt_cursor_init(reply); - net_ipv4_finalize(reply, IPPROTO_ICMP); + net_ipv4_finalize(reply, NET_IPPROTO_ICMP); *reply_pkt = reply; @@ -240,7 +240,7 @@ static int get_ipv4_reply(struct net_if *iface, } #else static int get_ipv4_reply(struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, struct net_pkt **reply_pkt, struct net_ipv4_hdr **hdr_ipv4, @@ -252,7 +252,7 @@ static int get_ipv4_reply(struct net_if *iface, #if defined(CONFIG_NET_IPV6) static int get_ipv6_reply(struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, struct net_pkt **reply_pkt, struct net_ipv6_hdr **hdr_ipv6, @@ -260,15 +260,15 @@ static int get_ipv6_reply(struct net_if *iface, { struct net_ipv6_hdr *ipv6_hdr = NULL; struct net_icmp_hdr *icmp_hdr; - const struct in6_addr *dest6; + const struct net_in6_addr *dest6; struct net_pkt *reply; - struct in6_addr *src6; + struct net_in6_addr *src6; int ret; reply = net_pkt_alloc_with_buffer(iface, sizeof(struct net_ipv6_hdr) + sizeof(struct net_icmp_hdr) + params->data_size, - AF_INET6, IPPROTO_ICMP, + NET_AF_INET6, NET_IPPROTO_ICMP, PKT_WAIT_TIME); if (!reply) { NET_DBG("No buffer"); @@ -303,7 +303,7 @@ static int get_ipv6_reply(struct net_if *iface, } net_pkt_cursor_init(reply); - net_ipv6_finalize(reply, IPPROTO_ICMP); + net_ipv6_finalize(reply, NET_IPPROTO_ICMP); *reply_pkt = reply; @@ -311,7 +311,7 @@ static int get_ipv6_reply(struct net_if *iface, } #else static int get_ipv6_reply(struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, struct net_pkt **reply_pkt, struct net_ipv6_hdr **hdr_ipv6, @@ -323,7 +323,7 @@ static int get_ipv6_reply(struct net_if *iface, static int offload_ping_handler(struct net_icmp_ctx *ctx, struct net_if *iface, - struct sockaddr *dst, + struct net_sockaddr *dst, struct net_icmp_ping_params *params, void *user_data) { @@ -349,7 +349,7 @@ static int offload_ping_handler(struct net_icmp_ctx *ctx, * Here we just simulate a reply as there is no need to actually * send anything anywhere. */ - if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == AF_INET) { + if (IS_ENABLED(CONFIG_NET_IPV4) && dst->sa_family == NET_AF_INET) { ret = get_ipv4_reply(iface, dst, params, &reply, &ipv4_hdr, &icmp_hdr); if (ret < 0) { @@ -357,11 +357,11 @@ static int offload_ping_handler(struct net_icmp_ctx *ctx, return ret; } - ip_hdr.family = AF_INET; + ip_hdr.family = NET_AF_INET; ip_hdr.ipv4 = ipv4_hdr; } - if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == AF_INET6) { + if (IS_ENABLED(CONFIG_NET_IPV6) && dst->sa_family == NET_AF_INET6) { ret = get_ipv6_reply(iface, dst, params, &reply, &ipv6_hdr, &icmp_hdr); if (ret < 0) { @@ -369,7 +369,7 @@ static int offload_ping_handler(struct net_icmp_ctx *ctx, return ret; } - ip_hdr.family = AF_INET6; + ip_hdr.family = NET_AF_INET6; ip_hdr.ipv6 = ipv6_hdr; } @@ -431,14 +431,14 @@ static int icmp_handler(struct net_icmp_ctx *ctx, { struct test_icmp_context *test = user_data; - if (hdr->family == AF_INET) { + if (hdr->family == NET_AF_INET) { struct net_ipv4_hdr *ip_hdr = hdr->ipv4; NET_DBG("Received Echo reply from %s to %s", net_sprint_ipv4_addr(&ip_hdr->src), net_sprint_ipv4_addr(&ip_hdr->dst)); - } else if (hdr->family == AF_INET6) { + } else if (hdr->family == NET_AF_INET6) { struct net_ipv6_hdr *ip_hdr = hdr->ipv6; NET_DBG("Received Echo Reply from %s to %s", @@ -456,7 +456,7 @@ static int icmp_handler(struct net_icmp_ctx *ctx, ZTEST(icmp_tests, test_icmpv6_echo_request) { - struct sockaddr_in6 dst6 = { 0 }; + struct net_sockaddr_in6 dst6 = { 0 }; struct net_icmp_ping_params params; struct net_icmp_ctx ctx; int ret; @@ -465,10 +465,10 @@ ZTEST(icmp_tests, test_icmpv6_echo_request) return; } - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, icmp_handler); + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, icmp_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); - dst6.sin6_family = AF_INET6; + dst6.sin6_family = NET_AF_INET6; #if defined(CONFIG_NET_IPV6) memcpy(&dst6.sin6_addr, &recv_addr_6, sizeof(recv_addr_6)); @@ -482,7 +482,7 @@ ZTEST(icmp_tests, test_icmpv6_echo_request) params.data_size = sizeof(send_ctx.test_data); ret = net_icmp_send_echo_request(&ctx, sender, - (struct sockaddr *)&dst6, + (struct net_sockaddr *)&dst6, ¶ms, &send_ctx); zassert_equal(ret, 0, "Cannot send ICMP Echo-Request (%d)", ret); @@ -499,7 +499,7 @@ ZTEST(icmp_tests, test_icmpv6_echo_request) ZTEST(icmp_tests, test_icmpv4_echo_request) { - struct sockaddr_in dst4 = { 0 }; + struct net_sockaddr_in dst4 = { 0 }; struct net_icmp_ping_params params; struct net_icmp_ctx ctx; int ret; @@ -508,10 +508,10 @@ ZTEST(icmp_tests, test_icmpv4_echo_request) return; } - ret = net_icmp_init_ctx(&ctx, AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_handler); + ret = net_icmp_init_ctx(&ctx, NET_AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); - dst4.sin_family = AF_INET; + dst4.sin_family = NET_AF_INET; #if defined(CONFIG_NET_IPV4) memcpy(&dst4.sin_addr, &recv_addr_4, sizeof(recv_addr_4)); @@ -525,7 +525,7 @@ ZTEST(icmp_tests, test_icmpv4_echo_request) params.data_size = sizeof(send_ctx.test_data); ret = net_icmp_send_echo_request(&ctx, sender, - (struct sockaddr *)&dst4, + (struct net_sockaddr *)&dst4, ¶ms, &send_ctx); zassert_equal(ret, 0, "Cannot send ICMP Echo-Request (%d)", ret); @@ -544,15 +544,15 @@ ZTEST(icmp_tests, test_icmpv4_echo_request) #if defined(CONFIG_NET_IPV4) ZTEST(icmp_tests, test_offload_icmpv4_echo_request) { - struct sockaddr_in dst4 = { 0 }; + struct net_sockaddr_in dst4 = { 0 }; struct net_icmp_ping_params params; struct net_icmp_ctx ctx; int ret; - ret = net_icmp_init_ctx(&ctx, AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_handler); + ret = net_icmp_init_ctx(&ctx, NET_AF_INET, NET_ICMPV4_ECHO_REPLY, 0, icmp_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); - dst4.sin_family = AF_INET; + dst4.sin_family = NET_AF_INET; memcpy(&dst4.sin_addr, &offload_recv_addr_4, sizeof(offload_recv_addr_4)); @@ -564,7 +564,7 @@ ZTEST(icmp_tests, test_offload_icmpv4_echo_request) params.data_size = sizeof(offload_ctx.test_data); ret = net_icmp_send_echo_request(&ctx, offload_sender, - (struct sockaddr *)&dst4, + (struct net_sockaddr *)&dst4, ¶ms, &offload_ctx); zassert_equal(ret, 0, "Cannot send ICMP Echo-Request (%d)", ret); @@ -583,15 +583,15 @@ ZTEST(icmp_tests, test_offload_icmpv4_echo_request) #if defined(CONFIG_NET_IPV6) ZTEST(icmp_tests, test_offload_icmpv6_echo_request) { - struct sockaddr_in6 dst6 = { 0 }; + struct net_sockaddr_in6 dst6 = { 0 }; struct net_icmp_ping_params params; struct net_icmp_ctx ctx; int ret; - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, icmp_handler); + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, icmp_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); - dst6.sin6_family = AF_INET6; + dst6.sin6_family = NET_AF_INET6; memcpy(&dst6.sin6_addr, &offload_recv_addr_6, sizeof(offload_recv_addr_6)); @@ -603,7 +603,7 @@ ZTEST(icmp_tests, test_offload_icmpv6_echo_request) params.data_size = sizeof(offload_ctx.test_data); ret = net_icmp_send_echo_request(&ctx, offload_sender, - (struct sockaddr *)&dst6, + (struct net_sockaddr *)&dst6, ¶ms, &offload_ctx); zassert_equal(ret, 0, "Cannot send ICMP Echo-Request (%d)", ret); @@ -637,8 +637,8 @@ static int icmp_request_handler(struct net_icmp_ctx *ctx, ZTEST(icmp_tests, test_malformed_icmpv6_echo_request_on_ipv4) { - struct in_addr dst4 = { 0 }; - const struct in_addr *src4; + struct net_in_addr dst4 = { 0 }; + const struct net_in_addr *src4; struct net_icmp_ctx ctx; struct net_if *iface; struct net_pkt *pkt; @@ -646,7 +646,7 @@ ZTEST(icmp_tests, test_malformed_icmpv6_echo_request_on_ipv4) k_sem_reset(&test_req_sem); - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_ECHO_REQUEST, 0, + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_ECHO_REQUEST, 0, icmp_request_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); @@ -657,7 +657,7 @@ ZTEST(icmp_tests, test_malformed_icmpv6_echo_request_on_ipv4) zassert_not_null(iface, "NULL iface"); pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_icmpv4_echo_req), - AF_INET, IPPROTO_ICMP, K_MSEC(100)); + NET_AF_INET, NET_IPPROTO_ICMP, K_MSEC(100)); zassert_not_null(pkt, "NULL pkt"); if (net_ipv4_create(pkt, src4, &dst4) != 0 || @@ -667,7 +667,7 @@ ZTEST(icmp_tests, test_malformed_icmpv6_echo_request_on_ipv4) } net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_ICMP); + net_ipv4_finalize(pkt, NET_IPPROTO_ICMP); if (net_try_send_data(pkt, K_NO_WAIT) != 0) { net_pkt_unref(pkt); @@ -686,8 +686,8 @@ ZTEST(icmp_tests, test_malformed_icmpv6_echo_request_on_ipv4) ZTEST(icmp_tests, test_malformed_icmpv4_echo_request_on_ipv6) { - struct in6_addr dst6 = { 0 }; - const struct in6_addr *src6; + struct net_in6_addr dst6 = { 0 }; + const struct net_in6_addr *src6; struct net_icmp_ctx ctx; struct net_if *iface; struct net_pkt *pkt; @@ -695,7 +695,7 @@ ZTEST(icmp_tests, test_malformed_icmpv4_echo_request_on_ipv6) k_sem_reset(&test_req_sem); - ret = net_icmp_init_ctx(&ctx, AF_INET, NET_ICMPV4_ECHO_REQUEST, 0, + ret = net_icmp_init_ctx(&ctx, NET_AF_INET, NET_ICMPV4_ECHO_REQUEST, 0, icmp_request_handler); zassert_equal(ret, 0, "Cannot init ICMP (%d)", ret); @@ -706,7 +706,7 @@ ZTEST(icmp_tests, test_malformed_icmpv4_echo_request_on_ipv6) zassert_not_null(iface, "NULL iface"); pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_icmpv6_echo_req), - AF_INET6, IPPROTO_ICMPV6, K_MSEC(100)); + NET_AF_INET6, NET_IPPROTO_ICMPV6, K_MSEC(100)); zassert_not_null(pkt, "NULL pkt"); if (net_ipv6_create(pkt, src6, &dst6) != 0 || @@ -716,7 +716,7 @@ ZTEST(icmp_tests, test_malformed_icmpv4_echo_request_on_ipv6) } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); if (net_try_send_data(pkt, K_NO_WAIT) != 0) { net_pkt_unref(pkt); diff --git a/tests/net/icmpv4/src/main.c b/tests/net/icmpv4/src/main.c index 8e345cec5f1c6..ece264a832458 100644 --- a/tests/net/icmpv4/src/main.c +++ b/tests/net/icmpv4/src/main.c @@ -113,7 +113,7 @@ static const unsigned char icmpv4_echo_req_opt_bad[] = { #define TEST_ICMPV4_ECHO_REQ_OPTS 2 static uint8_t current = TEST_ICMPV4_UNKNOWN; -static struct in_addr my_addr = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr my_addr = { { { 192, 0, 2, 1 } } }; static struct net_if *net_iface; static int handle_reply_msg(struct net_icmp_ctx *ctx, @@ -318,7 +318,7 @@ static struct net_pkt *prepare_echo_request(struct net_if *iface) struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(iface, sizeof(icmpv4_echo_req), - AF_INET, IPPROTO_ICMP, K_FOREVER); + NET_AF_INET, NET_IPPROTO_ICMP, K_FOREVER); if (!pkt) { return NULL; } @@ -343,7 +343,7 @@ static struct net_pkt *prepare_echo_reply(struct net_if *iface) struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(iface, sizeof(icmpv4_echo_rep), - AF_INET, IPPROTO_ICMP, K_FOREVER); + NET_AF_INET, NET_IPPROTO_ICMP, K_FOREVER); if (!pkt) { return NULL; } @@ -368,7 +368,7 @@ static struct net_pkt *prepare_echo_request_with_options(struct net_if *iface) struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(iface, sizeof(icmpv4_echo_req_opt), - AF_INET, IPPROTO_ICMP, K_FOREVER); + NET_AF_INET, NET_IPPROTO_ICMP, K_FOREVER); if (!pkt) { return NULL; } @@ -395,7 +395,7 @@ static struct net_pkt *prepare_echo_request_with_bad_options( struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(iface, sizeof(icmpv4_echo_req_opt_bad), - AF_INET, IPPROTO_ICMP, K_FOREVER); + NET_AF_INET, NET_IPPROTO_ICMP, K_FOREVER); if (!pkt) { return NULL; } @@ -464,7 +464,7 @@ static void icmpv4_send_echo_rep(void) struct net_pkt *pkt; int ret; - ret = net_icmp_init_ctx(&ctx, AF_INET, NET_ICMPV4_ECHO_REPLY, + ret = net_icmp_init_ctx(&ctx, NET_AF_INET, NET_ICMPV4_ECHO_REPLY, 0, handle_reply_msg); zassert_equal(ret, 0, "Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV4_ECHO_REPLY), ret); diff --git a/tests/net/icmpv6/src/main.c b/tests/net/icmpv6/src/main.c index 11a7a7e2437a4..4fad0a5b95747 100644 --- a/tests/net/icmpv6/src/main.c +++ b/tests/net/icmpv6/src/main.c @@ -155,11 +155,11 @@ static struct net_pkt *create_pkt(uint8_t *data, int len, struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(NULL, ICMPV6_MSG_SIZE, - AF_UNSPEC, 0, K_SECONDS(1)); + NET_AF_UNSPEC, 0, K_SECONDS(1)); zassert_not_null(pkt, "Allocation failed"); net_pkt_set_iface(pkt, test_iface); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_write(pkt, data, len); @@ -182,12 +182,12 @@ ZTEST(icmpv6_fn, test_icmpv6) struct net_pkt *pkt; int ret; - ret = net_icmp_init_ctx(&ctx1, AF_INET6, NET_ICMPV6_ECHO_REPLY, + ret = net_icmp_init_ctx(&ctx1, NET_AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, handle_test_msg); zassert_equal(ret, 0, "Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_ECHO_REPLY), ret); - ret = net_icmp_init_ctx(&ctx2, AF_INET6, NET_ICMPV6_ECHO_REQUEST, + ret = net_icmp_init_ctx(&ctx2, NET_AF_INET6, NET_ICMPV6_ECHO_REQUEST, 0, handle_test_msg); zassert_equal(ret, 0, "Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_ECHO_REQUEST), ret); diff --git a/tests/net/ieee802154/6lo_fragment/src/main.c b/tests/net/ieee802154/6lo_fragment/src/main.c index 83ba534f4cd55..570e2b861e989 100644 --- a/tests/net/ieee802154/6lo_fragment/src/main.c +++ b/tests/net/ieee802154/6lo_fragment/src/main.c @@ -265,8 +265,8 @@ static struct net_pkt *create_pkt(struct net_fragment_data *data) buf->data[44] = len >> 8; buf->data[45] = (uint8_t) len; - data->ipv6.len = htons(len); - data->udp.len = htons(len); + data->ipv6.len = net_htons(len); + data->udp.len = net_htons(len); while (remaining > 0) { uint8_t copy; @@ -307,12 +307,12 @@ static struct net_fragment_data test_data_1 = { .ipv6.tcflow = 0x00, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam00, .ipv6.dst = dst_dam00, - .udp.src_port = htons(udp_src_port_4bit), - .udp.dst_port = htons(udp_dst_port_4bit), + .udp.src_port = net_htons(udp_src_port_4bit), + .udp.dst_port = net_htons(udp_dst_port_4bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 70, @@ -324,12 +324,12 @@ static struct net_fragment_data test_data_2 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam01, .ipv6.dst = dst_dam01, - .udp.src_port = htons(udp_src_port_8bit_y), - .udp.dst_port = htons(udp_dst_port_8bit), + .udp.src_port = net_htons(udp_src_port_8bit_y), + .udp.dst_port = net_htons(udp_dst_port_8bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 200, @@ -341,12 +341,12 @@ static struct net_fragment_data test_data_3 = { .ipv6.tcflow = 0x21, .ipv6.flow = 0x3412, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam10, .ipv6.dst = dst_dam10, - .udp.src_port = htons(udp_src_port_8bit), - .udp.dst_port = htons(udp_dst_port_8bit_y), + .udp.src_port = net_htons(udp_src_port_8bit), + .udp.dst_port = net_htons(udp_dst_port_8bit_y), .udp.len = 0x00, .udp.chksum = 0x00, .len = 300, @@ -358,12 +358,12 @@ static struct net_fragment_data test_data_4 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam00, .ipv6.dst = dst_m1_dam00, - .udp.src_port = htons(udp_src_port_16bit), - .udp.dst_port = htons(udp_dst_port_16bit), + .udp.src_port = net_htons(udp_src_port_16bit), + .udp.dst_port = net_htons(udp_dst_port_16bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 400, @@ -375,12 +375,12 @@ static struct net_fragment_data test_data_5 = { .ipv6.tcflow = 0x23, .ipv6.flow = 0x4567, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam01, .ipv6.dst = dst_m1_dam01, - .udp.src_port = htons(udp_src_port_16bit), - .udp.dst_port = htons(udp_dst_port_16bit), + .udp.src_port = net_htons(udp_src_port_16bit), + .udp.dst_port = net_htons(udp_dst_port_16bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 500, @@ -392,12 +392,12 @@ static struct net_fragment_data test_data_6 = { .ipv6.tcflow = 0x0, .ipv6.flow = 0x0, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam10, .ipv6.dst = dst_m1_dam10, - .udp.src_port = htons(udp_src_port_8bit), - .udp.dst_port = htons(udp_dst_port_8bit), + .udp.src_port = net_htons(udp_src_port_8bit), + .udp.dst_port = net_htons(udp_dst_port_8bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 1200, @@ -409,12 +409,12 @@ static struct net_fragment_data test_data_7 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam00, .ipv6.dst = dst_m1_dam00, - .udp.src_port = htons(udp_src_port_16bit), - .udp.dst_port = htons(udp_dst_port_16bit), + .udp.src_port = net_htons(udp_src_port_16bit), + .udp.dst_port = net_htons(udp_dst_port_16bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 70, @@ -426,12 +426,12 @@ static struct net_fragment_data test_data_8 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sac1_sam00, .ipv6.dst = dst_m1_dam00, - .udp.src_port = htons(udp_src_port_16bit), - .udp.dst_port = htons(udp_dst_port_16bit), + .udp.src_port = net_htons(udp_src_port_16bit), + .udp.dst_port = net_htons(udp_dst_port_16bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 1200, @@ -444,12 +444,12 @@ static struct net_fragment_data test_data_9 = { .ipv6.tcflow = 0x20, .ipv6.flow = 0x00, .ipv6.len = 0, - .ipv6.nexthdr = IPPROTO_UDP, + .ipv6.nexthdr = NET_IPPROTO_UDP, .ipv6.hop_limit = 0xff, .ipv6.src = src_sam00, .ipv6.dst = dst_m1_dam01, - .udp.src_port = htons(udp_src_port_16bit), - .udp.dst_port = htons(udp_dst_port_16bit), + .udp.src_port = net_htons(udp_src_port_16bit), + .udp.dst_port = net_htons(udp_dst_port_16bit), .udp.len = 0x00, .udp.chksum = 0x00, .len = 90, diff --git a/tests/net/ieee802154/custom_l2/src/main.c b/tests/net/ieee802154/custom_l2/src/main.c index 2cecdffac167a..fc72e6e6b1641 100644 --- a/tests/net/ieee802154/custom_l2/src/main.c +++ b/tests/net/ieee802154/custom_l2/src/main.c @@ -79,7 +79,7 @@ ZTEST(ieee802154_custom_l2, test_send) zassert_not_null(net_if_l2(iface)->send, "No send() found"); tx_pkt = net_pkt_alloc_with_buffer(iface, sizeof(TEST_PAYLOAD), - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(tx_pkt, "Failed to allocate packet"); ret = net_pkt_write(tx_pkt, TEST_PAYLOAD, sizeof(TEST_PAYLOAD)); @@ -103,7 +103,7 @@ ZTEST(ieee802154_custom_l2, test_recv) zassert_not_null(net_if_l2(iface)->recv, "No recv () found"); rx_pkt = net_pkt_rx_alloc_with_buffer(iface, sizeof(TEST_PAYLOAD), - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(rx_pkt, "Failed to allocate packet"); ret = net_pkt_write(rx_pkt, TEST_PAYLOAD, sizeof(TEST_PAYLOAD)); diff --git a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c index a9d36e0a3900e..267359ac35c5f 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c +++ b/tests/net/ieee802154/l2/src/ieee802154_fake_driver.c @@ -83,8 +83,8 @@ static int fake_tx(const struct device *dev, struct net_pkt *ack_pkt; - ack_pkt = net_pkt_rx_alloc_with_buffer(iface, IEEE802154_ACK_PKT_LENGTH, AF_UNSPEC, - 0, K_FOREVER); + ack_pkt = net_pkt_rx_alloc_with_buffer(iface, IEEE802154_ACK_PKT_LENGTH, + NET_AF_UNSPEC, 0, K_FOREVER); if (!ack_pkt) { NET_ERR("*** Could not allocate ack pkt."); return -ENOMEM; diff --git a/tests/net/ieee802154/l2/src/ieee802154_shell_test.c b/tests/net/ieee802154/l2/src/ieee802154_shell_test.c index 5964025e02319..034f89be0a954 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_shell_test.c +++ b/tests/net/ieee802154/l2/src/ieee802154_shell_test.c @@ -209,7 +209,7 @@ static int create_and_receive_packet(uint8_t *beacon_pkt, size_t length) { struct net_pkt *pkt; - pkt = net_pkt_rx_alloc_with_buffer(net_iface, length, AF_UNSPEC, 0, K_FOREVER); + pkt = net_pkt_rx_alloc_with_buffer(net_iface, length, NET_AF_UNSPEC, 0, K_FOREVER); if (!pkt) { NET_ERR("*** No buffer to allocate"); return -1; diff --git a/tests/net/ieee802154/l2/src/ieee802154_test.c b/tests/net/ieee802154/l2/src/ieee802154_test.c index f1c16fbb14f2d..073c1d6fe6705 100644 --- a/tests/net/ieee802154/l2/src/ieee802154_test.c +++ b/tests/net/ieee802154/l2/src/ieee802154_test.c @@ -28,8 +28,8 @@ LOG_MODULE_REGISTER(net_ieee802154_test, LOG_LEVEL_DBG); struct ieee802154_pkt_test { char *name; - struct in6_addr src; - struct in6_addr dst; + struct net_in6_addr src; + struct net_in6_addr dst; uint8_t *pkt; uint8_t sequence; uint8_t length; @@ -317,7 +317,7 @@ static struct net_pkt *get_data_pkt_with_ar(void) }; struct net_pkt *pkt; - pkt = net_pkt_rx_alloc_with_buffer(net_iface, sizeof(data_pkt_with_ar), AF_UNSPEC, 0, + pkt = net_pkt_rx_alloc_with_buffer(net_iface, sizeof(data_pkt_with_ar), NET_AF_UNSPEC, 0, K_FOREVER); if (!pkt) { NET_ERR("*** No buffer to allocate"); @@ -394,10 +394,10 @@ static bool tear_down_security(void) static int set_up_recv_socket(enum net_sock_type socket_type) { - struct sockaddr_ll socket_sll = { + struct net_sockaddr_ll socket_sll = { .sll_ifindex = net_if_get_by_iface(net_iface), - .sll_family = AF_PACKET, - .sll_protocol = htons(ETH_P_IEEE802154), + .sll_family = NET_AF_PACKET, + .sll_protocol = net_htons(ETH_P_IEEE802154), }; struct timeval timeo_optval = { .tv_sec = 1, @@ -405,18 +405,20 @@ static int set_up_recv_socket(enum net_sock_type socket_type) }; int fd; - fd = zsock_socket(AF_PACKET, socket_type, htons(ETH_P_IEEE802154)); + fd = zsock_socket(NET_AF_PACKET, socket_type, net_htons(ETH_P_IEEE802154)); if (fd < 0) { NET_ERR("*** Failed to create recv socket : %d", errno); return fd; } - if (zsock_bind(fd, (const struct sockaddr *)&socket_sll, sizeof(struct sockaddr_ll))) { + if (zsock_bind(fd, (const struct net_sockaddr *)&socket_sll, + sizeof(struct net_sockaddr_ll))) { NET_ERR("*** Failed to bind packet socket : %d", errno); goto release_fd; } - if (zsock_setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeo_optval, sizeof(timeo_optval))) { + if (zsock_setsockopt(fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &timeo_optval, + sizeof(timeo_optval))) { NET_ERR("*** Failed to set reception timeout on packet socket : %d", errno); goto release_fd; } @@ -547,7 +549,7 @@ static bool test_wait_for_ack(struct ieee802154_pkt_test *t) } one_ack_pkt = net_pkt_rx_alloc_with_buffer(net_iface, IEEE802154_ACK_PKT_LENGTH, - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); if (!one_ack_pkt) { NET_ERR("*** Could not allocate ack pkt."); goto release_tx_pkt; @@ -587,7 +589,7 @@ static bool test_packet_cloning_with_cb(void) NET_INFO("- Cloning packet"); - pkt = net_pkt_rx_alloc_with_buffer(net_iface, 64, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(net_iface, 64, NET_AF_UNSPEC, 0, K_NO_WAIT); if (!pkt) { NET_ERR("*** No buffer to allocate"); return false; @@ -680,12 +682,12 @@ static bool test_dgram_packet_sending(void *dst_sll, uint8_t dst_sll_halen, uint { /* tests should be run sequentially, so no need for context locking */ struct ieee802154_context *ctx = net_if_l2_data(net_iface); - struct sockaddr_ll socket_sll = {.sll_ifindex = net_if_get_by_iface(net_iface), - .sll_family = AF_PACKET, - .sll_protocol = htons(ETH_P_IEEE802154)}; - struct sockaddr_ll pkt_dst_sll = { + struct net_sockaddr_ll socket_sll = {.sll_ifindex = net_if_get_by_iface(net_iface), + .sll_family = NET_AF_PACKET, + .sll_protocol = net_htons(ETH_P_IEEE802154)}; + struct net_sockaddr_ll pkt_dst_sll = { .sll_halen = dst_sll_halen, - .sll_protocol = htons(ETH_P_IEEE802154), + .sll_protocol = net_htons(ETH_P_IEEE802154), }; uint8_t payload[] = {0x01, 0x02, 0x03, 0x04}; struct ieee802154_mpdu mpdu; @@ -696,8 +698,8 @@ static bool test_dgram_packet_sending(void *dst_sll, uint8_t dst_sll_halen, uint goto out; } - NET_INFO("- Sending DGRAM packet via AF_PACKET socket"); - fd = zsock_socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_IEEE802154)); + NET_INFO("- Sending DGRAM packet via NET_AF_PACKET socket"); + fd = zsock_socket(NET_AF_PACKET, NET_SOCK_DGRAM, net_htons(ETH_P_IEEE802154)); if (fd < 0) { NET_ERR("*** Failed to create DGRAM socket : %d", errno); goto reset_security; @@ -715,13 +717,15 @@ static bool test_dgram_packet_sending(void *dst_sll, uint8_t dst_sll_halen, uint goto release_fd; } - if (zsock_bind(fd, (const struct sockaddr *)&socket_sll, sizeof(struct sockaddr_ll))) { + if (zsock_bind(fd, (const struct net_sockaddr *)&socket_sll, + sizeof(struct net_sockaddr_ll))) { NET_ERR("*** Failed to bind packet socket : %d", errno); goto release_fd; } - if (zsock_sendto(fd, payload, sizeof(payload), 0, (const struct sockaddr *)&pkt_dst_sll, - sizeof(struct sockaddr_ll)) != sizeof(payload)) { + if (zsock_sendto(fd, payload, sizeof(payload), 0, + (const struct net_sockaddr *)&pkt_dst_sll, + sizeof(struct net_sockaddr_ll)) != sizeof(payload)) { NET_ERR("*** Failed to send, errno %d", errno); goto release_fd; } @@ -778,9 +782,9 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l uint8_t payload[] = {0x01, 0x02, 0x03, 0x04}; uint16_t our_short_addr = ctx->short_addr; /* CPU byte order */ uint8_t ll_hdr_len = 0, authtag_len = 0; - struct sockaddr_ll recv_src_sll = {0}; + struct net_sockaddr_ll recv_src_sll = {0}; uint8_t received_payload[4] = {0}; - socklen_t recv_src_sll_len; + net_socklen_t recv_src_sll_len; struct net_buf *frame_buf; struct net_pkt *pkt; bool frame_result; @@ -796,9 +800,9 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l goto out; } - NET_INFO("- Receiving DGRAM packet via AF_PACKET socket"); + NET_INFO("- Receiving DGRAM packet via NET_AF_PACKET socket"); - fd = set_up_recv_socket(SOCK_DGRAM); + fd = set_up_recv_socket(NET_SOCK_DGRAM); if (fd < 0) { goto reset_security; } @@ -846,7 +850,7 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l * we can use ieee802154_create_data_frame(). */ if (src_ll_addr_len == IEEE802154_SHORT_ADDR_LENGTH) { - ctx->short_addr = ntohs(*(uint16_t *)src_ll_addr); + ctx->short_addr = net_ntohs(*(uint16_t *)src_ll_addr); } else if (src_ll_addr_len == IEEE802154_EXT_ADDR_LENGTH) { sys_memcpy_swap(ctx->ext_addr, src_ll_addr, sizeof(ctx->ext_addr)); } else { @@ -885,7 +889,7 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l recv_src_sll_len = sizeof(recv_src_sll); received_len = zsock_recvfrom(fd, received_payload, sizeof(received_payload), 0, - (struct sockaddr *)&recv_src_sll, &recv_src_sll_len); + (struct net_sockaddr *)&recv_src_sll, &recv_src_sll_len); if (received_len < 0) { NET_ERR("*** Failed to receive packet, errno %d", errno); goto release_pkt; @@ -898,9 +902,9 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l goto release_pkt; } - if (recv_src_sll_len != sizeof(struct sockaddr_ll) || - recv_src_sll.sll_family != AF_PACKET || - recv_src_sll.sll_protocol != htons(ETH_P_IEEE802154) || + if (recv_src_sll_len != sizeof(struct net_sockaddr_ll) || + recv_src_sll.sll_family != NET_AF_PACKET || + recv_src_sll.sll_protocol != net_htons(ETH_P_IEEE802154) || recv_src_sll.sll_ifindex != net_if_get_by_iface(net_iface) || recv_src_sll.sll_halen != src_ll_addr_len || memcmp(recv_src_sll.sll_addr, src_ll_addr, src_ll_addr_len)) { @@ -923,26 +927,27 @@ static bool test_dgram_packet_reception(void *src_ll_addr, uint8_t src_ll_addr_l static bool test_raw_packet_sending(void) { /* tests should be run sequentially, so no need for context locking */ - struct sockaddr_ll socket_sll = {0}; + struct net_sockaddr_ll socket_sll = {0}; struct ieee802154_mpdu mpdu; - struct msghdr msg = {0}; - struct iovec io_vector; + struct net_msghdr msg = {0}; + struct net_iovec io_vector; bool result = false; int fd; - NET_INFO("- Sending RAW packet via AF_PACKET socket"); + NET_INFO("- Sending RAW packet via NET_AF_PACKET socket"); - fd = zsock_socket(AF_PACKET, SOCK_RAW, htons(ETH_P_IEEE802154)); + fd = zsock_socket(NET_AF_PACKET, NET_SOCK_RAW, net_htons(ETH_P_IEEE802154)); if (fd < 0) { NET_ERR("*** Failed to create RAW socket : %d", errno); goto out; } socket_sll.sll_ifindex = net_if_get_by_iface(net_iface); - socket_sll.sll_family = AF_PACKET; - socket_sll.sll_protocol = htons(ETH_P_IEEE802154); + socket_sll.sll_family = NET_AF_PACKET; + socket_sll.sll_protocol = net_htons(NET_ETH_PTYPE_IEEE802154); - if (zsock_bind(fd, (const struct sockaddr *)&socket_sll, sizeof(struct sockaddr_ll))) { + if (zsock_bind(fd, (const struct net_sockaddr *)&socket_sll, + sizeof(struct net_sockaddr_ll))) { NET_ERR("*** Failed to bind packet socket : %d", errno); goto release_fd; } @@ -1001,9 +1006,9 @@ static bool test_raw_packet_reception(void) result = false; - NET_INFO("- Receiving RAW packet via AF_PACKET socket"); + NET_INFO("- Receiving RAW packet via NET_AF_PACKET socket"); - fd = set_up_recv_socket(SOCK_RAW); + fd = set_up_recv_socket(NET_SOCK_RAW); if (fd < 0) { goto out; } @@ -1095,11 +1100,11 @@ static bool test_recv_and_send_ack_reply(struct ieee802154_pkt_test *t) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Padding */ }; struct ieee802154_context *ctx = net_if_l2_data(net_iface); - struct sockaddr_ll recv_src_sll = {0}; - struct sockaddr_ll socket_sll = { + struct net_sockaddr_ll recv_src_sll = {0}; + struct net_sockaddr_ll socket_sll = { .sll_ifindex = net_if_get_by_iface(net_iface), - .sll_family = AF_PACKET, - .sll_protocol = htons(ETH_P_IEEE802154), + .sll_family = NET_AF_PACKET, + .sll_protocol = net_htons(ETH_P_IEEE802154), }; uint8_t received_payload[80] = {0}; struct timeval timeo_optval = { @@ -1107,7 +1112,7 @@ static bool test_recv_and_send_ack_reply(struct ieee802154_pkt_test *t) .tv_usec = 0, }; struct ieee802154_mpdu mpdu; - socklen_t recv_src_sll_len; + net_socklen_t recv_src_sll_len; struct net_pkt *rx_pkt; bool result = false; uint8_t mac_be[8]; @@ -1116,18 +1121,20 @@ static bool test_recv_and_send_ack_reply(struct ieee802154_pkt_test *t) NET_INFO("- Sending ACK reply to a data packet"); - fd = zsock_socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_IEEE802154)); + fd = zsock_socket(NET_AF_PACKET, NET_SOCK_DGRAM, net_htons(ETH_P_IEEE802154)); if (fd < 0) { NET_ERR("*** Failed to create DGRAM socket : %d", errno); goto out; } - if (zsock_bind(fd, (const struct sockaddr *)&socket_sll, sizeof(struct sockaddr_ll))) { + if (zsock_bind(fd, (const struct net_sockaddr *)&socket_sll, + sizeof(struct net_sockaddr_ll))) { NET_ERR("*** Failed to bind packet socket : %d", errno); goto release_fd; } - if (zsock_setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeo_optval, sizeof(timeo_optval))) { + if (zsock_setsockopt(fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, + &timeo_optval, sizeof(timeo_optval))) { NET_ERR("*** Failed to set reception timeout on packet socket : %d", errno); goto release_fd; } @@ -1148,17 +1155,17 @@ static bool test_recv_and_send_ack_reply(struct ieee802154_pkt_test *t) recv_src_sll_len = sizeof(recv_src_sll); received_len = zsock_recvfrom(fd, received_payload, sizeof(received_payload), 0, - (struct sockaddr *)&recv_src_sll, &recv_src_sll_len); + (struct net_sockaddr *)&recv_src_sll, &recv_src_sll_len); if (received_len < 0) { NET_ERR("*** Failed to receive packet, errno %d", errno); goto release_rx_pkt; } sys_memcpy_swap(mac_be, ctx->ext_addr, IEEE802154_EXT_ADDR_LENGTH); - if (recv_src_sll_len != sizeof(struct sockaddr_ll) || + if (recv_src_sll_len != sizeof(struct net_sockaddr_ll) || recv_src_sll.sll_ifindex != net_if_get_by_iface(net_iface) || - recv_src_sll.sll_family != AF_PACKET || - recv_src_sll.sll_protocol != htons(ETH_P_IEEE802154) || + recv_src_sll.sll_family != NET_AF_PACKET || + recv_src_sll.sll_protocol != net_htons(ETH_P_IEEE802154) || recv_src_sll.sll_halen != IEEE802154_EXT_ADDR_LENGTH || memcmp(recv_src_sll.sll_addr, mac_be, IEEE802154_EXT_ADDR_LENGTH)) { NET_ERR("*** Received socket address does not compare (%d)", -errno); @@ -1374,7 +1381,7 @@ ZTEST(ieee802154_l2_sockets, test_receiving_pkt_and_replying_ack_pkt) ZTEST(ieee802154_l2_sockets, test_sending_broadcast_dgram_pkt) { - uint16_t dst_short_addr = htons(IEEE802154_BROADCAST_ADDRESS); + uint16_t dst_short_addr = net_htons(IEEE802154_BROADCAST_ADDRESS); bool ret; ret = test_dgram_packet_sending(&dst_short_addr, sizeof(dst_short_addr), @@ -1385,7 +1392,7 @@ ZTEST(ieee802154_l2_sockets, test_sending_broadcast_dgram_pkt) ZTEST(ieee802154_l2_sockets, test_receiving_broadcast_dgram_pkt) { - uint16_t src_short_addr = htons(0x1234); + uint16_t src_short_addr = net_htons(0x1234); bool ret; ret = test_dgram_packet_reception(&src_short_addr, sizeof(src_short_addr), @@ -1396,7 +1403,7 @@ ZTEST(ieee802154_l2_sockets, test_receiving_broadcast_dgram_pkt) ZTEST(ieee802154_l2_sockets, test_sending_authenticated_dgram_pkt) { - uint16_t dst_short_addr = htons(0x1234); + uint16_t dst_short_addr = net_htons(0x1234); bool ret; ret = test_dgram_packet_sending(&dst_short_addr, sizeof(dst_short_addr), diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c index 4f61eef5e69b0..7597d1aa6469f 100644 --- a/tests/net/iface/src/main.c +++ b/tests/net/iface/src/main.c @@ -39,25 +39,25 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); #endif /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static ZTEST_BMEM struct in_addr my_ipv4_addr1 = { { { 192, 0, 2, 1 } } }; +static ZTEST_BMEM struct net_in_addr my_ipv4_addr1 = { { { 192, 0, 2, 1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 3 addresses */ -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -static struct in_addr inaddr_mcast = { { { 224, 0, 0, 1 } } }; -static struct in6_addr in6addr_mcast; +static struct net_in_addr inaddr_mcast = { { { 224, 0, 0, 1 } } }; +static struct net_in6_addr in6addr_mcast; static struct net_if *iface1; static struct net_if *iface2; @@ -606,7 +606,7 @@ static bool send_iface(struct net_if *iface, int val, bool expect_fail) int ret; pkt = net_pkt_alloc_with_buffer(iface, sizeof(data), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); if (!pkt) { DBG("Cannot allocate pkt\n"); return false; @@ -696,20 +696,20 @@ ZTEST(net_iface, test_send_iface1_down_up) ZTEST(net_iface, test_select_src_iface) { - struct in6_addr dst_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, + struct net_in6_addr dst_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; - struct in6_addr ll_addr1 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, + struct net_in6_addr ll_addr1 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0x09, 0x12, 0xaa, 0x29, 0x02, 0x88 } } }; - struct in6_addr dst_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, + struct net_in6_addr dst_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x99 } } }; - struct in6_addr in6addr_mcast1 = { { { 0x00 } } }; - struct in_addr dst_addr_2 = { { { 192, 0, 2, 2 } } }; + struct net_in6_addr in6addr_mcast1 = { { { 0x00 } } }; + struct net_in_addr dst_addr_2 = { { { 192, 0, 2, 2 } } }; struct net_if_addr *ifaddr; struct net_if *iface; - struct sockaddr_in ipv4; - struct sockaddr_in6 ipv6; + struct net_sockaddr_in ipv4; + struct net_sockaddr_in6 ipv6; iface = net_if_ipv6_select_src_iface(&dst_addr1); zassert_equal_ptr(iface, iface1, "Invalid interface %p vs %p selected", @@ -741,18 +741,18 @@ ZTEST(net_iface, test_select_src_iface) iface, net_if_get_default()); net_ipaddr_copy(&ipv4.sin_addr, &dst_addr_2); - ipv4.sin_family = AF_INET; + ipv4.sin_family = NET_AF_INET; ipv4.sin_port = 0U; - iface = net_if_select_src_iface((struct sockaddr *)&ipv4); + iface = net_if_select_src_iface((struct net_sockaddr *)&ipv4); zassert_equal_ptr(iface, iface1, "Invalid interface %p vs %p selected", iface, iface1); net_ipaddr_copy(&ipv6.sin6_addr, &dst_addr1); - ipv6.sin6_family = AF_INET6; + ipv6.sin6_family = NET_AF_INET6; ipv6.sin6_port = 0U; - iface = net_if_select_src_iface((struct sockaddr *)&ipv6); + iface = net_if_select_src_iface((struct net_sockaddr *)&ipv6); zassert_equal_ptr(iface, iface1, "Invalid interface %p vs %p selected", iface, iface1); } @@ -818,8 +818,8 @@ ZTEST(net_iface, test_promisc_mode) check_promisc_mode_off(); } -static struct in_addr my_ipv4_addr_test = { { { 10, 0, 0, 1 } } }; -static struct in_addr my_ipv4_addr_not_found = { { { 1, 2, 3, 4 } } }; +static struct net_in_addr my_ipv4_addr_test = { { { 10, 0, 0, 1 } } }; +static struct net_in_addr my_ipv4_addr_not_found = { { { 1, 2, 3, 4 } } }; static void v4_addr_add(void) { @@ -865,7 +865,7 @@ static void v4_addr_add_user(void *p1, void *p2, void *p3) ARG_UNUSED(p2); ARG_UNUSED(p3); - struct in_addr my_addr = MY_ADDR_V4_USER; + struct net_in_addr my_addr = MY_ADDR_V4_USER; bool ret; ret = net_if_ipv4_addr_add_by_index(1, &my_addr, NET_ADDR_MANUAL, 0); @@ -881,8 +881,8 @@ static void v4_addr_add_user_from_userspace(void) static void v4_addr_lookup_user(void) { - struct in_addr my_addr = MY_ADDR_V4_USER; - struct in_addr unknown_addr = UNKNOWN_ADDR_V4_USER; + struct net_in_addr my_addr = MY_ADDR_V4_USER; + struct net_in_addr unknown_addr = UNKNOWN_ADDR_V4_USER; int ret; ret = net_if_ipv4_addr_lookup_by_index(&my_addr); @@ -898,7 +898,7 @@ static void v4_addr_rm_user(void *p1, void *p2, void *p3) ARG_UNUSED(p2); ARG_UNUSED(p3); - struct in_addr my_addr = MY_ADDR_V4_USER; + struct net_in_addr my_addr = MY_ADDR_V4_USER; bool ret; ret = net_if_ipv4_addr_rm_by_index(1, &my_addr); @@ -920,11 +920,11 @@ ZTEST(net_iface, test_v4_addr_add_rm_user_from_userspace) } static -struct in6_addr my_ipv6_addr_test = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +struct net_in6_addr my_ipv6_addr_test = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; static -struct in6_addr my_ipv6_addr_not_found = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, +struct net_in6_addr my_ipv6_addr_not_found = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x64 } } }; static void v6_addr_add(void) @@ -973,12 +973,12 @@ ZTEST(net_iface, test_v6_addr_add_rm) ZTEST(net_iface, test_v6_addr_add_rm_solicited) { - const struct in6_addr prefix = { { { 0x20, 0x01, 0x1b, 0x98, 0x24, 0xb8, 0x7e, 0xbb, + const struct net_in6_addr prefix = { { { 0x20, 0x01, 0x1b, 0x98, 0x24, 0xb8, 0x7e, 0xbb, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr iid_addr = { }; - struct in6_addr iid_addr_mcast = { }; - struct in6_addr unicast_addr = { }; - struct in6_addr unicast_addr_mcast = { }; + struct net_in6_addr iid_addr = { }; + struct net_in6_addr iid_addr_mcast = { }; + struct net_in6_addr unicast_addr = { }; + struct net_in6_addr unicast_addr_mcast = { }; struct net_if_addr *ifaddr; struct net_if_mcast_addr *maddr; bool ret; @@ -1004,7 +1004,7 @@ ZTEST(net_iface, test_v6_addr_add_rm_solicited) /* Add the corresponding solicited-node multicast address (should exist) */ net_ipv6_addr_create_solicited_node(&unicast_addr, &unicast_addr_mcast); zassert_mem_equal(&unicast_addr_mcast, &iid_addr_mcast, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); maddr = net_if_ipv6_maddr_add(iface4, &unicast_addr_mcast); zassert_is_null(maddr, "Solicited-node multicast address was added twice"); @@ -1037,7 +1037,7 @@ static void v6_addr_add_user(void *p1, void *p2, void *p3) ARG_UNUSED(p2); ARG_UNUSED(p3); - struct in6_addr my_addr = MY_ADDR_V6_USER; + struct net_in6_addr my_addr = MY_ADDR_V6_USER; bool ret; ret = net_if_ipv6_addr_add_by_index(1, &my_addr, NET_ADDR_MANUAL, 0); @@ -1053,8 +1053,8 @@ static void v6_addr_add_user_from_userspace(void) static void v6_addr_lookup_user(void) { - struct in6_addr my_addr = MY_ADDR_V6_USER; - struct in6_addr unknown_addr = UNKNOWN_ADDR_V6_USER; + struct net_in6_addr my_addr = MY_ADDR_V6_USER; + struct net_in6_addr unknown_addr = UNKNOWN_ADDR_V6_USER; int ret; ret = net_if_ipv6_addr_lookup_by_index(&my_addr); @@ -1070,7 +1070,7 @@ static void v6_addr_rm_user(void *p1, void *p2, void *p3) ARG_UNUSED(p2); ARG_UNUSED(p3); - struct in6_addr my_addr = MY_ADDR_V6_USER; + struct net_in6_addr my_addr = MY_ADDR_V6_USER; bool ret; /* Check also that add is enabled so that we can remove something @@ -1100,7 +1100,7 @@ static void netmask_addr_add(void *p1, void *p2, void *p3) ARG_UNUSED(p2); ARG_UNUSED(p3); - struct in_addr my_netmask = { { { 255, 255, 255, 0 } } }; + struct net_in_addr my_netmask = { { { 255, 255, 255, 0 } } }; bool ret; ret = net_if_ipv4_set_netmask_by_addr_by_index(1, &my_ipv4_addr1, &my_netmask); @@ -1130,7 +1130,7 @@ static void gw_addr_add(void *p1, void *p2, void *p3) ARG_UNUSED(p2); ARG_UNUSED(p3); - struct in_addr my_gw = { { { 192, 0, 2, 254 } } }; + struct net_in_addr my_gw = { { { 192, 0, 2, 254 } } }; bool ret; ret = net_if_ipv4_set_gw_by_index(1, &my_gw); @@ -1191,7 +1191,7 @@ static void foreach_ipv4_addr_check(struct net_if *iface, zassert_equal_ptr(iface, iface1, "Callback called on wrong interface"); zassert_mem_equal(&if_addr->address.in_addr, &my_ipv4_addr1, - sizeof(struct in_addr), "Wrong IPv4 address"); + sizeof(struct net_in_addr), "Wrong IPv4 address"); } ZTEST(net_iface, test_ipv4_addr_foreach) @@ -1219,7 +1219,7 @@ static void foreach_ipv4_maddr_check(struct net_if *iface, zassert_equal_ptr(iface, iface1, "Callback called on wrong interface"); zassert_mem_equal(&if_addr->address.in_addr, &inaddr_mcast, - sizeof(struct in_addr), "Wrong IPv4 multicast address"); + sizeof(struct net_in_addr), "Wrong IPv4 multicast address"); } ZTEST(net_iface, test_ipv4_maddr_foreach) @@ -1249,10 +1249,10 @@ static void foreach_ipv6_addr_check(struct net_if *iface, if (net_ipv6_is_ll_addr(&if_addr->address.in6_addr)) { zassert_mem_equal(&if_addr->address.in6_addr, &ll_addr, - sizeof(struct in6_addr), "Wrong IPv6 address"); + sizeof(struct net_in6_addr), "Wrong IPv6 address"); } else { zassert_mem_equal(&if_addr->address.in6_addr, &my_addr1, - sizeof(struct in6_addr), "Wrong IPv6 address"); + sizeof(struct net_in6_addr), "Wrong IPv6 address"); } } @@ -1280,7 +1280,7 @@ static void foreach_ipv6_maddr_check(struct net_if *iface, (*count)++; zassert_equal_ptr(iface, iface1, "Callback called on wrong interface"); - zassert_mem_equal(&if_addr->address.in6_addr, &in6addr_mcast, sizeof(struct in6_addr), + zassert_mem_equal(&if_addr->address.in6_addr, &in6addr_mcast, sizeof(struct net_in6_addr), "Wrong IPv6 multicast address"); } @@ -1360,10 +1360,10 @@ ZTEST(net_iface, test_interface_name) } static void generate_iid(struct net_if *iface, - struct in6_addr *expected_addr, - struct in6_addr *iid_addr) + struct net_in6_addr *expected_addr, + struct net_in6_addr *iid_addr) { - const struct in6_addr prefix = { { { 0x20, 0x01, 0x1b, 0x98, 0x24, 0xb8, 0x7e, 0xbb, + const struct net_in6_addr prefix = { { { 0x20, 0x01, 0x1b, 0x98, 0x24, 0xb8, 0x7e, 0xbb, 0, 0, 0, 0, 0, 0, 0, 0 } } }; struct net_linkaddr *lladdr = net_if_get_link_addr(iface); uint8_t *mac; @@ -1372,7 +1372,7 @@ static void generate_iid(struct net_if *iface, lladdr = net_if_get_link_addr(eth_iface); mac = lladdr->addr; - memcpy(expected_addr, &prefix, sizeof(struct in6_addr)); + memcpy(expected_addr, &prefix, sizeof(struct net_in6_addr)); memcpy(&expected_addr->s6_addr[8], &mac[0], 3); expected_addr->s6_addr[11] = 0xff; expected_addr->s6_addr[12] = 0xfe; @@ -1388,12 +1388,12 @@ static void generate_iid(struct net_if *iface, ZTEST(net_iface, test_ipv6_iid_eui64) { #if defined(CONFIG_NET_IPV6_IID_EUI_64) - struct in6_addr iid_addr = { }; - struct in6_addr expected_addr = { }; + struct net_in6_addr iid_addr = { }; + struct net_in6_addr expected_addr = { }; generate_iid(eth_iface, &expected_addr, &iid_addr); - zassert_mem_equal(&expected_addr, &iid_addr, sizeof(struct in6_addr)); + zassert_mem_equal(&expected_addr, &iid_addr, sizeof(struct net_in6_addr)); #else ztest_test_skip(); #endif @@ -1402,8 +1402,8 @@ ZTEST(net_iface, test_ipv6_iid_eui64) ZTEST(net_iface, test_ipv6_iid_stable) { #if defined(CONFIG_NET_IPV6_IID_STABLE) - struct in6_addr iid_addr = { }; - struct in6_addr expected_addr = { }; + struct net_in6_addr iid_addr = { }; + struct net_in6_addr expected_addr = { }; generate_iid(eth_iface, &expected_addr, &iid_addr); @@ -1411,7 +1411,7 @@ ZTEST(net_iface, test_ipv6_iid_stable) zassert_not_equal(iid_addr.s6_addr[11], 0xff); zassert_not_equal(iid_addr.s6_addr[12], 0xfe); - zassert_true(memcmp(&expected_addr, &iid_addr, sizeof(struct in6_addr)) != 0, + zassert_true(memcmp(&expected_addr, &iid_addr, sizeof(struct net_in6_addr)) != 0, "IID is EUI-64 instead of randomized"); #else ztest_test_skip(); diff --git a/tests/net/igmp/src/main.c b/tests/net/igmp/src/main.c index ad25ff55eeb5d..558bd256906b9 100644 --- a/tests/net/igmp/src/main.c +++ b/tests/net/igmp/src/main.c @@ -63,9 +63,9 @@ static const unsigned char igmp_v3_query[] = { 0x11, 0x64, 0xec, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7d, 0x00, 0x00, }; -static struct in_addr my_addr = { { { 192, 0, 2, 1 } } }; -static struct in_addr mcast_addr = { { { 224, 0, 2, 63 } } }; -static struct in_addr any_addr = INADDR_ANY_INIT; +static struct net_in_addr my_addr = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr mcast_addr = { { { 224, 0, 2, 63 } } }; +static struct net_in_addr any_addr = NET_INADDR_ANY_INIT; static struct net_if *net_iface; static bool is_group_joined; @@ -183,7 +183,7 @@ static int tester_send(const struct device *dev, struct net_pkt *pkt) zassert_false(is_igmpv2_query_sent, "IGMPv3 response to IGMPv2 request"); #if defined(CONFIG_NET_IPV4_IGMPV3) - zassert_equal(ntohs(igmp_header->groups_len), 1, + zassert_equal(net_ntohs(igmp_header->groups_len), 1, "Invalid group length of IGMPv3 report (%d)", igmp_header->groups_len); @@ -314,7 +314,8 @@ static struct net_pkt *prepare_igmp_query(struct net_if *iface, bool is_igmpv3) const unsigned char *igmp_query = is_igmpv3 ? igmp_v3_query : igmp_v2_query; size_t igmp_query_size = is_igmpv3 ? sizeof(igmp_v3_query) : sizeof(igmp_v2_query); - pkt = net_pkt_alloc_with_buffer(iface, igmp_query_size, AF_INET, IPPROTO_IGMP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, igmp_query_size, NET_AF_INET, + NET_IPPROTO_IGMP, K_FOREVER); zassert_not_null(pkt, "Failed to allocate buffer"); zassert_ok(net_pkt_write(pkt, igmp_query, igmp_query_size)); @@ -432,33 +433,33 @@ ZTEST(net_igmp, test_igmp_verify_catch_join) verify_leave_group(); } -static void socket_group_with_address(struct in_addr *local_addr, bool do_join) +static void socket_group_with_address(struct net_in_addr *local_addr, bool do_join) { - struct ip_mreqn mreqn = { 0 }; + struct net_ip_mreqn mreqn = { 0 }; int option; int ret, fd; if (do_join) { - option = IP_ADD_MEMBERSHIP; + option = ZSOCK_IP_ADD_MEMBERSHIP; } else { - option = IP_DROP_MEMBERSHIP; + option = ZSOCK_IP_DROP_MEMBERSHIP; } - fd = zsock_socket(AF_INET, SOCK_DGRAM, 0); + fd = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, 0); zassert_true(fd >= 0, "Cannot get socket (%d)", -errno); - ret = zsock_setsockopt(fd, IPPROTO_IP, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IP, option, NULL, sizeof(mreqn)); zassert_equal(ret, -1, "Incorrect return value (%d)", ret); zassert_equal(errno, EINVAL, "Incorrect errno value (%d)", -errno); - ret = zsock_setsockopt(fd, IPPROTO_IP, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IP, option, (void *)&mreqn, 1); zassert_equal(ret, -1, "Incorrect return value (%d)", ret); zassert_equal(errno, EINVAL, "Incorrect errno value (%d)", -errno); /* First try with empty mreqn */ - ret = zsock_setsockopt(fd, IPPROTO_IP, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IP, option, (void *)&mreqn, sizeof(mreqn)); zassert_equal(ret, -1, "Incorrect return value (%d)", ret); zassert_equal(errno, EINVAL, "Incorrect errno value (%d)", -errno); @@ -466,7 +467,7 @@ static void socket_group_with_address(struct in_addr *local_addr, bool do_join) memcpy(&mreqn.imr_address, local_addr, sizeof(mreqn.imr_address)); memcpy(&mreqn.imr_multiaddr, &mcast_addr, sizeof(mreqn.imr_multiaddr)); - ret = zsock_setsockopt(fd, IPPROTO_IP, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IP, option, (void *)&mreqn, sizeof(mreqn)); if (do_join) { @@ -496,25 +497,25 @@ static void socket_group_with_address(struct in_addr *local_addr, bool do_join) k_msleep(THREAD_SLEEP); } -static void socket_group_with_index(struct in_addr *local_addr, bool do_join) +static void socket_group_with_index(struct net_in_addr *local_addr, bool do_join) { - struct ip_mreqn mreqn = { 0 }; + struct net_ip_mreqn mreqn = { 0 }; int option; int ret, fd; if (do_join) { - option = IP_ADD_MEMBERSHIP; + option = ZSOCK_IP_ADD_MEMBERSHIP; } else { - option = IP_DROP_MEMBERSHIP; + option = ZSOCK_IP_DROP_MEMBERSHIP; } - fd = zsock_socket(AF_INET, SOCK_DGRAM, 0); + fd = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, 0); zassert_true(fd >= 0, "Cannot get socket (%d)", -errno); mreqn.imr_ifindex = net_if_ipv4_addr_lookup_by_index(local_addr); memcpy(&mreqn.imr_multiaddr, &mcast_addr, sizeof(mreqn.imr_multiaddr)); - ret = zsock_setsockopt(fd, IPPROTO_IP, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IP, option, (void *)&mreqn, sizeof(mreqn)); if (do_join) { @@ -541,22 +542,22 @@ static void socket_group_with_index(struct in_addr *local_addr, bool do_join) k_msleep(THREAD_SLEEP); } -static void socket_join_group_with_address(struct in_addr *addr) +static void socket_join_group_with_address(struct net_in_addr *addr) { socket_group_with_address(addr, true); } -static void socket_leave_group_with_address(struct in_addr *addr) +static void socket_leave_group_with_address(struct net_in_addr *addr) { socket_group_with_address(addr, false); } -static void socket_join_group_with_index(struct in_addr *addr) +static void socket_join_group_with_index(struct net_in_addr *addr) { socket_group_with_index(addr, true); } -static void socket_leave_group_with_index(struct in_addr *addr) +static void socket_leave_group_with_index(struct net_in_addr *addr) { socket_group_with_index(addr, false); } diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c index 71df9d75b96d9..99de954c4204f 100644 --- a/tests/net/ip-addr/src/main.c +++ b/tests/net/ip-addr/src/main.c @@ -91,7 +91,7 @@ static struct net_if *second_iface; #define TEST_IPV6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, expected) \ do { \ - struct in6_addr addr = { { { a, b, c, d, e, f, g, h, \ + struct net_in6_addr addr = { { { a, b, c, d, e, f, g, h, \ i, j, k, l, m, n, o, p } } }; \ char *ptr = net_sprint_ipv6_addr(&addr); \ zassert_false(strcmp(ptr, expected), \ @@ -101,7 +101,7 @@ static struct net_if *second_iface; #define TEST_IPV4(a, b, c, d, expected) \ do { \ - struct in_addr addr = { { { a, b, c, d } } }; \ + struct net_in_addr addr = { { { a, b, c, d } } }; \ char *ptr = net_sprint_ipv4_addr(&addr); \ zassert_false(strcmp(ptr, expected), \ "Test %s failed, got %s\n", expected, \ @@ -233,7 +233,7 @@ static const char *addr_state_to_str(enum net_addr_state state) } static const char *get_addr_state(struct net_if *iface, - const struct in6_addr *addr) + const struct net_in6_addr *addr) { struct net_if_addr *ifaddr; @@ -252,30 +252,30 @@ static const char *get_addr_state(struct net_if *iface, ZTEST(ip_addr_fn, test_ipv6_addresses) { - struct in6_addr loopback = IN6ADDR_LOOPBACK_INIT; - struct in6_addr any = IN6ADDR_ANY_INIT; - struct in6_addr mcast = { { { 0xff, 0x84, 0, 0, 0, 0, 0, 0, + struct net_in6_addr loopback = IN6ADDR_LOOPBACK_INIT; + struct net_in6_addr any = NET_IN6ADDR_ANY_INIT; + struct net_in6_addr mcast = { { { 0xff, 0x84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; - struct in6_addr addr6 = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, + struct net_in6_addr addr6 = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct in6_addr addr6_pref1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr6_pref1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct in6_addr addr6_pref2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr6_pref2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; - struct in6_addr addr6_pref3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x64, 0, 0, + struct net_in6_addr addr6_pref3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; - struct in6_addr ula = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, + struct net_in6_addr ula = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, 0, 0, 0, 0, 0xd1, 0xd2, 0xd3, 0xd4 } } }; - struct in6_addr ula2 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, + struct net_in6_addr ula2 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, 0, 0, 0, 0, 0xd1, 0xd2, 0xd3, 2 } } }; - struct in6_addr ula3 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, + struct net_in6_addr ula3 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, 0, 0, 0, 0, 0xd1, 0xd2, 0xf3, 3 } } }; - struct in6_addr ula4 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, + struct net_in6_addr ula4 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, 0, 0, 0, 0, 0xd1, 0xd2, 0xf3, 4 } } }; - struct in6_addr ula5 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, + struct net_in6_addr ula5 = { { { 0xfc, 0x00, 0xaa, 0xaa, 0, 0, 0, 0, 0, 0, 0, 0, 0xd1, 0xd2, 0xd3, 0xd5 } } }; - struct in6_addr *tmp; - const struct in6_addr *out; + struct net_in6_addr *tmp; + const struct net_in6_addr *out; struct net_if_addr *ifaddr1, *ifaddr2, *ifaddr_ula, *ifaddr_ula3, *ifaddr_ula4; struct net_if_mcast_addr *ifmaddr1; struct net_if_ipv6_prefix *prefix; @@ -351,13 +351,13 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) tmp = net_if_ipv6_get_ll(default_iface, NET_ADDR_PREFERRED); zassert_false(tmp && memcmp(tmp, &addr6.s6_addr, - sizeof(struct in6_addr)), + sizeof(struct net_in6_addr)), "IPv6 ll address fetch failed"); ifaddr2->addr_state = NET_ADDR_DEPRECATED; tmp = net_if_ipv6_get_ll(default_iface, NET_ADDR_PREFERRED); - zassert_false(tmp && !memcmp(tmp, &any, sizeof(struct in6_addr)), + zassert_false(tmp && !memcmp(tmp, &any, sizeof(struct net_in6_addr)), "IPv6 preferred ll address fetch failed"); ifaddr1 = net_if_ipv6_addr_add(default_iface, @@ -385,7 +385,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) iface); zassert_false(memcmp(out->s6_addr, &addr6_pref2.s6_addr, - sizeof(struct in6_addr)), + sizeof(struct net_in6_addr)), "IPv6 wrong src address selected, iface %p\n", iface); @@ -399,7 +399,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) iface); zassert_false(memcmp(out->s6_addr, &any.s6_addr, - sizeof(struct in6_addr)), + sizeof(struct net_in6_addr)), "IPv6 wrong src any address selected, iface %p\n", iface); @@ -416,7 +416,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) iface); zassert_false(memcmp(out->s6_addr, &addr6.s6_addr, - sizeof(struct in6_addr)), + sizeof(struct net_in6_addr)), "IPv6 wrong src ll address selected, iface %p\n", iface); } @@ -449,7 +449,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) net_sprint_ipv6_addr(out), get_addr_state(default_iface, out), iface); - zassert_false(memcmp(out->s6_addr, &ula.s6_addr, sizeof(struct in6_addr)), + zassert_false(memcmp(out->s6_addr, &ula.s6_addr, sizeof(struct net_in6_addr)), "IPv6 wrong src ula address selected, iface %p\n", iface); /* Allow selection of deprecated address if no other address @@ -481,7 +481,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) net_sprint_ipv6_addr(out), get_addr_state(default_iface, out), iface); - zassert_false(memcmp(out->s6_addr, &ula3.s6_addr, sizeof(struct in6_addr)), + zassert_false(memcmp(out->s6_addr, &ula3.s6_addr, sizeof(struct net_in6_addr)), "IPv6 wrong src ula address selected, iface %p\n", iface); /* Then change the address to deprecated state and check that we @@ -497,7 +497,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) net_sprint_ipv6_addr(out), get_addr_state(default_iface, out), iface); - zassert_false(memcmp(out->s6_addr, &ula.s6_addr, sizeof(struct in6_addr)), + zassert_false(memcmp(out->s6_addr, &ula.s6_addr, sizeof(struct net_in6_addr)), "IPv6 wrong src ula address selected, iface %p\n", iface); /* Then have two deprecated addresses */ @@ -511,7 +511,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) net_sprint_ipv6_addr(out), get_addr_state(default_iface, out), iface); - zassert_false(memcmp(out->s6_addr, &ula3.s6_addr, sizeof(struct in6_addr)), + zassert_false(memcmp(out->s6_addr, &ula3.s6_addr, sizeof(struct net_in6_addr)), "IPv6 wrong src ula address selected, iface %p\n", iface); ifaddr_ula4 = net_if_ipv6_addr_add(default_iface, &ula4, @@ -532,7 +532,7 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) net_sprint_ipv6_addr(out), get_addr_state(default_iface, out), iface); - zassert_false(memcmp(out->s6_addr, &ula3.s6_addr, sizeof(struct in6_addr)), + zassert_false(memcmp(out->s6_addr, &ula3.s6_addr, sizeof(struct net_in6_addr)), "IPv6 wrong src ula address selected, iface %p\n", iface); zassert_true(net_if_ipv6_addr_rm(default_iface, &ula), @@ -548,12 +548,12 @@ ZTEST(ip_addr_fn, test_ipv6_addresses) ZTEST(ip_addr_fn, test_ipv4_ll_address_select_default_first) { struct net_if *iface; - const struct in_addr *out; + const struct net_in_addr *out; struct net_if_addr *ifaddr; - struct in_addr lladdr4_1 = { { { 169, 254, 0, 1 } } }; - struct in_addr lladdr4_2 = { { { 169, 254, 0, 3 } } }; - struct in_addr netmask = { { { 255, 255, 0, 0 } } }; - struct in_addr dst4 = { { { 169, 254, 0, 2 } } }; + struct net_in_addr lladdr4_1 = { { { 169, 254, 0, 1 } } }; + struct net_in_addr lladdr4_2 = { { { 169, 254, 0, 3 } } }; + struct net_in_addr netmask = { { { 255, 255, 0, 0 } } }; + struct net_in_addr dst4 = { { { 169, 254, 0, 2 } } }; ifaddr = net_if_ipv4_addr_add(default_iface, &lladdr4_1, NET_ADDR_MANUAL, 0); zassert_not_null(ifaddr, "IPv4 interface address add failed"); @@ -588,14 +588,14 @@ ZTEST(ip_addr_fn, test_ipv4_ll_address_select_default_first) ZTEST(ip_addr_fn, test_ipv4_ll_address_select) { struct net_if *iface; - const struct in_addr *out; + const struct net_in_addr *out; struct net_if_addr *ifaddr; - struct in_addr lladdr4_1 = { { { 169, 254, 250, 1 } } }; - struct in_addr lladdr4_2 = { { { 169, 254, 253, 1 } } }; - struct in_addr netmask_1 = { { { 255, 255, 255, 0 } } }; - struct in_addr netmask_2 = { { { 255, 255, 255, 252 } } }; - struct in_addr dst4_1 = { { { 169, 254, 250, 2 } } }; - struct in_addr dst4_2 = { { { 169, 254, 253, 2 } } }; + struct net_in_addr lladdr4_1 = { { { 169, 254, 250, 1 } } }; + struct net_in_addr lladdr4_2 = { { { 169, 254, 253, 1 } } }; + struct net_in_addr netmask_1 = { { { 255, 255, 255, 0 } } }; + struct net_in_addr netmask_2 = { { { 255, 255, 255, 252 } } }; + struct net_in_addr dst4_1 = { { { 169, 254, 250, 2 } } }; + struct net_in_addr dst4_2 = { { { 169, 254, 253, 2 } } }; ifaddr = net_if_ipv4_addr_add(default_iface, &lladdr4_1, NET_ADDR_MANUAL, 0); zassert_not_null(ifaddr, "IPv4 interface address add failed"); @@ -638,26 +638,26 @@ ZTEST(ip_addr_fn, test_ipv4_ll_address_select) ZTEST(ip_addr_fn, test_ipv4_addresses) { - const struct in_addr *out; + const struct net_in_addr *out; struct net_if_addr *ifaddr1; struct net_if_mcast_addr *ifmaddr1; - struct in_addr addr4 = { { { 192, 168, 0, 1 } } }; - struct in_addr addr4b = { { { 192, 168, 1, 2 } } }; - struct in_addr addr4_not_found = { { { 10, 20, 30, 40 } } }; - struct in_addr lladdr4 = { { { 169, 254, 98, 203 } } }; - struct in_addr maddr4a = { { { 224, 0, 0, 1 } } }; - struct in_addr maddr4b = { { { 224, 0, 0, 2 } } }; - struct in_addr match_addr = { { { 192, 168, 0, 2 } } }; - struct in_addr fail_addr = { { { 10, 1, 0, 2 } } }; - struct in_addr netmask = { { { 255, 255, 255, 0 } } }; - struct in_addr netmask2 = { { { 255, 255, 0, 0 } } }; - struct in_addr gw = { { { 192, 168, 0, 42 } } }; - struct in_addr loopback4 = { { { 127, 0, 0, 1 } } }; - struct in_addr bcast_addr1 = { { { 255, 255, 255, 255 } } }; - struct in_addr bcast_addr2 = { { { 192, 168, 1, 255 } } }; - struct in_addr bcast_addr3 = { { { 192, 168, 255, 255 } } }; - struct in_addr bcast_addr4 = { { { 192, 0, 2, 255 } } }; - struct in_addr bcast_addr5 = { { { 192, 168, 0, 255 } } }; + struct net_in_addr addr4 = { { { 192, 168, 0, 1 } } }; + struct net_in_addr addr4b = { { { 192, 168, 1, 2 } } }; + struct net_in_addr addr4_not_found = { { { 10, 20, 30, 40 } } }; + struct net_in_addr lladdr4 = { { { 169, 254, 98, 203 } } }; + struct net_in_addr maddr4a = { { { 224, 0, 0, 1 } } }; + struct net_in_addr maddr4b = { { { 224, 0, 0, 2 } } }; + struct net_in_addr match_addr = { { { 192, 168, 0, 2 } } }; + struct net_in_addr fail_addr = { { { 10, 1, 0, 2 } } }; + struct net_in_addr netmask = { { { 255, 255, 255, 0 } } }; + struct net_in_addr netmask2 = { { { 255, 255, 0, 0 } } }; + struct net_in_addr gw = { { { 192, 168, 0, 42 } } }; + struct net_in_addr loopback4 = { { { 127, 0, 0, 1 } } }; + struct net_in_addr bcast_addr1 = { { { 255, 255, 255, 255 } } }; + struct net_in_addr bcast_addr2 = { { { 192, 168, 1, 255 } } }; + struct net_in_addr bcast_addr3 = { { { 192, 168, 255, 255 } } }; + struct net_in_addr bcast_addr4 = { { { 192, 0, 2, 255 } } }; + struct net_in_addr bcast_addr5 = { { { 192, 168, 0, 255 } } }; struct net_if *iface, *iface1, *iface2; int i, ret; @@ -822,15 +822,15 @@ ZTEST(ip_addr_fn, test_ipv4_addresses) ZTEST(ip_addr_fn, test_ipv6_mesh_addresses) { struct net_if_addr *ifaddr; - const struct in6_addr *out; - struct in6_addr lla = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x54, 0xdb, + const struct net_in6_addr *out; + struct net_in6_addr lla = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x54, 0xdb, 0x88, 0x1c, 0x38, 0x45, 0x57, 0xf4 } } }; - struct in6_addr ml_eid = { { { 0xfd, 0xe5, 0x8d, 0xba, 0x82, 0xe1, 0, + struct net_in6_addr ml_eid = { { { 0xfd, 0xe5, 0x8d, 0xba, 0x82, 0xe1, 0, 0x01, 0x40, 0x16, 0x99, 0x3c, 0x83, 0x99, 0x35, 0xab } } }; - struct in6_addr ll_mcast = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, + struct net_in6_addr ll_mcast = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct in6_addr ml_mcast = { { { 0xff, 0x03, 0, 0, 0, 0, 0, 0, 0, 0, 0, + struct net_in6_addr ml_mcast = { { { 0xff, 0x03, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; struct net_if *iface = default_iface; @@ -852,7 +852,7 @@ ZTEST(ip_addr_fn, test_ipv6_mesh_addresses) net_sprint_ipv6_addr(&ll_mcast), net_sprint_ipv6_addr(out)); zassert_false(memcmp(out->s6_addr, &lla.s6_addr, - sizeof(struct in6_addr)), + sizeof(struct net_in6_addr)), "IPv6 wrong src address selected\n"); out = net_if_ipv6_select_src_addr(iface, &ml_mcast); @@ -862,7 +862,7 @@ ZTEST(ip_addr_fn, test_ipv6_mesh_addresses) net_sprint_ipv6_addr(&ml_mcast), net_sprint_ipv6_addr(out)); zassert_false(memcmp(out->s6_addr, &ml_eid.s6_addr, - sizeof(struct in6_addr)), + sizeof(struct net_in6_addr)), "IPv6 wrong src address selected\n"); zassert_true(net_if_ipv6_addr_rm(iface, &lla), @@ -875,7 +875,7 @@ ZTEST(ip_addr_fn, test_private_ipv6_addresses) { bool ret; struct { - struct in6_addr addr; + struct net_in6_addr addr; bool is_private; } addrs[] = { { @@ -912,7 +912,7 @@ ZTEST(ip_addr_fn, test_private_ipv4_addresses) { bool ret; struct { - struct in_addr addr; + struct net_in_addr addr; bool is_private; } addrs[] = { { diff --git a/tests/net/ipv4_fragment/src/main.c b/tests/net/ipv4_fragment/src/main.c index c61ff40addc63..f83f7cc69b2dc 100644 --- a/tests/net/ipv4_fragment/src/main.c +++ b/tests/net/ipv4_fragment/src/main.c @@ -35,8 +35,8 @@ LOG_MODULE_REGISTER(net_ipv4_test, CONFIG_NET_IPV4_LOG_LEVEL); #define ALLOC_TIMEOUT K_MSEC(500) /* Dummy network addresses, 192.168.8.1 and 192.168.8.2 */ -static struct in_addr my_addr1 = { { { 0xc0, 0xa8, 0x08, 0x01 } } }; -static struct in_addr my_addr2 = { { { 0xc0, 0xa8, 0x08, 0x02 } } }; +static struct net_in_addr my_addr1 = { { { 0xc0, 0xa8, 0x08, 0x01 } } }; +static struct net_in_addr my_addr2 = { { { 0xc0, 0xa8, 0x08, 0x02 } } }; /* IPv4 TCP packet header */ static const unsigned char ipv4_tcp[] = { @@ -220,8 +220,8 @@ static void check_ipv4_fragment_header(struct net_pkt *pkt, const uint8_t *orig_ zassert_mem_equal(hdr->dst, &orig_hdr[offsetof(struct net_ipv4_hdr, dst)], NET_IPV4_ADDR_SIZE, "IPv4 header destination IP mismatch"); - pkt_len = ntohs(hdr->len); - pkt_offset = ntohs(*((uint16_t *)&hdr->offset)); + pkt_len = net_ntohs(hdr->len); + pkt_offset = net_ntohs(*((uint16_t *)&hdr->offset)); pkt_flags = (pkt_offset & ~NET_IPV4_FRAGH_OFFSET_MASK) >> 13; pkt_offset &= NET_IPV4_FRAGH_OFFSET_MASK; pkt_offset *= 8; @@ -392,8 +392,8 @@ static enum net_verdict udp_data_received(struct net_conn *conn, struct net_pkt zassert_mem_equal(hdr->dst, &ipv4_udp[offsetof(struct net_ipv4_hdr, src)], NET_IPV4_ADDR_SIZE, "IPv4 header destination IP mismatch"); - pkt_len = ntohs(hdr->len); - pkt_offset = ntohs(*((uint16_t *)&hdr->offset)); + pkt_len = net_ntohs(hdr->len); + pkt_offset = net_ntohs(*((uint16_t *)&hdr->offset)); pkt_flags = (pkt_offset & ~NET_IPV4_FRAGH_OFFSET_MASK) >> 13; pkt_offset &= NET_IPV4_FRAGH_OFFSET_MASK; pkt_offset *= 8; @@ -473,8 +473,8 @@ static enum net_verdict tcp_data_received(struct net_conn *conn, struct net_pkt zassert_mem_equal(hdr->dst, &ipv4_tcp[offsetof(struct net_ipv4_hdr, src)], NET_IPV4_ADDR_SIZE, "IPv4 header destination IP mismatch"); - pkt_len = ntohs(hdr->len); - pkt_offset = ntohs(*((uint16_t *)&hdr->offset)); + pkt_len = net_ntohs(hdr->len); + pkt_offset = net_ntohs(*((uint16_t *)&hdr->offset)); pkt_flags = (pkt_offset & ~NET_IPV4_FRAGH_OFFSET_MASK) >> 13; pkt_offset &= NET_IPV4_FRAGH_OFFSET_MASK; pkt_offset *= 8; @@ -524,41 +524,42 @@ static enum net_verdict tcp_data_received(struct net_conn *conn, struct net_pkt return NET_OK; } -static void setup_udp_handler(const struct in_addr *raddr, const struct in_addr *laddr, +static void setup_udp_handler(const struct net_in_addr *raddr, const struct net_in_addr *laddr, uint16_t remote_port, uint16_t local_port) { static struct net_conn_handle *handle; - struct sockaddr remote_addr = { 0 }; - struct sockaddr local_addr = { 0 }; + struct net_sockaddr remote_addr = { 0 }; + struct net_sockaddr local_addr = { 0 }; int ret; net_ipaddr_copy(&net_sin(&local_addr)->sin_addr, laddr); - local_addr.sa_family = AF_INET; + local_addr.sa_family = NET_AF_INET; net_ipaddr_copy(&net_sin(&remote_addr)->sin_addr, raddr); - remote_addr.sa_family = AF_INET; + remote_addr.sa_family = NET_AF_INET; - ret = net_udp_register(AF_INET, &local_addr, &remote_addr, local_port, remote_port, NULL, + ret = net_udp_register(NET_AF_INET, &local_addr, &remote_addr, + local_port, remote_port, NULL, udp_data_received, NULL, &handle); zassert_equal(ret, 0, "Cannot register UDP connection"); } -static void setup_tcp_handler(const struct in_addr *raddr, const struct in_addr *laddr, +static void setup_tcp_handler(const struct net_in_addr *raddr, const struct net_in_addr *laddr, uint16_t remote_port, uint16_t local_port) { static struct net_conn_handle *handle; - struct sockaddr remote_addr = { 0 }; - struct sockaddr local_addr = { 0 }; + struct net_sockaddr remote_addr = { 0 }; + struct net_sockaddr local_addr = { 0 }; int ret; net_ipaddr_copy(&net_sin(&local_addr)->sin_addr, laddr); - local_addr.sa_family = AF_INET; + local_addr.sa_family = NET_AF_INET; net_ipaddr_copy(&net_sin(&remote_addr)->sin_addr, raddr); - remote_addr.sa_family = AF_INET; + remote_addr.sa_family = NET_AF_INET; - ret = net_conn_register(IPPROTO_TCP, SOCK_STREAM, AF_INET, &local_addr, + ret = net_conn_register(NET_IPPROTO_TCP, NET_SOCK_STREAM, NET_AF_INET, &local_addr, &remote_addr, local_port, remote_port, NULL, tcp_data_received, NULL, &handle); @@ -608,8 +609,8 @@ ZTEST(net_ipv4_fragment, test_udp) test_started = true; /* Create packet */ - pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv4_udp) + IPV4_TEST_PACKET_SIZE, AF_INET, - IPPROTO_UDP, ALLOC_TIMEOUT); + pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv4_udp) + IPV4_TEST_PACKET_SIZE, + NET_AF_INET, NET_IPPROTO_UDP, ALLOC_TIMEOUT); zassert_not_null(pkt, "Packet creation failed"); /* Add IPv4 and UDP headers */ @@ -626,12 +627,12 @@ ZTEST(net_ipv4_fragment, test_udp) /* Setup packet for insertion */ net_pkt_set_iface(pkt, iface1); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv4_hdr)); /* Update IPv4 headers */ packet_len = net_pkt_get_len(pkt); - NET_IPV4_HDR(pkt)->len = htons(packet_len); + NET_IPV4_HDR(pkt)->len = net_htons(packet_len); NET_IPV4_HDR(pkt)->chksum = net_calc_chksum_ipv4(pkt); net_pkt_cursor_init(pkt); @@ -677,7 +678,7 @@ ZTEST(net_ipv4_fragment, test_tcp) generate_dummy_data(tmp_buf, sizeof(tmp_buf)); pkt = net_pkt_alloc_with_buffer(iface1, (sizeof(ipv4_tcp) + IPV4_TEST_PACKET_SIZE), - AF_INET, IPPROTO_TCP, ALLOC_TIMEOUT); + NET_AF_INET, NET_IPPROTO_TCP, ALLOC_TIMEOUT); zassert_not_null(pkt, "Packet creation failure"); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv4_hdr)); @@ -695,12 +696,12 @@ ZTEST(net_ipv4_fragment, test_tcp) } net_pkt_set_iface(pkt, iface1); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv4_hdr)); packet_len = net_pkt_get_len(pkt); - NET_IPV4_HDR(pkt)->len = htons(packet_len); + NET_IPV4_HDR(pkt)->len = net_htons(packet_len); NET_IPV4_HDR(pkt)->chksum = net_calc_chksum_ipv4(pkt); net_pkt_cursor_init(pkt); @@ -745,11 +746,11 @@ ZTEST(net_ipv4_fragment, test_fragment_timeout) test_started = true; /* Create a packet for the test */ - pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv4_udp_frag), AF_INET, - IPPROTO_UDP, ALLOC_TIMEOUT); + pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv4_udp_frag), NET_AF_INET, + NET_IPPROTO_UDP, ALLOC_TIMEOUT); zassert_not_null(pkt, "Packet creation failure"); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv4_hdr)); /* Create packet from base data */ @@ -822,7 +823,7 @@ ZTEST(net_ipv4_fragment, test_do_not_fragment) /* Create packet */ pkt = net_pkt_alloc_with_buffer(iface1, (sizeof(ipv4_udp_do_not_frag) + IPV4_TEST_PACKET_SIZE), - AF_INET, IPPROTO_UDP, ALLOC_TIMEOUT); + NET_AF_INET, NET_IPPROTO_UDP, ALLOC_TIMEOUT); zassert_not_null(pkt, "Packet creation failed"); /* Add IPv4 and UDP headers */ @@ -839,12 +840,12 @@ ZTEST(net_ipv4_fragment, test_do_not_fragment) /* Setup packet for insertion */ net_pkt_set_iface(pkt, iface1); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv4_hdr)); /* Update IPv4 headers */ packet_len = net_pkt_get_len(pkt); - NET_IPV4_HDR(pkt)->len = htons(packet_len); + NET_IPV4_HDR(pkt)->len = net_htons(packet_len); NET_IPV4_HDR(pkt)->chksum = net_calc_chksum_ipv4(pkt); net_pkt_cursor_init(pkt); diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c index c0cbc7ca50604..6199d75245d4f 100644 --- a/tests/net/ipv6/src/main.c +++ b/tests/net/ipv6/src/main.c @@ -46,23 +46,23 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL); #define TEST_NET_IF net_if_lookup_by_dev(DEVICE_GET(eth_ipv6_net)) #define TEST_MSG_SIZE 128 -static struct in6_addr my_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; -static struct in6_addr multicast_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr multicast_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr all_nodes_mcast = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, +static struct net_in6_addr all_nodes_mcast = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Below should match prefix/addr distributed in RA message. */ -static struct in6_addr test_router_addr = { { { +static struct net_in6_addr test_router_addr = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x2, 0x60, 0x97, 0xff, 0xfe, 0x07, 0x69, 0xea } } }; -static struct in6_addr test_ra_prefix = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, +static struct net_in6_addr test_ra_prefix = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } } }; -static struct in6_addr test_ra_autoconf_addr = { { { +static struct net_in6_addr test_ra_autoconf_addr = { { { 0x3f, 0xfe, 0x05, 0x07, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x5e, 0xff, 0xfe, 0x00, 0x53, 0x00 } } }; @@ -157,7 +157,7 @@ static const unsigned char ipv6_hbho[] = { 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, /* ...... */ }; -static int send_msg(struct in6_addr *src, struct in6_addr *dst); +static int send_msg(struct net_in6_addr *src, struct net_in6_addr *dst); typedef void (*ns_callback)(struct net_pkt *pkt, void *user_data); @@ -233,10 +233,10 @@ static void prepare_ra_message(struct net_pkt *pkt) pkt->buffer = NULL; net_pkt_alloc_buffer(pkt, sizeof(struct net_eth_hdr) + - sizeof(icmpv6_ra), AF_UNSPEC, K_NO_WAIT); + sizeof(icmpv6_ra), NET_AF_UNSPEC, K_NO_WAIT); net_pkt_cursor_init(pkt); - hdr.type = htons(NET_ETH_PTYPE_IPV6); + hdr.type = net_htons(NET_ETH_PTYPE_IPV6); memset(&hdr.src, 0, sizeof(struct net_eth_addr)); memcpy(&hdr.dst, net_pkt_iface(pkt)->if_dev->link_addr.addr, sizeof(struct net_eth_addr)); @@ -249,8 +249,8 @@ static void prepare_ra_message(struct net_pkt *pkt) net_pkt_cursor_init(pkt); } -static void inject_na_message(struct net_if *iface, struct in6_addr *src, - struct in6_addr *dst, struct in6_addr *target, +static void inject_na_message(struct net_if *iface, struct net_in6_addr *src, + struct net_in6_addr *dst, struct net_in6_addr *target, uint8_t flags) { struct net_eth_hdr hdr; @@ -258,13 +258,13 @@ static void inject_na_message(struct net_if *iface, struct in6_addr *src, uint8_t na_flags[] = { flags, 0, 0, 0 }; uint8_t na_tlla_opt[] = { 0x02, 0x01, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa }; - pkt = net_pkt_alloc_with_buffer(iface, TEST_MSG_SIZE, AF_INET6, - IPPROTO_ICMPV6, K_NO_WAIT); + pkt = net_pkt_alloc_with_buffer(iface, TEST_MSG_SIZE, NET_AF_INET6, + NET_IPPROTO_ICMPV6, K_NO_WAIT); zassert_not_null(pkt, "Failed to allocate packet"); net_pkt_set_ipv6_hop_limit(pkt, NET_IPV6_ND_HOP_LIMIT); - hdr.type = htons(NET_ETH_PTYPE_IPV6); + hdr.type = net_htons(NET_ETH_PTYPE_IPV6); memset(&hdr.src, 0xaa, sizeof(struct net_eth_addr)); memcpy(&hdr.dst, net_pkt_iface(pkt)->if_dev->link_addr.addr, sizeof(struct net_eth_addr)); @@ -277,11 +277,11 @@ static void inject_na_message(struct net_if *iface, struct in6_addr *src, zassert_ok(net_ipv6_create(pkt, src, dst)); zassert_ok(net_icmpv6_create(pkt, NET_ICMPV6_NA, 0)); zassert_ok(net_pkt_write(pkt, na_flags, sizeof(na_flags))); - zassert_ok(net_pkt_write(pkt, target, sizeof(struct in6_addr))); + zassert_ok(net_pkt_write(pkt, target, sizeof(struct net_in6_addr))); zassert_ok(net_pkt_write(pkt, na_tlla_opt, sizeof(na_tlla_opt))); net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); /* Fill L2 header. */ net_buf_push_mem(pkt->frags, &hdr, sizeof(struct net_eth_hdr)); @@ -493,7 +493,7 @@ static void rm_neighbor(void) */ static void add_max_neighbors(void) { - struct in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3 } } }; struct net_nbr *nbr; struct net_linkaddr lladdr; @@ -522,7 +522,7 @@ static void add_max_neighbors(void) static void rm_max_neighbors(void) { - struct in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3 } } }; struct net_linkaddr lladdr; uint8_t i; @@ -599,7 +599,7 @@ static void *ipv6_setup(void) ifaddr = &iface->config.ip.ipv6->unicast[i]; ifaddr->is_used = true; - ifaddr->address.family = AF_INET6; + ifaddr->address.family = NET_AF_INET6; ifaddr->addr_type = NET_ADDR_MANUAL; ifaddr->addr_state = NET_ADDR_PREFERRED; ifaddr_record = ifaddr; @@ -655,9 +655,9 @@ ZTEST(net_ipv6, test_cmp_prefix) { bool st; - struct in6_addr prefix1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr prefix1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct in6_addr prefix2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr prefix2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; st = net_ipv6_is_prefix((uint8_t *)&prefix1, (uint8_t *)&prefix2, 64); @@ -705,7 +705,7 @@ ZTEST(net_ipv6, test_send_ns_extra_options) iface = TEST_NET_IF; pkt = net_pkt_alloc_with_buffer(iface, sizeof(icmpv6_ns_invalid), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); NET_ASSERT(pkt, "Out of TX packets"); @@ -728,7 +728,7 @@ ZTEST(net_ipv6, test_send_ns_no_options) iface = TEST_NET_IF; pkt = net_pkt_alloc_with_buffer(iface, sizeof(icmpv6_ns_no_sllao), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); NET_ASSERT(pkt, "Out of TX packets"); @@ -741,21 +741,21 @@ ZTEST(net_ipv6, test_send_ns_no_options) struct test_nd_context { struct k_sem wait_ns; - struct in6_addr *exp_ns_addr; + struct net_in6_addr *exp_ns_addr; bool reply; }; static void expect_nd_ns(struct net_pkt *pkt, void *user_data) { uint32_t res_bytes; - struct in6_addr target; + struct net_in6_addr target; struct test_nd_context *ctx = user_data; skip_headers(pkt); zassert_ok(net_pkt_read_be32(pkt, &res_bytes), "Failed to read reserved bytes"); zassert_equal(0, res_bytes, "Reserved bytes must be zeroed"); - zassert_ok(net_pkt_read(pkt, &target, sizeof(struct in6_addr)), + zassert_ok(net_pkt_read(pkt, &target, sizeof(struct net_in6_addr)), "Failed to read target address"); if (net_ipv6_addr_cmp(ctx->exp_ns_addr, &target)) { @@ -900,7 +900,7 @@ ZTEST(net_ipv6, test_send_neighbor_discovery_timeout) ZTEST(net_ipv6, test_prefix_timeout) { struct net_if_ipv6_prefix *prefix; - struct in6_addr addr = { { { 0x20, 1, 0x0d, 0xb8, 42, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 1, 0x0d, 0xb8, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; uint32_t lifetime = 1U; int len = 64; @@ -921,7 +921,7 @@ ZTEST(net_ipv6, test_prefix_timeout) ZTEST(net_ipv6, test_prefix_timeout_long) { struct net_if_ipv6_prefix *ifprefix; - struct in6_addr prefix = { { { 0x20, 1, 0x0d, 0xb8, 43, 0, 0, 0, + struct net_in6_addr prefix = { { { 0x20, 1, 0x0d, 0xb8, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; uint32_t lifetime = 0xfffffffe; int len = 64; @@ -966,16 +966,16 @@ static void rs_message(void) static void ra_message(void) { - struct in6_addr route_prefix = { { { 0x20, 0x01, 0x0d, 0xb0, 0x0f, 0xff } } }; - struct sockaddr_in6 dns_addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(53), + struct net_in6_addr route_prefix = { { { 0x20, 0x01, 0x0d, 0xb0, 0x0f, 0xff } } }; + struct net_sockaddr_in6 dns_addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(53), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }, }; struct net_route_entry *route; struct dns_resolve_context *ctx; - struct sockaddr_in6 *dns_server; + struct net_sockaddr_in6 *dns_server; struct net_if_addr *ifaddr; /* We received RA message earlier, make sure that the information @@ -1013,7 +1013,7 @@ static void ra_message(void) /* Check if RDNSS was added correctly. */ ctx = dns_resolve_get_default(); zassert_equal(ctx->state, DNS_RESOLVE_CONTEXT_ACTIVE); - dns_server = (struct sockaddr_in6 *)&ctx->servers[0].dns_server; + dns_server = (struct net_sockaddr_in6 *)&ctx->servers[0].dns_server; zassert_equal(dns_server->sin6_family, dns_addr.sin6_family); zassert_equal(dns_server->sin6_port, dns_addr.sin6_port); zassert_mem_equal(&dns_server->sin6_addr, &dns_addr.sin6_addr, @@ -1031,21 +1031,21 @@ ZTEST(net_ipv6, test_rs_ra_message) struct test_dad_context { struct k_sem wait_dad; - struct in6_addr *exp_dad_addr; + struct net_in6_addr *exp_dad_addr; bool reply; }; static void expect_dad_ns(struct net_pkt *pkt, void *user_data) { uint32_t res_bytes; - struct in6_addr target; + struct net_in6_addr target; struct test_dad_context *ctx = user_data; skip_headers(pkt); zassert_ok(net_pkt_read_be32(pkt, &res_bytes), "Failed to read reserved bytes"); zassert_equal(0, res_bytes, "Reserved bytes must be zeroed"); - zassert_ok(net_pkt_read(pkt, &target, sizeof(struct in6_addr)), + zassert_ok(net_pkt_read(pkt, &target, sizeof(struct net_in6_addr)), "Failed to read target address"); if (net_ipv6_addr_cmp(ctx->exp_dad_addr, &target)) { @@ -1120,7 +1120,7 @@ ZTEST(net_ipv6, test_hbho_message) iface = TEST_NET_IF; pkt = net_pkt_alloc_with_buffer(iface, sizeof(ipv6_hbho), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); NET_ASSERT(pkt, "Out of TX packets"); @@ -1171,7 +1171,7 @@ ZTEST(net_ipv6, test_hbho_message_1) iface = TEST_NET_IF; pkt = net_pkt_alloc_with_buffer(iface, sizeof(ipv6_hbho_1), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); NET_ASSERT(pkt, "Out of TX packets"); @@ -1231,7 +1231,7 @@ ZTEST(net_ipv6, test_hbho_message_2) iface = TEST_NET_IF; pkt = net_pkt_alloc_with_buffer(iface, sizeof(ipv6_hbho_2), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); NET_ASSERT(pkt, "Out of TX packets"); @@ -1394,7 +1394,7 @@ ZTEST(net_ipv6, test_hbho_message_3) iface = TEST_NET_IF; pkt = net_pkt_alloc_with_buffer(iface, sizeof(ipv6_hbho_3), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); NET_ASSERT(pkt, "Out of TX packets"); @@ -1416,7 +1416,7 @@ extern void net_address_lifetime_timeout(void); ZTEST(net_ipv6, test_address_lifetime) { - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x20, 0x1 } } }; struct net_if *iface = TEST_NET_IF; uint32_t vlifetime = 0xffff; @@ -1534,11 +1534,11 @@ ZTEST(net_ipv6, test_change_ll_addr) ZTEST(net_ipv6, test_dad_timeout) { #if defined(CONFIG_NET_IPV6_DAD) - struct in6_addr addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x99, 0x1 } } }; - struct in6_addr addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x99, 0x2 } } }; - struct in6_addr addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x99, 0x3 } } }; struct net_if *iface = TEST_NET_IF; @@ -1616,7 +1616,7 @@ ZTEST(net_ipv6, test_dad_on_static_addr_after_carrier_toggle) */ static void verify_dad_on_ll_addr_on_iface_event(void (*action)(void)) { - static struct in6_addr link_local_addr; + static struct net_in6_addr link_local_addr; static struct test_dad_context ctx = { .exp_dad_addr = &link_local_addr }; @@ -1655,7 +1655,7 @@ ZTEST(net_ipv6, test_dad_on_ll_addr_after_carrier_toggle) /* Verify that in case of DAD conflict, address is not used on the interface. */ ZTEST(net_ipv6, test_dad_conflict) { - static struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + static struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x99, 0x4 } } }; static struct test_dad_context ctx = { .exp_dad_addr = &addr, @@ -1687,8 +1687,8 @@ ZTEST(net_ipv6, test_dad_conflict) #define NET_UDP_HDR(pkt) ((struct net_udp_hdr *)(net_udp_get_hdr(pkt, NULL))) static struct net_pkt *setup_ipv6_udp(struct net_if *iface, - struct in6_addr *local_addr, - struct in6_addr *remote_addr, + struct net_in6_addr *local_addr, + struct net_in6_addr *remote_addr, uint16_t local_port, uint16_t remote_port) { @@ -1696,7 +1696,7 @@ static struct net_pkt *setup_ipv6_udp(struct net_if *iface, struct net_pkt *pkt; pkt = net_pkt_alloc_with_buffer(iface, strlen(payload), - AF_INET6, IPPROTO_UDP, K_FOREVER); + NET_AF_INET6, NET_IPPROTO_UDP, K_FOREVER); if (!pkt) { return NULL; } @@ -1706,7 +1706,7 @@ static struct net_pkt *setup_ipv6_udp(struct net_if *iface, zassert_true(0, "exiting"); } - if (net_udp_create(pkt, htons(local_port), htons(remote_port))) { + if (net_udp_create(pkt, net_htons(local_port), net_htons(remote_port))) { printk("Cannot create IPv6 pkt %p", pkt); zassert_true(0, "exiting"); } @@ -1717,13 +1717,13 @@ static struct net_pkt *setup_ipv6_udp(struct net_if *iface, } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_UDP); + net_ipv6_finalize(pkt, NET_IPPROTO_UDP); net_pkt_cursor_init(pkt); return pkt; } -static enum net_verdict recv_msg(struct in6_addr *src, struct in6_addr *dst) +static enum net_verdict recv_msg(struct net_in6_addr *src, struct net_in6_addr *dst) { struct net_pkt *pkt; struct net_if *iface; @@ -1738,7 +1738,7 @@ static enum net_verdict recv_msg(struct in6_addr *src, struct in6_addr *dst) return net_ipv6_input(pkt); } -static int send_msg(struct in6_addr *src, struct in6_addr *dst) +static int send_msg(struct net_in6_addr *src, struct net_in6_addr *dst) { struct net_pkt *pkt; struct net_if *iface; @@ -1752,9 +1752,9 @@ static int send_msg(struct in6_addr *src, struct in6_addr *dst) ZTEST(net_ipv6, test_src_localaddr_recv) { - struct in6_addr localaddr = { { { 0, 0, 0, 0, 0, 0, 0, 0, + struct net_in6_addr localaddr = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; enum net_verdict verdict; @@ -1765,9 +1765,9 @@ ZTEST(net_ipv6, test_src_localaddr_recv) ZTEST(net_ipv6, test_dst_localaddr_recv) { - struct in6_addr localaddr = { { { 0, 0, 0, 0, 0, 0, 0, 0, + struct net_in6_addr localaddr = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; enum net_verdict verdict; @@ -1778,9 +1778,9 @@ ZTEST(net_ipv6, test_dst_localaddr_recv) ZTEST(net_ipv6, test_dst_iface_scope_mcast_recv) { - struct in6_addr mcast_iface = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0, + struct net_in6_addr mcast_iface = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; enum net_verdict verdict; @@ -1791,9 +1791,9 @@ ZTEST(net_ipv6, test_dst_iface_scope_mcast_recv) ZTEST(net_ipv6, test_dst_zero_scope_mcast_recv) { - struct in6_addr mcast_zero = { { { 0xff, 0x00, 0, 0, 0, 0, 0, 0, + struct net_in6_addr mcast_zero = { { { 0xff, 0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; enum net_verdict verdict; @@ -1804,9 +1804,9 @@ ZTEST(net_ipv6, test_dst_zero_scope_mcast_recv) ZTEST(net_ipv6, test_dst_site_scope_mcast_recv_drop) { - struct in6_addr mcast_site = { { { 0xff, 0x05, 0, 0, 0, 0, 0, 0, + struct net_in6_addr mcast_site = { { { 0xff, 0x05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; enum net_verdict verdict; @@ -1819,24 +1819,24 @@ static void net_ctx_create(struct net_context **ctx) { int ret; - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, ctx); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, ctx); zassert_equal(ret, 0, "Context create IPv6 UDP test failed"); } -static void net_ctx_bind_mcast(struct net_context *ctx, struct in6_addr *maddr) +static void net_ctx_bind_mcast(struct net_context *ctx, struct net_in6_addr *maddr) { - struct sockaddr_in6 addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(4321), + struct net_sockaddr_in6 addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(4321), .sin6_addr = { { { 0 } } }, }; int ret; net_ipaddr_copy(&addr.sin6_addr, maddr); - ret = net_context_bind(ctx, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(ctx, (struct net_sockaddr *)&addr, + sizeof(struct net_sockaddr_in6)); zassert_equal(ret, 0, "Context bind test failed (%d)", ret); } @@ -1875,7 +1875,7 @@ static void net_ctx_recv(struct net_context *ctx) zassert_equal(ret, 0, "Context recv IPv6 UDP failed"); } -static void join_group(struct in6_addr *mcast_addr) +static void join_group(struct net_in6_addr *mcast_addr) { int ret; @@ -1883,7 +1883,7 @@ static void join_group(struct in6_addr *mcast_addr) zassert_equal(ret, 0, "Cannot join IPv6 multicast group"); } -static void leave_group(struct in6_addr *mcast_addr) +static void leave_group(struct net_in6_addr *mcast_addr) { int ret; @@ -1893,9 +1893,9 @@ static void leave_group(struct in6_addr *mcast_addr) ZTEST(net_ipv6, test_dst_site_scope_mcast_recv_ok) { - struct in6_addr mcast_all_dhcp = { { { 0xff, 0x05, 0, 0, 0, 0, 0, 0, + struct net_in6_addr mcast_all_dhcp = { { { 0xff, 0x05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0, 0, 0, 0x03 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; enum net_verdict verdict; struct net_context *ctx; @@ -1922,9 +1922,9 @@ ZTEST(net_ipv6, test_dst_site_scope_mcast_recv_ok) ZTEST(net_ipv6, test_dst_org_scope_mcast_recv) { - struct in6_addr mcast_org = { { { 0xff, 0x08, 0, 0, 0, 0, 0, 0, + struct net_in6_addr mcast_org = { { { 0xff, 0x08, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; enum net_verdict verdict; @@ -1935,9 +1935,9 @@ ZTEST(net_ipv6, test_dst_org_scope_mcast_recv) ZTEST(net_ipv6, test_dst_iface_scope_mcast_send) { - struct in6_addr mcast_iface = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0, + struct net_in6_addr mcast_iface = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; struct net_if_mcast_addr *maddr; struct net_context *ctx; @@ -1974,12 +1974,12 @@ ZTEST(net_ipv6, test_dst_iface_scope_mcast_send) ZTEST(net_ipv6, test_dst_unknown_group_mcast_recv) { - struct in6_addr mcast_unknown_group = { + struct net_in6_addr mcast_unknown_group = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 } } }; - struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, + struct net_in6_addr in6_addr_any = NET_IN6ADDR_ANY_INIT; + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; struct net_context *ctx; enum net_verdict verdict; @@ -2004,12 +2004,12 @@ ZTEST(net_ipv6, test_dst_unknown_group_mcast_recv) ZTEST(net_ipv6, test_y_dst_unjoined_group_mcast_recv) { - struct in6_addr mcast_unjoined_group = { + struct net_in6_addr mcast_unjoined_group = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42 } } }; - struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, + struct net_in6_addr in6_addr_any = NET_IN6ADDR_ANY_INIT; + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; struct net_if_mcast_addr *maddr; struct net_context *ctx; @@ -2051,11 +2051,11 @@ ZTEST(net_ipv6, test_y_dst_unjoined_group_mcast_recv) ZTEST(net_ipv6, test_dst_is_other_iface_mcast_recv) { - struct in6_addr mcast_iface2 = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0x01, + struct net_in6_addr mcast_iface2 = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 } } }; - struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, + struct net_in6_addr in6_addr_any = NET_IN6ADDR_ANY_INIT; + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10 } } }; struct net_if *test_iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); struct net_if_mcast_addr *maddr; @@ -2100,7 +2100,7 @@ static void verify_iface_mcast_send_on_iface_event(void (*action)(void)) { enum net_verdict verdict; struct net_context *ctx; - struct in6_addr solicited_node_mcast; + struct net_in6_addr solicited_node_mcast; action(); @@ -2155,7 +2155,7 @@ static void verify_iface_mcast_recv_on_iface_event(void (*action)(void)) { enum net_verdict verdict; struct net_context *ctx; - struct in6_addr solicited_node_mcast; + struct net_in6_addr solicited_node_mcast; action(); @@ -2212,7 +2212,7 @@ ZTEST(net_ipv6, test_iface_mcast_recv_after_carrier_toggle) ZTEST(net_ipv6, test_no_nd_flag) { bool ret; - struct in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_in6_addr addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x99, 0x10 } } }; struct net_if *iface = TEST_NET_IF; struct net_if_addr *ifaddr; @@ -2262,7 +2262,7 @@ ZTEST(net_ipv6, test_nd_reachability_hint) zassert_equal(net_ipv6_nbr_data(nbr)->state, NET_IPV6_NBR_STATE_REACHABLE); } -static bool is_pe_address_found(struct net_if *iface, struct in6_addr *prefix) +static bool is_pe_address_found(struct net_if *iface, struct net_in6_addr *prefix) { struct net_if_ipv6 *ipv6; @@ -2273,7 +2273,7 @@ static bool is_pe_address_found(struct net_if *iface, struct in6_addr *prefix) ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6 || + ipv6->unicast[i].address.family != NET_AF_INET6 || !ipv6->unicast[i].is_temporary) { continue; } @@ -2289,10 +2289,10 @@ static bool is_pe_address_found(struct net_if *iface, struct in6_addr *prefix) } static void get_pe_addresses(struct net_if *iface, - struct in6_addr **public_addr, - struct in6_addr **temp_addr) + struct net_in6_addr **public_addr, + struct net_in6_addr **temp_addr) { - struct in6_addr prefix = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, + struct net_in6_addr prefix = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } } }; struct net_if_ipv6 *ipv6; @@ -2303,7 +2303,7 @@ static void get_pe_addresses(struct net_if *iface, ARRAY_FOR_EACH(ipv6->unicast, i) { if (!ipv6->unicast[i].is_used || - ipv6->unicast[i].address.family != AF_INET6) { + ipv6->unicast[i].address.family != NET_AF_INET6) { continue; } @@ -2326,7 +2326,7 @@ static void get_pe_addresses(struct net_if *iface, */ ZTEST(net_ipv6, test_z_privacy_extension_01) { - struct in6_addr prefix = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, + struct net_in6_addr prefix = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } } }; struct net_if *iface = net_if_get_default(); bool found; @@ -2356,11 +2356,11 @@ ZTEST(net_ipv6, test_z_privacy_extension_01) ZTEST(net_ipv6, test_z_privacy_extension_02_filters) { - struct in6_addr prefix1 = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, + struct net_in6_addr prefix1 = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr prefix2 = { { { 0x3f, 0xfe, 0x04, 0x07, 0, 0, 0, 1, + struct net_in6_addr prefix2 = { { { 0x3f, 0xfe, 0x04, 0x07, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } } }; - struct in6_addr prefix3 = { { { 0x3f, 0xfe, 0x03, 0x07, 0, 0, 0, 1, + struct net_in6_addr prefix3 = { { { 0x3f, 0xfe, 0x03, 0x07, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 } } }; struct net_if *iface = net_if_get_default(); bool found; @@ -2440,12 +2440,12 @@ ZTEST(net_ipv6, test_z_privacy_extension_02_filters) ZTEST(net_ipv6, test_z_privacy_extension_03_get_addr) { - struct in6_addr dst_addr = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, + struct net_in6_addr dst_addr = { { { 0x3f, 0xfe, 0x05, 0x07, 0, 0, 0, 1, 0, 0, 2, 3, 4, 5, 6, 7 } } }; struct net_if *iface = net_if_get_default(); - struct in6_addr *public_addr = NULL; - struct in6_addr *temp_addr = NULL; - const struct in6_addr *src_addr; + struct net_in6_addr *public_addr = NULL; + struct net_in6_addr *temp_addr = NULL; + const struct net_in6_addr *src_addr; if (!IS_ENABLED(CONFIG_NET_IPV6_PE)) { return; diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c index 6df732b9b8b00..ca3bf5075ef04 100644 --- a/tests/net/ipv6_fragment/src/main.c +++ b/tests/net/ipv6_fragment/src/main.c @@ -33,15 +33,15 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL); #include "udp_internal.h" /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; @@ -1488,7 +1488,7 @@ static enum net_verdict udp_data_received(struct net_conn *conn, const struct net_ipv6_hdr *hdr = NET_IPV6_HDR(pkt); uint8_t verify_buf[NET_IPV6H_LEN]; size_t expected_pkt_length = NET_IPV6H_LEN + NET_UDPH_LEN + 1600U; - uint16_t expected_udp_length = htons(1600U + NET_UDPH_LEN); + uint16_t expected_udp_length = net_htons(1600U + NET_UDPH_LEN); static const char expected_data[] = "123456789."; const size_t expected_data_len = sizeof(expected_data) - 1; uint16_t i; @@ -1596,7 +1596,7 @@ NET_DEVICE_INIT_INSTANCE(net_iface1_test, NET_IPV6_MTU); static void add_nbr(struct net_if *iface, - struct in6_addr *addr, + struct net_in6_addr *addr, struct net_linkaddr *lladdr) { struct net_nbr *nbr; @@ -1606,23 +1606,23 @@ static void add_nbr(struct net_if *iface, zassert_not_null(nbr, "Cannot add neighbor"); } -static void setup_udp_handler(const struct in6_addr *raddr, - const struct in6_addr *laddr, +static void setup_udp_handler(const struct net_in6_addr *raddr, + const struct net_in6_addr *laddr, uint16_t remote_port, uint16_t local_port) { static struct net_conn_handle *handle; - struct sockaddr remote_addr = { 0 }; - struct sockaddr local_addr = { 0 }; + struct net_sockaddr remote_addr = { 0 }; + struct net_sockaddr local_addr = { 0 }; int ret; net_ipaddr_copy(&net_sin6(&local_addr)->sin6_addr, laddr); - local_addr.sa_family = AF_INET6; + local_addr.sa_family = NET_AF_INET6; net_ipaddr_copy(&net_sin6(&remote_addr)->sin6_addr, raddr); - remote_addr.sa_family = AF_INET6; + remote_addr.sa_family = NET_AF_INET6; - ret = net_udp_register(AF_INET6, &remote_addr, &local_addr, + ret = net_udp_register(NET_AF_INET6, &remote_addr, &local_addr, remote_port, local_port, NULL, udp_data_received, NULL, &handle); zassert_equal(ret, 0, "Cannot register UDP handler"); @@ -1692,8 +1692,8 @@ ZTEST(net_ipv6_fragment, test_find_last_ipv6_fragment_udp) struct net_pkt *pkt; int ret; - pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_udp), AF_INET6, - IPPROTO_UDP, ALLOC_TIMEOUT); + pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_udp), NET_AF_INET6, + NET_IPPROTO_UDP, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); @@ -1728,10 +1728,10 @@ ZTEST(net_ipv6_fragment, test_find_last_ipv6_fragment_hbho_udp) pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho) + sizeof(struct net_ipv6_hdr) + 6, - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_set_ipv6_ext_len(pkt, sizeof(ipv6_hbho) - sizeof(struct net_ipv6_hdr)); @@ -1764,10 +1764,10 @@ ZTEST(net_ipv6_fragment, test_find_last_ipv6_fragment_hbho_1) int ret; pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_1), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); /* Add IPv6 header + HBH option + fragment header */ @@ -1807,10 +1807,10 @@ ZTEST(net_ipv6_fragment, test_find_last_ipv6_fragment_hbho_2) int ret; pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_2), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); /* Add IPv6 header + HBH option + fragment header */ @@ -1850,10 +1850,10 @@ ZTEST(net_ipv6_fragment, test_find_last_ipv6_fragment_hbho_3) int ret; pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_3), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); /* Add IPv6 header + HBH option + fragment header */ @@ -1891,10 +1891,10 @@ ZTEST(net_ipv6_fragment, test_find_last_ipv6_fragment_hbho_frag) int ret; pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_frag), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); /* Add IPv6 header + HBH option + fragment header */ @@ -1928,10 +1928,10 @@ ZTEST(net_ipv6_fragment, test_find_last_ipv6_fragment_hbho_frag_1) int ret; pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho_frag_1), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); /* Add IPv6 header + HBH option + fragment header */ @@ -1977,11 +1977,11 @@ ZTEST(net_ipv6_fragment, test_send_ipv6_fragment) pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_hbho) + (count * data_len), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); net_pkt_set_iface(pkt, iface1); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_set_ipv6_ext_len(pkt, 8); /* hbho */ @@ -2008,7 +2008,7 @@ ZTEST(net_ipv6_fragment, test_send_ipv6_fragment) zassert_equal(total_len - net_pkt_ipv6_ext_len(pkt) - 8, pkt_data_len, "Packet size invalid"); - NET_IPV6_HDR(pkt)->len = htons(total_len); + NET_IPV6_HDR(pkt)->len = net_htons(total_len); net_pkt_cursor_init(pkt); net_pkt_set_overwrite(pkt, true); @@ -2042,10 +2042,10 @@ ZTEST(net_ipv6_fragment, test_send_ipv6_fragment_large_hbho) test_type = IPV6_LARGE_HBHO_FRAG; pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_large_hbho), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_set_ipv6_ext_len(pkt, 1032); /* hbho */ @@ -2087,11 +2087,11 @@ ZTEST(net_ipv6_fragment, test_send_ipv6_fragment_without_hbho) test_type = IPV6_WITHOUT_HBHO_FRAG; pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_frag_wo_hbho), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IPV6); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_set_ipv6_ext_len(pkt, NET_IPV6_FRAGH_LEN); /* without hbho*/ @@ -2138,11 +2138,11 @@ ZTEST(net_ipv6_fragment, test_send_ipv6_fragment_udp_loopback) pkt = net_pkt_alloc_with_buffer(iface1, sizeof(ipv6_udp) + (count * data_len), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt, "packet"); net_pkt_set_iface(pkt, iface1); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt, sizeof(struct net_ipv6_hdr)); net_pkt_set_ipv6_ext_len(pkt, 0); @@ -2169,7 +2169,7 @@ ZTEST(net_ipv6_fragment, test_send_ipv6_fragment_udp_loopback) zassert_equal(total_len - net_pkt_ipv6_ext_len(pkt) - 8, pkt_data_len, "Packet size invalid"); - NET_IPV6_HDR(pkt)->len = htons(total_len); + NET_IPV6_HDR(pkt)->len = net_htons(total_len); net_pkt_cursor_init(pkt); net_pkt_set_overwrite(pkt, true); @@ -2226,7 +2226,7 @@ static int handle_ipv6_echo_reply(struct net_icmp_ctx *ctx, const struct net_ipv6_hdr *hdr = NET_IPV6_HDR(pkt); uint8_t verify_buf[NET_IPV6H_LEN]; size_t expected_pkt_length = NET_IPV6H_LEN + ECHO_REPLY_H_LEN + test_recv_payload_len; - uint16_t expected_icmpv6_length = htons(test_recv_payload_len + ECHO_REPLY_H_LEN); + uint16_t expected_icmpv6_length = net_htons(test_recv_payload_len + ECHO_REPLY_H_LEN); uint16_t i; uint8_t expected_data = 0; @@ -2247,7 +2247,7 @@ static int handle_ipv6_echo_reply(struct net_icmp_ctx *ctx, zassert_mem_equal(&hdr->flow, &ipv6_reass_frag1[offsetof(struct net_ipv6_hdr, flow)], sizeof(hdr->flow), "IPv6 header flow mismatch"); zassert_equal(hdr->len, expected_icmpv6_length, "IPv6 header len mismatch"); - zassert_equal(hdr->nexthdr, IPPROTO_ICMPV6, "IPv6 header nexthdr mismatch"); + zassert_equal(hdr->nexthdr, NET_IPPROTO_ICMPV6, "IPv6 header nexthdr mismatch"); zassert_equal(hdr->hop_limit, ipv6_reass_frag1[offsetof(struct net_ipv6_hdr, hop_limit)], "IPv6 header hop_limit mismatch"); zassert_mem_equal(hdr->src, &ipv6_reass_frag1[offsetof(struct net_ipv6_hdr, src)], @@ -2299,7 +2299,7 @@ ZTEST(net_ipv6_fragment, test_recv_ipv6_fragment) int ret; struct net_icmp_ctx ctx; - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_ECHO_REPLY, + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_ECHO_REPLY, 0, handle_ipv6_echo_reply); zassert_equal(ret, 0, "Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_ECHO_REPLY), ret); @@ -2309,11 +2309,11 @@ ZTEST(net_ipv6_fragment, test_recv_ipv6_fragment) payload1_len = NET_IPV6_MTU - sizeof(ipv6_reass_frag1); payload2_len = test_recv_payload_len - payload1_len; - pkt1 = net_pkt_alloc_with_buffer(iface1, NET_IPV6_MTU, AF_UNSPEC, + pkt1 = net_pkt_alloc_with_buffer(iface1, NET_IPV6_MTU, NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt1, "packet"); - net_pkt_set_family(pkt1, AF_INET6); + net_pkt_set_family(pkt1, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt1, sizeof(struct net_ipv6_hdr)); net_pkt_cursor_init(pkt1); @@ -2350,10 +2350,10 @@ ZTEST(net_ipv6_fragment, test_recv_ipv6_fragment) pkt2 = net_pkt_alloc_with_buffer(iface1, payload2_len + sizeof(ipv6_reass_frag2), - AF_UNSPEC, 0, ALLOC_TIMEOUT); + NET_AF_UNSPEC, 0, ALLOC_TIMEOUT); zassert_not_null(pkt2, "packet"); - net_pkt_set_family(pkt2, AF_INET6); + net_pkt_set_family(pkt2, NET_AF_INET6); net_pkt_set_ip_hdr_len(pkt2, sizeof(struct net_ipv6_hdr)); net_pkt_cursor_init(pkt2); diff --git a/tests/net/lib/coap/src/main.c b/tests/net/lib/coap/src/main.c index 55c621433f974..0d6a497622768 100644 --- a/tests/net/lib/coap/src/main.c +++ b/tests/net/lib/coap/src/main.c @@ -46,7 +46,7 @@ static void server_resource_2_callback(struct coap_resource *resource, static int server_resource_1_get(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len); + struct net_sockaddr *addr, net_socklen_t addr_len); static const char * const server_resource_1_path[] = { "s", "1", NULL }; static const char *const server_resource_2_path[] = { "s", "2", NULL }; @@ -63,8 +63,8 @@ static struct coap_resource server_resources[] = { #define MY_PORT 12345 #define peer_addr { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, \ 0, 0, 0, 0, 0, 0, 0, 0x2 } } } -static struct sockaddr_in6 dummy_addr = { - .sin6_family = AF_INET6, +static struct net_sockaddr_in6 dummy_addr = { + .sin6_family = NET_AF_INET6, .sin6_addr = peer_addr }; static uint8_t data_buf[2][COAP_BUF_SIZE]; @@ -790,7 +790,7 @@ ZTEST(coap, test_retransmit_second_round) pending = coap_pending_next_unused(pendings, NUM_PENDINGS); zassert_not_null(pending, "No free pending"); - r = coap_pending_init(pending, &cpkt, (struct sockaddr *) &dummy_addr, + r = coap_pending_init(pending, &cpkt, (struct net_sockaddr *) &dummy_addr, NULL); zassert_equal(r, 0, "Could not initialize packet"); @@ -817,16 +817,16 @@ ZTEST(coap, test_retransmit_second_round) zassert_is_null(rsp_pending, "There should be no active pendings"); } -static bool ipaddr_cmp(const struct sockaddr *a, const struct sockaddr *b) +static bool ipaddr_cmp(const struct net_sockaddr *a, const struct net_sockaddr *b) { if (a->sa_family != b->sa_family) { return false; } - if (a->sa_family == AF_INET6) { + if (a->sa_family == NET_AF_INET6) { return net_ipv6_addr_cmp(&net_sin6(a)->sin6_addr, &net_sin6(b)->sin6_addr); - } else if (a->sa_family == AF_INET) { + } else if (a->sa_family == NET_AF_INET) { return net_ipv4_addr_cmp(&net_sin(a)->sin_addr, &net_sin(b)->sin_addr); } @@ -839,7 +839,7 @@ static void server_resource_1_callback(struct coap_resource *resource, { bool r; - r = ipaddr_cmp(&observer->addr, (const struct sockaddr *)&dummy_addr); + r = ipaddr_cmp(&observer->addr, (const struct net_sockaddr *)&dummy_addr); zassert_true(r, "The address of the observer doesn't match"); coap_remove_observer(resource, observer); @@ -849,13 +849,13 @@ static void server_resource_2_callback(struct coap_resource *resource, { bool r; - r = ipaddr_cmp(&observer->addr, (const struct sockaddr *)&dummy_addr); + r = ipaddr_cmp(&observer->addr, (const struct net_sockaddr *)&dummy_addr); zassert_true(r, "The address of the observer doesn't match"); } static int server_resource_1_get(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, net_socklen_t addr_len) { struct coap_packet response; struct coap_observer *observer; @@ -926,7 +926,7 @@ ZTEST(coap, test_observer_server) zassert_equal(r, 0, "Could not initialize packet"); r = coap_handle_request(&req, server_resources, options, opt_num, - (struct sockaddr *) &dummy_addr, + (struct net_sockaddr *) &dummy_addr, sizeof(dummy_addr)); zassert_equal(r, 0, "Could not handle packet"); @@ -941,7 +941,7 @@ ZTEST(coap, test_observer_server) zassert_equal(r, 0, "Could not initialize packet"); r = coap_handle_request(&req, server_resources, options, opt_num, - (struct sockaddr *) &dummy_addr, + (struct net_sockaddr *) &dummy_addr, sizeof(dummy_addr)); zassert_equal(r, -ENOENT, "There should be no handler for this resource"); @@ -949,7 +949,7 @@ ZTEST(coap, test_observer_server) static int resource_reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { TC_PRINT("You should see this"); @@ -997,7 +997,7 @@ ZTEST(coap, test_observer_client) zassert_equal(r, 0, "Could not parse req packet"); r = coap_handle_request(&req, server_resources, options, opt_num, - (struct sockaddr *) &dummy_addr, + (struct net_sockaddr *) &dummy_addr, sizeof(dummy_addr)); zassert_equal(r, 0, "Could not handle packet"); @@ -1010,7 +1010,7 @@ ZTEST(coap, test_observer_client) zassert_equal(r, 0, "Could not parse rsp packet"); reply = coap_response_received(&rsp, - (const struct sockaddr *) &dummy_addr, + (const struct net_sockaddr *) &dummy_addr, replies, NUM_REPLIES); zassert_not_null(reply, "Couldn't find a matching waiting reply"); } @@ -1039,7 +1039,7 @@ ZTEST(coap, test_handle_invalid_coap_req) zassert_equal(r, 0, "Could not parse req packet"); r = coap_handle_request(&pkt, server_resources, options, opt_num, - (struct sockaddr *) &dummy_addr, sizeof(dummy_addr)); + (struct net_sockaddr *) &dummy_addr, sizeof(dummy_addr)); zassert_equal(r, -ENOTSUP, "Request handling should fail with -ENOTSUP"); } @@ -1832,7 +1832,7 @@ ZTEST(coap, test_transmission_parameters) params.coap_backoff_percent = 250; params.max_retransmission = 3; - r = coap_pending_init(pending, &cpkt, (struct sockaddr *) &dummy_addr, + r = coap_pending_init(pending, &cpkt, (struct net_sockaddr *) &dummy_addr, ¶ms); zassert_equal(r, 0, "Could not initialize packet"); @@ -1841,7 +1841,7 @@ ZTEST(coap, test_transmission_parameters) zassert_equal(pending->params.coap_backoff_percent, 250, "Wrong backoff percent"); zassert_equal(pending->params.max_retransmission, 3, "Wrong max retransmission value"); - r = coap_pending_init(pending, &cpkt, (struct sockaddr *) &dummy_addr, + r = coap_pending_init(pending, &cpkt, (struct net_sockaddr *) &dummy_addr, NULL); zassert_equal(r, 0, "Could not initialize packet"); @@ -1873,7 +1873,7 @@ ZTEST(coap, test_notify_age) zassert_equal(r, 0, "Could not initialize packet"); r = coap_handle_request(&req, server_resources, options, opt_num, - (struct sockaddr *)&dummy_addr, sizeof(dummy_addr)); + (struct net_sockaddr *)&dummy_addr, sizeof(dummy_addr)); zassert_equal(r, 0, "Could not handle packet"); /* Forward time a bit, as not to run this 8 million time */ @@ -1919,7 +1919,7 @@ struct test_coap_request { static int reply_cb(const struct coap_packet *response, struct coap_reply *reply, - const struct sockaddr *from) + const struct net_sockaddr *from) { return 0; } @@ -2006,7 +2006,7 @@ ZTEST(coap, test_response_matching) ARRAY_FOR_EACH_PTR(test_responses, response) { struct coap_packet response_pkt = { 0 }; - struct sockaddr from = { 0 }; + struct net_sockaddr from = { 0 }; struct coap_reply *match; uint8_t data[64]; int ret; diff --git a/tests/net/lib/coap_client/src/main.c b/tests/net/lib/coap_client/src/main.c index 2efd567827299..38fa3b9929b95 100644 --- a/tests/net/lib/coap_client/src/main.c +++ b/tests/net/lib/coap_client/src/main.c @@ -65,7 +65,7 @@ static struct coap_client_request long_request = { .len = sizeof(long_payload) - 1, .user_data = &sem2, }; -static struct sockaddr dst_address; +static struct net_sockaddr dst_address; @@ -118,7 +118,8 @@ static void restore_token(uint8_t *buf) } static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint16_t last_message_id = 0; @@ -140,7 +141,8 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake(int sock, void *buf, size_t max } static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { uint16_t last_message_id = 0; uint8_t type; @@ -161,8 +163,8 @@ static ssize_t z_impl_zsock_sendto_custom_fake(int sock, void *buf, size_t len, } static ssize_t z_impl_zsock_sendto_custom_fake_no_reply(int sock, void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { uint16_t last_message_id = 0; @@ -177,8 +179,8 @@ static ssize_t z_impl_zsock_sendto_custom_fake_no_reply(int sock, void *buf, siz } static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { uint16_t last_message_id = 0; struct coap_packet response = {0}; @@ -210,8 +212,8 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo(int sock, void *buf, size_t static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { uint16_t last_message_id = 0; struct coap_packet response = {0}; @@ -250,24 +252,24 @@ static ssize_t z_impl_zsock_sendto_custom_fake_echo_next_req(int sock, void *buf } static ssize_t z_impl_zsock_sendto_custom_fake_block(int sock, void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { errno = EAGAIN; return -1; } static ssize_t z_impl_zsock_sendto_custom_fake_err(int sock, void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, - socklen_t addrlen) + const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { errno = ENETDOWN; return -1; } static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint16_t last_message_id = 0; @@ -288,8 +290,8 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_response(int sock, void *buf, s } static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint16_t last_message_id = 0; @@ -309,7 +311,8 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_empty_ack(int sock, void *buf, } static ssize_t z_impl_zsock_recvfrom_custom_fake_rst(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint16_t last_message_id = 0; @@ -328,8 +331,9 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_rst(int sock, void *buf, size_t } static ssize_t z_impl_zsock_recvfrom_custom_fake_only_ack(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { int ret; @@ -340,8 +344,9 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_only_ack(int sock, void *buf, s } static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint16_t last_message_id = 0; @@ -361,8 +366,8 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_unmatching(int sock, void *buf, } static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint16_t last_message_id = 0; @@ -388,8 +393,9 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo(int sock, void *buf, size_ } static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint16_t last_message_id = 0; @@ -416,8 +422,8 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_echo_next_req(int sock, void *b static ssize_t z_impl_zsock_recvfrom_custom_fake_duplicate_response(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, - socklen_t *addrlen) + struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { uint8_t token[TOKEN_OFFSET + COAP_TOKEN_MAX_LEN]; @@ -439,8 +445,8 @@ static ssize_t z_impl_zsock_recvfrom_custom_fake_duplicate_response(int sock, vo } static ssize_t z_impl_zsock_recvfrom_custom_fake_observe(int sock, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { int ret = z_impl_zsock_recvfrom_custom_fake_duplicate_response(sock, buf, max_len, flags, src_addr, addrlen); @@ -531,7 +537,8 @@ ZTEST(coap_client, test_request_block) ZTEST(coap_client, test_resend_request) { - int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = { + int (*sendto_fakes[])(int, void *, size_t, int, const struct net_sockaddr *, + net_socklen_t) = { z_impl_zsock_sendto_custom_fake_no_reply, z_impl_zsock_sendto_custom_fake_block, z_impl_zsock_sendto_custom_fake, @@ -646,7 +653,8 @@ ZTEST(coap_client, test_separate_response_ack_fail) req.user_data = &sem1; - int (*sendto_fakes[])(int, void *, size_t, int, const struct sockaddr *, socklen_t) = { + int (*sendto_fakes[])(int, void *, size_t, int, const struct net_sockaddr *, + net_socklen_t) = { z_impl_zsock_sendto_custom_fake, z_impl_zsock_sendto_custom_fake_err, }; diff --git a/tests/net/lib/coap_client/src/stubs.c b/tests/net/lib/coap_client/src/stubs.c index 76289991155bc..55dfc2b4995a3 100644 --- a/tests/net/lib/coap_client/src/stubs.c +++ b/tests/net/lib/coap_client/src/stubs.c @@ -10,10 +10,10 @@ LOG_MODULE_DECLARE(coap_client_test, LOG_LEVEL_DBG); DEFINE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get); -DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *, - socklen_t *); +DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, + struct net_sockaddr *, net_socklen_t *); DEFINE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void *, size_t, int, - const struct sockaddr *, socklen_t); + const struct net_sockaddr *, net_socklen_t); struct zvfs_pollfd { int fd; diff --git a/tests/net/lib/coap_client/src/stubs.h b/tests/net/lib/coap_client/src/stubs.h index c3024536b5453..95e54cef634e6 100644 --- a/tests/net/lib/coap_client/src/stubs.h +++ b/tests/net/lib/coap_client/src/stubs.h @@ -42,10 +42,10 @@ void set_socket_events(int fd, short events); void clear_socket_events(int fd, short events); DECLARE_FAKE_VALUE_FUNC(uint32_t, z_impl_sys_rand32_get); -DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, struct sockaddr *, - socklen_t *); +DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_recvfrom, int, void *, size_t, int, + struct net_sockaddr *, net_socklen_t *); DECLARE_FAKE_VALUE_FUNC(ssize_t, z_impl_zsock_sendto, int, void*, size_t, int, - const struct sockaddr *, socklen_t); + const struct net_sockaddr *, net_socklen_t); #define DO_FOREACH_FAKE(FUNC) \ do { \ diff --git a/tests/net/lib/coap_server/common/src/main.c b/tests/net/lib/coap_server/common/src/main.c index 8de27e60e89b3..7d533d871721c 100644 --- a/tests/net/lib/coap_server/common/src/main.c +++ b/tests/net/lib/coap_server/common/src/main.c @@ -10,7 +10,7 @@ #include static int coap_method1(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, net_socklen_t addr_len) { ARG_UNUSED(resource); ARG_UNUSED(request); @@ -21,7 +21,7 @@ static int coap_method1(struct coap_resource *resource, struct coap_packet *requ } static int coap_method2(struct coap_resource *resource, struct coap_packet *request, - struct sockaddr *addr, socklen_t addr_len) + struct net_sockaddr *addr, net_socklen_t addr_len) { ARG_UNUSED(resource); ARG_UNUSED(request); diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c index f8f9fdc1c806a..d72c8cf8174d4 100644 --- a/tests/net/lib/dns_addremove/src/main.c +++ b/tests/net/lib/dns_addremove/src/main.c @@ -48,13 +48,13 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL); #if defined(CONFIG_NET_IPV6) /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; #endif #if defined(CONFIG_NET_IPV4) /* Interface 1 addresses */ -static struct in_addr my_addr2 = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr my_addr2 = { { { 192, 0, 2, 1 } } }; #endif static struct net_mgmt_event_callback mgmt_cb; diff --git a/tests/net/lib/dns_cache/src/main.c b/tests/net/lib/dns_cache/src/main.c index 95e47d71e3b10..bf3578f5dc6ae 100644 --- a/tests/net/lib/dns_cache/src/main.c +++ b/tests/net/lib/dns_cache/src/main.c @@ -22,7 +22,7 @@ ZTEST_SUITE(net_dns_cache_test, NULL, NULL, clear_cache, NULL, NULL); ZTEST(net_dns_cache_test, test_simple_cache_entry) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read = {0}; const char *query = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_A; @@ -30,7 +30,7 @@ ZTEST(net_dns_cache_test, test_simple_cache_entry) zassert_ok(dns_cache_add(&test_dns_cache, query, &info_write, TEST_DNS_CACHE_DEFAULT_TTL), "Cache entry adding should work."); zassert_equal(1, dns_cache_find(&test_dns_cache, query, query_type, &info_read, 1)); - zassert_equal(AF_INET, info_read.ai_family); + zassert_equal(NET_AF_INET, info_read.ai_family); } ZTEST(net_dns_cache_test, test_not_cached) @@ -45,7 +45,7 @@ ZTEST(net_dns_cache_test, test_not_cached) ZTEST(net_dns_cache_test, test_fill_cache) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read[TEST_DNS_CACHE_SIZE] = {0}; const char *query = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_A; @@ -57,12 +57,12 @@ ZTEST(net_dns_cache_test, test_fill_cache) } zassert_equal(TEST_DNS_CACHE_SIZE, dns_cache_find(&test_dns_cache, query, query_type, info_read, TEST_DNS_CACHE_SIZE)); - zassert_equal(AF_INET, info_read[TEST_DNS_CACHE_SIZE - 1].ai_family); + zassert_equal(NET_AF_INET, info_read[TEST_DNS_CACHE_SIZE - 1].ai_family); } ZTEST(net_dns_cache_test, test_flush) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read[TEST_DNS_CACHE_SIZE] = {0}; const char *query = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_A; @@ -80,7 +80,7 @@ ZTEST(net_dns_cache_test, test_flush) ZTEST(net_dns_cache_test, test_fill_cache_to_small) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read[TEST_DNS_CACHE_SIZE - 1] = {0}; const char *query = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_A; @@ -92,12 +92,12 @@ ZTEST(net_dns_cache_test, test_fill_cache_to_small) } zassert_equal(-ENOSR, dns_cache_find(&test_dns_cache, query, query_type, info_read, TEST_DNS_CACHE_SIZE - 1)); - zassert_equal(AF_INET, info_read[TEST_DNS_CACHE_SIZE - 2].ai_family); + zassert_equal(NET_AF_INET, info_read[TEST_DNS_CACHE_SIZE - 2].ai_family); } ZTEST(net_dns_cache_test, test_closest_expiry_removed) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read = {0}; const char *closest_expiry = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_A; @@ -118,7 +118,7 @@ ZTEST(net_dns_cache_test, test_closest_expiry_removed) ZTEST(net_dns_cache_test, test_expired_entries_removed) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read[3] = {0}; const char *query = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_A; @@ -132,21 +132,21 @@ ZTEST(net_dns_cache_test, test_expired_entries_removed) dns_cache_add(&test_dns_cache, query, &info_write, TEST_DNS_CACHE_DEFAULT_TTL * 3), "Cache entry adding should work."); zassert_equal(3, dns_cache_find(&test_dns_cache, query, query_type, info_read, 3)); - zassert_equal(AF_INET, info_read[0].ai_family); + zassert_equal(NET_AF_INET, info_read[0].ai_family); k_sleep(K_MSEC(TEST_DNS_CACHE_DEFAULT_TTL * 1000 + 1)); zassert_equal(2, dns_cache_find(&test_dns_cache, query, query_type, info_read, 3)); - zassert_equal(AF_INET, info_read[0].ai_family); + zassert_equal(NET_AF_INET, info_read[0].ai_family); k_sleep(K_MSEC(TEST_DNS_CACHE_DEFAULT_TTL * 1000 + 1)); zassert_equal(1, dns_cache_find(&test_dns_cache, query, query_type, info_read, 3)); - zassert_equal(AF_INET, info_read[0].ai_family); + zassert_equal(NET_AF_INET, info_read[0].ai_family); k_sleep(K_MSEC(1)); zassert_equal(1, dns_cache_find(&test_dns_cache, query, query_type, info_read, 3)); - zassert_equal(AF_INET, info_read[0].ai_family); + zassert_equal(NET_AF_INET, info_read[0].ai_family); } ZTEST(net_dns_cache_test, test_different_type_not_returned) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read = {0}; const char *query = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_AAAA; @@ -159,8 +159,8 @@ ZTEST(net_dns_cache_test, test_different_type_not_returned) ZTEST(net_dns_cache_test, test_only_expected_type_returned) { - struct dns_addrinfo info_write_a = {.ai_family = AF_INET}; - struct dns_addrinfo info_write_b = {.ai_family = AF_INET6}; + struct dns_addrinfo info_write_a = {.ai_family = NET_AF_INET}; + struct dns_addrinfo info_write_b = {.ai_family = NET_AF_INET6}; struct dns_addrinfo info_read = {0}; const char *query = "example.com"; enum dns_query_type query_type_a = DNS_QUERY_TYPE_A; @@ -171,14 +171,14 @@ ZTEST(net_dns_cache_test, test_only_expected_type_returned) zassert_ok(dns_cache_add(&test_dns_cache, query, &info_write_b, TEST_DNS_CACHE_DEFAULT_TTL), "Cache entry adding should work."); zassert_equal(1, dns_cache_find(&test_dns_cache, query, query_type_a, &info_read, 1)); - zassert_equal(AF_INET, info_read.ai_family); + zassert_equal(NET_AF_INET, info_read.ai_family); zassert_equal(1, dns_cache_find(&test_dns_cache, query, query_type_b, &info_read, 1)); - zassert_equal(AF_INET6, info_read.ai_family); + zassert_equal(NET_AF_INET6, info_read.ai_family); } ZTEST(net_dns_cache_test, test_remove_single_entry) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read = {0}; const char *query = "example.com"; enum dns_query_type query_type = DNS_QUERY_TYPE_A; @@ -186,7 +186,7 @@ ZTEST(net_dns_cache_test, test_remove_single_entry) zassert_ok(dns_cache_add(&test_dns_cache, query, &info_write, TEST_DNS_CACHE_DEFAULT_TTL), "Cache entry adding should work."); zassert_equal(1, dns_cache_find(&test_dns_cache, query, query_type, &info_read, 1)); - zassert_equal(AF_INET, info_read.ai_family); + zassert_equal(NET_AF_INET, info_read.ai_family); zassert_ok(dns_cache_remove(&test_dns_cache, query), "Cache entry removal should work."); zassert_equal(0, dns_cache_find(&test_dns_cache, query, query_type, &info_read, 1)); @@ -194,8 +194,8 @@ ZTEST(net_dns_cache_test, test_remove_single_entry) ZTEST(net_dns_cache_test, test_remove_multiple_entries_same_query) { - struct dns_addrinfo info_write_a = {.ai_family = AF_INET}; - struct dns_addrinfo info_write_b = {.ai_family = AF_INET6}; + struct dns_addrinfo info_write_a = {.ai_family = NET_AF_INET}; + struct dns_addrinfo info_write_b = {.ai_family = NET_AF_INET6}; struct dns_addrinfo info_read[2] = {0}; const char *query = "example.com"; enum dns_query_type query_type_a = DNS_QUERY_TYPE_A; @@ -215,7 +215,7 @@ ZTEST(net_dns_cache_test, test_remove_multiple_entries_same_query) ZTEST(net_dns_cache_test, test_remove_specific_query_only) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read = {0}; const char *query1 = "example.com"; const char *query2 = "test.com"; @@ -231,12 +231,12 @@ ZTEST(net_dns_cache_test, test_remove_specific_query_only) zassert_ok(dns_cache_remove(&test_dns_cache, query1), "Cache entry removal should work."); zassert_equal(0, dns_cache_find(&test_dns_cache, query1, query_type, &info_read, 1)); zassert_equal(1, dns_cache_find(&test_dns_cache, query2, query_type, &info_read, 1)); - zassert_equal(AF_INET, info_read.ai_family); + zassert_equal(NET_AF_INET, info_read.ai_family); } ZTEST(net_dns_cache_test, test_remove_nonexistent_query) { - struct dns_addrinfo info_write = {.ai_family = AF_INET}; + struct dns_addrinfo info_write = {.ai_family = NET_AF_INET}; struct dns_addrinfo info_read = {0}; const char *query = "example.com"; const char *nonexistent_query = "nonexistent.com"; @@ -249,7 +249,7 @@ ZTEST(net_dns_cache_test, test_remove_nonexistent_query) zassert_ok(dns_cache_remove(&test_dns_cache, nonexistent_query), "Removing nonexistent query should not fail."); zassert_equal(1, dns_cache_find(&test_dns_cache, query, query_type, &info_read, 1)); - zassert_equal(AF_INET, info_read.ai_family); + zassert_equal(NET_AF_INET, info_read.ai_family); } ZTEST(net_dns_cache_test, test_remove_empty_cache) diff --git a/tests/net/lib/dns_dispatcher/src/main.c b/tests/net/lib/dns_dispatcher/src/main.c index e0353e8ac1f7a..3e8bd3761d69a 100644 --- a/tests/net/lib/dns_dispatcher/src/main.c +++ b/tests/net/lib/dns_dispatcher/src/main.c @@ -49,13 +49,13 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL); #if defined(CONFIG_NET_IPV6) /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; #endif #if defined(CONFIG_NET_IPV4) /* Interface 1 addresses */ -static struct in_addr my_addr2 = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr my_addr2 = { { { 192, 0, 2, 1 } } }; #endif static struct net_if *iface1; diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c index 5af734a916f00..02dc83c1bb15a 100644 --- a/tests/net/lib/dns_resolve/src/main.c +++ b/tests/net/lib/dns_resolve/src/main.c @@ -45,20 +45,20 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL); #if defined(CONFIG_NET_IPV6) /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; #endif #if defined(CONFIG_NET_IPV4) /* Interface 1 addresses */ -static struct in_addr my_addr2 = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr my_addr2 = { { { 192, 0, 2, 1 } } }; #endif static struct net_if *iface1; @@ -388,14 +388,14 @@ ZTEST(dns_resolve, test_dns_query_ipv4_server_count) continue; } - if (ctx->servers[i].dns_server.sa_family == AF_INET6) { + if (ctx->servers[i].dns_server.sa_family == NET_AF_INET6) { continue; } count++; if (net_sin(&ctx->servers[i].dns_server)->sin_port == - ntohs(53)) { + net_ntohs(53)) { port++; } } @@ -418,14 +418,14 @@ ZTEST(dns_resolve, test_dns_query_ipv6_server_count) continue; } - if (ctx->servers[i].dns_server.sa_family == AF_INET) { + if (ctx->servers[i].dns_server.sa_family == NET_AF_INET) { continue; } count++; if (net_sin6(&ctx->servers[i].dns_server)->sin6_port == - ntohs(53)) { + net_ntohs(53)) { port++; } } @@ -666,7 +666,7 @@ ZTEST(dns_resolve, test_dns_query_ipv6) } struct expected_addr_status { - struct sockaddr addr; + struct net_sockaddr addr; int status1; int status2; const char *caller; @@ -687,7 +687,7 @@ void dns_result_numeric_cb(enum dns_resolve_status status, zassert_true(false, "Invalid status"); } - if (info && info->ai_family == AF_INET) { + if (info && info->ai_family == NET_AF_INET) { #if defined(CONFIG_NET_IPV4) if (net_ipv4_addr_cmp(&net_sin(&info->ai_addr)->sin_addr, &my_addr2) != true) { @@ -696,7 +696,7 @@ void dns_result_numeric_cb(enum dns_resolve_status status, #endif } - if (info && info->ai_family == AF_INET6) { + if (info && info->ai_family == NET_AF_INET6) { #if defined(CONFIG_NET_IPV6) if (net_ipv6_addr_cmp(&net_sin6(&info->ai_addr)->sin6_addr, &my_addr3) != true) { @@ -770,7 +770,7 @@ ZTEST(dns_resolve, test_dns_query_ipv6_numeric) ZTEST(dns_resolve, test_mdns_ipv4_igmp_group) { struct net_if_mcast_addr *maddr; - struct sockaddr_in addr4; + struct net_sockaddr_in addr4; bool st; /* Skip this test if mDNS responder is enabled because it will join @@ -781,7 +781,7 @@ ZTEST(dns_resolve, test_mdns_ipv4_igmp_group) Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV4_IGMP); st = net_ipaddr_parse(MDNS_IPV4_ADDR, sizeof(MDNS_IPV4_ADDR) - 1, - (struct sockaddr *)&addr4); + (struct net_sockaddr *)&addr4); zassert_true(st, "Cannot parse IPv4 address"); maddr = net_if_ipv4_maddr_lookup(&addr4.sin_addr, NULL); @@ -794,7 +794,7 @@ ZTEST(dns_resolve, test_mdns_ipv4_igmp_group) ZTEST(dns_resolve, test_mdns_ipv6_mld_group) { struct net_if_mcast_addr *maddr; - struct sockaddr_in6 addr6; + struct net_sockaddr_in6 addr6; bool st; /* Skip this test if mDNS responder is enabled because it will join @@ -805,7 +805,7 @@ ZTEST(dns_resolve, test_mdns_ipv6_mld_group) Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV6_MLD); st = net_ipaddr_parse(MDNS_IPV6_ADDR, sizeof(MDNS_IPV6_ADDR) - 1, - (struct sockaddr *)&addr6); + (struct net_sockaddr *)&addr6); zassert_true(st, "Cannot parse IPv6 address"); maddr = net_if_ipv6_maddr_lookup(&addr6.sin6_addr, NULL); @@ -827,7 +827,7 @@ ZTEST(dns_resolve, test_dns_hostname_resolve_ipv4) char hostname[MAX_HOSTNAME_LEN + 1] = { 0 }; int ret; - hints.ai_family = AF_INET; + hints.ai_family = NET_AF_INET; strncpy(hostname, net_hostname_get(), sizeof(hostname) - 1); ret = zsock_getaddrinfo(hostname, NULL, &hints, &addrinfos); @@ -852,7 +852,7 @@ ZTEST(dns_resolve, test_dns_hostname_resolve_ipv6) char hostname[MAX_HOSTNAME_LEN + 1] = { 0 }; int ret; - hints.ai_family = AF_INET6; + hints.ai_family = NET_AF_INET6; strncpy(hostname, net_hostname_get(), sizeof(hostname) - 1); ret = zsock_getaddrinfo(hostname, NULL, &hints, &addrinfos); @@ -871,20 +871,20 @@ ZTEST(dns_resolve, test_dns_localhost_resolve_ipv4) { Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV4); - struct in_addr addr = INADDR_LOOPBACK_INIT; + struct net_in_addr addr = INADDR_LOOPBACK_INIT; struct zsock_addrinfo hints = { 0 }; struct zsock_addrinfo *addrinfos; const char *hostname = "localhost"; int ret; - hints.ai_family = AF_INET; + hints.ai_family = NET_AF_INET; ret = zsock_getaddrinfo(hostname, NULL, &hints, &addrinfos); zassert_equal(ret, 0, "getaddrinfo failed with %d (%s)", ret, zsock_gai_strerror(ret)); zassert_equal(memcmp(&net_sin(addrinfos[0].ai_addr)->sin_addr, - &addr, sizeof(struct in_addr)), + &addr, sizeof(struct net_in_addr)), 0, "not loopback address"); } @@ -892,20 +892,20 @@ ZTEST(dns_resolve, test_dns_localhost_resolve_ipv6) { Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV6); - struct in6_addr addr = IN6ADDR_LOOPBACK_INIT; + struct net_in6_addr addr = IN6ADDR_LOOPBACK_INIT; struct zsock_addrinfo hints = { 0 }; struct zsock_addrinfo *addrinfos; const char *hostname = "localhost"; int ret; - hints.ai_family = AF_INET6; + hints.ai_family = NET_AF_INET6; ret = zsock_getaddrinfo(hostname, NULL, &hints, &addrinfos); zassert_equal(ret, 0, "getaddrinfo failed with %d (%s)", ret, zsock_gai_strerror(ret)); zassert_equal(memcmp(&net_sin6(addrinfos[0].ai_addr)->sin6_addr, - &addr, sizeof(struct in6_addr)), + &addr, sizeof(struct net_in6_addr)), 0, "not loopback address"); } diff --git a/tests/net/lib/dns_sd/src/main.c b/tests/net/lib/dns_sd/src/main.c index f42c2695f765e..c681da40635b1 100644 --- a/tests/net/lib/dns_sd/src/main.c +++ b/tests/net/lib/dns_sd/src/main.c @@ -45,9 +45,9 @@ extern int add_srv_record(const struct dns_sd_rec *inst, uint32_t ttl, uint16_t *host_offset); extern size_t service_proto_size(const struct dns_sd_rec *ref); extern bool rec_is_valid(const struct dns_sd_rec *ref); -extern int setup_dst_addr(int sock, sa_family_t family, - struct sockaddr *src, socklen_t src_len, - struct sockaddr *dst, socklen_t *dst_len); +extern int setup_dst_addr(int sock, net_sa_family_t family, + struct net_sockaddr *src, net_socklen_t src_len, + struct net_sockaddr *dst, net_socklen_t *dst_len); /** Text for advertised service */ @@ -95,8 +95,8 @@ static uint8_t *create_query(const struct dns_sd_rec *inst, struct dns_header *hdr = (struct dns_header *)&create_query_buf[0]; - hdr->id = htons(0); - hdr->qdcount = htons(1); + hdr->id = net_htons(0); + hdr->qdcount = net_htons(1); offs += sizeof(struct dns_header); label_size = strlen(inst->service); @@ -118,8 +118,8 @@ static uint8_t *create_query(const struct dns_sd_rec *inst, struct dns_query *query = (struct dns_query *)&create_query_buf[offs]; - query->type = htons(rr_type); - query->class_ = htons(DNS_CLASS_IN); + query->type = net_htons(rr_type); + query->class_ = net_htons(DNS_CLASS_IN); offs += sizeof(struct dns_query); zassert_equal(expected_req_buf_size, offs, @@ -434,7 +434,7 @@ ZTEST(dns_sd, test_add_a_record) const uint32_t offset = 0; const uint16_t host_offset = 0x59; /* this one is made up */ - const struct in_addr addr = { { { 177, 5, 240, 13 } } }; + const struct net_in_addr addr = { { { 177, 5, 240, 13 } } }; static uint8_t actual_buf[BUFSZ]; static const uint8_t expected_buf[] = { @@ -444,7 +444,7 @@ ZTEST(dns_sd, test_add_a_record) int expected_int = sizeof(expected_buf); int actual_int = add_a_record(&nasxxxxxx, ttl, host_offset, - ntohl(addr.s_addr), actual_buf, offset, + net_ntohl(addr.s_addr), actual_buf, offset, sizeof(actual_buf)); zassert_equal(actual_int, expected_int, ""); @@ -455,12 +455,12 @@ ZTEST(dns_sd, test_add_a_record) /* test offset too large */ zassert_equal(-E2BIG, add_a_record(&nasxxxxxx, ttl, DNS_SD_PTR_MASK, - ntohl(addr.s_addr), actual_buf, offset, + net_ntohl(addr.s_addr), actual_buf, offset, sizeof(actual_buf)), ""); /* test buffer too small */ zassert_equal(-ENOSPC, add_a_record(&nasxxxxxx, ttl, - host_offset, ntohl(addr.s_addr), + host_offset, net_ntohl(addr.s_addr), actual_buf, offset, 0), ""); } @@ -511,7 +511,7 @@ ZTEST(dns_sd, test_add_aaaa_record) /** Test for @ref dns_sd_handle_ptr_query */ ZTEST(dns_sd, test_dns_sd_handle_ptr_query) { - struct in_addr addr = { { { 177, 5, 240, 13 } } }; + struct net_in_addr addr = { { { 177, 5, 240, 13 } } }; static uint8_t actual_rsp[512]; static uint8_t expected_rsp[] = { 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x01, @@ -577,7 +577,7 @@ ZTEST(dns_sd, test_dns_sd_handle_service_type_enum) DNS_SD_EMPTY_TXT, CONST_PORT); - struct in_addr addr = { { { 177, 5, 240, 13 } } }; + struct net_in_addr addr = { { { 177, 5, 240, 13 } } }; static uint8_t actual_rsp[512]; static uint8_t expected_rsp[] = { 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, @@ -658,9 +658,9 @@ ZTEST(dns_sd, test_dns_sd_rec_match) ZTEST(dns_sd, test_setup_dst_addr) { struct net_if *iface; - struct sockaddr dst; - socklen_t dst_len; - socklen_t optlen; + struct net_sockaddr dst; + net_socklen_t dst_len; + net_socklen_t optlen; int ttl; iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); @@ -668,17 +668,17 @@ ZTEST(dns_sd, test_setup_dst_addr) /* IPv4 case */ int v4; - struct in_addr addr_v4_expect = { { { 224, 0, 0, 251 } } }; + struct net_in_addr addr_v4_expect = { { { 224, 0, 0, 251 } } }; - memset(&dst, 0, sizeof(struct sockaddr)); + memset(&dst, 0, sizeof(struct net_sockaddr)); - v4 = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + v4 = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(v4 >= 0, "Create IPv4 UDP context failed (%d)", -errno); - zassert_equal(0, setup_dst_addr(v4, AF_INET, NULL, 0, &dst, &dst_len), ""); + zassert_equal(0, setup_dst_addr(v4, NET_AF_INET, NULL, 0, &dst, &dst_len), ""); optlen = sizeof(int); - (void)zsock_getsockopt(v4, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, &optlen); + (void)zsock_getsockopt(v4, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, &ttl, &optlen); zassert_equal(255, ttl, "TTL invalid (%d vs %d)", 255, ttl); zassert_true(net_ipv4_addr_cmp(&addr_v4_expect, @@ -690,18 +690,18 @@ ZTEST(dns_sd, test_setup_dst_addr) #if defined(CONFIG_NET_IPV6) /* IPv6 case */ int v6; - struct in6_addr addr_v6_expect = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0xfb } } }; + struct net_in6_addr addr_v6_expect = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0xfb } } }; - memset(&dst, 0, sizeof(struct sockaddr)); + memset(&dst, 0, sizeof(struct net_sockaddr)); - v6 = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + v6 = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(v6 >= 0, "Create IPv6 UDP context failed (%d)", -errno); - zassert_equal(0, setup_dst_addr(v6, AF_INET6, NULL, 0, &dst, &dst_len), ""); + zassert_equal(0, setup_dst_addr(v6, NET_AF_INET6, NULL, 0, &dst, &dst_len), ""); optlen = sizeof(int); - (void)zsock_getsockopt(v6, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, &optlen); + (void)zsock_getsockopt(v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, &ttl, &optlen); zassert_equal(255, ttl, "Hoplimit invalid (%d vs %d)", 255, ttl); zassert_true(net_ipv6_addr_cmp(&addr_v6_expect, @@ -715,11 +715,11 @@ ZTEST(dns_sd, test_setup_dst_addr) int xx; - xx = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + xx = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(xx >= 0, "Create IPV4 udp socket failed"); zassert_equal(-EPFNOSUPPORT, - setup_dst_addr(xx, AF_PACKET, NULL, 0, &dst, &dst_len), ""); + setup_dst_addr(xx, NET_AF_PACKET, NULL, 0, &dst, &dst_len), ""); } /** test for @ref dns_sd_is_service_type_enumeration */ diff --git a/tests/net/lib/http_client/src/main.c b/tests/net/lib/http_client/src/main.c index a7737dad56526..251e446c953a4 100644 --- a/tests/net/lib/http_client/src/main.c +++ b/tests/net/lib/http_client/src/main.c @@ -361,7 +361,7 @@ ZTEST(http_client, test_http1_client_post_payload_cb) static void client_tests_before(void *fixture) { - struct sockaddr_in6 sa; + struct net_sockaddr_in6 sa; int ret; ARG_UNUSED(fixture); @@ -379,23 +379,23 @@ static void client_tests_before(void *fixture) return; } - ret = zsock_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + ret = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP); if (ret < 0) { printk("Failed to create client socket (%d)\n", errno); return; } client_fd = ret; - sa.sin6_family = AF_INET6; - sa.sin6_port = htons(SERVER_PORT); + sa.sin6_family = NET_AF_INET6; + sa.sin6_port = net_htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET6, SERVER_IPV6_ADDR, &sa.sin6_addr.s6_addr); + ret = zsock_inet_pton(NET_AF_INET6, SERVER_IPV6_ADDR, &sa.sin6_addr.s6_addr); if (ret != 1) { printk("inet_pton() failed to convert %s\n", SERVER_IPV6_ADDR); return; } - ret = zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)); + ret = zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)); if (ret < 0) { printk("Failed to connect (%d)\n", errno); } diff --git a/tests/net/lib/http_server/core/src/main.c b/tests/net/lib/http_server/core/src/main.c index 39ce6c6608c1c..9abaaa4354974 100644 --- a/tests/net/lib/http_server/core/src/main.c +++ b/tests/net/lib/http_server/core/src/main.c @@ -2360,13 +2360,13 @@ ZTEST(server_function_tests, test_http2_500_internal_server_error) ZTEST(server_function_tests_no_init, test_http_server_start_stop) { - struct sockaddr_in sa = { 0 }; + struct net_sockaddr_in sa = { 0 }; int ret; - sa.sin_family = AF_INET; - sa.sin_port = htons(SERVER_PORT); + sa.sin_family = NET_AF_INET; + sa.sin_port = net_htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET, SERVER_IPV4_ADDR, &sa.sin_addr.s_addr); + ret = zsock_inet_pton(NET_AF_INET, SERVER_IPV4_ADDR, &sa.sin_addr.s_addr); zassert_equal(1, ret, "inet_pton() failed to convert %s", SERVER_IPV4_ADDR); zassert_ok(http_server_start(), "Failed to start the server"); @@ -2378,11 +2378,11 @@ ZTEST(server_function_tests_no_init, test_http_server_start_stop) zassert_ok(http_server_start(), "Failed to start the server"); /* Server should be listening now. */ - ret = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_not_equal(ret, -1, "failed to create client socket (%d)", errno); client_fd = ret; - zassert_ok(zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)), + zassert_ok(zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)), "failed to connect to the server (%d)", errno); zassert_ok(zsock_close(client_fd), "close() failed on the client fd (%d)", errno); client_fd = -1; @@ -2394,11 +2394,11 @@ ZTEST(server_function_tests_no_init, test_http_server_start_stop) /* Let the server thread run. */ k_msleep(CONFIG_HTTP_SERVER_RESTART_DELAY + 10); - ret = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_not_equal(ret, -1, "failed to create client socket (%d)", errno); client_fd = ret; - zassert_ok(zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)), + zassert_ok(zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)), "failed to connect to the server (%d)", errno); zassert_ok(zsock_close(client_fd), "close() failed on the client fd (%d)", errno); client_fd = -1; @@ -2782,7 +2782,7 @@ ZTEST(server_function_tests, test_http1_static_fs_compression) static void http_server_tests_before(void *fixture) { - struct sockaddr_in sa; + struct net_sockaddr_in sa; struct timeval optval = { .tv_sec = TIMEOUT_S, .tv_usec = 0, @@ -2804,30 +2804,30 @@ static void http_server_tests_before(void *fixture) return; } - ret = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); if (ret < 0) { printk("Failed to create client socket (%d)\n", errno); return; } client_fd = ret; - ret = zsock_setsockopt(client_fd, SOL_SOCKET, SO_RCVTIMEO, &optval, + ret = zsock_setsockopt(client_fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); if (ret < 0) { printk("Failed to set timeout (%d)\n", errno); return; } - sa.sin_family = AF_INET; - sa.sin_port = htons(SERVER_PORT); + sa.sin_family = NET_AF_INET; + sa.sin_port = net_htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET, SERVER_IPV4_ADDR, &sa.sin_addr.s_addr); + ret = zsock_inet_pton(NET_AF_INET, SERVER_IPV4_ADDR, &sa.sin_addr.s_addr); if (ret != 1) { printk("inet_pton() failed to convert %s\n", SERVER_IPV4_ADDR); return; } - ret = zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)); + ret = zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)); if (ret < 0) { printk("Failed to connect (%d)\n", errno); } diff --git a/tests/net/lib/http_server/crime/src/main.c b/tests/net/lib/http_server/crime/src/main.c index a00118ed1c551..f8a91b950617e 100644 --- a/tests/net/lib/http_server/crime/src/main.c +++ b/tests/net/lib/http_server/crime/src/main.c @@ -64,32 +64,32 @@ static void test_crime(void) { int ret, recv_len; int client_fd; - int proto = IPPROTO_TCP; + int proto = NET_IPPROTO_TCP; char *ptr; const char *data; size_t len; - struct sockaddr_in sa; + struct net_sockaddr_in sa; static unsigned char buf[512]; zassert_ok(http_server_start(), "Failed to start the server"); - ret = zsock_socket(AF_INET, SOCK_STREAM, proto); + ret = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, proto); zassert_not_equal(ret, -1, "failed to create client socket (%d)", errno); client_fd = ret; - sa.sin_family = AF_INET; - sa.sin_port = htons(SERVER_PORT); + sa.sin_family = NET_AF_INET; + sa.sin_port = net_htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET, MY_IPV4_ADDR, &sa.sin_addr.s_addr); + ret = zsock_inet_pton(NET_AF_INET, MY_IPV4_ADDR, &sa.sin_addr.s_addr); zassert_not_equal(-1, ret, "inet_pton() failed (%d)", errno); zassert_not_equal(0, ret, "%s is not a valid IPv4 address", MY_IPV4_ADDR); zassert_equal(1, ret, "inet_pton() failed to convert %s", MY_IPV4_ADDR); memset(buf, '\0', sizeof(buf)); - ptr = (char *)zsock_inet_ntop(AF_INET, &sa.sin_addr, buf, sizeof(buf)); + ptr = (char *)zsock_inet_ntop(NET_AF_INET, &sa.sin_addr, buf, sizeof(buf)); zassert_not_equal(ptr, NULL, "inet_ntop() failed (%d)", errno); - ret = zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)); + ret = zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)); zassert_not_equal(ret, -1, "failed to connect (%s/%d)", strerror(errno), errno); char *http1_request = "GET / HTTP/1.1\r\n" diff --git a/tests/net/lib/http_server/hpack/src/main.c b/tests/net/lib/http_server/hpack/src/main.c index c3cc732b1a7f3..ea6c85e6cabfd 100644 --- a/tests/net/lib/http_server/hpack/src/main.c +++ b/tests/net/lib/http_server/hpack/src/main.c @@ -92,7 +92,7 @@ static void test_huffman_code_prepare(uint32_t *buf, int index) */ *buf <<= pad_len; *buf |= (1UL << pad_len) - 1UL; - *buf = htonl(*buf); + *buf = net_htonl(*buf); } ZTEST(http2_hpack, test_huffman_encode_single) diff --git a/tests/net/lib/http_server/tls/prj.conf b/tests/net/lib/http_server/tls/prj.conf index 9decd429d2069..f5227738b4841 100644 --- a/tests/net/lib/http_server/tls/prj.conf +++ b/tests/net/lib/http_server/tls/prj.conf @@ -6,7 +6,6 @@ CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_FDTABLE=y CONFIG_EVENTFD=y -CONFIG_POSIX_API=y # Networking config CONFIG_NETWORKING=y diff --git a/tests/net/lib/http_server/tls/src/main.c b/tests/net/lib/http_server/tls/src/main.c index 6d710eb350eb6..5ad87d947e916 100644 --- a/tests/net/lib/http_server/tls/src/main.c +++ b/tests/net/lib/http_server/tls/src/main.c @@ -128,11 +128,11 @@ static void test_tls(void) { int ret, recv_len; int client_fd; - int proto = IPPROTO_TCP; + int proto = NET_IPPROTO_TCP; size_t len; char *ptr; const char *data; - struct sockaddr_in sa; + struct net_sockaddr_in sa; static unsigned char buf[512]; char http1_request[] = "GET / HTTP/1.1\r\n" @@ -143,12 +143,12 @@ static void test_tls(void) /* set the common protocol for both client and server */ if (IS_ENABLED(CONFIG_NET_SOCKETS_SOCKOPT_TLS)) { - proto = IPPROTO_TLS_1_2; + proto = NET_IPPROTO_TLS_1_2; } zassert_ok(http_server_start(), "Failed to start the server"); - ret = zsock_socket(AF_INET, SOCK_STREAM, proto); + ret = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, proto); zassert_not_equal(ret, -1, "failed to create client socket (%d)", errno); client_fd = ret; @@ -163,28 +163,28 @@ static void test_tls(void) sec_tag_list_size = sizeof(sec_tag_list); sec_tag_list = sec_tag_list_verify_none; - ret = zsock_setsockopt(client_fd, SOL_TLS, TLS_SEC_TAG_LIST, + ret = zsock_setsockopt(client_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, sec_tag_list, sec_tag_list_size); zassert_not_equal(ret, -1, "failed to set TLS_SEC_TAG_LIST (%d)", errno); - ret = zsock_setsockopt(client_fd, SOL_TLS, TLS_HOSTNAME, "zephyr.local", + ret = zsock_setsockopt(client_fd, ZSOCK_SOL_TLS, ZSOCK_TLS_HOSTNAME, "zephyr.local", sizeof("zephyr.local")); zassert_not_equal(ret, -1, "failed to set TLS_HOSTNAME (%d)", errno); } - sa.sin_family = AF_INET; - sa.sin_port = htons(SERVER_PORT); + sa.sin_family = NET_AF_INET; + sa.sin_port = net_htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET, MY_IPV4_ADDR, &sa.sin_addr.s_addr); + ret = zsock_inet_pton(NET_AF_INET, MY_IPV4_ADDR, &sa.sin_addr.s_addr); zassert_not_equal(-1, ret, "inet_pton() failed (%d)", errno); zassert_not_equal(ret, 0, "%s is not a valid IPv4 address", MY_IPV4_ADDR); zassert_equal(ret, 1, "inet_pton() failed to convert %s", MY_IPV4_ADDR); memset(buf, '\0', sizeof(buf)); - ptr = (char *)zsock_inet_ntop(AF_INET, &sa.sin_addr, buf, sizeof(buf)); + ptr = (char *)zsock_inet_ntop(NET_AF_INET, &sa.sin_addr, buf, sizeof(buf)); zassert_not_equal(ptr, NULL, "inet_ntop() failed (%d)", errno); - ret = zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)); + ret = zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)); zassert_not_equal(ret, -1, "failed to connect (%d)", errno); ret = zsock_send(client_fd, http1_request, sizeof(http1_request) - 1, 0); diff --git a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c index e72d12896bec3..7d26bea131c27 100644 --- a/tests/net/lib/lwm2m/lwm2m_engine/src/main.c +++ b/tests/net/lib/lwm2m/lwm2m_engine/src/main.c @@ -100,7 +100,7 @@ ZTEST(lwm2m_engine, test_start_stop) (void)memset(&ctx, 0x0, sizeof(ctx)); - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; ctx.sock_fd = -1; ctx.load_credentials = NULL; ctx.desthostname = host_name; @@ -130,7 +130,7 @@ ZTEST(lwm2m_engine, test_pause_resume) (void)memset(&ctx, 0x0, sizeof(ctx)); - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; ctx.sock_fd = -1; ctx.load_credentials = NULL; @@ -155,7 +155,7 @@ ZTEST(lwm2m_engine, test_engine_add_service) (void)memset(&ctx, 0x0, sizeof(ctx)); - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; ctx.load_credentials = NULL; ret = lwm2m_engine_start(&ctx); @@ -194,7 +194,7 @@ ZTEST(lwm2m_engine, test_connect_fail) ctx.sock_fd = -1; ctx.load_credentials = NULL; - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; errno = ENETDOWN; z_impl_zsock_connect_fake.return_val = -1; @@ -212,7 +212,7 @@ ZTEST(lwm2m_engine, test_socket_suspend_resume_connection) ctx.sock_fd = -1; ctx.load_credentials = NULL; - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; ret = lwm2m_engine_start(&ctx); zassert_equal(ret, 0); @@ -235,7 +235,7 @@ ZTEST(lwm2m_engine, test_check_notifications) ctx.sock_fd = -1; ctx.load_credentials = NULL; - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; sys_slist_init(&ctx.observer); obs.last_timestamp = k_uptime_get(); @@ -347,7 +347,7 @@ ZTEST(lwm2m_engine, test_retransmit_request) ctx.sock_fd = -1; ctx.load_credentials = NULL; - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; pending_1.t0 = k_uptime_get(); pending_1.timeout = 200U; @@ -376,7 +376,7 @@ ZTEST(lwm2m_engine, test_socket_recv) (void)memset(&ctx, 0x0, sizeof(ctx)); - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; ctx.sock_fd = -1; set_socket_events(ZSOCK_POLLIN); @@ -399,7 +399,7 @@ ZTEST(lwm2m_engine, test_socket_send) (void)memset(&ctx, 0x0, sizeof(ctx)); - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; ctx.sock_fd = -1; sys_slist_init(&ctx.queued_messages); msg.ctx = &ctx; @@ -430,7 +430,7 @@ ZTEST(lwm2m_engine, test_security) (void)memset(&ctx, 0x0, sizeof(ctx)); my_data_len = snprintk(my_buf, sizeof(my_buf), "-----BEGIN SOMETHING"); - ctx.remote_addr.sa_family = AF_INET; + ctx.remote_addr.sa_family = NET_AF_INET; ctx.sock_fd = -1; ctx.load_credentials = NULL; ctx.desthostname = host_name; @@ -449,9 +449,9 @@ ZTEST(lwm2m_engine, test_security) RESET_FAKE(z_impl_zsock_setsockopt); lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_PSK; zassert_equal(lwm2m_engine_start(&ctx), 0); - zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], TLS_SEC_TAG_LIST); - zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_PEER_VERIFY); - zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], TLS_CIPHERSUITE_LIST); + zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], ZSOCK_TLS_SEC_TAG_LIST); + zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], ZSOCK_TLS_PEER_VERIFY); + zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], ZSOCK_TLS_CIPHERSUITE_LIST); zassert_true(tls_credential_delete_fake.call_count > 3); zassert_true(tls_credential_add_fake.call_count == 2); zassert_equal(tls_credential_add_fake.arg1_history[0], TLS_CREDENTIAL_PSK_ID); @@ -463,9 +463,9 @@ ZTEST(lwm2m_engine, test_security) lwm2m_security_mode_fake.return_val = LWM2M_SECURITY_CERT; ctx.desthostname = NULL; zassert_equal(lwm2m_engine_start(&ctx), 0); - zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], TLS_SEC_TAG_LIST); - zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], TLS_PEER_VERIFY); - zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], TLS_CIPHERSUITE_LIST); + zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[0], ZSOCK_TLS_SEC_TAG_LIST); + zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[1], ZSOCK_TLS_PEER_VERIFY); + zassert_equal(z_impl_zsock_setsockopt_fake.arg2_history[2], ZSOCK_TLS_CIPHERSUITE_LIST); zassert_true(tls_credential_add_fake.call_count == 3); zassert_equal(tls_credential_add_fake.arg1_history[0], TLS_CREDENTIAL_PUBLIC_CERTIFICATE); zassert_equal(tls_credential_add_fake.arg1_history[1], TLS_CREDENTIAL_PRIVATE_KEY); @@ -485,7 +485,7 @@ ZTEST(lwm2m_engine, test_socket_state) { int ret; struct lwm2m_ctx ctx = { - .remote_addr.sa_family = AF_INET, + .remote_addr.sa_family = NET_AF_INET, .sock_fd = -1, .set_socket_state = socket_state, }; diff --git a/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.c b/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.c index 2acab7386cdf2..667a08fc50e03 100644 --- a/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.c +++ b/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.c @@ -26,7 +26,7 @@ DEFINE_FAKE_VALUE_FUNC(int64_t, engine_observe_shedule_next_event, struct observ const int64_t); DEFINE_FAKE_VALUE_FUNC(int, handle_request, struct coap_packet *, struct lwm2m_message *); DEFINE_FAKE_VOID_FUNC(lwm2m_udp_receive, struct lwm2m_ctx *, uint8_t *, uint16_t, - struct sockaddr *); + struct net_sockaddr *); DEFINE_FAKE_VALUE_FUNC(bool, lwm2m_rd_client_is_registred, struct lwm2m_ctx *); DEFINE_FAKE_VOID_FUNC(lwm2m_engine_context_close, struct lwm2m_ctx *); DEFINE_FAKE_VALUE_FUNC(int, lwm2m_get_res_buf, const struct lwm2m_obj_path *, void **, uint16_t *, @@ -41,7 +41,7 @@ DEFINE_FAKE_VALUE_FUNC(int, lwm2m_get_bool, const struct lwm2m_obj_path *, bool DEFINE_FAKE_VALUE_FUNC(int, lwm2m_delete_obj_inst, uint16_t, uint16_t); DEFINE_FAKE_VOID_FUNC(lwm2m_clear_block_contexts); DEFINE_FAKE_VALUE_FUNC(int, lwm2m_security_mode, struct lwm2m_ctx *); -DEFINE_FAKE_VALUE_FUNC(int, z_impl_zsock_setsockopt, int, int, int, const void *, socklen_t); +DEFINE_FAKE_VALUE_FUNC(int, z_impl_zsock_setsockopt, int, int, int, const void *, net_socklen_t); DEFINE_FAKE_VOID_FUNC(engine_update_tx_time); DEFINE_FAKE_VALUE_FUNC(bool, coap_block_has_more, struct coap_packet *); DEFINE_FAKE_VOID_FUNC(lwm2m_rd_client_hint_socket_state, struct lwm2m_ctx *, @@ -94,10 +94,10 @@ int z_impl_zsock_socketpair(int family, int type, int proto, int *sv) return 0; } -DEFINE_FAKE_VALUE_FUNC(int, z_impl_zsock_connect, int, const struct sockaddr *, socklen_t); +DEFINE_FAKE_VALUE_FUNC(int, z_impl_zsock_connect, int, const struct net_sockaddr *, net_socklen_t); ssize_t z_impl_zsock_sendto(int sock, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, net_socklen_t addrlen) { if (sock == PAIR_OUT) { return 1; @@ -110,7 +110,7 @@ ssize_t z_impl_zsock_sendto(int sock, const void *buf, size_t len, int flags, } ssize_t z_impl_zsock_recvfrom(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, net_socklen_t *addrlen) { if (sock == PAIR_IN) { return 1; diff --git a/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.h b/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.h index 7253752c61ac5..3ed19ad0cbea3 100644 --- a/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.h +++ b/tests/net/lib/lwm2m/lwm2m_engine/src/stubs.h @@ -40,7 +40,7 @@ DECLARE_FAKE_VALUE_FUNC(int64_t, engine_observe_shedule_next_event, struct obser const int64_t); DECLARE_FAKE_VALUE_FUNC(int, handle_request, struct coap_packet *, struct lwm2m_message *); DECLARE_FAKE_VOID_FUNC(lwm2m_udp_receive, struct lwm2m_ctx *, uint8_t *, uint16_t, - struct sockaddr *); + struct net_sockaddr *); DECLARE_FAKE_VALUE_FUNC(bool, lwm2m_rd_client_is_registred, struct lwm2m_ctx *); DECLARE_FAKE_VOID_FUNC(lwm2m_engine_context_close, struct lwm2m_ctx *); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_get_res_buf, const struct lwm2m_obj_path *, void **, uint16_t *, @@ -54,9 +54,9 @@ DECLARE_FAKE_VALUE_FUNC(struct lwm2m_engine_obj_field *, lwm2m_get_engine_obj_fi DECLARE_FAKE_VALUE_FUNC(int, lwm2m_get_bool, const struct lwm2m_obj_path *, bool *); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_delete_obj_inst, uint16_t, uint16_t); DECLARE_FAKE_VOID_FUNC(lwm2m_clear_block_contexts); -DECLARE_FAKE_VALUE_FUNC(int, z_impl_zsock_connect, int, const struct sockaddr *, socklen_t); +DECLARE_FAKE_VALUE_FUNC(int, z_impl_zsock_connect, int, const struct net_sockaddr *, net_socklen_t); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_security_mode, struct lwm2m_ctx *); -DECLARE_FAKE_VALUE_FUNC(int, z_impl_zsock_setsockopt, int, int, int, const void *, socklen_t); +DECLARE_FAKE_VALUE_FUNC(int, z_impl_zsock_setsockopt, int, int, int, const void *, net_socklen_t); DECLARE_FAKE_VOID_FUNC(engine_update_tx_time); DECLARE_FAKE_VALUE_FUNC(bool, coap_block_has_more, struct coap_packet *); DECLARE_FAKE_VOID_FUNC(lwm2m_rd_client_hint_socket_state, struct lwm2m_ctx *, diff --git a/tests/net/lib/lwm2m/lwm2m_rd_client/src/main.c b/tests/net/lib/lwm2m/lwm2m_rd_client/src/main.c index bc0eaa10b8c4f..873044ee833c2 100644 --- a/tests/net/lib/lwm2m/lwm2m_rd_client/src/main.c +++ b/tests/net/lib/lwm2m/lwm2m_rd_client/src/main.c @@ -181,11 +181,11 @@ void message_reply_cb_default(struct lwm2m_message *msg) { struct coap_packet response; struct coap_reply reply; - struct sockaddr from; + struct net_sockaddr from; memset(&response, 0, sizeof(struct coap_packet)); memset(&reply, 0, sizeof(struct coap_reply)); - memset(&from, 0, sizeof(struct sockaddr)); + memset(&from, 0, sizeof(struct net_sockaddr)); msg->reply_cb(&response, &reply, &from); } diff --git a/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.c b/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.c index 621057f84969c..e2fe2eea304ea 100644 --- a/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.c +++ b/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.c @@ -108,8 +108,8 @@ void test_throw_network_error_from_engine(int err) } DEFINE_FAKE_VOID_FUNC(lwm2m_engine_context_close, struct lwm2m_ctx *); -DEFINE_FAKE_VALUE_FUNC(char *, lwm2m_sprint_ip_addr, const struct sockaddr *); -char *lwm2m_sprint_ip_addr_fake_default(const struct sockaddr *addr) +DEFINE_FAKE_VALUE_FUNC(char *, lwm2m_sprint_ip_addr, const struct net_sockaddr *); +char *lwm2m_sprint_ip_addr_fake_default(const struct net_sockaddr *addr) { return "192.168.1.1:4444"; } diff --git a/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.h b/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.h index 0a3ce31d9e847..4e0088f849aff 100644 --- a/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.h +++ b/tests/net/lib/lwm2m/lwm2m_rd_client/src/stubs.h @@ -67,8 +67,8 @@ DECLARE_FAKE_VOID_FUNC(lwm2m_engine_context_init, struct lwm2m_ctx *); void lwm2m_engine_context_init_fake1(struct lwm2m_ctx *client_ctx); void test_throw_network_error_from_engine(int err); DECLARE_FAKE_VOID_FUNC(lwm2m_engine_context_close, struct lwm2m_ctx *); -DECLARE_FAKE_VALUE_FUNC(char *, lwm2m_sprint_ip_addr, const struct sockaddr *); -char *lwm2m_sprint_ip_addr_fake_default(const struct sockaddr *addr); +DECLARE_FAKE_VALUE_FUNC(char *, lwm2m_sprint_ip_addr, const struct net_sockaddr *); +char *lwm2m_sprint_ip_addr_fake_default(const struct net_sockaddr *addr); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_server_short_id_to_inst, uint16_t); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_server_disable, uint16_t, k_timeout_t); DECLARE_FAKE_VALUE_FUNC(uint8_t, lwm2m_server_get_prio, uint16_t); diff --git a/tests/net/lib/mdns_responder/src/main.c b/tests/net/lib/mdns_responder/src/main.c index 3d741803e31a8..08ba46672c260 100644 --- a/tests/net/lib/mdns_responder/src/main.c +++ b/tests/net/lib/mdns_responder/src/main.c @@ -95,11 +95,11 @@ static uint8_t mdns_server_ipv6_addr[] = { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xfb }; -static struct in6_addr ll_addr = {{{ +static struct net_in6_addr ll_addr = {{{ 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0x9f, 0x74, 0x88, 0x9c, 0x1b, 0x44, 0x72, 0x39 }}}; -static struct in6_addr sender_ll_addr = {{{ +static struct net_in6_addr sender_ll_addr = {{{ 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x9f, 0x74, 0x88, 0x9c, 0x1b, 0x44, 0x72, 0x39 }}}; @@ -296,7 +296,7 @@ static void send_msg(const uint8_t *data, size_t len) struct net_pkt *pkt; int res; - pkt = net_pkt_alloc_with_buffer(iface1, NET_IPV6UDPH_LEN + len, AF_UNSPEC, + pkt = net_pkt_alloc_with_buffer(iface1, NET_IPV6UDPH_LEN + len, NET_AF_UNSPEC, 0, K_FOREVER); zassert_not_null(pkt, "PKT is null"); @@ -346,7 +346,7 @@ static struct dns_sd_rec *alloc_ext_record(const char *instance, const char *ser memcpy(services[i].text, txt, txt_len); } - services[i].port = htons(port); + services[i].port = net_htons(port); services[i].record->text_size = txt_len; return services[i].record; diff --git a/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c b/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c index 63d94b12885f9..b67a0221c13e1 100644 --- a/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c +++ b/tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c @@ -27,7 +27,7 @@ static uint8_t broker_topic[32]; static uint8_t rx_buffer[BUFFER_SIZE]; static uint8_t tx_buffer[BUFFER_SIZE]; static struct mqtt_client client_ctx; -static struct sockaddr broker; +static struct net_sockaddr broker; int s_sock = -1, c_sock = -1; static struct zsock_pollfd client_fds[1]; static int client_nfds; @@ -108,23 +108,23 @@ static void client_wait(bool timeout_allowed) static void broker_init(void) { - struct sockaddr_in6 *broker6 = net_sin6(&broker); - struct sockaddr_in6 bind_addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(SERVER_PORT), - .sin6_addr = IN6ADDR_ANY_INIT, + struct net_sockaddr_in6 *broker6 = net_sin6(&broker); + struct net_sockaddr_in6 bind_addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(SERVER_PORT), + .sin6_addr = NET_IN6ADDR_ANY_INIT, }; int reuseaddr = 1; int ret; - broker6->sin6_family = AF_INET6; - broker6->sin6_port = htons(SERVER_PORT); - zsock_inet_pton(AF_INET6, SERVER_ADDR, &broker6->sin6_addr); + broker6->sin6_family = NET_AF_INET6; + broker6->sin6_port = net_htons(SERVER_PORT); + zsock_inet_pton(NET_AF_INET6, SERVER_ADDR, &broker6->sin6_addr); memset(broker_topic, 0, sizeof(broker_topic)); broker_offset = 0; - s_sock = zsock_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + s_sock = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP); if (s_sock < 0) { printk("Failed to create server socket\n"); } @@ -135,7 +135,7 @@ static void broker_init(void) printk("Failed to set SO_REUSEADDR on server socket, %d\n", errno); } - ret = zsock_bind(s_sock, (struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ret = zsock_bind(s_sock, (struct net_sockaddr *)&bind_addr, sizeof(bind_addr)); if (ret < 0) { printk("Failed to bind server socket, %d\n", errno); } @@ -712,7 +712,7 @@ ZTEST(mqtt_client, test_mqtt_connect) ZTEST(mqtt_client, test_mqtt_connect_with_binding) { - char name_buf[IFNAMSIZ] = { 0 }; + char name_buf[NET_IFNAMSIZ] = { 0 }; int ret = net_if_get_name(net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)), name_buf, sizeof(name_buf)); diff --git a/tests/net/lib/ocpp/src/main.c b/tests/net/lib/ocpp/src/main.c index 969a710679dad..c9021c9ec047e 100644 --- a/tests/net/lib/ocpp/src/main.c +++ b/tests/net/lib/ocpp/src/main.c @@ -81,7 +81,7 @@ int test_ocpp_init(void) struct ocpp_cs_info csi = { "122.165.245.213", /* ssh.linumiz.com */ "/steve/websocket/CentralSystemService/zephyr", 8180, - AF_INET }; + NET_AF_INET }; net_dhcpv4_start(net_if_get_default()); diff --git a/tests/net/mgmt/src/mgmt.c b/tests/net/mgmt/src/mgmt.c index 3fd94e89d21a7..b19b1e4792719 100644 --- a/tests/net/mgmt/src/mgmt.c +++ b/tests/net/mgmt/src/mgmt.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_MGMT_EVENT_LOG_LEVEL); #define TEST_MGMT_EVENT 0x97AB1234 #define TEST_MGMT_EVENT_UNHANDLED 0x97AB4321 #define TEST_MGMT_EVENT_INFO_SIZE \ - MAX(sizeof(TEST_INFO_STRING), sizeof(struct in6_addr)) + MAX(sizeof(TEST_INFO_STRING), sizeof(struct net_in6_addr)) /* Notifier infra */ static uint64_t event2throw; @@ -44,7 +44,7 @@ static size_t info_length_in_test; static struct net_mgmt_event_callback rx_cb; static char *info_string = TEST_INFO_STRING; -static struct in6_addr addr6 = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, +static struct net_in6_addr addr6 = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; static char info_data[TEST_MGMT_EVENT_INFO_SIZE]; @@ -329,7 +329,7 @@ static int test_core_event(uint64_t event, bool (*func)(void)) { TC_PRINT("- Triggering core event: 0x%" PRIx64 "\n", event); - info_length_in_test = sizeof(struct in6_addr); + info_length_in_test = sizeof(struct net_in6_addr); memcpy(info_data, &addr6, sizeof(addr6)); net_mgmt_init_event_callback(&rx_cb, receiver_cb, event); diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c index ecfc441336de0..ab8ec582ff76c 100644 --- a/tests/net/mld/src/main.c +++ b/tests/net/mld/src/main.c @@ -51,7 +51,7 @@ struct mld_report_mcast_record { uint8_t record_type; uint8_t aux_data_len; uint16_t num_of_sources; - struct in6_addr mcast_addr; + struct net_in6_addr mcast_addr; } __packed; struct mld_report_info { @@ -66,14 +66,14 @@ struct mld_report_handler { void *user_data; }; -static struct in6_addr my_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; -static struct in6_addr mcast_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr mcast_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr *exp_mcast_group; +static struct net_in6_addr *exp_mcast_group; static struct net_if *net_iface; static bool is_group_joined; static bool is_group_left; @@ -426,15 +426,15 @@ static void test_verify_leave_group(void) static void send_query(struct net_if *iface) { struct net_pkt *pkt; - struct in6_addr dst; + struct net_in6_addr dst; int ret; /* Sent to all MLDv2-capable routers */ net_ipv6_addr_create(&dst, 0xff02, 0, 0, 0, 0, 0, 0, 0x0016); /* router alert opt + icmpv6 reserved space + mldv2 mcast record */ - pkt = net_pkt_alloc_with_buffer(iface, 144, AF_INET6, - IPPROTO_ICMPV6, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, 144, NET_AF_INET6, + NET_IPPROTO_ICMPV6, K_FOREVER); zassert_not_null(pkt, "Cannot allocate pkt"); net_pkt_set_ipv6_hop_limit(pkt, 1); /* RFC 3810 ch 7.4 */ @@ -442,7 +442,7 @@ static void send_query(struct net_if *iface) zassert_false(ret, "Cannot create ipv6 pkt"); /* Add hop-by-hop option and router alert option, RFC 3810 ch 5. */ - ret = net_pkt_write_u8(pkt, IPPROTO_ICMPV6); + ret = net_pkt_write_u8(pkt, NET_IPPROTO_ICMPV6); zassert_false(ret, "Failed to write"); ret = net_pkt_write_u8(pkt, 0); /* length (0 means 8 bytes) */ zassert_false(ret, "Failed to write"); @@ -479,11 +479,11 @@ static void send_query(struct net_if *iface) zassert_false(ret, "Failed to write"); ret = net_pkt_write(pkt, net_ipv6_unspecified_address(), - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); zassert_false(ret, "Failed to write"); net_pkt_cursor_init(pkt); - ret = net_ipv6_finalize(pkt, IPPROTO_ICMPV6); + ret = net_ipv6_finalize(pkt, NET_IPPROTO_ICMPV6); zassert_false(ret, "Failed to finalize ipv6 packet"); net_pkt_cursor_init(pkt); @@ -557,7 +557,7 @@ static void test_catch_query(void) is_query_received = false; - ret = net_icmp_init_ctx(&ctx, AF_INET6, NET_ICMPV6_MLD_QUERY, + ret = net_icmp_init_ctx(&ctx, NET_AF_INET6, NET_ICMPV6_MLD_QUERY, 0, handle_mld_query); zassert_equal(ret, 0, "Cannot register %s handler (%d)", STRINGIFY(NET_ICMPV6_MLD_QUERY), ret); @@ -625,7 +625,7 @@ ZTEST(net_mld_test_suite, test_allnodes) { struct net_if *iface = NULL; struct net_if_mcast_addr *ifmaddr; - struct in6_addr addr; + struct net_in6_addr addr; net_ipv6_addr_create_ll_allnodes_mcast(&addr); @@ -669,7 +669,7 @@ static void verify_allnodes_on_iface_event(void (*action)(void)) { struct net_if *iface = NULL; struct net_if_mcast_addr *ifmaddr; - struct in6_addr addr; + struct net_in6_addr addr; bool exclude_report_sent = false; struct mld_report_handler handler = { .fn = expect_exclude_mcast_report, @@ -718,7 +718,7 @@ ZTEST(net_mld_test_suite, test_solicit_node) { struct net_if *iface = NULL; struct net_if_mcast_addr *ifmaddr; - struct in6_addr addr; + struct net_in6_addr addr; net_ipv6_addr_create_solicited_node(&my_addr, &addr); @@ -732,7 +732,7 @@ static void verify_solicit_node_on_iface_event(void (*action)(void)) { struct net_if *iface = NULL; struct net_if_mcast_addr *ifmaddr; - struct in6_addr addr; + struct net_in6_addr addr; bool exclude_report_sent = false; struct mld_report_handler handler = { .fn = expect_exclude_mcast_report, @@ -861,7 +861,7 @@ static size_t get_mcast_addr_count(struct net_if *iface) return ret; } -static void add_mcast_route_and_verify(struct net_if *iface, struct in6_addr *addr, +static void add_mcast_route_and_verify(struct net_if *iface, struct net_in6_addr *addr, struct mld_report_info *info) { k_sem_reset(&wait_data); @@ -876,10 +876,10 @@ static void add_mcast_route_and_verify(struct net_if *iface, struct in6_addr *ad zassert_equal(info->records[0].record_type, NET_IPV6_MLDv2_CHANGE_TO_EXCLUDE_MODE, "Invalid MLDv2 record type"); zassert_mem_equal(&info->records[0].mcast_addr, addr, - sizeof(struct in6_addr), "Invalid reported address"); + sizeof(struct net_in6_addr), "Invalid reported address"); } -static void del_mcast_route_and_verify(struct net_if *iface, struct in6_addr *addr, +static void del_mcast_route_and_verify(struct net_if *iface, struct net_in6_addr *addr, struct mld_report_info *info) { struct net_route_entry_mcast *entry; @@ -899,16 +899,16 @@ static void del_mcast_route_and_verify(struct net_if *iface, struct in6_addr *ad zassert_equal(info->records[0].record_type, NET_IPV6_MLDv2_CHANGE_TO_INCLUDE_MODE, "Invalid MLDv2 record type"); zassert_mem_equal(&info->records[0].mcast_addr, addr, - sizeof(struct in6_addr), "Invalid reported address"); + sizeof(struct net_in6_addr), "Invalid reported address"); } static void verify_mcast_routes_in_mld(struct mld_report_info *info) { struct net_if *dummy_iface = net_if_get_by_index(net_if_get_by_name("dummy0")); struct net_if *null_iface = net_if_get_by_index(net_if_get_by_name("dummy1")); - struct in6_addr site_local_mcast_addr_abcd; - struct in6_addr site_local_mcast_addr_beef; - struct in6_addr site_local_mcast_addr_cafe; + struct net_in6_addr site_local_mcast_addr_abcd; + struct net_in6_addr site_local_mcast_addr_beef; + struct net_in6_addr site_local_mcast_addr_cafe; zassert_not_null(dummy_iface, "Invalid dummy iface"); zassert_not_null(null_iface, "Invalid null iface"); @@ -984,7 +984,7 @@ ZTEST(net_mld_test_suite, test_mcast_routes_in_mld) struct mld_report_info info; struct mld_report_handler handler = { .fn = handle_mld_report, .user_data = &info}; struct net_if *iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); - char str[INET6_ADDRSTRLEN], *addr_str; + char str[NET_INET6_ADDRSTRLEN], *addr_str; memset(&info, 0, sizeof(info)); @@ -1004,7 +1004,8 @@ ZTEST(net_mld_test_suite, test_mcast_routes_in_mld) zassert_ok(k_sem_take(&wait_data, K_MSEC(WAIT_TIME)), "Timeout while waiting for a report"); for (int i = 0; i < info.records_count; ++i) { - addr_str = zsock_inet_ntop(AF_INET6, &info.records[i].mcast_addr, str, sizeof(str)); + addr_str = zsock_inet_ntop(NET_AF_INET6, &info.records[i].mcast_addr, + str, sizeof(str)); } /* 1. Expect that report contains all iface's multicast addressses and no route */ @@ -1019,33 +1020,33 @@ ZTEST(net_mld_test_suite, test_mcast_routes_in_mld) leave_mldv2_capable_routers_group(); } -static void socket_group_with_index(const struct in6_addr *local_addr, bool do_join) +static void socket_group_with_index(const struct net_in6_addr *local_addr, bool do_join) { - struct ipv6_mreq mreq = { 0 }; + struct net_ipv6_mreq mreq = { 0 }; int option; int ret, fd; if (do_join) { - option = IPV6_ADD_MEMBERSHIP; + option = ZSOCK_IPV6_ADD_MEMBERSHIP; } else { - option = IPV6_DROP_MEMBERSHIP; + option = ZSOCK_IPV6_DROP_MEMBERSHIP; } - fd = zsock_socket(AF_INET6, SOCK_DGRAM, 0); + fd = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, 0); zassert_true(fd >= 0, "Cannot get socket (%d)", -errno); - ret = zsock_setsockopt(fd, IPPROTO_IPV6, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IPV6, option, NULL, sizeof(mreq)); zassert_true(ret == -1 && errno == EINVAL, "Incorrect return value (%d)", -errno); - ret = zsock_setsockopt(fd, IPPROTO_IPV6, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IPV6, option, (void *)&mreq, 1); zassert_true(ret == -1 && errno == EINVAL, "Incorrect return value (%d)", -errno); /* First try with empty mreq */ - ret = zsock_setsockopt(fd, IPPROTO_IPV6, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IPV6, option, (void *)&mreq, sizeof(mreq)); zassert_true(ret == -1 && errno == EINVAL, "Incorrect return value (%d)", -errno); @@ -1054,7 +1055,7 @@ static void socket_group_with_index(const struct in6_addr *local_addr, bool do_j memcpy(&mreq.ipv6mr_multiaddr, &mcast_addr, sizeof(mreq.ipv6mr_multiaddr)); - ret = zsock_setsockopt(fd, IPPROTO_IPV6, option, + ret = zsock_setsockopt(fd, NET_IPPROTO_IPV6, option, (void *)&mreq, sizeof(mreq)); if (do_join) { @@ -1085,12 +1086,12 @@ static void socket_group_with_index(const struct in6_addr *local_addr, bool do_j k_msleep(THREAD_SLEEP); } -static void socket_join_group_with_index(const struct in6_addr *addr) +static void socket_join_group_with_index(const struct net_in6_addr *addr) { socket_group_with_index(addr, true); } -static void socket_leave_group_with_index(const struct in6_addr *addr) +static void socket_leave_group_with_index(const struct net_in6_addr *addr) { socket_group_with_index(addr, false); } diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c index 1eaf068136d1d..5f5f1ba24033b 100644 --- a/tests/net/net_pkt/src/main.c +++ b/tests/net/net_pkt/src/main.c @@ -139,7 +139,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_allocate_with_buffer) * Note: we don't care of the family/protocol for now */ pkt = net_pkt_alloc_with_buffer(eth_if, 512, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); /* Did we get the requested size? */ @@ -155,7 +155,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_allocate_with_buffer) * Note: again we don't care of family/protocol for now. */ pkt = net_pkt_alloc_with_buffer(eth_if, 1800, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); zassert_false(pkt_is_of_size(pkt, 1800), "Pkt size is not right"); @@ -170,8 +170,8 @@ ZTEST(net_pkt_test_suite, test_net_pkt_allocate_with_buffer) /* * c) - Now with 512 bytes but on IPv4/UDP */ - pkt = net_pkt_alloc_with_buffer(eth_if, 512, AF_INET, - IPPROTO_UDP, K_NO_WAIT); + pkt = net_pkt_alloc_with_buffer(eth_if, 512, NET_AF_INET, + NET_IPPROTO_UDP, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); /* Because 512 + NET_IPV4UDPH_LEN fits MTU, total must be that one */ @@ -186,8 +186,8 @@ ZTEST(net_pkt_test_suite, test_net_pkt_allocate_with_buffer) /* * c) - Now with 1800 bytes but on IPv4/UDP */ - pkt = net_pkt_alloc_with_buffer(eth_if, 1800, AF_INET, - IPPROTO_UDP, K_NO_WAIT); + pkt = net_pkt_alloc_with_buffer(eth_if, 1800, NET_AF_INET, + NET_IPPROTO_UDP, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); /* Because 1800 + NET_IPV4UDPH_LEN won't fit MTU, payload size @@ -202,10 +202,10 @@ ZTEST(net_pkt_test_suite, test_net_pkt_allocate_with_buffer) zassert_true(atomic_get(&pkt->atomic_ref) == 0, "Pkt not properly unreferenced"); - /* d) - with a zero payload but AF_INET family + /* d) - with a zero payload but NET_AF_INET family */ pkt = net_pkt_alloc_with_buffer(eth_if, 0, - AF_INET, 0, K_NO_WAIT); + NET_AF_INET, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); /* Did we get the requested size? */ @@ -217,10 +217,10 @@ ZTEST(net_pkt_test_suite, test_net_pkt_allocate_with_buffer) zassert_true(atomic_get(&pkt->atomic_ref) == 0, "Pkt not properly unreferenced"); - /* e) - with a zero payload but AF_PACKET family + /* e) - with a zero payload but NET_AF_PACKET family */ pkt = net_pkt_alloc_with_buffer(eth_if, 0, - AF_PACKET, 0, K_NO_WAIT); + NET_AF_PACKET, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); /* Did we get the requested size? */ @@ -244,7 +244,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_basics_of_rw) int ret; pkt = net_pkt_alloc_with_buffer(eth_if, 512, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); /* Once newly allocated with buffer, @@ -426,7 +426,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_advanced_basics) int ret; pkt = net_pkt_alloc_with_buffer(eth_if, 512, - AF_INET, IPPROTO_UDP, K_NO_WAIT); + NET_AF_INET, NET_IPPROTO_UDP, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); pkt_print_cursor(pkt); @@ -518,7 +518,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_easier_rw_usage) int ret; pkt = net_pkt_alloc_with_buffer(eth_if, 512, - AF_INET, IPPROTO_UDP, K_NO_WAIT); + NET_AF_INET, NET_IPPROTO_UDP, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); /* In net core, all goes down in fine to header manipulation. @@ -684,7 +684,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_pull) dummy_pkt = net_pkt_alloc_with_buffer(eth_if, PULL_TEST_PKT_DATA_SIZE, - AF_UNSPEC, + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(dummy_pkt != NULL, "Pkt not allocated"); @@ -735,7 +735,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_pull) dummy_pkt = net_pkt_alloc_with_buffer(eth_if, PULL_TEST_PKT_DATA_SIZE, - AF_UNSPEC, + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(dummy_pkt != NULL, "Pkt not allocated"); @@ -756,7 +756,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_pull) dummy_pkt = net_pkt_alloc_with_buffer(eth_if, PULL_TEST_PKT_DATA_SIZE, - AF_UNSPEC, + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(dummy_pkt != NULL, "Pkt not allocated"); @@ -790,7 +790,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_clone) int ret; pkt = net_pkt_alloc_with_buffer(eth_if, 64, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); ret = net_pkt_write(pkt, buf, sizeof(buf)); @@ -818,7 +818,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_clone) net_pkt_lladdr_dst(pkt)->type = NET_LINK_ETHERNET; zassert_mem_equal(net_pkt_lladdr_dst(pkt)->addr, &buf[6], NET_LINK_ADDR_MAX_LENGTH); - net_pkt_set_family(pkt, AF_INET6); + net_pkt_set_family(pkt, NET_AF_INET6); net_pkt_set_captured(pkt, true); net_pkt_set_eof(pkt, true); net_pkt_set_ptp(pkt, true); @@ -849,7 +849,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_clone) zassert_false(net_pkt_is_being_overwritten(pkt), "Pkt overwrite flag not restored"); - zassert_equal(net_pkt_family(cloned_pkt), AF_INET6, + zassert_equal(net_pkt_family(cloned_pkt), NET_AF_INET6, "Address family value mismatch"); zassert_true(net_pkt_is_captured(cloned_pkt), @@ -986,7 +986,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_headroom_copy) /* Create et_pkt containing the bytes "0123" */ pkt_src = net_pkt_alloc_with_buffer(eth_if, 4, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt_src != NULL, "Pkt not allocated"); res = net_pkt_write(pkt_src, "0123", 4); zassert_equal(res, 0, "Pkt write failed"); @@ -1030,7 +1030,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_get_contiguous_len) /* Allocate pkt with 2 fragments */ struct net_pkt *pkt = net_pkt_rx_alloc_with_buffer( NULL, CONFIG_NET_BUF_DATA_SIZE * 2, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(pkt, "Pkt not allocated"); @@ -1092,7 +1092,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_remove_tail) pkt = net_pkt_alloc_with_buffer(NULL, CONFIG_NET_BUF_DATA_SIZE * 2 + 3, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); net_pkt_cursor_init(pkt); @@ -1140,7 +1140,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_remove_tail) pkt = net_pkt_rx_alloc_with_buffer(NULL, CONFIG_NET_BUF_DATA_SIZE * 2 + 3, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); net_pkt_cursor_init(pkt); net_pkt_write(pkt, small_buffer, CONFIG_NET_BUF_DATA_SIZE * 2 + 3); @@ -1177,7 +1177,7 @@ ZTEST(net_pkt_test_suite, test_net_pkt_shallow_clone_noleak_buf) struct net_buf_pool *tx_data; pkt = net_pkt_alloc_with_buffer(NULL, pkt_size, - AF_UNSPEC, 0, K_NO_WAIT); + NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); @@ -1215,7 +1215,7 @@ void test_net_pkt_shallow_clone_append_buf(int extra_frag_refcounts) struct net_buf *frag; struct net_buf_pool *tx_data; - pkt = net_pkt_alloc_with_buffer(NULL, pkt_size, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_alloc_with_buffer(NULL, pkt_size, NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_true(pkt != NULL, "Pkt not allocated"); net_pkt_get_info(NULL, NULL, NULL, &tx_data); diff --git a/tests/net/npf/src/main.c b/tests/net/npf/src/main.c index 89ddf99cf6b77..84b4e51114fd0 100644 --- a/tests/net/npf/src/main.c +++ b/tests/net/npf/src/main.c @@ -56,12 +56,12 @@ static struct net_pkt *build_test_pkt(int type, int size, struct net_if *iface) struct net_eth_hdr eth_hdr; int ret; - pkt = net_pkt_rx_alloc_with_buffer(iface, size, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(iface, size, NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(pkt, ""); eth_hdr.src = ETH_SRC_ADDR; eth_hdr.dst = ETH_DST_ADDR; - eth_hdr.type = htons(type); + eth_hdr.type = net_htons(type); ret = net_pkt_write(pkt, ð_hdr, sizeof(eth_hdr)); zassert_equal(ret, 0, ""); @@ -81,13 +81,13 @@ static struct net_pkt *build_vlan_test_pkt(int type, int size, struct net_if *if struct net_eth_vlan_hdr eth_hdr; int ret; - pkt = net_pkt_rx_alloc_with_buffer(iface, size, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_rx_alloc_with_buffer(iface, size, NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(pkt, ""); eth_hdr.src = ETH_SRC_ADDR; eth_hdr.dst = ETH_DST_ADDR; - eth_hdr.type = htons(type); - eth_hdr.vlan.tpid = htons(NET_ETH_PTYPE_VLAN); + eth_hdr.type = net_htons(type); + eth_hdr.vlan.tpid = net_htons(NET_ETH_PTYPE_VLAN); ret = net_pkt_write(pkt, ð_hdr, sizeof(eth_hdr)); zassert_equal(ret, 0, ""); @@ -102,25 +102,25 @@ static struct net_pkt *build_vlan_test_pkt(int type, int size, struct net_if *if } static struct net_pkt *build_test_ip_pkt(void *src, void *dst, - sa_family_t family, struct net_if *iface) + net_sa_family_t family, struct net_if *iface) { struct net_pkt *pkt; int ret = -1; int size; - size = (family == AF_INET) ? sizeof(struct net_ipv4_hdr) : - (family == AF_INET6) ? sizeof(struct net_ipv6_hdr) : 0U; + size = (family == NET_AF_INET) ? sizeof(struct net_ipv4_hdr) : + (family == NET_AF_INET6) ? sizeof(struct net_ipv6_hdr) : 0U; pkt = net_pkt_rx_alloc_with_buffer(iface, size, family, 0, K_NO_WAIT); zassert_not_null(pkt, ""); - if (family == AF_INET) { - ret = net_ipv4_create(pkt, (struct in_addr *)src, (struct in_addr *)dst); - } else if (family == AF_INET6) { - ret = net_ipv6_create(pkt, (struct in6_addr *)src, (struct in6_addr *)dst); + if (family == NET_AF_INET) { + ret = net_ipv4_create(pkt, (struct net_in_addr *)src, (struct net_in_addr *)dst); + } else if (family == NET_AF_INET6) { + ret = net_ipv6_create(pkt, (struct net_in6_addr *)src, (struct net_in6_addr *)dst); } zassert_equal(ret, 0, "Cannot create %s packet (%d)", - (family == AF_INET) ? "IPv4" : "IPv6", ret); + (family == NET_AF_INET) ? "IPv4" : "IPv6", ret); DBG("pkt %p: iface %p size %d sa_family %d\n", pkt, iface, size, family); return pkt; @@ -427,14 +427,14 @@ ZTEST(net_pkt_filter_test_suite, test_npf_address_mask) * IP address filtering */ -static struct in_addr ipv4_address_list[4] = { +static struct net_in_addr ipv4_address_list[4] = { { { { 192, 168, 1, 1 } } }, { { { 192, 0, 2, 1 } } }, { { { 172, 16, 0, 1 } } }, { { { 10, 49, 0, 252 } } } }; -static struct in6_addr ipv6_address_list[4] = { +static struct net_in6_addr ipv6_address_list[4] = { { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }, { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }, { { { 0x20, 0x01, 0x0d, 0xb8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }, @@ -442,21 +442,21 @@ static struct in6_addr ipv6_address_list[4] = { }; static NPF_IP_SRC_ADDR_ALLOWLIST(allowlist_ipv4_src_addr, (void *)ipv4_address_list, - ARRAY_SIZE(ipv4_address_list), AF_INET); + ARRAY_SIZE(ipv4_address_list), NET_AF_INET); static NPF_IP_SRC_ADDR_BLOCKLIST(blocklist_ipv4_src_addr, (void *)ipv4_address_list, - ARRAY_SIZE(ipv4_address_list), AF_INET); + ARRAY_SIZE(ipv4_address_list), NET_AF_INET); static NPF_RULE(ipv4_allowlist, NET_OK, allowlist_ipv4_src_addr); static NPF_RULE(ipv4_blocklist, NET_OK, blocklist_ipv4_src_addr); ZTEST(net_pkt_filter_test_suite, test_npf_ipv4_address_filtering) { - struct in_addr dst = { { { 192, 168, 2, 1 } } }; - struct in_addr bad_addr = { { { 192, 168, 2, 3 } } }; - struct net_pkt *pkt_v4 = build_test_ip_pkt(&ipv4_address_list[0], &dst, AF_INET, + struct net_in_addr dst = { { { 192, 168, 2, 1 } } }; + struct net_in_addr bad_addr = { { { 192, 168, 2, 3 } } }; + struct net_pkt *pkt_v4 = build_test_ip_pkt(&ipv4_address_list[0], &dst, NET_AF_INET, &dummy_iface_a); struct net_pkt *pkt_v6 = build_test_ip_pkt(&ipv6_address_list[0], &ipv6_address_list[1], - AF_INET6, &dummy_iface_a); + NET_AF_INET6, &dummy_iface_a); /* make sure pkt is initially accepted */ zassert_true(net_pkt_filter_ip_recv_ok(pkt_v4), ""); @@ -466,14 +466,14 @@ ZTEST(net_pkt_filter_test_suite, test_npf_ipv4_address_filtering) npf_insert_ipv4_recv_rule(&ipv4_allowlist); for (int it = 0; it < ARRAY_SIZE(ipv4_address_list); it++) { - memcpy((struct in_addr *)NET_IPV4_HDR(pkt_v4)->src, &ipv4_address_list[it], - sizeof(struct in_addr)); + memcpy((struct net_in_addr *)NET_IPV4_HDR(pkt_v4)->src, &ipv4_address_list[it], + sizeof(struct net_in_addr)); zassert_true(net_pkt_filter_ip_recv_ok(pkt_v4), ""); } /* And one not listed */ - memcpy((struct in_addr *)NET_IPV4_HDR(pkt_v4)->src, - &bad_addr, sizeof(struct in_addr)); + memcpy((struct net_in_addr *)NET_IPV4_HDR(pkt_v4)->src, + &bad_addr, sizeof(struct net_in_addr)); zassert_false(net_pkt_filter_ip_recv_ok(pkt_v4), ""); zassert_true(net_pkt_filter_ip_recv_ok(pkt_v6), ""); @@ -488,14 +488,14 @@ ZTEST(net_pkt_filter_test_suite, test_npf_ipv4_address_filtering) npf_insert_ipv4_recv_rule(&ipv4_blocklist); for (int it = 0; it < ARRAY_SIZE(ipv4_address_list); it++) { - memcpy((struct in_addr *)NET_IPV4_HDR(pkt_v4)->src, &ipv4_address_list[it], - sizeof(struct in_addr)); + memcpy((struct net_in_addr *)NET_IPV4_HDR(pkt_v4)->src, &ipv4_address_list[it], + sizeof(struct net_in_addr)); zassert_false(net_pkt_filter_ip_recv_ok(pkt_v4), ""); } /* And one not listed */ - memcpy((struct in_addr *)NET_IPV4_HDR(pkt_v4)->src, - &bad_addr, sizeof(struct in_addr)); + memcpy((struct net_in_addr *)NET_IPV4_HDR(pkt_v4)->src, + &bad_addr, sizeof(struct net_in_addr)); zassert_true(net_pkt_filter_ip_recv_ok(pkt_v4), ""); zassert_true(npf_remove_all_ipv4_recv_rules(), ""); @@ -504,23 +504,23 @@ ZTEST(net_pkt_filter_test_suite, test_npf_ipv4_address_filtering) } static NPF_IP_SRC_ADDR_ALLOWLIST(allowlist_ipv6_src_addr, (void *)ipv6_address_list, - ARRAY_SIZE(ipv6_address_list), AF_INET6); + ARRAY_SIZE(ipv6_address_list), NET_AF_INET6); static NPF_IP_SRC_ADDR_BLOCKLIST(blocklist_ipv6_src_addr, (void *)ipv6_address_list, - ARRAY_SIZE(ipv6_address_list), AF_INET6); + ARRAY_SIZE(ipv6_address_list), NET_AF_INET6); static NPF_RULE(ipv6_allowlist, NET_OK, allowlist_ipv6_src_addr); static NPF_RULE(ipv6_blocklist, NET_OK, blocklist_ipv6_src_addr); ZTEST(net_pkt_filter_test_suite, test_npf_ipv6_address_filtering) { - struct in6_addr dst = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, + struct net_in6_addr dst = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; - struct in6_addr bad_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 8, 0, 0, 0, + struct net_in6_addr bad_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct net_pkt *pkt_v6 = build_test_ip_pkt(&ipv6_address_list[0], &dst, AF_INET6, + struct net_pkt *pkt_v6 = build_test_ip_pkt(&ipv6_address_list[0], &dst, NET_AF_INET6, &dummy_iface_a); struct net_pkt *pkt_v4 = build_test_ip_pkt(&ipv4_address_list[0], &ipv4_address_list[1], - AF_INET, &dummy_iface_a); + NET_AF_INET, &dummy_iface_a); /* make sure pkt is initially accepted */ zassert_true(net_pkt_filter_ip_recv_ok(pkt_v4), ""); @@ -530,14 +530,14 @@ ZTEST(net_pkt_filter_test_suite, test_npf_ipv6_address_filtering) npf_insert_ipv6_recv_rule(&ipv6_allowlist); for (int it = 0; it < ARRAY_SIZE(ipv6_address_list); it++) { - memcpy((struct in6_addr *)NET_IPV6_HDR(pkt_v6)->src, - &ipv6_address_list[it], sizeof(struct in6_addr)); + memcpy((struct net_in6_addr *)NET_IPV6_HDR(pkt_v6)->src, + &ipv6_address_list[it], sizeof(struct net_in6_addr)); zassert_true(net_pkt_filter_ip_recv_ok(pkt_v6), ""); } /* And one not listed */ - memcpy((struct in6_addr *)NET_IPV6_HDR(pkt_v6)->src, - &bad_addr, sizeof(struct in6_addr)); + memcpy((struct net_in6_addr *)NET_IPV6_HDR(pkt_v6)->src, + &bad_addr, sizeof(struct net_in6_addr)); zassert_true(net_pkt_filter_ip_recv_ok(pkt_v4), ""); zassert_false(net_pkt_filter_ip_recv_ok(pkt_v6), ""); @@ -552,14 +552,14 @@ ZTEST(net_pkt_filter_test_suite, test_npf_ipv6_address_filtering) npf_insert_ipv6_recv_rule(&ipv6_blocklist); for (int it = 0; it < ARRAY_SIZE(ipv6_address_list); it++) { - memcpy((struct in6_addr *)NET_IPV6_HDR(pkt_v6)->src, - &ipv6_address_list[it], sizeof(struct in6_addr)); + memcpy((struct net_in6_addr *)NET_IPV6_HDR(pkt_v6)->src, + &ipv6_address_list[it], sizeof(struct net_in6_addr)); zassert_false(net_pkt_filter_ip_recv_ok(pkt_v6), ""); } /* And one not listed */ - memcpy((struct in6_addr *)NET_IPV4_HDR(pkt_v6)->src, - &bad_addr, sizeof(struct in6_addr)); + memcpy((struct net_in6_addr *)NET_IPV4_HDR(pkt_v6)->src, + &bad_addr, sizeof(struct net_in6_addr)); zassert_true(net_pkt_filter_ip_recv_ok(pkt_v6), ""); zassert_true(npf_remove_all_ipv6_recv_rules(), ""); diff --git a/tests/net/offloaded_netdev/src/main.c b/tests/net/offloaded_netdev/src/main.c index 35dc63d6dfdf6..a05b63dd833e6 100644 --- a/tests/net/offloaded_netdev/src/main.c +++ b/tests/net/offloaded_netdev/src/main.c @@ -20,8 +20,8 @@ #include #include -static struct in_addr test_addr_ipv4 = { { { 192, 0, 2, 1 } } }; -static struct in6_addr test_addr_ipv6 = { { { +static struct net_in_addr test_addr_ipv4 = { { { 192, 0, 2, 1 } } }; +static struct net_in6_addr test_addr_ipv6 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c index 17078406a4d40..e80cd0e6d2eee 100644 --- a/tests/net/pm/src/main.c +++ b/tests/net/pm/src/main.c @@ -104,7 +104,7 @@ NET_DEVICE_INIT(fake_dev, "fake_dev", void *test_setup(void) { struct net_if *iface; - struct in_addr in4addr_my = { { { 192, 168, 0, 2 } } }; + struct net_in_addr in4addr_my = { { { 192, 168, 0, 2 } } }; struct net_if_addr *ifaddr; iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); @@ -122,22 +122,22 @@ ZTEST(test_net_pm_test_suite, test_pm) net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); const struct device *dev = net_if_get_device(iface); char data[] = "some data"; - struct sockaddr_in addr4; + struct net_sockaddr_in addr4; int sock; int ret; - addr4.sin_family = AF_INET; - addr4.sin_port = htons(12345); - zsock_inet_pton(AF_INET, "192.168.0.1", &addr4.sin_addr); + addr4.sin_family = NET_AF_INET; + addr4.sin_port = net_htons(12345); + zsock_inet_pton(NET_AF_INET, "192.168.0.1", &addr4.sin_addr); - sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Could not open socket"); zassert_false(net_if_is_suspended(iface), "net iface is not suspended"); /* Let's send some data, it should go through */ ret = zsock_sendto(sock, data, ARRAY_SIZE(data), 0, - (struct sockaddr *)&addr4, sizeof(struct sockaddr_in)); + (struct net_sockaddr *)&addr4, sizeof(struct net_sockaddr_in)); zassert_true(ret > 0, "Could not send data"); /* Let's make sure net stack's thread gets ran, or setting PM state @@ -158,7 +158,7 @@ ZTEST(test_net_pm_test_suite, test_pm) /* Let's send some data, it should fail relevantly */ ret = zsock_sendto(sock, data, ARRAY_SIZE(data), 0, - (struct sockaddr *)&addr4, sizeof(struct sockaddr_in)); + (struct net_sockaddr *)&addr4, sizeof(struct net_sockaddr_in)); zassert_true(ret < 0, "Could send data"); ret = pm_device_action_run(dev, PM_DEVICE_ACTION_RESUME); @@ -171,7 +171,7 @@ ZTEST(test_net_pm_test_suite, test_pm) /* Let's send some data, it should go through */ ret = zsock_sendto(sock, data, ARRAY_SIZE(data), 0, - (struct sockaddr *)&addr4, sizeof(struct sockaddr_in)); + (struct net_sockaddr *)&addr4, sizeof(struct net_sockaddr_in)); zassert_true(ret > 0, "Could not send data"); zsock_close(sock); diff --git a/tests/net/pmtu/src/main.c b/tests/net/pmtu/src/main.c index d744a4415f43b..5af546a072246 100644 --- a/tests/net/pmtu/src/main.c +++ b/tests/net/pmtu/src/main.c @@ -58,28 +58,28 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_PMTU_LOG_LEVEL); /* This is a helper function to get the MTU value for the given destination. * It is implemented in tcp.c file. */ -extern uint16_t net_tcp_get_mtu(struct sockaddr *dst); +extern uint16_t net_tcp_get_mtu(struct net_sockaddr *dst); /* Small sleep between tests makes sure that the PMTU destination * cache entries are separated from each other. */ #define SMALL_SLEEP K_MSEC(5) -static struct in_addr dest_ipv4_addr1 = { { { 198, 51, 100, 1 } } }; -static struct in_addr dest_ipv4_addr2 = { { { 198, 51, 100, 2 } } }; -static struct in_addr dest_ipv4_addr3 = { { { 198, 51, 100, 3 } } }; -static struct in_addr dest_ipv4_addr4 = { { { 198, 51, 100, 4 } } }; -static struct in_addr dest_ipv4_addr_not_found = { { { 1, 2, 3, 4 } } }; +static struct net_in_addr dest_ipv4_addr1 = { { { 198, 51, 100, 1 } } }; +static struct net_in_addr dest_ipv4_addr2 = { { { 198, 51, 100, 2 } } }; +static struct net_in_addr dest_ipv4_addr3 = { { { 198, 51, 100, 3 } } }; +static struct net_in_addr dest_ipv4_addr4 = { { { 198, 51, 100, 4 } } }; +static struct net_in_addr dest_ipv4_addr_not_found = { { { 1, 2, 3, 4 } } }; -static struct in6_addr dest_ipv6_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, +static struct net_in6_addr dest_ipv6_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr dest_ipv6_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, +static struct net_in6_addr dest_ipv6_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; -static struct in6_addr dest_ipv6_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, +static struct net_in6_addr dest_ipv6_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3 } } }; -static struct in6_addr dest_ipv6_addr4 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, +static struct net_in6_addr dest_ipv6_addr4 = { { { 0x20, 0x01, 0x0d, 0xb8, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x4 } } }; -static struct in6_addr dest_ipv6_addr_not_found = { { { 0x20, 0x01, 0x0d, 0xb8, 0xde, +static struct net_in6_addr dest_ipv6_addr_not_found = { { { 0x20, 0x01, 0x0d, 0xb8, 0xde, 0xad, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x4 } } }; static struct net_if *target_iface; @@ -210,12 +210,12 @@ ZTEST(net_pmtu_test_suite, test_pmtu_01_ipv4_get_entry) { #if defined(CONFIG_NET_IPV4_PMTU) struct net_pmtu_entry *entry; - struct sockaddr_in dest_ipv4; + struct net_sockaddr_in dest_ipv4; net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr1); - dest_ipv4.sin_family = AF_INET; + dest_ipv4.sin_family = NET_AF_INET; - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv4); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv4); zassert_is_null(entry, "PMTU IPv4 entry is not NULL"); k_sleep(SMALL_SLEEP); @@ -228,12 +228,12 @@ ZTEST(net_pmtu_test_suite, test_pmtu_01_ipv6_get_entry) { #if defined(CONFIG_NET_IPV6_PMTU) struct net_pmtu_entry *entry; - struct sockaddr_in6 dest_ipv6; + struct net_sockaddr_in6 dest_ipv6; net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr1); - dest_ipv6.sin6_family = AF_INET6; + dest_ipv6.sin6_family = NET_AF_INET6; - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv6); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv6); zassert_is_null(entry, "PMTU IPv6 entry is not NULL"); k_sleep(SMALL_SLEEP); @@ -245,13 +245,13 @@ ZTEST(net_pmtu_test_suite, test_pmtu_01_ipv6_get_entry) ZTEST(net_pmtu_test_suite, test_pmtu_02_ipv4_update_entry) { #if defined(CONFIG_NET_IPV4_PMTU) - struct sockaddr_in dest_ipv4; + struct net_sockaddr_in dest_ipv4; int ret; net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr1); - dest_ipv4.sin_family = AF_INET; + dest_ipv4.sin_family = NET_AF_INET; - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv4, 1300); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv4, 1300); zassert_equal(ret, 0, "PMTU IPv4 MTU update failed (%d)", ret); k_sleep(SMALL_SLEEP); @@ -263,13 +263,13 @@ ZTEST(net_pmtu_test_suite, test_pmtu_02_ipv4_update_entry) ZTEST(net_pmtu_test_suite, test_pmtu_02_ipv6_update_entry) { #if defined(CONFIG_NET_IPV6_PMTU) - struct sockaddr_in6 dest_ipv6; + struct net_sockaddr_in6 dest_ipv6; int ret; net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr1); - dest_ipv6.sin6_family = AF_INET6; + dest_ipv6.sin6_family = NET_AF_INET6; - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv6, 1600); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv6, 1600); zassert_equal(ret, 0, "PMTU IPv6 MTU update failed (%d)", ret); k_sleep(SMALL_SLEEP); @@ -281,41 +281,41 @@ ZTEST(net_pmtu_test_suite, test_pmtu_02_ipv6_update_entry) ZTEST(net_pmtu_test_suite, test_pmtu_03_ipv4_create_more_entries) { #if defined(CONFIG_NET_IPV4_PMTU) - struct sockaddr_in dest_ipv4; + struct net_sockaddr_in dest_ipv4; struct net_pmtu_entry *entry; uint16_t mtu; int ret; - dest_ipv4.sin_family = AF_INET; + dest_ipv4.sin_family = NET_AF_INET; net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr1); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv4, 1300); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv4, 1300); zassert_equal(ret, 1300, "PMTU IPv4 MTU update failed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv4); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv4); zassert_equal(entry->mtu, 1300, "PMTU IPv4 MTU is not correct (%d)", entry->mtu); k_sleep(SMALL_SLEEP); net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr2); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv4, 1400); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv4, 1400); zassert_equal(ret, 0, "PMTU IPv4 MTU update failed (%d)", ret); - mtu = net_pmtu_get_mtu((struct sockaddr *)&dest_ipv4); + mtu = net_pmtu_get_mtu((struct net_sockaddr *)&dest_ipv4); zassert_equal(mtu, 1400, "PMTU IPv4 MTU is not correct (%d)", mtu); k_sleep(SMALL_SLEEP); net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr3); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv4, 1500); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv4, 1500); zassert_equal(ret, 0, "PMTU IPv4 MTU update failed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv4); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv4); zassert_equal(entry->mtu, 1500, "PMTU IPv4 MTU is not correct (%d)", entry->mtu); net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr_not_found); - ret = net_pmtu_get_mtu((struct sockaddr *)&dest_ipv4); + ret = net_pmtu_get_mtu((struct net_sockaddr *)&dest_ipv4); zassert_equal(ret, -ENOENT, "PMTU IPv4 MTU update succeed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv4); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv4); zassert_equal(entry, NULL, "PMTU IPv4 MTU update succeed"); #else ztest_test_skip(); @@ -325,41 +325,41 @@ ZTEST(net_pmtu_test_suite, test_pmtu_03_ipv4_create_more_entries) ZTEST(net_pmtu_test_suite, test_pmtu_03_ipv6_create_more_entries) { #if defined(CONFIG_NET_IPV6_PMTU) - struct sockaddr_in6 dest_ipv6; + struct net_sockaddr_in6 dest_ipv6; struct net_pmtu_entry *entry; uint16_t mtu; int ret; - dest_ipv6.sin6_family = AF_INET6; + dest_ipv6.sin6_family = NET_AF_INET6; net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr1); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv6, 1600); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv6, 1600); zassert_equal(ret, 1600, "PMTU IPv6 MTU update failed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv6); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv6); zassert_equal(entry->mtu, 1600, "PMTU IPv6 MTU is not correct (%d)", entry->mtu); k_sleep(SMALL_SLEEP); net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr2); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv6, 1700); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv6, 1700); zassert_equal(ret, 0, "PMTU IPv6 MTU update failed (%d)", ret); - mtu = net_pmtu_get_mtu((struct sockaddr *)&dest_ipv6); + mtu = net_pmtu_get_mtu((struct net_sockaddr *)&dest_ipv6); zassert_equal(mtu, 1700, "PMTU IPv6 MTU is not correct (%d)", mtu); k_sleep(SMALL_SLEEP); net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr3); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv6, 1800); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv6, 1800); zassert_equal(ret, 0, "PMTU IPv6 MTU update failed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv6); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv6); zassert_equal(entry->mtu, 1800, "PMTU IPv6 MTU is not correct (%d)", entry->mtu); net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr_not_found); - ret = net_pmtu_get_mtu((struct sockaddr *)&dest_ipv6); + ret = net_pmtu_get_mtu((struct net_sockaddr *)&dest_ipv6); zassert_equal(ret, -ENOENT, "PMTU IPv6 MTU update succeed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv6); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv6); zassert_equal(entry, NULL, "PMTU IPv6 MTU update succeed"); #else ztest_test_skip(); @@ -369,25 +369,25 @@ ZTEST(net_pmtu_test_suite, test_pmtu_03_ipv6_create_more_entries) ZTEST(net_pmtu_test_suite, test_pmtu_04_ipv4_overflow) { #if defined(CONFIG_NET_IPV4_PMTU) - struct sockaddr_in dest_ipv4; + struct net_sockaddr_in dest_ipv4; struct net_pmtu_entry *entry; int ret; - dest_ipv4.sin_family = AF_INET; + dest_ipv4.sin_family = NET_AF_INET; /* Create more entries than we have space */ net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr4); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv4, 1450); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv4, 1450); zassert_equal(ret, 0, "PMTU IPv4 MTU update failed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv4); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv4); zassert_equal(entry->mtu, 1450, "PMTU IPv4 MTU is not correct (%d)", entry->mtu); k_sleep(SMALL_SLEEP); net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr1); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv4); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv4); zassert_is_null(entry, "PMTU IPv4 MTU found when it should not be"); #else ztest_test_skip(); @@ -397,18 +397,18 @@ ZTEST(net_pmtu_test_suite, test_pmtu_04_ipv4_overflow) ZTEST(net_pmtu_test_suite, test_pmtu_04_ipv6_overflow) { #if defined(CONFIG_NET_IPV6_PMTU) - struct sockaddr_in6 dest_ipv6; + struct net_sockaddr_in6 dest_ipv6; struct net_pmtu_entry *entry; int ret; - dest_ipv6.sin6_family = AF_INET6; + dest_ipv6.sin6_family = NET_AF_INET6; /* Create more entries than we have space */ net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr4); - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv6, 1650); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv6, 1650); zassert_equal(ret, 0, "PMTU IPv6 MTU update failed (%d)", ret); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv6); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv6); zassert_equal(entry->mtu, 1650, "PMTU IPv6 MTU is not correct (%d)", entry->mtu); @@ -417,15 +417,15 @@ ZTEST(net_pmtu_test_suite, test_pmtu_04_ipv6_overflow) /* If we have IPv4 PMTU enabled, then the oldest one is an IPv4 entry. */ if (IS_ENABLED(CONFIG_NET_IPV4_PMTU)) { - struct sockaddr_in dest_ipv4; + struct net_sockaddr_in dest_ipv4; - dest_ipv4.sin_family = AF_INET; + dest_ipv4.sin_family = NET_AF_INET; net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr2); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv4); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv4); } else { net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr1); - entry = net_pmtu_get_entry((struct sockaddr *)&dest_ipv6); + entry = net_pmtu_get_entry((struct net_sockaddr *)&dest_ipv6); } zassert_is_null(entry, "PMTU IPv6 MTU found when it should not be"); @@ -434,7 +434,7 @@ ZTEST(net_pmtu_test_suite, test_pmtu_04_ipv6_overflow) #endif } -static void test_bind(int sock, struct sockaddr *addr, socklen_t addrlen) +static void test_bind(int sock, struct net_sockaddr *addr, net_socklen_t addrlen) { int ret; @@ -449,7 +449,7 @@ static void test_listen(int sock) "listen failed with error %d", errno); } -static void test_connect(int sock, struct sockaddr *addr, socklen_t addrlen) +static void test_connect(int sock, struct net_sockaddr *addr, net_socklen_t addrlen) { zassert_equal(zsock_connect(sock, addr, addrlen), 0, @@ -461,8 +461,8 @@ static void test_connect(int sock, struct sockaddr *addr, socklen_t addrlen) } } -static void test_accept(int sock, int *new_sock, struct sockaddr *addr, - socklen_t *addrlen) +static void test_accept(int sock, int *new_sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { zassert_not_null(new_sock, "null newsock"); @@ -472,27 +472,27 @@ static void test_accept(int sock, int *new_sock, struct sockaddr *addr, #if defined(CONFIG_NET_IPV6_PMTU) static int get_v6_send_recv_sock(int *srv_sock, - struct sockaddr_in6 *my_saddr, - struct sockaddr_in6 *peer_saddr, + struct net_sockaddr_in6 *my_saddr, + struct net_sockaddr_in6 *peer_saddr, uint16_t my_port, uint16_t peer_port) { - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); int new_sock; int c_sock; int s_sock; prepare_sock_tcp_v6(PEER_IPV6_ADDR, peer_port, &s_sock, peer_saddr); - test_bind(s_sock, (struct sockaddr *)peer_saddr, sizeof(*peer_saddr)); + test_bind(s_sock, (struct net_sockaddr *)peer_saddr, sizeof(*peer_saddr)); test_listen(s_sock); prepare_sock_tcp_v6(MY_IPV6_ADDR, my_port, &c_sock, my_saddr); - test_bind(c_sock, (struct sockaddr *)my_saddr, sizeof(*my_saddr)); - test_connect(c_sock, (struct sockaddr *)peer_saddr, sizeof(*peer_saddr)); + test_bind(c_sock, (struct net_sockaddr *)my_saddr, sizeof(*my_saddr)); + test_connect(c_sock, (struct net_sockaddr *)peer_saddr, sizeof(*peer_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); *srv_sock = new_sock; @@ -500,21 +500,21 @@ static int get_v6_send_recv_sock(int *srv_sock, } static int create_icmpv6_ptb(struct net_if *iface, - struct sockaddr_in6 *src, - struct sockaddr_in6 *dst, + struct net_sockaddr_in6 *src, + struct net_sockaddr_in6 *dst, uint32_t mtu, struct net_pkt **pkt) { struct net_icmpv6_ptb ptb_hdr; struct net_pkt *ptb_pkt; - struct in6_addr *dest6; - struct in6_addr *src6; + struct net_in6_addr *dest6; + struct net_in6_addr *src6; int ret; ptb_pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_ipv6_hdr) + sizeof(struct net_icmp_hdr) + sizeof(struct net_icmpv6_ptb), - AF_INET6, IPPROTO_ICMPV6, + NET_AF_INET6, NET_IPPROTO_ICMPV6, PKT_WAIT_TIME); if (ptb_pkt == NULL) { NET_DBG("No buffer"); @@ -536,7 +536,7 @@ static int create_icmpv6_ptb(struct net_if *iface, return ret; } - ptb_hdr.mtu = htonl(mtu); + ptb_hdr.mtu = net_htonl(mtu); ret = net_pkt_write(ptb_pkt, &ptb_hdr, sizeof(ptb_hdr)); if (ret < 0) { @@ -545,7 +545,7 @@ static int create_icmpv6_ptb(struct net_if *iface, } net_pkt_cursor_init(ptb_pkt); - net_ipv6_finalize(ptb_pkt, IPPROTO_ICMPV6); + net_ipv6_finalize(ptb_pkt, NET_IPPROTO_ICMPV6); net_pkt_set_iface(ptb_pkt, iface); @@ -558,22 +558,22 @@ static int create_icmpv6_ptb(struct net_if *iface, ZTEST(net_pmtu_test_suite, test_pmtu_05_ipv6_tcp) { #if defined(CONFIG_NET_IPV6_PMTU) - struct sockaddr_in6 dest_ipv6; - struct sockaddr_in6 s_saddr = { 0 }; /* peer */ - struct sockaddr_in6 c_saddr = { 0 }; /* this host */ + struct net_sockaddr_in6 dest_ipv6; + struct net_sockaddr_in6 s_saddr = { 0 }; /* peer */ + struct net_sockaddr_in6 c_saddr = { 0 }; /* this host */ struct net_pkt *pkt = NULL; int client_sock, server_sock; uint16_t mtu; int ret; - dest_ipv6.sin6_family = AF_INET6; + dest_ipv6.sin6_family = NET_AF_INET6; client_sock = get_v6_send_recv_sock(&server_sock, &c_saddr, &s_saddr, MY_PORT, PEER_PORT); zassert_true(client_sock >= 0, "Failed to create client socket"); /* Set initial MTU for the destination */ - ret = net_pmtu_update_mtu((struct sockaddr *)&c_saddr, 4096); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&c_saddr, 4096); zassert_true(ret >= 0, "PMTU IPv6 MTU update failed (%d)", ret); /* Send an ICMPv6 "Packet too big" message from server to client which @@ -586,7 +586,7 @@ ZTEST(net_pmtu_test_suite, test_pmtu_05_ipv6_tcp) zassert_equal(ret, 0, "Failed to send PTB message"); /* Check that the PMTU entry has been updated */ - mtu = net_tcp_get_mtu((struct sockaddr *)&s_saddr); + mtu = net_tcp_get_mtu((struct net_sockaddr *)&s_saddr); zassert_equal(mtu, 2048, "PMTU IPv6 MTU is not correct (%d)", mtu); (void)zsock_close(client_sock); @@ -598,27 +598,27 @@ ZTEST(net_pmtu_test_suite, test_pmtu_05_ipv6_tcp) #if defined(CONFIG_NET_IPV4_PMTU) static int get_v4_send_recv_sock(int *srv_sock, - struct sockaddr_in *my_saddr, - struct sockaddr_in *peer_saddr, + struct net_sockaddr_in *my_saddr, + struct net_sockaddr_in *peer_saddr, uint16_t my_port, uint16_t peer_port) { - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); int new_sock; int c_sock; int s_sock; prepare_sock_tcp_v4(PEER_IPV4_ADDR, peer_port, &s_sock, peer_saddr); - test_bind(s_sock, (struct sockaddr *)peer_saddr, sizeof(*peer_saddr)); + test_bind(s_sock, (struct net_sockaddr *)peer_saddr, sizeof(*peer_saddr)); test_listen(s_sock); prepare_sock_tcp_v4(MY_IPV4_ADDR, my_port, &c_sock, my_saddr); - test_bind(c_sock, (struct sockaddr *)my_saddr, sizeof(*my_saddr)); - test_connect(c_sock, (struct sockaddr *)peer_saddr, sizeof(*peer_saddr)); + test_bind(c_sock, (struct net_sockaddr *)my_saddr, sizeof(*my_saddr)); + test_connect(c_sock, (struct net_sockaddr *)peer_saddr, sizeof(*peer_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); *srv_sock = new_sock; @@ -626,21 +626,21 @@ static int get_v4_send_recv_sock(int *srv_sock, } static int create_icmpv4_dest_unreach(struct net_if *iface, - struct sockaddr_in *src, - struct sockaddr_in *dst, + struct net_sockaddr_in *src, + struct net_sockaddr_in *dst, uint32_t mtu, struct net_pkt **pkt) { struct net_icmpv4_dest_unreach du_hdr; struct net_pkt *du_pkt; - struct in_addr *dest4; - struct in_addr *src4; + struct net_in_addr *dest4; + struct net_in_addr *src4; int ret; du_pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_ipv4_hdr) + sizeof(struct net_icmp_hdr) + sizeof(struct net_icmpv4_dest_unreach), - AF_INET, IPPROTO_ICMP, + NET_AF_INET, NET_IPPROTO_ICMP, PKT_WAIT_TIME); if (du_pkt == NULL) { NET_DBG("No buffer"); @@ -662,7 +662,7 @@ static int create_icmpv4_dest_unreach(struct net_if *iface, return ret; } - du_hdr.mtu = htons(mtu); + du_hdr.mtu = net_htons(mtu); ret = net_pkt_write(du_pkt, &du_hdr, sizeof(du_hdr)); if (ret < 0) { @@ -671,7 +671,7 @@ static int create_icmpv4_dest_unreach(struct net_if *iface, } net_pkt_cursor_init(du_pkt); - net_ipv4_finalize(du_pkt, IPPROTO_ICMP); + net_ipv4_finalize(du_pkt, NET_IPPROTO_ICMP); net_pkt_set_iface(du_pkt, iface); @@ -684,22 +684,22 @@ static int create_icmpv4_dest_unreach(struct net_if *iface, ZTEST(net_pmtu_test_suite, test_pmtu_05_ipv4_tcp) { #if defined(CONFIG_NET_IPV4_PMTU) - struct sockaddr_in dest_ipv4; - struct sockaddr_in s_saddr = { 0 }; /* peer */ - struct sockaddr_in c_saddr = { 0 }; /* this host */ + struct net_sockaddr_in dest_ipv4; + struct net_sockaddr_in s_saddr = { 0 }; /* peer */ + struct net_sockaddr_in c_saddr = { 0 }; /* this host */ struct net_pkt *pkt = NULL; int client_sock, server_sock; uint16_t mtu; int ret; - dest_ipv4.sin_family = AF_INET; + dest_ipv4.sin_family = NET_AF_INET; client_sock = get_v4_send_recv_sock(&server_sock, &c_saddr, &s_saddr, MY_PORT, PEER_PORT); zassert_true(client_sock >= 0, "Failed to create client socket"); /* Set initial MTU for the destination */ - ret = net_pmtu_update_mtu((struct sockaddr *)&c_saddr, 4096); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&c_saddr, 4096); zassert_true(ret >= 0, "PMTU IPv6 MTU update failed (%d)", ret); /* Send an ICMPv4 "Destination Unreachable" message from server to client which @@ -712,7 +712,7 @@ ZTEST(net_pmtu_test_suite, test_pmtu_05_ipv4_tcp) zassert_equal(ret, 0, "Failed to send Destination Unreachable message"); /* Check that the PMTU entry has been updated */ - mtu = net_tcp_get_mtu((struct sockaddr *)&s_saddr); + mtu = net_tcp_get_mtu((struct net_sockaddr *)&s_saddr); zassert_equal(mtu, 2048, "PMTU IPv4 MTU is not correct (%d)", mtu); (void)zsock_close(client_sock); @@ -725,7 +725,7 @@ ZTEST(net_pmtu_test_suite, test_pmtu_05_ipv4_tcp) ZTEST(net_pmtu_test_suite, test_pmtu_06_ipv4_event) { #if defined(CONFIG_NET_IPV4_PMTU) && WAIT_PROPERLY - struct sockaddr_in dest_ipv4; + struct net_sockaddr_in dest_ipv4; int ret; setup_mgmt_events(); @@ -733,9 +733,9 @@ ZTEST(net_pmtu_test_suite, test_pmtu_06_ipv4_event) is_pmtu_changed = false; net_ipaddr_copy(&dest_ipv4.sin_addr, &dest_ipv4_addr1); - dest_ipv4.sin_family = AF_INET; + dest_ipv4.sin_family = NET_AF_INET; - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv4, 1200); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv4, 1200); zassert_equal(ret, 0, "PMTU IPv4 MTU update failed (%d)", ret); if (k_sem_take(&wait_pmtu_changed, K_MSEC(WAIT_TIME))) { @@ -753,7 +753,7 @@ ZTEST(net_pmtu_test_suite, test_pmtu_06_ipv4_event) ZTEST(net_pmtu_test_suite, test_pmtu_06_ipv6_event) { #if defined(CONFIG_NET_IPV6_PMTU) && WAIT_PROPERLY - struct sockaddr_in6 dest_ipv6; + struct net_sockaddr_in6 dest_ipv6; int ret; setup_mgmt_events(); @@ -761,9 +761,9 @@ ZTEST(net_pmtu_test_suite, test_pmtu_06_ipv6_event) is_pmtu_changed = false; net_ipaddr_copy(&dest_ipv6.sin6_addr, &dest_ipv6_addr1); - dest_ipv6.sin6_family = AF_INET6; + dest_ipv6.sin6_family = NET_AF_INET6; - ret = net_pmtu_update_mtu((struct sockaddr *)&dest_ipv6, 1500); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&dest_ipv6, 1500); zassert_equal(ret, 0, "PMTU IPv6 MTU update failed (%d)", ret); if (k_sem_take(&wait_pmtu_changed, K_MSEC(WAIT_TIME))) { @@ -781,8 +781,8 @@ ZTEST(net_pmtu_test_suite, test_pmtu_06_ipv6_event) ZTEST(net_pmtu_test_suite, test_pmtu_07_socket_api_ipv4) { #if defined(CONFIG_NET_IPV4_PMTU) - struct sockaddr_in s_saddr = { 0 }; /* peer */ - struct sockaddr_in c_saddr = { 0 }; /* this host */ + struct net_sockaddr_in s_saddr = { 0 }; /* peer */ + struct net_sockaddr_in c_saddr = { 0 }; /* this host */ int ret, client_sock, server_sock; size_t optlen; int optval; @@ -793,18 +793,18 @@ ZTEST(net_pmtu_test_suite, test_pmtu_07_socket_api_ipv4) zassert_true(client_sock >= 0, "Failed to create client socket"); /* Set initial MTU for the destination */ - ret = net_pmtu_update_mtu((struct sockaddr *)&c_saddr, 4096); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&c_saddr, 4096); zassert_true(ret >= 0, "PMTU IPv4 MTU update failed (%d)", ret); optval = 0; optlen = sizeof(int); - ret = zsock_getsockopt(client_sock, IPPROTO_IP, IP_MTU, &optval, &optlen); + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IP, ZSOCK_IP_MTU, &optval, &optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); zexpect_equal(optlen, sizeof(int), "setsockopt optlen (%d)", optlen); zexpect_equal(optval, 4096, "setsockopt mtu (%d)", optval); optval = 0; optlen = sizeof(int); - ret = zsock_setsockopt(client_sock, IPPROTO_IP, IP_MTU, &optval, optlen); + ret = zsock_setsockopt(client_sock, NET_IPPROTO_IP, ZSOCK_IP_MTU, &optval, optlen); err = -errno; zexpect_equal(ret, -1, "setsockopt failed (%d)", err); zexpect_equal(optlen, sizeof(int), "setsockopt optlen (%d)", optlen); @@ -820,8 +820,8 @@ ZTEST(net_pmtu_test_suite, test_pmtu_07_socket_api_ipv4) ZTEST(net_pmtu_test_suite, test_pmtu_08_socket_api_ipv6) { #if defined(CONFIG_NET_IPV6_PMTU) - struct sockaddr_in6 s_saddr = { 0 }; /* peer */ - struct sockaddr_in6 c_saddr = { 0 }; /* this host */ + struct net_sockaddr_in6 s_saddr = { 0 }; /* peer */ + struct net_sockaddr_in6 c_saddr = { 0 }; /* this host */ int ret, client_sock, server_sock; size_t optlen; int optval; @@ -832,25 +832,25 @@ ZTEST(net_pmtu_test_suite, test_pmtu_08_socket_api_ipv6) zassert_true(client_sock >= 0, "Failed to create client socket"); /* Set initial MTU for the destination */ - ret = net_pmtu_update_mtu((struct sockaddr *)&c_saddr, 2048); + ret = net_pmtu_update_mtu((struct net_sockaddr *)&c_saddr, 2048); zassert_true(ret >= 0, "PMTU IPv6 MTU update failed (%d)", ret); optval = 0; optlen = sizeof(int); - ret = zsock_getsockopt(client_sock, IPPROTO_IPV6, IPV6_MTU, &optval, &optlen); + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MTU, &optval, &optlen); err = -errno; zexpect_equal(ret, 0, "getsockopt failed (%d)", err); zexpect_equal(optlen, sizeof(int), "getsockopt optlen (%d)", optlen); zexpect_equal(optval, 2048, "getsockopt mtu (%d)", optval); optval = 1500; optlen = sizeof(int); - ret = zsock_setsockopt(client_sock, IPPROTO_IPV6, IPV6_MTU, &optval, optlen); + ret = zsock_setsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MTU, &optval, optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); zexpect_equal(optlen, sizeof(int), "setsockopt optlen (%d)", optlen); zexpect_equal(optval, 1500, "setsockopt mtu (%d)", optval); optval = 0; optlen = sizeof(int); - ret = zsock_getsockopt(client_sock, IPPROTO_IPV6, IPV6_MTU, &optval, &optlen); + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MTU, &optval, &optlen); err = -errno; zexpect_equal(ret, 0, "getsockopt failed (%d)", err); zexpect_equal(optlen, sizeof(int), "getsockopt optlen (%d)", optlen); diff --git a/tests/net/ppp/driver/src/main.c b/tests/net/ppp/driver/src/main.c index abedb53fb71a5..d432e9d0158ab 100644 --- a/tests/net/ppp/driver/src/main.c +++ b/tests/net/ppp/driver/src/main.c @@ -320,7 +320,7 @@ static void ppp_verify_fcs(uint8_t *buf, int len) uint8_t *ptr; bool ret; - pkt = net_pkt_alloc_with_buffer(net_iface, len, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_alloc_with_buffer(net_iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(pkt, "Cannot create pkt"); ptr = buf; @@ -391,7 +391,7 @@ static void ppp_calc_fcs(uint8_t *buf, int len) uint8_t *ptr; bool ret; - pkt = net_pkt_alloc_with_buffer(net_iface, len, AF_UNSPEC, 0, K_NO_WAIT); + pkt = net_pkt_alloc_with_buffer(net_iface, len, NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(pkt, "Cannot create pkt"); ptr = buf; diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c index 364917b7de34f..ccf76404b4376 100644 --- a/tests/net/promiscuous/src/main.c +++ b/tests/net/promiscuous/src/main.c @@ -35,23 +35,23 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); #endif /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 3 addresses */ -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -static struct in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; static struct net_if *iface1; @@ -350,7 +350,7 @@ static void _recv_data(struct net_if *iface, struct net_pkt **pkt) int ret; *pkt = net_pkt_rx_alloc_with_buffer(iface, sizeof(data), - AF_UNSPEC, 0, K_FOREVER); + NET_AF_UNSPEC, 0, K_FOREVER); net_pkt_ref(*pkt); diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c index bd59963f5742c..f036e42759a0b 100644 --- a/tests/net/ptp/clock/src/main.c +++ b/tests/net/ptp/clock/src/main.c @@ -43,19 +43,19 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); #endif /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 3 addresses */ -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c index 644c07564aee8..37a1b2bc12db4 100644 --- a/tests/net/route/src/main.c +++ b/tests/net/route/src/main.c @@ -44,31 +44,31 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL); static struct net_context *udp_ctx; /* Interface 1 is the default host and it has my_addr assigned to it */ -static struct in6_addr my_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 is the secondary host for peer device with address peer_addr */ -static struct in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0x0b, 0x0e, 0x0e, 0x3 } } }; /* Alternate next hop address for dest_addr */ -static struct in6_addr peer_addr_alt = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr peer_addr_alt = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0x0b, 0x0e, 0x0e, 0x4 } } }; /* The dest_addr is only reachable via peer_addr */ -static struct in6_addr dest_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr dest_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0xd, 0xe, 0x5, 0x7 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -static struct in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr in6addr_mcast = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Generic address that we are using to generate some more addresses */ -static struct in6_addr generic_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr generic_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0xbe, 0xef, 0, 0 } } }; static struct net_if *recipient; @@ -80,7 +80,7 @@ static struct net_route_entry *route_entry; #define MAX_ROUTES CONFIG_NET_MAX_ROUTES static const int max_routes = MAX_ROUTES; static struct net_route_entry *test_routes[MAX_ROUTES]; -static struct in6_addr dest_addresses[MAX_ROUTES]; +static struct net_in6_addr dest_addresses[MAX_ROUTES]; static bool test_failed; static bool data_failure; @@ -282,7 +282,7 @@ static void test_init(void) /* Some test addresses are generated */ for (i = 0; i < max_routes; i++) { memcpy(&dest_addresses[i], &generic_addr, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); dest_addresses[i].s6_addr[14] = i + 1; dest_addresses[i].s6_addr[15] = sys_rand8_get(); @@ -293,14 +293,14 @@ static void test_net_ctx_create(void) { int ret; - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_ctx); zassert_equal(ret, 0, "Context create IPv6 UDP test failed"); } static bool net_test_send_ns(struct net_if *iface, - struct in6_addr *addr) + struct net_in6_addr *addr) { int ret; @@ -319,7 +319,7 @@ static bool net_test_send_ns(struct net_if *iface, } static bool net_test_nbr_lookup_ok(struct net_if *iface, - struct in6_addr *addr) + struct net_in6_addr *addr) { struct net_nbr *nbr; @@ -418,7 +418,7 @@ static void test_route_del_again(void) static void test_route_get_nexthop(void) { - struct in6_addr *nexthop; + struct net_in6_addr *nexthop; nexthop = net_route_get_nexthop(route_entry); @@ -448,7 +448,7 @@ static void test_route_lookup_fail(void) static void test_route_del_nexthop(void) { - struct in6_addr *nexthop = &peer_addr; + struct net_in6_addr *nexthop = &peer_addr; int ret; ret = net_route_del_by_nexthop(my_iface, nexthop); @@ -457,7 +457,7 @@ static void test_route_del_nexthop(void) static void test_route_del_nexthop_again(void) { - struct in6_addr *nexthop = &peer_addr; + struct net_in6_addr *nexthop = &peer_addr; int ret; ret = net_route_del_by_nexthop(my_iface, nexthop); diff --git a/tests/net/route_mcast/src/main.c b/tests/net/route_mcast/src/main.c index 140809c86a375..4cd5cd31d11d2 100644 --- a/tests/net/route_mcast/src/main.c +++ b/tests/net/route_mcast/src/main.c @@ -43,29 +43,29 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL); #define DBG(fmt, ...) #endif -static struct in6_addr iface_1_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr iface_1_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr iface_2_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr iface_2_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0x0b, 0x0e, 0x0e, 0x3 } } }; -static struct in6_addr iface_3_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr iface_3_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0x0e, 0x0e, 0x0e, 0x4 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr_1 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr_1 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -static struct in6_addr ll_addr_2 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr_2 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x05, 0x06 } } }; -static struct in6_addr ll_addr_3 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr_3 = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x07, 0x08 } } }; -static struct in6_addr in6addr_mcast = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, +static struct net_in6_addr in6addr_mcast = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; static struct net_if *iface_1; @@ -83,32 +83,32 @@ struct net_route_mcast_iface_cfg { static struct net_route_entry_mcast *test_mcast_routes[MAX_MCAST_ROUTES]; -static struct in6_addr mcast_prefix_iflocal = { { { +static struct net_in6_addr mcast_prefix_iflocal = { { { 0xFF, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; -static struct in6_addr mcast_prefix_llocal = { { { +static struct net_in6_addr mcast_prefix_llocal = { { { 0xFF, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; -static struct in6_addr mcast_prefix_admin = { { { +static struct net_in6_addr mcast_prefix_admin = { { { 0xFF, 0x04, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; -static struct in6_addr mcast_prefix_site_local = { { { +static struct net_in6_addr mcast_prefix_site_local = { { { 0xFF, 0x05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; -static struct in6_addr mcast_prefix_orga = { { { +static struct net_in6_addr mcast_prefix_orga = { { { 0xFF, 0x08, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } }; -static struct in6_addr mcast_prefix_global = { { { +static struct net_in6_addr mcast_prefix_global = { { { 0xFF, 0x0E, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -119,7 +119,7 @@ static struct in6_addr mcast_prefix_global = { { { * FF3F:40:FD01:101:: \128 * network prefix FD01:101::\64 */ -static struct in6_addr mcast_prefix_nw_based = { { { +static struct net_in6_addr mcast_prefix_nw_based = { { { 0xFF, 0x3F, 0, 0x40, 0xFD, 0x01, 0x01, 0x01, 0, 0, 0, 0, @@ -131,8 +131,8 @@ static bool iface_2_forwarded; static bool iface_3_forwarded; struct net_route_mcast_scenario_cfg { - struct in6_addr src; - struct in6_addr mcast; + struct net_in6_addr src; + struct net_in6_addr mcast; bool is_active; }; @@ -164,7 +164,7 @@ static uint8_t *net_route_mcast_get_mac(const struct device *dev) } static void net_route_mcast_add_addresses(struct net_if *iface, - struct in6_addr *ipv6, struct in6_addr *ll_addr) + struct net_in6_addr *ipv6, struct net_in6_addr *ll_addr) { struct net_if_mcast_addr *maddr; struct net_if_addr *ifaddr; @@ -212,10 +212,10 @@ static bool check_packet_addresses(struct net_pkt *pkt) if ((memcmp(&active_scenario.src, &ipv6_hdr->src, - sizeof(struct in6_addr)) != 0) || + sizeof(struct net_in6_addr)) != 0) || (memcmp(&active_scenario.mcast, ipv6_hdr->dst, - sizeof(struct in6_addr)) != 0)) { + sizeof(struct net_in6_addr)) != 0)) { return false; } @@ -288,16 +288,16 @@ NET_DEVICE_INIT_INSTANCE(mcast_iface_3, "mcast_iface_3", iface_3, _ETH_L2_CTX_TYPE, 127); static struct net_pkt *setup_ipv6_udp(struct net_if *iface, - struct in6_addr *src_addr, - struct in6_addr *remote_addr, + struct net_in6_addr *src_addr, + struct net_in6_addr *remote_addr, uint16_t src_port, uint16_t remote_port) { static const char payload[] = "foobar"; struct net_pkt *pkt; int res; - pkt = net_pkt_alloc_with_buffer(iface, strlen(payload), AF_INET6, - IPPROTO_UDP, K_FOREVER); + pkt = net_pkt_alloc_with_buffer(iface, strlen(payload), NET_AF_INET6, + NET_IPPROTO_UDP, K_FOREVER); if (!pkt) { return NULL; } @@ -307,14 +307,14 @@ static struct net_pkt *setup_ipv6_udp(struct net_if *iface, res = net_ipv6_create(pkt, src_addr, remote_addr); zassert_equal(0, res, "ipv6 create failed"); - res = net_udp_create(pkt, htons(src_port), htons(remote_port)); + res = net_udp_create(pkt, net_htons(src_port), net_htons(remote_port)); zassert_equal(0, res, "udp create failed"); res = net_pkt_write(pkt, (uint8_t *) payload, strlen(payload)); zassert_equal(0, res, "pkt write failed"); net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_UDP); + net_ipv6_finalize(pkt, NET_IPPROTO_UDP); net_pkt_cursor_init(pkt); return pkt; @@ -333,7 +333,7 @@ static void test_route_mcast_init(void) static void test_route_mcast_route_add(void) { - struct in6_addr nw_prefix_based_all_nodes; + struct net_in6_addr nw_prefix_based_all_nodes; struct net_route_entry_mcast *entry; entry = net_route_mcast_add(iface_1, &mcast_prefix_iflocal, 16); @@ -371,7 +371,7 @@ static void test_route_mcast_route_add(void) "add for nw prefix based failed"); memcpy(&nw_prefix_based_all_nodes, &mcast_prefix_nw_based, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); nw_prefix_based_all_nodes.s6_addr[15] = 0x01; test_mcast_routes[5] = net_route_mcast_add(iface_2, @@ -480,11 +480,11 @@ static void test_route_mcast_scenario1(void) * only iface_2 forwards */ reset_counters(); - memcpy(&active_scenario.src, &iface_1_addr, sizeof(struct in6_addr)); + memcpy(&active_scenario.src, &iface_1_addr, sizeof(struct net_in6_addr)); active_scenario.src.s6_addr[15] = 0x02; memcpy(&active_scenario.mcast, &mcast_prefix_site_local, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); active_scenario.mcast.s6_addr[15] = 0x01; struct net_pkt *pkt1 = setup_ipv6_udp(iface_1, &active_scenario.src, @@ -507,7 +507,7 @@ static void test_route_mcast_scenario1(void) reset_counters(); - memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct in6_addr)); + memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct net_in6_addr)); active_scenario.src.s6_addr[15] = 0x09; struct net_pkt *pkt2 = setup_ipv6_udp(iface_3, &active_scenario.src, @@ -542,11 +542,11 @@ static void test_route_mcast_scenario2(void) * now iface_1 must forward due to routing entry */ reset_counters(); - memcpy(&active_scenario.src, &iface_1_addr, sizeof(struct in6_addr)); + memcpy(&active_scenario.src, &iface_1_addr, sizeof(struct net_in6_addr)); active_scenario.src.s6_addr[15] = 0x08; memcpy(&active_scenario.mcast, &mcast_prefix_admin, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); active_scenario.mcast.s6_addr[15] = 0x01; struct net_pkt *pkt = setup_ipv6_udp(iface_1, &active_scenario.src, @@ -566,7 +566,7 @@ static void test_route_mcast_scenario2(void) zassert_equal(forwarding_counter, 0, "wrong count forwarded packets"); reset_counters(); - memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct in6_addr)); + memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct net_in6_addr)); active_scenario.src.s6_addr[15] = 0x08; struct net_pkt *pkt2 = setup_ipv6_udp(iface_3, &active_scenario.src, @@ -598,11 +598,11 @@ static void test_route_mcast_scenario3(void) * no iface forwards */ reset_counters(); - memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct in6_addr)); + memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct net_in6_addr)); active_scenario.src.s6_addr[15] = 0x08; memcpy(&active_scenario.mcast, &mcast_prefix_nw_based, - sizeof(struct in6_addr)); + sizeof(struct net_in6_addr)); active_scenario.mcast.s6_addr[15] = 0x01; struct net_pkt *pkt = setup_ipv6_udp(iface_3, &active_scenario.src, @@ -685,10 +685,10 @@ void test_route_mcast_multiple_route_ifaces(void) bool res; reset_counters(); - memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct in6_addr)); + memcpy(&active_scenario.src, &iface_3_addr, sizeof(struct net_in6_addr)); active_scenario.src.s6_addr[15] = 0x02; - memcpy(&active_scenario.mcast, &mcast_prefix_site_local, sizeof(struct in6_addr)); + memcpy(&active_scenario.mcast, &mcast_prefix_site_local, sizeof(struct net_in6_addr)); active_scenario.mcast.s6_addr[15] = 0x01; struct net_pkt *pkt = setup_ipv6_udp(iface_3, &active_scenario.src, &active_scenario.mcast, diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c index d8e3c096531d5..2f052652c750f 100644 --- a/tests/net/shell/src/main.c +++ b/tests/net/shell/src/main.c @@ -128,46 +128,46 @@ static void *test_setup(void) struct net_if *iface; struct net_if_addr *ifaddr; - struct sockaddr_in6 any_addr6; - const struct in6_addr in6addr_anyaddr = IN6ADDR_ANY_INIT; + struct net_sockaddr_in6 any_addr6; + const struct net_in6_addr in6addr_anyaddr = NET_IN6ADDR_ANY_INIT; - struct sockaddr_in6 my_addr6; - struct in6_addr in6addr_my = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_sockaddr_in6 my_addr6; + struct net_in6_addr in6addr_my = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct sockaddr_in6 peer_addr6; - struct in6_addr in6addr_peer = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_sockaddr_in6 peer_addr6; + struct net_in6_addr in6addr_peer = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0x4e, 0x11, 0, 0, 0x2 } } }; - struct sockaddr_in any_addr4; - const struct in_addr in4addr_any = { { { 0 } } }; + struct net_sockaddr_in any_addr4; + const struct net_in_addr in4addr_any = { { { 0 } } }; - struct sockaddr_in my_addr4; - struct in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; + struct net_sockaddr_in my_addr4; + struct net_in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; - struct sockaddr_in peer_addr4; - struct in_addr in4addr_peer = { { { 192, 0, 2, 9 } } }; + struct net_sockaddr_in peer_addr4; + struct net_in_addr in4addr_peer = { { { 192, 0, 2, 9 } } }; iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); test_failed = false; net_ipaddr_copy(&any_addr6.sin6_addr, &in6addr_anyaddr); - any_addr6.sin6_family = AF_INET6; + any_addr6.sin6_family = NET_AF_INET6; net_ipaddr_copy(&my_addr6.sin6_addr, &in6addr_my); - my_addr6.sin6_family = AF_INET6; + my_addr6.sin6_family = NET_AF_INET6; net_ipaddr_copy(&peer_addr6.sin6_addr, &in6addr_peer); - peer_addr6.sin6_family = AF_INET6; + peer_addr6.sin6_family = NET_AF_INET6; net_ipaddr_copy(&any_addr4.sin_addr, &in4addr_any); - any_addr4.sin_family = AF_INET; + any_addr4.sin_family = NET_AF_INET; net_ipaddr_copy(&my_addr4.sin_addr, &in4addr_my); - my_addr4.sin_family = AF_INET; + my_addr4.sin_family = NET_AF_INET; net_ipaddr_copy(&peer_addr4.sin_addr, &in4addr_peer); - peer_addr4.sin_family = AF_INET; + peer_addr4.sin_family = NET_AF_INET; k_sem_init(&recv_lock, 0, UINT_MAX); diff --git a/tests/net/socket/af_inet_raw/src/main.c b/tests/net/socket/af_inet_raw/src/main.c index 90ca11370fc8d..071a08fcc9887 100644 --- a/tests/net/socket/af_inet_raw/src/main.c +++ b/tests/net/socket/af_inet_raw/src/main.c @@ -17,7 +17,8 @@ * * Sending data (TX): * - * * (AF_INET/6, SOCK_RAW, 0) - The IP header needs to be supplied by the user in the data: + * * (NET_AF_INET/6, NET_SOCK_RAW, 0) - The IP header needs to be supplied by the user + * in the data: * - test_raw_v4_sock_send_proto_wildcard * - test_raw_v6_sock_send_proto_wildcard * - test_raw_v4_sock_sendto @@ -25,7 +26,8 @@ * - test_raw_v4_sock_sendmsg * - test_raw_v6_sock_sendmsg * - * * (AF_INET/6, SOCK_RAW, ) - Construct IP header according to the protocol number if + * * (NET_AF_INET/6, NET_SOCK_RAW, ) - Construct IP header according to the + * protocol number if * `IP_HDRINCL` socket option is not set. Otherwise, IP header should be provided by the user. * Currently `IP_HDRINCL` is always considered set: * - test_raw_v4_sock_send_proto_match @@ -33,15 +35,16 @@ * - test_raw_v6_sock_send_proto_match * - test_raw_v6_sock_send_proto_mismatch * - * * (AF_INET/6, SOCK_RAW, IPPROTO_RAW) - The IP header needs to be supplied by the user in the - * data: + * * (NET_AF_INET/6, NET_SOCK_RAW, IPPROTO_RAW) - The IP header needs to be supplied by + * the user in the data: * - test_raw_v4_sock_send_proto_ipproto_raw * - test_raw_v6_sock_send_proto_ipproto_raw * * Receiving data (RX) * - * * (AF_INET/6, SOCK_RAW, 0) - 0 value is also `IPPROTO_IP` which is "wildcard" value. The - * packet is received for any IP protocol. It works in similar way as in FreeBSD: + * * (NET_AF_INET/6, NET_SOCK_RAW, 0) - 0 value is also `IPPROTO_IP` which is + * "wildcard" value. The packet is received for any IP protocol. It works in + * similar way as in FreeBSD: * - test_raw_v4_sock_recv_proto_wildcard * - test_raw_v6_sock_recv_proto_wildcard * - test_raw_v4_sock_recvfrom @@ -49,12 +52,14 @@ * - test_raw_v4_sock_recvmsg * - test_raw_v6_sock_recvmsg * - * * (AF_INET/6, SOCK_RAW, ) - All packets matching the protocol number specified for + * * (NET_AF_INET/6, NET_SOCK_RAW, ) - All packets matching the protocol + * number specified for * the raw socket are passed to this socket. http://www.iana.org/assignments/protocol-numbers: * - test_raw_v4_sock_recv_proto_match * - test_raw_v6_sock_recv_proto_match * - * * (AF_INET/6, SOCK_RAW, IPPROTO_RAW) - Receiving of all IP protocols via IPPROTO_RAW is not + * * (NET_AF_INET/6, NET_SOCK_RAW, IPPROTO_RAW) - Receiving of all IP protocols via + * NET_IPPROTO_RAW is not * possible using raw sockets. https://man7.org/linux/man-pages/man7/raw.7.html: * - test_raw_v4_sock_recv_proto_ipproto_raw * - test_raw_v6_sock_recv_proto_ipproto_raw @@ -110,12 +115,12 @@ NET_DEVICE_INIT(test_iface_1, "test_iface_1", NULL, NULL, NULL, NULL, #define TEST_PORT_DST 4243 static struct net_if *test_iface = NET_IF_GET(test_iface_1, 0); -static struct in_addr test_ipv4_1 = { { { 192, 0, 2, 1 } } }; -static struct in_addr test_ipv4_2 = { { { 192, 0, 2, 2 } } }; -static struct in6_addr test_ipv6_1 = { { { +static struct net_in_addr test_ipv4_1 = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr test_ipv4_2 = { { { 192, 0, 2, 2 } } }; +static struct net_in6_addr test_ipv6_1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in6_addr test_ipv6_2 = { { { +static struct net_in6_addr test_ipv6_2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; @@ -124,15 +129,15 @@ static int raw_sock_2 = -1; static int udp_sock = -1; static int udp_sock_2 = -1; static int packet_sock = -1; -static struct sockaddr src_addr; -static struct sockaddr dst_addr; -static socklen_t addrlen; +static struct net_sockaddr src_addr; +static struct net_sockaddr dst_addr; +static net_socklen_t addrlen; static uint8_t test_payload[] = "test_payload"; static uint8_t rx_buf[128]; static uint8_t tx_buf[128]; -static void prepare_raw_sock_common(int *sock, sa_family_t family, +static void prepare_raw_sock_common(int *sock, net_sa_family_t family, enum net_ip_protocol proto) { struct timeval optval = { @@ -140,56 +145,56 @@ static void prepare_raw_sock_common(int *sock, sa_family_t family, }; int ret; - *sock = zsock_socket(family, SOCK_RAW, proto); + *sock = zsock_socket(family, NET_SOCK_RAW, proto); zassert_true(*sock >= 0, "Failed to create RAW socket(%d)", errno); - ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval, + ret = zsock_setsockopt(*sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); zassert_ok(ret, "setsockopt failed (%d)", errno); } -static void prepare_raw_sock(sa_family_t family, enum net_ip_protocol proto) +static void prepare_raw_sock(net_sa_family_t family, enum net_ip_protocol proto) { prepare_raw_sock_common(&raw_sock, family, proto); } -static void prepare_raw_sock_2(sa_family_t family, enum net_ip_protocol proto) +static void prepare_raw_sock_2(net_sa_family_t family, enum net_ip_protocol proto) { prepare_raw_sock_common(&raw_sock_2, family, proto); } -static void prepare_udp_sock_common(int *sock, sa_family_t family, - struct sockaddr *bind_addr) +static void prepare_udp_sock_common(int *sock, net_sa_family_t family, + struct net_sockaddr *bind_addr) { struct timeval optval = { .tv_usec = 100000, }; int ret; - *sock = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + *sock = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(*sock >= 0, "Failed to create UDP socket (%d)", errno); ret = zsock_bind(*sock, bind_addr, addrlen); zassert_ok(ret, "Binding UDP socket failed (%d)", errno); - ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval, + ret = zsock_setsockopt(*sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); zassert_ok(ret, "setsockopt failed (%d)", errno); } -static void prepare_udp_sock(sa_family_t family) +static void prepare_udp_sock(net_sa_family_t family) { prepare_udp_sock_common(&udp_sock, family, &src_addr); } -static void prepare_udp_sock_2(sa_family_t family) +static void prepare_udp_sock_2(net_sa_family_t family) { prepare_udp_sock_common(&udp_sock_2, family, &dst_addr); } static void prepare_packet_sock(uint16_t proto) { - struct sockaddr_ll addr = { 0 }; + struct net_sockaddr_ll addr = { 0 }; struct timeval optval = { .tv_usec = 100000, }; @@ -198,40 +203,40 @@ static void prepare_packet_sock(uint16_t proto) memset(&addr, 0, sizeof(addr)); addr.sll_ifindex = net_if_get_by_iface(test_iface); - addr.sll_family = AF_PACKET; + addr.sll_family = NET_AF_PACKET; - packet_sock = zsock_socket(AF_PACKET, SOCK_DGRAM, htons(proto)); + packet_sock = zsock_socket(NET_AF_PACKET, NET_SOCK_DGRAM, net_htons(proto)); zassert_true(packet_sock >= 0, "Failed to create packet socket (%d)", errno); - ret = zsock_bind(packet_sock, (struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_bind(packet_sock, (struct net_sockaddr *)&addr, sizeof(addr)); zassert_ok(ret, "Binding packet socket failed (%d)", errno); - ret = zsock_setsockopt(packet_sock, SOL_SOCKET, SO_RCVTIMEO, &optval, + ret = zsock_setsockopt(packet_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); zassert_ok(ret, "setsockopt failed (%d)", errno); } -static void prepare_addr(sa_family_t family) +static void prepare_addr(net_sa_family_t family) { src_addr.sa_family = family; dst_addr.sa_family = family; - if (family == AF_INET) { + if (family == NET_AF_INET) { net_sin(&src_addr)->sin_addr = test_ipv4_1; - net_sin(&src_addr)->sin_port = htons(TEST_PORT_OWN); + net_sin(&src_addr)->sin_port = net_htons(TEST_PORT_OWN); net_sin(&dst_addr)->sin_addr = test_ipv4_2; - net_sin(&dst_addr)->sin_port = htons(TEST_PORT_DST); - addrlen = sizeof(struct sockaddr_in); + net_sin(&dst_addr)->sin_port = net_htons(TEST_PORT_DST); + addrlen = sizeof(struct net_sockaddr_in); } else { net_sin6(&src_addr)->sin6_addr = test_ipv6_1; - net_sin6(&src_addr)->sin6_port = htons(TEST_PORT_OWN); + net_sin6(&src_addr)->sin6_port = net_htons(TEST_PORT_OWN); net_sin6(&dst_addr)->sin6_addr = test_ipv6_2; - net_sin6(&dst_addr)->sin6_port = htons(TEST_PORT_DST); - addrlen = sizeof(struct sockaddr_in6); + net_sin6(&dst_addr)->sin6_port = net_htons(TEST_PORT_DST); + addrlen = sizeof(struct net_sockaddr_in6); } } -static void prepare_raw_and_udp_sock_and_addr(sa_family_t family, +static void prepare_raw_and_udp_sock_and_addr(net_sa_family_t family, enum net_ip_protocol proto) { prepare_addr(family); @@ -239,11 +244,11 @@ static void prepare_raw_and_udp_sock_and_addr(sa_family_t family, prepare_udp_sock(family); } -static void sock_bind_any(int sock, sa_family_t family) +static void sock_bind_any(int sock, net_sa_family_t family) { - struct sockaddr anyaddr = { .sa_family = family }; - socklen_t bindaddr_len = (family == AF_INET) ? - sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6); + struct net_sockaddr anyaddr = { .sa_family = family }; + net_socklen_t bindaddr_len = (family == NET_AF_INET) ? + sizeof(struct net_sockaddr_in) : sizeof(struct net_sockaddr_in6); zassert_ok(zsock_bind(sock, &anyaddr, bindaddr_len), "Binding RAW socket failed (%d)", errno); @@ -277,11 +282,11 @@ static void test_sockets_close(void) } } -static void validate_ip_udp_hdr(sa_family_t family, struct sockaddr *src, - struct sockaddr *dst, uint8_t *data, +static void validate_ip_udp_hdr(net_sa_family_t family, struct net_sockaddr *src, + struct net_sockaddr *dst, uint8_t *data, size_t datalen) { - if (family == AF_INET) { + if (family == NET_AF_INET) { struct net_ipv4_hdr *ipv4 = (struct net_ipv4_hdr *)data; struct net_udp_hdr *udp = (struct net_udp_hdr *)(data + NET_IPV4H_LEN); @@ -291,12 +296,12 @@ static void validate_ip_udp_hdr(sa_family_t family, struct sockaddr *src, "Invalid source address"); zassert_mem_equal(ipv4->dst, &net_sin(dst)->sin_addr, sizeof(ipv4->dst), "Invalid destination address"); - zassert_equal(ipv4->proto, IPPROTO_UDP, "Invalid protocol"); + zassert_equal(ipv4->proto, NET_IPPROTO_UDP, "Invalid protocol"); zassert_equal(udp->src_port, net_sin(src)->sin_port, "Invalid source port"); zassert_equal(udp->dst_port, net_sin(dst)->sin_port, "Invalid destination port"); - zassert_equal(udp->len, htons(datalen - NET_IPV4H_LEN), + zassert_equal(udp->len, net_htons(datalen - NET_IPV4H_LEN), "Invalid UDP length"); } else { struct net_ipv6_hdr *ipv6 = (struct net_ipv6_hdr *)data; @@ -308,19 +313,19 @@ static void validate_ip_udp_hdr(sa_family_t family, struct sockaddr *src, "Invalid source address"); zassert_mem_equal(ipv6->dst, &net_sin6(dst)->sin6_addr, sizeof(ipv6->dst), "Invalid destination address"); - zassert_equal(ipv6->nexthdr, IPPROTO_UDP, "Invalid protocol"); + zassert_equal(ipv6->nexthdr, NET_IPPROTO_UDP, "Invalid protocol"); zassert_equal(udp->src_port, net_sin6(src)->sin6_port, "Invalid source port"); zassert_equal(udp->dst_port, net_sin6(dst)->sin6_port, "Invalid destination port"); - zassert_equal(udp->len, htons(datalen - NET_IPV6H_LEN), + zassert_equal(udp->len, net_htons(datalen - NET_IPV6H_LEN), "Invalid UDP length"); } } -static void verify_raw_recv_success(int sock, sa_family_t family) +static void verify_raw_recv_success(int sock, net_sa_family_t family) { - size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; + size_t headers_len = (family == NET_AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; size_t expected_len = headers_len + sizeof(test_payload); int ret; @@ -346,23 +351,23 @@ static void verify_raw_recv_failure(void) #define TEST_UDP_IVP4_CHKSUM 0x03e4 #define TEST_UDP_IVP6_CHKSUM 0x930c -static void prepare_raw_ip_packet(sa_family_t family, uint8_t *buf, uint16_t *buflen) +static void prepare_raw_ip_packet(net_sa_family_t family, uint8_t *buf, uint16_t *buflen) { - uint16_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; + uint16_t headers_len = (family == NET_AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; uint16_t packet_len = headers_len + sizeof(test_payload); zassert_true(packet_len <= *buflen, "Packet too long"); *buflen = packet_len; - if (family == AF_INET) { + if (family == NET_AF_INET) { struct net_ipv4_hdr *ipv4 = (struct net_ipv4_hdr *)tx_buf; struct net_udp_hdr *udp = (struct net_udp_hdr *)(tx_buf + NET_IPV4H_LEN); /* Prepare IPv4 header */ ipv4->vhl = 0x45; - ipv4->len = htons(packet_len); + ipv4->len = net_htons(packet_len); ipv4->ttl = 64; - ipv4->proto = IPPROTO_UDP; + ipv4->proto = NET_IPPROTO_UDP; /* UDP socket binds to src_addr, so for this test we swap src/dst */ memcpy(ipv4->src, &net_sin(&dst_addr)->sin_addr, sizeof(ipv4->src)); memcpy(ipv4->dst, &net_sin(&src_addr)->sin_addr, sizeof(ipv4->dst)); @@ -370,7 +375,7 @@ static void prepare_raw_ip_packet(sa_family_t family, uint8_t *buf, uint16_t *bu /* Prepare UDP header */ udp->src_port = net_sin(&dst_addr)->sin_port; udp->dst_port = net_sin(&src_addr)->sin_port; - udp->len = htons(sizeof(test_payload) + NET_UDPH_LEN); + udp->len = net_htons(sizeof(test_payload) + NET_UDPH_LEN); udp->chksum = TEST_UDP_IVP4_CHKSUM; memcpy(tx_buf + NET_IPV4UDPH_LEN, test_payload, sizeof(test_payload)); @@ -380,8 +385,8 @@ static void prepare_raw_ip_packet(sa_family_t family, uint8_t *buf, uint16_t *bu /* Prepare IPv6 header */ ipv6->vtc = 0x60; - ipv6->len = htons(sizeof(test_payload) + NET_UDPH_LEN); - ipv6->nexthdr = IPPROTO_UDP; + ipv6->len = net_htons(sizeof(test_payload) + NET_UDPH_LEN); + ipv6->nexthdr = NET_IPPROTO_UDP; ipv6->hop_limit = 64; /* UDP socket binds to src_addr, so for this test we swap src/dst */ memcpy(ipv6->src, &net_sin6(&dst_addr)->sin6_addr, sizeof(ipv6->src)); @@ -390,14 +395,14 @@ static void prepare_raw_ip_packet(sa_family_t family, uint8_t *buf, uint16_t *bu /* Prepare UDP header */ udp->src_port = net_sin6(&dst_addr)->sin6_port; udp->dst_port = net_sin6(&src_addr)->sin6_port; - udp->len = htons(sizeof(test_payload) + NET_UDPH_LEN); + udp->len = net_htons(sizeof(test_payload) + NET_UDPH_LEN); udp->chksum = TEST_UDP_IVP6_CHKSUM; memcpy(tx_buf + NET_IPV6UDPH_LEN, test_payload, sizeof(test_payload)); } } -static void test_raw_sock_send(sa_family_t family, enum net_ip_protocol proto) +static void test_raw_sock_send(net_sa_family_t family, enum net_ip_protocol proto) { uint16_t len = sizeof(tx_buf); int ret; @@ -419,40 +424,40 @@ static void test_raw_sock_send(sa_family_t family, enum net_ip_protocol proto) ZTEST(socket_af_inet_raw, test_raw_v4_sock_send_proto_wildcard) { - test_raw_sock_send(AF_INET, IPPROTO_IP); + test_raw_sock_send(NET_AF_INET, NET_IPPROTO_IP); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_send_proto_wildcard) { - test_raw_sock_send(AF_INET6, IPPROTO_IP); + test_raw_sock_send(NET_AF_INET6, NET_IPPROTO_IP); } ZTEST(socket_af_inet_raw, test_raw_v4_sock_send_proto_match) { - test_raw_sock_send(AF_INET, IPPROTO_UDP); + test_raw_sock_send(NET_AF_INET, NET_IPPROTO_UDP); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_send_proto_match) { - test_raw_sock_send(AF_INET6, IPPROTO_UDP); + test_raw_sock_send(NET_AF_INET6, NET_IPPROTO_UDP); } ZTEST(socket_af_inet_raw, test_raw_v4_sock_send_proto_ipproto_raw) { - test_raw_sock_send(AF_INET, IPPROTO_RAW); + test_raw_sock_send(NET_AF_INET, NET_IPPROTO_RAW); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_send_proto_ipproto_raw) { - test_raw_sock_send(AF_INET6, IPPROTO_RAW); + test_raw_sock_send(NET_AF_INET6, NET_IPPROTO_RAW); } -static void test_raw_sock_sendto(sa_family_t family) +static void test_raw_sock_sendto(net_sa_family_t family) { uint16_t len = sizeof(tx_buf); int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_IP); prepare_raw_ip_packet(family, tx_buf, &len); ret = zsock_sendto(raw_sock, tx_buf, len, 0, &src_addr, addrlen); @@ -469,22 +474,22 @@ static void test_raw_sock_sendto(sa_family_t family) ZTEST(socket_af_inet_raw, test_raw_v4_sock_sendto) { - test_raw_sock_sendto(AF_INET); + test_raw_sock_sendto(NET_AF_INET); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_sendto) { - test_raw_sock_sendto(AF_INET6); + test_raw_sock_sendto(NET_AF_INET6); } -static void test_raw_sock_sendmsg(sa_family_t family) +static void test_raw_sock_sendmsg(net_sa_family_t family) { uint16_t len = sizeof(tx_buf); - struct iovec io_vector; - struct msghdr msg = { 0 }; + struct net_iovec io_vector; + struct net_msghdr msg = { 0 }; int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_IP); prepare_raw_ip_packet(family, tx_buf, &len); io_vector.iov_base = tx_buf; @@ -508,15 +513,15 @@ static void test_raw_sock_sendmsg(sa_family_t family) ZTEST(socket_af_inet_raw, test_raw_v4_sock_sendmsg) { - test_raw_sock_sendmsg(AF_INET); + test_raw_sock_sendmsg(NET_AF_INET); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_sendmsg) { - test_raw_sock_sendmsg(AF_INET6); + test_raw_sock_sendmsg(NET_AF_INET6); } -static void test_raw_sock_recv(sa_family_t family, enum net_ip_protocol proto) +static void test_raw_sock_recv(net_sa_family_t family, enum net_ip_protocol proto) { int ret; @@ -529,7 +534,7 @@ static void test_raw_sock_recv(sa_family_t family, enum net_ip_protocol proto) zassert_equal(ret, sizeof(test_payload), "Failed to send UDP packet (%d)", errno); - if (proto == IPPROTO_IP || proto == IPPROTO_UDP) { + if (proto == NET_IPPROTO_IP || proto == NET_IPPROTO_UDP) { verify_raw_recv_success(raw_sock, family); } else { verify_raw_recv_failure(); @@ -538,53 +543,53 @@ static void test_raw_sock_recv(sa_family_t family, enum net_ip_protocol proto) ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_wildcard) { - test_raw_sock_recv(AF_INET, IPPROTO_IP); + test_raw_sock_recv(NET_AF_INET, NET_IPPROTO_IP); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_wildcard) { - test_raw_sock_recv(AF_INET6, IPPROTO_IP); + test_raw_sock_recv(NET_AF_INET6, NET_IPPROTO_IP); } ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_match) { - test_raw_sock_recv(AF_INET, IPPROTO_UDP); + test_raw_sock_recv(NET_AF_INET, NET_IPPROTO_UDP); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_match) { - test_raw_sock_recv(AF_INET6, IPPROTO_UDP); + test_raw_sock_recv(NET_AF_INET6, NET_IPPROTO_UDP); } ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_mismatch) { - test_raw_sock_recv(AF_INET, IPPROTO_TCP); + test_raw_sock_recv(NET_AF_INET, NET_IPPROTO_TCP); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_mismatch) { - test_raw_sock_recv(AF_INET6, IPPROTO_TCP); + test_raw_sock_recv(NET_AF_INET6, NET_IPPROTO_TCP); } ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_proto_ipproto_raw) { - test_raw_sock_recv(AF_INET, IPPROTO_RAW); + test_raw_sock_recv(NET_AF_INET, NET_IPPROTO_RAW); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_proto_ipproto_raw) { - test_raw_sock_recv(AF_INET6, IPPROTO_RAW); + test_raw_sock_recv(NET_AF_INET6, NET_IPPROTO_RAW); } -static void test_raw_sock_recvfrom(sa_family_t family) +static void test_raw_sock_recvfrom(net_sa_family_t family) { - size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; + size_t headers_len = (family == NET_AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; size_t expected_len = headers_len + sizeof(test_payload); - struct sockaddr recv_addr = { 0 }; - socklen_t recv_addrlen = sizeof(recv_addr); + struct net_sockaddr recv_addr = { 0 }; + net_socklen_t recv_addrlen = sizeof(recv_addr); int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_IP); sock_bind_any(raw_sock, family); ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0, @@ -603,37 +608,37 @@ static void test_raw_sock_recvfrom(sa_family_t family) zassert_equal(recv_addrlen, addrlen, "Invalid sender address length"); zassert_equal(recv_addr.sa_family, family, "Invalid sender address family"); - if (family == AF_INET) { + if (family == NET_AF_INET) { zassert_mem_equal(&net_sin(&recv_addr)->sin_addr, &net_sin(&src_addr)->sin_addr, - sizeof(struct in_addr), "Invalid sender address"); + sizeof(struct net_in_addr), "Invalid sender address"); } else { zassert_mem_equal(&net_sin6(&recv_addr)->sin6_addr, &net_sin6(&src_addr)->sin6_addr, - sizeof(struct in6_addr), "Invalid sender address"); + sizeof(struct net_in6_addr), "Invalid sender address"); } } ZTEST(socket_af_inet_raw, test_raw_v4_sock_recvfrom) { - test_raw_sock_recvfrom(AF_INET); + test_raw_sock_recvfrom(NET_AF_INET); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_recvfrom) { - test_raw_sock_recvfrom(AF_INET6); + test_raw_sock_recvfrom(NET_AF_INET6); } -static void test_raw_sock_recvmsg(sa_family_t family) +static void test_raw_sock_recvmsg(net_sa_family_t family) { - size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; + size_t headers_len = (family == NET_AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; size_t expected_len = headers_len + sizeof(test_payload); - struct sockaddr recv_addr = { 0 }; - struct iovec io_vector; - struct msghdr msg = { 0 }; + struct net_sockaddr recv_addr = { 0 }; + struct net_iovec io_vector; + struct net_msghdr msg = { 0 }; int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_IP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_IP); sock_bind_any(raw_sock, family); ret = zsock_sendto(udp_sock, test_payload, sizeof(test_payload), 0, @@ -658,33 +663,33 @@ static void test_raw_sock_recvmsg(sa_family_t family) zassert_equal(msg.msg_namelen, addrlen, "Invalid sender address length"); zassert_equal(recv_addr.sa_family, family, "Invalid sender address family"); - if (family == AF_INET) { + if (family == NET_AF_INET) { zassert_mem_equal(&net_sin(&recv_addr)->sin_addr, &net_sin(&src_addr)->sin_addr, - sizeof(struct in_addr), "Invalid sender address"); + sizeof(struct net_in_addr), "Invalid sender address"); } else { zassert_mem_equal(&net_sin6(&recv_addr)->sin6_addr, &net_sin6(&src_addr)->sin6_addr, - sizeof(struct in6_addr), "Invalid sender address"); + sizeof(struct net_in6_addr), "Invalid sender address"); } } ZTEST(socket_af_inet_raw, test_raw_v4_sock_recvmsg) { - test_raw_sock_recvmsg(AF_INET); + test_raw_sock_recvmsg(NET_AF_INET); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_recvmsg) { - test_raw_sock_recvmsg(AF_INET6); + test_raw_sock_recvmsg(NET_AF_INET6); } -static void test_raw_sock_bind(sa_family_t family, struct sockaddr *bind_addr, +static void test_raw_sock_bind(net_sa_family_t family, struct net_sockaddr *bind_addr, bool shall_receive) { int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_UDP); ret = zsock_bind(raw_sock, bind_addr, addrlen); zassert_ok(ret, "Binding RAW socket failed (%d)", errno); @@ -703,51 +708,51 @@ static void test_raw_sock_bind(sa_family_t family, struct sockaddr *bind_addr, ZTEST(socket_af_inet_raw, test_raw_v4_sock_bind) { - struct sockaddr_in bind_addr = { - .sin_family = AF_INET, + struct net_sockaddr_in bind_addr = { + .sin_family = NET_AF_INET, .sin_addr = test_ipv4_2 }; - test_raw_sock_bind(AF_INET, (struct sockaddr *)&bind_addr, true); + test_raw_sock_bind(NET_AF_INET, (struct net_sockaddr *)&bind_addr, true); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_bind) { - struct sockaddr_in6 bind_addr = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 bind_addr = { + .sin6_family = NET_AF_INET6, .sin6_addr = test_ipv6_2 }; - test_raw_sock_bind(AF_INET6, (struct sockaddr *)&bind_addr, true); + test_raw_sock_bind(NET_AF_INET6, (struct net_sockaddr *)&bind_addr, true); } ZTEST(socket_af_inet_raw, test_raw_v4_sock_bind_other_addr) { - struct sockaddr_in bind_addr = { - .sin_family = AF_INET, + struct net_sockaddr_in bind_addr = { + .sin_family = NET_AF_INET, .sin_addr = test_ipv4_1 }; - test_raw_sock_bind(AF_INET, (struct sockaddr *)&bind_addr, false); + test_raw_sock_bind(NET_AF_INET, (struct net_sockaddr *)&bind_addr, false); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_bind_other_addr) { - struct sockaddr_in6 bind_addr = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 bind_addr = { + .sin6_family = NET_AF_INET6, .sin6_addr = test_ipv6_1 }; - test_raw_sock_bind(AF_INET6, (struct sockaddr *)&bind_addr, false); + test_raw_sock_bind(NET_AF_INET6, (struct net_sockaddr *)&bind_addr, false); } -static void test_raw_sock_recv_no_cross_family(sa_family_t family_raw) +static void test_raw_sock_recv_no_cross_family(net_sa_family_t family_raw) { - sa_family_t family_udp = family_raw == AF_INET ? AF_INET6 : AF_INET; + net_sa_family_t family_udp = family_raw == NET_AF_INET ? NET_AF_INET6 : NET_AF_INET; int ret; prepare_addr(family_udp); - prepare_raw_sock(family_raw, IPPROTO_UDP); + prepare_raw_sock(family_raw, NET_IPPROTO_UDP); prepare_udp_sock(family_udp); sock_bind_any(raw_sock, family_raw); @@ -764,20 +769,20 @@ static void test_raw_sock_recv_no_cross_family(sa_family_t family_raw) ZTEST(socket_af_inet_raw, test_raw_v4_sock_recv_no_ipv6) { - test_raw_sock_recv_no_cross_family(AF_INET); + test_raw_sock_recv_no_cross_family(NET_AF_INET); } ZTEST(socket_af_inet_raw, test_raw_v6_sock_recv_no_ipv4) { - test_raw_sock_recv_no_cross_family(AF_INET6); + test_raw_sock_recv_no_cross_family(NET_AF_INET6); } -static void test_two_raw_socks_recv(sa_family_t family) +static void test_two_raw_socks_recv(net_sa_family_t family) { int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP); - prepare_raw_sock_2(family, IPPROTO_IP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_UDP); + prepare_raw_sock_2(family, NET_IPPROTO_IP); sock_bind_any(raw_sock, family); sock_bind_any(raw_sock_2, family); @@ -793,21 +798,21 @@ static void test_two_raw_socks_recv(sa_family_t family) ZTEST(socket_af_inet_raw, test_two_raw_v4_socks_recv) { - test_two_raw_socks_recv(AF_INET); + test_two_raw_socks_recv(NET_AF_INET); } ZTEST(socket_af_inet_raw, test_two_raw_v6_socks_recv) { - test_two_raw_socks_recv(AF_INET6); + test_two_raw_socks_recv(NET_AF_INET6); } -static void test_raw_and_udp_socks_recv(sa_family_t family) +static void test_raw_and_udp_socks_recv(net_sa_family_t family) { - size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; + size_t headers_len = (family == NET_AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; size_t expected_len = headers_len + sizeof(test_payload); int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_UDP); prepare_udp_sock_2(family); sock_bind_any(raw_sock, family); @@ -839,21 +844,21 @@ static void test_raw_and_udp_socks_recv(sa_family_t family) ZTEST(socket_af_inet_raw, test_raw_and_udp_v4_socks_recv) { - test_raw_and_udp_socks_recv(AF_INET); + test_raw_and_udp_socks_recv(NET_AF_INET); } ZTEST(socket_af_inet_raw, test_raw_and_udp_v6_socks_recv) { - test_raw_and_udp_socks_recv(AF_INET6); + test_raw_and_udp_socks_recv(NET_AF_INET6); } -static void test_packet_and_raw_socks_recv(sa_family_t family, uint16_t packet_proto) +static void test_packet_and_raw_socks_recv(net_sa_family_t family, uint16_t packet_proto) { - size_t headers_len = (family == AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; + size_t headers_len = (family == NET_AF_INET) ? NET_IPV4UDPH_LEN : NET_IPV6UDPH_LEN; size_t expected_len = headers_len + sizeof(test_payload); int ret; - prepare_raw_and_udp_sock_and_addr(family, IPPROTO_UDP); + prepare_raw_and_udp_sock_and_addr(family, NET_IPPROTO_UDP); prepare_packet_sock(packet_proto); sock_bind_any(raw_sock, family); @@ -895,7 +900,7 @@ ZTEST(socket_af_inet_raw, test_packet_and_raw_v4_socks_recv_wildcard) ztest_test_skip(); } - test_packet_and_raw_socks_recv(AF_INET, ETH_P_ALL); + test_packet_and_raw_socks_recv(NET_AF_INET, ETH_P_ALL); } ZTEST(socket_af_inet_raw, test_packet_and_raw_v6_socks_recv_wildcard) @@ -904,7 +909,7 @@ ZTEST(socket_af_inet_raw, test_packet_and_raw_v6_socks_recv_wildcard) ztest_test_skip(); } - test_packet_and_raw_socks_recv(AF_INET6, ETH_P_ALL); + test_packet_and_raw_socks_recv(NET_AF_INET6, ETH_P_ALL); } ZTEST(socket_af_inet_raw, test_packet_and_raw_v4_socks_recv_proto_match) @@ -913,7 +918,7 @@ ZTEST(socket_af_inet_raw, test_packet_and_raw_v4_socks_recv_proto_match) ztest_test_skip(); } - test_packet_and_raw_socks_recv(AF_INET, ETH_P_IP); + test_packet_and_raw_socks_recv(NET_AF_INET, ETH_P_IP); } ZTEST(socket_af_inet_raw, test_packet_and_raw_v6_socks_recv_proto_match) @@ -922,7 +927,7 @@ ZTEST(socket_af_inet_raw, test_packet_and_raw_v6_socks_recv_proto_match) ztest_test_skip(); } - test_packet_and_raw_socks_recv(AF_INET6, ETH_P_IPV6); + test_packet_and_raw_socks_recv(NET_AF_INET6, ETH_P_IPV6); } static void test_after(void *arg) diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c index 71777ddb7107d..9a2f960089222 100644 --- a/tests/net/socket/af_packet/src/main.c +++ b/tests/net/socket/af_packet/src/main.c @@ -17,19 +17,19 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); #include #include -/* This test suite verifies that AF_PACKET sockets behave according to well known behaviors. +/* This test suite verifies that NET_AF_PACKET sockets behave according to well known behaviors. * Note, that this is not well standardized and relies on behaviors known from Linux or FreeBSD. * * Sending data (TX) * - * * (AF_PACKET, SOCK_RAW, 0) - The packet contains already a valid L2 header: + * * (NET_AF_PACKET, NET_SOCK_RAW, 0) - The packet contains already a valid L2 header: * - test_raw_sock_sendto_no_proto_bound * - test_raw_sock_sendto_no_proto_unbound * - test_raw_sock_sendto_no_proto_unbound_no_iface * - test_raw_sock_sendto_no_proto_unbound_no_addr * - test_raw_sock_sendmsg_no_proto * - * * (AF_PACKET, SOCK_DGRAM, 0) - User needs to supply `struct sockaddr_ll` with + * * (NET_AF_PACKET, NET_SOCK_DGRAM, 0) - User needs to supply `struct net_sockaddr_ll` with * all the relevant fields filled so that L2 header can be constructed: * - test_dgram_sock_sendto_no_proto_bound * - test_dgram_sock_sendto_no_proto_unbound @@ -37,14 +37,14 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); * - test_dgram_sock_sendto_no_proto_unbound_no_addr * - test_dgram_sock_sendmsg_no_proto * - * * (AF_PACKET, SOCK_RAW, ) - The packet contains already a valid + * * (NET_AF_PACKET, NET_SOCK_RAW, ) - The packet contains already a valid * L2 header. Not mentioned in packet(7) but as the L2 header needs to be * supplied by the user, the protocol value is ignored: * - test_raw_sock_sendto_proto_wildcard * - test_raw_sock_sendmsg_proto_wildcard * - * * (AF_PACKET, SOCK_DGRAM, ) - L2 header is constructed according - * to protocol and `struct sockaddr_ll`: + * * (NET_AF_PACKET, NET_SOCK_DGRAM, ) - L2 header is constructed according + * to protocol and `struct net_sockaddr_ll`: * - test_dgram_sock_sendto_proto_wildcard * - test_dgram_sock_sendto_proto_match * - test_dgram_sock_sendmsg_proto_wildcard @@ -52,32 +52,32 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); * * Receiving data (RX) * - * * (AF_PACKET, SOCK_RAW, 0) - The packet is dropped when received by this socket. + * * (NET_AF_PACKET, NET_SOCK_RAW, 0) - The packet is dropped when received by this socket. * See https://man7.org/linux/man-pages/man7/packet.7.html: * - test_raw_sock_recv_no_proto * - * * (AF_PACKET, SOCK_DGRAM, 0) - The packet is dropped when received by this socket. + * * (NET_AF_PACKET, NET_SOCK_DGRAM, 0) - The packet is dropped when received by this socket. * See https://man7.org/linux/man-pages/man7/packet.7.html * - test_dgram_sock_recv_no_proto * - * * (AF_PACKET, SOCK_RAW, ) - The packet is received for a given protocol + * * (NET_AF_PACKET, NET_SOCK_RAW, ) - The packet is received for a given protocol * only. The L2 header is not removed from the data: * - NOT SUPPORTED * - * * (AF_PACKET, SOCK_DGRAM, ) - The packet is received for a given protocol + * * (NET_AF_PACKET, NET_SOCK_DGRAM, ) - The packet is received for a given protocol * only. The L2 header is removed from the data: * - test_dgram_sock_recv_proto_match * - test_dgram_sock_recv_proto_mismatch * - * * (AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)) - The packet is received for all protocols. - * The L2 header is not removed from the data: + * * (NET_AF_PACKET, NET_SOCK_RAW, net_htons(ETH_P_ALL)) - The packet is received for all + * protocols. The L2 header is not removed from the data: * - test_raw_sock_recv_proto_wildcard * - test_raw_sock_recv_proto_wildcard_bound_other_iface * - test_raw_sock_recvfrom_proto_wildcard * - test_raw_sock_recvfrom_proto_wildcard_unbound * - * * (AF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) - The packet is received for all protocols. - * The L2 header is removed from the data: + * * (NET_AF_PACKET, NET_SOCK_DGRAM, net_htons(ETH_P_ALL)) - The packet is received for all + * protocols. The L2 header is removed from the data: * - test_dgram_sock_recv_proto_wildcard * - test_dgram_sock_recv_proto_wildcard_bound_other_iface * - test_dgram_sock_recvfrom_proto_wildcard @@ -101,7 +101,7 @@ static int udp_sock_2 = -1; static const uint8_t test_payload[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; static uint8_t rx_buf[64]; static uint8_t tx_buf[64]; -static struct in_addr fake_src = { { { 192, 0, 2, 2 } } }; +static struct net_in_addr fake_src = { { { 192, 0, 2, 2 } } }; static uint8_t lladdr1[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; static uint8_t lladdr2[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 }; @@ -162,9 +162,9 @@ static void eth_fake_iface_init(struct net_if *iface) net_if_set_link_addr(iface, ctx->mac_address, 6, NET_LINK_ETHERNET); if (ctx->ip_address != NULL) { - struct in_addr addr; + struct net_in_addr addr; - if (net_addr_pton(AF_INET, ctx->ip_address, &addr) == 0) { + if (net_addr_pton(NET_AF_INET, ctx->ip_address, &addr) == 0) { net_if_ipv4_addr_add(iface, &addr, NET_ADDR_MANUAL, 0); } } @@ -192,7 +192,7 @@ static void setup_packet_socket(int *sock, int type, int proto) }; int ret; - *sock = zsock_socket(AF_PACKET, type, proto); + *sock = zsock_socket(NET_AF_PACKET, type, proto); zassert_true(*sock >= 0, "Cannot create packet socket (%d)", -errno); ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval, @@ -202,15 +202,15 @@ static void setup_packet_socket(int *sock, int type, int proto) static void bind_packet_socket(int sock, struct net_if *iface) { - struct sockaddr_ll addr; + struct net_sockaddr_ll addr; int ret; memset(&addr, 0, sizeof(addr)); addr.sll_ifindex = (iface == NULL) ? 0 : net_if_get_by_iface(iface); - addr.sll_family = AF_PACKET; + addr.sll_family = NET_AF_PACKET; - ret = zsock_bind(sock, (struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_bind(sock, (struct net_sockaddr *)&addr, sizeof(addr)); zassert_ok(ret, "Cannot bind packet socket (%d)", -errno); } @@ -251,23 +251,23 @@ static void iface_cb(struct net_if *iface, void *user_data) #define SRC_PORT 4240 #define DST_PORT 4242 -static void prepare_udp_socket(int *sock, struct sockaddr_in *sockaddr, uint16_t local_port) +static void prepare_udp_socket(int *sock, struct net_sockaddr_in *sockaddr, uint16_t local_port) { struct timeval optval = { .tv_usec = 100000, }; int ret; - *sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + *sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(*sock >= 0, "Cannot create DGRAM (UDP) socket (%d)", *sock); - sockaddr->sin_family = AF_INET; - sockaddr->sin_port = htons(local_port); - ret = zsock_inet_pton(AF_INET, IPV4_ADDR, &sockaddr->sin_addr); + sockaddr->sin_family = NET_AF_INET; + sockaddr->sin_port = net_htons(local_port); + ret = zsock_inet_pton(NET_AF_INET, IPV4_ADDR, &sockaddr->sin_addr); zassert_equal(ret, 1, "inet_pton failed"); /* Bind UDP socket to local port */ - ret = zsock_bind(*sock, (struct sockaddr *) sockaddr, sizeof(*sockaddr)); + ret = zsock_bind(*sock, (struct net_sockaddr *) sockaddr, sizeof(*sockaddr)); zassert_equal(ret, 0, "Cannot bind DGRAM (UDP) socket (%d)", -errno); ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval, @@ -282,14 +282,14 @@ ZTEST(socket_packet, test_raw_packet_sockets_udp_send) { uint8_t data_to_send[] = { 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 }; uint8_t data_to_receive[sizeof(data_to_send) + HDR_SIZE]; - struct sockaddr_ll src; - struct sockaddr_in sockaddr; + struct net_sockaddr_ll src; + struct net_sockaddr_in sockaddr; int ret; - socklen_t addrlen; + net_socklen_t addrlen; ssize_t sent = 0; - prepare_packet_socket(&packet_sock_1, ud.first, SOCK_RAW, htons(ETH_P_ALL)); - prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_1, ud.first, NET_SOCK_RAW, net_htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_2, ud.second, NET_SOCK_RAW, net_htons(ETH_P_ALL)); /* Prepare UDP socket which will read data */ prepare_udp_socket(&udp_sock_1, &sockaddr, DST_PORT); @@ -297,14 +297,14 @@ ZTEST(socket_packet, test_raw_packet_sockets_udp_send) /* Prepare UDP socket from which data are going to be sent */ prepare_udp_socket(&udp_sock_2, &sockaddr, SRC_PORT); /* Properly set destination port for UDP packet */ - sockaddr.sin_port = htons(DST_PORT); + sockaddr.sin_port = net_htons(DST_PORT); /* * Send UDP datagram to us - as check_ip_addr() in net_send_data() * returns 1 - the packet is processed immediately in the net stack */ sent = zsock_sendto(udp_sock_2, data_to_send, sizeof(data_to_send), - 0, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); + 0, (struct net_sockaddr *)&sockaddr, sizeof(sockaddr)); zassert_equal(sent, sizeof(data_to_send), "sendto failed"); memset(&data_to_receive, 0, sizeof(data_to_receive)); @@ -313,7 +313,7 @@ ZTEST(socket_packet, test_raw_packet_sockets_udp_send) /* Check if UDP packets can be read after being sent */ addrlen = sizeof(sockaddr); ret = zsock_recvfrom(udp_sock_1, data_to_receive, sizeof(data_to_receive), - 0, (struct sockaddr *)&sockaddr, &addrlen); + 0, (struct net_sockaddr *)&sockaddr, &addrlen); zassert_equal(ret, sizeof(data_to_send), "Cannot receive all data (%d)", -errno); zassert_mem_equal(data_to_receive, data_to_send, sizeof(data_to_send), @@ -330,7 +330,7 @@ ZTEST(socket_packet, test_raw_packet_sockets_udp_send) * which have been sent. */ ret = zsock_recvfrom(packet_sock_1, data_to_receive, sizeof(data_to_receive), 0, - (struct sockaddr *)&src, &addrlen); + (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, sizeof(data_to_send) + HDR_SIZE, "Cannot receive all data (%d vs %zd) (%d)", ret, sizeof(data_to_send), -errno); @@ -341,51 +341,51 @@ ZTEST(socket_packet, test_raw_packet_sockets_udp_send) ZTEST(socket_packet, test_packet_sockets) { - prepare_packet_socket(&packet_sock_1, ud.first, SOCK_RAW, htons(ETH_P_ALL)); - prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_1, ud.first, NET_SOCK_RAW, net_htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_2, ud.second, NET_SOCK_RAW, net_htons(ETH_P_ALL)); } ZTEST(socket_packet, test_packet_sockets_dgram) { - socklen_t addrlen = sizeof(struct sockaddr_ll); - struct sockaddr_ll dst, src; + net_socklen_t addrlen = sizeof(struct net_sockaddr_ll); + struct net_sockaddr_ll dst, src; int ret; - prepare_packet_socket(&packet_sock_1, ud.first, SOCK_DGRAM, htons(ETH_P_TSN)); - prepare_packet_socket(&packet_sock_2, ud.second, SOCK_DGRAM, htons(ETH_P_TSN)); + prepare_packet_socket(&packet_sock_1, ud.first, NET_SOCK_DGRAM, net_htons(ETH_P_TSN)); + prepare_packet_socket(&packet_sock_2, ud.second, NET_SOCK_DGRAM, net_htons(ETH_P_TSN)); memset(&dst, 0, sizeof(dst)); - dst.sll_family = AF_PACKET; - dst.sll_protocol = htons(ETH_P_TSN); + dst.sll_family = NET_AF_PACKET; + dst.sll_protocol = net_htons(ETH_P_TSN); memcpy(dst.sll_addr, lladdr1, sizeof(lladdr1)); ret = zsock_sendto(packet_sock_2, test_payload, sizeof(test_payload), 0, - (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); + (const struct net_sockaddr *)&dst, sizeof(struct net_sockaddr_ll)); zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)", -errno); ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), 0, - (struct sockaddr *)&src, &addrlen); + (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, -1, "Received something (%d)", ret); zassert_equal(errno, EAGAIN, "Wrong errno (%d)", errno); memset(&src, 0, sizeof(src)); errno = 0; ret = zsock_recvfrom(packet_sock_1, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&src, &addrlen); + 0, (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, sizeof(test_payload), "Cannot receive all data (%d vs %zd) (%d)", ret, sizeof(test_payload), -errno); - zassert_equal(addrlen, sizeof(struct sockaddr_ll), + zassert_equal(addrlen, sizeof(struct net_sockaddr_ll), "Invalid address length (%d)", addrlen); - struct sockaddr_ll src_expected = { - .sll_family = AF_PACKET, + struct net_sockaddr_ll src_expected = { + .sll_family = NET_AF_PACKET, .sll_protocol = dst.sll_protocol, .sll_ifindex = net_if_get_by_iface(ud.first), - .sll_pkttype = PACKET_OTHERHOST, - .sll_hatype = ARPHRD_ETHER, + .sll_pkttype = NET_PACKET_OTHERHOST, + .sll_hatype = NET_ARPHRD_ETHER, .sll_halen = sizeof(lladdr2), .sll_addr = {0}, }; @@ -401,14 +401,14 @@ ZTEST(socket_packet, test_packet_sockets_dgram) * data in socket 1 */ ret = zsock_sendto(packet_sock_2, test_payload, sizeof(test_payload), 0, - (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); + (const struct net_sockaddr *)&dst, sizeof(struct net_sockaddr_ll)); zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)", -errno); memset(&src, 0, sizeof(src)); ret = zsock_recvfrom(packet_sock_1, rx_buf, sizeof(rx_buf), 0, - (struct sockaddr *)&src, &addrlen); + (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, -1, "Received something (%d)", ret); zassert_equal(errno, EAGAIN, "Wrong errno (%d)", errno); @@ -416,18 +416,18 @@ ZTEST(socket_packet, test_packet_sockets_dgram) errno = 0; ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&src, &addrlen); + 0, (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, sizeof(test_payload), "Cannot receive all data (%d)", -errno); - zassert_equal(addrlen, sizeof(struct sockaddr_ll), + zassert_equal(addrlen, sizeof(struct net_sockaddr_ll), "Invalid address length (%d)", addrlen); - src_expected = (struct sockaddr_ll){ - .sll_family = AF_PACKET, + src_expected = (struct net_sockaddr_ll){ + .sll_family = NET_AF_PACKET, .sll_protocol = dst.sll_protocol, .sll_ifindex = net_if_get_by_iface(ud.second), - .sll_pkttype = PACKET_OTHERHOST, - .sll_hatype = ARPHRD_ETHER, + .sll_pkttype = NET_PACKET_OTHERHOST, + .sll_hatype = NET_ARPHRD_ETHER, .sll_halen = ARRAY_SIZE(lladdr2), .sll_addr = {0}, }; @@ -450,13 +450,13 @@ ZTEST(socket_packet, test_packet_sockets_dgram) payload_ip_length[5] = 1; ret = zsock_sendto(packet_sock_2, payload_ip_length, sizeof(payload_ip_length), 0, - (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); + (const struct net_sockaddr *)&dst, sizeof(struct net_sockaddr_ll)); zassert_equal(ret, sizeof(payload_ip_length), "Cannot send all data (%d)", -errno); memset(&src, 0, sizeof(src)); errno = 0; ret = zsock_recvfrom(packet_sock_2, receive_ip_length, sizeof(receive_ip_length), 0, - (struct sockaddr *)&src, &addrlen); + (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, ARRAY_SIZE(payload_ip_length), "Cannot receive all data (%d)", -errno); zassert_mem_equal(payload_ip_length, receive_ip_length, sizeof(payload_ip_length), @@ -465,8 +465,8 @@ ZTEST(socket_packet, test_packet_sockets_dgram) ZTEST(socket_packet, test_raw_and_dgram_socket_exchange) { - socklen_t addrlen = sizeof(struct sockaddr_ll); - struct sockaddr_ll dst, src; + net_socklen_t addrlen = sizeof(struct net_sockaddr_ll); + struct net_sockaddr_ll dst, src; int ret; const uint8_t expected_payload_raw[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* Dst ll addr */ @@ -481,18 +481,18 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 /* Payload */ }; - prepare_packet_socket(&packet_sock_1, ud.first, SOCK_DGRAM, htons(ETH_P_ALL)); - prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_1, ud.first, NET_SOCK_DGRAM, net_htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_2, ud.second, NET_SOCK_RAW, net_htons(ETH_P_ALL)); memset(&dst, 0, sizeof(dst)); - dst.sll_family = AF_PACKET; - dst.sll_protocol = htons(ETH_P_IP); + dst.sll_family = NET_AF_PACKET; + dst.sll_protocol = net_htons(ETH_P_IP); memcpy(dst.sll_addr, lladdr2, sizeof(lladdr1)); - /* SOCK_DGRAM to SOCK_RAW */ + /* NET_SOCK_DGRAM to NET_SOCK_RAW */ ret = zsock_sendto(packet_sock_1, test_payload, sizeof(test_payload), 0, - (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); + (const struct net_sockaddr *)&dst, sizeof(struct net_sockaddr_ll)); zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)", -errno); @@ -501,7 +501,7 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange) errno = 0; ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&src, &addrlen); + 0, (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, sizeof(expected_payload_raw), "Cannot receive all data (%d vs %zd) (%d)", ret, sizeof(expected_payload_raw), -errno); @@ -509,13 +509,13 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange) sizeof(expected_payload_raw), "Data mismatch"); memset(&dst, 0, sizeof(dst)); - dst.sll_family = AF_PACKET; - dst.sll_protocol = htons(ETH_P_IP); + dst.sll_family = NET_AF_PACKET; + dst.sll_protocol = net_htons(ETH_P_IP); - /* SOCK_RAW to SOCK_DGRAM */ + /* NET_SOCK_RAW to NET_SOCK_DGRAM */ ret = zsock_sendto(packet_sock_2, send_payload_raw, sizeof(send_payload_raw), 0, - (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); + (const struct net_sockaddr *)&dst, sizeof(struct net_sockaddr_ll)); zassert_equal(ret, sizeof(send_payload_raw), "Cannot send all data (%d)", -errno); @@ -523,7 +523,7 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange) errno = 0; ret = zsock_recvfrom(packet_sock_1, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&src, &addrlen); + 0, (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, sizeof(test_payload), "Cannot receive all data (%d)", -errno); zassert_mem_equal(test_payload, rx_buf, sizeof(test_payload), @@ -532,8 +532,8 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_exchange) ZTEST(socket_packet, test_raw_and_dgram_socket_recv) { - socklen_t addrlen = sizeof(struct sockaddr_ll); - struct sockaddr_ll dst, src; + net_socklen_t addrlen = sizeof(struct net_sockaddr_ll); + struct net_sockaddr_ll dst, src; int ret; const uint8_t expected_payload_raw[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* Dst ll addr */ @@ -542,27 +542,27 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_recv) 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 /* Payload */ }; - prepare_packet_socket(&packet_sock_1, ud.first, SOCK_DGRAM, htons(ETH_P_ALL)); - prepare_packet_socket(&packet_sock_2, ud.second, SOCK_RAW, htons(ETH_P_ALL)); - prepare_packet_socket(&packet_sock_3, ud.second, SOCK_DGRAM, htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_1, ud.first, NET_SOCK_DGRAM, net_htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_2, ud.second, NET_SOCK_RAW, net_htons(ETH_P_ALL)); + prepare_packet_socket(&packet_sock_3, ud.second, NET_SOCK_DGRAM, net_htons(ETH_P_ALL)); memset(&dst, 0, sizeof(dst)); - dst.sll_family = AF_PACKET; - dst.sll_protocol = htons(ETH_P_IP); + dst.sll_family = NET_AF_PACKET; + dst.sll_protocol = net_htons(ETH_P_IP); memcpy(dst.sll_addr, lladdr2, sizeof(lladdr1)); ret = zsock_sendto(packet_sock_1, test_payload, sizeof(test_payload), 0, - (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); + (const struct net_sockaddr *)&dst, sizeof(struct net_sockaddr_ll)); zassert_equal(ret, sizeof(test_payload), "Cannot send all data (%d)", -errno); memset(&src, 0, sizeof(src)); - /* Both SOCK_DGRAM to SOCK_RAW sockets should receive packet. */ + /* Both NET_SOCK_DGRAM to NET_SOCK_RAW sockets should receive packet. */ errno = 0; ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&src, &addrlen); + 0, (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, sizeof(expected_payload_raw), "Cannot receive all data (%d vs %zd) (%d)", ret, sizeof(expected_payload_raw), -errno); @@ -574,7 +574,7 @@ ZTEST(socket_packet, test_raw_and_dgram_socket_recv) errno = 0; ret = zsock_recvfrom(packet_sock_3, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&src, &addrlen); + 0, (struct net_sockaddr *)&src, &addrlen); zassert_equal(ret, sizeof(test_payload), "Cannot receive all data (%d)", -errno); zassert_mem_equal(test_payload, rx_buf, sizeof(test_payload), @@ -591,7 +591,7 @@ static void prepare_test_packet(int sock_type, uint16_t proto, { uint16_t offset = 0; - if (sock_type == SOCK_RAW) { + if (sock_type == NET_SOCK_RAW) { struct net_eth_hdr *eth = (struct net_eth_hdr *)tx_buf; offset += sizeof(struct net_eth_hdr); @@ -601,11 +601,11 @@ static void prepare_test_packet(int sock_type, uint16_t proto, memcpy(ð->dst, ll_dst, sizeof(eth->dst)); memcpy(ð->src, ll_src, sizeof(eth->src)); - eth->type = htons(proto); + eth->type = net_htons(proto); } if (proto == ETH_P_IP) { - struct in_addr addr; + struct net_in_addr addr; struct net_ipv4_hdr *ipv4 = (struct net_ipv4_hdr *)(tx_buf + offset); struct net_udp_hdr *udp = @@ -613,21 +613,21 @@ static void prepare_test_packet(int sock_type, uint16_t proto, offset += NET_IPV4UDPH_LEN; zassert_true(offset <= sizeof(tx_buf), "Packet too long"); - zassert_ok(net_addr_pton(AF_INET, IPV4_ADDR, &addr), "Address parse failed"); + zassert_ok(net_addr_pton(NET_AF_INET, IPV4_ADDR, &addr), "Address parse failed"); /* Prepare IPv4 header */ ipv4->vhl = 0x45; - ipv4->len = htons(sizeof(test_payload) + NET_IPV4UDPH_LEN); + ipv4->len = net_htons(sizeof(test_payload) + NET_IPV4UDPH_LEN); ipv4->ttl = 64; - ipv4->proto = IPPROTO_UDP; + ipv4->proto = NET_IPPROTO_UDP; ipv4->chksum = TEST_IPV4_CHKSUM; memcpy(ipv4->src, &fake_src, sizeof(ipv4->src)); memcpy(ipv4->dst, &addr, sizeof(ipv4->dst)); /* Prepare UDP header */ - udp->src_port = htons(SRC_PORT); - udp->dst_port = htons(DST_PORT); - udp->len = htons(sizeof(test_payload) + NET_UDPH_LEN); + udp->src_port = net_htons(SRC_PORT); + udp->dst_port = net_htons(DST_PORT); + udp->len = net_htons(sizeof(test_payload) + NET_UDPH_LEN); udp->chksum = TEST_UDP_CHKSUM; } @@ -638,13 +638,13 @@ static void prepare_test_packet(int sock_type, uint16_t proto, *pkt_len = offset; } -static void prepare_test_dst_lladdr(struct sockaddr_ll *ll_dst, uint16_t proto, +static void prepare_test_dst_lladdr(struct net_sockaddr_ll *ll_dst, uint16_t proto, uint8_t *ll_addr, struct net_if *iface) { - memset(ll_dst, 0, sizeof(struct sockaddr_ll)); + memset(ll_dst, 0, sizeof(struct net_sockaddr_ll)); - ll_dst->sll_family = AF_PACKET; - ll_dst->sll_protocol = htons(proto); + ll_dst->sll_family = NET_AF_PACKET; + ll_dst->sll_protocol = net_htons(proto); memcpy(ll_dst->sll_addr, ll_addr, NET_ETH_ADDR_LEN); if (iface != NULL) { @@ -656,12 +656,12 @@ static void test_sendto_common(int sock_type, int proto, bool do_bind, int custom_dst_iface, bool set_dst_addr, bool success) { - struct sockaddr_in ip_src; - struct sockaddr_ll ll_dst; + struct net_sockaddr_in ip_src; + struct net_sockaddr_ll ll_dst; uint16_t pkt_len; int ret; - setup_packet_socket(&packet_sock_1, sock_type, htons(proto)); + setup_packet_socket(&packet_sock_1, sock_type, net_htons(proto)); if (do_bind) { bind_packet_socket(packet_sock_1, ud.second); } @@ -673,8 +673,8 @@ static void test_sendto_common(int sock_type, int proto, bool do_bind, } ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0, - set_dst_addr ? (struct sockaddr *)&ll_dst : NULL, - set_dst_addr ? sizeof(struct sockaddr_ll) : 0); + set_dst_addr ? (struct net_sockaddr *)&ll_dst : NULL, + set_dst_addr ? sizeof(struct net_sockaddr_ll) : 0); if (success) { zassert_not_equal(ret, -1, "Failed to send (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len); @@ -694,34 +694,34 @@ static void test_sendto_common(int sock_type, int proto, bool do_bind, ZTEST(socket_packet, test_raw_sock_sendto_no_proto_bound) { - test_sendto_common(SOCK_RAW, 0, true, 0, true, true); + test_sendto_common(NET_SOCK_RAW, 0, true, 0, true, true); } ZTEST(socket_packet, test_raw_sock_sendto_no_proto_unbound) { - test_sendto_common(SOCK_RAW, 0, false, 0, true, true); + test_sendto_common(NET_SOCK_RAW, 0, false, 0, true, true); } ZTEST(socket_packet, test_raw_sock_sendto_no_proto_unbound_no_iface) { - test_sendto_common(SOCK_RAW, 0, false, 10, true, false); + test_sendto_common(NET_SOCK_RAW, 0, false, 10, true, false); } ZTEST(socket_packet, test_raw_sock_sendto_no_proto_unbound_no_addr) { - test_sendto_common(SOCK_RAW, 0, false, 0, false, false); + test_sendto_common(NET_SOCK_RAW, 0, false, 0, false, false); } static void test_sendmsg_common(int sock_type, int proto) { - struct sockaddr_in ip_src; - struct sockaddr_ll ll_dst; - struct iovec io_vector; - struct msghdr msg = { 0 }; + struct net_sockaddr_in ip_src; + struct net_sockaddr_ll ll_dst; + struct net_iovec io_vector; + struct net_msghdr msg = { 0 }; uint16_t pkt_len; int ret; - setup_packet_socket(&packet_sock_1, sock_type, htons(proto)); + setup_packet_socket(&packet_sock_1, sock_type, net_htons(proto)); prepare_udp_socket(&udp_sock_1, &ip_src, DST_PORT); prepare_test_packet(sock_type, ETH_P_IP, lladdr2, lladdr1, &pkt_len); prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second); @@ -748,86 +748,86 @@ static void test_sendmsg_common(int sock_type, int proto) ZTEST(socket_packet, test_raw_sock_sendmsg_no_proto) { - test_sendmsg_common(SOCK_RAW, 0); + test_sendmsg_common(NET_SOCK_RAW, 0); } ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_bound) { - test_sendto_common(SOCK_DGRAM, 0, true, 0, true, true); + test_sendto_common(NET_SOCK_DGRAM, 0, true, 0, true, true); } ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_unbound) { - test_sendto_common(SOCK_DGRAM, 0, false, 0, true, true); + test_sendto_common(NET_SOCK_DGRAM, 0, false, 0, true, true); } ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_unbound_no_iface) { - test_sendto_common(SOCK_DGRAM, 0, false, 10, true, false); + test_sendto_common(NET_SOCK_DGRAM, 0, false, 10, true, false); } ZTEST(socket_packet, test_dgram_sock_sendto_no_proto_unbound_no_addr) { - test_sendto_common(SOCK_DGRAM, 0, false, 0, false, false); + test_sendto_common(NET_SOCK_DGRAM, 0, false, 0, false, false); } ZTEST(socket_packet, test_dgram_sock_sendmsg_no_proto) { - test_sendmsg_common(SOCK_DGRAM, 0); + test_sendmsg_common(NET_SOCK_DGRAM, 0); } ZTEST(socket_packet, test_raw_sock_sendto_proto_wildcard) { - test_sendto_common(SOCK_RAW, ETH_P_ALL, true, 0, true, true); + test_sendto_common(NET_SOCK_RAW, ETH_P_ALL, true, 0, true, true); } ZTEST(socket_packet, test_raw_sock_sendmsg_proto_wildcard) { - test_sendmsg_common(SOCK_RAW, ETH_P_ALL); + test_sendmsg_common(NET_SOCK_RAW, ETH_P_ALL); } ZTEST(socket_packet, test_dgram_sock_sendto_proto_wildcard) { - test_sendto_common(SOCK_DGRAM, ETH_P_ALL, true, 0, true, true); + test_sendto_common(NET_SOCK_DGRAM, ETH_P_ALL, true, 0, true, true); } ZTEST(socket_packet, test_dgram_sock_sendto_proto_match) { - test_sendto_common(SOCK_DGRAM, ETH_P_IP, true, 0, true, true); + test_sendto_common(NET_SOCK_DGRAM, ETH_P_IP, true, 0, true, true); } ZTEST(socket_packet, test_dgram_sock_sendmsg_proto_wildcard) { - test_sendmsg_common(SOCK_DGRAM, ETH_P_ALL); + test_sendmsg_common(NET_SOCK_DGRAM, ETH_P_ALL); } ZTEST(socket_packet, test_dgram_sock_sendmsg_proto_match) { - test_sendmsg_common(SOCK_DGRAM, ETH_P_IP); + test_sendmsg_common(NET_SOCK_DGRAM, ETH_P_IP); } static void test_recv_common(int sock_type, int proto, bool success) { - struct sockaddr_ll ll_dst; + struct net_sockaddr_ll ll_dst; uint16_t offset = 0; uint16_t pkt_len; int ret; /* Transmitting sock */ - setup_packet_socket(&packet_sock_1, SOCK_RAW, 0); - prepare_test_packet(SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len); + setup_packet_socket(&packet_sock_1, NET_SOCK_RAW, 0); + prepare_test_packet(NET_SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len); prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second); /* Receiving sock */ - setup_packet_socket(&packet_sock_2, sock_type, htons(proto)); + setup_packet_socket(&packet_sock_2, sock_type, net_htons(proto)); bind_packet_socket(packet_sock_2, ud.first); ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0, - (struct sockaddr *)&ll_dst, - sizeof(struct sockaddr_ll)); + (struct net_sockaddr *)&ll_dst, + sizeof(struct net_sockaddr_ll)); zassert_not_equal(ret, -1, "Failed to send (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len); - if (sock_type == SOCK_DGRAM) { + if (sock_type == NET_SOCK_DGRAM) { offset = sizeof(struct net_eth_hdr); pkt_len -= sizeof(struct net_eth_hdr); } @@ -848,81 +848,81 @@ static void test_recv_common(int sock_type, int proto, bool success) ZTEST(socket_packet, test_raw_sock_recv_no_proto) { - test_recv_common(SOCK_RAW, 0, false); + test_recv_common(NET_SOCK_RAW, 0, false); } ZTEST(socket_packet, test_dgram_sock_recv_no_proto) { - test_recv_common(SOCK_DGRAM, 0, false); + test_recv_common(NET_SOCK_DGRAM, 0, false); } ZTEST(socket_packet, test_dgram_sock_recv_proto_match) { - test_recv_common(SOCK_DGRAM, ETH_P_IP, true); + test_recv_common(NET_SOCK_DGRAM, ETH_P_IP, true); } ZTEST(socket_packet, test_dgram_sock_recv_proto_mismatch) { - test_recv_common(SOCK_DGRAM, ETH_P_IPV6, false); + test_recv_common(NET_SOCK_DGRAM, ETH_P_IPV6, false); } ZTEST(socket_packet, test_raw_sock_recv_proto_wildcard) { - test_recv_common(SOCK_RAW, ETH_P_ALL, true); + test_recv_common(NET_SOCK_RAW, ETH_P_ALL, true); } -static void validate_recvfrom_addr(struct sockaddr_ll *ll_rx, socklen_t addrlen, +static void validate_recvfrom_addr(struct net_sockaddr_ll *ll_rx, net_socklen_t addrlen, int iface, uint8_t *lladdr) { - zassert_equal(addrlen, sizeof(struct sockaddr_ll), + zassert_equal(addrlen, sizeof(struct net_sockaddr_ll), "Invalid address length (%u)", addrlen); - zassert_equal(ll_rx->sll_family, AF_PACKET, "Invalid family"); - zassert_equal(ll_rx->sll_protocol, htons(ETH_P_IP), "Invalid protocol"); + zassert_equal(ll_rx->sll_family, NET_AF_PACKET, "Invalid family"); + zassert_equal(ll_rx->sll_protocol, net_htons(ETH_P_IP), "Invalid protocol"); zassert_equal(ll_rx->sll_ifindex, iface, "Invalid interface"); - zassert_equal(ll_rx->sll_hatype, ARPHRD_ETHER, "Invalid hardware type"); - zassert_equal(ll_rx->sll_pkttype, PACKET_OTHERHOST, "Invalid packet type"); + zassert_equal(ll_rx->sll_hatype, NET_ARPHRD_ETHER, "Invalid hardware type"); + zassert_equal(ll_rx->sll_pkttype, NET_PACKET_OTHERHOST, "Invalid packet type"); zassert_equal(ll_rx->sll_halen, NET_ETH_ADDR_LEN, "Invalid address length"); zassert_mem_equal(ll_rx->sll_addr, lladdr, NET_ETH_ADDR_LEN, "Invalid address"); } static void test_recvfrom_common(int sock_type, int proto) { - struct sockaddr_ll ll_dst; - struct sockaddr_ll ll_rx = { 0 }; - socklen_t addrlen = sizeof(ll_rx); + struct net_sockaddr_ll ll_dst; + struct net_sockaddr_ll ll_rx = { 0 }; + net_socklen_t addrlen = sizeof(ll_rx); uint16_t pkt_len; uint16_t offset = 0; int ret; /* Transmitting sock */ - setup_packet_socket(&packet_sock_1, SOCK_RAW, 0); - prepare_test_packet(SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len); + setup_packet_socket(&packet_sock_1, NET_SOCK_RAW, 0); + prepare_test_packet(NET_SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len); prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second); /* Receiving sock */ - setup_packet_socket(&packet_sock_2, sock_type, htons(proto)); + setup_packet_socket(&packet_sock_2, sock_type, net_htons(proto)); bind_packet_socket(packet_sock_2, ud.first); ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0, - (struct sockaddr *)&ll_dst, - sizeof(struct sockaddr_ll)); + (struct net_sockaddr *)&ll_dst, + sizeof(struct net_sockaddr_ll)); zassert_not_equal(ret, -1, "Failed to send (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len); - if (sock_type == SOCK_DGRAM) { + if (sock_type == NET_SOCK_DGRAM) { offset = sizeof(struct net_eth_hdr); } pkt_len -= offset; ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), 0, - (struct sockaddr *)&ll_rx, &addrlen); + (struct net_sockaddr *)&ll_rx, &addrlen); zassert_not_equal(ret, -1, "Failed to receive packet (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data size received (%d, expected %d)", ret, pkt_len); zassert_mem_equal(rx_buf, tx_buf + offset, pkt_len, "Invalid payload received"); - zassert_equal(addrlen, sizeof(struct sockaddr_ll), + zassert_equal(addrlen, sizeof(struct net_sockaddr_ll), "Invalid address length (%u)", addrlen); validate_recvfrom_addr(&ll_rx, addrlen, net_if_get_by_iface(ud.first), lladdr2); @@ -930,43 +930,43 @@ static void test_recvfrom_common(int sock_type, int proto) ZTEST(socket_packet, test_raw_sock_recvfrom_proto_wildcard) { - test_recvfrom_common(SOCK_RAW, ETH_P_ALL); + test_recvfrom_common(NET_SOCK_RAW, ETH_P_ALL); } ZTEST(socket_packet, test_dgram_sock_recv_proto_wildcard) { - test_recv_common(SOCK_DGRAM, ETH_P_ALL, true); + test_recv_common(NET_SOCK_DGRAM, ETH_P_ALL, true); } ZTEST(socket_packet, test_dgram_sock_recvfrom_proto_wildcard) { - test_recvfrom_common(SOCK_DGRAM, ETH_P_ALL); + test_recvfrom_common(NET_SOCK_DGRAM, ETH_P_ALL); } static void test_recvfrom_unbound_round(int tx_sock, int rx_sock, int sock_type, uint8_t *src_addr, struct net_if *src_iface, uint8_t *dst_addr, struct net_if *dst_iface) { - uint16_t offset = (sock_type == SOCK_DGRAM) ? sizeof(struct net_eth_hdr) : 0; - struct sockaddr_ll ll_dst; - struct sockaddr_ll ll_rx = { 0 }; - socklen_t addrlen = sizeof(ll_rx); + uint16_t offset = (sock_type == NET_SOCK_DGRAM) ? sizeof(struct net_eth_hdr) : 0; + struct net_sockaddr_ll ll_dst; + struct net_sockaddr_ll ll_rx = { 0 }; + net_socklen_t addrlen = sizeof(ll_rx); uint16_t pkt_len; int ret; - prepare_test_packet(SOCK_RAW, ETH_P_IP, src_addr, dst_addr, &pkt_len); + prepare_test_packet(NET_SOCK_RAW, ETH_P_IP, src_addr, dst_addr, &pkt_len); prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, dst_addr, src_iface); ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0, - (struct sockaddr *)&ll_dst, - sizeof(struct sockaddr_ll)); + (struct net_sockaddr *)&ll_dst, + sizeof(struct net_sockaddr_ll)); zassert_not_equal(ret, -1, "Failed to send (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len); pkt_len -= offset; ret = zsock_recvfrom(packet_sock_2, rx_buf, sizeof(rx_buf), 0, - (struct sockaddr *)&ll_rx, &addrlen); + (struct net_sockaddr *)&ll_rx, &addrlen); zassert_not_equal(ret, -1, "Failed to receive packet (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data size received (%d, expected %d)", @@ -979,15 +979,15 @@ static void test_recvfrom_unbound_round(int tx_sock, int rx_sock, int sock_type, static void test_recvfrom_common_unbound(int sock_type, bool bind_iface_0) { - struct sockaddr_ll ll_dst; + struct net_sockaddr_ll ll_dst; static uint8_t dummy_lladdr[] = { 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; uint16_t pkt_len; int ret; /* Transmitting sock */ - setup_packet_socket(&packet_sock_1, SOCK_RAW, 0); + setup_packet_socket(&packet_sock_1, NET_SOCK_RAW, 0); /* Receiving sock */ - setup_packet_socket(&packet_sock_2, sock_type, htons(ETH_P_ALL)); + setup_packet_socket(&packet_sock_2, sock_type, net_htons(ETH_P_ALL)); if (bind_iface_0) { bind_packet_socket(packet_sock_2, NULL); @@ -1007,8 +1007,8 @@ static void test_recvfrom_common_unbound(int sock_type, bool bind_iface_0) prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, dummy_lladdr, ud.second); prepare_test_packet(sock_type, ETH_P_IP, lladdr2, dummy_lladdr, &pkt_len); ret = zsock_sendto(packet_sock_2, tx_buf, pkt_len, 0, - (struct sockaddr *)&ll_dst, - sizeof(struct sockaddr_ll)); + (struct net_sockaddr *)&ll_dst, + sizeof(struct net_sockaddr_ll)); zassert_not_equal(ret, -1, "Failed to send (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len); @@ -1024,43 +1024,43 @@ static void test_recvfrom_common_unbound(int sock_type, bool bind_iface_0) ZTEST(socket_packet, test_raw_sock_recvfrom_proto_wildcard_unbound) { - test_recvfrom_common_unbound(SOCK_RAW, false); + test_recvfrom_common_unbound(NET_SOCK_RAW, false); } ZTEST(socket_packet, test_dgram_sock_recvfrom_proto_wildcard_unbound) { - test_recvfrom_common_unbound(SOCK_DGRAM, false); + test_recvfrom_common_unbound(NET_SOCK_DGRAM, false); } ZTEST(socket_packet, test_raw_sock_recvfrom_proto_wildcard_bound_iface_0) { - test_recvfrom_common_unbound(SOCK_RAW, true); + test_recvfrom_common_unbound(NET_SOCK_RAW, true); } ZTEST(socket_packet, test_dgram_sock_recvfrom_proto_wildcard_bound_iface_0) { - test_recvfrom_common_unbound(SOCK_DGRAM, true); + test_recvfrom_common_unbound(NET_SOCK_DGRAM, true); } static void test_recv_common_bound_other_iface(int sock_type) { - struct sockaddr_ll ll_dst; - struct sockaddr_in ip_src; + struct net_sockaddr_ll ll_dst; + struct net_sockaddr_in ip_src; uint16_t pkt_len; int ret; /* Transmitting sock */ - setup_packet_socket(&packet_sock_1, SOCK_RAW, 0); - prepare_test_packet(SOCK_RAW, ETH_P_IP, lladdr1, lladdr2, &pkt_len); + setup_packet_socket(&packet_sock_1, NET_SOCK_RAW, 0); + prepare_test_packet(NET_SOCK_RAW, ETH_P_IP, lladdr1, lladdr2, &pkt_len); prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr2, ud.first); /* Receiving sock */ - setup_packet_socket(&packet_sock_2, sock_type, htons(ETH_P_ALL)); + setup_packet_socket(&packet_sock_2, sock_type, net_htons(ETH_P_ALL)); bind_packet_socket(packet_sock_2, ud.first); prepare_udp_socket(&udp_sock_1, &ip_src, DST_PORT); ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0, - (struct sockaddr *)&ll_dst, - sizeof(struct sockaddr_ll)); + (struct net_sockaddr *)&ll_dst, + sizeof(struct net_sockaddr_ll)); zassert_not_equal(ret, -1, "Failed to send (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len); @@ -1076,36 +1076,36 @@ static void test_recv_common_bound_other_iface(int sock_type) ZTEST(socket_packet, test_raw_sock_recv_proto_wildcard_bound_other_iface) { - test_recv_common_bound_other_iface(SOCK_RAW); + test_recv_common_bound_other_iface(NET_SOCK_RAW); } ZTEST(socket_packet, test_dgram_sock_recv_proto_wildcard_bound_other_iface) { - test_recv_common_bound_other_iface(SOCK_DGRAM); + test_recv_common_bound_other_iface(NET_SOCK_DGRAM); } ZTEST(socket_packet, test_raw_dgram_udp_socks_recv) { - struct sockaddr_in ip_src; - struct sockaddr_ll ll_dst; + struct net_sockaddr_in ip_src; + struct net_sockaddr_ll ll_dst; uint8_t offset = 0; uint16_t pkt_len; int ret; /* Transmitting sock */ - setup_packet_socket(&packet_sock_1, SOCK_RAW, 0); - prepare_test_packet(SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len); + setup_packet_socket(&packet_sock_1, NET_SOCK_RAW, 0); + prepare_test_packet(NET_SOCK_RAW, ETH_P_IP, lladdr2, lladdr1, &pkt_len); prepare_test_dst_lladdr(&ll_dst, ETH_P_IP, lladdr1, ud.second); /* Receiving sockets */ - setup_packet_socket(&packet_sock_2, SOCK_RAW, htons(ETH_P_ALL)); + setup_packet_socket(&packet_sock_2, NET_SOCK_RAW, net_htons(ETH_P_ALL)); bind_packet_socket(packet_sock_2, ud.first); - setup_packet_socket(&packet_sock_3, SOCK_DGRAM, htons(ETH_P_ALL)); + setup_packet_socket(&packet_sock_3, NET_SOCK_DGRAM, net_htons(ETH_P_ALL)); bind_packet_socket(packet_sock_3, ud.first); prepare_udp_socket(&udp_sock_1, &ip_src, DST_PORT); ret = zsock_sendto(packet_sock_1, tx_buf, pkt_len, 0, - (struct sockaddr *)&ll_dst, - sizeof(struct sockaddr_ll)); + (struct net_sockaddr *)&ll_dst, + sizeof(struct net_sockaddr_ll)); zassert_not_equal(ret, -1, "Failed to send (%d)", errno); zassert_equal(ret, pkt_len, "Invalid data length sent (%d/%d)", ret, pkt_len); diff --git a/tests/net/socket/getaddrinfo/src/main.c b/tests/net/socket/getaddrinfo/src/main.c index 25be0205ea873..d2c008222f9a6 100644 --- a/tests/net/socket/getaddrinfo/src/main.c +++ b/tests/net/socket/getaddrinfo/src/main.c @@ -32,8 +32,8 @@ static uint8_t recv_buf[MAX_BUF_SIZE]; static int sock_v4; static int sock_v6; -static struct sockaddr_in addr_v4; -static struct sockaddr_in6 addr_v6; +static struct net_sockaddr_in addr_v4; +static struct net_sockaddr_in6 addr_v6; static int queries_received; static int expected_query_count = @@ -114,14 +114,14 @@ static void process_dns(void *p1, void *p2, void *p3) ARG_UNUSED(p3); struct zsock_pollfd pollfds[2]; - struct sockaddr *addr; - socklen_t addr_len; + struct net_sockaddr *addr; + net_socklen_t addr_len; int ret, idx; NET_DBG("Waiting for IPv4 DNS packets on port %d", - ntohs(addr_v4.sin_port)); + net_ntohs(addr_v4.sin_port)); NET_DBG("Waiting for IPv6 DNS packets on port %d", - ntohs(addr_v6.sin6_port)); + net_ntohs(addr_v6.sin6_port)); while (true) { memset(pollfds, 0, sizeof(pollfds)); @@ -141,10 +141,10 @@ static void process_dns(void *p1, void *p2, void *p3) if (pollfds[idx].revents & ZSOCK_POLLIN) { if (pollfds[idx].fd == sock_v4) { addr_len = sizeof(addr_v4); - addr = (struct sockaddr *)&addr_v4; + addr = (struct net_sockaddr *)&addr_v4; } else { addr_len = sizeof(addr_v6); - addr = (struct sockaddr *)&addr_v6; + addr = (struct net_sockaddr *)&addr_v6; } ret = zsock_recvfrom(pollfds[idx].fd, @@ -176,7 +176,7 @@ K_THREAD_DEFINE(dns_server_thread_id, STACK_SIZE, static void *test_getaddrinfo_setup(void) { char str[INET6_ADDRSTRLEN], *addr_str; - struct sockaddr addr; + struct net_sockaddr addr; int ret; ret = net_ipaddr_parse(CONFIG_DNS_SERVER1, @@ -184,10 +184,10 @@ static void *test_getaddrinfo_setup(void) &addr); zassert_true(ret, "Cannot parse IP address %s", CONFIG_DNS_SERVER1); - if (addr.sa_family == AF_INET) { - memcpy(&addr_v4, net_sin(&addr), sizeof(struct sockaddr_in)); - } else if (addr.sa_family == AF_INET6) { - memcpy(&addr_v6, net_sin6(&addr), sizeof(struct sockaddr_in6)); + if (addr.sa_family == NET_AF_INET) { + memcpy(&addr_v4, net_sin(&addr), sizeof(struct net_sockaddr_in)); + } else if (addr.sa_family == NET_AF_INET6) { + memcpy(&addr_v6, net_sin6(&addr), sizeof(struct net_sockaddr_in6)); } ret = net_ipaddr_parse(CONFIG_DNS_SERVER2, @@ -195,20 +195,20 @@ static void *test_getaddrinfo_setup(void) &addr); zassert_true(ret, "Cannot parse IP address %s", CONFIG_DNS_SERVER2); - if (addr.sa_family == AF_INET) { - memcpy(&addr_v4, net_sin(&addr), sizeof(struct sockaddr_in)); - } else if (addr.sa_family == AF_INET6) { - memcpy(&addr_v6, net_sin6(&addr), sizeof(struct sockaddr_in6)); + if (addr.sa_family == NET_AF_INET) { + memcpy(&addr_v4, net_sin(&addr), sizeof(struct net_sockaddr_in)); + } else if (addr.sa_family == NET_AF_INET6) { + memcpy(&addr_v6, net_sin6(&addr), sizeof(struct net_sockaddr_in6)); } - addr_str = zsock_inet_ntop(AF_INET, &addr_v4.sin_addr, str, sizeof(str)); - NET_DBG("v4: [%s]:%d", addr_str, ntohs(addr_v4.sin_port)); + addr_str = zsock_inet_ntop(NET_AF_INET, &addr_v4.sin_addr, str, sizeof(str)); + NET_DBG("v4: [%s]:%d", addr_str, net_ntohs(addr_v4.sin_port)); sock_v4 = prepare_listen_sock_udp_v4(&addr_v4); zassert_true(sock_v4 >= 0, "Invalid IPv4 socket"); - addr_str = zsock_inet_ntop(AF_INET6, &addr_v6.sin6_addr, str, sizeof(str)); - NET_DBG("v6: [%s]:%d", addr_str, ntohs(addr_v6.sin6_port)); + addr_str = zsock_inet_ntop(NET_AF_INET6, &addr_v6.sin6_addr, str, sizeof(str)); + NET_DBG("v6: [%s]:%d", addr_str, net_ntohs(addr_v6.sin6_port)); sock_v6 = prepare_listen_sock_udp_v6(&addr_v6); zassert_true(sock_v6 >= 0, "Invalid IPv6 socket"); @@ -285,12 +285,12 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_no_host) ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv4) { struct zsock_addrinfo *res = NULL; - struct sockaddr_in *saddr; + struct net_sockaddr_in *saddr; int ret; struct zsock_addrinfo hints = { - .ai_family = AF_INET, - .ai_socktype = SOCK_STREAM + .ai_family = NET_AF_INET, + .ai_socktype = NET_SOCK_STREAM }; ret = zsock_getaddrinfo("1.2.3.255", "65534", NULL, &res); @@ -298,32 +298,32 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv4) zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET, ""); - zassert_equal(res->ai_socktype, SOCK_STREAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_TCP, ""); + zassert_equal(res->ai_family, NET_AF_INET, ""); + zassert_equal(res->ai_socktype, NET_SOCK_STREAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_TCP, ""); zsock_freeaddrinfo(res); ret = zsock_getaddrinfo("1.2.3.255", "65534", &hints, &res); zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET, ""); - zassert_equal(res->ai_socktype, SOCK_STREAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_TCP, ""); + zassert_equal(res->ai_family, NET_AF_INET, ""); + zassert_equal(res->ai_socktype, NET_SOCK_STREAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_TCP, ""); zsock_freeaddrinfo(res); - hints.ai_socktype = SOCK_DGRAM; + hints.ai_socktype = NET_SOCK_DGRAM; ret = zsock_getaddrinfo("1.2.3.255", "65534", &hints, &res); zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET, ""); - zassert_equal(res->ai_socktype, SOCK_DGRAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_UDP, ""); + zassert_equal(res->ai_family, NET_AF_INET, ""); + zassert_equal(res->ai_socktype, NET_SOCK_DGRAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_UDP, ""); - saddr = (struct sockaddr_in *)res->ai_addr; - zassert_equal(saddr->sin_family, AF_INET, ""); - zassert_equal(saddr->sin_port, htons(65534), ""); + saddr = (struct net_sockaddr_in *)res->ai_addr; + zassert_equal(saddr->sin_family, NET_AF_INET, ""); + zassert_equal(saddr->sin_port, net_htons(65534), ""); zassert_equal(saddr->sin_addr.s4_addr[0], 1, ""); zassert_equal(saddr->sin_addr.s4_addr[1], 2, ""); zassert_equal(saddr->sin_addr.s4_addr[2], 3, ""); @@ -334,12 +334,12 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv4) ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) { struct zsock_addrinfo *res = NULL; - struct sockaddr_in6 *saddr; + struct net_sockaddr_in6 *saddr; int ret; struct zsock_addrinfo hints = { - .ai_family = AF_INET6, - .ai_socktype = SOCK_STREAM + .ai_family = NET_AF_INET6, + .ai_socktype = NET_SOCK_STREAM }; ret = zsock_getaddrinfo("[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]", @@ -348,13 +348,13 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET6, ""); - zassert_equal(res->ai_socktype, SOCK_STREAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_TCP, ""); + zassert_equal(res->ai_family, NET_AF_INET6, ""); + zassert_equal(res->ai_socktype, NET_SOCK_STREAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_TCP, ""); - saddr = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr->sin6_family, AF_INET6, ""); - zassert_equal(saddr->sin6_port, htons(65534), ""); + saddr = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr->sin6_port, net_htons(65534), ""); zassert_equal(saddr->sin6_addr.s6_addr[0], 0xFE, ""); zassert_equal(saddr->sin6_addr.s6_addr[1], 0xDC, ""); zassert_equal(saddr->sin6_addr.s6_addr[2], 0xBA, ""); @@ -379,13 +379,13 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET6, ""); - zassert_equal(res->ai_socktype, SOCK_STREAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_TCP, ""); + zassert_equal(res->ai_family, NET_AF_INET6, ""); + zassert_equal(res->ai_socktype, NET_SOCK_STREAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_TCP, ""); - saddr = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr->sin6_family, AF_INET6, ""); - zassert_equal(saddr->sin6_port, htons(65534), ""); + saddr = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr->sin6_port, net_htons(65534), ""); zassert_equal(saddr->sin6_addr.s6_addr[0], 0x10, ""); zassert_equal(saddr->sin6_addr.s6_addr[1], 0x80, ""); zassert_equal(saddr->sin6_addr.s6_addr[2], 0x0, ""); @@ -405,19 +405,19 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) zsock_freeaddrinfo(res); - hints.ai_socktype = SOCK_DGRAM; + hints.ai_socktype = NET_SOCK_DGRAM; ret = zsock_getaddrinfo("[3ffe:2a00:100:7031::1]", "65534", &hints, &res); zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET6, ""); - zassert_equal(res->ai_socktype, SOCK_DGRAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_UDP, ""); + zassert_equal(res->ai_family, NET_AF_INET6, ""); + zassert_equal(res->ai_socktype, NET_SOCK_DGRAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_UDP, ""); - saddr = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr->sin6_family, AF_INET6, ""); - zassert_equal(saddr->sin6_port, htons(65534), ""); + saddr = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr->sin6_port, net_htons(65534), ""); zassert_equal(saddr->sin6_addr.s6_addr[0], 0x3f, ""); zassert_equal(saddr->sin6_addr.s6_addr[1], 0xfe, ""); zassert_equal(saddr->sin6_addr.s6_addr[2], 0x2a, ""); @@ -441,9 +441,9 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) "65534", &hints, &res); zassert_equal(ret, 0, "Invalid result"); - saddr = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr->sin6_family, AF_INET6, ""); - zassert_equal(saddr->sin6_port, htons(65534), ""); + saddr = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr->sin6_port, net_htons(65534), ""); zassert_equal(saddr->sin6_addr.s6_addr[0], 0x10, ""); zassert_equal(saddr->sin6_addr.s6_addr[1], 0x80, ""); zassert_equal(saddr->sin6_addr.s6_addr[2], 0x0, ""); @@ -466,9 +466,9 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) ret = zsock_getaddrinfo("[::192.9.5.5]", "65534", &hints, &res); zassert_equal(ret, 0, "Invalid result"); - saddr = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr->sin6_family, AF_INET6, ""); - zassert_equal(saddr->sin6_port, htons(65534), ""); + saddr = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr->sin6_port, net_htons(65534), ""); zassert_equal(saddr->sin6_addr.s6_addr[0], 0x0, ""); zassert_equal(saddr->sin6_addr.s6_addr[1], 0x0, ""); zassert_equal(saddr->sin6_addr.s6_addr[2], 0x0, ""); @@ -492,9 +492,9 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) "65534", &hints, &res); zassert_equal(ret, 0, "Invalid result"); - saddr = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr->sin6_family, AF_INET6, ""); - zassert_equal(saddr->sin6_port, htons(65534), ""); + saddr = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr->sin6_port, net_htons(65534), ""); zassert_equal(saddr->sin6_addr.s6_addr[0], 0x0, ""); zassert_equal(saddr->sin6_addr.s6_addr[1], 0x0, ""); zassert_equal(saddr->sin6_addr.s6_addr[2], 0x0, ""); @@ -518,9 +518,9 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_num_ipv6) "65534", &hints, &res); zassert_equal(ret, 0, "Invalid result"); - saddr = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr->sin6_family, AF_INET6, ""); - zassert_equal(saddr->sin6_port, htons(65534), ""); + saddr = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr->sin6_port, net_htons(65534), ""); zassert_equal(saddr->sin6_addr.s6_addr[0], 0x20, ""); zassert_equal(saddr->sin6_addr.s6_addr[1], 0x10, ""); zassert_equal(saddr->sin6_addr.s6_addr[2], 0x83, ""); @@ -563,7 +563,7 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_ipv4_hints_ipv6) { struct zsock_addrinfo *res = NULL; struct zsock_addrinfo hints = { - .ai_family = AF_INET6, + .ai_family = NET_AF_INET6, }; int ret; @@ -577,7 +577,7 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_ipv6_hints_ipv4) { struct zsock_addrinfo *res = NULL; struct zsock_addrinfo hints = { - .ai_family = AF_INET, + .ai_family = NET_AF_INET, }; int ret; @@ -599,12 +599,12 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_port_invalid) ZTEST(net_socket_getaddrinfo, test_getaddrinfo_null_host) { - struct sockaddr_in *saddr; - struct sockaddr_in6 *saddr6; + struct net_sockaddr_in *saddr; + struct net_sockaddr_in6 *saddr6; struct zsock_addrinfo *res = NULL; struct zsock_addrinfo hints = { - .ai_family = AF_INET, - .ai_socktype = SOCK_STREAM, + .ai_family = NET_AF_INET, + .ai_socktype = NET_SOCK_STREAM, .ai_flags = AI_PASSIVE }; int ret; @@ -614,56 +614,56 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_null_host) zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET, ""); - zassert_equal(res->ai_socktype, SOCK_STREAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_TCP, ""); + zassert_equal(res->ai_family, NET_AF_INET, ""); + zassert_equal(res->ai_socktype, NET_SOCK_STREAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_TCP, ""); saddr = net_sin(res->ai_addr); - zassert_equal(saddr->sin_family, AF_INET, ""); - zassert_equal(saddr->sin_port, htons(80), ""); - zassert_equal(saddr->sin_addr.s_addr, INADDR_ANY, ""); + zassert_equal(saddr->sin_family, NET_AF_INET, ""); + zassert_equal(saddr->sin_port, net_htons(80), ""); + zassert_equal(saddr->sin_addr.s_addr, NET_INADDR_ANY, ""); zsock_freeaddrinfo(res); /* Test IPv6 TCP */ - hints.ai_family = AF_INET6; + hints.ai_family = NET_AF_INET6; ret = zsock_getaddrinfo(NULL, "80", &hints, &res); zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET6, ""); - zassert_equal(res->ai_socktype, SOCK_STREAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_TCP, ""); + zassert_equal(res->ai_family, NET_AF_INET6, ""); + zassert_equal(res->ai_socktype, NET_SOCK_STREAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_TCP, ""); saddr6 = net_sin6(res->ai_addr); - zassert_equal(saddr6->sin6_family, AF_INET6, ""); - zassert_equal(saddr6->sin6_port, htons(80), ""); + zassert_equal(saddr6->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr6->sin6_port, net_htons(80), ""); zassert_equal(0, memcmp(&saddr6->sin6_addr, &in6addr_any, sizeof(in6addr_any)), ""); zsock_freeaddrinfo(res); /* Test IPv6 UDP */ - hints.ai_socktype = SOCK_DGRAM; + hints.ai_socktype = NET_SOCK_DGRAM; ret = zsock_getaddrinfo(NULL, "80", &hints, &res); zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET6, ""); - zassert_equal(res->ai_socktype, SOCK_DGRAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_UDP, ""); - saddr6 = (struct sockaddr_in6 *)res->ai_addr; - zassert_equal(saddr6->sin6_family, AF_INET6, ""); - zassert_equal(saddr6->sin6_port, htons(80), ""); + zassert_equal(res->ai_family, NET_AF_INET6, ""); + zassert_equal(res->ai_socktype, NET_SOCK_DGRAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_UDP, ""); + saddr6 = (struct net_sockaddr_in6 *)res->ai_addr; + zassert_equal(saddr6->sin6_family, NET_AF_INET6, ""); + zassert_equal(saddr6->sin6_port, net_htons(80), ""); zsock_freeaddrinfo(res); /* Test IPv4 UDP */ - hints.ai_family = AF_INET; + hints.ai_family = NET_AF_INET; ret = zsock_getaddrinfo(NULL, "80", &hints, &res); zassert_equal(ret, 0, "Invalid result"); zassert_not_null(res, ""); zassert_is_null(res->ai_next, ""); - zassert_equal(res->ai_family, AF_INET, ""); - zassert_equal(res->ai_socktype, SOCK_DGRAM, ""); - zassert_equal(res->ai_protocol, IPPROTO_UDP, ""); - saddr = (struct sockaddr_in *)res->ai_addr; - zassert_equal(saddr->sin_family, AF_INET, ""); - zassert_equal(saddr->sin_port, htons(80), ""); + zassert_equal(res->ai_family, NET_AF_INET, ""); + zassert_equal(res->ai_socktype, NET_SOCK_DGRAM, ""); + zassert_equal(res->ai_protocol, NET_IPPROTO_UDP, ""); + saddr = (struct net_sockaddr_in *)res->ai_addr; + zassert_equal(saddr->sin_family, NET_AF_INET, ""); + zassert_equal(saddr->sin_port, net_htons(80), ""); zsock_freeaddrinfo(res); } diff --git a/tests/net/socket/getnameinfo/src/main.c b/tests/net/socket/getnameinfo/src/main.c index 4c5e4c547892b..f5b0bde43fbc7 100644 --- a/tests/net/socket/getnameinfo/src/main.c +++ b/tests/net/socket/getnameinfo/src/main.c @@ -14,15 +14,15 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); ZTEST_USER(net_socket_getnameinfo, test_getnameinfo_ipv4) { - struct sockaddr_in saddr; + struct net_sockaddr_in saddr; char host[80]; char serv[10]; int ret; memset(&saddr, 0, sizeof(saddr)); - saddr.sin_family = AF_INET; + saddr.sin_family = NET_AF_INET; - ret = zsock_getnameinfo((struct sockaddr *)&saddr, sizeof(saddr), + ret = zsock_getnameinfo((struct net_sockaddr *)&saddr, sizeof(saddr), host, sizeof(host), serv, sizeof(serv), 0); zassert_equal(ret, 0, ""); @@ -30,10 +30,10 @@ ZTEST_USER(net_socket_getnameinfo, test_getnameinfo_ipv4) zassert_equal(strcmp(host, "0.0.0.0"), 0, ""); zassert_equal(strcmp(serv, "0"), 0, ""); - saddr.sin_port = htons(1234); - saddr.sin_addr.s_addr = htonl(0x7f000001); + saddr.sin_port = net_htons(1234); + saddr.sin_addr.s_addr = net_htonl(0x7f000001); - ret = zsock_getnameinfo((struct sockaddr *)&saddr, sizeof(saddr), + ret = zsock_getnameinfo((struct net_sockaddr *)&saddr, sizeof(saddr), host, sizeof(host), serv, sizeof(serv), 0); zassert_equal(ret, 0, ""); @@ -44,15 +44,15 @@ ZTEST_USER(net_socket_getnameinfo, test_getnameinfo_ipv4) ZTEST_USER(net_socket_getnameinfo, test_getnameinfo_ipv6) { - struct sockaddr_in6 saddr; + struct net_sockaddr_in6 saddr; char host[80]; char serv[10]; int ret; memset(&saddr, 0, sizeof(saddr)); - saddr.sin6_family = AF_INET6; + saddr.sin6_family = NET_AF_INET6; - ret = zsock_getnameinfo((struct sockaddr *)&saddr, sizeof(saddr), + ret = zsock_getnameinfo((struct net_sockaddr *)&saddr, sizeof(saddr), host, sizeof(host), serv, sizeof(serv), 0); zassert_equal(ret, 0, ""); @@ -60,12 +60,12 @@ ZTEST_USER(net_socket_getnameinfo, test_getnameinfo_ipv6) zassert_equal(strcmp(host, "::"), 0, ""); zassert_equal(strcmp(serv, "0"), 0, ""); - saddr.sin6_port = htons(4321); + saddr.sin6_port = net_htons(4321); saddr.sin6_addr.s6_addr[0] = 0xff; saddr.sin6_addr.s6_addr[1] = 0x55; saddr.sin6_addr.s6_addr[15] = 0x11; - ret = zsock_getnameinfo((struct sockaddr *)&saddr, sizeof(saddr), + ret = zsock_getnameinfo((struct net_sockaddr *)&saddr, sizeof(saddr), host, sizeof(host), serv, sizeof(serv), 0); zassert_equal(ret, 0, ""); diff --git a/tests/net/socket/misc/src/main.c b/tests/net/socket/misc/src/main.c index dd22cc79a322a..2d4f126acebf1 100644 --- a/tests/net/socket/misc/src/main.c +++ b/tests/net/socket/misc/src/main.c @@ -34,52 +34,52 @@ ZTEST_USER(socket_misc_test_suite, test_inet_pton) int res; uint8_t buf[32]; - res = zsock_inet_pton(AF_INET, "127.0.0.1", buf); + res = zsock_inet_pton(NET_AF_INET, "127.0.0.1", buf); zassert_equal(res, 1, ""); - res = zsock_inet_pton(AF_INET, "127.0.0.1a", buf); + res = zsock_inet_pton(NET_AF_INET, "127.0.0.1a", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET6, "a:b:c:d:0:1:2:3", buf); + res = zsock_inet_pton(NET_AF_INET6, "a:b:c:d:0:1:2:3", buf); zassert_equal(res, 1, ""); - res = zsock_inet_pton(AF_INET6, "::1", buf); + res = zsock_inet_pton(NET_AF_INET6, "::1", buf); zassert_equal(res, 1, ""); - res = zsock_inet_pton(AF_INET6, "1::", buf); + res = zsock_inet_pton(NET_AF_INET6, "1::", buf); zassert_equal(res, 1, ""); - res = zsock_inet_pton(AF_INET6, "a:b:c:d:0:1:2:3z", buf); + res = zsock_inet_pton(NET_AF_INET6, "a:b:c:d:0:1:2:3z", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "192.0.2.400", buf); + res = zsock_inet_pton(NET_AF_INET, "192.0.2.400", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "0.0", buf); + res = zsock_inet_pton(NET_AF_INET, "0.0", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "0.1", buf); + res = zsock_inet_pton(NET_AF_INET, "0.1", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "0", buf); + res = zsock_inet_pton(NET_AF_INET, "0", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "1", buf); + res = zsock_inet_pton(NET_AF_INET, "1", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "256", buf); + res = zsock_inet_pton(NET_AF_INET, "256", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "00.0.0.0", buf); + res = zsock_inet_pton(NET_AF_INET, "00.0.0.0", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "0.0.0.0", buf); + res = zsock_inet_pton(NET_AF_INET, "0.0.0.0", buf); zassert_equal(res, 1, ""); - res = zsock_inet_pton(AF_INET, "0.0..0", buf); + res = zsock_inet_pton(NET_AF_INET, "0.0..0", buf); zassert_equal(res, 0, ""); - res = zsock_inet_pton(AF_INET, "1.2.3.0.", buf); + res = zsock_inet_pton(NET_AF_INET, "1.2.3.0.", buf); zassert_equal(res, 0, ""); } @@ -88,13 +88,13 @@ ZTEST_USER(socket_misc_test_suite, test_inet_pton) #define TEST_MY_IPV6_ADDR "2001:db8::1" #define TEST_PEER_IPV6_ADDR "2001:db8::2" -static struct in6_addr my_ipv6_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_ipv6_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in_addr my_ipv4_addr1 = { { { 192, 0, 1, 1 } } }; +static struct net_in_addr my_ipv4_addr1 = { { { 192, 0, 1, 1 } } }; -static struct in6_addr my_ipv6_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_ipv6_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; -static struct in_addr my_ipv4_addr2 = { { { 192, 0, 2, 2 } } }; +static struct net_in_addr my_ipv4_addr2 = { { { 192, 0, 2, 2 } } }; static uint8_t lladdr1[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; static uint8_t lladdr2[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 }; @@ -102,8 +102,8 @@ static uint8_t lladdr2[] = { 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 }; struct dummy_context { struct net_if *iface; uint8_t *mac_address; - struct in6_addr *ipv6_addr; - struct in_addr *ipv4_addr; + struct net_in6_addr *ipv6_addr; + struct net_in_addr *ipv4_addr; }; static struct dummy_context dummy_data1 = { @@ -196,12 +196,12 @@ NET_DEVICE_INIT(dummy_2, DEV2_NAME, NULL, NULL, &dummy_data2, NULL, #define DST_PORT 4242 #define BIND_PORT 4240 -void test_so_bindtodevice(int sock_c, int sock_s, struct sockaddr *peer_addr_1, - struct sockaddr *peer_addr_2, socklen_t peer_addrlen, - struct sockaddr *bind_addr, socklen_t bind_addrlen) +void test_so_bindtodevice(int sock_c, int sock_s, struct net_sockaddr *peer_addr_1, + struct net_sockaddr *peer_addr_2, net_socklen_t peer_addrlen, + struct net_sockaddr *bind_addr, net_socklen_t bind_addrlen) { int ret; - struct ifreq ifreq = { 0 }; + struct net_ifreq ifreq = { 0 }; #if !defined(CONFIG_NET_INTERFACE_NAME) const struct device *dev1 = device_get_binding(DEV1_NAME); @@ -217,7 +217,7 @@ void test_so_bindtodevice(int sock_c, int sock_s, struct sockaddr *peer_addr_1, /* Bind server socket with interface 2. */ strcpy(ifreq.ifr_name, DEV2_NAME); - ret = zsock_setsockopt(sock_s, SOL_SOCKET, SO_BINDTODEVICE, &ifreq, + ret = zsock_setsockopt(sock_s, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); zassert_equal(ret, 0, "SO_BINDTODEVICE failed, %d", errno); @@ -228,7 +228,7 @@ void test_so_bindtodevice(int sock_c, int sock_s, struct sockaddr *peer_addr_1, strcpy(ifreq.ifr_name, DEV1_NAME); strcpy(send_buf, DEV1_NAME); - ret = zsock_setsockopt(sock_c, SOL_SOCKET, SO_BINDTODEVICE, &ifreq, + ret = zsock_setsockopt(sock_c, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); zassert_equal(ret, 0, "SO_BINDTODEVICE failed, %d", errno); @@ -253,7 +253,7 @@ void test_so_bindtodevice(int sock_c, int sock_s, struct sockaddr *peer_addr_1, strcpy(ifreq.ifr_name, DEV2_NAME); strcpy(send_buf, DEV2_NAME); - ret = zsock_setsockopt(sock_c, SOL_SOCKET, SO_BINDTODEVICE, &ifreq, + ret = zsock_setsockopt(sock_c, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); zassert_equal(ret, 0, "SO_BINDTODEVICE failed, %d", errno); @@ -281,7 +281,7 @@ void test_so_bindtodevice(int sock_c, int sock_s, struct sockaddr *peer_addr_1, /* Remove the binding from the server socket. */ strcpy(ifreq.ifr_name, ""); - ret = zsock_setsockopt(sock_s, SOL_SOCKET, SO_BINDTODEVICE, &ifreq, + ret = zsock_setsockopt(sock_s, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); zassert_equal(ret, 0, "SO_BINDTODEVICE failed, %d", errno); @@ -291,7 +291,7 @@ void test_so_bindtodevice(int sock_c, int sock_s, struct sockaddr *peer_addr_1, strcpy(ifreq.ifr_name, DEV1_NAME); strcpy(send_buf, DEV1_NAME); - ret = zsock_setsockopt(sock_c, SOL_SOCKET, SO_BINDTODEVICE, &ifreq, + ret = zsock_setsockopt(sock_c, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); zassert_equal(ret, 0, "SO_BINDTODEVICE failed, %d", errno); @@ -327,91 +327,91 @@ void test_ipv4_so_bindtodevice(void) { int sock_c; int sock_s; - struct sockaddr_in peer_addr_1 = { - .sin_family = AF_INET, - .sin_port = htons(DST_PORT), + struct net_sockaddr_in peer_addr_1 = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(DST_PORT), .sin_addr = { { { 192, 0, 1, 1 } } }, }; - struct sockaddr_in peer_addr_2 = { - .sin_family = AF_INET, - .sin_port = htons(DST_PORT), + struct net_sockaddr_in peer_addr_2 = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(DST_PORT), .sin_addr = { { { 192, 0, 2, 2 } } }, }; - struct sockaddr_in bind_addr = { - .sin_family = AF_INET, - .sin_port = htons(DST_PORT), - .sin_addr = INADDR_ANY_INIT, + struct net_sockaddr_in bind_addr = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(DST_PORT), + .sin_addr = NET_INADDR_ANY_INIT, }; - sock_c = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock_c = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_c >= 0, "socket open failed"); - sock_s = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock_s = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_s >= 0, "socket open failed"); - test_so_bindtodevice(sock_c, sock_s, (struct sockaddr *)&peer_addr_1, - (struct sockaddr *)&peer_addr_2, sizeof(peer_addr_1), - (struct sockaddr *)&bind_addr, sizeof(bind_addr)); + test_so_bindtodevice(sock_c, sock_s, (struct net_sockaddr *)&peer_addr_1, + (struct net_sockaddr *)&peer_addr_2, sizeof(peer_addr_1), + (struct net_sockaddr *)&bind_addr, sizeof(bind_addr)); } void test_ipv6_so_bindtodevice(void) { int sock_c; int sock_s; - struct sockaddr_in6 peer_addr_1 = { - .sin6_family = AF_INET6, - .sin6_port = htons(DST_PORT), + struct net_sockaddr_in6 peer_addr_1 = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(DST_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }, }; - struct sockaddr_in6 peer_addr_2 = { - .sin6_family = AF_INET6, - .sin6_port = htons(DST_PORT), + struct net_sockaddr_in6 peer_addr_2 = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(DST_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }, }; - struct sockaddr_in6 bind_addr = { - .sin6_family = AF_INET6, - .sin6_port = htons(DST_PORT), - .sin6_addr = IN6ADDR_ANY_INIT, + struct net_sockaddr_in6 bind_addr = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(DST_PORT), + .sin6_addr = NET_IN6ADDR_ANY_INIT, }; - sock_c = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + sock_c = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_c >= 0, "socket open failed"); - sock_s = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + sock_s = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_s >= 0, "socket open failed"); - test_so_bindtodevice(sock_c, sock_s, (struct sockaddr *)&peer_addr_1, - (struct sockaddr *)&peer_addr_2, sizeof(peer_addr_1), - (struct sockaddr *)&bind_addr, sizeof(bind_addr)); + test_so_bindtodevice(sock_c, sock_s, (struct net_sockaddr *)&peer_addr_1, + (struct net_sockaddr *)&peer_addr_2, sizeof(peer_addr_1), + (struct net_sockaddr *)&bind_addr, sizeof(bind_addr)); } -#define ADDR_SIZE(family) ((family == AF_INET) ? \ - sizeof(struct sockaddr_in) : \ - sizeof(struct sockaddr_in6)) +#define ADDR_SIZE(family) ((family == NET_AF_INET) ? \ + sizeof(struct net_sockaddr_in) : \ + sizeof(struct net_sockaddr_in6)) void test_getpeername(int family) { int ret; int sock_c; int sock_s; - struct sockaddr peer_addr; - socklen_t peer_addr_len; - struct sockaddr srv_addr = { 0 }; + struct net_sockaddr peer_addr; + net_socklen_t peer_addr_len; + struct net_sockaddr srv_addr = { 0 }; srv_addr.sa_family = family; - if (family == AF_INET) { - net_sin(&srv_addr)->sin_port = htons(DST_PORT); - ret = zsock_inet_pton(AF_INET, TEST_MY_IPV4_ADDR, + if (family == NET_AF_INET) { + net_sin(&srv_addr)->sin_port = net_htons(DST_PORT); + ret = zsock_inet_pton(NET_AF_INET, TEST_MY_IPV4_ADDR, &net_sin(&srv_addr)->sin_addr); } else { - net_sin6(&srv_addr)->sin6_port = htons(DST_PORT); - ret = zsock_inet_pton(AF_INET6, TEST_MY_IPV6_ADDR, + net_sin6(&srv_addr)->sin6_port = net_htons(DST_PORT); + ret = zsock_inet_pton(NET_AF_INET6, TEST_MY_IPV6_ADDR, &net_sin6(&srv_addr)->sin6_addr); } zassert_equal(ret, 1, "inet_pton failed"); /* UDP socket */ - sock_c = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + sock_c = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_c >= 0, "socket open failed"); peer_addr_len = ADDR_SIZE(family); @@ -433,9 +433,9 @@ void test_getpeername(int family) zassert_equal(ret, 0, "close failed, %d", errno); /* TCP socket */ - sock_c = zsock_socket(family, SOCK_STREAM, IPPROTO_TCP); + sock_c = zsock_socket(family, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_c >= 0, "socket open failed"); - sock_s = zsock_socket(family, SOCK_STREAM, IPPROTO_TCP); + sock_s = zsock_socket(family, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s >= 0, "socket open failed"); ret = zsock_bind(sock_s, &srv_addr, ADDR_SIZE(family)); @@ -470,12 +470,12 @@ void test_getpeername(int family) void test_ipv4_getpeername(void) { - test_getpeername(AF_INET); + test_getpeername(NET_AF_INET); } void test_ipv6_getpeername(void) { - test_getpeername(AF_INET6); + test_getpeername(NET_AF_INET6); } void test_getsockname_tcp(int family) @@ -483,25 +483,25 @@ void test_getsockname_tcp(int family) int ret; int sock_c; int sock_s; - struct sockaddr local_addr = { 0 }; - socklen_t local_addr_len = ADDR_SIZE(family); - struct sockaddr srv_addr = { 0 }; + struct net_sockaddr local_addr = { 0 }; + net_socklen_t local_addr_len = ADDR_SIZE(family); + struct net_sockaddr srv_addr = { 0 }; srv_addr.sa_family = family; - if (family == AF_INET) { - net_sin(&srv_addr)->sin_port = htons(DST_PORT); - ret = zsock_inet_pton(AF_INET, TEST_MY_IPV4_ADDR, + if (family == NET_AF_INET) { + net_sin(&srv_addr)->sin_port = net_htons(DST_PORT); + ret = zsock_inet_pton(NET_AF_INET, TEST_MY_IPV4_ADDR, &net_sin(&srv_addr)->sin_addr); } else { - net_sin6(&srv_addr)->sin6_port = htons(DST_PORT); - ret = zsock_inet_pton(AF_INET6, TEST_MY_IPV6_ADDR, + net_sin6(&srv_addr)->sin6_port = net_htons(DST_PORT); + ret = zsock_inet_pton(NET_AF_INET6, TEST_MY_IPV6_ADDR, &net_sin6(&srv_addr)->sin6_addr); } zassert_equal(ret, 1, "inet_pton failed"); - sock_c = zsock_socket(family, SOCK_STREAM, IPPROTO_TCP); + sock_c = zsock_socket(family, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_c >= 0, "socket open failed"); - sock_s = zsock_socket(family, SOCK_STREAM, IPPROTO_TCP); + sock_s = zsock_socket(family, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s >= 0, "socket open failed"); /* Verify that unbound/unconnected socket has no local address set */ @@ -552,25 +552,25 @@ void test_getsockname_udp(int family) int ret; int sock_c; int sock_s; - struct sockaddr local_addr = { 0 }; - socklen_t local_addr_len = ADDR_SIZE(family); - struct sockaddr srv_addr = { 0 }; + struct net_sockaddr local_addr = { 0 }; + net_socklen_t local_addr_len = ADDR_SIZE(family); + struct net_sockaddr srv_addr = { 0 }; srv_addr.sa_family = family; - if (family == AF_INET) { - net_sin(&srv_addr)->sin_port = htons(DST_PORT); - ret = zsock_inet_pton(AF_INET, TEST_MY_IPV4_ADDR, + if (family == NET_AF_INET) { + net_sin(&srv_addr)->sin_port = net_htons(DST_PORT); + ret = zsock_inet_pton(NET_AF_INET, TEST_MY_IPV4_ADDR, &net_sin(&srv_addr)->sin_addr); } else { - net_sin6(&srv_addr)->sin6_port = htons(DST_PORT); - ret = zsock_inet_pton(AF_INET6, TEST_MY_IPV6_ADDR, + net_sin6(&srv_addr)->sin6_port = net_htons(DST_PORT); + ret = zsock_inet_pton(NET_AF_INET6, TEST_MY_IPV6_ADDR, &net_sin6(&srv_addr)->sin6_addr); } zassert_equal(ret, 1, "inet_pton failed"); - sock_c = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + sock_c = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_c >= 0, "socket open failed"); - sock_s = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + sock_s = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_s >= 0, "socket open failed"); /* Verify that unbound/unconnected socket has no local address set */ @@ -617,38 +617,38 @@ void test_ipv4_mapped_to_ipv6_disabled(void) { int ret; int sock_s4, sock_s6; - struct sockaddr srv_addr4 = { 0 }; - struct sockaddr srv_addr6 = { 0 }; + struct net_sockaddr srv_addr4 = { 0 }; + struct net_sockaddr srv_addr6 = { 0 }; if (IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) { return; } - srv_addr4.sa_family = AF_INET; - net_sin(&srv_addr4)->sin_port = htons(MAPPING_PORT); - ret = zsock_inet_pton(AF_INET, TEST_MY_IPV4_ADDR, + srv_addr4.sa_family = NET_AF_INET; + net_sin(&srv_addr4)->sin_port = net_htons(MAPPING_PORT); + ret = zsock_inet_pton(NET_AF_INET, TEST_MY_IPV4_ADDR, &net_sin(&srv_addr4)->sin_addr); zassert_equal(ret, 1, "inet_pton failed"); - srv_addr6.sa_family = AF_INET6; - net_sin6(&srv_addr6)->sin6_port = htons(MAPPING_PORT); - ret = zsock_inet_pton(AF_INET6, TEST_MY_IPV6_ADDR, + srv_addr6.sa_family = NET_AF_INET6; + net_sin6(&srv_addr6)->sin6_port = net_htons(MAPPING_PORT); + ret = zsock_inet_pton(NET_AF_INET6, TEST_MY_IPV6_ADDR, &net_sin6(&srv_addr6)->sin6_addr); zassert_equal(ret, 1, "inet_pton failed"); - sock_s4 = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + sock_s4 = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s4 >= 0, "socket open failed"); - ret = zsock_bind(sock_s4, &srv_addr4, ADDR_SIZE(AF_INET)); + ret = zsock_bind(sock_s4, &srv_addr4, ADDR_SIZE(NET_AF_INET)); zassert_equal(ret, 0, "bind failed, %d", errno); ret = zsock_listen(sock_s4, 1); zassert_equal(ret, 0, "listen failed, %d", errno); - sock_s6 = zsock_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + sock_s6 = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s6 >= 0, "socket open failed"); - ret = zsock_bind(sock_s6, &srv_addr6, ADDR_SIZE(AF_INET6)); + ret = zsock_bind(sock_s6, &srv_addr6, ADDR_SIZE(NET_AF_INET6)); zassert_equal(ret, 0, "bind failed, %d", errno); ret = zsock_close(sock_s4); @@ -659,12 +659,12 @@ void test_ipv4_mapped_to_ipv6_disabled(void) void test_ipv4_mapped_to_ipv6_enabled(void) { - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); int off = 0; int ret; int sock_s4, sock_s6; - struct sockaddr srv_addr4 = { 0 }; - struct sockaddr srv_addr6 = { 0 }; + struct net_sockaddr srv_addr4 = { 0 }; + struct net_sockaddr srv_addr6 = { 0 }; if (!IS_ENABLED(CONFIG_NET_IPV4_MAPPING_TO_IPV6)) { return; @@ -673,34 +673,34 @@ void test_ipv4_mapped_to_ipv6_enabled(void) /* We must have bound to ANY address so that the * v4-mapping-to-v6 works as expected. */ - srv_addr4.sa_family = AF_INET; - net_sin(&srv_addr4)->sin_port = htons(MAPPING_PORT); - ret = zsock_inet_pton(AF_INET, "0.0.0.0", + srv_addr4.sa_family = NET_AF_INET; + net_sin(&srv_addr4)->sin_port = net_htons(MAPPING_PORT); + ret = zsock_inet_pton(NET_AF_INET, "0.0.0.0", &net_sin(&srv_addr4)->sin_addr); zassert_equal(ret, 1, "inet_pton failed"); - srv_addr6.sa_family = AF_INET6; - net_sin6(&srv_addr6)->sin6_port = htons(MAPPING_PORT); - ret = zsock_inet_pton(AF_INET6, "::", + srv_addr6.sa_family = NET_AF_INET6; + net_sin6(&srv_addr6)->sin6_port = net_htons(MAPPING_PORT); + ret = zsock_inet_pton(NET_AF_INET6, "::", &net_sin6(&srv_addr6)->sin6_addr); zassert_equal(ret, 1, "inet_pton failed"); /* First create IPv6 socket */ - sock_s6 = zsock_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + sock_s6 = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s6 >= 0, "socket open failed"); - ret = zsock_bind(sock_s6, &srv_addr6, ADDR_SIZE(AF_INET6)); + ret = zsock_bind(sock_s6, &srv_addr6, ADDR_SIZE(NET_AF_INET6)); zassert_equal(ret, 0, "bind failed, %d", errno); ret = zsock_listen(sock_s6, 1); zassert_equal(ret, 0, "listen failed, %d", errno); /* Then try to create IPv4 socket to the same port */ - sock_s4 = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + sock_s4 = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s4 >= 0, "socket open failed"); /* Initially the IPV6_V6ONLY is set so the next bind is ok */ - ret = zsock_bind(sock_s4, &srv_addr4, ADDR_SIZE(AF_INET)); + ret = zsock_bind(sock_s4, &srv_addr4, ADDR_SIZE(NET_AF_INET)); zassert_equal(ret, 0, "bind failed, %d", errno); ret = zsock_close(sock_s4); @@ -709,18 +709,18 @@ void test_ipv4_mapped_to_ipv6_enabled(void) /* Then we turn off IPV6_V6ONLY which means that IPv4 and IPv6 * will have same port space and the next bind should fail. */ - ret = zsock_setsockopt(sock_s6, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)); + ret = zsock_setsockopt(sock_s6, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &off, sizeof(off)); zassert_equal(ret, 0, "setsockopt failed, %d", errno); - ret = zsock_getsockopt(sock_s6, IPPROTO_IPV6, IPV6_V6ONLY, &off, &optlen); + ret = zsock_getsockopt(sock_s6, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &off, &optlen); zassert_equal(ret, 0, "getsockopt failed, %d", errno); zassert_equal(off, 0, "IPV6_V6ONLY option setting failed"); - sock_s4 = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + sock_s4 = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s4 >= 0, "socket open failed"); /* Now v4 bind should fail */ - ret = zsock_bind(sock_s4, &srv_addr4, ADDR_SIZE(AF_INET)); + ret = zsock_bind(sock_s4, &srv_addr4, ADDR_SIZE(NET_AF_INET)); zassert_equal(ret, -1, "bind failed, %d", errno); zassert_equal(errno, EADDRINUSE, "bind failed"); @@ -732,16 +732,16 @@ void test_ipv4_mapped_to_ipv6_enabled(void) void test_ipv4_mapped_to_ipv6_server(void) { - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); int off; int ret, len; int sock_c4, sock_c6, sock_s6, new_sock; - struct sockaddr srv_addr6 = { 0 }; - struct sockaddr srv_addr = { 0 }; - struct sockaddr connect_addr6 = { 0 }; - struct sockaddr addr = { 0 }; - socklen_t addrlen = sizeof(addr); - struct sockaddr_in6 mapped; + struct net_sockaddr srv_addr6 = { 0 }; + struct net_sockaddr srv_addr = { 0 }; + struct net_sockaddr connect_addr6 = { 0 }; + struct net_sockaddr addr = { 0 }; + net_socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 mapped; #define MAX_BUF_SIZE 16 char buf[MAX_BUF_SIZE]; @@ -757,15 +757,15 @@ void test_ipv4_mapped_to_ipv6_server(void) * this will work and we should be bound internally * to ::ffff:a.b.c.d IPv6 address. */ - srv_addr.sa_family = AF_INET; - net_sin(&srv_addr)->sin_port = htons(MAPPING_PORT); - ret = zsock_inet_pton(AF_INET, "192.0.1.1", + srv_addr.sa_family = NET_AF_INET; + net_sin(&srv_addr)->sin_port = net_htons(MAPPING_PORT); + ret = zsock_inet_pton(NET_AF_INET, "192.0.1.1", &net_sin(&srv_addr)->sin_addr); zassert_equal(ret, 1, "inet_pton failed"); - connect_addr6.sa_family = AF_INET6; - net_sin6(&connect_addr6)->sin6_port = htons(MAPPING_PORT); - ret = zsock_inet_pton(AF_INET6, TEST_PEER_IPV6_ADDR, + connect_addr6.sa_family = NET_AF_INET6; + net_sin6(&connect_addr6)->sin6_port = net_htons(MAPPING_PORT); + ret = zsock_inet_pton(NET_AF_INET6, TEST_PEER_IPV6_ADDR, &net_sin6(&connect_addr6)->sin6_addr); zassert_equal(ret, 1, "inet_pton failed"); @@ -775,18 +775,18 @@ void test_ipv4_mapped_to_ipv6_server(void) /* We must have bound to ANY address so that the * v4-mapping-to-v6 works as expected. */ - srv_addr6.sa_family = AF_INET6; - net_sin6(&srv_addr6)->sin6_port = htons(MAPPING_PORT); - ret = zsock_inet_pton(AF_INET6, "::", + srv_addr6.sa_family = NET_AF_INET6; + net_sin6(&srv_addr6)->sin6_port = net_htons(MAPPING_PORT); + ret = zsock_inet_pton(NET_AF_INET6, "::", &net_sin6(&srv_addr6)->sin6_addr); zassert_equal(ret, 1, "inet_pton failed"); /* First create IPv6 socket */ - sock_s6 = zsock_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + sock_s6 = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_s6 >= 0, "socket open failed"); /* Verify that by default the IPV6_V6ONLY option is set */ - ret = zsock_getsockopt(sock_s6, IPPROTO_IPV6, IPV6_V6ONLY, &off, &optlen); + ret = zsock_getsockopt(sock_s6, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &off, &optlen); zassert_equal(ret, 0, "getsockopt failed, %d", errno); zassert_not_equal(off, 0, "IPV6_V6ONLY option setting failed"); @@ -794,36 +794,36 @@ void test_ipv4_mapped_to_ipv6_server(void) * will have same port space. */ off = 0; - ret = zsock_setsockopt(sock_s6, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)); + ret = zsock_setsockopt(sock_s6, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &off, sizeof(off)); zassert_equal(ret, 0, "setsockopt failed, %d", errno); - ret = zsock_getsockopt(sock_s6, IPPROTO_IPV6, IPV6_V6ONLY, &off, &optlen); + ret = zsock_getsockopt(sock_s6, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &off, &optlen); zassert_equal(ret, 0, "getsockopt failed, %d", errno); zassert_equal(off, 0, "IPV6_V6ONLY option setting failed, %d", off); - ret = zsock_bind(sock_s6, &srv_addr6, ADDR_SIZE(AF_INET6)); + ret = zsock_bind(sock_s6, &srv_addr6, ADDR_SIZE(NET_AF_INET6)); zassert_equal(ret, 0, "bind failed, %d", errno); ret = zsock_listen(sock_s6, 1); zassert_equal(ret, 0, "listen failed, %d", errno); /* Then create IPv4 socket and connect to the IPv6 port */ - sock_c4 = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + sock_c4 = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_c4 >= 0, "socket open failed"); - ret = zsock_connect(sock_c4, &srv_addr, ADDR_SIZE(AF_INET)); + ret = zsock_connect(sock_c4, &srv_addr, ADDR_SIZE(NET_AF_INET)); zassert_equal(ret, 0, "connect failed"); new_sock = zsock_accept(sock_s6, &addr, &addrlen); zassert_true(new_sock >= 0, "accept failed, %d", errno); /* Note that we should get IPv6 address here (mapped from IPv4) */ - zassert_equal(addr.sa_family, AF_INET6, "wrong family"); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), + zassert_equal(addr.sa_family, NET_AF_INET6, "wrong family"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen (%d, expecting %d)", addrlen, - sizeof(struct sockaddr_in6)); + sizeof(struct net_sockaddr_in6)); zassert_mem_equal(&mapped.sin6_addr, &net_sin6(&addr)->sin6_addr, - sizeof(struct in6_addr), + sizeof(struct net_in6_addr), "wrong address (%s, expecting %s)", net_sprint_ipv6_addr(&mapped.sin6_addr), net_sprint_ipv6_addr(&net_sin6(&addr)->sin6_addr)); @@ -832,7 +832,7 @@ void test_ipv4_mapped_to_ipv6_server(void) ret = zsock_send(new_sock, "foobar", len, 0); zassert_equal(ret, len, "cannot send (%d vs %d), errno %d", ret, len, errno); - addrlen = sizeof(struct sockaddr_in); + addrlen = sizeof(struct net_sockaddr_in); ret = zsock_recv(sock_c4, buf, sizeof(buf), 0); zassert_equal(ret, strlen("foobar"), "cannot recv"); @@ -845,10 +845,10 @@ void test_ipv4_mapped_to_ipv6_server(void) k_sleep(K_MSEC(200)); /* Then create IPv6 socket and make sure it works ok too */ - sock_c6 = zsock_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + sock_c6 = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_c6 >= 0, "socket open failed"); - ret = zsock_connect(sock_c6, &connect_addr6, ADDR_SIZE(AF_INET6)); + ret = zsock_connect(sock_c6, &connect_addr6, ADDR_SIZE(NET_AF_INET6)); zassert_equal(ret, 0, "connect failed, %d", errno); new_sock = zsock_accept(sock_s6, &addr, &addrlen); @@ -857,7 +857,7 @@ void test_ipv4_mapped_to_ipv6_server(void) ret = zsock_send(new_sock, "foobar", len, 0); zassert_equal(ret, len, "cannot send (%d vs %d), errno %d", ret, len, errno); - addrlen = sizeof(struct sockaddr_in); + addrlen = sizeof(struct net_sockaddr_in); ret = zsock_recv(sock_c6, buf, sizeof(buf), 0); zassert_equal(ret, strlen("foobar"), "cannot recv"); @@ -872,22 +872,22 @@ void test_ipv4_mapped_to_ipv6_server(void) ZTEST_USER(socket_misc_test_suite, test_ipv4_getsockname_tcp) { - test_getsockname_tcp(AF_INET); + test_getsockname_tcp(NET_AF_INET); } ZTEST_USER(socket_misc_test_suite, test_ipv4_getsockname_udp) { - test_getsockname_udp(AF_INET); + test_getsockname_udp(NET_AF_INET); } ZTEST_USER(socket_misc_test_suite, test_ipv6_getsockname_tcp) { - test_getsockname_tcp(AF_INET6); + test_getsockname_tcp(NET_AF_INET6); } ZTEST_USER(socket_misc_test_suite, test_ipv6_getsockname_udp) { - test_getsockname_udp(AF_INET6); + test_getsockname_udp(NET_AF_INET6); } static void *setup(void) @@ -928,27 +928,27 @@ ZTEST(socket_misc_test_suite, test_so_domain_socket_option) int ret; int sock_u; int sock_t; - socklen_t optlen = sizeof(int); + net_socklen_t optlen = sizeof(int); int domain; - sock_t = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + sock_t = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(sock_t >= 0, "TCP socket open failed"); - sock_u = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + sock_u = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock_u >= 0, "UDP socket open failed"); - ret = zsock_getsockopt(sock_t, SOL_SOCKET, SO_DOMAIN, &domain, &optlen); + ret = zsock_getsockopt(sock_t, ZSOCK_SOL_SOCKET, ZSOCK_SO_DOMAIN, &domain, &optlen); zassert_equal(ret, 0, "getsockopt failed, %d", -errno); - zassert_equal(domain, AF_INET, "Mismatch domain value %d vs %d", - AF_INET, domain); + zassert_equal(domain, NET_AF_INET, "Mismatch domain value %d vs %d", + NET_AF_INET, domain); - ret = zsock_getsockopt(sock_u, SOL_SOCKET, SO_DOMAIN, &domain, &optlen); + ret = zsock_getsockopt(sock_u, ZSOCK_SOL_SOCKET, ZSOCK_SO_DOMAIN, &domain, &optlen); zassert_equal(ret, 0, "getsockopt failed, %d", -errno); - zassert_equal(domain, AF_INET6, "Mismatch domain value %d vs %d", - AF_INET6, domain); + zassert_equal(domain, NET_AF_INET6, "Mismatch domain value %d vs %d", + NET_AF_INET6, domain); /* setsockopt() is not supported for this option */ - domain = AF_INET; - ret = zsock_setsockopt(sock_u, SOL_SOCKET, SO_DOMAIN, &domain, optlen); + domain = NET_AF_INET; + ret = zsock_setsockopt(sock_u, ZSOCK_SOL_SOCKET, ZSOCK_SO_DOMAIN, &domain, optlen); zassert_equal(ret, -1, "setsockopt succeed"); zassert_equal(errno, ENOPROTOOPT, "Invalid errno %d", errno); diff --git a/tests/net/socket/net_mgmt/src/main.c b/tests/net/socket/net_mgmt/src/main.c index 9bd094742952f..c62f9d1fe376c 100644 --- a/tests/net/socket/net_mgmt/src/main.c +++ b/tests/net/socket/net_mgmt/src/main.c @@ -36,8 +36,8 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); static struct net_if *default_iface; static ZTEST_BMEM int fd; -static ZTEST_BMEM struct in6_addr addr_v6; -static ZTEST_DMEM struct in_addr addr_v4 = { { { 192, 0, 2, 3 } } }; +static ZTEST_BMEM struct net_in6_addr addr_v6; +static ZTEST_DMEM struct net_in_addr addr_v4 = { { { 192, 0, 2, 3 } } }; #if defined(CONFIG_NET_SOCKETS_LOG_LEVEL_DBG) #define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__) @@ -331,7 +331,7 @@ K_THREAD_DEFINE(trigger_events_thread_id, STACK_SIZE, trigger_events, NULL, NULL, NULL, THREAD_PRIORITY, 0, -1); -static char *get_ip_addr(char *ipaddr, size_t len, sa_family_t family, +static char *get_ip_addr(char *ipaddr, size_t len, net_sa_family_t family, struct net_mgmt_msghdr *hdr) { char *buf; @@ -357,13 +357,13 @@ static void iface_cb(struct net_if *iface, void *user_data) static void test_net_mgmt_setup(void) { - struct sockaddr_nm sockaddr; + struct net_sockaddr_nm sockaddr; int ret; net_if_foreach(iface_cb, &default_iface); zassert_not_null(default_iface, "Cannot find test interface"); - fd = zsock_socket(AF_NET_MGMT, SOCK_DGRAM, NET_MGMT_EVENT_PROTO); + fd = zsock_socket(AF_NET_MGMT, NET_SOCK_DGRAM, NET_MGMT_EVENT_PROTO); zassert_false(fd < 0, "Cannot create net_mgmt socket (%d)", errno); #ifdef CONFIG_USERSPACE @@ -385,7 +385,7 @@ static void test_net_mgmt_setup(void) NET_EVENT_IPV6_ADDR_ADD | NET_EVENT_IPV6_ADDR_DEL; - ret = zsock_bind(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); + ret = zsock_bind(fd, (struct net_sockaddr *)&sockaddr, sizeof(sockaddr)); zassert_false(ret < 0, "Cannot bind net_mgmt socket (%d)", errno); k_thread_start(trigger_events_thread_id); @@ -393,8 +393,8 @@ static void test_net_mgmt_setup(void) static void test_net_mgmt_catch_events(void) { - struct sockaddr_nm event_addr; - socklen_t event_addr_len; + struct net_sockaddr_nm event_addr; + net_socklen_t event_addr_len; char ipaddr[INET6_ADDRSTRLEN]; uint8_t buf[MAX_BUF_LEN]; int event_count = 2; @@ -407,7 +407,7 @@ static void test_net_mgmt_catch_events(void) event_addr_len = sizeof(event_addr); ret = zsock_recvfrom(fd, buf, sizeof(buf), 0, - (struct sockaddr *)&event_addr, + (struct net_sockaddr *)&event_addr, &event_addr_len); if (ret < 0) { continue; @@ -425,7 +425,7 @@ static void test_net_mgmt_catch_events(void) DBG("IPv6 address added to interface %d (%s)\n", event_addr.nm_ifindex, get_ip_addr(ipaddr, sizeof(ipaddr), - AF_INET6, hdr)); + NET_AF_INET6, hdr)); zassert_equal(strncmp(ipaddr, "2001:db8::3", sizeof(ipaddr) - 1), 0, "Invalid IPv6 address %s added", @@ -436,7 +436,7 @@ static void test_net_mgmt_catch_events(void) DBG("IPv6 address removed from interface %d (%s)\n", event_addr.nm_ifindex, get_ip_addr(ipaddr, sizeof(ipaddr), - AF_INET6, hdr)); + NET_AF_INET6, hdr)); zassert_equal(strncmp(ipaddr, "2001:db8::3", sizeof(ipaddr) - 1), 0, "Invalid IPv6 address %s removed", @@ -460,8 +460,8 @@ ZTEST_USER(net_socket_net_mgmt, test_net_mgmt_catch_user) static void test_net_mgmt_catch_events_failure(void) { #define SMALL_BUF_LEN 16 - struct sockaddr_nm event_addr; - socklen_t event_addr_len; + struct net_sockaddr_nm event_addr; + net_socklen_t event_addr_len; uint8_t buf[SMALL_BUF_LEN]; int ret; @@ -469,7 +469,7 @@ static void test_net_mgmt_catch_events_failure(void) event_addr_len = sizeof(event_addr); ret = zsock_recvfrom(fd, buf, sizeof(buf), 0, - (struct sockaddr *)&event_addr, + (struct net_sockaddr *)&event_addr, &event_addr_len); zassert_equal(ret, -1, "Msg check failed, %d", errno); zassert_equal(errno, EMSGSIZE, "Msg check failed, errno %d", errno); @@ -520,7 +520,7 @@ ZTEST_USER(net_socket_net_mgmt, test_ethernet_set_qav_user) static void test_ethernet_get_qav(void) { struct ethernet_req_params params; - socklen_t optlen = sizeof(params); + net_socklen_t optlen = sizeof(params); int ret; memset(¶ms, 0, sizeof(params)); @@ -550,7 +550,7 @@ ZTEST_USER(net_socket_net_mgmt, test_ethernet_get_qav_user) static void test_ethernet_get_unknown_option(void) { struct ethernet_req_params params; - socklen_t optlen = sizeof(params); + net_socklen_t optlen = sizeof(params); int ret; memset(¶ms, 0, sizeof(params)); @@ -575,7 +575,7 @@ ZTEST_USER(net_socket_net_mgmt, test_ethernet_get_unknown_opt_user) static void test_ethernet_set_unknown_option(void) { struct ethernet_req_params params; - socklen_t optlen = sizeof(params); + net_socklen_t optlen = sizeof(params); int ret; memset(¶ms, 0, sizeof(params)); diff --git a/tests/net/socket/offload_dispatcher/src/main.c b/tests/net/socket/offload_dispatcher/src/main.c index 47fc4d7b2205e..c65f5082eaf9b 100644 --- a/tests/net/socket/offload_dispatcher/src/main.c +++ b/tests/net/socket/offload_dispatcher/src/main.c @@ -95,8 +95,8 @@ static int offload_shutdown(void *obj, int how) return 0; } -static int offload_bind(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int offload_bind(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { struct test_socket_calls *ctx = obj; @@ -108,8 +108,8 @@ static int offload_bind(void *obj, const struct sockaddr *addr, return 0; } -static int offload_connect(void *obj, const struct sockaddr *addr, - socklen_t addrlen) +static int offload_connect(void *obj, const struct net_sockaddr *addr, + net_socklen_t addrlen) { struct test_socket_calls *ctx = obj; @@ -132,7 +132,7 @@ static int offload_listen(void *obj, int backlog) return 0; } -static int offload_accept(void *obj, struct sockaddr *addr, socklen_t *addrlen) +static int offload_accept(void *obj, struct net_sockaddr *addr, net_socklen_t *addrlen) { struct test_socket_calls *ctx = obj; @@ -145,8 +145,8 @@ static int offload_accept(void *obj, struct sockaddr *addr, socklen_t *addrlen) } static ssize_t offload_sendto(void *obj, const void *buf, size_t len, - int flags, const struct sockaddr *dest_addr, - socklen_t addrlen) + int flags, const struct net_sockaddr *dest_addr, + net_socklen_t addrlen) { struct test_socket_calls *ctx = obj; @@ -161,7 +161,7 @@ static ssize_t offload_sendto(void *obj, const void *buf, size_t len, return len; } -static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) +static ssize_t offload_sendmsg(void *obj, const struct net_msghdr *msg, int flags) { struct test_socket_calls *ctx = obj; @@ -174,8 +174,8 @@ static ssize_t offload_sendmsg(void *obj, const struct msghdr *msg, int flags) } static ssize_t offload_recvfrom(void *obj, void *buf, size_t max_len, - int flags, struct sockaddr *src_addr, - socklen_t *addrlen) + int flags, struct net_sockaddr *src_addr, + net_socklen_t *addrlen) { struct test_socket_calls *ctx = obj; @@ -191,7 +191,7 @@ static ssize_t offload_recvfrom(void *obj, void *buf, size_t max_len, } static int offload_getsockopt(void *obj, int level, int optname, - void *optval, socklen_t *optlen) + void *optval, net_socklen_t *optlen) { struct test_socket_calls *ctx = obj; @@ -206,7 +206,7 @@ static int offload_getsockopt(void *obj, int level, int optname, } static int offload_setsockopt(void *obj, int level, int optname, - const void *optval, socklen_t optlen) + const void *optval, net_socklen_t optlen) { struct test_socket_calls *ctx = obj; @@ -220,8 +220,8 @@ static int offload_setsockopt(void *obj, int level, int optname, return 0; } -static int offload_getpeername(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int offload_getpeername(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { struct test_socket_calls *ctx = obj; @@ -233,8 +233,8 @@ static int offload_getpeername(void *obj, struct sockaddr *addr, return 0; } -static int offload_getsockname(void *obj, struct sockaddr *addr, - socklen_t *addrlen) +static int offload_getsockname(void *obj, struct net_sockaddr *addr, + net_socklen_t *addrlen) { struct test_socket_calls *ctx = obj; @@ -293,7 +293,7 @@ static bool offload_1_is_supported(int family, int type, int proto) return true; } -NET_SOCKET_OFFLOAD_REGISTER(offloaded_1, SOCKET_OFFLOAD_PRIO_HIGH, AF_UNSPEC, +NET_SOCKET_OFFLOAD_REGISTER(offloaded_1, SOCKET_OFFLOAD_PRIO_HIGH, NET_AF_UNSPEC, offload_1_is_supported, offload_1_socket); static void offloaded_1_iface_init(struct net_if *iface) @@ -355,7 +355,7 @@ static bool offload_2_is_supported(int family, int type, int proto) return true; } -NET_SOCKET_OFFLOAD_REGISTER(offloaded_2, SOCKET_OFFLOAD_PRIO_HIGH, AF_UNSPEC, +NET_SOCKET_OFFLOAD_REGISTER(offloaded_2, SOCKET_OFFLOAD_PRIO_HIGH, NET_AF_UNSPEC, offload_2_is_supported, offload_2_socket); static void offloaded_2_iface_init(struct net_if *iface) @@ -374,7 +374,7 @@ NET_DEVICE_OFFLOAD_INIT(offloaded_2, "offloaded_2", NULL, NULL, /* Native dummy interface */ static uint8_t lladdr[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; -static struct in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; static K_SEM_DEFINE(test_native_send_called, 0, 1); static void dummy_native_iface_init(struct net_if *iface) @@ -404,8 +404,8 @@ NET_DEVICE_INIT(dummy_native, "dummy_native", NULL, NULL, NULL, /* Actual tests */ -static const struct sockaddr_in test_peer_addr = { - .sin_family = AF_INET, +static const struct net_sockaddr_in test_peer_addr = { + .sin_family = NET_AF_INET, .sin_addr = { { { 192, 0, 0, 2 } } }, .sin_port = 1234 }; @@ -421,7 +421,7 @@ static void test_socket_setup_udp(void *dummy) ARG_UNUSED(dummy); test_result_reset(); - test_sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + test_sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(test_sock >= 0, "Failed to create socket"); zassert_false(test_socket_ctx[OFFLOAD_1].socket_called, @@ -433,7 +433,7 @@ static void test_socket_setup_tls(void *dummy) ARG_UNUSED(dummy); test_result_reset(); - test_sock = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2); + test_sock = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TLS_1_2); zassert_true(test_sock >= 0, "Failed to create socket"); zassert_false(test_socket_ctx[OFFLOAD_1].socket_called, "Socket should'nt have been dispatched yet"); @@ -503,11 +503,11 @@ ZTEST(net_socket_offload_udp, test_shutdown_not_bound) ZTEST(net_socket_offload_udp, test_bind_not_bound) { int ret; - struct sockaddr_in addr = { - .sin_family = AF_INET + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET }; - ret = zsock_bind(test_sock, (struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_bind(test_sock, (struct net_sockaddr *)&addr, sizeof(addr)); zassert_equal(0, ret, "bind() failed"); zassert_true(test_socket_ctx[OFFLOAD_1].socket_called, "Socket should've been dispatched"); @@ -521,9 +521,9 @@ ZTEST(net_socket_offload_udp, test_bind_not_bound) ZTEST(net_socket_offload_udp, test_connect_not_bound) { int ret; - struct sockaddr_in addr = test_peer_addr; + struct net_sockaddr_in addr = test_peer_addr; - ret = zsock_connect(test_sock, (struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_connect(test_sock, (struct net_sockaddr *)&addr, sizeof(addr)); zassert_equal(0, ret, "connect() failed"); zassert_true(test_socket_ctx[OFFLOAD_1].socket_called, "Socket should've been dispatched"); @@ -552,10 +552,10 @@ ZTEST(net_socket_offload_udp, test_listen_not_bound) ZTEST(net_socket_offload_udp, test_accept_not_bound) { int ret; - struct sockaddr_in addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in addr; + net_socklen_t addrlen = sizeof(addr); - ret = zsock_accept(test_sock, (struct sockaddr *)&addr, &addrlen); + ret = zsock_accept(test_sock, (struct net_sockaddr *)&addr, &addrlen); zassert_equal(0, ret, "accept() failed"); zassert_true(test_socket_ctx[OFFLOAD_1].socket_called, "Socket should've been dispatched"); @@ -570,10 +570,10 @@ ZTEST(net_socket_offload_udp, test_sendto_not_bound) { int ret; uint8_t dummy_data = 0; - struct sockaddr_in addr = test_peer_addr; + struct net_sockaddr_in addr = test_peer_addr; ret = zsock_sendto(test_sock, &dummy_data, 1, 0, - (struct sockaddr *)&addr, sizeof(addr)); + (struct net_sockaddr *)&addr, sizeof(addr)); zassert_equal(1, ret, "sendto() failed"); zassert_true(test_socket_ctx[OFFLOAD_1].socket_called, "Socket should've been dispatched"); @@ -604,7 +604,7 @@ ZTEST(net_socket_offload_udp, test_getsockopt_not_bound) { int ret; struct timeval optval = { 0 }; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); ret = zsock_getsockopt(test_sock, SOL_SOCKET, SO_RCVTIMEO, &optval, &optlen); @@ -638,7 +638,7 @@ ZTEST(net_socket_offload_udp, test_setsockopt_not_bound) ZTEST(net_socket_offload_udp, test_sendmsg_not_bound) { int ret; - struct msghdr dummy_msg = { 0 }; + struct net_msghdr dummy_msg = { 0 }; ret = zsock_sendmsg(test_sock, &dummy_msg, 0); zassert_equal(0, ret, "sendmsg() failed"); @@ -654,10 +654,10 @@ ZTEST(net_socket_offload_udp, test_sendmsg_not_bound) ZTEST(net_socket_offload_udp, test_getpeername_not_bound) { int ret; - struct sockaddr_in addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in addr; + net_socklen_t addrlen = sizeof(addr); - ret = zsock_getpeername(test_sock, (struct sockaddr *)&addr, &addrlen); + ret = zsock_getpeername(test_sock, (struct net_sockaddr *)&addr, &addrlen); zassert_equal(0, ret, "getpeername() failed"); zassert_true(test_socket_ctx[OFFLOAD_1].socket_called, "Socket should've been dispatched"); @@ -671,10 +671,10 @@ ZTEST(net_socket_offload_udp, test_getpeername_not_bound) ZTEST(net_socket_offload_udp, test_getsockname_not_bound) { int ret; - struct sockaddr_in addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in addr; + net_socklen_t addrlen = sizeof(addr); - ret = zsock_getsockname(test_sock, (struct sockaddr *)&addr, &addrlen); + ret = zsock_getsockname(test_sock, (struct net_sockaddr *)&addr, &addrlen); zassert_equal(0, ret, "getsockname() failed"); zassert_true(test_socket_ctx[OFFLOAD_1].socket_called, "Socket should've been dispatched"); @@ -696,8 +696,8 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_offloaded) .ifr_name = "offloaded_2" #endif }; - struct sockaddr_in addr = { - .sin_family = AF_INET + struct net_sockaddr_in addr = { + .sin_family = NET_AF_INET }; ret = zsock_setsockopt(test_sock, SOL_SOCKET, SO_BINDTODEVICE, @@ -711,7 +711,7 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_offloaded) "setsockopt() should've been dispatched"); ret = zsock_sendto(test_sock, &dummy_data, 1, 0, - (struct sockaddr *)&addr, sizeof(addr)); + (struct net_sockaddr *)&addr, sizeof(addr)); zassert_equal(1, ret, "sendto() failed"); zassert_true(test_socket_ctx[OFFLOAD_2].sendto_called, "sendto() should've been dispatched"); @@ -731,7 +731,7 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_native) .ifr_name = "dummy_native" #endif }; - struct sockaddr_in addr = test_peer_addr; + struct net_sockaddr_in addr = test_peer_addr; ret = zsock_setsockopt(test_sock, SOL_SOCKET, SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); @@ -743,7 +743,7 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_native) "Socket dispatched to wrong iface"); ret = zsock_sendto(test_sock, &dummy_data, 1, 0, - (struct sockaddr *)&addr, sizeof(addr)); + (struct net_sockaddr *)&addr, sizeof(addr)); zassert_equal(1, ret, "sendto() failed %d", errno); ret = k_sem_take(&test_native_send_called, K_MSEC(200)); @@ -767,7 +767,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_offloaded) #endif }; int tls_native = 1; - struct sockaddr_in addr = test_peer_addr; + struct net_sockaddr_in addr = test_peer_addr; ret = zsock_setsockopt(test_sock, SOL_TLS, TLS_NATIVE, &tls_native, sizeof(tls_native)); @@ -792,7 +792,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_offloaded) /* Ignore connect result as it will fail anyway. Just verify the * call/packets were forwarded to a valid iface. */ - ret = zsock_connect(test_sock, (struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_connect(test_sock, (struct net_sockaddr *)&addr, sizeof(addr)); zassert_true(test_socket_ctx[OFFLOAD_2].connect_called, "connect() should've been dispatched to offloaded_2 iface"); } @@ -814,7 +814,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_native) #endif }; int tls_native = 1; - struct sockaddr_in addr = test_peer_addr; + struct net_sockaddr_in addr = test_peer_addr; ret = zsock_setsockopt(test_sock, SOL_TLS, TLS_NATIVE, &tls_native, sizeof(tls_native)); @@ -839,7 +839,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_native) /* Ignore connect result as it will fail anyway. Just verify the * call/packets were forwarded to a valid iface. */ - (void)zsock_connect(test_sock, (struct sockaddr *)&addr, sizeof(addr)); + (void)zsock_connect(test_sock, (struct net_sockaddr *)&addr, sizeof(addr)); ret = k_sem_take(&test_native_send_called, K_MSEC(200)); zassert_equal(0, ret, "sendto() should've been dispatched to native iface"); diff --git a/tests/net/socket/poll/src/main.c b/tests/net/socket/poll/src/main.c index a155461514f55..378b122071d25 100644 --- a/tests/net/socket/poll/src/main.c +++ b/tests/net/socket/poll/src/main.c @@ -38,8 +38,8 @@ ZTEST(net_socket_poll, test_poll) int s_sock; int c_sock_tcp; int s_sock_tcp; - struct sockaddr_in6 c_addr; - struct sockaddr_in6 s_addr; + struct net_sockaddr_in6 c_addr; + struct net_sockaddr_in6 s_addr; struct zsock_pollfd pollfds[2]; struct zsock_pollfd pollout[1]; uint32_t tstamp; @@ -51,10 +51,10 @@ ZTEST(net_socket_poll, test_poll) prepare_sock_tcp_v6(MY_IPV6_ADDR, CLIENT_PORT, &c_sock_tcp, &c_addr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock_tcp, &s_addr); - res = zsock_bind(s_sock, (struct sockaddr *)&s_addr, sizeof(s_addr)); + res = zsock_bind(s_sock, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, "bind failed"); - res = zsock_connect(c_sock, (struct sockaddr *)&s_addr, sizeof(s_addr)); + res = zsock_connect(c_sock, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, "connect failed"); memset(pollfds, 0, sizeof(pollfds)); @@ -118,7 +118,7 @@ ZTEST(net_socket_poll, test_poll) pollout[0].fd = c_sock; pollout[0].events = ZSOCK_POLLOUT; - res = zsock_connect(c_sock, (const struct sockaddr *)&s_addr, + res = zsock_connect(c_sock, (const struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, ""); @@ -135,12 +135,12 @@ ZTEST(net_socket_poll, test_poll) pollout[0].fd = c_sock_tcp; pollout[0].events = ZSOCK_POLLOUT; - res = zsock_bind(s_sock_tcp, (struct sockaddr *)&s_addr, sizeof(s_addr)); + res = zsock_bind(s_sock_tcp, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, ""); res = zsock_listen(s_sock_tcp, 0); zassert_equal(res, 0, ""); - res = zsock_connect(c_sock_tcp, (const struct sockaddr *)&s_addr, + res = zsock_connect(c_sock_tcp, (const struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, ""); @@ -181,19 +181,19 @@ ZTEST(net_socket_poll, test_pollout_tcp) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_addr; - struct sockaddr_in6 s_addr; + struct net_sockaddr_in6 c_addr; + struct net_sockaddr_in6 s_addr; struct zsock_pollfd pollout[1]; char buf[TEST_SNDBUF_SIZE] = { }; prepare_sock_tcp_v6(MY_IPV6_ADDR, CLIENT_PORT, &c_sock, &c_addr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_addr); - res = zsock_bind(s_sock, (struct sockaddr *)&s_addr, sizeof(s_addr)); + res = zsock_bind(s_sock, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, ""); res = zsock_listen(s_sock, 0); zassert_equal(res, 0, ""); - res = zsock_connect(c_sock, (const struct sockaddr *)&s_addr, + res = zsock_connect(c_sock, (const struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, ""); new_sock = zsock_accept(s_sock, NULL, NULL); diff --git a/tests/net/socket/register/src/main.c b/tests/net/socket/register/src/main.c index 43eec0e8845f5..e520843252177 100644 --- a/tests/net/socket/register/src/main.c +++ b/tests/net/socket/register/src/main.c @@ -28,22 +28,22 @@ static const struct test_result { } expected_result[] = { { /* 0 */ - .test_case.family = AF_INET, - .test_case.type = SOCK_DGRAM, - .test_case.proto = IPPROTO_UDP, + .test_case.family = NET_AF_INET, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = NET_IPPROTO_UDP, .result = 0, }, { /* 1 */ - .test_case.family = AF_INET6, - .test_case.type = SOCK_DGRAM, - .test_case.proto = IPPROTO_UDP, + .test_case.family = NET_AF_INET6, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = NET_IPPROTO_UDP, .result = 0, }, { /* 2 */ /* This test will not increase the called func count */ - .test_case.family = AF_UNSPEC, + .test_case.family = NET_AF_UNSPEC, .test_case.type = 0, .test_case.proto = 0, .result = -1, @@ -51,110 +51,110 @@ static const struct test_result { }, { /* 3 */ - .test_case.family = AF_INET, - .test_case.type = SOCK_DGRAM, + .test_case.family = NET_AF_INET, + .test_case.type = NET_SOCK_DGRAM, .test_case.proto = 0, .result = 0, }, { /* 4 */ - .test_case.family = AF_INET6, - .test_case.type = SOCK_DGRAM, + .test_case.family = NET_AF_INET6, + .test_case.type = NET_SOCK_DGRAM, .test_case.proto = 0, .result = 0, }, { /* 5 */ - .test_case.family = AF_INET, - .test_case.type = SOCK_DGRAM, - .test_case.proto = IPPROTO_UDP, + .test_case.family = NET_AF_INET, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = NET_IPPROTO_UDP, .result = 0, }, { /* 6 */ - .test_case.family = AF_INET6, - .test_case.type = SOCK_DGRAM, - .test_case.proto = IPPROTO_UDP, + .test_case.family = NET_AF_INET6, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = NET_IPPROTO_UDP, .result = 0, }, { /* 7 */ - .test_case.family = AF_INET, - .test_case.type = SOCK_DGRAM, - .test_case.proto = IPPROTO_UDP, + .test_case.family = NET_AF_INET, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = NET_IPPROTO_UDP, .result = 0, }, { /* 8 */ - .test_case.family = AF_INET6, - .test_case.type = SOCK_DGRAM, - .test_case.proto = IPPROTO_UDP, + .test_case.family = NET_AF_INET6, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = NET_IPPROTO_UDP, .result = 0, }, { /* 9 */ - .test_case.family = AF_INET6, - .test_case.type = SOCK_STREAM, - .test_case.proto = IPPROTO_UDP, + .test_case.family = NET_AF_INET6, + .test_case.type = NET_SOCK_STREAM, + .test_case.proto = NET_IPPROTO_UDP, .result = -1, .error = EOPNOTSUPP, }, { /* 10 */ - .test_case.family = AF_PACKET, - .test_case.type = SOCK_RAW, - .test_case.proto = htons(ETH_P_ALL), + .test_case.family = NET_AF_PACKET, + .test_case.type = NET_SOCK_RAW, + .test_case.proto = net_htons(ETH_P_ALL), .result = 0, }, { /* 11 */ - .test_case.family = AF_CAN, - .test_case.type = SOCK_RAW, - .test_case.proto = CAN_RAW, + .test_case.family = NET_AF_CAN, + .test_case.type = NET_SOCK_RAW, + .test_case.proto = NET_CAN_RAW, .result = 0, }, { /* 12 */ - .test_case.family = AF_INET6, - .test_case.type = SOCK_STREAM, - .test_case.proto = IPPROTO_TLS_1_2, + .test_case.family = NET_AF_INET6, + .test_case.type = NET_SOCK_STREAM, + .test_case.proto = NET_IPPROTO_TLS_1_2, .result = 0, }, { /* 13 */ - .test_case.family = AF_INET, - .test_case.type = SOCK_DGRAM, - .test_case.proto = IPPROTO_DTLS_1_0, + .test_case.family = NET_AF_INET, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = NET_IPPROTO_DTLS_1_0, .result = 0, }, { /* 14 */ - .test_case.family = AF_CAN, - .test_case.type = SOCK_RAW, - .test_case.proto = IPPROTO_RAW, + .test_case.family = NET_AF_CAN, + .test_case.type = NET_SOCK_RAW, + .test_case.proto = NET_IPPROTO_RAW, .result = -1, .error = EAFNOSUPPORT, }, { /* 15 */ - .test_case.family = AF_INET, - .test_case.type = SOCK_DGRAM, + .test_case.family = NET_AF_INET, + .test_case.type = NET_SOCK_DGRAM, .test_case.proto = 254, .result = -1, .error = EPROTONOSUPPORT, }, { /* 16 */ - .test_case.family = AF_PACKET, - .test_case.type = SOCK_RAW, - .test_case.proto = htons(ETH_P_IEEE802154), + .test_case.family = NET_AF_PACKET, + .test_case.type = NET_SOCK_RAW, + .test_case.proto = net_htons(ETH_P_IEEE802154), .result = 0, }, { /* 17 */ - .test_case.family = AF_PACKET, - .test_case.type = SOCK_DGRAM, - .test_case.proto = htons(ETH_P_IEEE802154), + .test_case.family = NET_AF_PACKET, + .test_case.type = NET_SOCK_DGRAM, + .test_case.proto = net_htons(ETH_P_IEEE802154), .result = 0, }, }; @@ -190,9 +190,9 @@ static int socket_test_ok(int family, int type, int proto) static bool is_tls(int family, int type, int proto) { - if ((family == AF_INET || family == AF_INET6) && - (((proto >= IPPROTO_TLS_1_0) && (proto <= IPPROTO_TLS_1_2)) || - (proto >= IPPROTO_DTLS_1_0 && proto <= IPPROTO_DTLS_1_2))) { + if ((family == NET_AF_INET || family == NET_AF_INET6) && + (((proto >= NET_IPPROTO_TLS_1_0) && (proto <= NET_IPPROTO_TLS_1_2)) || + (proto >= NET_IPPROTO_DTLS_1_0 && proto <= NET_IPPROTO_DTLS_1_2))) { return true; } @@ -201,10 +201,10 @@ static bool is_tls(int family, int type, int proto) static bool is_packet(int family, int type, int proto) { - proto = ntohs(proto); + proto = net_ntohs(proto); - if (((type == SOCK_RAW) && (proto == ETH_P_ALL || proto == ETH_P_IEEE802154)) || - ((type == SOCK_DGRAM) && (proto > 0))) { + if (((type == NET_SOCK_RAW) && (proto == ETH_P_ALL || proto == ETH_P_IEEE802154)) || + ((type == NET_SOCK_DGRAM) && (proto > 0))) { return true; } @@ -213,7 +213,7 @@ static bool is_packet(int family, int type, int proto) static bool is_can(int family, int type, int proto) { - if (type != SOCK_RAW || proto != CAN_RAW) { + if (type != NET_SOCK_RAW || proto != NET_CAN_RAW) { return false; } @@ -222,7 +222,7 @@ static bool is_can(int family, int type, int proto) static bool is_ip(int family, int type, int proto) { - if (family != AF_INET && family != AF_INET6) { + if (family != NET_AF_INET && family != NET_AF_INET6) { return false; } @@ -231,14 +231,14 @@ static bool is_ip(int family, int type, int proto) #define TEST_SOCKET_PRIO 40 -NET_SOCKET_REGISTER(af_inet, TEST_SOCKET_PRIO, AF_INET, is_ip, socket_test); -NET_SOCKET_REGISTER(af_inet6, TEST_SOCKET_PRIO, AF_INET6, is_ip, socket_test); -NET_SOCKET_REGISTER(af_can2, TEST_SOCKET_PRIO, AF_CAN, is_ip, socket_test); +NET_SOCKET_REGISTER(af_inet, TEST_SOCKET_PRIO, NET_AF_INET, is_ip, socket_test); +NET_SOCKET_REGISTER(af_inet6, TEST_SOCKET_PRIO, NET_AF_INET6, is_ip, socket_test); +NET_SOCKET_REGISTER(af_can2, TEST_SOCKET_PRIO, NET_AF_CAN, is_ip, socket_test); /* For these socket families, we return ok always for now */ -NET_SOCKET_REGISTER(tls, TEST_SOCKET_PRIO, AF_UNSPEC, is_tls, socket_test_ok); -NET_SOCKET_REGISTER(af_packet, TEST_SOCKET_PRIO, AF_PACKET, is_packet, socket_test_ok); -NET_SOCKET_REGISTER(af_can, TEST_SOCKET_PRIO, AF_CAN, is_can, socket_test_ok); +NET_SOCKET_REGISTER(tls, TEST_SOCKET_PRIO, NET_AF_UNSPEC, is_tls, socket_test_ok); +NET_SOCKET_REGISTER(af_packet, TEST_SOCKET_PRIO, NET_AF_PACKET, is_packet, socket_test_ok); +NET_SOCKET_REGISTER(af_can, TEST_SOCKET_PRIO, NET_AF_CAN, is_can, socket_test_ok); ZTEST(net_socket_register, test_create_sockets) { diff --git a/tests/net/socket/reuseaddr_reuseport/src/main.c b/tests/net/socket/reuseaddr_reuseport/src/main.c index 5e0b95aa8272e..e6ddbdcce67b4 100644 --- a/tests/net/socket/reuseaddr_reuseport/src/main.c +++ b/tests/net/socket/reuseaddr_reuseport/src/main.c @@ -33,13 +33,13 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); #define SHOULD_SUCCEED true #define SHOULD_FAIL false -static void test_add_local_ip_address(sa_family_t family, const char *ip) +static void test_add_local_ip_address(net_sa_family_t family, const char *ip) { - if (family == AF_INET) { - struct sockaddr_in addr; + if (family == NET_AF_INET) { + struct net_sockaddr_in addr; struct net_if_addr *ifaddr; - zsock_inet_pton(AF_INET, ip, &addr.sin_addr); + zsock_inet_pton(NET_AF_INET, ip, &addr.sin_addr); ifaddr = net_if_ipv4_addr_add(net_if_get_default(), &addr.sin_addr, @@ -47,10 +47,10 @@ static void test_add_local_ip_address(sa_family_t family, const char *ip) 0); zassert_not_null(ifaddr, "Cannot add IPv4 address %s", ip); - } else if (family == AF_INET6) { - struct sockaddr_in6 addr; + } else if (family == NET_AF_INET6) { + struct net_sockaddr_in6 addr; - zsock_inet_pton(AF_INET6, ip, &addr.sin6_addr); + zsock_inet_pton(NET_AF_INET6, ip, &addr.sin6_addr); zassert_not_null(net_if_ipv6_addr_add(net_if_get_default(), &addr.sin6_addr, @@ -65,45 +65,45 @@ static void *setup(void) /* Make sure that both the specified IPv4 and IPv6 addresses are * added to the network interface. */ - test_add_local_ip_address(AF_INET, TEST_MY_IPV4_ADDR); - test_add_local_ip_address(AF_INET6, TEST_MY_IPV6_ADDR); + test_add_local_ip_address(NET_AF_INET, TEST_MY_IPV4_ADDR); + test_add_local_ip_address(NET_AF_INET6, TEST_MY_IPV6_ADDR); return NULL; } -static inline void prepare_sock_tcp(sa_family_t family, const char *ip, uint16_t port, - int *sock, struct sockaddr *addr) +static inline void prepare_sock_tcp(net_sa_family_t family, const char *ip, uint16_t port, + int *sock, struct net_sockaddr *addr) { - if (family == AF_INET) { + if (family == NET_AF_INET) { prepare_sock_tcp_v4(ip, port, sock, - (struct sockaddr_in *) addr); - } else if (family == AF_INET6) { + (struct net_sockaddr_in *) addr); + } else if (family == NET_AF_INET6) { prepare_sock_tcp_v6(ip, port, sock, - (struct sockaddr_in6 *) addr); + (struct net_sockaddr_in6 *) addr); } } -static inline void prepare_sock_udp(sa_family_t family, const char *ip, uint16_t port, - int *sock, struct sockaddr *addr) +static inline void prepare_sock_udp(net_sa_family_t family, const char *ip, uint16_t port, + int *sock, struct net_sockaddr *addr) { - if (family == AF_INET) { + if (family == NET_AF_INET) { prepare_sock_udp_v4(ip, port, sock, - (struct sockaddr_in *) addr); - } else if (family == AF_INET6) { + (struct net_sockaddr_in *) addr); + } else if (family == NET_AF_INET6) { prepare_sock_udp_v6(ip, port, sock, - (struct sockaddr_in6 *) addr); + (struct net_sockaddr_in6 *) addr); } } -static void test_getsocketopt_reuseaddr(int sock, void *optval, socklen_t *optlen) +static void test_getsocketopt_reuseaddr(int sock, void *optval, net_socklen_t *optlen) { int ret; @@ -111,7 +111,7 @@ static void test_getsocketopt_reuseaddr(int sock, void *optval, socklen_t *optle zassert_equal(ret, 0, "getsocketopt() failed with error %d", errno); } -static void test_setsocketopt_reuseaddr(int sock, void *optval, socklen_t optlen) +static void test_setsocketopt_reuseaddr(int sock, void *optval, net_socklen_t optlen) { int ret; @@ -126,7 +126,7 @@ static void test_enable_reuseaddr(int sock) test_setsocketopt_reuseaddr(sock, &value, sizeof(value)); } -static void test_getsocketopt_reuseport(int sock, void *optval, socklen_t *optlen) +static void test_getsocketopt_reuseport(int sock, void *optval, net_socklen_t *optlen) { int ret; @@ -134,7 +134,7 @@ static void test_getsocketopt_reuseport(int sock, void *optval, socklen_t *optle zassert_equal(ret, 0, "getsocketopt() failed with error %d", errno); } -static void test_setsocketopt_reuseport(int sock, void *optval, socklen_t optlen) +static void test_setsocketopt_reuseport(int sock, void *optval, net_socklen_t optlen) { int ret; @@ -149,7 +149,7 @@ static void test_enable_reuseport(int sock) test_setsocketopt_reuseport(sock, &value, sizeof(value)); } -static void test_bind_success(int sock, const struct sockaddr *addr, socklen_t addrlen) +static void test_bind_success(int sock, const struct net_sockaddr *addr, net_socklen_t addrlen) { int ret; @@ -157,7 +157,7 @@ static void test_bind_success(int sock, const struct sockaddr *addr, socklen_t a zassert_equal(ret, 0, "bind() failed with error %d", errno); } -static void test_bind_fail(int sock, const struct sockaddr *addr, socklen_t addrlen) +static void test_bind_fail(int sock, const struct net_sockaddr *addr, net_socklen_t addrlen) { int ret; @@ -174,7 +174,7 @@ static void test_listen(int sock) "listen() failed with error %d", errno); } -static void test_connect_success(int sock, const struct sockaddr *addr, socklen_t addrlen) +static void test_connect_success(int sock, const struct net_sockaddr *addr, net_socklen_t addrlen) { int ret; @@ -187,7 +187,7 @@ static void test_connect_success(int sock, const struct sockaddr *addr, socklen_ } } -static void test_connect_fail(int sock, const struct sockaddr *addr, socklen_t addrlen) +static void test_connect_fail(int sock, const struct net_sockaddr *addr, net_socklen_t addrlen) { int ret; @@ -197,7 +197,7 @@ static void test_connect_fail(int sock, const struct sockaddr *addr, socklen_t a zassert_equal(errno, EADDRINUSE, "connect() returned unexpected errno (%d)", errno); } -static int test_accept(int sock, struct sockaddr *addr, socklen_t *addrlen) +static int test_accept(int sock, struct net_sockaddr *addr, net_socklen_t *addrlen) { int new_sock = zsock_accept(sock, addr, addrlen); @@ -207,7 +207,7 @@ static int test_accept(int sock, struct sockaddr *addr, socklen_t *addrlen) } static void test_sendto(int sock, const void *buf, size_t len, int flags, - const struct sockaddr *dest_addr, socklen_t addrlen) + const struct net_sockaddr *dest_addr, net_socklen_t addrlen) { int ret; @@ -216,7 +216,7 @@ static void test_sendto(int sock, const void *buf, size_t len, int flags, } static void test_recvfrom_success(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, net_socklen_t *addrlen) { int ret; @@ -225,7 +225,7 @@ static void test_recvfrom_success(int sock, void *buf, size_t max_len, int flags } static void test_recvfrom_fail(int sock, void *buf, size_t max_len, int flags, - struct sockaddr *src_addr, socklen_t *addrlen) + struct net_sockaddr *src_addr, net_socklen_t *addrlen) { int ret; @@ -257,9 +257,9 @@ ZTEST_USER(socket_reuseaddr_test_suite, test_enable_disable) { int server_sock = -1; int value = -1; - socklen_t value_size = sizeof(int); + net_socklen_t value_size = sizeof(int); - server_sock = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + server_sock = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(server_sock >= 0, "socket open failed"); /* Read initial value */ @@ -295,7 +295,7 @@ ZTEST_USER(socket_reuseaddr_test_suite, test_enable_disable) } -static void test_reuseaddr_unspecified_specified_common(sa_family_t family, +static void test_reuseaddr_unspecified_specified_common(net_sa_family_t family, char const *first_ip, char const *second_ip, bool should_succeed) @@ -303,8 +303,8 @@ static void test_reuseaddr_unspecified_specified_common(sa_family_t family, int server_sock1 = -1; int server_sock2 = -1; - struct sockaddr bind_addr1; - struct sockaddr bind_addr2; + struct net_sockaddr bind_addr1; + struct net_sockaddr bind_addr2; /* Create the sockets */ prepare_sock_tcp(family, first_ip, LOCAL_PORT, &server_sock1, &bind_addr1); @@ -332,7 +332,7 @@ static void test_reuseaddr_unspecified_specified_common(sa_family_t family, ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_first_unspecified) { - test_reuseaddr_unspecified_specified_common(AF_INET, + test_reuseaddr_unspecified_specified_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_MY_IPV4_ADDR, SHOULD_SUCCEED); @@ -340,7 +340,7 @@ ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_first_unspecified) ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_first_unspecified) { - test_reuseaddr_unspecified_specified_common(AF_INET6, + test_reuseaddr_unspecified_specified_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_MY_IPV6_ADDR, SHOULD_SUCCEED); @@ -348,7 +348,7 @@ ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_first_unspecified) ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_second_unspecified) { - test_reuseaddr_unspecified_specified_common(AF_INET, + test_reuseaddr_unspecified_specified_common(NET_AF_INET, TEST_MY_IPV4_ADDR, TEST_IPV4_ANY_ADDR, SHOULD_SUCCEED); @@ -356,7 +356,7 @@ ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_second_unspecified) ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_second_unspecified) { - test_reuseaddr_unspecified_specified_common(AF_INET6, + test_reuseaddr_unspecified_specified_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, TEST_IPV6_ANY_ADDR, SHOULD_SUCCEED); @@ -364,7 +364,7 @@ ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_second_unspecified) ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_both_unspecified) { - test_reuseaddr_unspecified_specified_common(AF_INET, + test_reuseaddr_unspecified_specified_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_IPV4_ANY_ADDR, SHOULD_FAIL); @@ -372,22 +372,22 @@ ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_both_unspecified) ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_both_unspecified) { - test_reuseaddr_unspecified_specified_common(AF_INET6, + test_reuseaddr_unspecified_specified_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_IPV6_ANY_ADDR, SHOULD_FAIL); } -static void test_reuseaddr_tcp_listening_common(sa_family_t family, +static void test_reuseaddr_tcp_listening_common(net_sa_family_t family, char const *first_ip, char const *second_ip) { int server_sock1 = -1; int server_sock2 = -1; - struct sockaddr bind_addr1; - struct sockaddr bind_addr2; + struct net_sockaddr bind_addr1; + struct net_sockaddr bind_addr2; /* Create the sockets */ prepare_sock_tcp(family, first_ip, LOCAL_PORT, &server_sock1, &bind_addr1); @@ -403,7 +403,7 @@ static void test_reuseaddr_tcp_listening_common(sa_family_t family, test_enable_reuseaddr(server_sock2); /* Try to bind the second socket, should fail */ - test_bind_fail(server_sock2, (struct sockaddr *) &bind_addr2, sizeof(bind_addr2)); + test_bind_fail(server_sock2, (struct net_sockaddr *) &bind_addr2, sizeof(bind_addr2)); zsock_close(server_sock1); zsock_close(server_sock2); @@ -411,34 +411,34 @@ static void test_reuseaddr_tcp_listening_common(sa_family_t family, ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_tcp_unspecified_listening) { - test_reuseaddr_tcp_listening_common(AF_INET, + test_reuseaddr_tcp_listening_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_MY_IPV4_ADDR); } ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_tcp_unspecified_listening) { - test_reuseaddr_tcp_listening_common(AF_INET6, + test_reuseaddr_tcp_listening_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_MY_IPV6_ADDR); } ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_tcp_specified_listening) { - test_reuseaddr_tcp_listening_common(AF_INET, + test_reuseaddr_tcp_listening_common(NET_AF_INET, TEST_MY_IPV4_ADDR, TEST_IPV4_ANY_ADDR); } ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_tcp_specified_listening) { - test_reuseaddr_tcp_listening_common(AF_INET6, + test_reuseaddr_tcp_listening_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, TEST_IPV6_ANY_ADDR); } -static void test_reuseaddr_tcp_tcp_time_wait_common(sa_family_t family, +static void test_reuseaddr_tcp_tcp_time_wait_common(net_sa_family_t family, char const *first_ip, char const *second_ip) { @@ -446,17 +446,17 @@ static void test_reuseaddr_tcp_tcp_time_wait_common(sa_family_t family, int client_sock = -1; int accept_sock = -1; - struct sockaddr bind_addr; - struct sockaddr conn_addr; + struct net_sockaddr bind_addr; + struct net_sockaddr conn_addr; - struct sockaddr accept_addr; - socklen_t accept_addrlen = sizeof(accept_addr); + struct net_sockaddr accept_addr; + net_socklen_t accept_addrlen = sizeof(accept_addr); prepare_sock_tcp(family, first_ip, LOCAL_PORT, &server_sock, &bind_addr); prepare_sock_tcp(family, second_ip, LOCAL_PORT, &client_sock, &conn_addr); /* Bind the server socket */ - test_bind_success(server_sock, (struct sockaddr *) &bind_addr, sizeof(bind_addr)); + test_bind_success(server_sock, (struct net_sockaddr *) &bind_addr, sizeof(bind_addr)); /* Start listening on the server socket */ test_listen(server_sock); @@ -480,13 +480,13 @@ static void test_reuseaddr_tcp_tcp_time_wait_common(sa_family_t family, prepare_sock_tcp(family, first_ip, LOCAL_PORT, &server_sock, &bind_addr); /* Bind the server socket, should fail */ - test_bind_fail(server_sock, (struct sockaddr *) &bind_addr, sizeof(bind_addr)); + test_bind_fail(server_sock, (struct net_sockaddr *) &bind_addr, sizeof(bind_addr)); /* Enable SO_REUSEADDR option for the new server socket */ test_enable_reuseaddr(server_sock); /* Try to bind the new server socket again, should work now */ - test_bind_success(server_sock, (struct sockaddr *) &bind_addr, sizeof(bind_addr)); + test_bind_success(server_sock, (struct net_sockaddr *) &bind_addr, sizeof(bind_addr)); zsock_close(client_sock); zsock_close(server_sock); @@ -499,28 +499,28 @@ static void test_reuseaddr_tcp_tcp_time_wait_common(sa_family_t family, ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_tcp_time_wait_unspecified) { - test_reuseaddr_tcp_tcp_time_wait_common(AF_INET, + test_reuseaddr_tcp_tcp_time_wait_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_MY_IPV4_ADDR); } ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_tcp_time_wait_unspecified) { - test_reuseaddr_tcp_tcp_time_wait_common(AF_INET6, + test_reuseaddr_tcp_tcp_time_wait_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_MY_IPV6_ADDR); } ZTEST_USER(socket_reuseaddr_test_suite, test_ipv4_tcp_time_wait_specified) { - test_reuseaddr_tcp_tcp_time_wait_common(AF_INET, + test_reuseaddr_tcp_tcp_time_wait_common(NET_AF_INET, TEST_MY_IPV4_ADDR, TEST_MY_IPV4_ADDR); } ZTEST_USER(socket_reuseaddr_test_suite, test_ipv6_tcp_time_wait_specified) { - test_reuseaddr_tcp_tcp_time_wait_common(AF_INET6, + test_reuseaddr_tcp_tcp_time_wait_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, TEST_MY_IPV6_ADDR); } @@ -534,9 +534,9 @@ ZTEST_USER(socket_reuseport_test_suite, test_enable_disable) int server_sock = -1; int value = -1; - socklen_t value_size = sizeof(int); + net_socklen_t value_size = sizeof(int); - server_sock = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + server_sock = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(server_sock >= 0, "socket open failed"); /* Read initial value */ @@ -572,7 +572,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_enable_disable) } -static void test_reuseport_unspecified_specified_common(sa_family_t family, +static void test_reuseport_unspecified_specified_common(net_sa_family_t family, char const *first_ip, char const *second_ip, bool should_succeed) @@ -580,8 +580,8 @@ static void test_reuseport_unspecified_specified_common(sa_family_t family, int server_sock1 = -1; int server_sock2 = -1; - struct sockaddr bind_addr1; - struct sockaddr bind_addr2; + struct net_sockaddr bind_addr1; + struct net_sockaddr bind_addr2; /* Create the sockets */ prepare_sock_tcp(family, first_ip, LOCAL_PORT, &server_sock1, &bind_addr1); @@ -614,7 +614,7 @@ static void test_reuseport_unspecified_specified_common(sa_family_t family, ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_unspecified_bad) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_IPV4_ANY_ADDR, SHOULD_FAIL); @@ -622,7 +622,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_unspecified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_unspecified_bad) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_IPV6_ANY_ADDR, SHOULD_FAIL); @@ -630,7 +630,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_unspecified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_unspecified_good) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_IPV4_ANY_ADDR, SHOULD_SUCCEED); @@ -638,7 +638,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_unspecified_good) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_unspecified_good) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_IPV6_ANY_ADDR, SHOULD_SUCCEED); @@ -646,7 +646,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_unspecified_good) ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_specified_bad) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_MY_IPV4_ADDR, TEST_MY_IPV4_ADDR, SHOULD_FAIL); @@ -654,7 +654,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_specified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_specified_bad) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, TEST_MY_IPV6_ADDR, SHOULD_FAIL); @@ -662,7 +662,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_specified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_specified_good) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_MY_IPV4_ADDR, TEST_MY_IPV4_ADDR, SHOULD_SUCCEED); @@ -670,7 +670,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_both_specified_good) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_specified_good) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, TEST_MY_IPV6_ADDR, SHOULD_SUCCEED); @@ -678,7 +678,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv6_both_specified_good) ZTEST_USER(socket_reuseport_test_suite, test_ipv4_first_unspecified_bad) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_MY_IPV4_ADDR, SHOULD_FAIL); @@ -686,7 +686,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_first_unspecified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_first_unspecified_bad) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_MY_IPV6_ADDR, SHOULD_FAIL); @@ -694,7 +694,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv6_first_unspecified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv4_first_unspecified_good) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_MY_IPV4_ADDR, SHOULD_SUCCEED); @@ -702,7 +702,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_first_unspecified_good) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_first_unspecified_good) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_MY_IPV6_ADDR, SHOULD_SUCCEED); @@ -710,7 +710,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv6_first_unspecified_good) ZTEST_USER(socket_reuseport_test_suite, test_ipv4_second_unspecified_bad) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_MY_IPV4_ADDR, TEST_IPV4_ANY_ADDR, SHOULD_FAIL); @@ -718,7 +718,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_second_unspecified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_second_unspecified_bad) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, TEST_IPV6_ANY_ADDR, SHOULD_FAIL); @@ -726,7 +726,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv6_second_unspecified_bad) ZTEST_USER(socket_reuseport_test_suite, test_ipv4_second_unspecified_good) { - test_reuseport_unspecified_specified_common(AF_INET, + test_reuseport_unspecified_specified_common(NET_AF_INET, TEST_MY_IPV4_ADDR, TEST_IPV4_ANY_ADDR, SHOULD_SUCCEED); @@ -734,7 +734,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_second_unspecified_good) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_second_unspecified_good) { - test_reuseport_unspecified_specified_common(AF_INET6, + test_reuseport_unspecified_specified_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, TEST_IPV6_ANY_ADDR, SHOULD_SUCCEED); @@ -748,7 +748,7 @@ enum sockets_reuseport_enabled { BOTH_SET }; -static void test_reuseport_udp_server_client_common(sa_family_t family, +static void test_reuseport_udp_server_client_common(net_sa_family_t family, char const *ip, enum sockets_reuseport_enabled setup) { @@ -756,11 +756,11 @@ static void test_reuseport_udp_server_client_common(sa_family_t family, int client_sock = -1; int accept_sock = 1; - struct sockaddr server_addr; - struct sockaddr client_addr; + struct net_sockaddr server_addr; + struct net_sockaddr client_addr; - struct sockaddr accept_addr; - socklen_t accept_addr_len = sizeof(accept_addr); + struct net_sockaddr accept_addr; + net_socklen_t accept_addr_len = sizeof(accept_addr); char tx_buf = 0x55; char rx_buf; @@ -775,10 +775,10 @@ static void test_reuseport_udp_server_client_common(sa_family_t family, } /* Bind server socket */ - test_bind_success(server_sock, (struct sockaddr *) &server_addr, sizeof(server_addr)); + test_bind_success(server_sock, (struct net_sockaddr *) &server_addr, sizeof(server_addr)); /* Bind client socket (on a random port) */ - test_bind_success(client_sock, (struct sockaddr *) &client_addr, sizeof(client_addr)); + test_bind_success(client_sock, (struct net_sockaddr *) &client_addr, sizeof(client_addr)); /* Send message from client to server */ test_sendto(client_sock, &tx_buf, sizeof(tx_buf), 0, &server_addr, sizeof(server_addr)); @@ -793,7 +793,7 @@ static void test_reuseport_udp_server_client_common(sa_family_t family, zassert_equal(rx_buf, tx_buf, "wrong data"); /* Create a more specific socket to have a direct connection to the new client */ - accept_sock = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + accept_sock = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(accept_sock >= 0, "socket open failed"); /* Make sure we can bind to the address:port */ @@ -804,11 +804,11 @@ static void test_reuseport_udp_server_client_common(sa_family_t family, /* Try to bind new client socket */ if (setup == BOTH_SET) { /* Should succeed */ - test_bind_success(accept_sock, (struct sockaddr *) &server_addr, + test_bind_success(accept_sock, (struct net_sockaddr *) &server_addr, sizeof(server_addr)); } else { /* Should fail */ - test_bind_fail(accept_sock, (struct sockaddr *) &server_addr, + test_bind_fail(accept_sock, (struct net_sockaddr *) &server_addr, sizeof(server_addr)); } @@ -847,35 +847,35 @@ static void test_reuseport_udp_server_client_common(sa_family_t family, ZTEST_USER(socket_reuseport_test_suite, test_ipv4_udp_bad_both_not_set) { - test_reuseport_udp_server_client_common(AF_INET, + test_reuseport_udp_server_client_common(NET_AF_INET, TEST_MY_IPV4_ADDR, NONE_SET); } ZTEST_USER(socket_reuseport_test_suite, test_ipv6_udp_bad_both_not_set) { - test_reuseport_udp_server_client_common(AF_INET6, + test_reuseport_udp_server_client_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, NONE_SET); } ZTEST_USER(socket_reuseport_test_suite, test_ipv4_udp_bad_first_not_set) { - test_reuseport_udp_server_client_common(AF_INET, + test_reuseport_udp_server_client_common(NET_AF_INET, TEST_MY_IPV4_ADDR, SECOND_SET); } ZTEST_USER(socket_reuseport_test_suite, test_ipv6_udp_bad_first_not_set) { - test_reuseport_udp_server_client_common(AF_INET6, + test_reuseport_udp_server_client_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, SECOND_SET); } ZTEST_USER(socket_reuseport_test_suite, test_ipv4_udp_bad_second_not_set) { - test_reuseport_udp_server_client_common(AF_INET, + test_reuseport_udp_server_client_common(NET_AF_INET, TEST_MY_IPV4_ADDR, FIRST_SET); } @@ -883,27 +883,27 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_udp_bad_second_not_set) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_udp_bad_second_not_set) { - test_reuseport_udp_server_client_common(AF_INET6, + test_reuseport_udp_server_client_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, FIRST_SET); } ZTEST_USER(socket_reuseport_test_suite, test_ipv4_udp_good) { - test_reuseport_udp_server_client_common(AF_INET, + test_reuseport_udp_server_client_common(NET_AF_INET, TEST_MY_IPV4_ADDR, BOTH_SET); } ZTEST_USER(socket_reuseport_test_suite, test_ipv6_udp_good) { - test_reuseport_udp_server_client_common(AF_INET6, + test_reuseport_udp_server_client_common(NET_AF_INET6, TEST_MY_IPV6_ADDR, BOTH_SET); } -static void test_reuseport_tcp_identical_clients_common(sa_family_t family, +static void test_reuseport_tcp_identical_clients_common(net_sa_family_t family, char const *server_ip, char const *client_ip) { @@ -912,12 +912,12 @@ static void test_reuseport_tcp_identical_clients_common(sa_family_t family, int client_sock2 = -1; int accept_sock = 1; - struct sockaddr server_addr; - struct sockaddr client_addr; - struct sockaddr connect_addr; + struct net_sockaddr server_addr; + struct net_sockaddr client_addr; + struct net_sockaddr connect_addr; - struct sockaddr accept_addr; - socklen_t accept_addr_len = sizeof(accept_addr); + struct net_sockaddr accept_addr; + net_socklen_t accept_addr_len = sizeof(accept_addr); /* Create sockets */ prepare_sock_tcp(family, server_ip, LOCAL_PORT, &server_sock, &server_addr); @@ -945,7 +945,7 @@ static void test_reuseport_tcp_identical_clients_common(sa_family_t family, accept_sock = test_accept(server_sock, &accept_addr, &accept_addr_len); /* Connect the second client, should fail */ - test_connect_fail(client_sock2, (struct sockaddr *)&connect_addr, sizeof(connect_addr)); + test_connect_fail(client_sock2, (struct net_sockaddr *)&connect_addr, sizeof(connect_addr)); zsock_close(accept_sock); zsock_close(client_sock1); @@ -960,7 +960,7 @@ static void test_reuseport_tcp_identical_clients_common(sa_family_t family, ZTEST_USER(socket_reuseport_test_suite, test_ipv4_tcp_identical_clients) { - test_reuseport_tcp_identical_clients_common(AF_INET, + test_reuseport_tcp_identical_clients_common(NET_AF_INET, TEST_IPV4_ANY_ADDR, TEST_MY_IPV4_ADDR); } @@ -968,7 +968,7 @@ ZTEST_USER(socket_reuseport_test_suite, test_ipv4_tcp_identical_clients) ZTEST_USER(socket_reuseport_test_suite, test_ipv6_tcp_identical_clients) { - test_reuseport_tcp_identical_clients_common(AF_INET6, + test_reuseport_tcp_identical_clients_common(NET_AF_INET6, TEST_IPV6_ANY_ADDR, TEST_MY_IPV6_ADDR); } diff --git a/tests/net/socket/select/src/main.c b/tests/net/socket/select/src/main.c index 4a04bf67b04b9..e5c5c29cb82f3 100644 --- a/tests/net/socket/select/src/main.c +++ b/tests/net/socket/select/src/main.c @@ -70,8 +70,8 @@ ZTEST_USER(net_socket_select, test_select) int res; int c_sock; int s_sock; - struct sockaddr_in6 c_addr; - struct sockaddr_in6 s_addr; + struct net_sockaddr_in6 c_addr; + struct net_sockaddr_in6 s_addr; zsock_fd_set readfds; uint32_t tstamp; ssize_t len; @@ -81,10 +81,10 @@ ZTEST_USER(net_socket_select, test_select) prepare_sock_udp_v6(MY_IPV6_ADDR, CLIENT_PORT, &c_sock, &c_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_addr); - res = zsock_bind(s_sock, (struct sockaddr *)&s_addr, sizeof(s_addr)); + res = zsock_bind(s_sock, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, "bind failed"); - res = zsock_connect(c_sock, (struct sockaddr *)&s_addr, sizeof(s_addr)); + res = zsock_connect(c_sock, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(res, 0, "connect failed"); ZSOCK_FD_ZERO(&readfds); diff --git a/tests/net/socket/service/src/main.c b/tests/net/socket/service/src/main.c index 4e90d71cb8934..07ddd346b2480 100644 --- a/tests/net/socket/service/src/main.c +++ b/tests/net/socket/service/src/main.c @@ -64,8 +64,8 @@ void run_test_service(const struct net_socket_service_desc *udp_service, int c_sock_tcp; int s_sock_tcp; int new_sock; - struct sockaddr_in6 c_addr; - struct sockaddr_in6 s_addr; + struct net_sockaddr_in6 c_addr; + struct net_sockaddr_in6 s_addr; ssize_t len; char buf[10]; struct zsock_pollfd sock[2] = { @@ -93,10 +93,10 @@ void run_test_service(const struct net_socket_service_desc *udp_service, ret = net_socket_service_register(tcp_service, sock, ARRAY_SIZE(sock), NULL); zassert_equal(ret, 0, "Cannot register tcp service (%d)", ret); - ret = bind(s_sock_udp, (struct sockaddr *)&s_addr, sizeof(s_addr)); + ret = bind(s_sock_udp, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(ret, 0, "bind failed"); - ret = connect(c_sock_udp, (struct sockaddr *)&s_addr, sizeof(s_addr)); + ret = connect(c_sock_udp, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(ret, 0, "connect failed"); /* Send pkt for s_sock_udp and poll with timeout of 10 */ @@ -111,12 +111,12 @@ void run_test_service(const struct net_socket_service_desc *udp_service, len = recv(s_sock_udp, BUF_AND_SIZE(buf), 0); zassert_equal(len, STRLEN(TEST_STR_SMALL), "invalid recv len"); - ret = bind(s_sock_tcp, (struct sockaddr *)&s_addr, sizeof(s_addr)); + ret = bind(s_sock_tcp, (struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(ret, 0, "bind failed (%d)", -errno); ret = listen(s_sock_tcp, 0); zassert_equal(ret, 0, ""); - ret = connect(c_sock_tcp, (const struct sockaddr *)&s_addr, + ret = connect(c_sock_tcp, (const struct net_sockaddr *)&s_addr, sizeof(s_addr)); zassert_equal(ret, 0, ""); diff --git a/tests/net/socket/socket_helpers.h b/tests/net/socket/socket_helpers.h index 7ac4e0f8edd32..ec024dc71f230 100644 --- a/tests/net/socket/socket_helpers.h +++ b/tests/net/socket/socket_helpers.h @@ -16,46 +16,46 @@ #define clear_buf(buf) memset(buf, 0, sizeof(buf)) -static inline int prepare_listen_sock_udp_v4(struct sockaddr_in *addr) +static inline int prepare_listen_sock_udp_v4(struct net_sockaddr_in *addr) { int ret, sock; - zassert_not_null(addr, "null sockaddr"); + zassert_not_null(addr, "null net_sockaddr"); - ret = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ret = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(ret >= 0, "socket open failed"); sock = ret; - zassert_equal(addr->sin_family, AF_INET, "Invalid family"); + zassert_equal(addr->sin_family, NET_AF_INET, "Invalid family"); - ret = zsock_bind(sock, (struct sockaddr *)addr, sizeof(*addr)); + ret = zsock_bind(sock, (struct net_sockaddr *)addr, sizeof(*addr)); zassert_equal(ret, 0, "bind failed (%d/%d)", ret, errno); return sock; } -static inline int prepare_listen_sock_udp_v6(struct sockaddr_in6 *addr) +static inline int prepare_listen_sock_udp_v6(struct net_sockaddr_in6 *addr) { int ret, sock; - zassert_not_null(addr, "null sockaddr"); + zassert_not_null(addr, "null net_sockaddr"); - ret = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + ret = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(ret >= 0, "socket open failed"); sock = ret; - zassert_equal(addr->sin6_family, AF_INET6, "Invalid family"); + zassert_equal(addr->sin6_family, NET_AF_INET6, "Invalid family"); - ret = zsock_bind(sock, (struct sockaddr *)addr, sizeof(*addr)); + ret = zsock_bind(sock, (struct net_sockaddr *)addr, sizeof(*addr)); zassert_equal(ret, 0, "bind failed (%d/%d)", ret, errno); return sock; } static inline void prepare_sock_udp_v4(const char *addr, uint16_t port, - int *sock, struct sockaddr_in *sockaddr) + int *sock, struct net_sockaddr_in *sockaddr) { int rv; @@ -63,17 +63,17 @@ static inline void prepare_sock_udp_v4(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + *sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(*sock >= 0, "socket open failed"); - sockaddr->sin_family = AF_INET; - sockaddr->sin_port = htons(port); - rv = zsock_inet_pton(AF_INET, addr, &sockaddr->sin_addr); + sockaddr->sin_family = NET_AF_INET; + sockaddr->sin_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET, addr, &sockaddr->sin_addr); zassert_equal(rv, 1, "inet_pton failed"); } static inline void prepare_sock_udp_v6(const char *addr, uint16_t port, - int *sock, struct sockaddr_in6 *sockaddr) + int *sock, struct net_sockaddr_in6 *sockaddr) { int rv; @@ -81,18 +81,18 @@ static inline void prepare_sock_udp_v6(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + *sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(*sock >= 0, "socket open failed"); (void)memset(sockaddr, 0, sizeof(*sockaddr)); - sockaddr->sin6_family = AF_INET6; - sockaddr->sin6_port = htons(port); - rv = zsock_inet_pton(AF_INET6, addr, &sockaddr->sin6_addr); + sockaddr->sin6_family = NET_AF_INET6; + sockaddr->sin6_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET6, addr, &sockaddr->sin6_addr); zassert_equal(rv, 1, "inet_pton failed"); } static inline void prepare_sock_tcp_v4(const char *addr, uint16_t port, - int *sock, struct sockaddr_in *sockaddr) + int *sock, struct net_sockaddr_in *sockaddr) { int rv; @@ -100,17 +100,17 @@ static inline void prepare_sock_tcp_v4(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + *sock = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(*sock >= 0, "socket open failed"); - sockaddr->sin_family = AF_INET; - sockaddr->sin_port = htons(port); - rv = zsock_inet_pton(AF_INET, addr, &sockaddr->sin_addr); + sockaddr->sin_family = NET_AF_INET; + sockaddr->sin_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET, addr, &sockaddr->sin_addr); zassert_equal(rv, 1, "inet_pton failed"); } static inline void prepare_sock_tcp_v6(const char *addr, uint16_t port, - int *sock, struct sockaddr_in6 *sockaddr) + int *sock, struct net_sockaddr_in6 *sockaddr) { int rv; @@ -118,17 +118,17 @@ static inline void prepare_sock_tcp_v6(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + *sock = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP); zassert_true(*sock >= 0, "socket open failed"); - sockaddr->sin6_family = AF_INET6; - sockaddr->sin6_port = htons(port); - rv = zsock_inet_pton(AF_INET6, addr, &sockaddr->sin6_addr); + sockaddr->sin6_family = NET_AF_INET6; + sockaddr->sin6_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET6, addr, &sockaddr->sin6_addr); zassert_equal(rv, 1, "inet_pton failed"); } static inline void prepare_sock_tls_v4(const char *addr, uint16_t port, - int *sock, struct sockaddr_in *sockaddr, + int *sock, struct net_sockaddr_in *sockaddr, enum net_ip_protocol_secure proto) { int rv; @@ -137,17 +137,17 @@ static inline void prepare_sock_tls_v4(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET, SOCK_STREAM, proto); + *sock = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, proto); zassert_true(*sock >= 0, "socket open failed"); - sockaddr->sin_family = AF_INET; - sockaddr->sin_port = htons(port); - rv = zsock_inet_pton(AF_INET, addr, &sockaddr->sin_addr); + sockaddr->sin_family = NET_AF_INET; + sockaddr->sin_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET, addr, &sockaddr->sin_addr); zassert_equal(rv, 1, "inet_pton failed"); } static inline void prepare_sock_tls_v6(const char *addr, uint16_t port, - int *sock, struct sockaddr_in6 *sockaddr, + int *sock, struct net_sockaddr_in6 *sockaddr, enum net_ip_protocol_secure proto) { int rv; @@ -156,17 +156,17 @@ static inline void prepare_sock_tls_v6(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET6, SOCK_STREAM, proto); + *sock = zsock_socket(NET_AF_INET6, NET_SOCK_STREAM, proto); zassert_true(*sock >= 0, "socket open failed"); - sockaddr->sin6_family = AF_INET6; - sockaddr->sin6_port = htons(port); - rv = zsock_inet_pton(AF_INET6, addr, &sockaddr->sin6_addr); + sockaddr->sin6_family = NET_AF_INET6; + sockaddr->sin6_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET6, addr, &sockaddr->sin6_addr); zassert_equal(rv, 1, "inet_pton failed"); } static inline void prepare_sock_dtls_v4(const char *addr, uint16_t port, - int *sock, struct sockaddr_in *sockaddr, + int *sock, struct net_sockaddr_in *sockaddr, enum net_ip_protocol_secure proto) { int rv; @@ -175,17 +175,17 @@ static inline void prepare_sock_dtls_v4(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET, SOCK_DGRAM, proto); + *sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, proto); zassert_true(*sock >= 0, "socket open failed"); - sockaddr->sin_family = AF_INET; - sockaddr->sin_port = htons(port); - rv = zsock_inet_pton(AF_INET, addr, &sockaddr->sin_addr); + sockaddr->sin_family = NET_AF_INET; + sockaddr->sin_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET, addr, &sockaddr->sin_addr); zassert_equal(rv, 1, "inet_pton failed"); } static inline void prepare_sock_dtls_v6(const char *addr, uint16_t port, - int *sock, struct sockaddr_in6 *sockaddr, + int *sock, struct net_sockaddr_in6 *sockaddr, enum net_ip_protocol_secure proto) { int rv; @@ -194,11 +194,11 @@ static inline void prepare_sock_dtls_v6(const char *addr, uint16_t port, zassert_not_null(sock, "null sock"); zassert_not_null(sockaddr, "null sockaddr"); - *sock = zsock_socket(AF_INET6, SOCK_DGRAM, proto); + *sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, proto); zassert_true(*sock >= 0, "socket open failed"); - sockaddr->sin6_family = AF_INET6; - sockaddr->sin6_port = htons(port); - rv = zsock_inet_pton(AF_INET6, addr, &sockaddr->sin6_addr); + sockaddr->sin6_family = NET_AF_INET6; + sockaddr->sin6_port = net_htons(port); + rv = zsock_inet_pton(NET_AF_INET6, addr, &sockaddr->sin6_addr); zassert_equal(rv, 1, "inet_pton failed"); } diff --git a/tests/net/socket/socketpair/src/_main.c b/tests/net/socket/socketpair/src/_main.c index 118d8be120912..94480e16e1b0f 100644 --- a/tests/net/socket/socketpair/src/_main.c +++ b/tests/net/socket/socketpair/src/_main.c @@ -31,7 +31,7 @@ static void before(void *arg) fixture->sv[i] = -1; } } - zassert_ok(zsock_socketpair(AF_UNIX, SOCK_STREAM, 0, fixture->sv)); + zassert_ok(zsock_socketpair(NET_AF_UNIX, NET_SOCK_STREAM, 0, fixture->sv)); } static void after(void *arg) diff --git a/tests/net/socket/socketpair/src/closed_ends.c b/tests/net/socket/socketpair/src/closed_ends.c index 8c4241f0f23f2..2ae6f48995f74 100644 --- a/tests/net/socket/socketpair/src/closed_ends.c +++ b/tests/net/socket/socketpair/src/closed_ends.c @@ -23,7 +23,7 @@ ZTEST_USER_F(net_socketpair, test_close_one_end_and_write_to_the_other) zassert_equal(res, 0, "close(fixture->sv[%u]) failed: %d", i, errno); fixture->sv[(!i) & 1] = -1; - res = zsock_socketpair(AF_UNIX, SOCK_STREAM, 0, fixture->sv); + res = zsock_socketpair(NET_AF_UNIX, NET_SOCK_STREAM, 0, fixture->sv); zassert_equal(res, 0, "socketpair() failed: %d", errno); } } @@ -60,7 +60,7 @@ ZTEST_USER_F(net_socketpair, test_close_one_end_and_read_from_the_other) zassert_equal(res, 0, "close(fixture->sv[%u]) failed: %d", i, errno); fixture->sv[(!i) & 1] = -1; - res = zsock_socketpair(AF_UNIX, SOCK_STREAM, 0, fixture->sv); + res = zsock_socketpair(NET_AF_UNIX, NET_SOCK_STREAM, 0, fixture->sv); zassert_equal(res, 0, "socketpair() failed: %d", errno); } } diff --git a/tests/net/socket/socketpair/src/expected_failures.c b/tests/net/socket/socketpair/src/expected_failures.c index d5f722e45bc11..bd827ca8f6e0f 100644 --- a/tests/net/socket/socketpair/src/expected_failures.c +++ b/tests/net/socket/socketpair/src/expected_failures.c @@ -12,7 +12,7 @@ ZTEST_USER_F(net_socketpair, test_expected_failures) /* Use invalid values in fields starting from left to right */ - res = zsock_socketpair(AF_INET, SOCK_STREAM, 0, fixture->sv); + res = zsock_socketpair(NET_AF_INET, NET_SOCK_STREAM, 0, fixture->sv); if (res != -1) { for (int i = 0; i < 2; ++i) { zassert_ok(zsock_close(fixture->sv[i])); @@ -23,7 +23,7 @@ ZTEST_USER_F(net_socketpair, test_expected_failures) zassert_equal(errno, EAFNOSUPPORT, "errno should be EAFNOSUPPORT with bad address family"); - res = zsock_socketpair(AF_UNIX, 42, 0, fixture->sv); + res = zsock_socketpair(NET_AF_UNIX, 42, 0, fixture->sv); if (res != -1) { for (int i = 0; i < 2; ++i) { zassert_ok(zsock_close(fixture->sv[i])); @@ -35,7 +35,7 @@ ZTEST_USER_F(net_socketpair, test_expected_failures) zassert_equal(errno, EPROTOTYPE, "errno should be EPROTOTYPE with bad socket type"); - res = zsock_socketpair(AF_UNIX, SOCK_STREAM, IPPROTO_TLS_1_0, fixture->sv); + res = zsock_socketpair(NET_AF_UNIX, NET_SOCK_STREAM, NET_IPPROTO_TLS_1_0, fixture->sv); if (res != -1) { for (int i = 0; i < 2; ++i) { zassert_ok(zsock_close(fixture->sv[i])); @@ -48,7 +48,7 @@ ZTEST_USER_F(net_socketpair, test_expected_failures) "errno should be EPROTONOSUPPORT with bad protocol"); /* This is not a POSIX requirement, but should be safe */ - res = zsock_socketpair(AF_UNIX, SOCK_STREAM, 0, NULL); + res = zsock_socketpair(NET_AF_UNIX, NET_SOCK_STREAM, 0, NULL); if (res != -1) { for (int i = 0; i < 2; ++i) { zassert_ok(zsock_close(fixture->sv[i])); diff --git a/tests/net/socket/socketpair/src/happy_path.c b/tests/net/socket/socketpair/src/happy_path.c index ebecff04b2b21..cd44a030eb962 100644 --- a/tests/net/socket/socketpair/src/happy_path.c +++ b/tests/net/socket/socketpair/src/happy_path.c @@ -19,9 +19,9 @@ static void happy_path( const unsigned int expected_msg_len = strlen(expected_msg); char actual_msg[32]; size_t actual_msg_len; - struct iovec iovec; - struct msghdr msghdr; - socklen_t len; + struct net_iovec iovec; + struct net_msghdr msghdr; + net_socklen_t len; /* sockets are bidirectional. test functions from both ends */ for (int i = 0; i < 2; ++i) { @@ -105,22 +105,22 @@ static void happy_path( } } -ZTEST_USER_F(net_socketpair, test_AF_LOCAL_SOCK_STREAM_0) +ZTEST_USER_F(net_socketpair, test_AF_LOCAL_NET_SOCK_STREAM_0) { happy_path( fixture, - AF_LOCAL, "AF_LOCAL", - SOCK_STREAM, "SOCK_STREAM", + NET_AF_LOCAL, "AF_LOCAL", + NET_SOCK_STREAM, "SOCK_STREAM", 0, "0" ); } -ZTEST_USER_F(net_socketpair, test_AF_UNIX_SOCK_STREAM_0) +ZTEST_USER_F(net_socketpair, test_AF_UNIX_NET_SOCK_STREAM_0) { happy_path( fixture, - AF_UNIX, "AF_UNIX", - SOCK_STREAM, "SOCK_STREAM", + NET_AF_UNIX, "AF_UNIX", + NET_SOCK_STREAM, "SOCK_STREAM", 0, "0" ); } diff --git a/tests/net/socket/socketpair/src/poll.c b/tests/net/socket/socketpair/src/poll.c index 169063f742abc..647fa82d58f9e 100644 --- a/tests/net/socket/socketpair/src/poll.c +++ b/tests/net/socket/socketpair/src/poll.c @@ -130,7 +130,7 @@ ZTEST_F(net_socketpair, test_poll_close_remote_end_POLLOUT) * But rather than reading, close the other end of the channel */ - res = zsock_socketpair(AF_UNIX, SOCK_STREAM, 0, fixture->sv); + res = zsock_socketpair(NET_AF_UNIX, NET_SOCK_STREAM, 0, fixture->sv); zassert_not_equal(res, -1, "socketpair() failed: %d", errno); for (size_t i = 0; i < CONFIG_NET_SOCKETPAIR_BUFFER_SIZE; ++i) { diff --git a/tests/net/socket/socketpair/src/unsupported_calls.c b/tests/net/socket/socketpair/src/unsupported_calls.c index 7c80338daba67..c85d39d8e72bf 100644 --- a/tests/net/socket/socketpair/src/unsupported_calls.c +++ b/tests/net/socket/socketpair/src/unsupported_calls.c @@ -9,20 +9,20 @@ ZTEST_USER_F(net_socketpair, test_unsupported_calls) { int res; - struct sockaddr_un addr = { - .sun_family = AF_UNIX, + struct net_sockaddr_un addr = { + .sun_family = NET_AF_UNIX, }; - socklen_t len = sizeof(addr); + net_socklen_t len = sizeof(addr); for (size_t i = 0; i < 2; ++i) { - res = zsock_bind(fixture->sv[i], (struct sockaddr *)&addr, len); + res = zsock_bind(fixture->sv[i], (struct net_sockaddr *)&addr, len); zassert_equal(res, -1, "bind should fail on a socketpair endpoint"); zassert_equal(errno, EISCONN, "bind should set errno to EISCONN"); - res = zsock_connect(fixture->sv[i], (struct sockaddr *)&addr, len); + res = zsock_connect(fixture->sv[i], (struct net_sockaddr *)&addr, len); zassert_equal(res, -1, "connect should fail on a socketpair endpoint"); zassert_equal(errno, EISCONN, @@ -34,7 +34,7 @@ ZTEST_USER_F(net_socketpair, test_unsupported_calls) zassert_equal(errno, EINVAL, "listen should set errno to EINVAL"); - res = zsock_accept(fixture->sv[i], (struct sockaddr *)&addr, &len); + res = zsock_accept(fixture->sv[i], (struct net_sockaddr *)&addr, &len); zassert_equal(res, -1, "accept should fail on a socketpair endpoint"); zassert_equal(errno, EOPNOTSUPP, diff --git a/tests/net/socket/tcp/src/main.c b/tests/net/socket/tcp/src/main.c index aee0132e9f0cf..ee3030beead36 100644 --- a/tests/net/socket/tcp/src/main.c +++ b/tests/net/socket/tcp/src/main.c @@ -8,7 +8,6 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); #include -#include #include #include #include @@ -35,7 +34,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL); #define TCP_TEARDOWN_TIMEOUT K_SECONDS(3) #define THREAD_SLEEP 50 /* ms */ -static void test_bind(int sock, struct sockaddr *addr, socklen_t addrlen) +static void test_bind(int sock, struct net_sockaddr *addr, net_socklen_t addrlen) { zassert_equal(zsock_bind(sock, addr, addrlen), 0, @@ -49,7 +48,7 @@ static void test_listen(int sock) "listen failed with error %d", errno); } -static void test_connect(int sock, struct sockaddr *addr, socklen_t addrlen) +static void test_connect(int sock, struct net_sockaddr *addr, net_socklen_t addrlen) { zassert_equal(zsock_connect(sock, addr, addrlen), 0, @@ -69,15 +68,15 @@ static void test_send(int sock, const void *buf, size_t len, int flags) } static void test_sendto(int sock, const void *buf, size_t len, int flags, - const struct sockaddr *addr, socklen_t addrlen) + const struct net_sockaddr *addr, net_socklen_t addrlen) { zassert_equal(zsock_sendto(sock, buf, len, flags, addr, addrlen), len, "send failed"); } -static void test_accept(int sock, int *new_sock, struct sockaddr *addr, - socklen_t *addrlen) +static void test_accept(int sock, int *new_sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { zassert_not_null(new_sock, "null newsock"); @@ -85,8 +84,8 @@ static void test_accept(int sock, int *new_sock, struct sockaddr *addr, zassert_true(*new_sock >= 0, "accept failed"); } -static void test_accept_timeout(int sock, int *new_sock, struct sockaddr *addr, - socklen_t *addrlen) +static void test_accept_timeout(int sock, int *new_sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { zassert_not_null(new_sock, "null newsock"); @@ -116,8 +115,8 @@ static void test_recv(int sock, int flags) static void test_recvfrom(int sock, int flags, - struct sockaddr *addr, - socklen_t *addrlen) + struct net_sockaddr *addr, + net_socklen_t *addrlen) { ssize_t recved = 0; char rx_buf[30] = {0}; @@ -132,7 +131,7 @@ static void test_recvfrom(int sock, } static void test_recvmsg(int sock, - struct msghdr *msg, + struct net_msghdr *msg, int flags, size_t expected, int line) @@ -233,22 +232,22 @@ ZTEST_USER(net_socket_tcp, test_v4_send_recv) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_send(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); test_recv(new_sock, ZSOCK_MSG_PEEK); test_recv(new_sock, 0); @@ -268,22 +267,22 @@ ZTEST_USER(net_socket_tcp, test_v6_send_recv) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_send(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); test_recv(new_sock, ZSOCK_MSG_PEEK); test_recv(new_sock, 0); @@ -310,13 +309,13 @@ struct k_thread tcp_server_thread_data; void tcp_server_block_thread(void *vps_sock, void *unused2, void *unused3) { int new_sock; - struct sockaddr addr; + struct net_sockaddr addr; int *ps_sock = (int *)vps_sock; - socklen_t addrlen = sizeof(addr); + net_socklen_t addrlen = sizeof(addr); test_accept(*ps_sock, &new_sock, &addr, &addrlen); - zassert_true(addrlen == sizeof(struct sockaddr_in) - || addrlen == sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_true(addrlen == sizeof(struct net_sockaddr_in) + || addrlen == sizeof(struct net_sockaddr_in6), "wrong addrlen"); /* Check the received data */ ssize_t recved = 0; @@ -359,26 +358,26 @@ void test_send_recv_large_common(int tcp_nodelay, int family) int rv; int c_sock = 0; int s_sock = 0; - struct sockaddr *c_saddr = NULL; - struct sockaddr *s_saddr = NULL; + struct net_sockaddr *c_saddr = NULL; + struct net_sockaddr *s_saddr = NULL; size_t addrlen = 0; - struct sockaddr_in c_saddr_in; - struct sockaddr_in s_saddr_in; - struct sockaddr_in6 c_saddr_in6; - struct sockaddr_in6 s_saddr_in6; + struct net_sockaddr_in c_saddr_in; + struct net_sockaddr_in s_saddr_in; + struct net_sockaddr_in6 c_saddr_in6; + struct net_sockaddr_in6 s_saddr_in6; - if (family == AF_INET) { + if (family == NET_AF_INET) { prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr_in); - c_saddr = (struct sockaddr *) &c_saddr_in; + c_saddr = (struct net_sockaddr *) &c_saddr_in; prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr_in); - s_saddr = (struct sockaddr *) &s_saddr_in; + s_saddr = (struct net_sockaddr *) &s_saddr_in; addrlen = sizeof(s_saddr_in); - } else if (family == AF_INET6) { + } else if (family == NET_AF_INET6) { prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr_in6); - c_saddr = (struct sockaddr *) &c_saddr_in6; + c_saddr = (struct net_sockaddr *) &c_saddr_in6; prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr_in6); - s_saddr = (struct sockaddr *) &s_saddr_in6; + s_saddr = (struct net_sockaddr *) &s_saddr_in6; addrlen = sizeof(s_saddr_in6); } else { zassert_unreachable(); @@ -395,7 +394,8 @@ void test_send_recv_large_common(int tcp_nodelay, int family) test_connect(c_sock, s_saddr, addrlen); - rv = zsock_setsockopt(c_sock, IPPROTO_TCP, TCP_NODELAY, (char *) &tcp_nodelay, sizeof(int)); + rv = zsock_setsockopt(c_sock, NET_IPPROTO_TCP, ZSOCK_TCP_NODELAY, + (char *)&tcp_nodelay, sizeof(int)); zassert_equal(rv, 0, "setsockopt failed (%d)", rv); /* send piece by piece */ @@ -454,39 +454,39 @@ static void restore_packet_loss_ratio(void) ZTEST(net_socket_tcp, test_v4_send_recv_large_normal) { - test_send_recv_large_common(0, AF_INET); + test_send_recv_large_common(0, NET_AF_INET); } ZTEST(net_socket_tcp, test_v4_send_recv_large_packet_loss) { set_packet_loss_ratio(); - test_send_recv_large_common(0, AF_INET); + test_send_recv_large_common(0, NET_AF_INET); restore_packet_loss_ratio(); } ZTEST(net_socket_tcp, test_v4_send_recv_large_no_delay) { set_packet_loss_ratio(); - test_send_recv_large_common(1, AF_INET); + test_send_recv_large_common(1, NET_AF_INET); restore_packet_loss_ratio(); } ZTEST(net_socket_tcp, test_v6_send_recv_large_normal) { - test_send_recv_large_common(0, AF_INET6); + test_send_recv_large_common(0, NET_AF_INET6); } ZTEST(net_socket_tcp, test_v6_send_recv_large_packet_loss) { set_packet_loss_ratio(); - test_send_recv_large_common(0, AF_INET6); + test_send_recv_large_common(0, NET_AF_INET6); restore_packet_loss_ratio(); } ZTEST(net_socket_tcp, test_v6_send_recv_large_no_delay) { set_packet_loss_ratio(); - test_send_recv_large_common(1, AF_INET6); + test_send_recv_large_common(1, NET_AF_INET6); restore_packet_loss_ratio(); } @@ -496,10 +496,10 @@ ZTEST(net_socket_tcp, test_v4_broken_link) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); struct timeval optval = { .tv_sec = 0, @@ -518,14 +518,14 @@ ZTEST(net_socket_tcp, test_v4_broken_link) prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_send(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &optval, sizeof(optval)); @@ -581,29 +581,29 @@ ZTEST_USER(net_socket_tcp, test_v4_sendto_recvfrom) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_sendto(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0, - (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); test_recvfrom(new_sock, ZSOCK_MSG_PEEK, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); test_recvfrom(new_sock, 0, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); test_close(new_sock); test_close(s_sock); @@ -617,30 +617,30 @@ ZTEST_USER(net_socket_tcp, test_v6_sendto_recvfrom) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_sendto(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0, - (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); test_recvfrom(new_sock, ZSOCK_MSG_PEEK, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); test_recvfrom(new_sock, 0, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); test_close(new_sock); test_close(s_sock); @@ -655,23 +655,23 @@ ZTEST_USER(net_socket_tcp, test_v4_sendto_recvfrom_null_dest) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_sendto(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0, - (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); test_recvfrom(new_sock, 0, NULL, NULL); @@ -688,23 +688,23 @@ ZTEST_USER(net_socket_tcp, test_v6_sendto_recvfrom_null_dest) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_sendto(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0, - (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); test_recvfrom(new_sock, 0, NULL, NULL); @@ -720,31 +720,31 @@ ZTEST_USER(net_socket_tcp, test_v4_sendto_recvmsg) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); #define MAX_BUF_LEN 64 #define SMALL_BUF_LEN (sizeof(TEST_STR_SMALL) - 1 - 2) char buf[MAX_BUF_LEN]; char buf2[SMALL_BUF_LEN]; char buf3[MAX_BUF_LEN]; - struct iovec io_vector[3]; - struct msghdr msg; + struct net_iovec io_vector[3]; + struct net_msghdr msg; int i, len; prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_sendto(c_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), 0, - (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); /* Read data first in one chunk */ io_vector[0].iov_base = buf; @@ -790,7 +790,7 @@ ZTEST_USER(net_socket_tcp, test_v4_sendto_recvmsg) /* Send larger test buffer */ test_sendto(c_sock, TEST_STR_LONG, strlen(TEST_STR_LONG), 0, - (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); /* Verify that the data is truncated */ io_vector[0].iov_base = buf; @@ -866,12 +866,12 @@ ZTEST_USER(net_socket_tcp, test_v4_recv_enotconn) * should lead to ENOTCONN. */ int c_sock, s_sock; - struct sockaddr_in c_saddr, s_saddr; + struct net_sockaddr_in c_saddr, s_saddr; prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); _test_recv_enotconn(c_sock, s_sock); } @@ -882,12 +882,12 @@ ZTEST_USER(net_socket_tcp, test_v6_recv_enotconn) * should lead to ENOTCONN. */ int c_sock, s_sock; - struct sockaddr_in6 c_saddr, s_saddr; + struct net_sockaddr_in6 c_saddr, s_saddr; prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); _test_recv_enotconn(c_sock, s_sock); } @@ -899,18 +899,18 @@ ZTEST_USER(net_socket_tcp, test_shutdown_rd_synchronous) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr, s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr, s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); /* Connect and accept that connection */ - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); @@ -950,19 +950,19 @@ ZTEST(net_socket_tcp, test_shutdown_rd_while_recv) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr, s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr, s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); struct shutdown_data shutdown_work_data; prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); /* Connect and accept that connection */ - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); @@ -990,8 +990,8 @@ ZTEST(net_socket_tcp, test_open_close_immediately) * receiving SYN. */ int count_before = 0, count_after = 0; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; int c_sock; int s_sock; @@ -1000,7 +1000,7 @@ ZTEST(net_socket_tcp, test_open_close_immediately) prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); /* We should have two contexts open now */ @@ -1009,9 +1009,9 @@ ZTEST(net_socket_tcp, test_open_close_immediately) /* Try to connect to a port that is not accepting connections. * The end result should be that we do not leak net_context. */ - s_saddr.sin_port = htons(SERVER_PORT + 1); + s_saddr.sin_port = net_htons(SERVER_PORT + 1); - zassert_not_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + zassert_not_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), 0, "connect succeed"); @@ -1046,8 +1046,8 @@ ZTEST(net_socket_tcp, test_connect_timeout) * possible. */ int count_after = 0; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; int c_sock; int rv; @@ -1055,14 +1055,14 @@ ZTEST(net_socket_tcp, test_connect_timeout) prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); - s_saddr.sin_family = AF_INET; - s_saddr.sin_port = htons(SERVER_PORT); - rv = zsock_inet_pton(AF_INET, MY_IPV4_ADDR, &s_saddr.sin_addr); + s_saddr.sin_family = NET_AF_INET; + s_saddr.sin_port = net_htons(SERVER_PORT); + rv = zsock_inet_pton(NET_AF_INET, MY_IPV4_ADDR, &s_saddr.sin_addr); zassert_equal(rv, 1, "inet_pton failed"); loopback_set_packet_drop_ratio(1.0f); - zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + zassert_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), -1, "connect succeed"); @@ -1094,8 +1094,8 @@ ZTEST(net_socket_tcp, test_async_connect_timeout) /* Test if asynchronous socket connect fails when there is no communication * possible. */ - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; int c_sock; int rv; struct zsock_pollfd poll_fds[POLL_FDS_NUM]; @@ -1103,13 +1103,13 @@ ZTEST(net_socket_tcp, test_async_connect_timeout) loopback_set_packet_drop_ratio(1.0f); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); - test_fcntl(c_sock, F_SETFL, O_NONBLOCK); - s_saddr.sin_family = AF_INET; - s_saddr.sin_port = htons(SERVER_PORT); - rv = zsock_inet_pton(AF_INET, MY_IPV4_ADDR, &s_saddr.sin_addr); + test_fcntl(c_sock, ZVFS_F_SETFL, ZVFS_O_NONBLOCK); + s_saddr.sin_family = NET_AF_INET; + s_saddr.sin_port = net_htons(SERVER_PORT); + rv = zsock_inet_pton(NET_AF_INET, MY_IPV4_ADDR, &s_saddr.sin_addr); zassert_equal(rv, 1, "inet_pton failed"); - rv = zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + rv = zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); zassert_equal(rv, -1, "connect should not succeed"); zassert_equal(errno, EINPROGRESS, @@ -1135,21 +1135,21 @@ ZTEST(net_socket_tcp, test_async_connect) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); struct zsock_pollfd poll_fds[1]; int poll_rc; prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_fcntl(c_sock, F_SETFL, O_NONBLOCK); + test_fcntl(c_sock, ZVFS_F_SETFL, ZVFS_O_NONBLOCK); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)), + zassert_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), -1, "connect shouldn't complete right away"); @@ -1164,7 +1164,7 @@ ZTEST(net_socket_tcp, test_async_connect) "poll should set POLLOUT"); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "Wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "Wrong addrlen"); test_close(c_sock); test_close(s_sock); @@ -1181,10 +1181,10 @@ ZTEST(net_socket_tcp, test_z_close_obstructed) * possible any more */ int count_before = 0, count_after = 0; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); int c_sock; int s_sock; int new_sock; @@ -1196,10 +1196,10 @@ ZTEST(net_socket_tcp, test_z_close_obstructed) prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + zassert_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), 0, "connect not succeed"); test_accept(s_sock, &new_sock, &addr, &addrlen); @@ -1253,16 +1253,16 @@ ZTEST_USER(net_socket_tcp, test_v4_accept_timeout) int s_sock; int new_sock; uint32_t tstamp; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_fcntl(s_sock, F_SETFL, O_NONBLOCK); + test_fcntl(s_sock, ZVFS_F_SETFL, ZVFS_O_NONBLOCK); tstamp = k_uptime_get_32(); test_accept_timeout(s_sock, &new_sock, &addr, &addrlen); @@ -1275,11 +1275,11 @@ ZTEST_USER(net_socket_tcp, test_v4_accept_timeout) ZTEST(net_socket_tcp, test_so_type) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); zassert_equal(wait_for_n_tcp_contexts(0, TCP_TEARDOWN_TIMEOUT), 0, @@ -1290,12 +1290,12 @@ ZTEST(net_socket_tcp, test_so_type) rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_TYPE, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type"); + zassert_equal(optval, NET_SOCK_STREAM, "getsockopt got invalid type"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_TYPE, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type"); + zassert_equal(optval, NET_SOCK_STREAM, "getsockopt got invalid type"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); test_close(sock1); @@ -1308,23 +1308,23 @@ ZTEST(net_socket_tcp, test_so_type) ZTEST(net_socket_tcp, test_so_protocol) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6); rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_PROTOCOL, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, IPPROTO_TCP, "getsockopt got invalid protocol"); + zassert_equal(optval, NET_IPPROTO_TCP, "getsockopt got invalid protocol"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_PROTOCOL, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, IPPROTO_TCP, "getsockopt got invalid protocol"); + zassert_equal(optval, NET_IPPROTO_TCP, "getsockopt got invalid protocol"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); test_close(sock1); @@ -1335,12 +1335,12 @@ ZTEST(net_socket_tcp, test_so_protocol) ZTEST(net_socket_tcp, test_so_rcvbuf) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int retval; int optval = UINT16_MAX; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6); @@ -1379,23 +1379,23 @@ ZTEST(net_socket_tcp, test_so_rcvbuf_win_size) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); char tx_buf[] = TEST_STR_SMALL; int buf_optval = sizeof(TEST_STR_SMALL); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); /* Lower server-side RX window size. */ rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval, @@ -1424,12 +1424,12 @@ ZTEST(net_socket_tcp, test_so_rcvbuf_win_size) ZTEST(net_socket_tcp, test_so_sndbuf) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int retval; int optval = UINT16_MAX; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6); @@ -1468,10 +1468,10 @@ ZTEST(net_socket_tcp, test_so_sndbuf_win_size) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); char tx_buf[] = TEST_STR_SMALL; int buf_optval = sizeof(TEST_STR_SMALL); @@ -1483,13 +1483,13 @@ ZTEST(net_socket_tcp, test_so_sndbuf_win_size) sizeof(buf_optval)); zassert_equal(rv, 0, "setsockopt failed (%d)", errno); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); /* Make sure the ACK from the server does not arrive. */ loopback_set_packet_drop_ratio(1.0f); @@ -1516,10 +1516,10 @@ ZTEST(net_socket_tcp, test_v4_so_rcvtimeo) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); int rv; uint32_t start_time, time_diff; @@ -1534,13 +1534,13 @@ ZTEST(net_socket_tcp, test_v4_so_rcvtimeo) prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_RCVTIMEO, &optval, sizeof(optval)); @@ -1583,10 +1583,10 @@ ZTEST(net_socket_tcp, test_v6_so_rcvtimeo) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); int rv; uint32_t start_time, time_diff; @@ -1601,13 +1601,13 @@ ZTEST(net_socket_tcp, test_v6_so_rcvtimeo) prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_RCVTIMEO, &optval, sizeof(optval)); @@ -1651,10 +1651,10 @@ ZTEST(net_socket_tcp, test_v4_so_sndtimeo) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); uint32_t start_time, time_diff; char tx_buf[] = TEST_STR_SMALL; int buf_optval = sizeof(TEST_STR_SMALL); @@ -1666,13 +1666,13 @@ ZTEST(net_socket_tcp, test_v4_so_sndtimeo) prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen"); rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_SNDTIMEO, &timeo_optval, sizeof(timeo_optval)); @@ -1712,10 +1712,10 @@ ZTEST(net_socket_tcp, test_v6_so_sndtimeo) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); uint32_t start_time, time_diff; char tx_buf[] = TEST_STR_SMALL; int buf_optval = sizeof(TEST_STR_SMALL); @@ -1727,13 +1727,13 @@ ZTEST(net_socket_tcp, test_v6_so_sndtimeo) prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen"); rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_SNDTIMEO, &timeo_optval, sizeof(timeo_optval)); @@ -1797,10 +1797,10 @@ ZTEST(net_socket_tcp, test_v4_msg_waitall) int c_sock; int s_sock; int new_sock; - struct sockaddr_in c_saddr; - struct sockaddr_in s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in c_saddr; + struct net_sockaddr_in s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); int ret; uint8_t rx_buf[sizeof(TEST_STR_SMALL) - 1] = { 0 }; struct timeval timeo_optval = { @@ -1811,13 +1811,13 @@ ZTEST(net_socket_tcp, test_v4_msg_waitall) prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in), "Wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "Wrong addrlen"); /* Regular MSG_WAITALL - make sure recv returns only after @@ -1875,10 +1875,10 @@ ZTEST(net_socket_tcp, test_v6_msg_waitall) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); int ret; uint8_t rx_buf[sizeof(TEST_STR_SMALL) - 1] = { 0 }; struct timeval timeo_optval = { @@ -1889,13 +1889,13 @@ ZTEST(net_socket_tcp, test_v6_msg_waitall) prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "Wrong addrlen"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "Wrong addrlen"); /* Regular MSG_WAITALL - make sure recv returns only after * requested amount is received. @@ -1967,7 +1967,7 @@ ZTEST(net_socket_tcp, test_socket_permission) { #ifdef CONFIG_USERSPACE int sock; - struct sockaddr_in saddr; + struct net_sockaddr_in saddr; struct net_context *ctx; prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock, &saddr); @@ -2038,9 +2038,9 @@ ZTEST(net_socket_tcp, test_close_while_recv) int c_sock; int s_sock; int new_sock; - struct sockaddr_in6 c_saddr, s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 c_saddr, s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); struct close_data close_work_data; char rx_buf[1]; ssize_t ret; @@ -2048,11 +2048,11 @@ ZTEST(net_socket_tcp, test_close_while_recv) prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); /* Connect and accept that connection */ - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(s_sock, &new_sock, &addr, &addrlen); @@ -2081,14 +2081,14 @@ ZTEST(net_socket_tcp, test_close_while_accept) */ int s_sock; int new_sock; - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); struct close_data close_work_data; prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); /* Schedule close() from workqueue */ @@ -2118,29 +2118,29 @@ enum test_ioctl_fionread_sockid { static void test_ioctl_fionread_setup(int af, int fd[3]) { - socklen_t addrlen; - socklen_t addrlen2; - struct sockaddr_in6 addr; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; + net_socklen_t addrlen; + net_socklen_t addrlen2; + struct net_sockaddr_in6 addr; + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; fd[0] = -1; fd[1] = -1; fd[2] = -1; switch (af) { - case AF_INET: { + case NET_AF_INET: { prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &fd[CLIENT], - (struct sockaddr_in *)&c_saddr); + (struct net_sockaddr_in *)&c_saddr); prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &fd[ACCEPT], - (struct sockaddr_in *)&s_saddr); - addrlen = sizeof(struct sockaddr_in); + (struct net_sockaddr_in *)&s_saddr); + addrlen = sizeof(struct net_sockaddr_in); } break; - case AF_INET6: { + case NET_AF_INET6: { prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &fd[CLIENT], &c_saddr); prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, &fd[ACCEPT], &s_saddr); - addrlen = sizeof(struct sockaddr_in6); + addrlen = sizeof(struct net_sockaddr_in6); } break; default: @@ -2150,11 +2150,11 @@ static void test_ioctl_fionread_setup(int af, int fd[3]) addrlen2 = addrlen; - test_bind(fd[ACCEPT], (struct sockaddr *)&s_saddr, addrlen); + test_bind(fd[ACCEPT], (struct net_sockaddr *)&s_saddr, addrlen); test_listen(fd[ACCEPT]); - test_connect(fd[CLIENT], (struct sockaddr *)&s_saddr, addrlen); - test_accept(fd[ACCEPT], &fd[SERVER], (struct sockaddr *)&addr, &addrlen2); + test_connect(fd[CLIENT], (struct net_sockaddr *)&s_saddr, addrlen); + test_accept(fd[ACCEPT], &fd[SERVER], (struct net_sockaddr *)&addr, &addrlen2); } /* note: this is duplicated from tests/net/socket/socketpair/src/fionread.c */ @@ -2210,11 +2210,11 @@ static void test_ioctl_fionread_common(int af) ZTEST(net_socket_tcp, test_ioctl_fionread_v4) { - test_ioctl_fionread_common(AF_INET); + test_ioctl_fionread_common(NET_AF_INET); } ZTEST(net_socket_tcp, test_ioctl_fionread_v6) { - test_ioctl_fionread_common(AF_INET6); + test_ioctl_fionread_common(NET_AF_INET6); } /* Connect to peer which is not listening the test port and @@ -2223,25 +2223,25 @@ ZTEST(net_socket_tcp, test_ioctl_fionread_v6) */ ZTEST(net_socket_tcp, test_connect_and_wait_for_v4_select) { - struct sockaddr_in addr = { 0 }; - struct in_addr v4addr; + struct net_sockaddr_in addr = { 0 }; + struct net_in_addr v4addr; int fd, flags, ret, optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); - fd = zsock_socket(AF_INET, SOCK_STREAM, 0); + fd = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, 0); - flags = zsock_fcntl(fd, F_GETFL, 0); - zsock_fcntl(fd, F_SETFL, flags | O_NONBLOCK); + flags = zsock_fcntl(fd, ZVFS_F_GETFL, 0); + zsock_fcntl(fd, ZVFS_F_SETFL, flags | ZVFS_O_NONBLOCK); - zsock_inet_pton(AF_INET, "127.0.0.1", (void *)&v4addr); + zsock_inet_pton(NET_AF_INET, "127.0.0.1", (void *)&v4addr); - addr.sin_family = AF_INET; + addr.sin_family = NET_AF_INET; net_ipaddr_copy(&addr.sin_addr, &v4addr); /* There should be nobody serving this port */ - addr.sin_port = htons(8088); + addr.sin_port = net_htons(8088); - ret = zsock_connect(fd, (const struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_connect(fd, (const struct net_sockaddr *)&addr, sizeof(addr)); zassert_equal(ret, -1, "connect succeed, %d", errno); zassert_equal(errno, EINPROGRESS, "connect succeed, %d", errno); @@ -2290,27 +2290,27 @@ ZTEST(net_socket_tcp, test_connect_and_wait_for_v4_select) */ ZTEST(net_socket_tcp, test_connect_and_wait_for_v4_poll) { - struct sockaddr_in addr = { 0 }; + struct net_sockaddr_in addr = { 0 }; struct zsock_pollfd fds[1]; - struct in_addr v4addr; + struct net_in_addr v4addr; int fd, flags, ret, optval; bool closed = false; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); - fd = zsock_socket(AF_INET, SOCK_STREAM, 0); + fd = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, 0); - flags = zsock_fcntl(fd, F_GETFL, 0); - zsock_fcntl(fd, F_SETFL, flags | O_NONBLOCK); + flags = zsock_fcntl(fd, ZVFS_F_GETFL, 0); + zsock_fcntl(fd, ZVFS_F_SETFL, flags | ZVFS_O_NONBLOCK); - zsock_inet_pton(AF_INET, "127.0.0.1", (void *)&v4addr); + zsock_inet_pton(NET_AF_INET, "127.0.0.1", (void *)&v4addr); - addr.sin_family = AF_INET; + addr.sin_family = NET_AF_INET; net_ipaddr_copy(&addr.sin_addr, &v4addr); /* There should be nobody serving this port */ - addr.sin_port = htons(8088); + addr.sin_port = net_htons(8088); - ret = zsock_connect(fd, (const struct sockaddr *)&addr, sizeof(addr)); + ret = zsock_connect(fd, (const struct net_sockaddr *)&addr, sizeof(addr)); zassert_equal(ret, -1, "connect succeed, %d", errno); zassert_equal(errno, EINPROGRESS, "connect succeed, %d", errno); @@ -2351,10 +2351,10 @@ ZTEST(net_socket_tcp, test_connect_and_wait_for_v4_poll) ZTEST(net_socket_tcp, test_so_keepalive_opt) { - struct sockaddr_in bind_addr4; + struct net_sockaddr_in bind_addr4; int sock, ret; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock, &bind_addr4); @@ -2376,19 +2376,19 @@ ZTEST(net_socket_tcp, test_so_keepalive_opt) zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); /* Check keep-alive parameters defaults. */ - ret = zsock_getsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, &optlen); + ret = zsock_getsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPIDLE, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, CONFIG_NET_TCP_KEEPIDLE_DEFAULT, "getsockopt got invalid value"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); - ret = zsock_getsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, &optlen); + ret = zsock_getsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPINTVL, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, CONFIG_NET_TCP_KEEPINTVL_DEFAULT, "getsockopt got invalid value"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); - ret = zsock_getsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, &optlen); + ret = zsock_getsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPCNT, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, CONFIG_NET_TCP_KEEPCNT_DEFAULT, "getsockopt got invalid value"); @@ -2396,31 +2396,31 @@ ZTEST(net_socket_tcp, test_so_keepalive_opt) /* Check keep-alive parameters update. */ optval = 123; - ret = zsock_setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, + ret = zsock_setsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPIDLE, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); optval = 10; - ret = zsock_setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, + ret = zsock_setsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPINTVL, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); optval = 2; - ret = zsock_setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, + ret = zsock_setsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPCNT, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); - ret = zsock_getsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, &optlen); + ret = zsock_getsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPIDLE, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, 123, "getsockopt got invalid value"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); - ret = zsock_getsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, &optlen); + ret = zsock_getsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPINTVL, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, 10, "getsockopt got invalid value"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); - ret = zsock_getsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, &optlen); + ret = zsock_getsockopt(sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPCNT, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, 2, "getsockopt got invalid value"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); @@ -2432,7 +2432,7 @@ ZTEST(net_socket_tcp, test_so_keepalive_opt) static void test_prepare_keepalive_socks(int *c_sock, int *s_sock, int *new_sock) { - struct sockaddr_in c_saddr, s_saddr; + struct net_sockaddr_in c_saddr, s_saddr; int optval; int ret; @@ -2441,41 +2441,41 @@ static void test_prepare_keepalive_socks(int *c_sock, int *s_sock, int *new_sock /* Enable keep-alive on both ends and set timeouts/retries to minimum */ optval = 1; - ret = zsock_setsockopt(*c_sock, SOL_SOCKET, SO_KEEPALIVE, + ret = zsock_setsockopt(*c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_KEEPALIVE, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); - ret = zsock_setsockopt(*s_sock, SOL_SOCKET, SO_KEEPALIVE, + ret = zsock_setsockopt(*s_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_KEEPALIVE, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); optval = 1; - ret = zsock_setsockopt(*c_sock, IPPROTO_TCP, TCP_KEEPIDLE, + ret = zsock_setsockopt(*c_sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPIDLE, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); - ret = zsock_setsockopt(*s_sock, IPPROTO_TCP, TCP_KEEPIDLE, + ret = zsock_setsockopt(*s_sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPIDLE, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); optval = 1; - ret = zsock_setsockopt(*c_sock, IPPROTO_TCP, TCP_KEEPINTVL, + ret = zsock_setsockopt(*c_sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPINTVL, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); - ret = zsock_setsockopt(*s_sock, IPPROTO_TCP, TCP_KEEPINTVL, + ret = zsock_setsockopt(*s_sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPINTVL, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); optval = 1; - ret = zsock_setsockopt(*c_sock, IPPROTO_TCP, TCP_KEEPCNT, + ret = zsock_setsockopt(*c_sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPCNT, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); - ret = zsock_setsockopt(*s_sock, IPPROTO_TCP, TCP_KEEPCNT, + ret = zsock_setsockopt(*s_sock, NET_IPPROTO_TCP, ZSOCK_TCP_KEEPCNT, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); /* Establish connection */ - test_bind(*s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(*s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(*s_sock); - test_connect(*c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(*c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_accept(*s_sock, new_sock, NULL, NULL); } @@ -2491,7 +2491,7 @@ ZTEST(net_socket_tcp, test_keepalive) test_prepare_keepalive_socks(&c_sock, &s_sock, &new_sock); - ret = zsock_setsockopt(c_sock, SOL_SOCKET, SO_RCVTIMEO, &optval, + ret = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -2542,35 +2542,35 @@ ZTEST(net_socket_tcp, test_keepalive_timeout) #define TEST_BACKLOG_MAX 3 static void test_prepare_backlog_server_sock(int family, int *s_sock, - struct sockaddr *s_addr, - socklen_t *addrlen) + struct net_sockaddr *s_addr, + net_socklen_t *addrlen) { - if (family == AF_INET) { + if (family == NET_AF_INET) { prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, s_sock, - (struct sockaddr_in *)s_addr); - *addrlen = sizeof(struct sockaddr_in); + (struct net_sockaddr_in *)s_addr); + *addrlen = sizeof(struct net_sockaddr_in); } else { prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, s_sock, - (struct sockaddr_in6 *)s_addr); - *addrlen = sizeof(struct sockaddr_in6); + (struct net_sockaddr_in6 *)s_addr); + *addrlen = sizeof(struct net_sockaddr_in6); } test_bind(*s_sock, s_addr, *addrlen); } -static void test_backlog_connect_ok(int *c_sock, struct sockaddr *s_addr, - socklen_t addrlen) +static void test_backlog_connect_ok(int *c_sock, struct net_sockaddr *s_addr, + net_socklen_t addrlen) { - struct sockaddr c_addr; + struct net_sockaddr c_addr; int sock; int ret; - if (s_addr->sa_family == AF_INET) { + if (s_addr->sa_family == NET_AF_INET) { prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock, - (struct sockaddr_in *)&c_addr); + (struct net_sockaddr_in *)&c_addr); } else { prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock, - (struct sockaddr_in6 *)&c_addr); + (struct net_sockaddr_in6 *)&c_addr); } ret = zsock_connect(sock, s_addr, addrlen); @@ -2584,18 +2584,18 @@ static void test_backlog_connect_ok(int *c_sock, struct sockaddr *s_addr, *c_sock = sock; } -static void test_backlog_connect_fail(struct sockaddr *s_addr, socklen_t addrlen) +static void test_backlog_connect_fail(struct net_sockaddr *s_addr, net_socklen_t addrlen) { - struct sockaddr c_addr; + struct net_sockaddr c_addr; int sock; int ret; - if (s_addr->sa_family == AF_INET) { + if (s_addr->sa_family == NET_AF_INET) { prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock, - (struct sockaddr_in *)&c_addr); + (struct net_sockaddr_in *)&c_addr); } else { prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock, - (struct sockaddr_in6 *)&c_addr); + (struct net_sockaddr_in6 *)&c_addr); } ret = zsock_connect(sock, s_addr, addrlen); @@ -2609,8 +2609,8 @@ static void test_common_listen_backlog(int family, int backlog) { const int expect_conns = backlog <= 0 ? 1 : backlog; int client_socks[TEST_BACKLOG_MAX]; - struct sockaddr s_addr; - socklen_t addrlen; + struct net_sockaddr s_addr; + net_socklen_t addrlen; int s_sock, c_sock, accept_sock; int ret; @@ -2649,16 +2649,16 @@ static void test_common_listen_backlog(int family, int backlog) ZTEST(net_socket_tcp, test_v4_listen_backlog) { - test_common_listen_backlog(AF_INET, 0); - test_common_listen_backlog(AF_INET, 1); - test_common_listen_backlog(AF_INET, TEST_BACKLOG_MAX); + test_common_listen_backlog(NET_AF_INET, 0); + test_common_listen_backlog(NET_AF_INET, 1); + test_common_listen_backlog(NET_AF_INET, TEST_BACKLOG_MAX); } ZTEST(net_socket_tcp, test_v6_listen_backlog) { - test_common_listen_backlog(AF_INET6, 0); - test_common_listen_backlog(AF_INET6, 1); - test_common_listen_backlog(AF_INET6, TEST_BACKLOG_MAX); + test_common_listen_backlog(NET_AF_INET6, 0); + test_common_listen_backlog(NET_AF_INET6, 1); + test_common_listen_backlog(NET_AF_INET6, TEST_BACKLOG_MAX); } static void after(void *arg) diff --git a/tests/net/socket/tls/src/main.c b/tests/net/socket/tls/src/main.c index 8186ba7dbe913..03c3b7b08bee7 100644 --- a/tests/net/socket/tls/src/main.c +++ b/tests/net/socket/tls/src/main.c @@ -73,13 +73,13 @@ static void test_config_psk(int s_sock, int c_sock) 0, "Failed to register PSK ID"); if (s_sock >= 0) { - zassert_equal(zsock_setsockopt(s_sock, SOL_TLS, TLS_SEC_TAG_LIST, + zassert_equal(zsock_setsockopt(s_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, sec_tag_list, sizeof(sec_tag_list)), 0, "Failed to set PSK on server socket"); } if (c_sock >= 0) { - zassert_equal(zsock_setsockopt(c_sock, SOL_TLS, TLS_SEC_TAG_LIST, + zassert_equal(zsock_setsockopt(c_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, sec_tag_list, sizeof(sec_tag_list)), 0, "Failed to set PSK on client socket"); } @@ -90,7 +90,7 @@ static void test_fcntl(int sock, int cmd, int val) zassert_equal(zsock_fcntl(sock, cmd, val), 0, "fcntl failed"); } -static void test_bind(int sock, struct sockaddr *addr, socklen_t addrlen) +static void test_bind(int sock, struct net_sockaddr *addr, net_socklen_t addrlen) { zassert_equal(zsock_bind(sock, addr, addrlen), 0, @@ -104,7 +104,7 @@ static void test_listen(int sock) "listen failed"); } -static void test_connect(int sock, struct sockaddr *addr, socklen_t addrlen) +static void test_connect(int sock, struct net_sockaddr *addr, net_socklen_t addrlen) { k_yield(); @@ -125,12 +125,12 @@ static void test_send(int sock, const void *buf, size_t len, int flags) "send failed"); } -static void test_sendmsg(int sock, const struct msghdr *msg, int flags) +static void test_sendmsg(int sock, const struct net_msghdr *msg, int flags) { size_t total_len = 0; for (int i = 0; i < msg->msg_iovlen; i++) { - struct iovec *vec = msg->msg_iov + i; + struct net_iovec *vec = msg->msg_iov + i; total_len += vec->iov_len; } @@ -140,8 +140,8 @@ static void test_sendmsg(int sock, const struct msghdr *msg, int flags) "sendmsg failed"); } -static void test_accept(int sock, int *new_sock, struct sockaddr *addr, - socklen_t *addrlen) +static void test_accept(int sock, int *new_sock, struct net_sockaddr *addr, + net_socklen_t *addrlen) { zassert_not_null(new_sock, "null newsock"); @@ -202,23 +202,23 @@ static void test_eof(int sock) ZTEST(net_socket_tls, test_so_type) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); - prepare_sock_tls_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4, IPPROTO_TLS_1_2); - prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6, IPPROTO_TLS_1_2); + prepare_sock_tls_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4, NET_IPPROTO_TLS_1_2); + prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6, NET_IPPROTO_TLS_1_2); - rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_TYPE, &optval, &optlen); + rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_TYPE, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type"); + zassert_equal(optval, NET_SOCK_STREAM, "getsockopt got invalid type"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); - rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_TYPE, &optval, &optlen); + rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_TYPE, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type"); + zassert_equal(optval, NET_SOCK_STREAM, "getsockopt got invalid type"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); test_close(sock1); @@ -227,24 +227,24 @@ ZTEST(net_socket_tls, test_so_type) ZTEST(net_socket_tls, test_so_protocol) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); - prepare_sock_tls_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4, IPPROTO_TLS_1_2); - prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6, IPPROTO_TLS_1_1); + prepare_sock_tls_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4, NET_IPPROTO_TLS_1_2); + prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6, NET_IPPROTO_TLS_1_1); - rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_PROTOCOL, &optval, &optlen); + rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_PROTOCOL, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, IPPROTO_TLS_1_2, + zassert_equal(optval, NET_IPPROTO_TLS_1_2, "getsockopt got invalid protocol"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); - rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_PROTOCOL, &optval, &optlen); + rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_PROTOCOL, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, IPPROTO_TLS_1_1, + zassert_equal(optval, NET_IPPROTO_TLS_1_1, "getsockopt got invalid protocol"); zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size"); @@ -277,7 +277,7 @@ static void test_msg_waitall_tx_work_handler(struct k_work *work) struct connect_data { struct k_work_delayable work; int sock; - struct sockaddr *addr; + struct net_sockaddr *addr; }; static void client_connect_work_handler(struct k_work *work) @@ -286,8 +286,8 @@ static void client_connect_work_handler(struct k_work *work) struct connect_data *data = CONTAINER_OF(dwork, struct connect_data, work); - test_connect(data->sock, data->addr, data->addr->sa_family == AF_INET ? - sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)); + test_connect(data->sock, data->addr, data->addr->sa_family == NET_AF_INET ? + sizeof(struct net_sockaddr_in) : sizeof(struct net_sockaddr_in6)); } static void dtls_client_connect_send_work_handler(struct k_work *work) @@ -297,36 +297,36 @@ static void dtls_client_connect_send_work_handler(struct k_work *work) CONTAINER_OF(dwork, struct connect_data, work); uint8_t tx_buf = 0; - test_connect(data->sock, data->addr, data->addr->sa_family == AF_INET ? - sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)); + test_connect(data->sock, data->addr, data->addr->sa_family == NET_AF_INET ? + sizeof(struct net_sockaddr_in) : sizeof(struct net_sockaddr_in6)); test_send(data->sock, &tx_buf, sizeof(tx_buf), 0); } -static void test_prepare_tls_connection(sa_family_t family) +static void test_prepare_tls_connection(net_sa_family_t family) { - struct sockaddr c_saddr; - struct sockaddr s_saddr; - socklen_t exp_addrlen = family == AF_INET6 ? - sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr c_saddr; + struct net_sockaddr s_saddr; + net_socklen_t exp_addrlen = family == NET_AF_INET6 ? + sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); struct connect_data test_data; - if (family == AF_INET6) { + if (family == NET_AF_INET6) { prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, - (struct sockaddr_in6 *)&c_saddr, - IPPROTO_TLS_1_2); + (struct net_sockaddr_in6 *)&c_saddr, + NET_IPPROTO_TLS_1_2); prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &s_sock, - (struct sockaddr_in6 *)&s_saddr, - IPPROTO_TLS_1_2); + (struct net_sockaddr_in6 *)&s_saddr, + NET_IPPROTO_TLS_1_2); } else { prepare_sock_tls_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, - (struct sockaddr_in *)&c_saddr, - IPPROTO_TLS_1_2); + (struct net_sockaddr_in *)&c_saddr, + NET_IPPROTO_TLS_1_2); prepare_sock_tls_v4(MY_IPV4_ADDR, ANY_PORT, &s_sock, - (struct sockaddr_in *)&s_saddr, - IPPROTO_TLS_1_2); + (struct net_sockaddr_in *)&s_saddr, + NET_IPPROTO_TLS_1_2); } test_config_psk(s_sock, c_sock); @@ -348,39 +348,39 @@ static void test_prepare_tls_connection(sa_family_t family) test_work_wait(&test_data.work); } -static void test_prepare_dtls_connection(sa_family_t family) +static void test_prepare_dtls_connection(net_sa_family_t family) { - struct sockaddr c_saddr; - struct sockaddr s_saddr; - socklen_t exp_addrlen = family == AF_INET6 ? - sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); + struct net_sockaddr c_saddr; + struct net_sockaddr s_saddr; + net_socklen_t exp_addrlen = family == NET_AF_INET6 ? + sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); struct connect_data test_data; - int role = TLS_DTLS_ROLE_SERVER; + int role = ZSOCK_TLS_DTLS_ROLE_SERVER; struct zsock_pollfd fds[1]; uint8_t rx_buf; int ret; - if (family == AF_INET6) { + if (family == NET_AF_INET6) { prepare_sock_dtls_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, - (struct sockaddr_in6 *)&c_saddr, - IPPROTO_DTLS_1_2); + (struct net_sockaddr_in6 *)&c_saddr, + NET_IPPROTO_DTLS_1_2); prepare_sock_dtls_v6(MY_IPV6_ADDR, ANY_PORT, &s_sock, - (struct sockaddr_in6 *)&s_saddr, - IPPROTO_DTLS_1_2); + (struct net_sockaddr_in6 *)&s_saddr, + NET_IPPROTO_DTLS_1_2); } else { prepare_sock_dtls_v4(MY_IPV4_ADDR, ANY_PORT, &c_sock, - (struct sockaddr_in *)&c_saddr, - IPPROTO_DTLS_1_2); + (struct net_sockaddr_in *)&c_saddr, + NET_IPPROTO_DTLS_1_2); prepare_sock_dtls_v4(MY_IPV4_ADDR, ANY_PORT, &s_sock, - (struct sockaddr_in *)&s_saddr, - IPPROTO_DTLS_1_2); + (struct net_sockaddr_in *)&s_saddr, + NET_IPPROTO_DTLS_1_2); } test_config_psk(s_sock, c_sock); - zassert_equal(zsock_setsockopt(s_sock, SOL_TLS, TLS_DTLS_ROLE, + zassert_equal(zsock_setsockopt(s_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_DTLS_ROLE, &role, sizeof(role)), 0, "setsockopt() failed"); @@ -419,7 +419,7 @@ ZTEST(net_socket_tls, test_v4_msg_waitall) .tv_usec = 500000, }; - test_prepare_tls_connection(AF_INET); + test_prepare_tls_connection(NET_AF_INET); /* Regular MSG_WAITALL - make sure recv returns only after * requested amount is received. @@ -440,7 +440,7 @@ ZTEST(net_socket_tls, test_v4_msg_waitall) /* MSG_WAITALL + SO_RCVTIMEO - make sure recv returns the amount of data * received so far */ - ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &timeo_optval, + ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &timeo_optval, sizeof(timeo_optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -475,7 +475,7 @@ ZTEST(net_socket_tls, test_v6_msg_waitall) .tv_usec = 500000, }; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); /* Regular MSG_WAITALL - make sure recv returns only after * requested amount is received. @@ -496,7 +496,7 @@ ZTEST(net_socket_tls, test_v6_msg_waitall) /* MSG_WAITALL + SO_RCVTIMEO - make sure recv returns the amount of data * received so far */ - ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &timeo_optval, + ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &timeo_optval, sizeof(timeo_optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -535,7 +535,7 @@ static void send_work_handler(struct k_work *work) test_send(test_data->sock, test_data->data, test_data->datalen, 0); } -void test_msg_trunc(sa_family_t family) +void test_msg_trunc(net_sa_family_t family) { int rv; uint8_t rx_buf[sizeof(TEST_STR_SMALL) - 1]; @@ -575,18 +575,18 @@ void test_msg_trunc(sa_family_t family) ZTEST(net_socket_tls, test_v4_msg_trunc) { - test_msg_trunc(AF_INET); + test_msg_trunc(NET_AF_INET); } ZTEST(net_socket_tls, test_v6_msg_trunc) { - test_msg_trunc(AF_INET6); + test_msg_trunc(NET_AF_INET6); } struct test_sendmsg_data { struct k_work_delayable tx_work; int sock; - const struct msghdr *msg; + const struct net_msghdr *msg; }; static void test_sendmsg_tx_work_handler(struct k_work *work) @@ -598,11 +598,11 @@ static void test_sendmsg_tx_work_handler(struct k_work *work) test_sendmsg(test_data->sock, test_data->msg, 0); } -static void test_dtls_sendmsg_no_buf(sa_family_t family) +static void test_dtls_sendmsg_no_buf(net_sa_family_t family) { int rv; uint8_t rx_buf[sizeof(TEST_STR_SMALL) - 1]; - struct iovec iov[3] = { + struct net_iovec iov[3] = { {}, { .iov_base = TEST_STR_SMALL, @@ -610,7 +610,7 @@ static void test_dtls_sendmsg_no_buf(sa_family_t family) }, {}, }; - struct msghdr msg = {}; + struct net_msghdr msg = {}; struct test_sendmsg_data test_data = { .msg = &msg, }; @@ -669,7 +669,7 @@ ZTEST(net_socket_tls, test_v4_dtls_sendmsg_no_buf) ztest_test_skip(); } - test_dtls_sendmsg_no_buf(AF_INET); + test_dtls_sendmsg_no_buf(NET_AF_INET); } ZTEST(net_socket_tls, test_v6_dtls_sendmsg_no_buf) @@ -678,16 +678,16 @@ ZTEST(net_socket_tls, test_v6_dtls_sendmsg_no_buf) ztest_test_skip(); } - test_dtls_sendmsg_no_buf(AF_INET6); + test_dtls_sendmsg_no_buf(NET_AF_INET6); } -static void test_dtls_sendmsg(sa_family_t family) +static void test_dtls_sendmsg(net_sa_family_t family) { int rv; uint8_t buf[128 + 1] = { 0 }; uint8_t dummy_byte = 0; static const char expected_str[] = "testtest"; - struct iovec iov[3] = { + struct net_iovec iov[3] = { { .iov_base = TEST_STR_SMALL, .iov_len = sizeof(TEST_STR_SMALL) - 1, @@ -698,7 +698,7 @@ static void test_dtls_sendmsg(sa_family_t family) }, {}, }; - struct msghdr msg = {}; + struct net_msghdr msg = {}; struct test_sendmsg_data test_data = { .msg = &msg, }; @@ -789,7 +789,7 @@ ZTEST(net_socket_tls, test_v4_dtls_sendmsg) ztest_test_skip(); } - test_dtls_sendmsg(AF_INET); + test_dtls_sendmsg(NET_AF_INET); } ZTEST(net_socket_tls, test_v6_dtls_sendmsg) @@ -798,7 +798,7 @@ ZTEST(net_socket_tls, test_v6_dtls_sendmsg) ztest_test_skip(); } - test_dtls_sendmsg(AF_INET6); + test_dtls_sendmsg(NET_AF_INET6); } struct close_data { @@ -817,16 +817,16 @@ static void close_work(struct k_work *work) ZTEST(net_socket_tls, test_close_while_accept) { - struct sockaddr_in6 s_saddr; - struct sockaddr addr; - socklen_t addrlen = sizeof(addr); + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr addr; + net_socklen_t addrlen = sizeof(addr); struct close_data close_work_data; - prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &s_sock, &s_saddr, IPPROTO_TLS_1_2); + prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &s_sock, &s_saddr, NET_IPPROTO_TLS_1_2); test_config_psk(s_sock, -1); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); /* Schedule close() from workqueue */ @@ -851,7 +851,7 @@ ZTEST(net_socket_tls, test_close_while_recv) struct close_data close_work_data; uint8_t rx_buf; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); /* Schedule close() from workqueue */ k_work_init_delayable(&close_work_data.work, close_work); @@ -871,22 +871,22 @@ ZTEST(net_socket_tls, test_close_while_recv) ZTEST(net_socket_tls, test_connect_timeout) { - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; int ret; prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr, - IPPROTO_TLS_1_2); + NET_IPPROTO_TLS_1_2); test_config_psk(-1, c_sock); - s_saddr.sin6_family = AF_INET6; - s_saddr.sin6_port = htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET6, MY_IPV6_ADDR, &s_saddr.sin6_addr); + s_saddr.sin6_family = NET_AF_INET6; + s_saddr.sin6_port = net_htons(SERVER_PORT); + ret = zsock_inet_pton(NET_AF_INET6, MY_IPV6_ADDR, &s_saddr.sin6_addr); zassert_equal(ret, 1, "inet_pton failed"); loopback_set_packet_drop_ratio(1.0f); - zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + zassert_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), -1, "connect succeed"); zassert_equal(errno, ETIMEDOUT, @@ -900,20 +900,20 @@ ZTEST(net_socket_tls, test_connect_timeout) ZTEST(net_socket_tls, test_connect_closed_port) { - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; int ret; prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr, - IPPROTO_TLS_1_2); + NET_IPPROTO_TLS_1_2); test_config_psk(-1, c_sock); - s_saddr.sin6_family = AF_INET6; - s_saddr.sin6_port = htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET6, MY_IPV6_ADDR, &s_saddr.sin6_addr); + s_saddr.sin6_family = NET_AF_INET6; + s_saddr.sin6_port = net_htons(SERVER_PORT); + ret = zsock_inet_pton(NET_AF_INET6, MY_IPV6_ADDR, &s_saddr.sin6_addr); zassert_equal(ret, 1, "inet_pton failed"); - zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + zassert_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), -1, "connect succeed"); zassert_equal(errno, ECONNREFUSED, @@ -963,19 +963,19 @@ static void fake_tcp_server_work(struct k_work *work) } static void test_prepare_fake_tcp_server(struct fake_tcp_server_data *s_data, - sa_family_t family, int *s_sock, - struct sockaddr *s_saddr, bool reply) + net_sa_family_t family, int *s_sock, + struct net_sockaddr *s_saddr, bool reply) { - socklen_t exp_addrlen = family == AF_INET6 ? - sizeof(struct sockaddr_in6) : - sizeof(struct sockaddr_in); + net_socklen_t exp_addrlen = family == NET_AF_INET6 ? + sizeof(struct net_sockaddr_in6) : + sizeof(struct net_sockaddr_in); - if (family == AF_INET6) { + if (family == NET_AF_INET6) { prepare_sock_tcp_v6(MY_IPV6_ADDR, SERVER_PORT, s_sock, - (struct sockaddr_in6 *)s_saddr); + (struct net_sockaddr_in6 *)s_saddr); } else { prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, s_sock, - (struct sockaddr_in *)s_saddr); + (struct net_sockaddr_in *)s_saddr); } test_bind(*s_sock, s_saddr, exp_addrlen); @@ -990,16 +990,16 @@ static void test_prepare_fake_tcp_server(struct fake_tcp_server_data *s_data, ZTEST(net_socket_tls, test_connect_invalid_handshake_data) { struct fake_tcp_server_data server_data; - struct sockaddr_in6 c_saddr; - struct sockaddr_in6 s_saddr; + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr, - IPPROTO_TLS_1_2); + NET_IPPROTO_TLS_1_2); test_config_psk(-1, c_sock); - test_prepare_fake_tcp_server(&server_data, AF_INET6, &s_sock, - (struct sockaddr *)&s_saddr, true); + test_prepare_fake_tcp_server(&server_data, NET_AF_INET6, &s_sock, + (struct net_sockaddr *)&s_saddr, true); - zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + zassert_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), -1, "connect succeed"); zassert_equal(errno, ECONNABORTED, @@ -1017,16 +1017,16 @@ ZTEST(net_socket_tls, test_connect_invalid_handshake_data) ZTEST(net_socket_tls, test_connect_no_handshake_data) { struct fake_tcp_server_data server_data; - struct sockaddr_in6 c_saddr; - struct sockaddr s_saddr; + struct net_sockaddr_in6 c_saddr; + struct net_sockaddr s_saddr; prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr, - IPPROTO_TLS_1_2); + NET_IPPROTO_TLS_1_2); test_config_psk(-1, c_sock); - test_prepare_fake_tcp_server(&server_data, AF_INET6, &s_sock, - (struct sockaddr *)&s_saddr, false); + test_prepare_fake_tcp_server(&server_data, NET_AF_INET6, &s_sock, + (struct net_sockaddr *)&s_saddr, false); - zassert_equal(zsock_connect(c_sock, (struct sockaddr *)&s_saddr, + zassert_equal(zsock_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)), -1, "connect succeed"); zassert_equal(errno, ECONNABORTED, @@ -1041,14 +1041,14 @@ ZTEST(net_socket_tls, test_connect_no_handshake_data) ZTEST(net_socket_tls, test_accept_non_block) { uint32_t timestamp; - struct sockaddr_in6 s_saddr; + struct net_sockaddr_in6 s_saddr; prepare_sock_tls_v6(MY_IPV6_ADDR, SERVER_PORT, &s_sock, &s_saddr, - IPPROTO_TLS_1_2); + NET_IPPROTO_TLS_1_2); test_config_psk(s_sock, -1); test_fcntl(s_sock, F_SETFL, O_NONBLOCK); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); timestamp = k_uptime_get_32(); @@ -1063,19 +1063,19 @@ ZTEST(net_socket_tls, test_accept_non_block) ZTEST(net_socket_tls, test_accept_invalid_handshake_data) { - struct sockaddr_in6 s_saddr; - struct sockaddr_in6 c_saddr; + struct net_sockaddr_in6 s_saddr; + struct net_sockaddr_in6 c_saddr; prepare_sock_tls_v6(MY_IPV6_ADDR, ANY_PORT, &s_sock, &s_saddr, - IPPROTO_TLS_1_2); + NET_IPPROTO_TLS_1_2); prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &c_sock, &c_saddr); test_config_psk(s_sock, -1); - test_bind(s_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_bind(s_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_listen(s_sock); /* Connect at TCP level and send some unexpected data. */ - test_connect(c_sock, (struct sockaddr *)&s_saddr, sizeof(s_saddr)); + test_connect(c_sock, (struct net_sockaddr *)&s_saddr, sizeof(s_saddr)); test_send(c_sock, TEST_STR_SMALL, sizeof(TEST_STR_SMALL), 0); new_sock = zsock_accept(s_sock, NULL, NULL); @@ -1091,7 +1091,7 @@ ZTEST(net_socket_tls, test_recv_non_block) int ret; uint8_t rx_buf[sizeof(TEST_STR_SMALL) - 1] = { 0 }; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); /* Verify ZSOCK_MSG_DONTWAIT flag first */ ret = zsock_recv(new_sock, rx_buf, sizeof(rx_buf), ZSOCK_MSG_DONTWAIT); @@ -1134,7 +1134,7 @@ ZTEST(net_socket_tls, test_recv_block) .datalen = sizeof(TEST_STR_SMALL) - 1 }; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); test_data.sock = c_sock; k_work_init_delayable(&test_data.tx_work, send_work_handler); @@ -1152,7 +1152,7 @@ ZTEST(net_socket_tls, test_recv_block) ZTEST(net_socket_tls, test_recv_eof_on_close) { - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); test_close(c_sock); c_sock = -1; @@ -1173,10 +1173,10 @@ ZTEST(net_socket_tls, test_send_non_block) uint8_t rx_buf[sizeof(TEST_STR_SMALL) - 1] = { 0 }; int buf_optval = TLS_RECORD_OVERHEAD + sizeof(TEST_STR_SMALL) - 1; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); /* Simulate window full scenario with SO_RCVBUF option. */ - ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval, + ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &buf_optval, sizeof(buf_optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -1266,10 +1266,10 @@ ZTEST(net_socket_tls, test_send_block) .datalen = sizeof(TEST_STR_SMALL) - 1 }; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); /* Simulate window full scenario with SO_RCVBUF option. */ - ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval, + ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &buf_optval, sizeof(buf_optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -1310,7 +1310,7 @@ ZTEST(net_socket_tls, test_send_on_close) uint8_t rx_buf[sizeof(TEST_STR_SMALL) - 1] = { 0 }; int ret; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); test_close(new_sock); new_sock = -1; @@ -1332,7 +1332,7 @@ ZTEST(net_socket_tls, test_send_on_close) /* And in reverse order */ - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); test_close(new_sock); new_sock = -1; @@ -1368,9 +1368,9 @@ ZTEST(net_socket_tls, test_so_rcvtimeo) }; int ret; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); - ret = zsock_setsockopt(c_sock, SOL_SOCKET, SO_RCVTIMEO, &optval, + ret = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -1411,14 +1411,14 @@ ZTEST(net_socket_tls, test_so_sndtimeo) }; int ret; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); - ret = zsock_setsockopt(c_sock, SOL_SOCKET, SO_SNDTIMEO, &timeo_optval, + ret = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDTIMEO, &timeo_optval, sizeof(timeo_optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); /* Simulate window full scenario with SO_RCVBUF option. */ - ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval, + ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &buf_optval, sizeof(buf_optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -1453,7 +1453,7 @@ ZTEST(net_socket_tls, test_so_sndtimeo) ZTEST(net_socket_tls, test_shutdown_rd_synchronous) { - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); /* Shutdown reception */ test_shutdown(c_sock, ZSOCK_SHUT_RD); @@ -1487,7 +1487,7 @@ ZTEST(net_socket_tls, test_shutdown_rd_while_recv) .how = ZSOCK_SHUT_RD, }; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); /* Schedule reception shutdown from workqueue */ k_work_init_delayable(&test_data.work, shutdown_work); @@ -1515,7 +1515,7 @@ ZTEST(net_socket_tls, test_send_while_recv) }; int ret; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); test_data_c.sock = c_sock; k_work_init_delayable(&test_data_c.tx_work, send_work_handler); @@ -1548,7 +1548,7 @@ ZTEST(net_socket_tls, test_poll_tls_pollin) int ret; struct zsock_pollfd fds[1]; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); fds[0].fd = new_sock; fds[0].events = ZSOCK_POLLIN; @@ -1583,7 +1583,7 @@ ZTEST(net_socket_tls, test_poll_dtls_pollin) int ret; struct zsock_pollfd fds[1]; - test_prepare_dtls_connection(AF_INET6); + test_prepare_dtls_connection(NET_AF_INET6); fds[0].fd = s_sock; fds[0].events = ZSOCK_POLLIN; @@ -1617,7 +1617,7 @@ ZTEST(net_socket_tls, test_poll_tls_pollout) int ret; struct zsock_pollfd fds[1]; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); fds[0].fd = c_sock; fds[0].events = ZSOCK_POLLOUT; @@ -1627,7 +1627,7 @@ ZTEST(net_socket_tls, test_poll_tls_pollout) zassert_equal(fds[0].revents, ZSOCK_POLLOUT, "No POLLOUT event"); /* Simulate window full scenario with SO_RCVBUF option. */ - ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval, + ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &buf_optval, sizeof(buf_optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); @@ -1663,7 +1663,7 @@ ZTEST(net_socket_tls, test_poll_dtls_pollout) struct zsock_pollfd fds[1]; int ret; - test_prepare_dtls_connection(AF_INET6); + test_prepare_dtls_connection(NET_AF_INET6); fds[0].fd = c_sock; fds[0].events = ZSOCK_POLLOUT; @@ -1685,7 +1685,7 @@ ZTEST(net_socket_tls, test_poll_tls_pollhup) uint8_t rx_buf; int ret; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); fds[0].fd = new_sock; fds[0].events = ZSOCK_POLLIN; @@ -1713,7 +1713,7 @@ ZTEST(net_socket_tls, test_poll_dtls_pollhup) uint8_t rx_buf; int ret; - test_prepare_dtls_connection(AF_INET6); + test_prepare_dtls_connection(NET_AF_INET6); fds[0].fd = s_sock; fds[0].events = ZSOCK_POLLIN; @@ -1744,10 +1744,10 @@ ZTEST(net_socket_tls, test_poll_tls_pollerr) int ret; struct zsock_pollfd fds[1]; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); mbedtls_ssl_context *ssl_ctx; - test_prepare_tls_connection(AF_INET6); + test_prepare_tls_connection(NET_AF_INET6); fds[0].fd = new_sock; fds[0].events = ZSOCK_POLLIN; @@ -1761,7 +1761,7 @@ ZTEST(net_socket_tls, test_poll_tls_pollerr) zassert_equal(ret, 1, "poll() should've report event"); zassert_true(fds[0].revents & ZSOCK_POLLERR, "No POLLERR event"); - ret = zsock_getsockopt(new_sock, SOL_SOCKET, SO_ERROR, &optval, &optlen); + ret = zsock_getsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_ERROR, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, ECONNABORTED, "getsockopt got invalid error %d", optval); @@ -1781,10 +1781,10 @@ ZTEST(net_socket_tls, test_poll_dtls_pollerr) int ret; struct zsock_pollfd fds[1]; int optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); mbedtls_ssl_context *ssl_ctx; - test_prepare_dtls_connection(AF_INET6); + test_prepare_dtls_connection(NET_AF_INET6); fds[0].fd = s_sock; fds[0].events = ZSOCK_POLLIN; @@ -1798,7 +1798,7 @@ ZTEST(net_socket_tls, test_poll_dtls_pollerr) zassert_equal(ret, 1, "poll() should've report event"); zassert_true(fds[0].revents & ZSOCK_POLLERR, "No POLLERR event"); - ret = zsock_getsockopt(s_sock, SOL_SOCKET, SO_ERROR, &optval, &optlen); + ret = zsock_getsockopt(s_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_ERROR, &optval, &optlen); zassert_equal(ret, 0, "getsockopt failed (%d)", errno); zassert_equal(optval, ECONNABORTED, "getsockopt got invalid error %d", optval); @@ -1861,9 +1861,9 @@ static void test_bad_cred_common(bool test_dtls) sizeof(bad_psk)), "Failed to add psk"); if (test_dtls) { - s_sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_DTLS_1_2); + s_sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_DTLS_1_2); } else { - s_sock = zsock_socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2); + s_sock = zsock_socket(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TLS_1_2); } zassert_true(s_sock >= 0, "socket open failed"); @@ -1872,7 +1872,7 @@ static void test_bad_cred_common(bool test_dtls) sec_tag_t test_tag = bad_tags[i]; int ret; - ret = zsock_setsockopt(s_sock, SOL_TLS, TLS_SEC_TAG_LIST, + ret = zsock_setsockopt(s_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_SEC_TAG_LIST, &test_tag, sizeof(test_tag)); zassert_equal(ret, -1, "zsock_setsockopt should've failed with invalid credential"); if (test_tag == BAD_NO_CRED_TAG) { diff --git a/tests/net/socket/tls_configurations/src/main.c b/tests/net/socket/tls_configurations/src/main.c index 2f41570ea439b..33cc63de932e5 100644 --- a/tests/net/socket/tls_configurations/src/main.c +++ b/tests/net/socket/tls_configurations/src/main.c @@ -10,6 +10,12 @@ LOG_MODULE_REGISTER(tls_configuration_sample, LOG_LEVEL_INF); #include #include +#include +#include +#include +#include +#include + #include #include #include @@ -81,16 +87,16 @@ static int wait_for_event(void) static int create_socket(void) { int ret = 0; - struct sockaddr_in addr; + struct net_sockaddr_in addr; - addr.sin_family = AF_INET; - addr.sin_port = htons(CONFIG_SERVER_PORT); - inet_pton(AF_INET, "127.0.0.1", &addr.sin_addr); + addr.sin_family = NET_AF_INET; + addr.sin_port = net_htons(CONFIG_SERVER_PORT); + inet_pton(NET_AF_INET, "127.0.0.1", &addr.sin_addr); #if defined(CONFIG_MBEDTLS_SSL_PROTO_TLS1_3) - socket_fd = socket(addr.sin_family, SOCK_STREAM, IPPROTO_TLS_1_3); + socket_fd = socket(addr.sin_family, NET_SOCK_STREAM, IPPROTO_TLS_1_3); #else - socket_fd = socket(addr.sin_family, SOCK_STREAM, IPPROTO_TLS_1_2); + socket_fd = socket(addr.sin_family, NET_SOCK_STREAM, IPPROTO_TLS_1_2); #endif if (socket_fd < 0) { LOG_ERR("Failed to create TLS socket (%d)", errno); @@ -123,7 +129,7 @@ static int create_socket(void) } #endif - ret = connect(socket_fd, (struct sockaddr *) &addr, sizeof(addr)); + ret = connect(socket_fd, (struct net_sockaddr *) &addr, sizeof(addr)); if (ret < 0) { LOG_ERR("Cannot connect to TCP remote (%d)", errno); return -errno; @@ -145,7 +151,7 @@ void close_socket(void) static int setup_credentials(void) { - int err; + __maybe_unused int err; #if defined(USE_CERTIFICATE) err = tls_credential_add(CA_CERTIFICATE_TAG, diff --git a/tests/net/socket/tls_ext/src/main.c b/tests/net/socket/tls_ext/src/main.c index ffc4c5630fd0e..8da57beaab850 100644 --- a/tests/net/socket/tls_ext/src/main.c +++ b/tests/net/socket/tls_ext/src/main.c @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include #include @@ -155,9 +157,9 @@ static void server_thread_fn(void *arg0, void *arg1, void *arg2) int r; int client_fd; - socklen_t addrlen; + net_socklen_t addrlen; char addrstr[INET_ADDRSTRLEN]; - struct sockaddr_in sa; + struct net_sockaddr_in sa; char *addrstrp; k_thread_name_set(k_current_get(), "server"); @@ -169,7 +171,7 @@ static void server_thread_fn(void *arg0, void *arg1, void *arg2) NET_DBG("Accepting client connection.."); k_sem_give(&server_sem); - r = accept(server_fd, (struct sockaddr *)&sa, &addrlen); + r = accept(server_fd, (struct net_sockaddr *)&sa, &addrlen); if (expect_failure) { zassert_equal(r, -1, "accept() should've failed"); return; @@ -183,7 +185,7 @@ static void server_thread_fn(void *arg0, void *arg1, void *arg2) zassert_not_equal(addrstrp, NULL, "inet_ntop() failed (%d)", errno); NET_DBG("accepted connection from [%s]:%d as fd %d", - addrstr, ntohs(sa.sin_port), client_fd); + addrstr, net_ntohs(sa.sin_port), client_fd); if (echo) { NET_DBG("calling recv()"); @@ -219,7 +221,7 @@ static int test_configure_server(k_tid_t *server_thread_id, int peer_verify, char addrstr[INET_ADDRSTRLEN]; const sec_tag_t *sec_tag_list; size_t sec_tag_list_size; - struct sockaddr_in sa; + struct net_sockaddr_in sa; const int yes = true; char *addrstrp; int server_fd; @@ -266,11 +268,11 @@ static int test_configure_server(k_tid_t *server_thread_id, int peer_verify, memset(&sa, 0, sizeof(sa)); /* The server listens on all network interfaces */ - sa.sin_addr.s_addr = INADDR_ANY; + sa.sin_addr.s_addr = NET_INADDR_ANY; sa.sin_family = AF_INET; - sa.sin_port = htons(PORT); + sa.sin_port = net_htons(PORT); - r = bind(server_fd, (struct sockaddr *)&sa, sizeof(sa)); + r = bind(server_fd, (struct net_sockaddr *)&sa, sizeof(sa)); zassert_not_equal(r, -1, "failed to bind (%d)", errno); r = listen(server_fd, 1); @@ -282,7 +284,7 @@ static int test_configure_server(k_tid_t *server_thread_id, int peer_verify, zassert_not_equal(addrstrp, NULL, "inet_ntop() failed (%d)", errno); NET_DBG("listening on [%s]:%d as fd %d", - addrstr, ntohs(sa.sin_port), server_fd); + addrstr, net_ntohs(sa.sin_port), server_fd); NET_DBG("Creating server thread"); *server_thread_id = k_thread_create(&server_thread, server_stack, @@ -298,7 +300,7 @@ static int test_configure_server(k_tid_t *server_thread_id, int peer_verify, return server_fd; } -static int test_configure_client(struct sockaddr_in *sa, bool own_cert, +static int test_configure_client(struct net_sockaddr_in *sa, bool own_cert, const char *hostname) { static const sec_tag_t client_tag_list_verify_none[] = { @@ -341,7 +343,7 @@ static int test_configure_client(struct sockaddr_in *sa, bool own_cert, zassert_not_equal(r, -1, "failed to set TLS_HOSTNAME (%d)", errno); sa->sin_family = AF_INET; - sa->sin_port = htons(PORT); + sa->sin_port = net_htons(PORT); r = inet_pton(AF_INET, MY_IPV4_ADDR, &sa->sin_addr.s_addr); zassert_not_equal(-1, r, "inet_pton() failed (%d)", errno); zassert_not_equal(0, r, "%s is not a valid IPv4 address", MY_IPV4_ADDR); @@ -353,7 +355,7 @@ static int test_configure_client(struct sockaddr_in *sa, bool own_cert, zassert_not_equal(addrstrp, NULL, "inet_ntop() failed (%d)", errno); NET_DBG("connecting to [%s]:%d with fd %d", - addrstr, ntohs(sa->sin_port), client_fd); + addrstr, net_ntohs(sa->sin_port), client_fd); return client_fd; } @@ -378,7 +380,7 @@ static void test_shutdown(int client_fd, int server_fd, k_tid_t server_thread_id static void test_common(int peer_verify) { k_tid_t server_thread_id; - struct sockaddr_in sa; + struct net_sockaddr_in sa; uint8_t rx_buf[16]; int server_fd; int client_fd; @@ -400,7 +402,7 @@ static void test_common(int peer_verify) * The main part of the test */ - r = connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)); + r = connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)); zassert_not_equal(r, -1, "failed to connect (%d)", errno); NET_DBG("Calling send()"); @@ -441,9 +443,9 @@ static void test_tls_cert_verify_result_opt_common(uint32_t expect) { int server_fd, client_fd, ret; k_tid_t server_thread_id; - struct sockaddr_in sa; + struct net_sockaddr_in sa; uint32_t optval; - socklen_t optlen = sizeof(optval); + net_socklen_t optlen = sizeof(optval); const char *hostname = "localhost"; int peer_verify = TLS_PEER_VERIFY_OPTIONAL; @@ -459,7 +461,7 @@ static void test_tls_cert_verify_result_opt_common(uint32_t expect) &peer_verify, sizeof(peer_verify)); zassert_ok(ret, "failed to set TLS_PEER_VERIFY (%d)", errno); - ret = zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)); + ret = zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)); zassert_not_equal(ret, -1, "failed to connect (%d)", errno); ret = zsock_getsockopt(client_fd, SOL_TLS, TLS_CERT_VERIFY_RESULT, @@ -506,7 +508,7 @@ static void test_tls_cert_verify_cb_opt_common(int result) { int server_fd, client_fd, ret; k_tid_t server_thread_id; - struct sockaddr_in sa; + struct net_sockaddr_in sa; struct test_cert_verify_ctx ctx = { .cb_called = false, .result = result, @@ -524,7 +526,7 @@ static void test_tls_cert_verify_cb_opt_common(int result) &cb, sizeof(cb)); zassert_ok(ret, "failed to set TLS_CERT_VERIFY_CALLBACK (%d)", errno); - ret = zsock_connect(client_fd, (struct sockaddr *)&sa, sizeof(sa)); + ret = zsock_connect(client_fd, (struct net_sockaddr *)&sa, sizeof(sa)); zassert_true(ctx.cb_called, "callback not called"); if (result == 0) { zassert_equal(ret, 0, "failed to connect (%d)", errno); diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c index 44138ae1990c9..1d60f455f68e5 100644 --- a/tests/net/socket/udp/src/main.c +++ b/tests/net/socket/udp/src/main.c @@ -60,19 +60,19 @@ static ZTEST_BMEM char rx_buf[NET_ETH_MTU + 1]; /* Common routine to communicate packets over pair of sockets. */ static void comm_sendto_recvfrom(int client_sock, - struct sockaddr *client_addr, - socklen_t client_addrlen, + struct net_sockaddr *client_addr, + net_socklen_t client_addrlen, int server_sock, - struct sockaddr *server_addr, - socklen_t server_addrlen) + struct net_sockaddr *server_addr, + net_socklen_t server_addrlen) { int avail; ssize_t sent = 0; ssize_t recved = 0; - struct sockaddr addr; - socklen_t addrlen; - struct sockaddr addr2; - socklen_t addrlen2; + struct net_sockaddr addr; + net_socklen_t addrlen; + struct net_sockaddr addr2; + net_socklen_t addrlen2; zassert_not_null(client_addr, "null client addr"); zassert_not_null(server_addr, "null server addr"); @@ -174,22 +174,22 @@ ZTEST(net_socket_udp, test_v4_sendto_recvfrom) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "bind failed"); comm_sendto_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -203,21 +203,21 @@ ZTEST(net_socket_udp, test_v6_sendto_recvfrom) int rv; int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; prepare_sock_udp_v6(MY_IPV6_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, sizeof(server_addr)); + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "bind failed"); comm_sendto_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -231,25 +231,25 @@ ZTEST(net_socket_udp, test_v4_bind_sendto) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; prepare_sock_udp_v4(MY_IPV4_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "bind failed"); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, sizeof(server_addr)); + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "bind failed"); comm_sendto_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -263,25 +263,25 @@ ZTEST(net_socket_udp, test_v6_bind_sendto) int rv; int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; prepare_sock_udp_v6(MY_IPV6_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "bind failed"); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, sizeof(server_addr)); + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "bind failed"); comm_sendto_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -293,17 +293,17 @@ ZTEST(net_socket_udp, test_v6_bind_sendto) ZTEST(net_socket_udp, test_send_recv_2_sock) { int sock1, sock2; - struct sockaddr_in bind_addr, conn_addr; + struct net_sockaddr_in bind_addr, conn_addr; char buf[10]; int len, rv; prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock1, &bind_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock2, &conn_addr); - rv = zsock_bind(sock1, (struct sockaddr *)&bind_addr, sizeof(bind_addr)); + rv = zsock_bind(sock1, (struct net_sockaddr *)&bind_addr, sizeof(bind_addr)); zassert_equal(rv, 0, "bind failed"); - rv = zsock_connect(sock2, (struct sockaddr *)&conn_addr, sizeof(conn_addr)); + rv = zsock_connect(sock2, (struct net_sockaddr *)&conn_addr, sizeof(conn_addr)); zassert_equal(rv, 0, "connect failed"); len = zsock_send(sock2, TEST_STR_SMALL, sizeof(TEST_STR_SMALL) - 1, 0); @@ -327,27 +327,27 @@ ZTEST(net_socket_udp, test_send_recv_2_sock) ZTEST(net_socket_udp, test_so_priority) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; uint8_t optval; prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock1, &bind_addr4); prepare_sock_udp_v6(MY_IPV6_ADDR, 55555, &sock2, &bind_addr6); - rv = zsock_bind(sock1, (struct sockaddr *)&bind_addr4, sizeof(bind_addr4)); + rv = zsock_bind(sock1, (struct net_sockaddr *)&bind_addr4, sizeof(bind_addr4)); zassert_equal(rv, 0, "bind failed"); - rv = zsock_bind(sock2, (struct sockaddr *)&bind_addr6, sizeof(bind_addr6)); + rv = zsock_bind(sock2, (struct net_sockaddr *)&bind_addr6, sizeof(bind_addr6)); zassert_equal(rv, 0, "bind failed"); optval = 2; - rv = zsock_setsockopt(sock1, SOL_SOCKET, SO_PRIORITY, &optval, + rv = zsock_setsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_PRIORITY, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed (%d)", errno); optval = 6; - rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_PRIORITY, &optval, + rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_PRIORITY, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed"); @@ -358,17 +358,17 @@ ZTEST(net_socket_udp, test_so_priority) } static void comm_sendmsg_recvfrom(int client_sock, - struct sockaddr *client_addr, - socklen_t client_addrlen, - const struct msghdr *client_msg, + struct net_sockaddr *client_addr, + net_socklen_t client_addrlen, + const struct net_msghdr *client_msg, int server_sock, - struct sockaddr *server_addr, - socklen_t server_addrlen) + struct net_sockaddr *server_addr, + net_socklen_t server_addrlen) { ssize_t sent; ssize_t recved; - struct sockaddr addr; - socklen_t addrlen; + struct net_sockaddr addr; + net_socklen_t addrlen; int len, i; zassert_not_null(client_addr, "null client addr"); @@ -426,26 +426,26 @@ ZTEST_USER(net_socket_udp, test_v4_sendmsg_recvfrom) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; - struct msghdr msg; - struct cmsghdr *cmsg; - struct iovec io_vector[1]; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; + struct net_msghdr msg; + struct net_cmsghdr *cmsg; + struct net_iovec io_vector[1]; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(int))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(int))]; } cmsgbuf; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "server bind failed"); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); @@ -460,18 +460,18 @@ ZTEST_USER(net_socket_udp, test_v4_sendmsg_recvfrom) msg.msg_name = &server_addr; msg.msg_namelen = sizeof(server_addr); - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - cmsg->cmsg_level = SOL_SOCKET; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(int)); + cmsg->cmsg_level = ZSOCK_SOL_SOCKET; cmsg->cmsg_type = 1122; - *(int *)CMSG_DATA(cmsg) = 42; + *(int *)NET_CMSG_DATA(cmsg) = 42; comm_sendmsg_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg, server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -485,21 +485,21 @@ ZTEST_USER(net_socket_udp, test_v4_sendmsg_recvfrom_no_aux_data) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; - struct msghdr msg; - struct iovec io_vector[1]; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; + struct net_msghdr msg; + struct net_iovec io_vector[1]; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "server bind failed"); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); @@ -513,11 +513,11 @@ ZTEST_USER(net_socket_udp, test_v4_sendmsg_recvfrom_no_aux_data) msg.msg_namelen = sizeof(server_addr); comm_sendmsg_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg, server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -531,25 +531,25 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_recvfrom) int rv; int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; - struct msghdr msg; - struct cmsghdr *cmsg; - struct iovec io_vector[1]; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; + struct net_msghdr msg; + struct net_cmsghdr *cmsg; + struct net_iovec io_vector[1]; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(int))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(int))]; } cmsgbuf; prepare_sock_udp_v6(MY_IPV6_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, sizeof(server_addr)); + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "server bind failed"); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); @@ -564,18 +564,18 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_recvfrom) msg.msg_name = &server_addr; msg.msg_namelen = sizeof(server_addr); - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - cmsg->cmsg_level = SOL_SOCKET; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(int)); + cmsg->cmsg_level = ZSOCK_SOL_SOCKET; cmsg->cmsg_type = 1122; - *(int *)CMSG_DATA(cmsg) = 42; + *(int *)NET_CMSG_DATA(cmsg) = 42; comm_sendmsg_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg, server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -589,30 +589,30 @@ ZTEST_USER(net_socket_udp, test_v4_sendmsg_recvfrom_connected) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; - struct msghdr msg; - struct cmsghdr *cmsg; - struct iovec io_vector[1]; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; + struct net_msghdr msg; + struct net_cmsghdr *cmsg; + struct net_iovec io_vector[1]; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(int))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(int))]; } cmsgbuf; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "server bind failed"); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); - rv = zsock_connect(client_sock, (struct sockaddr *)&server_addr, + rv = zsock_connect(client_sock, (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "connect failed"); @@ -625,18 +625,18 @@ ZTEST_USER(net_socket_udp, test_v4_sendmsg_recvfrom_connected) msg.msg_iov = io_vector; msg.msg_iovlen = 1; - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - cmsg->cmsg_level = SOL_SOCKET; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(int)); + cmsg->cmsg_level = ZSOCK_SOL_SOCKET; cmsg->cmsg_type = 1122; - *(int *)CMSG_DATA(cmsg) = 42; + *(int *)NET_CMSG_DATA(cmsg) = 42; comm_sendmsg_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg, server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -650,29 +650,29 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_recvfrom_connected) int rv; int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; - struct msghdr msg; - struct cmsghdr *cmsg; - struct iovec io_vector[1]; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; + struct net_msghdr msg; + struct net_cmsghdr *cmsg; + struct net_iovec io_vector[1]; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(int))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(int))]; } cmsgbuf; prepare_sock_udp_v6(MY_IPV6_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, sizeof(server_addr)); + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "server bind failed"); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); - rv = zsock_connect(client_sock, (struct sockaddr *)&server_addr, + rv = zsock_connect(client_sock, (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "connect failed"); @@ -685,18 +685,18 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_recvfrom_connected) msg.msg_iov = io_vector; msg.msg_iovlen = 1; - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - cmsg->cmsg_level = SOL_SOCKET; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(int)); + cmsg->cmsg_level = ZSOCK_SOL_SOCKET; cmsg->cmsg_type = 1122; - *(int *)CMSG_DATA(cmsg) = 42; + *(int *)NET_CMSG_DATA(cmsg) = 42; comm_sendmsg_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg, server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); rv = zsock_close(client_sock); @@ -707,23 +707,23 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_recvfrom_connected) ZTEST(net_socket_udp, test_so_type) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int optval; - socklen_t optsize = sizeof(optval); + net_socklen_t optsize = sizeof(optval); prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock1, &bind_addr4); prepare_sock_udp_v6(MY_IPV6_ADDR, 55555, &sock2, &bind_addr6); - rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_TYPE, &optval, &optsize); + rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_TYPE, &optval, &optsize); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, SOCK_DGRAM, "getsockopt got invalid type"); + zassert_equal(optval, NET_SOCK_DGRAM, "getsockopt got invalid type"); zassert_equal(optsize, sizeof(optval), "getsockopt got invalid size"); - rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_TYPE, &optval, &optsize); + rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_TYPE, &optval, &optsize); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, SOCK_DGRAM, "getsockopt got invalid type"); + zassert_equal(optval, NET_SOCK_DGRAM, "getsockopt got invalid type"); zassert_equal(optsize, sizeof(optval), "getsockopt got invalid size"); rv = zsock_close(sock1); @@ -734,40 +734,40 @@ ZTEST(net_socket_udp, test_so_type) ZTEST(net_socket_udp, test_so_txtime) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; - socklen_t optlen; + net_socklen_t optlen; int optval; prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock1, &bind_addr4); prepare_sock_udp_v6(MY_IPV6_ADDR, 55555, &sock2, &bind_addr6); - rv = zsock_bind(sock1, (struct sockaddr *)&bind_addr4, sizeof(bind_addr4)); + rv = zsock_bind(sock1, (struct net_sockaddr *)&bind_addr4, sizeof(bind_addr4)); zassert_equal(rv, 0, "bind failed"); - rv = zsock_bind(sock2, (struct sockaddr *)&bind_addr6, sizeof(bind_addr6)); + rv = zsock_bind(sock2, (struct net_sockaddr *)&bind_addr6, sizeof(bind_addr6)); zassert_equal(rv, 0, "bind failed"); optval = true; - rv = zsock_setsockopt(sock1, SOL_SOCKET, SO_TXTIME, &optval, + rv = zsock_setsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_TXTIME, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed (%d)", errno); optval = false; - rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_TXTIME, &optval, + rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_TXTIME, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed"); optlen = sizeof(optval); - rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_TXTIME, &optval, &optlen); + rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_TXTIME, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); zassert_equal(optlen, sizeof(optval), "invalid optlen %d vs %d", optlen, sizeof(optval)); zassert_equal(optval, true, "getsockopt txtime"); optlen = sizeof(optval); - rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_TXTIME, &optval, &optlen); + rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_TXTIME, &optval, &optlen); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); zassert_equal(optlen, sizeof(optval), "invalid optlen %d vs %d", optlen, sizeof(optval)); @@ -781,12 +781,12 @@ ZTEST(net_socket_udp, test_so_txtime) ZTEST(net_socket_udp, test_so_rcvtimeo) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; ssize_t recved = 0; - struct sockaddr addr; - socklen_t addrlen; + struct net_sockaddr addr; + net_socklen_t addrlen; uint32_t start_time, time_diff; struct timeval optval = { @@ -797,18 +797,18 @@ ZTEST(net_socket_udp, test_so_rcvtimeo) prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock1, &bind_addr4); prepare_sock_udp_v6(MY_IPV6_ADDR, 55555, &sock2, &bind_addr6); - rv = zsock_bind(sock1, (struct sockaddr *)&bind_addr4, sizeof(bind_addr4)); + rv = zsock_bind(sock1, (struct net_sockaddr *)&bind_addr4, sizeof(bind_addr4)); zassert_equal(rv, 0, "bind failed"); - rv = zsock_bind(sock2, (struct sockaddr *)&bind_addr6, sizeof(bind_addr6)); + rv = zsock_bind(sock2, (struct net_sockaddr *)&bind_addr6, sizeof(bind_addr6)); zassert_equal(rv, 0, "bind failed"); - rv = zsock_setsockopt(sock1, SOL_SOCKET, SO_RCVTIMEO, &optval, + rv = zsock_setsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed (%d)", errno); optval.tv_usec = 400000; - rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, &optval, + rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed (%d)", errno); @@ -842,8 +842,8 @@ ZTEST(net_socket_udp, test_so_rcvtimeo) ZTEST(net_socket_udp, test_so_sndtimeo) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; struct timeval optval = { @@ -854,18 +854,18 @@ ZTEST(net_socket_udp, test_so_sndtimeo) prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock1, &bind_addr4); prepare_sock_udp_v6(MY_IPV6_ADDR, 55555, &sock2, &bind_addr6); - rv = zsock_bind(sock1, (struct sockaddr *)&bind_addr4, sizeof(bind_addr4)); + rv = zsock_bind(sock1, (struct net_sockaddr *)&bind_addr4, sizeof(bind_addr4)); zassert_equal(rv, 0, "bind failed"); - rv = zsock_bind(sock2, (struct sockaddr *)&bind_addr6, sizeof(bind_addr6)); + rv = zsock_bind(sock2, (struct net_sockaddr *)&bind_addr6, sizeof(bind_addr6)); zassert_equal(rv, 0, "bind failed"); - rv = zsock_setsockopt(sock1, SOL_SOCKET, SO_SNDTIMEO, &optval, + rv = zsock_setsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDTIMEO, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed (%d)", errno); optval.tv_usec = 0; - rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, &optval, + rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDTIMEO, &optval, sizeof(optval)); zassert_equal(rv, 0, "setsockopt failed"); @@ -877,23 +877,23 @@ ZTEST(net_socket_udp, test_so_sndtimeo) ZTEST(net_socket_udp, test_so_protocol) { - struct sockaddr_in bind_addr4; - struct sockaddr_in6 bind_addr6; + struct net_sockaddr_in bind_addr4; + struct net_sockaddr_in6 bind_addr6; int sock1, sock2, rv; int optval; - socklen_t optsize = sizeof(optval); + net_socklen_t optsize = sizeof(optval); prepare_sock_udp_v4(MY_IPV4_ADDR, 55555, &sock1, &bind_addr4); prepare_sock_udp_v6(MY_IPV6_ADDR, 55555, &sock2, &bind_addr6); - rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_PROTOCOL, &optval, &optsize); + rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_PROTOCOL, &optval, &optsize); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, IPPROTO_UDP, "getsockopt got invalid protocol"); + zassert_equal(optval, NET_IPPROTO_UDP, "getsockopt got invalid protocol"); zassert_equal(optsize, sizeof(optval), "getsockopt got invalid size"); - rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_PROTOCOL, &optval, &optsize); + rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_PROTOCOL, &optval, &optsize); zassert_equal(rv, 0, "getsockopt failed (%d)", errno); - zassert_equal(optval, IPPROTO_UDP, "getsockopt got invalid protocol"); + zassert_equal(optval, NET_IPPROTO_UDP, "getsockopt got invalid protocol"); zassert_equal(optsize, sizeof(optval), "getsockopt got invalid size"); rv = zsock_close(sock1); @@ -903,9 +903,9 @@ ZTEST(net_socket_udp, test_so_protocol) } static void comm_sendmsg_with_txtime(int client_sock, - struct sockaddr *client_addr, - socklen_t client_addrlen, - const struct msghdr *client_msg) + struct net_sockaddr *client_addr, + net_socklen_t client_addrlen, + const struct net_msghdr *client_msg) { ssize_t sent; int len, i; @@ -936,7 +936,7 @@ struct eth_fake_context { }; static struct eth_fake_context eth_fake_data; -static ZTEST_BMEM struct sockaddr_in6 udp_server_addr; +static ZTEST_BMEM struct net_sockaddr_in6 udp_server_addr; /* The semaphore is there to wait the data to be received. */ static ZTEST_BMEM struct sys_sem wait_data; @@ -945,14 +945,14 @@ static struct net_if *eth_iface; static struct net_if *lo0; static ZTEST_BMEM bool test_started; static ZTEST_BMEM bool test_failed; -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in_addr my_addr2 = { { { 192, 0, 2, 2 } } }; -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in_addr my_addr2 = { { { 192, 0, 2, 2 } } }; +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x3 } } }; -static struct in6_addr my_mcast_addr1 = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0, +static struct net_in6_addr my_mcast_addr1 = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in_addr my_mcast_addr2 = { { { 224, 0, 0, 2 } } }; +static struct net_in_addr my_mcast_addr2 = { { { 224, 0, 0, 2 } } }; static struct net_linkaddr server_link_addr = { .addr = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }, .len = NET_ETH_ADDR_LEN, @@ -1030,13 +1030,13 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_with_txtime) int client_sock; int optval; net_time_t txtime; - struct sockaddr_in6 client_addr; - struct msghdr msg; - struct cmsghdr *cmsg; - struct iovec io_vector[1]; + struct net_sockaddr_in6 client_addr; + struct net_msghdr msg; + struct net_cmsghdr *cmsg; + struct net_iovec io_vector[1]; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(uint64_t))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(uint64_t))]; } cmsgbuf; /* Just flush the semaphore */ @@ -1045,7 +1045,7 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_with_txtime) prepare_sock_udp_v6(MY_IPV6_ADDR_ETH, ANY_PORT, &client_sock, &client_addr); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); @@ -1062,20 +1062,20 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_with_txtime) txtime = TEST_TXTIME; - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(txtime)); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_TXTIME; - *(net_time_t *)CMSG_DATA(cmsg) = txtime; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(txtime)); + cmsg->cmsg_level = ZSOCK_SOL_SOCKET; + cmsg->cmsg_type = ZSOCK_SCM_TXTIME; + *(net_time_t *)NET_CMSG_DATA(cmsg) = txtime; optval = true; - rv = zsock_setsockopt(client_sock, SOL_SOCKET, SO_TXTIME, &optval, + rv = zsock_setsockopt(client_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_TXTIME, &optval, sizeof(optval)); test_started = true; comm_sendmsg_with_txtime(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg); @@ -1091,9 +1091,9 @@ ZTEST_USER(net_socket_udp, test_v6_sendmsg_with_txtime) test_started = false; } -void test_msg_trunc(int sock_c, int sock_s, struct sockaddr *addr_c, - socklen_t addrlen_c, struct sockaddr *addr_s, - socklen_t addrlen_s) +void test_msg_trunc(int sock_c, int sock_s, struct net_sockaddr *addr_c, + net_socklen_t addrlen_c, struct net_sockaddr *addr_s, + net_socklen_t addrlen_s) { int rv; uint8_t str_buf[sizeof(TEST_STR_SMALL) - 1]; @@ -1149,35 +1149,35 @@ ZTEST(net_socket_udp, test_v4_msg_trunc) { int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); test_msg_trunc(client_sock, server_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); } ZTEST(net_socket_udp, test_v6_msg_trunc) { int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; prepare_sock_udp_v6(MY_IPV6_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); test_msg_trunc(client_sock, server_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); } static void test_dgram_overflow(int sock_c, int sock_s, - struct sockaddr *addr_c, socklen_t addrlen_c, - struct sockaddr *addr_s, socklen_t addrlen_s, + struct net_sockaddr *addr_c, net_socklen_t addrlen_c, + struct net_sockaddr *addr_s, net_socklen_t addrlen_s, const void *buf, size_t buf_size) { int rv; @@ -1202,8 +1202,8 @@ static void test_dgram_overflow(int sock_c, int sock_s, } static void test_dgram_fragmented(int sock_c, int sock_s, - struct sockaddr *addr_c, socklen_t addrlen_c, - struct sockaddr *addr_s, socklen_t addrlen_s, + struct net_sockaddr *addr_c, net_socklen_t addrlen_c, + struct net_sockaddr *addr_s, net_socklen_t addrlen_s, const void *buf, size_t buf_size) { int rv; @@ -1235,15 +1235,15 @@ ZTEST(net_socket_udp, test_v4_dgram_overflow) { int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); test_dgram_overflow(client_sock, server_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), test_str_all_tx_bufs, NET_ETH_MTU + 1); } @@ -1251,21 +1251,21 @@ ZTEST(net_socket_udp, test_v6_dgram_fragmented_or_overflow) { int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; prepare_sock_udp_v6(MY_IPV6_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); if (IS_ENABLED(CONFIG_NET_IPV6_FRAGMENT)) { test_dgram_fragmented(client_sock, server_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), test_str_all_tx_bufs, NET_ETH_MTU + 1); } else { test_dgram_overflow(client_sock, server_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), test_str_all_tx_bufs, NET_ETH_MTU + 1); } } @@ -1274,22 +1274,22 @@ ZTEST(net_socket_udp, test_v6_dgram_overflow) { int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; prepare_sock_udp_v6(MY_IPV6_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); test_dgram_overflow(client_sock, server_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), BUF_AND_SIZE(test_str_all_tx_bufs)); } static void test_dgram_connected(int sock_c, int sock_s1, int sock_s2, - struct sockaddr *addr_c, socklen_t addrlen_c, - struct sockaddr *addr_s1, socklen_t addrlen_s1, - struct sockaddr *addr_s2, socklen_t addrlen_s2) + struct net_sockaddr *addr_c, net_socklen_t addrlen_c, + struct net_sockaddr *addr_s1, net_socklen_t addrlen_s1, + struct net_sockaddr *addr_s2, net_socklen_t addrlen_s2) { uint8_t tx_buf = 0xab; uint8_t rx_buf; @@ -1343,18 +1343,18 @@ ZTEST(net_socket_udp, test_v4_dgram_connected) int client_sock; int server_sock_1; int server_sock_2; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr_1; - struct sockaddr_in server_addr_2; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr_1; + struct net_sockaddr_in server_addr_2; prepare_sock_udp_v4(MY_IPV4_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock_1, &server_addr_1); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT + 1, &server_sock_2, &server_addr_2); test_dgram_connected(client_sock, server_sock_1, server_sock_2, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr_1, sizeof(server_addr_1), - (struct sockaddr *)&server_addr_2, sizeof(server_addr_2)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr_1, sizeof(server_addr_1), + (struct net_sockaddr *)&server_addr_2, sizeof(server_addr_2)); } ZTEST(net_socket_udp, test_v6_dgram_connected) @@ -1362,29 +1362,29 @@ ZTEST(net_socket_udp, test_v6_dgram_connected) int client_sock; int server_sock_1; int server_sock_2; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr_1; - struct sockaddr_in6 server_addr_2; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr_1; + struct net_sockaddr_in6 server_addr_2; prepare_sock_udp_v6(MY_IPV6_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock_1, &server_addr_1); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT + 1, &server_sock_2, &server_addr_2); test_dgram_connected(client_sock, server_sock_1, server_sock_2, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr_1, sizeof(server_addr_1), - (struct sockaddr *)&server_addr_2, sizeof(server_addr_2)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr_1, sizeof(server_addr_1), + (struct net_sockaddr *)&server_addr_2, sizeof(server_addr_2)); } ZTEST_USER(net_socket_udp, test_recvmsg_invalid) { - struct msghdr msg; - struct sockaddr_in6 server_addr; - struct cmsghdr *cmsg; - struct iovec io_vector[1]; + struct net_msghdr msg; + struct net_sockaddr_in6 server_addr; + struct net_cmsghdr *cmsg; + struct net_iovec io_vector[1]; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(int))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(int))]; } cmsgbuf; int ret; @@ -1414,24 +1414,24 @@ ZTEST_USER(net_socket_udp, test_recvmsg_invalid) msg.msg_name = (void *)1; msg.msg_namelen = sizeof(server_addr); - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - cmsg->cmsg_level = SOL_SOCKET; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(int)); + cmsg->cmsg_level = ZSOCK_SOL_SOCKET; cmsg->cmsg_type = 1122; - *(int *)CMSG_DATA(cmsg) = 42; + *(int *)NET_CMSG_DATA(cmsg) = 42; ret = zsock_recvmsg(0, &msg, 0); zassert_true(ret < 0, "recvmsg() succeed"); } static void comm_sendmsg_recvmsg(int client_sock, - struct sockaddr *client_addr, - socklen_t client_addrlen, - const struct msghdr *client_msg, + struct net_sockaddr *client_addr, + net_socklen_t client_addrlen, + const struct net_msghdr *client_msg, int server_sock, - struct sockaddr *server_addr, - socklen_t server_addrlen, - struct msghdr *msg, + struct net_sockaddr *server_addr, + net_socklen_t server_addrlen, + struct net_msghdr *msg, void *cmsgbuf, int cmsgbuf_len, bool expect_control_data) { @@ -1439,11 +1439,11 @@ static void comm_sendmsg_recvmsg(int client_sock, #define SMALL_BUF_LEN (sizeof(TEST_STR_SMALL) - 1 - 2) char buf[MAX_BUF_LEN]; char buf2[SMALL_BUF_LEN]; - struct iovec io_vector[2]; + struct net_iovec io_vector[2]; ssize_t sent; ssize_t recved; - struct sockaddr addr; - socklen_t addrlen = server_addrlen; + struct net_sockaddr addr; + net_socklen_t addrlen = server_addrlen; int len, i; zassert_not_null(client_addr, "null client addr"); @@ -1516,7 +1516,7 @@ static void comm_sendmsg_recvmsg(int client_sock, } /* Check the client port */ - if (addr.sa_family == AF_INET) { + if (addr.sa_family == NET_AF_INET) { if (net_sin(client_addr)->sin_port != ANY_PORT) { zassert_equal(net_sin(client_addr)->sin_port, net_sin(&addr)->sin_port, @@ -1524,7 +1524,7 @@ static void comm_sendmsg_recvmsg(int client_sock, } } - if (addr.sa_family == AF_INET6) { + if (addr.sa_family == NET_AF_INET6) { if (net_sin6(client_addr)->sin6_port != ANY_PORT) { zassert_equal(net_sin6(client_addr)->sin6_port, net_sin6(&addr)->sin6_port, @@ -1661,21 +1661,21 @@ ZTEST_USER(net_socket_udp, test_recvmsg_user) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; - struct msghdr msg, server_msg; - struct iovec io_vector[1]; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; + struct net_msghdr msg, server_msg; + struct net_iovec io_vector[1]; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "server bind failed"); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); @@ -1689,11 +1689,11 @@ ZTEST_USER(net_socket_udp, test_recvmsg_user) msg.msg_namelen = sizeof(server_addr); comm_sendmsg_recvmsg(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg, server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr), &server_msg, NULL, 0, false); @@ -1704,25 +1704,25 @@ ZTEST_USER(net_socket_udp, test_recvmsg_user) } static void run_ancillary_recvmsg_test(int client_sock, - struct sockaddr *client_addr, + struct net_sockaddr *client_addr, int client_addr_len, int server_sock, - struct sockaddr *server_addr, + struct net_sockaddr *server_addr, int server_addr_len) { int rv; int opt; int ifindex = 0; - socklen_t optlen; - struct sockaddr addr = { 0 }; + net_socklen_t optlen; + struct net_sockaddr addr = { 0 }; struct net_if *iface; - struct msghdr msg; - struct msghdr server_msg; - struct iovec io_vector[1]; - struct cmsghdr *cmsg, *prevcmsg; + struct net_msghdr msg; + struct net_msghdr server_msg; + struct net_iovec io_vector[1]; + struct net_cmsghdr *cmsg, *prevcmsg; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(struct in6_pktinfo))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(struct net_in6_pktinfo))]; } cmsgbuf; #define SMALL_BUF_LEN (sizeof(TEST_STR_SMALL) - 1 - 2) char buf[MAX_BUF_LEN]; @@ -1758,22 +1758,24 @@ static void run_ancillary_recvmsg_test(int client_sock, sizeof(cmsgbuf.buf), true); - for (prevcmsg = NULL, cmsg = CMSG_FIRSTHDR(&server_msg); + for (prevcmsg = NULL, cmsg = NET_CMSG_FIRSTHDR(&server_msg); cmsg != NULL && prevcmsg != cmsg; - prevcmsg = cmsg, cmsg = CMSG_NXTHDR(&server_msg, cmsg)) { - if (cmsg->cmsg_level == IPPROTO_IP && - cmsg->cmsg_type == IP_PKTINFO) { - net_sin(&addr)->sin_addr = ((struct in_pktinfo *)CMSG_DATA(cmsg))->ipi_addr; + prevcmsg = cmsg, cmsg = NET_CMSG_NXTHDR(&server_msg, cmsg)) { + if (cmsg->cmsg_level == NET_IPPROTO_IP && + cmsg->cmsg_type == ZSOCK_IP_PKTINFO) { + net_sin(&addr)->sin_addr = + ((struct net_in_pktinfo *)NET_CMSG_DATA(cmsg))->ipi_addr; break; } } /* As we have not set the socket option, the address should not be set */ - if (server_addr->sa_family == AF_INET) { - zassert_equal(net_sin(&addr)->sin_addr.s_addr, INADDR_ANY, "Source address set!"); + if (server_addr->sa_family == NET_AF_INET) { + zassert_equal(net_sin(&addr)->sin_addr.s_addr, NET_INADDR_ANY, + "Source address set!"); } - if (server_addr->sa_family == AF_INET6) { + if (server_addr->sa_family == NET_AF_INET6) { zassert_true(net_sin6(&addr)->sin6_addr.s6_addr32[0] == 0 && net_sin6(&addr)->sin6_addr.s6_addr32[1] == 0 && net_sin6(&addr)->sin6_addr.s6_addr32[2] == 0 && @@ -1783,10 +1785,12 @@ static void run_ancillary_recvmsg_test(int client_sock, opt = 1; optlen = sizeof(opt); - if (server_addr->sa_family == AF_INET) { - rv = zsock_setsockopt(server_sock, IPPROTO_IP, IP_PKTINFO, &opt, optlen); + if (server_addr->sa_family == NET_AF_INET) { + rv = zsock_setsockopt(server_sock, NET_IPPROTO_IP, + ZSOCK_IP_PKTINFO, &opt, optlen); } else { - rv = zsock_setsockopt(server_sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opt, optlen); + rv = zsock_setsockopt(server_sock, NET_IPPROTO_IPV6, + ZSOCK_IPV6_RECVPKTINFO, &opt, optlen); } zassert_equal(rv, 0, "setsockopt failed (%d)", -errno); @@ -1810,35 +1814,35 @@ static void run_ancillary_recvmsg_test(int client_sock, sizeof(cmsgbuf.buf), true); - for (cmsg = CMSG_FIRSTHDR(&server_msg); cmsg != NULL; - cmsg = CMSG_NXTHDR(&server_msg, cmsg)) { - if (cmsg->cmsg_level == IPPROTO_IP && - cmsg->cmsg_type == IP_PKTINFO) { + for (cmsg = NET_CMSG_FIRSTHDR(&server_msg); cmsg != NULL; + cmsg = NET_CMSG_NXTHDR(&server_msg, cmsg)) { + if (cmsg->cmsg_level == NET_IPPROTO_IP && + cmsg->cmsg_type == ZSOCK_IP_PKTINFO) { net_sin(&addr)->sin_addr = - ((struct in_pktinfo *)CMSG_DATA(cmsg))->ipi_addr; - ifindex = ((struct in_pktinfo *)CMSG_DATA(cmsg))->ipi_ifindex; + ((struct net_in_pktinfo *)NET_CMSG_DATA(cmsg))->ipi_addr; + ifindex = ((struct net_in_pktinfo *)NET_CMSG_DATA(cmsg))->ipi_ifindex; break; } - if (cmsg->cmsg_level == IPPROTO_IPV6 && - cmsg->cmsg_type == IPV6_PKTINFO) { + if (cmsg->cmsg_level == NET_IPPROTO_IPV6 && + cmsg->cmsg_type == ZSOCK_IPV6_PKTINFO) { net_ipaddr_copy(&net_sin6(&addr)->sin6_addr, - &((struct in6_pktinfo *)CMSG_DATA(cmsg))->ipi6_addr); - ifindex = ((struct in6_pktinfo *)CMSG_DATA(cmsg))->ipi6_ifindex; + &((struct net_in6_pktinfo *)NET_CMSG_DATA(cmsg))->ipi6_addr); + ifindex = ((struct net_in6_pktinfo *)NET_CMSG_DATA(cmsg))->ipi6_ifindex; break; } } - if (server_addr->sa_family == AF_INET) { + if (server_addr->sa_family == NET_AF_INET) { zassert_equal(net_sin(&addr)->sin_addr.s_addr, net_sin(server_addr)->sin_addr.s_addr, "Source address not set properly!"); } - if (server_addr->sa_family == AF_INET6) { + if (server_addr->sa_family == NET_AF_INET6) { zassert_mem_equal(&net_sin6(&addr)->sin6_addr, &net_sin6(server_addr)->sin6_addr, - sizeof(struct in6_addr), + sizeof(struct net_in6_addr), "Source address not set properly!"); } @@ -1874,8 +1878,8 @@ static void run_ancillary_recvmsg_test(int client_sock, ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv4_pktinfo_data_user) { - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; int client_sock; int server_sock; @@ -1883,17 +1887,17 @@ ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv4_pktinfo_data_user) prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); run_ancillary_recvmsg_test(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); } ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv6_pktinfo_data_user) { - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; int client_sock; int server_sock; @@ -1901,30 +1905,30 @@ ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv6_pktinfo_data_user) prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); run_ancillary_recvmsg_test(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); } static int bind_socket(int sock, struct net_if *iface) { - struct sockaddr_ll addr; + struct net_sockaddr_ll addr; memset(&addr, 0, sizeof(addr)); addr.sll_ifindex = net_if_get_by_iface(iface); - addr.sll_family = AF_PACKET; + addr.sll_family = NET_AF_PACKET; - return zsock_bind(sock, (struct sockaddr *)&addr, sizeof(addr)); + return zsock_bind(sock, (struct net_sockaddr *)&addr, sizeof(addr)); } static void test_check_ttl(int sock_c, int sock_s, int sock_p, - struct sockaddr *addr_c, socklen_t addrlen_c, - struct sockaddr *addr_s, socklen_t addrlen_s, - struct sockaddr *addr_sendto, socklen_t addrlen_sendto, - sa_family_t family, uint8_t expected_ttl, + struct net_sockaddr *addr_c, net_socklen_t addrlen_c, + struct net_sockaddr *addr_s, net_socklen_t addrlen_s, + struct net_sockaddr *addr_sendto, net_socklen_t addrlen_sendto, + net_sa_family_t family, uint8_t expected_ttl, uint8_t expected_mcast_ttl) { uint8_t tx_buf = 0xab; @@ -1937,10 +1941,10 @@ static void test_check_ttl(int sock_c, int sock_s, int sock_p, #define V6_HDR_SIZE (IPV6_HDR_SIZE + UDP_HDR_SIZE) #define MAX_HDR_SIZE (IPV6_HDR_SIZE + UDP_HDR_SIZE) uint8_t data_to_receive[sizeof(tx_buf) + MAX_HDR_SIZE]; - struct sockaddr_ll src; - socklen_t addrlen; + struct net_sockaddr_ll src; + net_socklen_t addrlen; char ifname[CONFIG_NET_INTERFACE_NAME_LEN]; - struct ifreq ifreq = { 0 }; + struct net_ifreq ifreq = { 0 }; struct timeval timeo_optval = { .tv_sec = 0, .tv_usec = 100000, @@ -1959,14 +1963,14 @@ static void test_check_ttl(int sock_c, int sock_s, int sock_p, zassert_true(ret > 0, "cannot get interface name (%d)", ret); strncpy(ifreq.ifr_name, ifname, sizeof(ifreq.ifr_name)); - ret = zsock_setsockopt(sock_c, SOL_SOCKET, SO_BINDTODEVICE, &ifreq, + ret = zsock_setsockopt(sock_c, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq, sizeof(ifreq)); zassert_equal(ret, 0, "SO_BINDTODEVICE failed, %d", -errno); ret = zsock_connect(sock_c, addr_s, addrlen_s); zassert_equal(ret, 0, "connect failed"); - ret = zsock_setsockopt(sock_s, SOL_SOCKET, SO_RCVTIMEO, + ret = zsock_setsockopt(sock_s, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &timeo_optval, sizeof(timeo_optval)); zassert_equal(ret, 0, "Cannot set receive timeout (%d)", -errno); @@ -1982,9 +1986,9 @@ static void test_check_ttl(int sock_c, int sock_s, int sock_p, } ret = zsock_recvfrom(sock_p, data_to_receive, sizeof(data_to_receive), 0, - (struct sockaddr *)&src, &addrlen); + (struct net_sockaddr *)&src, &addrlen); if (ret > 0) { - int hdr_size = family == AF_INET ? + int hdr_size = family == NET_AF_INET ? V4_HDR_SIZE : V6_HDR_SIZE; zassert_equal(ret, sizeof(tx_buf) + hdr_size, "Cannot receive all data (%d vs %zd) (%d)", @@ -1993,7 +1997,7 @@ static void test_check_ttl(int sock_c, int sock_s, int sock_p, sizeof(tx_buf), "Sent and received buffers do not match"); - if (family == AF_INET) { + if (family == NET_AF_INET) { struct net_ipv4_hdr *ipv4 = (struct net_ipv4_hdr *)&data_to_receive[0]; @@ -2006,7 +2010,7 @@ static void test_check_ttl(int sock_c, int sock_s, int sock_p, "Invalid mcast ttl (%d vs %d)", ipv4->ttl, expected_mcast_ttl); } - } else if (family == AF_INET6) { + } else if (family == NET_AF_INET6) { struct net_ipv6_hdr *ipv6 = (struct net_ipv6_hdr *)&data_to_receive[0]; @@ -2032,22 +2036,22 @@ static void test_check_ttl(int sock_c, int sock_s, int sock_p, zassert_true(count > 0, "timeout while waiting data"); - if (family == AF_INET) { + if (family == NET_AF_INET) { /* Set TTL to 0 and make sure the packet is dropped and not * received */ int option; if (expected_ttl > 0) { - option = IP_TTL; + option = ZSOCK_IP_TTL; } else { - option = IP_MULTICAST_TTL; + option = ZSOCK_IP_MULTICAST_TTL; } opt = 0; - ret = zsock_setsockopt(sock_c, IPPROTO_IP, option, &opt, sizeof(opt)); + ret = zsock_setsockopt(sock_c, NET_IPPROTO_IP, option, &opt, sizeof(opt)); zassert_equal(ret, 0, "Cannot set %s TTL (%d)", - option == IP_TTL ? "unicast" : "multicast", + option == ZSOCK_IP_TTL ? "unicast" : "multicast", -errno); #if defined(CONFIG_NET_STATISTICS) @@ -2075,23 +2079,23 @@ static void test_check_ttl(int sock_c, int sock_s, int sock_p, zassert_true(ret < 0 && errno == EAGAIN, "recv succeed (%d)", -errno); } - if (family == AF_INET6) { + if (family == NET_AF_INET6) { /* Set hoplimit to 0 and make sure the packet is dropped and not * received. */ int option; if (expected_ttl > 0) { - option = IPV6_UNICAST_HOPS; + option = ZSOCK_IPV6_UNICAST_HOPS; } else { - option = IPV6_MULTICAST_HOPS; + option = ZSOCK_IPV6_MULTICAST_HOPS; } opt = 0; - ret = zsock_setsockopt(sock_c, IPPROTO_IPV6, option, + ret = zsock_setsockopt(sock_c, NET_IPPROTO_IPV6, option, &opt, sizeof(opt)); zassert_equal(ret, 0, "Cannot set %s hops (%d)", - option == IPV6_UNICAST_HOPS ? "unicast" : "multicast", + option == ZSOCK_IPV6_UNICAST_HOPS ? "unicast" : "multicast", -errno); #if defined(CONFIG_NET_STATISTICS) @@ -2135,16 +2139,16 @@ ZTEST(net_socket_udp, test_v4_ttl) int server_sock; int packet_sock; int ttl, verify; - socklen_t optlen; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + net_socklen_t optlen; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; Z_TEST_SKIP_IFNDEF(CONFIG_NET_SOCKETS_PACKET); prepare_sock_udp_v4(MY_IPV4_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); - packet_sock = zsock_socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + packet_sock = zsock_socket(NET_AF_PACKET, NET_SOCK_RAW, net_htons(ETH_P_ALL)); zassert_true(packet_sock >= 0, "Cannot create packet socket (%d)", -errno); ret = bind_socket(packet_sock, lo0); @@ -2160,20 +2164,20 @@ ZTEST(net_socket_udp, test_v4_ttl) zassert_equal(verify, ttl, "Different TTLs (%d vs %d)", ttl, verify); ttl = 128; - ret = zsock_setsockopt(client_sock, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)); + ret = zsock_setsockopt(client_sock, NET_IPPROTO_IP, ZSOCK_IP_TTL, &ttl, sizeof(ttl)); zassert_equal(ret, 0, "Cannot set unicast TTL (%d)", -errno); optlen = sizeof(verify); - ret = zsock_getsockopt(client_sock, IPPROTO_IP, IP_TTL, &verify, &optlen); + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IP, ZSOCK_IP_TTL, &verify, &optlen); zassert_equal(ret, 0, "Cannot get unicast TTL (%d)", -errno); zassert_equal(verify, ttl, "Different unicast TTL (%d vs %d)", ttl, verify); test_check_ttl(client_sock, server_sock, packet_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), - AF_INET, ttl, 0); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), + NET_AF_INET, ttl, 0); } ZTEST(net_socket_udp, test_v4_mcast_ttl) @@ -2183,17 +2187,17 @@ ZTEST(net_socket_udp, test_v4_mcast_ttl) int server_sock; int packet_sock; int mcast_ttl, verify; - socklen_t optlen; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; - struct sockaddr_in sendto_addr; + net_socklen_t optlen; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; + struct net_sockaddr_in sendto_addr; Z_TEST_SKIP_IFNDEF(CONFIG_NET_SOCKETS_PACKET); prepare_sock_udp_v4(MY_IPV4_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); - packet_sock = zsock_socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + packet_sock = zsock_socket(NET_AF_PACKET, NET_SOCK_RAW, net_htons(ETH_P_ALL)); zassert_true(packet_sock >= 0, "Cannot create packet socket (%d)", -errno); ret = bind_socket(packet_sock, lo0); @@ -2204,25 +2208,25 @@ ZTEST(net_socket_udp, test_v4_mcast_ttl) net_if_get_by_iface(lo0), lo0); mcast_ttl = 8; - ret = zsock_setsockopt(client_sock, IPPROTO_IP, IP_MULTICAST_TTL, &mcast_ttl, + ret = zsock_setsockopt(client_sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, &mcast_ttl, sizeof(mcast_ttl)); zassert_equal(ret, 0, "Cannot set multicast ttl (%d)", -errno); optlen = sizeof(verify); - ret = zsock_getsockopt(client_sock, IPPROTO_IP, IP_MULTICAST_TTL, &verify, + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_TTL, &verify, &optlen); zassert_equal(ret, 0, "Cannot get multicast ttl (%d)", -errno); zassert_equal(verify, mcast_ttl, "Different multicast TTLs (%d vs %d)", mcast_ttl, verify); - ret = net_addr_pton(AF_INET, MY_MCAST_IPV4_ADDR, &sendto_addr.sin_addr); + ret = net_addr_pton(NET_AF_INET, MY_MCAST_IPV4_ADDR, &sendto_addr.sin_addr); zassert_equal(ret, 0, "Cannot get IPv4 address (%d)", ret); test_check_ttl(client_sock, server_sock, packet_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), - (struct sockaddr *)&sendto_addr, sizeof(sendto_addr), - AF_INET, 0, mcast_ttl); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&sendto_addr, sizeof(sendto_addr), + NET_AF_INET, 0, mcast_ttl); } ZTEST(net_socket_udp, test_v6_mcast_hops) @@ -2233,17 +2237,17 @@ ZTEST(net_socket_udp, test_v6_mcast_hops) int packet_sock; int mcast_hops, if_mcast_hops; int verify, opt; - socklen_t optlen; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; - struct sockaddr_in6 sendto_addr; + net_socklen_t optlen; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; + struct net_sockaddr_in6 sendto_addr; Z_TEST_SKIP_IFNDEF(CONFIG_NET_SOCKETS_PACKET); prepare_sock_udp_v6(MY_IPV6_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); - packet_sock = zsock_socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + packet_sock = zsock_socket(NET_AF_PACKET, NET_SOCK_RAW, net_htons(ETH_P_ALL)); zassert_true(packet_sock >= 0, "Cannot create packet socket (%d)", -errno); ret = bind_socket(packet_sock, lo0); @@ -2259,12 +2263,12 @@ ZTEST(net_socket_udp, test_v6_mcast_hops) if_mcast_hops = net_if_ipv6_get_mcast_hop_limit(lo0); opt = -1; - ret = zsock_setsockopt(client_sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &opt, + ret = zsock_setsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, &opt, sizeof(opt)); zassert_equal(ret, 0, "Cannot set multicast hop limit (%d)", -errno); optlen = sizeof(verify); - ret = zsock_getsockopt(client_sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &verify, + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, &verify, &optlen); zassert_equal(ret, 0, "Cannot get multicast hop limit (%d)", -errno); zassert_equal(verify, if_mcast_hops, "Different multicast hop limit (%d vs %d)", @@ -2272,25 +2276,25 @@ ZTEST(net_socket_udp, test_v6_mcast_hops) /* Then test the normal case where we set the value */ mcast_hops = 8; - ret = zsock_setsockopt(client_sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcast_hops, - sizeof(mcast_hops)); + ret = zsock_setsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, + &mcast_hops, sizeof(mcast_hops)); zassert_equal(ret, 0, "Cannot set multicast hop limit (%d)", -errno); optlen = sizeof(verify); - ret = zsock_getsockopt(client_sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &verify, + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_HOPS, &verify, &optlen); zassert_equal(ret, 0, "Cannot get multicast hop limit (%d)", -errno); zassert_equal(verify, mcast_hops, "Different multicast hop limit (%d vs %d)", mcast_hops, verify); - ret = net_addr_pton(AF_INET6, MY_MCAST_IPV6_ADDR, &sendto_addr.sin6_addr); + ret = net_addr_pton(NET_AF_INET6, MY_MCAST_IPV6_ADDR, &sendto_addr.sin6_addr); zassert_equal(ret, 0, "Cannot get IPv6 address (%d)", ret); test_check_ttl(client_sock, server_sock, packet_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), - (struct sockaddr *)&sendto_addr, sizeof(sendto_addr), - AF_INET6, 0, mcast_hops); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&sendto_addr, sizeof(sendto_addr), + NET_AF_INET6, 0, mcast_hops); } ZTEST(net_socket_udp, test_v6_hops) @@ -2300,16 +2304,16 @@ ZTEST(net_socket_udp, test_v6_hops) int server_sock; int packet_sock; int hops, verify; - socklen_t optlen; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + net_socklen_t optlen; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; Z_TEST_SKIP_IFNDEF(CONFIG_NET_SOCKETS_PACKET); prepare_sock_udp_v6(MY_IPV6_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); - packet_sock = zsock_socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + packet_sock = zsock_socket(NET_AF_PACKET, NET_SOCK_RAW, net_htons(ETH_P_ALL)); zassert_true(packet_sock >= 0, "Cannot create packet socket (%d)", -errno); ret = bind_socket(packet_sock, lo0); @@ -2325,22 +2329,22 @@ ZTEST(net_socket_udp, test_v6_hops) zassert_equal(verify, hops, "Different hop limit (%d vs %d)", hops, verify); hops = 8; - ret = zsock_setsockopt(client_sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hops, + ret = zsock_setsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_UNICAST_HOPS, &hops, sizeof(hops)); zassert_equal(ret, 0, "Cannot set unicast hops (%d)", -errno); optlen = sizeof(verify); - ret = zsock_getsockopt(client_sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &verify, + ret = zsock_getsockopt(client_sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_UNICAST_HOPS, &verify, &optlen); zassert_equal(ret, 0, "Cannot get unicast hops (%d)", -errno); zassert_equal(verify, hops, "Different unicast hops (%d vs %d)", hops, verify); test_check_ttl(client_sock, server_sock, packet_sock, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), - (struct sockaddr *)&server_addr, sizeof(server_addr), - AF_INET6, hops, 0); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), + (struct net_sockaddr *)&server_addr, sizeof(server_addr), + NET_AF_INET6, hops, 0); } ZTEST_USER(net_socket_udp, test_recvmsg_msg_controllen_update) @@ -2348,25 +2352,25 @@ ZTEST_USER(net_socket_udp, test_recvmsg_msg_controllen_update) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; - struct msghdr msg, server_msg; - struct iovec io_vector[1]; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; + struct net_msghdr msg, server_msg; + struct net_iovec io_vector[1]; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(struct in6_pktinfo))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(struct net_in6_pktinfo))]; } cmsgbuf; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "server bind failed"); rv = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(rv, 0, "client bind failed"); @@ -2382,11 +2386,11 @@ ZTEST_USER(net_socket_udp, test_recvmsg_msg_controllen_update) msg.msg_namelen = sizeof(server_addr); comm_sendmsg_recvmsg(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), &msg, server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr), &server_msg, &cmsgbuf.buf, @@ -2404,7 +2408,7 @@ ZTEST(net_socket_udp, test_v6_address_removal) int ret; bool status; int client_sock; - struct sockaddr_in6 client_addr; + struct net_sockaddr_in6 client_addr; struct net_if_addr *ifaddr; struct net_if *iface; @@ -2419,7 +2423,7 @@ ZTEST(net_socket_udp, test_v6_address_removal) prepare_sock_udp_v6(MY_IPV6_ADDR_ETH, CLIENT_PORT, &client_sock, &client_addr); ret = zsock_bind(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr)); zassert_equal(ret, 0, "client bind failed"); @@ -2442,25 +2446,25 @@ ZTEST(net_socket_udp, test_v6_address_removal) static void check_ipv6_address_preferences(struct net_if *iface, uint16_t preference, - const struct in6_addr *addr, - const struct in6_addr *dest) + const struct net_in6_addr *addr, + const struct net_in6_addr *dest) { - const struct in6_addr *selected; - socklen_t optlen; + const struct net_in6_addr *selected; + net_socklen_t optlen; int optval; int sock; int ret; - sock = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); optval = preference; - ret = zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_ADDR_PREFERENCES, + ret = zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_ADDR_PREFERENCES, &optval, sizeof(optval)); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); optval = 0; optlen = 0U; - ret = zsock_getsockopt(sock, IPPROTO_IPV6, IPV6_ADDR_PREFERENCES, + ret = zsock_getsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_ADDR_PREFERENCES, &optval, &optlen); zassert_equal(ret, 0, "setsockopt failed (%d)", errno); zassert_equal(optlen, sizeof(optval), "invalid optlen %d vs %d", @@ -2483,7 +2487,7 @@ static void check_ipv6_address_preferences(struct net_if *iface, ZTEST(net_socket_udp, test_ipv6_src_addr_select) { struct net_if_addr *ifaddr; - const struct in6_addr dest = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + const struct net_in6_addr dest = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; net_if_foreach(iface_cb, ð_iface); @@ -2511,24 +2515,24 @@ ZTEST(net_socket_udp, test_ipv6_src_addr_select) net_if_up(eth_iface); - check_ipv6_address_preferences(NULL, IPV6_PREFER_SRC_PUBLIC, + check_ipv6_address_preferences(NULL, ZSOCK_IPV6_PREFER_SRC_PUBLIC, &my_addr1, &dest); - check_ipv6_address_preferences(NULL, IPV6_PREFER_SRC_TMP, + check_ipv6_address_preferences(NULL, ZSOCK_IPV6_PREFER_SRC_TMP, &my_addr3, &dest); } ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) { - struct sockaddr_in6 saddr6 = { - .sin6_family = AF_INET6, - .sin6_port = htons(SERVER_PORT), + struct net_sockaddr_in6 saddr6 = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(SERVER_PORT), .sin6_addr = my_mcast_addr1, }; struct net_if_mcast_addr *ifmaddr; struct net_if_addr *ifaddr; int server_sock; - socklen_t addrlen; - socklen_t optlen; + net_socklen_t addrlen; + net_socklen_t optlen; int ifindex; int optval; int sock; @@ -2556,11 +2560,11 @@ ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) net_if_up(eth_iface); /* Check that we get the default interface */ - sock = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); optval = 0; optlen = 0U; - ret = zsock_getsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, + ret = zsock_getsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_IF, &optval, &optlen); zexpect_equal(ret, 0, "setsockopt failed (%d)", errno); zexpect_equal(optlen, sizeof(optval), "invalid optlen %d vs %d", @@ -2574,11 +2578,11 @@ ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) zassert_equal(sock, 0, "Cannot close socket (%d)", -errno); /* Check failure for IPv4 socket */ - sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); optval = 0; optlen = 0U; - ret = zsock_getsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, + ret = zsock_getsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_IF, &optval, &optlen); err = -errno; zexpect_equal(ret, -1, "setsockopt failed (%d)", errno); @@ -2589,12 +2593,12 @@ ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) zassert_equal(sock, 0, "Cannot close socket (%d)", -errno); /* Check that we can set the interface */ - sock = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); /* Clear any existing interface value by setting it to 0 */ optval = 0; optlen = sizeof(int); - ret = zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, + ret = zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_IF, &optval, optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -2603,14 +2607,14 @@ ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) /* Set the output multicast packet interface to the default interface */ optval = net_if_get_by_iface(net_if_get_default()); optlen = sizeof(int); - ret = zsock_setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, + ret = zsock_setsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_IF, &optval, optlen); zexpect_equal(ret, 0, "setsockopt failed (%d)", errno); zexpect_equal(optlen, sizeof(optval), "invalid optlen %d vs %d", optlen, sizeof(optval)); optval = 0; optlen = 0U; - ret = zsock_getsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, + ret = zsock_getsockopt(sock, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_IF, &optval, &optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -2626,7 +2630,7 @@ ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) loopback_enable_address_swap(false); ret = zsock_sendto(sock, TEST_STR_SMALL, sizeof(TEST_STR_SMALL) - 1, 0, - (struct sockaddr *)&saddr6, sizeof(saddr6)); + (struct net_sockaddr *)&saddr6, sizeof(saddr6)); zexpect_equal(ret, STRLEN(TEST_STR_SMALL), "invalid send len (was %d expected %d) (%d)", ret, STRLEN(TEST_STR_SMALL), -errno); @@ -2636,7 +2640,7 @@ ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) */ addrlen = sizeof(saddr6); ret = zsock_recvfrom(server_sock, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&saddr6, &addrlen); + 0, (struct net_sockaddr *)&saddr6, &addrlen); zexpect_true(ret >= 0, "recvfrom fail"); zexpect_equal(ret, strlen(TEST_STR_SMALL), "unexpected received bytes"); @@ -2655,25 +2659,25 @@ ZTEST(net_socket_udp, test_ipv6_multicast_ifindex) ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) { - struct sockaddr_in saddr4 = { - .sin_family = AF_INET, - .sin_port = htons(SERVER_PORT), + struct net_sockaddr_in saddr4 = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(SERVER_PORT), .sin_addr = my_mcast_addr2, }; - struct sockaddr_in dst_addr = { - .sin_family = AF_INET, - .sin_port = htons(SERVER_PORT), + struct net_sockaddr_in dst_addr = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(SERVER_PORT), .sin_addr = my_mcast_addr2, }; struct net_if_mcast_addr *ifmaddr; struct net_if_addr *ifaddr; - struct in_addr addr = { 0 }; - struct ip_mreqn mreqn; - struct ip_mreq mreq; + struct net_in_addr addr = { 0 }; + struct net_ip_mreqn mreqn; + struct net_ip_mreq mreq; struct net_if *iface; int server_sock; - socklen_t addrlen; - socklen_t optlen; + net_socklen_t addrlen; + net_socklen_t optlen; int ifindex; int sock; int ret; @@ -2700,11 +2704,11 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) net_if_up(eth_iface); /* Check that we get the default interface */ - sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); optlen = sizeof(addr); - ret = zsock_getsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_getsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &addr, &optlen); zexpect_equal(ret, 0, "setsockopt failed (%d)", errno); zexpect_equal(optlen, sizeof(addr), "invalid optlen %d vs %d", @@ -2719,11 +2723,11 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) zassert_equal(sock, 0, "Cannot close socket (%d)", -errno); /* Check failure for IPv6 socket */ - sock = zsock_socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); optlen = 0U; - ret = zsock_getsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_getsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &addr, &optlen); err = -errno; zexpect_equal(ret, -1, "setsockopt failed (%d)", errno); @@ -2734,7 +2738,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) zassert_equal(sock, 0, "Cannot close socket (%d)", -errno); /* Check that we can set the interface */ - sock = zsock_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(NET_AF_INET, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); /* Clear any existing interface value by setting it to 0 */ @@ -2742,14 +2746,14 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) mreqn.imr_ifindex = 0; mreqn.imr_address.s_addr = 0; - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &mreqn, optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); /* Verify that we get the empty value */ optlen = sizeof(addr); - ret = zsock_getsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_getsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &addr, &optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -2760,7 +2764,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) mreqn.imr_ifindex = net_if_get_by_iface(net_if_get_default()); mreqn.imr_address.s_addr = 0; - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &mreqn, optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -2768,7 +2772,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) /* Verify that we get the default interface */ optlen = sizeof(addr); memset(&addr, 0, sizeof(addr)); - ret = zsock_getsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_getsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &addr, &optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -2793,7 +2797,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) loopback_enable_address_swap(false); ret = zsock_sendto(sock, TEST_STR_SMALL, sizeof(TEST_STR_SMALL) - 1, 0, - (struct sockaddr *)&dst_addr, sizeof(dst_addr)); + (struct net_sockaddr *)&dst_addr, sizeof(dst_addr)); zexpect_equal(ret, STRLEN(TEST_STR_SMALL), "invalid send len (was %d expected %d) (%d)", ret, STRLEN(TEST_STR_SMALL), -errno); @@ -2801,7 +2805,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) /* Test that the sent data is received from Ethernet interface. */ addrlen = sizeof(saddr4); ret = zsock_recvfrom(server_sock, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&saddr4, &addrlen); + 0, (struct net_sockaddr *)&saddr4, &addrlen); zexpect_true(ret >= 0, "recvfrom fail"); zexpect_equal(ret, strlen(TEST_STR_SMALL), "unexpected received bytes"); @@ -2813,7 +2817,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) mreqn.imr_ifindex = 0; mreqn.imr_address.s_addr = 0; - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &mreqn, optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -2832,17 +2836,17 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) net_if_get_by_iface(net_if_get_default())); mreqn.imr_address.s_addr = ifaddr->address.in_addr.s_addr; - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &mreqn, optlen); zexpect_equal(ret, 0, "setsockopt failed (%d)", errno); /* Verify that we get the default interface address */ - optlen = sizeof(struct in_addr); - ret = zsock_getsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + optlen = sizeof(struct net_in_addr); + ret = zsock_getsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &addr, &optlen); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); - zexpect_equal(optlen, sizeof(struct in_addr), "setsockopt optlen (%d)", optlen); + zexpect_equal(optlen, sizeof(struct net_in_addr), "setsockopt optlen (%d)", optlen); ret = net_if_ipv4_addr_lookup_by_index(&addr); zexpect_equal(ret, net_if_get_by_iface(net_if_get_default()), "getsockopt multicast ifindex (expected %d got %d)", @@ -2854,7 +2858,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) net_sprint_ipv4_addr(&addr)); ret = zsock_sendto(sock, TEST_STR_SMALL, sizeof(TEST_STR_SMALL) - 1, 0, - (struct sockaddr *)&dst_addr, sizeof(dst_addr)); + (struct net_sockaddr *)&dst_addr, sizeof(dst_addr)); zexpect_equal(ret, STRLEN(TEST_STR_SMALL), "invalid send len (was %d expected %d) (%d)", ret, STRLEN(TEST_STR_SMALL), -errno); @@ -2862,7 +2866,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) /* Test that the sent data is received from default interface. */ addrlen = sizeof(saddr4); ret = zsock_recvfrom(server_sock, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&saddr4, &addrlen); + 0, (struct net_sockaddr *)&saddr4, &addrlen); zexpect_true(ret >= 0, "recvfrom fail"); zexpect_equal(ret, strlen(TEST_STR_SMALL), "unexpected received bytes"); @@ -2876,12 +2880,12 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) net_if_get_by_iface(net_if_get_default())); mreq.imr_interface.s_addr = ifaddr->address.in_addr.s_addr; - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_IF, &mreq, optlen); zexpect_equal(ret, 0, "setsockopt failed (%d)", errno); ret = zsock_sendto(sock, TEST_STR_SMALL, sizeof(TEST_STR_SMALL) - 1, 0, - (struct sockaddr *)&dst_addr, sizeof(dst_addr)); + (struct net_sockaddr *)&dst_addr, sizeof(dst_addr)); zexpect_equal(ret, STRLEN(TEST_STR_SMALL), "invalid send len (was %d expected %d) (%d)", ret, STRLEN(TEST_STR_SMALL), -errno); @@ -2889,7 +2893,7 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) /* Test that the sent data is received from default interface. */ addrlen = sizeof(saddr4); ret = zsock_recvfrom(server_sock, rx_buf, sizeof(rx_buf), - 0, (struct sockaddr *)&saddr4, &addrlen); + 0, (struct net_sockaddr *)&saddr4, &addrlen); zexpect_true(ret >= 0, "recvfrom fail"); zexpect_equal(ret, strlen(TEST_STR_SMALL), "unexpected received bytes"); @@ -2911,52 +2915,52 @@ ZTEST(net_socket_udp, test_ipv4_multicast_ifindex) #define PORT_RANGE(lower, upper) \ (uint32_t)(((uint16_t)(upper) << 16) | (uint16_t)(lower)) -static void check_port_range(struct sockaddr *my_addr, +static void check_port_range(struct net_sockaddr *my_addr, size_t my_addr_len, - struct sockaddr *local_addr, + struct net_sockaddr *local_addr, size_t local_addr_len) { - sa_family_t family = AF_UNSPEC; + net_sa_family_t family = NET_AF_UNSPEC; uint32_t optval; - socklen_t addr_len; - socklen_t optlen; + net_socklen_t addr_len; + net_socklen_t optlen; int sock; int ret, err; addr_len = local_addr_len; - if (my_addr->sa_family == AF_INET) { - family = AF_INET; - } else if (my_addr->sa_family == AF_INET6) { - family = AF_INET6; + if (my_addr->sa_family == NET_AF_INET) { + family = NET_AF_INET; + } else if (my_addr->sa_family == NET_AF_INET6) { + family = NET_AF_INET6; } else { zassert_true(false, "Invalid address family %d", my_addr->sa_family); } - sock = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); optval = PORT_RANGE(1024, 1500); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); optval = 0; optlen = 0U; - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, optlen); err = -errno; zexpect_equal(ret, -1, "setsockopt failed (%d)", err); optval = 0; optlen = sizeof(uint64_t); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, optlen); err = -errno; zexpect_equal(ret, -1, "setsockopt failed (%d)", err); optval = PORT_RANGE(0, 0); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -2964,23 +2968,23 @@ static void check_port_range(struct sockaddr *my_addr, * then taken into use when we bind the socket. */ optval = PORT_RANGE(1024, 0); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); zexpect_equal(ret, 0, "setsockopt failed (%d)", err); optval = PORT_RANGE(0, 1024); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); zexpect_equal(ret, 0, "setsockopt failed (%d)", err); /* Then set a valid range and verify that bound socket is using it */ optval = PORT_RANGE(10000, 10010); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); zexpect_equal(ret, 0, "setsockopt failed (%d)", err); optval = 0; optlen = sizeof(optval); - ret = zsock_getsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_getsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, &optlen); zexpect_equal(ret, 0, "setsockopt failed (%d)", err); zexpect_equal(optval, PORT_RANGE(10000, 10010), "Invalid port range"); @@ -2994,20 +2998,20 @@ static void check_port_range(struct sockaddr *my_addr, zexpect_equal(ret, 0, "getsockname failed (%d)", err); /* The port should be in the range */ - zexpect_true(ntohs(net_sin(local_addr)->sin_port) >= 10000 && - ntohs(net_sin(local_addr)->sin_port) <= 10010, - "Invalid port %d", ntohs(net_sin(local_addr)->sin_port)); + zexpect_true(net_ntohs(net_sin(local_addr)->sin_port) >= 10000 && + net_ntohs(net_sin(local_addr)->sin_port) <= 10010, + "Invalid port %d", net_ntohs(net_sin(local_addr)->sin_port)); (void)zsock_close(sock); /* Try setting invalid range and verify that we do not net a port from that * range. */ - sock = zsock_socket(family, SOCK_DGRAM, IPPROTO_UDP); + sock = zsock_socket(family, NET_SOCK_DGRAM, NET_IPPROTO_UDP); zassert_true(sock >= 0, "Cannot create socket (%d)", -errno); optval = PORT_RANGE(1001, 1000); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); err = -errno; zexpect_equal(ret, -1, "setsockopt failed (%d)", err); @@ -3015,14 +3019,14 @@ static void check_port_range(struct sockaddr *my_addr, /* Port range cannot be just one port */ optval = PORT_RANGE(1001, 1001); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); err = -errno; zexpect_equal(ret, -1, "setsockopt failed (%d)", err); zexpect_equal(err, -EINVAL, "Invalid errno (%d)", -err); optval = PORT_RANGE(0, 1000); - ret = zsock_setsockopt(sock, IPPROTO_IP, IP_LOCAL_PORT_RANGE, + ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE, &optval, sizeof(optval)); err = -errno; zexpect_equal(ret, 0, "setsockopt failed (%d)", err); @@ -3037,9 +3041,9 @@ static void check_port_range(struct sockaddr *my_addr, zexpect_equal(ret, 0, "getsockname failed (%d)", err); /* The port should not be in the range */ - zexpect_false(ntohs(net_sin(local_addr)->sin_port) >= 1000 && - ntohs(net_sin(local_addr)->sin_port) <= 1001, - "Invalid port %d", ntohs(net_sin(local_addr)->sin_port)); + zexpect_false(net_ntohs(net_sin(local_addr)->sin_port) >= 1000 && + net_ntohs(net_sin(local_addr)->sin_port) <= 1001, + "Invalid port %d", net_ntohs(net_sin(local_addr)->sin_port)); (void)zsock_close(sock); } @@ -3048,40 +3052,40 @@ static void check_port_range(struct sockaddr *my_addr, ZTEST(net_socket_udp, test_clamp_udp_tcp_port_range) { #if defined(CONFIG_NET_CONTEXT_CLAMP_PORT_RANGE) - struct sockaddr_in my_addr4 = { - .sin_family = AF_INET, + struct net_sockaddr_in my_addr4 = { + .sin_family = NET_AF_INET, .sin_port = 0, .sin_addr = { { { 192, 0, 2, 2 } } }, }; - struct sockaddr_in6 my_addr6 = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 my_addr6 = { + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = in6addr_loopback, }; - struct sockaddr_in local_addr4; - struct sockaddr_in6 local_addr6; + struct net_sockaddr_in local_addr4; + struct net_sockaddr_in6 local_addr6; /* First try with a IPv4 socket */ - check_port_range((struct sockaddr *)&my_addr4, sizeof(my_addr4), - (struct sockaddr *)&local_addr4, sizeof(local_addr4)); + check_port_range((struct net_sockaddr *)&my_addr4, sizeof(my_addr4), + (struct net_sockaddr *)&local_addr4, sizeof(local_addr4)); /* Finally try with a IPv6 socket */ - check_port_range((struct sockaddr *)&my_addr6, sizeof(my_addr6), - (struct sockaddr *)&local_addr6, sizeof(local_addr6)); + check_port_range((struct net_sockaddr *)&my_addr6, sizeof(my_addr6), + (struct net_sockaddr *)&local_addr6, sizeof(local_addr6)); #else ztest_test_skip(); #endif } static void test_dgram_peer_addr_reset(int sock_c, int sock_s1, int sock_s2, - struct sockaddr *addr_c, socklen_t addrlen_c, - struct sockaddr *addr_s1, socklen_t addrlen_s1, - struct sockaddr *addr_s2, socklen_t addrlen_s2) + struct net_sockaddr *addr_c, net_socklen_t addrlen_c, + struct net_sockaddr *addr_s1, net_socklen_t addrlen_s1, + struct net_sockaddr *addr_s2, net_socklen_t addrlen_s2) { uint8_t tx_buf = 0xab; uint8_t rx_buf; - struct sockaddr_storage unspec = { - .ss_family = AF_UNSPEC, + struct net_sockaddr_storage unspec = { + .ss_family = NET_AF_UNSPEC, }; int rv; @@ -3110,7 +3114,7 @@ static void test_dgram_peer_addr_reset(int sock_c, int sock_s1, int sock_s2, zassert_equal(errno, EAGAIN, "incorrect errno"); /* Reset peer address */ - rv = zsock_connect(sock_c, (struct sockaddr *)&unspec, sizeof(unspec)); + rv = zsock_connect(sock_c, (struct net_sockaddr *)&unspec, sizeof(unspec)); zassert_equal(rv, 0, "connect failed"); /* Verify that a datagram can be received from other address */ @@ -3138,18 +3142,18 @@ ZTEST(net_socket_udp, test_v4_dgram_peer_addr_reset) int client_sock; int server_sock_1; int server_sock_2; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr_1; - struct sockaddr_in server_addr_2; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr_1; + struct net_sockaddr_in server_addr_2; prepare_sock_udp_v4(MY_IPV4_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock_1, &server_addr_1); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT + 1, &server_sock_2, &server_addr_2); test_dgram_peer_addr_reset(client_sock, server_sock_1, server_sock_2, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr_1, sizeof(server_addr_1), - (struct sockaddr *)&server_addr_2, sizeof(server_addr_2)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr_1, sizeof(server_addr_1), + (struct net_sockaddr *)&server_addr_2, sizeof(server_addr_2)); } ZTEST(net_socket_udp, test_v6_dgram_peer_addr_reset) @@ -3157,38 +3161,38 @@ ZTEST(net_socket_udp, test_v6_dgram_peer_addr_reset) int client_sock; int server_sock_1; int server_sock_2; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr_1; - struct sockaddr_in6 server_addr_2; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr_1; + struct net_sockaddr_in6 server_addr_2; prepare_sock_udp_v6(MY_IPV6_ADDR, CLIENT_PORT, &client_sock, &client_addr); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock_1, &server_addr_1); prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT + 1, &server_sock_2, &server_addr_2); test_dgram_peer_addr_reset(client_sock, server_sock_1, server_sock_2, - (struct sockaddr *)&client_addr, sizeof(client_addr), - (struct sockaddr *)&server_addr_1, sizeof(server_addr_1), - (struct sockaddr *)&server_addr_2, sizeof(server_addr_2)); + (struct net_sockaddr *)&client_addr, sizeof(client_addr), + (struct net_sockaddr *)&server_addr_1, sizeof(server_addr_1), + (struct net_sockaddr *)&server_addr_2, sizeof(server_addr_2)); } static void comm_sendmsg_recvmsg_hop_limit(int client_sock, - struct sockaddr *client_addr, - socklen_t client_addrlen, - const struct msghdr *client_msg, + struct net_sockaddr *client_addr, + net_socklen_t client_addrlen, + const struct net_msghdr *client_msg, int server_sock, - struct sockaddr *server_addr, - socklen_t server_addrlen, - struct msghdr *msg, + struct net_sockaddr *server_addr, + net_socklen_t server_addrlen, + struct net_msghdr *msg, void *cmsgbuf, int cmsgbuf_len, bool expect_control_data) { #define MAX_BUF_LEN 64 char buf[MAX_BUF_LEN]; - struct iovec io_vector[1]; + struct net_iovec io_vector[1]; ssize_t sent; ssize_t recved; - struct sockaddr addr; - socklen_t addrlen = server_addrlen; + struct net_sockaddr addr; + net_socklen_t addrlen = server_addrlen; int len, i; zassert_not_null(client_addr, "null client addr"); @@ -3248,23 +3252,23 @@ static void comm_sendmsg_recvmsg_hop_limit(int client_sock, } static void run_ancillary_recvmsg_hoplimit_test(int client_sock, - struct sockaddr *client_addr, + struct net_sockaddr *client_addr, int client_addr_len, int server_sock, - struct sockaddr *server_addr, + struct net_sockaddr *server_addr, int server_addr_len) { int rv; int opt; - socklen_t optlen; - struct msghdr msg; - struct msghdr server_msg; - struct iovec io_vector[1]; - struct cmsghdr *cmsg, *prevcmsg; + net_socklen_t optlen; + struct net_msghdr msg; + struct net_msghdr server_msg; + struct net_iovec io_vector[1]; + struct net_cmsghdr *cmsg, *prevcmsg; int send_hop_limit = 90, recv_hop_limit = 0; union { - struct cmsghdr hdr; - unsigned char buf[CMSG_SPACE(sizeof(int))]; + struct net_cmsghdr hdr; + unsigned char buf[NET_CMSG_SPACE(sizeof(int))]; } cmsgbuf; Z_TEST_SKIP_IFNDEF(CONFIG_NET_CONTEXT_RECV_HOPLIMIT); @@ -3288,17 +3292,17 @@ static void run_ancillary_recvmsg_hoplimit_test(int client_sock, msg.msg_control = &cmsgbuf.buf; msg.msg_controllen = sizeof(cmsgbuf.buf); - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - if (client_addr->sa_family == AF_INET) { - cmsg->cmsg_level = IPPROTO_IP; - cmsg->cmsg_type = IP_TTL; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(int)); + if (client_addr->sa_family == NET_AF_INET) { + cmsg->cmsg_level = NET_IPPROTO_IP; + cmsg->cmsg_type = ZSOCK_IP_TTL; } else { - cmsg->cmsg_level = IPPROTO_IPV6; - cmsg->cmsg_type = IPV6_HOPLIMIT; + cmsg->cmsg_level = NET_IPPROTO_IPV6; + cmsg->cmsg_type = ZSOCK_IPV6_HOPLIMIT; } - *(int *)CMSG_DATA(cmsg) = send_hop_limit; + *(int *)NET_CMSG_DATA(cmsg) = send_hop_limit; comm_sendmsg_recvmsg_hop_limit(client_sock, client_addr, @@ -3312,19 +3316,19 @@ static void run_ancillary_recvmsg_hoplimit_test(int client_sock, sizeof(cmsgbuf.buf), true); - for (prevcmsg = NULL, cmsg = CMSG_FIRSTHDR(&server_msg); + for (prevcmsg = NULL, cmsg = NET_CMSG_FIRSTHDR(&server_msg); cmsg != NULL && prevcmsg != cmsg; - prevcmsg = cmsg, cmsg = CMSG_NXTHDR(&server_msg, cmsg)) { - if (client_addr->sa_family == AF_INET) { - if (cmsg->cmsg_level == IPPROTO_IP && - cmsg->cmsg_type == IP_TTL) { - recv_hop_limit = *(int *)CMSG_DATA(cmsg); + prevcmsg = cmsg, cmsg = NET_CMSG_NXTHDR(&server_msg, cmsg)) { + if (client_addr->sa_family == NET_AF_INET) { + if (cmsg->cmsg_level == NET_IPPROTO_IP && + cmsg->cmsg_type == ZSOCK_IP_TTL) { + recv_hop_limit = *(int *)NET_CMSG_DATA(cmsg); break; } } else { - if (cmsg->cmsg_level == IPPROTO_IPV6 && - cmsg->cmsg_type == IPV6_HOPLIMIT) { - recv_hop_limit = *(int *)CMSG_DATA(cmsg); + if (cmsg->cmsg_level == NET_IPPROTO_IPV6 && + cmsg->cmsg_type == ZSOCK_IPV6_HOPLIMIT) { + recv_hop_limit = *(int *)NET_CMSG_DATA(cmsg); break; } } @@ -3335,10 +3339,12 @@ static void run_ancillary_recvmsg_hoplimit_test(int client_sock, opt = 1; optlen = sizeof(opt); - if (server_addr->sa_family == AF_INET) { - rv = zsock_setsockopt(server_sock, IPPROTO_IP, IP_RECVTTL, &opt, optlen); + if (server_addr->sa_family == NET_AF_INET) { + rv = zsock_setsockopt(server_sock, NET_IPPROTO_IP, + ZSOCK_IP_RECVTTL, &opt, optlen); } else { - rv = zsock_setsockopt(server_sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opt, optlen); + rv = zsock_setsockopt(server_sock, NET_IPPROTO_IPV6, + ZSOCK_IPV6_RECVHOPLIMIT, &opt, optlen); } zassert_equal(rv, 0, "setsockopt failed (%d)", -errno); @@ -3352,17 +3358,17 @@ static void run_ancillary_recvmsg_hoplimit_test(int client_sock, msg.msg_control = &cmsgbuf.buf; msg.msg_controllen = sizeof(cmsgbuf.buf); - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_len = CMSG_LEN(sizeof(int)); - if (client_addr->sa_family == AF_INET) { - cmsg->cmsg_level = IPPROTO_IP; - cmsg->cmsg_type = IP_TTL; + cmsg = NET_CMSG_FIRSTHDR(&msg); + cmsg->cmsg_len = NET_CMSG_LEN(sizeof(int)); + if (client_addr->sa_family == NET_AF_INET) { + cmsg->cmsg_level = NET_IPPROTO_IP; + cmsg->cmsg_type = ZSOCK_IP_TTL; } else { - cmsg->cmsg_level = IPPROTO_IPV6; - cmsg->cmsg_type = IPV6_HOPLIMIT; + cmsg->cmsg_level = NET_IPPROTO_IPV6; + cmsg->cmsg_type = ZSOCK_IPV6_HOPLIMIT; } - *(int *)CMSG_DATA(cmsg) = send_hop_limit; + *(int *)NET_CMSG_DATA(cmsg) = send_hop_limit; comm_sendmsg_recvmsg_hop_limit(client_sock, client_addr, @@ -3376,19 +3382,19 @@ static void run_ancillary_recvmsg_hoplimit_test(int client_sock, sizeof(cmsgbuf.buf), true); - for (prevcmsg = NULL, cmsg = CMSG_FIRSTHDR(&server_msg); + for (prevcmsg = NULL, cmsg = NET_CMSG_FIRSTHDR(&server_msg); cmsg != NULL && prevcmsg != cmsg; - prevcmsg = cmsg, cmsg = CMSG_NXTHDR(&server_msg, cmsg)) { - if (client_addr->sa_family == AF_INET) { - if (cmsg->cmsg_level == IPPROTO_IP && - cmsg->cmsg_type == IP_TTL) { - recv_hop_limit = *(int *)CMSG_DATA(cmsg); + prevcmsg = cmsg, cmsg = NET_CMSG_NXTHDR(&server_msg, cmsg)) { + if (client_addr->sa_family == NET_AF_INET) { + if (cmsg->cmsg_level == NET_IPPROTO_IP && + cmsg->cmsg_type == ZSOCK_IP_TTL) { + recv_hop_limit = *(int *)NET_CMSG_DATA(cmsg); break; } } else { - if (cmsg->cmsg_level == IPPROTO_IPV6 && - cmsg->cmsg_type == IPV6_HOPLIMIT) { - recv_hop_limit = *(int *)CMSG_DATA(cmsg); + if (cmsg->cmsg_level == NET_IPPROTO_IPV6 && + cmsg->cmsg_type == ZSOCK_IPV6_HOPLIMIT) { + recv_hop_limit = *(int *)NET_CMSG_DATA(cmsg); break; } } @@ -3399,8 +3405,8 @@ static void run_ancillary_recvmsg_hoplimit_test(int client_sock, ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv4_hoplimit_data_user) { - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; int client_sock; int server_sock; @@ -3408,17 +3414,17 @@ ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv4_hoplimit_data_user) prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); run_ancillary_recvmsg_hoplimit_test(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); } ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv6_hoplimit_data_user) { - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; int client_sock; int server_sock; @@ -3426,27 +3432,27 @@ ZTEST_USER(net_socket_udp, test_recvmsg_ancillary_ipv6_hoplimit_data_user) prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock, &server_addr); run_ancillary_recvmsg_hoplimit_test(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); } static void sendto_recvfrom(int client_sock, - struct sockaddr *client_addr, - socklen_t client_addrlen, + struct net_sockaddr *client_addr, + net_socklen_t client_addrlen, int server_sock, - struct sockaddr *server_addr, - socklen_t server_addrlen, + struct net_sockaddr *server_addr, + net_socklen_t server_addrlen, bool expect_failure) { ssize_t sent = 0; ssize_t recved = 0; - struct sockaddr addr; - socklen_t addrlen; - struct sockaddr addr2; - socklen_t addrlen2; + struct net_sockaddr addr; + net_socklen_t addrlen; + struct net_sockaddr addr2; + net_socklen_t addrlen2; zassert_not_null(client_addr, "null client addr"); zassert_not_null(server_addr, "null server addr"); @@ -3505,22 +3511,22 @@ ZTEST_USER(net_socket_udp, test_udp_shutdown_recv) int rv; int client_sock; int server_sock; - struct sockaddr_in client_addr; - struct sockaddr_in server_addr; + struct net_sockaddr_in client_addr; + struct net_sockaddr_in server_addr; prepare_sock_udp_v4(MY_IPV4_ADDR, ANY_PORT, &client_sock, &client_addr); prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock, &server_addr); rv = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(rv, 0, "bind failed"); sendto_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr), false); @@ -3529,10 +3535,10 @@ ZTEST_USER(net_socket_udp, test_udp_shutdown_recv) zassert_equal(rv, 0, "shutdown failed (%d)", -errno); sendto_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr), true); @@ -3552,12 +3558,12 @@ void test_ipv4_mapped_to_ipv6_send_common(enum ipv4_mapped_to_ipv6_send_mode tes int off = 0; int ret; int sock_s, sock_c; - socklen_t addrlen; - struct sockaddr_in addr_c4 = { 0 }; - struct sockaddr_in addr_s4 = { 0 }; - struct sockaddr_in6 addr_s6 = { 0 }; - struct sockaddr_in6 addr_recv = { 0 }; - struct in6_addr mapped_address = { 0 }; + net_socklen_t addrlen; + struct net_sockaddr_in addr_c4 = { 0 }; + struct net_sockaddr_in addr_s4 = { 0 }; + struct net_sockaddr_in6 addr_s6 = { 0 }; + struct net_sockaddr_in6 addr_recv = { 0 }; + struct net_in6_addr mapped_address = { 0 }; /* Create IPv4 client socket */ prepare_sock_udp_v4(MY_IPV4_ADDR, CLIENT_PORT, &sock_c, &addr_c4); @@ -3565,31 +3571,31 @@ void test_ipv4_mapped_to_ipv6_send_common(enum ipv4_mapped_to_ipv6_send_mode tes prepare_sock_udp_v6(ANY_IPV6_ADDR, SERVER_PORT, &sock_s, &addr_s6); /* Prepare server's IPv4 address and expected mapped address */ - addr_s4.sin_family = AF_INET; - addr_s4.sin_port = htons(SERVER_PORT); - ret = zsock_inet_pton(AF_INET, MY_IPV4_ADDR, &addr_s4.sin_addr); + addr_s4.sin_family = NET_AF_INET; + addr_s4.sin_port = net_htons(SERVER_PORT); + ret = zsock_inet_pton(NET_AF_INET, MY_IPV4_ADDR, &addr_s4.sin_addr); zassert_equal(ret, 1, "inet_pton failed"); - ret = zsock_inet_pton(AF_INET6, MY_IPV4_MAPPED_ADDR, &mapped_address); + ret = zsock_inet_pton(NET_AF_INET6, MY_IPV4_MAPPED_ADDR, &mapped_address); zassert_equal(ret, 1, "inet_pton failed"); /* Bind the client socket to ensure we check the correct address */ - ret = zsock_bind(sock_c, (struct sockaddr *)&addr_c4, sizeof(addr_c4)); + ret = zsock_bind(sock_c, (struct net_sockaddr *)&addr_c4, sizeof(addr_c4)); zassert_ok(ret, "bind failed, %d", errno); /* Turn off IPV6_V6ONLY on the server socket, so the socket becomes * dual-stack. */ - ret = zsock_setsockopt(sock_s, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)); + ret = zsock_setsockopt(sock_s, NET_IPPROTO_IPV6, ZSOCK_IPV6_V6ONLY, &off, sizeof(off)); zassert_ok(ret, "setsockopt failed, %d", errno); /* And bind it to ANY address */ - ret = zsock_bind(sock_s, (struct sockaddr *)&addr_s6, sizeof(addr_s6)); + ret = zsock_bind(sock_s, (struct net_sockaddr *)&addr_s6, sizeof(addr_s6)); zassert_ok(ret, "bind failed, %d", errno); /* Send datagram from IPv4 client socket to dual-stack server */ ret = zsock_sendto(sock_c, TEST_STR_SMALL, sizeof(TEST_STR_SMALL) - 1, 0, - (struct sockaddr *)&addr_s4, sizeof(addr_s4)); + (struct net_sockaddr *)&addr_s4, sizeof(addr_s4)); zexpect_equal(ret, sizeof(TEST_STR_SMALL) - 1, "invalid send len (was %d expected %d) (%d)", ret, sizeof(TEST_STR_SMALL) - 1, errno); @@ -3601,27 +3607,27 @@ void test_ipv4_mapped_to_ipv6_send_common(enum ipv4_mapped_to_ipv6_send_mode tes addrlen = sizeof(addr_recv); clear_buf(rx_buf); ret = zsock_recvfrom(sock_s, rx_buf, sizeof(rx_buf), ZSOCK_MSG_DONTWAIT, - (struct sockaddr *)&addr_recv, &addrlen); + (struct net_sockaddr *)&addr_recv, &addrlen); zassert_true(ret >= 0, "recvfrom fail (%d)", errno); zassert_equal(ret, sizeof(TEST_STR_SMALL) - 1, "unexpected received bytes"); zassert_mem_equal(rx_buf, BUF_AND_SIZE(TEST_STR_SMALL), "wrong data"); - zassert_equal(addrlen, sizeof(struct sockaddr_in6), "unexpected addrlen"); - zassert_equal(addr_recv.sin6_family, AF_INET6, - "IPv4-to-IPv6 mapped address should be AF_INET6"); - zassert_equal(addr_recv.sin6_port, htons(CLIENT_PORT), "invalid port"); + zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "unexpected addrlen"); + zassert_equal(addr_recv.sin6_family, NET_AF_INET6, + "IPv4-to-IPv6 mapped address should be NET_AF_INET6"); + zassert_equal(addr_recv.sin6_port, net_htons(CLIENT_PORT), "invalid port"); zassert_mem_equal(&addr_recv.sin6_addr, &mapped_address, sizeof(mapped_address), "invalid mapped address"); /* Echo data back */ if (test_mode == IPV4_MAPPED_TO_IPV6_SENDTO) { ret = zsock_sendto(sock_s, TEST_STR_SMALL, sizeof(TEST_STR_SMALL) - 1, 0, - (struct sockaddr *)&addr_recv, addrlen); + (struct net_sockaddr *)&addr_recv, addrlen); zexpect_equal(ret, sizeof(TEST_STR_SMALL) - 1, "invalid send len (was %d expected %d) (%d)", ret, sizeof(TEST_STR_SMALL) - 1, errno); } else if (test_mode == IPV4_MAPPED_TO_IPV6_SENDMSG) { - struct msghdr msg = { 0 }; - struct iovec io_vector[1] = { 0 }; + struct net_msghdr msg = { 0 }; + struct net_iovec io_vector[1] = { 0 }; io_vector[0].iov_base = TEST_STR_SMALL; io_vector[0].iov_len = strlen(TEST_STR_SMALL); @@ -3783,9 +3789,9 @@ static void *setup(void) net_if_up(eth_iface); (void)memset(&udp_server_addr, 0, sizeof(udp_server_addr)); - udp_server_addr.sin6_family = AF_INET6; - udp_server_addr.sin6_port = htons(1234); - ret = zsock_inet_pton(AF_INET6, PEER_IPV6_ADDR_ETH, &udp_server_addr.sin6_addr); + udp_server_addr.sin6_family = NET_AF_INET6; + udp_server_addr.sin6_port = net_htons(1234); + ret = zsock_inet_pton(NET_AF_INET6, PEER_IPV6_ADDR_ETH, &udp_server_addr.sin6_addr); zassert_equal(ret, 1, "inet_pton failed"); /* In order to avoid neighbor discovery, populate neighbor cache */ diff --git a/tests/net/socket/websocket/src/main.c b/tests/net/socket/websocket/src/main.c index 3f54334a77836..e9c2c990dbf07 100644 --- a/tests/net/socket/websocket/src/main.c +++ b/tests/net/socket/websocket/src/main.c @@ -289,7 +289,7 @@ ZTEST(net_websocket, test_recv_two_msg) test_recv_2(sizeof(frame1) + FRAME1_HDR_SIZE / 2); } -int verify_sent_and_received_msg(struct msghdr *msg, bool split_msg) +int verify_sent_and_received_msg(struct net_msghdr *msg, bool split_msg) { static struct websocket_context ctx; uint32_t msg_type = -1; diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c index 768d6b8e546c1..c294a5ee94cd4 100644 --- a/tests/net/tcp/src/main.c +++ b/tests/net/tcp/src/main.c @@ -41,34 +41,34 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_TCP_LOG_LEVEL); /* Data (1280 bytes) to be sent */ static const char lorem_ipsum[] = LOREM_IPSUM; -static struct in_addr my_addr = { { { 192, 0, 2, 1 } } }; -static struct sockaddr_in my_addr_s = { - .sin_family = AF_INET, - .sin_port = htons(PEER_PORT), +static struct net_in_addr my_addr = { { { 192, 0, 2, 1 } } }; +static struct net_sockaddr_in my_addr_s = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(PEER_PORT), .sin_addr = { { { 192, 0, 2, 1 } } }, }; -static struct in_addr peer_addr = { { { 192, 0, 2, 2 } } }; -static struct sockaddr_in peer_addr_s = { - .sin_family = AF_INET, - .sin_port = htons(PEER_PORT), +static struct net_in_addr peer_addr = { { { 192, 0, 2, 2 } } }; +static struct net_sockaddr_in peer_addr_s = { + .sin_family = NET_AF_INET, + .sin_port = net_htons(PEER_PORT), .sin_addr = { { { 192, 0, 2, 2 } } }, }; -static struct in6_addr my_addr_v6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr_v6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct sockaddr_in6 my_addr_v6_s = { - .sin6_family = AF_INET6, - .sin6_port = htons(PEER_PORT), +static struct net_sockaddr_in6 my_addr_v6_s = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(PEER_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }, }; -static struct in6_addr peer_addr_v6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr peer_addr_v6 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; -static struct sockaddr_in6 peer_addr_v6_s = { - .sin6_family = AF_INET6, - .sin6_port = htons(PEER_PORT), +static struct net_sockaddr_in6 peer_addr_v6_s = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(PEER_PORT), .sin6_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }, }; @@ -125,24 +125,24 @@ static void test_server_timeout(struct k_work *work); static int tester_send(const struct device *dev, struct net_pkt *pkt); -static void handle_client_test(sa_family_t af, struct tcphdr *th); -static void handle_server_test(sa_family_t af, struct tcphdr *th); +static void handle_client_test(net_sa_family_t af, struct tcphdr *th); +static void handle_server_test(net_sa_family_t af, struct tcphdr *th); static void handle_syn_resend(void); -static void handle_syn_rst_ack(sa_family_t af, struct tcphdr *th); -static void handle_client_fin_wait_2_test(sa_family_t af, struct tcphdr *th); -static void handle_client_fin_wait_2_failure_test(sa_family_t af, struct tcphdr *th); -static void handle_client_closing_test(sa_family_t af, struct tcphdr *th); -static void handle_client_closing_failure_test(sa_family_t af, struct tcphdr *th); -static void handle_data_fin1_test(sa_family_t af, struct tcphdr *th); -static void handle_data_during_fin1_test(sa_family_t af, struct tcphdr *th); +static void handle_syn_rst_ack(net_sa_family_t af, struct tcphdr *th); +static void handle_client_fin_wait_2_test(net_sa_family_t af, struct tcphdr *th); +static void handle_client_fin_wait_2_failure_test(net_sa_family_t af, struct tcphdr *th); +static void handle_client_closing_test(net_sa_family_t af, struct tcphdr *th); +static void handle_client_closing_failure_test(net_sa_family_t af, struct tcphdr *th); +static void handle_data_fin1_test(net_sa_family_t af, struct tcphdr *th); +static void handle_data_during_fin1_test(net_sa_family_t af, struct tcphdr *th); static void handle_server_recv_out_of_order(struct net_pkt *pkt); -static void handle_server_rst_on_closed_port(sa_family_t af, struct tcphdr *th); -static void handle_server_rst_on_listening_port(sa_family_t af, struct tcphdr *th); -static void handle_syn_invalid_ack(sa_family_t af, struct tcphdr *th); -static void handle_client_fin_ack_with_data_test(sa_family_t af, struct tcphdr *th); -static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th); +static void handle_server_rst_on_closed_port(net_sa_family_t af, struct tcphdr *th); +static void handle_server_rst_on_listening_port(net_sa_family_t af, struct tcphdr *th); +static void handle_syn_invalid_ack(net_sa_family_t af, struct tcphdr *th); +static void handle_client_fin_ack_with_data_test(net_sa_family_t af, struct tcphdr *th); +static void handle_client_seq_validation_test(net_sa_family_t af, struct tcphdr *th); static void handle_server_ack_validation_test(struct net_pkt *pkt); -static void handle_server_fin_ack_after_data_test(sa_family_t af, struct tcphdr *th); +static void handle_server_fin_ack_after_data_test(net_sa_family_t af, struct tcphdr *th); static void verify_flags(struct tcphdr *th, uint8_t flags, const char *fun, int line) @@ -240,7 +240,7 @@ static uint8_t tcp_options[20] = { 0x01, /* NOP */ 0x03, 0x03, 0x07 /* Win scale*/ }; -static struct net_pkt *tester_prepare_tcp_pkt(sa_family_t af, +static struct net_pkt *tester_prepare_tcp_pkt(net_sa_family_t af, uint16_t src_port, uint16_t dst_port, uint8_t flags, @@ -260,15 +260,15 @@ static struct net_pkt *tester_prepare_tcp_pkt(sa_family_t af, /* Allocate buffer */ pkt = net_pkt_alloc_with_buffer(net_iface, sizeof(struct tcphdr) + len + opts_len, - af, IPPROTO_TCP, K_NO_WAIT); + af, NET_IPPROTO_TCP, K_NO_WAIT); if (!pkt) { return NULL; } /* Create IP header */ - if (af == AF_INET) { + if (af == NET_AF_INET) { ret = net_ipv4_create(pkt, &peer_addr, &my_addr); - } else if (af == AF_INET6) { + } else if (af == NET_AF_INET6) { ret = net_ipv6_create(pkt, &peer_addr_v6, &my_addr_v6); } else { goto fail; @@ -296,11 +296,11 @@ static struct net_pkt *tester_prepare_tcp_pkt(sa_family_t af, } th->th_flags = flags; - th->th_win = htons(NET_IPV6_MTU); - th->th_seq = htonl(seq); + th->th_win = net_htons(NET_IPV6_MTU); + th->th_seq = net_htonl(seq); if (ACK & flags) { - th->th_ack = htonl(ack); + th->th_ack = net_htonl(ack); } ret = net_pkt_set_data(pkt, &tcp_access); @@ -325,10 +325,10 @@ static struct net_pkt *tester_prepare_tcp_pkt(sa_family_t af, net_pkt_cursor_init(pkt); - if (af == AF_INET) { - ret = net_ipv4_finalize(pkt, IPPROTO_TCP); - } else if (af == AF_INET6) { - ret = net_ipv6_finalize(pkt, IPPROTO_TCP); + if (af == NET_AF_INET) { + ret = net_ipv4_finalize(pkt, NET_IPPROTO_TCP); + } else if (af == NET_AF_INET6) { + ret = net_ipv6_finalize(pkt, NET_IPPROTO_TCP); } else { goto fail; } @@ -343,33 +343,33 @@ static struct net_pkt *tester_prepare_tcp_pkt(sa_family_t af, return NULL; } -static struct net_pkt *prepare_syn_packet(sa_family_t af, uint16_t src_port, +static struct net_pkt *prepare_syn_packet(net_sa_family_t af, uint16_t src_port, uint16_t dst_port) { return tester_prepare_tcp_pkt(af, src_port, dst_port, SYN, NULL, 0U); } -static struct net_pkt *prepare_syn_ack_packet(sa_family_t af, uint16_t src_port, +static struct net_pkt *prepare_syn_ack_packet(net_sa_family_t af, uint16_t src_port, uint16_t dst_port) { return tester_prepare_tcp_pkt(af, src_port, dst_port, SYN | ACK, NULL, 0U); } -static struct net_pkt *prepare_rst_ack_packet(sa_family_t af, uint16_t src_port, +static struct net_pkt *prepare_rst_ack_packet(net_sa_family_t af, uint16_t src_port, uint16_t dst_port) { return tester_prepare_tcp_pkt(af, src_port, dst_port, RST | ACK, NULL, 0U); } -static struct net_pkt *prepare_ack_packet(sa_family_t af, uint16_t src_port, +static struct net_pkt *prepare_ack_packet(net_sa_family_t af, uint16_t src_port, uint16_t dst_port) { return tester_prepare_tcp_pkt(af, src_port, dst_port, ACK, NULL, 0U); } -static struct net_pkt *prepare_data_packet(sa_family_t af, uint16_t src_port, +static struct net_pkt *prepare_data_packet(net_sa_family_t af, uint16_t src_port, uint16_t dst_port, const uint8_t *data, size_t len) @@ -378,14 +378,14 @@ static struct net_pkt *prepare_data_packet(sa_family_t af, uint16_t src_port, len); } -static struct net_pkt *prepare_fin_ack_packet(sa_family_t af, uint16_t src_port, +static struct net_pkt *prepare_fin_ack_packet(net_sa_family_t af, uint16_t src_port, uint16_t dst_port) { return tester_prepare_tcp_pkt(af, src_port, dst_port, FIN | ACK, NULL, 0U); } -static struct net_pkt *prepare_rst_packet(sa_family_t af, uint16_t src_port, +static struct net_pkt *prepare_rst_packet(net_sa_family_t af, uint16_t src_port, uint16_t dst_port) { return tester_prepare_tcp_pkt(af, src_port, dst_port, RST, NULL, 0U); @@ -393,10 +393,10 @@ static struct net_pkt *prepare_rst_packet(sa_family_t af, uint16_t src_port, static bool is_icmp_pkt(struct net_pkt *pkt) { - if (net_pkt_family(pkt) == AF_INET) { - return NET_IPV4_HDR(pkt)->proto == IPPROTO_ICMP; + if (net_pkt_family(pkt) == NET_AF_INET) { + return NET_IPV4_HDR(pkt)->proto == NET_IPPROTO_ICMP; } else { - return NET_IPV6_HDR(pkt)->nexthdr == IPPROTO_ICMPV6; + return NET_IPV6_HDR(pkt)->nexthdr == NET_IPPROTO_ICMPV6; } } @@ -535,7 +535,7 @@ static void *presetup(void) return NULL; } -static void handle_client_test(sa_family_t af, struct tcphdr *th) +static void handle_client_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -544,8 +544,8 @@ static void handle_client_test(sa_family_t af, struct tcphdr *th) case T_SYN: test_verify_flags(th, SYN); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_SYN_ACK; break; @@ -559,7 +559,7 @@ static void handle_client_test(sa_family_t af, struct tcphdr *th) test_verify_flags(th, PSH | ACK); seq++; ack = ack + 1U; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_FIN; test_sem_give(); break; @@ -567,7 +567,7 @@ static void handle_client_test(sa_family_t af, struct tcphdr *th) test_verify_flags(th, FIN | ACK); ack = ack + 1U; t_state = T_FIN_ACK; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_ACK: @@ -610,15 +610,15 @@ ZTEST(net_tcp, test_client_ipv4) test_case_no = TEST_CLIENT_IPV4; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -672,15 +672,15 @@ ZTEST(net_tcp, test_client_ipv6) test_case_no = TEST_CLIENT_IPV6; seq = ack = 0; - ret = net_context_get(AF_INET6, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_v6_s, - sizeof(struct sockaddr_in6), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_v6_s, + sizeof(struct net_sockaddr_in6), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -713,43 +713,43 @@ ZTEST(net_tcp, test_client_ipv6) k_sleep(K_MSEC(CONFIG_NET_TCP_TIME_WAIT_DELAY)); } -static void handle_server_test(sa_family_t af, struct tcphdr *th) +static void handle_server_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; switch (t_state) { case T_SYN: - reply = prepare_syn_packet(af, htons(MY_PORT), - htons(PEER_PORT)); + reply = prepare_syn_packet(af, net_htons(MY_PORT), + net_htons(PEER_PORT)); t_state = T_SYN_ACK; break; case T_SYN_ACK: test_verify_flags(th, SYN | ACK); seq++; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_ack_packet(af, htons(MY_PORT), - htons(PEER_PORT)); + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_ack_packet(af, net_htons(MY_PORT), + net_htons(PEER_PORT)); t_state = T_DATA; break; case T_DATA: - reply = prepare_data_packet(af, htons(MY_PORT), - htons(PEER_PORT), "A", 1U); + reply = prepare_data_packet(af, net_htons(MY_PORT), + net_htons(PEER_PORT), "A", 1U); t_state = T_DATA_ACK; break; case T_DATA_ACK: test_verify_flags(th, ACK); seq++; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), - htons(PEER_PORT)); + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), + net_htons(PEER_PORT)); t_state = T_FIN; break; case T_FIN: test_verify_flags(th, FIN | ACK); seq++; ack++; - reply = prepare_ack_packet(af, htons(MY_PORT), - htons(PEER_PORT)); + reply = prepare_ack_packet(af, net_htons(MY_PORT), + net_htons(PEER_PORT)); t_state = T_FIN_ACK; break; case T_FIN_ACK: @@ -775,9 +775,9 @@ static void test_server_timeout(struct k_work *work) test_case_no == TEST_SERVER_WITH_OPTIONS_IPV4 || test_case_no == TEST_SERVER_RST_ON_CLOSED_PORT || test_case_no == TEST_SERVER_RST_ON_LISTENING_PORT_NO_ACTIVE_CONNECTION) { - handle_server_test(AF_INET, NULL); + handle_server_test(NET_AF_INET, NULL); } else if (test_case_no == TEST_SERVER_IPV6) { - handle_server_test(AF_INET6, NULL); + handle_server_test(NET_AF_INET6, NULL); } else { zassert_true(false, "Invalid test case"); } @@ -802,8 +802,8 @@ static void test_tcp_recv_cb(struct net_context *context, static struct net_context *accepted_ctx; static void test_tcp_accept_cb(struct net_context *ctx, - struct sockaddr *addr, - socklen_t addrlen, + struct net_sockaddr *addr, + net_socklen_t addrlen, int status, void *user_data) { @@ -841,15 +841,15 @@ ZTEST(net_tcp, test_server_ipv4) test_case_no = TEST_SERVER_IPV4; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_s, - sizeof(struct sockaddr_in)); + ret = net_context_bind(ctx, (struct net_sockaddr *)&my_addr_s, + sizeof(struct net_sockaddr_in)); if (ret < 0) { zassert_true(false, "Failed to bind net_context"); } @@ -910,15 +910,15 @@ ZTEST(net_tcp, test_server_with_options_ipv4) test_case_no = TEST_SERVER_WITH_OPTIONS_IPV4; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_s, - sizeof(struct sockaddr_in)); + ret = net_context_bind(ctx, (struct net_sockaddr *)&my_addr_s, + sizeof(struct net_sockaddr_in)); if (ret < 0) { zassert_true(false, "Failed to bind net_context"); } @@ -979,15 +979,15 @@ ZTEST(net_tcp, test_server_ipv6) test_case_no = TEST_SERVER_IPV6; seq = ack = 0; - ret = net_context_get(AF_INET6, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_v6_s, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(ctx, (struct net_sockaddr *)&my_addr_v6_s, + sizeof(struct net_sockaddr_in6)); if (ret < 0) { zassert_true(false, "Failed to bind net_context"); } @@ -1054,15 +1054,15 @@ ZTEST(net_tcp, test_client_syn_resend) test_case_no = TEST_CLIENT_SYN_RESEND; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(300 + 50), NULL); @@ -1074,7 +1074,7 @@ ZTEST(net_tcp, test_client_syn_resend) net_context_put(ctx); } -static void handle_syn_rst_ack(sa_family_t af, struct tcphdr *th) +static void handle_syn_rst_ack(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -1083,8 +1083,8 @@ static void handle_syn_rst_ack(sa_family_t af, struct tcphdr *th) case T_SYN: test_verify_flags(th, SYN); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_rst_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_rst_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_CLOSING; break; @@ -1116,15 +1116,15 @@ ZTEST(net_tcp, test_client_syn_rst_ack) test_case_no = TEST_CLIENT_SYN_RST_ACK; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(1000), NULL); @@ -1136,7 +1136,7 @@ ZTEST(net_tcp, test_client_syn_rst_ack) } -static void handle_client_fin_wait_2_test(sa_family_t af, struct tcphdr *th) +static void handle_client_fin_wait_2_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -1146,8 +1146,8 @@ static void handle_client_fin_wait_2_test(sa_family_t af, struct tcphdr *th) case T_SYN: test_verify_flags(th, SYN); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_SYN_ACK; break; @@ -1161,7 +1161,7 @@ static void handle_client_fin_wait_2_test(sa_family_t af, struct tcphdr *th) test_verify_flags(th, PSH | ACK); seq++; ack = ack + 1U; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_FIN; test_sem_give(); break; @@ -1169,11 +1169,11 @@ static void handle_client_fin_wait_2_test(sa_family_t af, struct tcphdr *th) test_verify_flags(th, FIN | ACK); ack = ack + 1U; t_state = T_FIN_2; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_2: t_state = T_FIN_ACK; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_ACK: test_verify_flags(th, ACK); @@ -1220,15 +1220,15 @@ ZTEST(net_tcp, test_client_fin_wait_2_ipv4) test_case_no = TEST_CLIENT_FIN_WAIT_2_IPV4; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -1261,7 +1261,7 @@ ZTEST(net_tcp, test_client_fin_wait_2_ipv4) k_sleep(K_MSEC(CONFIG_NET_TCP_TIME_WAIT_DELAY)); } -static void handle_client_fin_wait_2_failure_test(sa_family_t af, struct tcphdr *th) +static void handle_client_fin_wait_2_failure_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -1271,8 +1271,8 @@ static void handle_client_fin_wait_2_failure_test(sa_family_t af, struct tcphdr case T_SYN: test_verify_flags(th, SYN); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_SYN_ACK; break; @@ -1286,7 +1286,7 @@ static void handle_client_fin_wait_2_failure_test(sa_family_t af, struct tcphdr test_verify_flags(th, PSH | ACK); seq++; ack = ack + 1U; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_FIN; test_sem_give(); break; @@ -1294,7 +1294,7 @@ static void handle_client_fin_wait_2_failure_test(sa_family_t af, struct tcphdr test_verify_flags(th, FIN | ACK); ack = ack + 1U; t_state = T_FIN_2; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_2: t_state = T_FIN_ACK; @@ -1362,15 +1362,15 @@ ZTEST(net_tcp, test_client_fin_wait_2_ipv4_failure) seq = ack = 0; closed = false; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -1404,10 +1404,10 @@ ZTEST(net_tcp, test_client_fin_wait_2_ipv4_failure) static uint32_t get_rel_seq(struct tcphdr *th) { - return ntohl(th->th_seq) - device_initial_seq; + return net_ntohl(th->th_seq) - device_initial_seq; } -static void handle_data_fin1_test(sa_family_t af, struct tcphdr *th) +static void handle_data_fin1_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -1416,10 +1416,10 @@ static void handle_data_fin1_test(sa_family_t af, struct tcphdr *th) switch (t_state) { case T_SYN: test_verify_flags(th, SYN); - device_initial_seq = ntohl(th->th_seq); + device_initial_seq = net_ntohl(th->th_seq); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); seq++; t_state = T_SYN_ACK; @@ -1427,7 +1427,7 @@ static void handle_data_fin1_test(sa_family_t af, struct tcphdr *th) case T_SYN_ACK: test_verify_flags(th, ACK); /* connection is success */ - reply = prepare_data_packet(af, htons(MY_PORT), + reply = prepare_data_packet(af, net_htons(MY_PORT), th->th_sport, "A", 1U); t_state = T_DATA_ACK; break; @@ -1442,12 +1442,12 @@ static void handle_data_fin1_test(sa_family_t af, struct tcphdr *th) zassert_true(get_rel_seq(th) == 1, "%s:%d unexpected sequence number in original FIN, got %d", __func__, __LINE__, get_rel_seq(th)); - zassert_true(ntohl(th->th_ack) == 2, + zassert_true(net_ntohl(th->th_ack) == 2, "%s:%d unexpected acknowledgment in original FIN, got %d", __func__, - __LINE__, ntohl(th->th_ack)); + __LINE__, net_ntohl(th->th_ack)); t_state = T_FIN_1; /* retransmit the data that we already send*/ - reply = prepare_data_packet(af, htons(MY_PORT), + reply = prepare_data_packet(af, net_htons(MY_PORT), th->th_sport, "A", 1U); seq++; break; @@ -1460,16 +1460,16 @@ static void handle_data_fin1_test(sa_family_t af, struct tcphdr *th) zassert_true(get_rel_seq(th) == 2, "%s:%i unexpected sequence number in retransmitted FIN, got %d", __func__, __LINE__, get_rel_seq(th)); - zassert_true(ntohl(th->th_ack) == 2, + zassert_true(net_ntohl(th->th_ack) == 2, "%s:%i unexpected acknowledgment in retransmitted FIN, got %d", - __func__, __LINE__, ntohl(th->th_ack)); + __func__, __LINE__, net_ntohl(th->th_ack)); ack = ack + 1U; t_state = T_FIN_2; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_2: t_state = T_FIN_ACK; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_ACK: test_verify_flags(th, ACK); @@ -1517,15 +1517,15 @@ ZTEST(net_tcp, test_client_fin_wait_1_retransmit_ipv4) test_case_no = TEST_CLIENT_FIN_WAIT_1_RETRANSMIT_IPV4; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -1552,7 +1552,7 @@ ZTEST(net_tcp, test_client_fin_wait_1_retransmit_ipv4) k_sleep(K_MSEC(CONFIG_NET_TCP_TIME_WAIT_DELAY)); } -static void handle_data_during_fin1_test(sa_family_t af, struct tcphdr *th) +static void handle_data_during_fin1_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -1560,10 +1560,10 @@ static void handle_data_during_fin1_test(sa_family_t af, struct tcphdr *th) switch (t_state) { case T_SYN: test_verify_flags(th, SYN); - device_initial_seq = ntohl(th->th_seq); + device_initial_seq = net_ntohl(th->th_seq); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); seq++; t_state = T_SYN_ACK; @@ -1578,14 +1578,14 @@ static void handle_data_during_fin1_test(sa_family_t af, struct tcphdr *th) zassert_true(get_rel_seq(th) == 1, "%s:%d unexpected sequence number in original FIN, got %d", __func__, __LINE__, get_rel_seq(th)); - zassert_true(ntohl(th->th_ack) == 1, + zassert_true(net_ntohl(th->th_ack) == 1, "%s:%d unexpected acknowledgment in original FIN, got %d", __func__, - __LINE__, ntohl(th->th_ack)); + __LINE__, net_ntohl(th->th_ack)); ack = ack + 1U; /* retransmit the data that we already send / missed */ - reply = prepare_data_packet(af, htons(MY_PORT), + reply = prepare_data_packet(af, net_htons(MY_PORT), th->th_sport, "A", 1U); t_state = T_FIN_1; @@ -1635,15 +1635,15 @@ ZTEST(net_tcp, test_client_data_during_fin_1_ipv4) test_case_no = TEST_CLIENT_DATA_DURING_FIN_1_IPV4; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -1667,7 +1667,7 @@ ZTEST(net_tcp, test_client_data_during_fin_1_ipv4) } -static void handle_client_closing_test(sa_family_t af, struct tcphdr *th) +static void handle_client_closing_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -1676,8 +1676,8 @@ static void handle_client_closing_test(sa_family_t af, struct tcphdr *th) case T_SYN: test_verify_flags(th, SYN); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_SYN_ACK; break; @@ -1691,7 +1691,7 @@ static void handle_client_closing_test(sa_family_t af, struct tcphdr *th) test_verify_flags(th, PSH | ACK); seq++; ack = ack + 1U; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_FIN; test_sem_give(); break; @@ -1699,13 +1699,13 @@ static void handle_client_closing_test(sa_family_t af, struct tcphdr *th) test_verify_flags(th, FIN | ACK); ack = ack + 1U; t_state = T_CLOSING; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_CLOSING: test_verify_flags(th, ACK); t_state = T_FIN_ACK; seq++; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; default: zassert_true(false, "%s unexpected state", __func__); @@ -1748,15 +1748,15 @@ ZTEST(net_tcp, test_client_closing_ipv6) test_case_no = TEST_CLIENT_CLOSING_IPV6; seq = ack = 0; - ret = net_context_get(AF_INET6, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_v6_s, - sizeof(struct sockaddr_in6), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_v6_s, + sizeof(struct net_sockaddr_in6), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -1792,7 +1792,7 @@ ZTEST(net_tcp, test_client_closing_ipv6) /* In this test we check that things work properly if we do not receive * the final ACK that leads to TIME_WAIT state. */ -static void handle_client_closing_failure_test(sa_family_t af, struct tcphdr *th) +static void handle_client_closing_failure_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply; int ret; @@ -1801,8 +1801,8 @@ static void handle_client_closing_failure_test(sa_family_t af, struct tcphdr *th case T_SYN: test_verify_flags(th, SYN); seq = 0U; - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_SYN_ACK; break; @@ -1816,31 +1816,31 @@ static void handle_client_closing_failure_test(sa_family_t af, struct tcphdr *th test_verify_flags(th, PSH | ACK); seq++; ack = ack + 1U; - reply = prepare_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); t_state = T_FIN; test_sem_give(); break; case T_FIN: test_verify_flags(th, FIN | ACK); t_state = T_FIN_1; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_1: /* The FIN retransmit timer should not yet be expired */ test_verify_flags(th, ACK); - zassert_equal(ntohl(th->th_seq), ack + 1, "FIN seq was not correct!"); - zassert_equal(ntohl(th->th_ack), seq + 1, "FIN ack was not correct!"); + zassert_equal(net_ntohl(th->th_seq), ack + 1, "FIN seq was not correct!"); + zassert_equal(net_ntohl(th->th_ack), seq + 1, "FIN ack was not correct!"); t_state = T_CLOSING; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), th->th_sport); + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_CLOSING: /* The FIN retransmit timer could have expired */ if (th_flags(th) == (FIN | ACK)) { - zassert_equal(ntohl(th->th_seq), ack, "FIN seq was not correct!"); - zassert_equal(ntohl(th->th_ack), seq + 1, "FIN ack was not correct!"); + zassert_equal(net_ntohl(th->th_seq), ack, "FIN seq was not correct!"); + zassert_equal(net_ntohl(th->th_ack), seq + 1, "FIN ack was not correct!"); } else if (th_flags(th) == ACK) { - zassert_equal(ntohl(th->th_seq), ack + 1, "FIN seq was not correct!"); - zassert_equal(ntohl(th->th_ack), seq + 1, "FIN ack was not correct!"); + zassert_equal(net_ntohl(th->th_seq), ack + 1, "FIN seq was not correct!"); + zassert_equal(net_ntohl(th->th_ack), seq + 1, "FIN ack was not correct!"); } else { zassert_true(false, "Wrong flag received: 0x%x", th_flags(th)); } @@ -1887,15 +1887,15 @@ ZTEST(net_tcp, test_client_closing_failure_ipv6) test_case_no = TEST_CLIENT_CLOSING_FAILURE_IPV6; seq = ack = 0; - ret = net_context_get(AF_INET6, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_v6_s, - sizeof(struct sockaddr_in6), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_v6_s, + sizeof(struct net_sockaddr_in6), NULL, K_MSEC(100), NULL); if (ret < 0) { @@ -1933,15 +1933,15 @@ static struct net_context *create_server_socket(uint32_t my_seq, seq = my_seq; ack = my_ack; - ret = net_context_get(AF_INET6, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET6, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_v6_s, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(ctx, (struct net_sockaddr *)&my_addr_v6_s, + sizeof(struct net_sockaddr_in6)); if (ret < 0) { zassert_true(false, "Failed to bind net_context"); } @@ -1978,7 +1978,7 @@ static void check_rst_fail(uint32_t seq_value) /* Invalid seq in the RST packet */ seq = seq_value; - reply = prepare_rst_packet(AF_INET6, htons(MY_PORT), htons(PEER_PORT)); + reply = prepare_rst_packet(NET_AF_INET6, net_htons(MY_PORT), net_htons(PEER_PORT)); ret = net_recv_data(net_iface, reply); zassert_true(ret == 0, "recv data failed (%d)", ret); @@ -2008,7 +2008,7 @@ static void check_rst_succeed(struct net_context *ctx, /* Another valid seq in the RST packet */ seq = ack + seq_value; - reply = prepare_rst_packet(AF_INET6, htons(MY_PORT), htons(PEER_PORT)); + reply = prepare_rst_packet(NET_AF_INET6, net_htons(MY_PORT), net_htons(PEER_PORT)); rsterr_before = GET_STAT(net_iface, tcp.rsterr); @@ -2070,10 +2070,10 @@ static void handle_server_recv_out_of_order(struct net_pkt *pkt) } /* Verify that we received all the queued data */ - zassert_equal(expected_ack, ntohl(th.th_ack), + zassert_equal(expected_ack, net_ntohl(th.th_ack), "Not all pending data received. " "Expected ACK %u but got %u", - expected_ack, ntohl(th.th_ack)); + expected_ack, net_ntohl(th.th_ack)); test_sem_give(); @@ -2127,7 +2127,7 @@ static void checklist_based_out_of_order_test(struct out_of_order_check_struct * check_ptr = &check_list[i]; seq = sequence_base + check_ptr->seq_offset; - pkt = prepare_data_packet(AF_INET6, htons(MY_PORT), htons(PEER_PORT), + pkt = prepare_data_packet(NET_AF_INET6, net_htons(MY_PORT), net_htons(PEER_PORT), &data[check_ptr->seq_offset], check_ptr->length); zassert_not_null(pkt, "Cannot create pkt"); @@ -2208,7 +2208,7 @@ static void test_server_timeout_out_of_order_data(void) * the testcase does not need to implement full TCP closing handshake. */ seq = expected_ack + 1; - rst = prepare_rst_packet(AF_INET6, htons(MY_PORT), htons(PEER_PORT)); + rst = prepare_rst_packet(NET_AF_INET6, net_htons(MY_PORT), net_htons(PEER_PORT)); ret = net_recv_data(net_iface, rst); zassert_true(ret == 0, "recv data failed (%d)", ret); @@ -2226,14 +2226,14 @@ ZTEST(net_tcp, test_server_out_of_order_data) test_server_timeout_out_of_order_data(); } -static void handle_server_rst_on_closed_port(sa_family_t af, struct tcphdr *th) +static void handle_server_rst_on_closed_port(net_sa_family_t af, struct tcphdr *th) { switch (t_state) { case T_SYN_ACK: /* Port was closed so expect RST instead of SYN */ test_verify_flags(th, RST | ACK); - zassert_equal(ntohl(th->th_seq), 0, "Invalid SEQ value"); - zassert_equal(ntohl(th->th_ack), seq + 1, "Invalid ACK value"); + zassert_equal(net_ntohl(th->th_seq), 0, "Invalid SEQ value"); + zassert_equal(net_ntohl(th->th_ack), seq + 1, "Invalid ACK value"); t_state = T_CLOSING; test_sem_give(); break; @@ -2262,13 +2262,13 @@ ZTEST(net_tcp, test_server_rst_on_closed_port) test_sem_take(K_MSEC(100), __LINE__); } -static void handle_server_rst_on_listening_port(sa_family_t af, struct tcphdr *th) +static void handle_server_rst_on_listening_port(net_sa_family_t af, struct tcphdr *th) { switch (t_state) { case T_DATA_ACK: /* No active connection so expect RST instead of ACK */ test_verify_flags(th, RST); - zassert_equal(ntohl(th->th_seq), ack, "Invalid SEQ value"); + zassert_equal(net_ntohl(th->th_seq), ack, "Invalid SEQ value"); t_state = T_CLOSING; test_sem_give(); break; @@ -2277,8 +2277,8 @@ static void handle_server_rst_on_listening_port(sa_family_t af, struct tcphdr *t } } -static void dummy_accept_cb(struct net_context *ctx, struct sockaddr *addr, - socklen_t addrlen, int status, void *user_data) +static void dummy_accept_cb(struct net_context *ctx, struct net_sockaddr *addr, + net_socklen_t addrlen, int status, void *user_data) { /* Should not ever be called. */ zassert_unreachable("Should not have called dummy accept cb"); @@ -2301,15 +2301,15 @@ ZTEST(net_tcp, test_server_rst_on_listening_port_no_active_connection) k_sem_reset(&test_sem); - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_s, - sizeof(struct sockaddr_in)); + ret = net_context_bind(ctx, (struct net_sockaddr *)&my_addr_s, + sizeof(struct net_sockaddr_in)); if (ret < 0) { zassert_true(false, "Failed to bind net_context"); } @@ -2345,7 +2345,7 @@ ZTEST(net_tcp, test_server_rst_on_listening_port_no_active_connection) * expect ACK. * any failures cause test case to fail. */ -static void handle_syn_invalid_ack(sa_family_t af, struct tcphdr *th) +static void handle_syn_invalid_ack(net_sa_family_t af, struct tcphdr *th) { static bool invalid_ack = true; struct net_pkt *reply; @@ -2356,15 +2356,15 @@ static void handle_syn_invalid_ack(sa_family_t af, struct tcphdr *th) case T_SYN: test_verify_flags(th, SYN); if (invalid_ack) { - ack = ntohl(th->th_seq) + 1000U; - reply = prepare_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1000U; + reply = prepare_ack_packet(af, net_htons(MY_PORT), th->th_sport); /* Expect RST now. */ t_state = T_RST; invalid_ack = false; } else { - ack = ntohl(th->th_seq) + 1U; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), + ack = net_ntohl(th->th_seq) + 1U; + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), th->th_sport); /* Proceed with the handshake on second attempt. */ t_state = T_SYN_ACK; @@ -2381,7 +2381,7 @@ static void handle_syn_invalid_ack(sa_family_t af, struct tcphdr *th) seq++; ack++; t_state = T_FIN_ACK; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), th->th_sport); break; case T_FIN_ACK: @@ -2390,7 +2390,7 @@ static void handle_syn_invalid_ack(sa_family_t af, struct tcphdr *th) return; case T_RST: test_verify_flags(th, RST); - zassert_equal(ntohl(th->th_seq), ack, "Invalid SEQ value"); + zassert_equal(net_ntohl(th->th_seq), ack, "Invalid SEQ value"); /* Wait for SYN retransmission. */ t_state = T_SYN; @@ -2418,15 +2418,15 @@ ZTEST(net_tcp, test_client_rst_on_unexpected_ack_on_syn) test_case_no = TEST_CLIENT_RST_ON_UNEXPECTED_ACK_ON_SYN; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); if (ret < 0) { zassert_true(false, "Failed to get net_context"); } net_context_ref(ctx); - ret = net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), + ret = net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(1000), NULL); zassert_equal(ret, 0, "Connect failed"); @@ -2452,7 +2452,7 @@ static struct k_work_delayable test_fin_data_work; /* In this test we check that FIN packet containing data is handled correctly * by the TCP stack. */ -static void handle_client_fin_ack_with_data_test(sa_family_t af, struct tcphdr *th) +static void handle_client_fin_ack_with_data_test(net_sa_family_t af, struct tcphdr *th) { static uint16_t peer_port; struct net_pkt *reply; @@ -2461,11 +2461,11 @@ static void handle_client_fin_ack_with_data_test(sa_family_t af, struct tcphdr * switch (t_state) { case T_SYN: test_verify_flags(th, SYN); - device_initial_seq = ntohl(th->th_seq); + device_initial_seq = net_ntohl(th->th_seq); seq = 0U; - ack = ntohl(th->th_seq) + 1U; + ack = net_ntohl(th->th_seq) + 1U; peer_port = th->th_sport; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), peer_port); + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), peer_port); seq++; t_state = T_SYN_ACK; break; @@ -2492,7 +2492,7 @@ static void handle_client_fin_ack_with_data_test(sa_family_t af, struct tcphdr * break; } - reply = tester_prepare_tcp_pkt(af, htons(MY_PORT), peer_port, + reply = tester_prepare_tcp_pkt(af, net_htons(MY_PORT), peer_port, flags, TEST_FIN_DATA, strlen(TEST_FIN_DATA)); seq += strlen(TEST_FIN_DATA) + 1; @@ -2502,8 +2502,8 @@ static void handle_client_fin_ack_with_data_test(sa_family_t af, struct tcphdr * test_verify_flags(th, ACK); zassert_equal(get_rel_seq(th), 1, "Unexpected SEQ number in T_FIN, got %d", get_rel_seq(th)); - zassert_equal(ntohl(th->th_ack), seq, "Unexpected ACK in T_FIN, got %d", - ntohl(th->th_ack)); + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_FIN, got %d", + net_ntohl(th->th_ack)); t_state = T_CLOSING; return; @@ -2511,11 +2511,11 @@ static void handle_client_fin_ack_with_data_test(sa_family_t af, struct tcphdr * test_verify_flags(th, FIN | ACK); zassert_equal(get_rel_seq(th), 1, "Unexpected SEQ number in T_FIN_ACK, got %d", get_rel_seq(th)); - zassert_equal(ntohl(th->th_ack), seq, "Unexpected ACK in T_FIN_ACK, got %d", - ntohl(th->th_ack)); + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_FIN_ACK, got %d", + net_ntohl(th->th_ack)); ack++; - reply = prepare_ack_packet(af, htons(MY_PORT), peer_port); + reply = prepare_ack_packet(af, net_htons(MY_PORT), peer_port); t_state = T_SYN; break; @@ -2525,7 +2525,7 @@ static void handle_client_fin_ack_with_data_test(sa_family_t af, struct tcphdr * get_rel_seq(th)); ack++; - reply = prepare_ack_packet(af, htons(MY_PORT), peer_port); + reply = prepare_ack_packet(af, net_htons(MY_PORT), peer_port); t_state = T_SYN; break; @@ -2542,7 +2542,7 @@ static void test_fin_data_handler(struct k_work *work) { ARG_UNUSED(work); - handle_client_fin_ack_with_data_test(AF_INET, NULL); + handle_client_fin_ack_with_data_test(NET_AF_INET, NULL); } static void test_fin_ack_data_recv_cb(struct net_context *context, @@ -2594,13 +2594,13 @@ ZTEST(net_tcp, test_client_fin_ack_with_data) t_state = T_SYN; seq = ack = 0; - zassert_ok(net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx), + zassert_ok(net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx), "Failed to get net_context"); net_context_ref(ctx); - zassert_ok(net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), NULL, + zassert_ok(net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(1000), NULL), "Failed to connect to peer"); zassert_ok(net_context_recv(ctx, test_fin_ack_data_recv_cb, @@ -2624,7 +2624,7 @@ ZTEST(net_tcp, test_client_fin_ack_with_data) static struct k_work_delayable test_seq_val_work; -static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) +static void handle_client_seq_validation_test(net_sa_family_t af, struct tcphdr *th) { static uint16_t peer_port; struct net_pkt *reply = NULL; @@ -2637,18 +2637,18 @@ static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) switch (t_state) { case T_SYN: test_verify_flags(th, SYN); - device_initial_seq = ntohl(th->th_seq); + device_initial_seq = net_ntohl(th->th_seq); seq = 0U; - ack = ntohl(th->th_seq) + 1U; + ack = net_ntohl(th->th_seq) + 1U; peer_port = th->th_sport; - reply = prepare_syn_ack_packet(af, htons(MY_PORT), peer_port); + reply = prepare_syn_ack_packet(af, net_htons(MY_PORT), peer_port); seq++; t_state = T_SYN_ACK; break; case T_SYN_ACK: test_verify_flags(th, ACK); t_state = T_DATA; - wnd = ntohs(th_win(th)); + wnd = net_ntohs(th_win(th)); round = 0; k_work_reschedule(&test_seq_val_work, K_MSEC(1)); @@ -2665,7 +2665,7 @@ static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) /* len == 0, with seqnum bigger than the scope. */ seq = 66000; - reply = prepare_ack_packet(af, htons(MY_PORT), peer_port); + reply = prepare_ack_packet(af, net_htons(MY_PORT), peer_port); seq = t_seq; round++; @@ -2678,7 +2678,7 @@ static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) /* len == 0, with seqnum bigger than the scope. */ seq = 66000; - reply = prepare_data_packet(af, htons(MY_PORT), peer_port, data, 10); + reply = prepare_data_packet(af, net_htons(MY_PORT), peer_port, data, 10); seq = t_seq; round++; } @@ -2690,12 +2690,12 @@ static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) zassert_equal(get_rel_seq(th), 1, "Unexpected SEQ number in T_DATA_ACK round %d, got %d", round, get_rel_seq(th)); - zassert_equal(ntohl(th->th_ack), seq, + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_DATA_ACK round %d, got %d", - round, ntohl(th->th_ack)); + round, net_ntohl(th->th_ack)); seq = wnd + 10; - reply = prepare_data_packet(af, htons(MY_PORT), peer_port, data, 1); + reply = prepare_data_packet(af, net_htons(MY_PORT), peer_port, data, 1); seq = t_seq; round++; } @@ -2705,15 +2705,15 @@ static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) zassert_equal(get_rel_seq(th), 1, "Unexpected SEQ number in T_DATA round %d, got %d", round, get_rel_seq(th)); - zassert_equal(ntohl(th->th_ack), seq, + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_DATA round %d, got %d", - round, ntohl(th->th_ack)); - zassert_equal(ntohs(th_win(th)), wnd, + round, net_ntohl(th->th_ack)); + zassert_equal(net_ntohs(th_win(th)), wnd, "Unexpected recv_win in T_DATA round %d, got %d", - round, ntohs(th_win(th))); + round, net_ntohs(th_win(th))); len = len > wnd ? wnd : len; - reply = prepare_data_packet(af, htons(MY_PORT), peer_port, data, len); + reply = prepare_data_packet(af, net_htons(MY_PORT), peer_port, data, len); seq += len; wnd -= len; if (wnd == 0) { @@ -2732,25 +2732,25 @@ static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) zassert_equal(get_rel_seq(th), 1, "Unexpected SEQ number in T_DATA_ACK round %d, got %d", round, get_rel_seq(th)); - zassert_equal(ntohl(th->th_ack), seq, + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_DATA_ACK round %d, got %d", - round, ntohl(th->th_ack)); - zassert_equal(ntohs(th_win(th)), wnd, + round, net_ntohl(th->th_ack)); + zassert_equal(net_ntohs(th_win(th)), wnd, "Unexpected recv_win in T_DATA_ACK round %d, got %d", - round, ntohs(th_win(th))); + round, net_ntohs(th_win(th))); } switch (round) { case 4: zassert_true(wnd == 0, "Peer's recv_win is not zero"); /* test data in 0 window, expect duplicate ACK */ - reply = prepare_data_packet(af, htons(MY_PORT), peer_port, data, 1); + reply = prepare_data_packet(af, net_htons(MY_PORT), peer_port, data, 1); round++; break; case 5: /* test RST with different seqnum, expect no reply */ seq--; - reply = prepare_rst_ack_packet(af, htons(MY_PORT), peer_port); + reply = prepare_rst_ack_packet(af, net_htons(MY_PORT), peer_port); seq++; round++; @@ -2767,7 +2767,7 @@ static void handle_client_seq_validation_test(sa_family_t af, struct tcphdr *th) rsterr, rsterr_after); /* test RST with correct seqnum, expect ERSET in recv_cb. */ - reply = prepare_rst_ack_packet(af, htons(MY_PORT), peer_port); + reply = prepare_rst_ack_packet(af, net_htons(MY_PORT), peer_port); } break; @@ -2788,7 +2788,7 @@ static void test_seq_val_handler(struct k_work *work) { ARG_UNUSED(work); - handle_client_seq_validation_test(AF_INET, NULL); + handle_client_seq_validation_test(NET_AF_INET, NULL); } static void test_seq_val_recv_cb(struct net_context *context, @@ -2840,13 +2840,13 @@ ZTEST(net_tcp, test_client_seq_validation) t_state = T_SYN; seq = ack = 0; - zassert_ok(net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx), + zassert_ok(net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx), "Failed to get net_context"); net_context_ref(ctx); - zassert_ok(net_context_connect(ctx, (struct sockaddr *)&peer_addr_s, - sizeof(struct sockaddr_in), NULL, + zassert_ok(net_context_connect(ctx, (struct net_sockaddr *)&peer_addr_s, + sizeof(struct net_sockaddr_in), NULL, K_MSEC(1000), NULL), "Failed to connect to peer"); zassert_ok(net_context_recv(ctx, test_seq_val_recv_cb, @@ -2903,7 +2903,8 @@ static void handle_server_ack_validation_test(struct net_pkt *pkt) uint32_t old_ack = ack; ack = svr_seq_base + ack_check_list[ack_check_index].c_ack; - reply = prepare_ack_packet(net_pkt_family(pkt), htons(MY_PORT), htons(PEER_PORT)); + reply = prepare_ack_packet(net_pkt_family(pkt), net_htons(MY_PORT), + net_htons(PEER_PORT)); zassert_not_null(reply, "Cannot create pkt"); ack = old_ack; @@ -2923,10 +2924,10 @@ static void handle_server_ack_validation_test(struct net_pkt *pkt) */ test_verify_flags(&th, ACK); /* Verify that we received the ACK-only packet with the expected seqnum */ - zassert_equal(expected_seq, ntohl(th.th_seq), + zassert_equal(expected_seq, net_ntohl(th.th_seq), "Wrong seqnum received from server. " "Expected SEQ %u but got %u", - expected_seq, ntohl(th.th_seq)); + expected_seq, net_ntohl(th.th_seq)); ackerr_after = GET_STAT(net_iface, tcp.ackerr); zassert_equal(ackerr + 1, ackerr_after, @@ -2935,7 +2936,8 @@ static void handle_server_ack_validation_test(struct net_pkt *pkt) /* send valid ACK to server to avoid retransmission */ ack += ack_check_list[ack_check_index].s_data_len; - reply = prepare_ack_packet(net_pkt_family(pkt), htons(MY_PORT), htons(PEER_PORT)); + reply = prepare_ack_packet(net_pkt_family(pkt), net_htons(MY_PORT), + net_htons(PEER_PORT)); zassert_not_null(reply, "Cannot create pkt"); ret = net_recv_data(net_iface, reply); @@ -2993,7 +2995,8 @@ ZTEST(net_tcp, test_server_ack_validation) /* Just send a RST packet to abort the underlying connection, so that * the testcase does not need to implement full TCP closing handshake. */ - rst = tester_prepare_tcp_pkt(AF_INET6, htons(MY_PORT), htons(PEER_PORT), RST, NULL, 0); + rst = tester_prepare_tcp_pkt(NET_AF_INET6, net_htons(MY_PORT), net_htons(PEER_PORT), + RST, NULL, 0); zassert_not_null(rst, "Cannot create pkt"); ret = net_recv_data(net_iface, rst); @@ -3012,7 +3015,7 @@ ZTEST(net_tcp, test_server_ack_validation) /* In this test we check that FIN,ACK packet acknowledging latest data is * handled correctly by the TCP stack. */ -static void handle_server_fin_ack_after_data_test(sa_family_t af, struct tcphdr *th) +static void handle_server_fin_ack_after_data_test(net_sa_family_t af, struct tcphdr *th) { struct net_pkt *reply = NULL; @@ -3021,21 +3024,21 @@ static void handle_server_fin_ack_after_data_test(sa_family_t af, struct tcphdr switch (t_state) { case T_SYN: - reply = prepare_syn_packet(af, htons(MY_PORT), htons(PEER_PORT)); + reply = prepare_syn_packet(af, net_htons(MY_PORT), net_htons(PEER_PORT)); seq++; t_state = T_SYN_ACK; break; case T_SYN_ACK: test_verify_flags(th, SYN | ACK); - zassert_equal(ntohl(th->th_ack), seq, + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_SYN_ACK, got %d, expected %d", - ntohl(th->th_ack), seq); - device_initial_seq = ntohl(th->th_seq); - ack = ntohl(th->th_seq) + 1U; + net_ntohl(th->th_ack), seq); + device_initial_seq = net_ntohl(th->th_seq); + ack = net_ntohl(th->th_seq) + 1U; t_state = T_DATA_ACK; /* Dummy "request" packet */ - reply = prepare_data_packet(af, htons(MY_PORT), htons(PEER_PORT), + reply = prepare_data_packet(af, net_htons(MY_PORT), net_htons(PEER_PORT), TEST_FIN_ACK_AFTER_DATA_REQ, sizeof(TEST_FIN_ACK_AFTER_DATA_REQ) - 1); seq += sizeof(TEST_FIN_ACK_AFTER_DATA_REQ) - 1; @@ -3043,40 +3046,40 @@ static void handle_server_fin_ack_after_data_test(sa_family_t af, struct tcphdr case T_DATA_ACK: test_verify_flags(th, ACK); t_state = T_DATA; - zassert_equal(ntohl(th->th_seq), ack, + zassert_equal(net_ntohl(th->th_seq), ack, "Unexpected SEQ in T_DATA_ACK, got %d, expected %d", get_rel_seq(th), ack); - zassert_equal(ntohl(th->th_ack), seq, + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_DATA_ACK, got %d, expected %d", - ntohl(th->th_ack), seq); + net_ntohl(th->th_ack), seq); break; case T_DATA: test_verify_flags(th, PSH | ACK); - zassert_equal(ntohl(th->th_seq), ack, + zassert_equal(net_ntohl(th->th_seq), ack, "Unexpected SEQ in T_DATA, got %d, expected %d", get_rel_seq(th), ack); - zassert_equal(ntohl(th->th_ack), seq, + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_DATA, got %d, expected %d", - ntohl(th->th_ack), seq); + net_ntohl(th->th_ack), seq); ack += sizeof(TEST_FIN_ACK_AFTER_DATA_RSP) - 1; t_state = T_FIN_ACK; - reply = prepare_fin_ack_packet(af, htons(MY_PORT), htons(PEER_PORT)); + reply = prepare_fin_ack_packet(af, net_htons(MY_PORT), net_htons(PEER_PORT)); seq++; break; case T_FIN_ACK: test_verify_flags(th, FIN | ACK); - zassert_equal(ntohl(th->th_seq), ack, + zassert_equal(net_ntohl(th->th_seq), ack, "Unexpected SEQ in T_FIN_ACK, got %d, expected %d", get_rel_seq(th), ack); - zassert_equal(ntohl(th->th_ack), seq, + zassert_equal(net_ntohl(th->th_ack), seq, "Unexpected ACK in T_FIN_ACK, got %d, expected %d", - ntohl(th->th_ack), seq); + net_ntohl(th->th_ack), seq); ack++; t_state = T_CLOSING; - reply = prepare_ack_packet(af, htons(MY_PORT), htons(PEER_PORT)); + reply = prepare_ack_packet(af, net_htons(MY_PORT), net_htons(PEER_PORT)); seq++; break; case T_CLOSING: @@ -3118,8 +3121,8 @@ static void test_fin_ack_after_data_recv_cb(struct net_context *context, } static void test_fin_ack_after_data_accept_cb(struct net_context *ctx, - struct sockaddr *addr, - socklen_t addrlen, + struct net_sockaddr *addr, + net_socklen_t addrlen, int status, void *user_data) { @@ -3160,13 +3163,13 @@ ZTEST(net_tcp, test_server_fin_ack_after_data) t_state = T_SYN; seq = ack = 0; - ret = net_context_get(AF_INET, SOCK_STREAM, IPPROTO_TCP, &ctx); + ret = net_context_get(NET_AF_INET, NET_SOCK_STREAM, NET_IPPROTO_TCP, &ctx); zassert_ok(ret, "Failed to get net_context"); net_context_ref(ctx); - ret = net_context_bind(ctx, (struct sockaddr *)&my_addr_s, - sizeof(struct sockaddr_in)); + ret = net_context_bind(ctx, (struct net_sockaddr *)&my_addr_s, + sizeof(struct net_sockaddr_in)); zassert_ok(ret, "Failed to bind net_context"); /* Put context into listening mode and install accept cb */ @@ -3178,7 +3181,7 @@ ZTEST(net_tcp, test_server_fin_ack_after_data) zassert_ok(ret, "Failed to set accept on net_context"); /* Trigger the peer to send SYN */ - handle_server_fin_ack_after_data_test(AF_INET, NULL); + handle_server_fin_ack_after_data_test(NET_AF_INET, NULL); /* test_fin_ack_after_data_recv_cb will release the semaphore after * dummy request is read. diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c index 7cb75e0ccec61..105eff41665d2 100644 --- a/tests/net/traffic_class/src/main.c +++ b/tests/net/traffic_class/src/main.c @@ -58,29 +58,29 @@ static enum net_priority rx_tc2prio[NET_TC_RX_COUNT]; static const char *test_data = "Test data to be sent"; /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 3 addresses */ -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Destination address for test packets */ -static struct in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 9, 0, 0, 0, +static struct net_in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -static struct sockaddr_in6 dst_addr6 = { - .sin6_family = AF_INET6, - .sin6_port = htons(TEST_PORT), +static struct net_sockaddr_in6 dst_addr6 = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(TEST_PORT), }; static struct { @@ -167,7 +167,7 @@ static int eth_tx(const struct device *dev, struct net_pkt *pkt) } if (start_receiving) { - struct in6_addr addr; + struct net_in6_addr addr; struct net_udp_hdr hdr, *udp_hdr; uint16_t port; @@ -343,7 +343,7 @@ static void priority_setup(void) } #if defined(CONFIG_NET_IPV6_NBR_CACHE) -static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) +static bool add_neighbor(struct net_if *iface, struct net_in6_addr *addr) { struct net_linkaddr lladdr; struct net_nbr *nbr; @@ -374,8 +374,8 @@ static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) static void setup_net_context(struct net_context **ctx) { - struct sockaddr_in6 src_addr6 = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 src_addr6 = { + .sin6_family = NET_AF_INET6, .sin6_port = 0, }; int ret; @@ -383,18 +383,18 @@ static void setup_net_context(struct net_context **ctx) iface1 = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, ctx); + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, ctx); zassert_equal(ret, 0, "Create IPv6 UDP context %p failed (%d)\n", *ctx, ret); - memcpy(&src_addr6.sin6_addr, &my_addr1, sizeof(struct in6_addr)); - memcpy(&dst_addr6.sin6_addr, &dst_addr, sizeof(struct in6_addr)); + memcpy(&src_addr6.sin6_addr, &my_addr1, sizeof(struct net_in6_addr)); + memcpy(&dst_addr6.sin6_addr, &dst_addr, sizeof(struct net_in6_addr)); ret = add_neighbor(iface1, &dst_addr); zassert_true(ret, "Cannot add neighbor"); - ret = net_context_bind(*ctx, (struct sockaddr *)&src_addr6, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(*ctx, (struct net_sockaddr *)&src_addr6, + sizeof(struct net_sockaddr_in6)); zassert_equal(ret, 0, "Context bind failure test failed (%d)\n", ret); } @@ -494,8 +494,8 @@ static void traffic_class_send_packets_with_prio(enum net_priority prio, send_priorities[net_tx_priority2tc(prio)][pkt_count - 1] = prio + 1; ret = net_context_sendto(net_ctxs_tx[tc].ctx, data, len, - (struct sockaddr *)&dst_addr6, - sizeof(struct sockaddr_in6), + (struct net_sockaddr *)&dst_addr6, + sizeof(struct net_sockaddr_in6), NULL, K_NO_WAIT, NULL); zassert_true(ret > 0, "Send UDP pkt failed"); } @@ -758,7 +758,7 @@ static void traffic_class_recv_packets_with_prio(enum net_priority prio, int len, ret; int tc = net_rx_priority2tc(prio); - const struct in6_addr *src_addr; + const struct net_in6_addr *src_addr; struct net_if_addr *ifaddr; struct net_if *iface = NULL; @@ -787,8 +787,8 @@ static void traffic_class_recv_packets_with_prio(enum net_priority prio, * UDP header. */ ret = net_context_sendto(net_ctxs_rx[tc].ctx, data, len, - (struct sockaddr *)&dst_addr6, - sizeof(struct sockaddr_in6), + (struct net_sockaddr *)&dst_addr6, + sizeof(struct net_sockaddr_in6), NULL, K_NO_WAIT, NULL); zassert_true(ret > 0, "Send UDP pkt failed"); diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c index 3f8e980f6feb6..3fe5700f07458 100644 --- a/tests/net/tx_timestamp/src/main.c +++ b/tests/net/tx_timestamp/src/main.c @@ -45,19 +45,19 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); static char *test_data = "Test data to be sent"; /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Destination address for test packets */ -static struct in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 9, 0, 0, 0, +static struct net_in6_addr dst_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; @@ -397,7 +397,7 @@ void test_address_setup(void) test_failed = false; } -static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) +static bool add_neighbor(struct net_if *iface, struct net_in6_addr *addr) { struct net_linkaddr lladdr; struct net_nbr *nbr; @@ -425,33 +425,33 @@ static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) static void send_some_data(struct net_if *iface) { - struct sockaddr_in6 dst_addr6 = { - .sin6_family = AF_INET6, - .sin6_port = htons(TEST_PORT), + struct net_sockaddr_in6 dst_addr6 = { + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(TEST_PORT), }; - struct sockaddr_in6 src_addr6 = { - .sin6_family = AF_INET6, + struct net_sockaddr_in6 src_addr6 = { + .sin6_family = NET_AF_INET6, .sin6_port = 0, }; int ret; - ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(NET_AF_INET6, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_v6_ctx); zassert_equal(ret, 0, "Create IPv6 UDP context failed\n"); - memcpy(&src_addr6.sin6_addr, &my_addr1, sizeof(struct in6_addr)); - memcpy(&dst_addr6.sin6_addr, &dst_addr, sizeof(struct in6_addr)); + memcpy(&src_addr6.sin6_addr, &my_addr1, sizeof(struct net_in6_addr)); + memcpy(&dst_addr6.sin6_addr, &dst_addr, sizeof(struct net_in6_addr)); - ret = net_context_bind(udp_v6_ctx, (struct sockaddr *)&src_addr6, - sizeof(struct sockaddr_in6)); + ret = net_context_bind(udp_v6_ctx, (struct net_sockaddr *)&src_addr6, + sizeof(struct net_sockaddr_in6)); zassert_equal(ret, 0, "Context bind failure test failed\n"); ret = add_neighbor(iface, &dst_addr); zassert_true(ret, "Cannot add neighbor\n"); ret = net_context_sendto(udp_v6_ctx, test_data, strlen(test_data), - (struct sockaddr *)&dst_addr6, - sizeof(struct sockaddr_in6), + (struct net_sockaddr *)&dst_addr6, + sizeof(struct net_sockaddr_in6), NULL, K_NO_WAIT, NULL); zassert_true(ret > 0, "Send UDP pkt failed\n"); diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c index e3dfa9d7f6884..6d0a48bedcba9 100644 --- a/tests/net/udp/src/main.c +++ b/tests/net/udp/src/main.c @@ -126,8 +126,8 @@ NET_DEVICE_INIT(net_udp_test, "net_udp_test", &net_udp_if_api, _ETH_L2_LAYER, _ETH_L2_CTX_TYPE, 127); struct ud { - const struct sockaddr *remote_addr; - const struct sockaddr *local_addr; + const struct net_sockaddr *remote_addr; + const struct net_sockaddr *local_addr; uint16_t remote_port; uint16_t local_port; char *test; @@ -211,8 +211,8 @@ uint8_t ipv6_hop_by_hop_ext_hdr[] = { #define TIMEOUT K_MSEC(200) static bool send_ipv6_udp_msg(struct net_if *iface, - struct in6_addr *src, - struct in6_addr *dst, + struct net_in6_addr *src, + struct net_in6_addr *dst, uint16_t src_port, uint16_t dst_port, struct ud *ud, @@ -221,18 +221,18 @@ static bool send_ipv6_udp_msg(struct net_if *iface, struct net_pkt *pkt; int ret; - pkt = net_pkt_alloc_with_buffer(iface, 0, AF_INET6, - IPPROTO_UDP, K_SECONDS(1)); + pkt = net_pkt_alloc_with_buffer(iface, 0, NET_AF_INET6, + NET_IPPROTO_UDP, K_SECONDS(1)); zassert_not_null(pkt, "Out of mem"); if (net_ipv6_create(pkt, src, dst) || - net_udp_create(pkt, htons(src_port), htons(dst_port))) { + net_udp_create(pkt, net_htons(src_port), net_htons(dst_port))) { printk("Cannot create IPv6 UDP pkt %p", pkt); zassert_true(0, "exiting"); } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_UDP); + net_ipv6_finalize(pkt, NET_IPPROTO_UDP); ret = net_recv_data(iface, pkt); if (ret < 0) { @@ -260,8 +260,8 @@ static bool send_ipv6_udp_msg(struct net_if *iface, } static bool send_ipv6_udp_long_msg(struct net_if *iface, - struct in6_addr *src, - struct in6_addr *dst, + struct net_in6_addr *src, + struct net_in6_addr *dst, uint16_t src_port, uint16_t dst_port, struct ud *ud, @@ -272,8 +272,8 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface, pkt = net_pkt_alloc_with_buffer(iface, sizeof(ipv6_hop_by_hop_ext_hdr) + - sizeof(payload), AF_INET6, - IPPROTO_UDP, K_SECONDS(1)); + sizeof(payload), NET_AF_INET6, + NET_IPPROTO_UDP, K_SECONDS(1)); zassert_not_null(pkt, "Out of mem"); if (net_ipv6_create(pkt, src, dst)) { @@ -290,7 +290,7 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface, net_pkt_set_ipv6_ext_len(pkt, sizeof(ipv6_hop_by_hop_ext_hdr)); net_pkt_set_ipv6_next_hdr(pkt, NET_IPV6_NEXTHDR_HBHO); - if (net_udp_create(pkt, htons(src_port), htons(dst_port))) { + if (net_udp_create(pkt, net_htons(src_port), net_htons(dst_port))) { printk("Cannot create IPv6 pkt %p", pkt); zassert_true(0, "exiting"); } @@ -301,7 +301,7 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface, } net_pkt_cursor_init(pkt); - net_ipv6_finalize(pkt, IPPROTO_UDP); + net_ipv6_finalize(pkt, NET_IPPROTO_UDP); ret = net_recv_data(iface, pkt); if (ret < 0) { @@ -328,8 +328,8 @@ static bool send_ipv6_udp_long_msg(struct net_if *iface, } static bool send_ipv4_udp_msg(struct net_if *iface, - struct in_addr *src, - struct in_addr *dst, + struct net_in_addr *src, + struct net_in_addr *dst, uint16_t src_port, uint16_t dst_port, struct ud *ud, @@ -338,18 +338,18 @@ static bool send_ipv4_udp_msg(struct net_if *iface, struct net_pkt *pkt; int ret; - pkt = net_pkt_alloc_with_buffer(iface, 0, AF_INET, - IPPROTO_UDP, K_SECONDS(1)); + pkt = net_pkt_alloc_with_buffer(iface, 0, NET_AF_INET, + NET_IPPROTO_UDP, K_SECONDS(1)); zassert_not_null(pkt, "Out of mem"); if (net_ipv4_create(pkt, src, dst) || - net_udp_create(pkt, htons(src_port), htons(dst_port))) { + net_udp_create(pkt, net_htons(src_port), net_htons(dst_port))) { printk("Cannot create IPv4 UDP pkt %p", pkt); zassert_true(0, "exiting"); } net_pkt_cursor_init(pkt); - net_ipv4_finalize(pkt, IPPROTO_UDP); + net_ipv4_finalize(pkt, NET_IPPROTO_UDP); ret = net_recv_data(iface, pkt); if (ret < 0) { @@ -376,27 +376,27 @@ static bool send_ipv4_udp_msg(struct net_if *iface, return !fail; } -static void set_port(sa_family_t family, struct sockaddr *raddr, - struct sockaddr *laddr, uint16_t rport, +static void set_port(net_sa_family_t family, struct net_sockaddr *raddr, + struct net_sockaddr *laddr, uint16_t rport, uint16_t lport) { - if (family == AF_INET6) { + if (family == NET_AF_INET6) { if (raddr) { - ((struct sockaddr_in6 *)raddr)-> - sin6_port = htons(rport); + ((struct net_sockaddr_in6 *)raddr)-> + sin6_port = net_htons(rport); } if (laddr) { - ((struct sockaddr_in6 *)laddr)-> - sin6_port = htons(lport); + ((struct net_sockaddr_in6 *)laddr)-> + sin6_port = net_htons(lport); } - } else if (family == AF_INET) { + } else if (family == NET_AF_INET) { if (raddr) { - ((struct sockaddr_in *)raddr)-> - sin_port = htons(rport); + ((struct net_sockaddr_in *)raddr)-> + sin_port = net_htons(rport); } if (laddr) { - ((struct sockaddr_in *)laddr)-> - sin_port = htons(lport); + ((struct net_sockaddr_in *)laddr)-> + sin_port = net_htons(lport); } } } @@ -419,45 +419,45 @@ ZTEST(udp_fn_tests, test_udp) int ret, i = 0; bool st; - struct sockaddr_in6 any_addr6; - const struct in6_addr in6addr_anyaddr = IN6ADDR_ANY_INIT; + struct net_sockaddr_in6 any_addr6; + const struct net_in6_addr in6addr_anyaddr = NET_IN6ADDR_ANY_INIT; - struct sockaddr_in6 my_addr6; - struct in6_addr in6addr_my = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_sockaddr_in6 my_addr6; + struct net_in6_addr in6addr_my = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; - struct sockaddr_in6 peer_addr6; - struct in6_addr in6addr_peer = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, + struct net_sockaddr_in6 peer_addr6; + struct net_in6_addr in6addr_peer = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0x4e, 0x11, 0, 0, 0x2 } } }; - struct sockaddr_in any_addr4; - const struct in_addr in4addr_any = { { { 0 } } }; + struct net_sockaddr_in any_addr4; + const struct net_in_addr in4addr_any = { { { 0 } } }; - struct sockaddr_in my_addr4; - struct in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; + struct net_sockaddr_in my_addr4; + struct net_in_addr in4addr_my = { { { 192, 0, 2, 1 } } }; - struct sockaddr_in peer_addr4; - struct in_addr in4addr_peer = { { { 192, 0, 2, 9 } } }; + struct net_sockaddr_in peer_addr4; + struct net_in_addr in4addr_peer = { { { 192, 0, 2, 9 } } }; iface = net_if_get_first_by_type(&NET_L2_GET_NAME(DUMMY)); net_ipaddr_copy(&any_addr6.sin6_addr, &in6addr_anyaddr); - any_addr6.sin6_family = AF_INET6; + any_addr6.sin6_family = NET_AF_INET6; net_ipaddr_copy(&my_addr6.sin6_addr, &in6addr_my); - my_addr6.sin6_family = AF_INET6; + my_addr6.sin6_family = NET_AF_INET6; net_ipaddr_copy(&peer_addr6.sin6_addr, &in6addr_peer); - peer_addr6.sin6_family = AF_INET6; + peer_addr6.sin6_family = NET_AF_INET6; net_ipaddr_copy(&any_addr4.sin_addr, &in4addr_any); - any_addr4.sin_family = AF_INET; + any_addr4.sin_family = NET_AF_INET; net_ipaddr_copy(&my_addr4.sin_addr, &in4addr_my); - my_addr4.sin_family = AF_INET; + my_addr4.sin_family = NET_AF_INET; net_ipaddr_copy(&peer_addr4.sin_addr, &in4addr_peer); - peer_addr4.sin_family = AF_INET; + peer_addr4.sin_family = NET_AF_INET; k_sem_init(&recv_lock, 0, UINT_MAX); @@ -479,19 +479,19 @@ ZTEST(udp_fn_tests, test_udp) ({ \ static struct ud user_data; \ \ - user_data.remote_addr = (struct sockaddr *)raddr; \ - user_data.local_addr = (struct sockaddr *)laddr; \ + user_data.remote_addr = (struct net_sockaddr *)raddr; \ + user_data.local_addr = (struct net_sockaddr *)laddr; \ user_data.remote_port = rport; \ user_data.local_port = lport; \ user_data.test = "DST="#raddr"-SRC="#laddr"-RP="#rport \ "-LP="#lport; \ \ - set_port(family, (struct sockaddr *)raddr, \ - (struct sockaddr *)laddr, rport, lport); \ + set_port(family, (struct net_sockaddr *)raddr, \ + (struct net_sockaddr *)laddr, rport, lport); \ \ ret = net_udp_register(family, \ - (struct sockaddr *)raddr, \ - (struct sockaddr *)laddr, \ + (struct net_sockaddr *)raddr, \ + (struct net_sockaddr *)laddr, \ rport, lport, \ NULL, test_ok, &user_data, \ &handlers[i]); \ @@ -505,9 +505,9 @@ ZTEST(udp_fn_tests, test_udp) }) #define REGISTER_FAIL(raddr, laddr, rport, lport) \ - ret = net_udp_register(AF_INET, \ - (struct sockaddr *)raddr, \ - (struct sockaddr *)laddr, \ + ret = net_udp_register(NET_AF_INET, \ + (struct net_sockaddr *)raddr, \ + (struct net_sockaddr *)laddr, \ rport, lport, \ NULL, test_fail, INT_TO_POINTER(0), \ NULL); \ @@ -570,7 +570,7 @@ ZTEST(udp_fn_tests, test_udp) zassert_true(0, "exiting"); \ } - ud = REGISTER(AF_INET6, &any_addr6, &any_addr6, 1234, 4242); + ud = REGISTER(NET_AF_INET6, &any_addr6, &any_addr6, 1234, 4242); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); TEST_IPV6_LONG_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); @@ -579,21 +579,21 @@ ZTEST(udp_fn_tests, test_udp) TEST_IPV6_FAIL(ud, &in6addr_peer, &in6addr_my, 1234, 61400); UNREGISTER(ud); - ud = REGISTER(AF_INET, &any_addr4, &any_addr4, 1234, 4242); + ud = REGISTER(NET_AF_INET, &any_addr4, &any_addr4, 1234, 4242); TEST_IPV4_OK(ud, &in4addr_peer, &in4addr_my, 1234, 4242); TEST_IPV4_OK(ud, &in4addr_peer, &in4addr_my, 1234, 4242); TEST_IPV4_FAIL(ud, &in4addr_peer, &in4addr_my, 1234, 4325); TEST_IPV4_FAIL(ud, &in4addr_peer, &in4addr_my, 1234, 4325); UNREGISTER(ud); - ud = REGISTER(AF_INET6, &any_addr6, NULL, 1234, 4242); + ud = REGISTER(NET_AF_INET6, &any_addr6, NULL, 1234, 4242); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); TEST_IPV6_FAIL(ud, &in6addr_peer, &in6addr_my, 1234, 61400); TEST_IPV6_FAIL(ud, &in6addr_peer, &in6addr_my, 1234, 61400); UNREGISTER(ud); - ud = REGISTER(AF_INET6, NULL, &any_addr6, 1234, 4242); + ud = REGISTER(NET_AF_INET6, NULL, &any_addr6, 1234, 4242); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); TEST_IPV6_LONG_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); @@ -602,19 +602,19 @@ ZTEST(udp_fn_tests, test_udp) TEST_IPV6_FAIL(ud, &in6addr_peer, &in6addr_my, 1234, 61400); UNREGISTER(ud); - ud = REGISTER(AF_INET6, &peer_addr6, &my_addr6, 1234, 4242); + ud = REGISTER(NET_AF_INET6, &peer_addr6, &my_addr6, 1234, 4242); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 4242); TEST_IPV6_FAIL(ud, &in6addr_peer, &in6addr_my, 1234, 4243); - ud = REGISTER(AF_INET, &peer_addr4, &my_addr4, 1234, 4242); + ud = REGISTER(NET_AF_INET, &peer_addr4, &my_addr4, 1234, 4242); TEST_IPV4_OK(ud, &in4addr_peer, &in4addr_my, 1234, 4242); TEST_IPV4_FAIL(ud, &in4addr_peer, &in4addr_my, 1234, 4243); - ud = REGISTER(AF_UNSPEC, NULL, NULL, 1234, 42423); + ud = REGISTER(NET_AF_UNSPEC, NULL, NULL, 1234, 42423); TEST_IPV4_OK(ud, &in4addr_peer, &in4addr_my, 1234, 42423); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 42423); - ud = REGISTER(AF_UNSPEC, NULL, NULL, 1234, 0); + ud = REGISTER(NET_AF_UNSPEC, NULL, NULL, 1234, 0); TEST_IPV4_OK(ud, &in4addr_peer, &in4addr_my, 1234, 42422); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 1234, 42422); TEST_IPV4_OK(ud, &in4addr_peer, &in4addr_my, 1234, 42422); @@ -623,14 +623,14 @@ ZTEST(udp_fn_tests, test_udp) TEST_IPV4_FAIL(ud, &in4addr_peer, &in4addr_my, 12345, 42421); TEST_IPV6_FAIL(ud, &in6addr_peer, &in6addr_my, 12345, 42421); - ud = REGISTER(AF_UNSPEC, NULL, NULL, 0, 0); + ud = REGISTER(NET_AF_UNSPEC, NULL, NULL, 0, 0); TEST_IPV4_OK(ud, &in4addr_peer, &in4addr_my, 12345, 42421); TEST_IPV6_OK(ud, &in6addr_peer, &in6addr_my, 12345, 42421); TEST_IPV6_LONG_OK(ud, &in6addr_peer, &in6addr_my, 12345, 42421); /* Remote addr same as local addr, these two will never match */ - REGISTER(AF_INET6, &my_addr6, NULL, 1234, 4242); - REGISTER(AF_INET, &my_addr4, NULL, 1234, 4242); + REGISTER(NET_AF_INET6, &my_addr6, NULL, 1234, 4242); + REGISTER(NET_AF_INET, &my_addr4, NULL, 1234, 4242); /* IPv4 remote addr and IPv6 remote addr, impossible combination */ REGISTER_FAIL(&my_addr4, &my_addr6, 1234, 4242); diff --git a/tests/net/utils/src/main.c b/tests/net/utils/src/main.c index d9d4213466b19..8cf51638bbd7c 100644 --- a/tests/net/utils/src/main.c +++ b/tests/net/utils/src/main.c @@ -31,243 +31,243 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_UTILS_LOG_LEVEL); #include "net_private.h" struct net_addr_test_data { - sa_family_t family; + net_sa_family_t family; bool pton; struct { char c_addr[16]; char c_verify[16]; - struct in_addr addr; - struct in_addr verify; + struct net_in_addr addr; + struct net_in_addr verify; } ipv4; struct { char c_addr[46]; char c_verify[46]; - struct in6_addr addr; - struct in6_addr verify; + struct net_in6_addr addr; + struct net_in6_addr verify; } ipv6; }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_1 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "192.0.0.1", .ipv4.verify.s4_addr = { 192, 0, 0, 1 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_2 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "192.1.0.0", .ipv4.verify.s4_addr = { 192, 1, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_3 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "192.0.0.0", .ipv4.verify.s4_addr = { 192, 0, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_4 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "255.255.255.255", .ipv4.verify.s4_addr = { 255, 255, 255, 255 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_5 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "0.0.0.0", .ipv4.verify.s4_addr = { 0, 0, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_6 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "0.0.0.1", .ipv4.verify.s4_addr = { 0, 0, 0, 1 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_7 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "0.0.1.0", .ipv4.verify.s4_addr = { 0, 0, 1, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_pton_8 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = true, .ipv4.c_addr = "0.1.0.0", .ipv4.verify.s4_addr = { 0, 1, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_pton_1 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = true, .ipv6.c_addr = "ff08::", - .ipv6.verify.s6_addr16 = { htons(0xff08), 0, 0, 0, 0, 0, 0, 0 }, + .ipv6.verify.s6_addr16 = { net_htons(0xff08), 0, 0, 0, 0, 0, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_pton_2 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = true, .ipv6.c_addr = "::", .ipv6.verify.s6_addr16 = { 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_pton_3 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = true, .ipv6.c_addr = "ff08::1", - .ipv6.verify.s6_addr16 = { htons(0xff08), 0, 0, 0, 0, 0, 0, htons(1) }, + .ipv6.verify.s6_addr16 = { net_htons(0xff08), 0, 0, 0, 0, 0, 0, net_htons(1) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_pton_4 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = true, .ipv6.c_addr = "2001:db8::1", - .ipv6.verify.s6_addr16 = { htons(0x2001), htons(0xdb8), - 0, 0, 0, 0, 0, htons(1) }, + .ipv6.verify.s6_addr16 = { net_htons(0x2001), net_htons(0xdb8), + 0, 0, 0, 0, 0, net_htons(1) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_pton_5 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = true, .ipv6.c_addr = "2001:db8::2:1", - .ipv6.verify.s6_addr16 = { htons(0x2001), htons(0xdb8), - 0, 0, 0, 0, htons(2), htons(1) }, + .ipv6.verify.s6_addr16 = { net_htons(0x2001), net_htons(0xdb8), + 0, 0, 0, 0, net_htons(2), net_htons(1) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_pton_6 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = true, .ipv6.c_addr = "ff08:1122:3344:5566:7788:9900:aabb:ccdd", - .ipv6.verify.s6_addr16 = { htons(0xff08), htons(0x1122), - htons(0x3344), htons(0x5566), - htons(0x7788), htons(0x9900), - htons(0xaabb), htons(0xccdd) }, + .ipv6.verify.s6_addr16 = { net_htons(0xff08), net_htons(0x1122), + net_htons(0x3344), net_htons(0x5566), + net_htons(0x7788), net_htons(0x9900), + net_htons(0xaabb), net_htons(0xccdd) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_pton_7 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = true, .ipv6.c_addr = "0:ff08::", - .ipv6.verify.s6_addr16 = { 0, htons(0xff08), 0, 0, 0, 0, 0, 0 }, + .ipv6.verify.s6_addr16 = { 0, net_htons(0xff08), 0, 0, 0, 0, 0, 0 }, }; /* net_addr_ntop test cases */ static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_1 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "192.0.0.1", .ipv4.addr.s4_addr = { 192, 0, 0, 1 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_2 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "192.1.0.0", .ipv4.addr.s4_addr = { 192, 1, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_3 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "192.0.0.0", .ipv4.addr.s4_addr = { 192, 0, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_4 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "255.255.255.255", .ipv4.addr.s4_addr = { 255, 255, 255, 255 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_5 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "0.0.0.0", .ipv4.addr.s4_addr = { 0, 0, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_6 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "0.0.0.1", .ipv4.addr.s4_addr = { 0, 0, 0, 1 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_7 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "0.0.1.0", .ipv4.addr.s4_addr = { 0, 0, 1, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv4_ntop_8 = { - .family = AF_INET, + .family = NET_AF_INET, .pton = false, .ipv4.c_verify = "0.1.0.0", .ipv4.addr.s4_addr = { 0, 1, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_ntop_1 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = false, .ipv6.c_verify = "ff08::", - .ipv6.addr.s6_addr16 = { htons(0xff08), 0, 0, 0, 0, 0, 0, 0 }, + .ipv6.addr.s6_addr16 = { net_htons(0xff08), 0, 0, 0, 0, 0, 0, 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_ntop_2 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = false, .ipv6.c_verify = "::", .ipv6.addr.s6_addr16 = { 0 }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_ntop_3 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = false, .ipv6.c_verify = "ff08::1", - .ipv6.addr.s6_addr16 = { htons(0xff08), 0, 0, 0, 0, 0, 0, htons(1) }, + .ipv6.addr.s6_addr16 = { net_htons(0xff08), 0, 0, 0, 0, 0, 0, net_htons(1) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_ntop_4 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = false, .ipv6.c_verify = "2001:db8::1", - .ipv6.addr.s6_addr16 = { htons(0x2001), htons(0xdb8), - 0, 0, 0, 0, 0, htons(1) }, + .ipv6.addr.s6_addr16 = { net_htons(0x2001), net_htons(0xdb8), + 0, 0, 0, 0, 0, net_htons(1) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_ntop_5 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = false, .ipv6.c_verify = "2001:db8::2:1", - .ipv6.addr.s6_addr16 = { htons(0x2001), htons(0xdb8), - 0, 0, 0, 0, htons(2), htons(1) }, + .ipv6.addr.s6_addr16 = { net_htons(0x2001), net_htons(0xdb8), + 0, 0, 0, 0, net_htons(2), net_htons(1) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_ntop_6 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = false, .ipv6.c_verify = "ff08:1122:3344:5566:7788:9900:aabb:ccdd", - .ipv6.addr.s6_addr16 = { htons(0xff08), htons(0x1122), - htons(0x3344), htons(0x5566), - htons(0x7788), htons(0x9900), - htons(0xaabb), htons(0xccdd) }, + .ipv6.addr.s6_addr16 = { net_htons(0xff08), net_htons(0x1122), + net_htons(0x3344), net_htons(0x5566), + net_htons(0x7788), net_htons(0x9900), + net_htons(0xaabb), net_htons(0xccdd) }, }; static ZTEST_DMEM struct net_addr_test_data ipv6_ntop_7 = { - .family = AF_INET6, + .family = NET_AF_INET6, .pton = false, .ipv6.c_verify = "0:ff08::", - .ipv6.addr.s6_addr16 = { 0, htons(0xff08), 0, 0, 0, 0, 0, 0 }, + .ipv6.addr.s6_addr16 = { 0, net_htons(0xff08), 0, 0, 0, 0, 0, 0 }, }; static const struct { @@ -316,9 +316,9 @@ static const struct { static bool check_net_addr(struct net_addr_test_data *data) { switch (data->family) { - case AF_INET: + case NET_AF_INET: if (data->pton) { - if (net_addr_pton(AF_INET, (char *)data->ipv4.c_addr, + if (net_addr_pton(NET_AF_INET, (char *)data->ipv4.c_addr, &data->ipv4.addr) < 0) { printk("Failed to convert %s\n", data->ipv4.c_addr); @@ -334,7 +334,7 @@ static bool check_net_addr(struct net_addr_test_data *data) return false; } } else { - if (!net_addr_ntop(AF_INET, &data->ipv4.addr, + if (!net_addr_ntop(NET_AF_INET, &data->ipv4.addr, data->ipv4.c_addr, sizeof(data->ipv4.c_addr))) { printk("Failed to convert %s\n", @@ -355,9 +355,9 @@ static bool check_net_addr(struct net_addr_test_data *data) break; - case AF_INET6: + case NET_AF_INET6: if (data->pton) { - if (net_addr_pton(AF_INET6, (char *)data->ipv6.c_addr, + if (net_addr_pton(NET_AF_INET6, (char *)data->ipv6.c_addr, &data->ipv6.addr) < 0) { printk("Failed to convert %s\n", data->ipv6.c_addr); @@ -376,7 +376,7 @@ static bool check_net_addr(struct net_addr_test_data *data) return false; } } else { - if (!net_addr_ntop(AF_INET6, &data->ipv6.addr, + if (!net_addr_ntop(NET_AF_INET6, &data->ipv6.addr, data->ipv6.c_addr, sizeof(data->ipv6.c_addr))) { printk("Failed to convert %s\n", @@ -422,22 +422,22 @@ ZTEST(test_utils_fn, test_net_addr) ZTEST(test_utils_fn, test_addr_parse) { - struct sockaddr addr; + struct net_sockaddr addr; bool ret; int i; #if defined(CONFIG_NET_IPV4) static const struct { const char *address; int len; - struct sockaddr_in result; + struct net_sockaddr_in result; bool verdict; } parse_ipv4_entries[] = { { .address = "192.0.2.1:80", .len = sizeof("192.0.2.1:80") - 1, .result = { - .sin_family = AF_INET, - .sin_port = htons(80), + .sin_family = NET_AF_INET, + .sin_port = net_htons(80), .sin_addr = { .s4_addr[0] = 192, .s4_addr[1] = 0, @@ -451,7 +451,7 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "192.0.2.2", .len = sizeof("192.0.2.2") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_port = 0, .sin_addr = { .s4_addr[0] = 192, @@ -466,7 +466,7 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "192.0.2.3/foobar", .len = sizeof("192.0.2.3/foobar") - 8, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_port = 0, .sin_addr = { .s4_addr[0] = 192, @@ -481,7 +481,7 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "255.255.255.255:0", .len = sizeof("255.255.255.255:0") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_port = 0, .sin_addr = { .s4_addr[0] = 255, @@ -496,8 +496,8 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "127.0.0.42:65535", .len = sizeof("127.0.0.42:65535") - 1, .result = { - .sin_family = AF_INET, - .sin_port = htons(65535), + .sin_family = NET_AF_INET, + .sin_port = net_htons(65535), .sin_addr = { .s4_addr[0] = 127, .s4_addr[1] = 0, @@ -521,7 +521,7 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "192.0.2.3:80/foobar", .len = sizeof("192.0.2.3") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_port = 0, .sin_addr = { .s4_addr[0] = 192, @@ -536,8 +536,8 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "192.0.2.3:80/foobar", .len = sizeof("192.0.2.3:80") - 1, .result = { - .sin_family = AF_INET, - .sin_port = htons(80), + .sin_family = NET_AF_INET, + .sin_port = net_htons(80), .sin_addr = { .s4_addr[0] = 192, .s4_addr[1] = 0, @@ -566,7 +566,7 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "192.168.0.1", .len = sizeof("192.168.0.1:80000") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_port = 0, .sin_addr = { .s4_addr[0] = 192, @@ -587,23 +587,23 @@ ZTEST(test_utils_fn, test_addr_parse) static const struct { const char *address; int len; - struct sockaddr_in6 result; + struct net_sockaddr_in6 result; bool verdict; } parse_ipv6_entries[] = { { .address = "[2001:db8::2]:80", .len = sizeof("[2001:db8::2]:80") - 1, .result = { - .sin6_family = AF_INET6, - .sin6_port = htons(80), + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(80), .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(2) + .s6_addr16[7] = net_ntohs(2) } }, .verdict = true @@ -612,16 +612,16 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "[2001:db8::a]/barfoo", .len = sizeof("[2001:db8::a]/barfoo") - 8, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0xa) + .s6_addr16[7] = net_ntohs(0xa) } }, .verdict = true @@ -630,16 +630,16 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "[2001:db8::a]", .len = sizeof("[2001:db8::a]") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0xa) + .s6_addr16[7] = net_ntohs(0xa) } }, .verdict = true @@ -648,17 +648,17 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "[2001:db8:3:4:5:6:7:8]:65535", .len = sizeof("[2001:db8:3:4:5:6:7:8]:65535") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 65535, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), - .s6_addr16[2] = ntohs(3), - .s6_addr16[3] = ntohs(4), - .s6_addr16[4] = ntohs(5), - .s6_addr16[5] = ntohs(6), - .s6_addr16[6] = ntohs(7), - .s6_addr16[7] = ntohs(8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), + .s6_addr16[2] = net_ntohs(3), + .s6_addr16[3] = net_ntohs(4), + .s6_addr16[4] = net_ntohs(5), + .s6_addr16[5] = net_ntohs(6), + .s6_addr16[6] = net_ntohs(7), + .s6_addr16[7] = net_ntohs(8), } }, .verdict = true @@ -667,7 +667,7 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "[::]:0", .len = sizeof("[::]:0") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { .s6_addr16[0] = 0, @@ -686,16 +686,16 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "2001:db8::42", .len = sizeof("2001:db8::42") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0x42) + .s6_addr16[7] = net_ntohs(0x42) } }, .verdict = true @@ -734,11 +734,11 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "[2001:db8::]:80/url/continues", .len = sizeof("[2001:db8::]") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, @@ -752,16 +752,16 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "[2001:db8::200]:080", .len = sizeof("[2001:db8:433:2]:80000") - 1, .result = { - .sin6_family = AF_INET6, - .sin6_port = htons(80), + .sin6_family = NET_AF_INET6, + .sin6_port = net_htons(80), .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0x200) + .s6_addr16[7] = net_ntohs(0x200) } }, .verdict = true @@ -786,16 +786,16 @@ ZTEST(test_utils_fn, test_addr_parse) .address = "2001:db8::1:80", .len = sizeof("2001:db8::1:80") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, - .s6_addr16[6] = ntohs(0x01), - .s6_addr16[7] = ntohs(0x80) + .s6_addr16[6] = net_ntohs(0x01), + .s6_addr16[7] = net_ntohs(0x80) } }, .verdict = true @@ -870,8 +870,8 @@ static const char *check_ipaddr(const char *addresses) char addr_str[NET_IPV6_ADDR_LEN + 4 + 1]; char expecting[NET_IPV6_ADDR_LEN + 4 + 1]; const char *orig = addresses; - struct sockaddr_storage addr; - struct sockaddr_storage mask; + struct net_sockaddr_storage addr; + struct net_sockaddr_storage mask; uint8_t mask_len; int ret; @@ -882,29 +882,29 @@ static const char *check_ipaddr(const char *addresses) memset(expecting, 0, sizeof(expecting)); addresses = net_ipaddr_parse_mask(addresses, strlen(addresses), - (struct sockaddr *)&addr, &mask_len); + (struct net_sockaddr *)&addr, &mask_len); zassert_not_null(addresses, "Invalid parse, expecting \"%s\"", orig); strncpy(expecting, orig, *addresses == '\0' ? strlen(orig) : addresses - orig - 1); (void)net_addr_ntop(addr.ss_family, - &net_sin((struct sockaddr *)&addr)->sin_addr, + &net_sin((struct net_sockaddr *)&addr)->sin_addr, addr_str, sizeof(addr_str)); ret = net_mask_len_to_netmask(addr.ss_family, mask_len, - (struct sockaddr *)&mask); + (struct net_sockaddr *)&mask); zassert_equal(ret, 0, "Failed to convert mask %d", mask_len); ret = net_netmask_to_mask_len(addr.ss_family, - (struct sockaddr *)&mask, + (struct net_sockaddr *)&mask, &mask_len); zassert_equal(ret, 0, "Failed to convert mask %s", net_sprint_addr(addr.ss_family, (const void *)&net_sin( - ((struct sockaddr *)&mask))->sin_addr)); + ((struct net_sockaddr *)&mask))->sin_addr)); - if (net_sin((struct sockaddr *)&mask)->sin_addr.s_addr != 0) { + if (net_sin((struct net_sockaddr *)&mask)->sin_addr.s_addr != 0) { int addr_len = strlen(addr_str); snprintk(addr_str + addr_len, @@ -924,7 +924,7 @@ static const char *check_ipaddr(const char *addresses) ZTEST(test_utils_fn, test_addr_parse_mask) { - struct sockaddr addr; + struct net_sockaddr addr; uint8_t mask_len; const char *next; int i; @@ -932,7 +932,7 @@ ZTEST(test_utils_fn, test_addr_parse_mask) static const struct { const char *address; int len; - struct sockaddr_in result; + struct net_sockaddr_in result; uint8_t mask_len; const char *verdict; } parse_ipv4_entries[] = { @@ -945,7 +945,7 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "192.0.2.2", .len = sizeof("192.0.2.2") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_addr = { .s4_addr[0] = 192, .s4_addr[1] = 0, @@ -964,7 +964,7 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "127.0.0.42,1.2.3.4", .len = sizeof("127.0.0.42,1.2.3.4") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_addr = { .s4_addr[0] = 127, .s4_addr[1] = 0, @@ -979,7 +979,7 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "127.0.0.42/8,1.2.3.4", .len = sizeof("127.0.0.42/8,1.2.3.4") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_addr = { .s4_addr[0] = 127, .s4_addr[1] = 0, @@ -1004,7 +1004,7 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "192.0.2.3:80/foobar", .len = sizeof("192.0.2.3") - 1, .result = { - .sin_family = AF_INET, + .sin_family = NET_AF_INET, .sin_port = 0, .sin_addr = { .s4_addr[0] = 192, @@ -1030,7 +1030,7 @@ ZTEST(test_utils_fn, test_addr_parse_mask) static const struct { const char *address; int len; - struct sockaddr_in6 result; + struct net_sockaddr_in6 result; uint8_t mask_len; const char *verdict; } parse_ipv6_entries[] = { @@ -1038,15 +1038,15 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "2001:db8::2", .len = sizeof("2001:db8::2") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(2) + .s6_addr16[7] = net_ntohs(2) } }, .verdict = "", @@ -1055,16 +1055,16 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "2001:db8::a/barfoo", .len = sizeof("2001:db8::a/barfoo") - 8, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0xa) + .s6_addr16[7] = net_ntohs(0xa) } }, .verdict = "", @@ -1073,16 +1073,16 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "2001:db8::a", .len = sizeof("2001:db8::a") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0xa) + .s6_addr16[7] = net_ntohs(0xa) } }, .verdict = "", @@ -1101,16 +1101,16 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "2001:db8::42", .len = sizeof("2001:db8::42") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_port = 0, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0x42) + .s6_addr16[7] = net_ntohs(0x42) } }, .verdict = "", @@ -1175,15 +1175,15 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "2001:db8::1:80", .len = sizeof("2001:db8::1:80") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, - .s6_addr16[6] = ntohs(0x01), - .s6_addr16[7] = ntohs(0x80) + .s6_addr16[6] = net_ntohs(0x01), + .s6_addr16[7] = net_ntohs(0x80) } }, .verdict = "", @@ -1192,16 +1192,16 @@ ZTEST(test_utils_fn, test_addr_parse_mask) .address = "2001:db8::1/64,2001:db8::2", .len = sizeof("2001:db8::1/64,2001:db8::2") - 1, .result = { - .sin6_family = AF_INET6, + .sin6_family = NET_AF_INET6, .sin6_addr = { - .s6_addr16[0] = ntohs(0x2001), - .s6_addr16[1] = ntohs(0xdb8), + .s6_addr16[0] = net_ntohs(0x2001), + .s6_addr16[1] = net_ntohs(0xdb8), .s6_addr16[2] = 0, .s6_addr16[3] = 0, .s6_addr16[4] = 0, .s6_addr16[5] = 0, .s6_addr16[6] = 0, - .s6_addr16[7] = ntohs(0x01) + .s6_addr16[7] = net_ntohs(0x01) } }, .mask_len = 64, @@ -1393,7 +1393,7 @@ ZTEST(test_utils_fn, test_linkaddr_handling) int ret; pkt = net_pkt_rx_alloc_with_buffer(net_if_get_default(), - sizeof(udp), AF_UNSPEC, + sizeof(udp), NET_AF_UNSPEC, 0, K_NO_WAIT); zassert_not_null(pkt, "Cannot allocate pkt"); diff --git a/tests/net/virtual/src/main.c b/tests/net/virtual/src/main.c index 218f805c980af..113fcaa0cfec0 100644 --- a/tests/net/virtual/src/main.c +++ b/tests/net/virtual/src/main.c @@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL); #include "ipv6.h" #include "udp_internal.h" -bool arp_add(struct net_if *iface, struct in_addr *src, +bool arp_add(struct net_if *iface, struct net_in_addr *src, struct net_eth_addr *hwaddr); #define NET_LOG_ENABLED 1 @@ -51,25 +51,25 @@ bool arp_add(struct net_if *iface, struct in_addr *src, static char *test_data = "Test data to be sent"; /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; -static struct in_addr my_addr = { { { 192, 0, 2, 1 } } }; +static struct net_in_addr my_addr = { { { 192, 0, 2, 1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 3 addresses */ -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; -struct sockaddr virtual_addr; -struct sockaddr peer_addr; +struct net_sockaddr virtual_addr; +struct net_sockaddr peer_addr; #define MTU 1024 @@ -380,7 +380,7 @@ static void test_virtual_setup(void) static void test_address_setup(void) { - struct in_addr netmask = {{{ 255, 255, 255, 0 }}}; + struct net_in_addr netmask = {{{ 255, 255, 255, 0 }}}; struct net_if_addr *ifaddr; struct net_if *eth, *virt, *dummy1, *dummy2; int ret; @@ -452,7 +452,7 @@ static void test_address_setup(void) zassert_equal(ret, 1, "Cannot parse \"%s\"", CONFIG_NET_TEST_TUNNEL_MY_ADDR); - if (virtual_addr.sa_family == AF_INET) { + if (virtual_addr.sa_family == NET_AF_INET) { ifaddr = net_if_ipv4_addr_add(virt, &net_sin(&virtual_addr)->sin_addr, NET_ADDR_MANUAL, 0); @@ -463,13 +463,13 @@ static void test_address_setup(void) zassert_not_null(ifaddr, "virt addr"); } - net_sin(&virtual_addr)->sin_port = htons(4242); + net_sin(&virtual_addr)->sin_port = net_htons(4242); net_if_ipv4_set_netmask_by_addr(virt, &net_sin(&virtual_addr)->sin_addr, &netmask); - } else if (virtual_addr.sa_family == AF_INET6) { + } else if (virtual_addr.sa_family == NET_AF_INET6) { ifaddr = net_if_ipv6_addr_add(virt, &net_sin6(&virtual_addr)->sin6_addr, NET_ADDR_MANUAL, 0); @@ -480,7 +480,7 @@ static void test_address_setup(void) zassert_not_null(ifaddr, "virt addr"); } - net_sin6(&virtual_addr)->sin6_port = htons(4242); + net_sin6(&virtual_addr)->sin6_port = net_htons(4242); } else { zassert_not_null(NULL, "Invalid address family (%d)", virtual_addr.sa_family); @@ -501,7 +501,7 @@ static void test_address_setup(void) test_failed = false; } -static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) +static bool add_neighbor(struct net_if *iface, struct net_in6_addr *addr) { struct net_linkaddr lladdr; struct net_nbr *nbr; @@ -527,7 +527,7 @@ static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) return true; } -static bool add_to_arp(struct net_if *iface, struct in_addr *addr) +static bool add_to_arp(struct net_if *iface, struct net_in_addr *addr) { #if defined(CONFIG_NET_ARP) struct net_eth_addr lladdr; @@ -705,10 +705,10 @@ ZTEST(net_virtual, test_virtual_05_set_peer) net_if_get_by_iface(iface), ret); params.family = peer_addr.sa_family; - if (params.family == AF_INET) { + if (params.family == NET_AF_INET) { net_ipaddr_copy(¶ms.peer4addr, &net_sin(&peer_addr)->sin_addr); - } else if (params.family == AF_INET6) { + } else if (params.family == NET_AF_INET6) { net_ipaddr_copy(¶ms.peer6addr, &net_sin6(&peer_addr)->sin6_addr); } else { @@ -759,15 +759,15 @@ ZTEST(net_virtual, test_virtual_06_get_peer) zassert_equal(params.family, peer_addr.sa_family, "Invalid family, should be %d was %d", peer_addr.sa_family, params.family); - if (params.family == AF_INET) { + if (params.family == NET_AF_INET) { zassert_mem_equal(¶ms.peer4addr, &net_sin(&peer_addr)->sin_addr, - sizeof(struct in_addr), + sizeof(struct net_in_addr), "Peer IPv4 address invalid"); - } else if (params.family == AF_INET6) { + } else if (params.family == NET_AF_INET6) { zassert_mem_equal(¶ms.peer6addr, &net_sin6(&peer_addr)->sin6_addr, - sizeof(struct in6_addr), + sizeof(struct net_in6_addr), "Peer IPv6 address invalid"); } else { zassert_true(false, "Invalid family (%d)", params.family); @@ -815,13 +815,13 @@ ZTEST(net_virtual, test_virtual_08_send_data_to_tunnel) struct virtual_interface_req_params params = { 0 }; struct net_if *iface = virtual_interfaces[0]; struct net_if *attached = eth_interfaces[0]; - struct sockaddr dst_addr, src_addr; + struct net_sockaddr dst_addr, src_addr; void *addr; int addrlen; int ret; params.family = peer_addr.sa_family; - if (params.family == AF_INET) { + if (params.family == NET_AF_INET) { net_ipaddr_copy(¶ms.peer4addr, &net_sin(&peer_addr)->sin_addr); expecting_outer = 0x45; @@ -830,7 +830,7 @@ ZTEST(net_virtual, test_virtual_08_send_data_to_tunnel) ret = add_to_arp(eth_interfaces[0], &net_sin(&peer_addr)->sin_addr); zassert_true(ret, "Cannot add to arp"); - } else if (params.family == AF_INET6) { + } else if (params.family == NET_AF_INET6) { net_ipaddr_copy(¶ms.peer6addr, &net_sin6(&peer_addr)->sin6_addr); expecting_outer = 0x60; @@ -862,19 +862,19 @@ ZTEST(net_virtual, test_virtual_08_send_data_to_tunnel) memcpy(&dst_addr, &virtual_addr, sizeof(dst_addr)); memcpy(&src_addr, &virtual_addr, sizeof(src_addr)); - if (dst_addr.sa_family == AF_INET) { + if (dst_addr.sa_family == NET_AF_INET) { net_sin(&dst_addr)->sin_addr.s4_addr[3] = 2; addr = &src_addr; - addrlen = sizeof(struct sockaddr_in); + addrlen = sizeof(struct net_sockaddr_in); expecting_inner = 0x45; /* IPv4 */ - } else if (dst_addr.sa_family == AF_INET6) { + } else if (dst_addr.sa_family == NET_AF_INET6) { net_sin6(&dst_addr)->sin6_addr.s6_addr[15] = 2; addr = &src_addr; - addrlen = sizeof(struct sockaddr_in6); + addrlen = sizeof(struct net_sockaddr_in6); expecting_inner = 0x60; /* IPv6 */ } else { @@ -882,11 +882,11 @@ ZTEST(net_virtual, test_virtual_08_send_data_to_tunnel) addrlen = 0; } - ret = net_context_get(virtual_addr.sa_family, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(virtual_addr.sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_ctx); zassert_equal(ret, 0, "Create IP UDP context failed"); - ret = net_context_bind(udp_ctx, (struct sockaddr *)addr, addrlen); + ret = net_context_bind(udp_ctx, (struct net_sockaddr *)addr, addrlen); zassert_equal(ret, 0, "Context bind failure test failed"); test_started = true; @@ -905,7 +905,7 @@ ZTEST(net_virtual, test_virtual_08_send_data_to_tunnel) } static struct net_pkt *create_outer(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, size_t inner_len, size_t outer_len) @@ -915,7 +915,7 @@ static struct net_pkt *create_outer(struct net_if *iface, } static struct net_pkt *create_inner(struct net_if *iface, - sa_family_t family, + net_sa_family_t family, enum net_ip_protocol proto, size_t inner_len, size_t data_len) @@ -939,9 +939,9 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, { struct net_if *iface = virtual_interfaces[0]; struct net_if *attached = eth_interfaces[0]; - struct sockaddr dst_addr, src_addr, inner_src; - struct in_addr *outerv4, *innerv4; - struct in6_addr *outerv6, *innerv6; + struct net_sockaddr dst_addr, src_addr, inner_src; + struct net_in_addr *outerv4, *innerv4; + struct net_in6_addr *outerv6, *innerv6; size_t inner_len = sizeof(struct net_udp_hdr) + strlen(test_data); struct net_pkt *outer, *inner; @@ -955,7 +955,7 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, memcpy(&src_addr, &peer_addr, sizeof(src_addr)); memcpy(&inner_src, &virtual_addr, sizeof(inner_src)); - if (peer_addr.sa_family == AF_INET) { + if (peer_addr.sa_family == NET_AF_INET) { net_sin(&dst_addr)->sin_addr.s4_addr[3] = 1; net_sin(&src_addr)->sin_addr.s4_addr[3] = remote_ip; outerv4 = &net_sin(&peer_addr)->sin_addr; @@ -965,7 +965,7 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, outerv6 = &net_sin6(&peer_addr)->sin6_addr; } - if (virtual_addr.sa_family == AF_INET) { + if (virtual_addr.sa_family == NET_AF_INET) { net_sin(&inner_src)->sin_addr.s4_addr[3] = 2; innerv4 = &net_sin(&virtual_addr)->sin_addr; inner_len += sizeof(struct net_ipv4_hdr); @@ -975,8 +975,8 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, inner_len += sizeof(struct net_ipv6_hdr); } - if (peer_addr.sa_family == AF_INET) { - outer = create_outer(attached, AF_INET, IPPROTO_IP, + if (peer_addr.sa_family == NET_AF_INET) { + outer = create_outer(attached, NET_AF_INET, NET_IPPROTO_IP, sizeof(struct net_ipv4_hdr), 0); zassert_not_null(outer, "Cannot allocate pkt"); @@ -985,7 +985,7 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, zassert_equal(ret, 0, "Cannot create %s packet (%d)", "IPv4", ret); } else { - outer = create_outer(attached, AF_INET6, IPPROTO_IPV6, + outer = create_outer(attached, NET_AF_INET6, NET_IPPROTO_IPV6, sizeof(struct net_ipv6_hdr), 0); zassert_not_null(outer, "Cannot allocate %p pkt", outer); @@ -995,8 +995,8 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, ret); } - if (virtual_addr.sa_family == AF_INET) { - inner = create_inner(iface, AF_INET, IPPROTO_IP, + if (virtual_addr.sa_family == NET_AF_INET) { + inner = create_inner(iface, NET_AF_INET, NET_IPPROTO_IP, sizeof(struct net_ipv4_hdr), sizeof(struct net_udp_hdr) + strlen(test_data)); @@ -1006,10 +1006,10 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, innerv4); zassert_equal(ret, 0, "Cannot create outer %s (%d)", "IPv4", ret); - next_header = IPPROTO_IPIP; - addrlen = sizeof(struct sockaddr_in); + next_header = NET_IPPROTO_IPIP; + addrlen = sizeof(struct net_sockaddr_in); } else { - inner = create_inner(iface, AF_INET6, IPPROTO_IPV6, + inner = create_inner(iface, NET_AF_INET6, NET_IPPROTO_IPV6, sizeof(struct net_ipv6_hdr), sizeof(struct net_udp_hdr) + strlen(test_data)); @@ -1019,21 +1019,21 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, innerv6); zassert_equal(ret, 0, "Cannot create outer %s (%d)", "IPv6", ret); - next_header = IPPROTO_IPV6; - addrlen = sizeof(struct sockaddr_in6); + next_header = NET_IPPROTO_IPV6; + addrlen = sizeof(struct net_sockaddr_in6); } - ret = net_udp_create(inner, htons(src_port), htons(dst_port)); + ret = net_udp_create(inner, net_htons(src_port), net_htons(dst_port)); zassert_equal(ret, 0, "Cannot create UDP (%d)", ret); net_pkt_write(inner, test_data, strlen(test_data)); net_pkt_cursor_init(inner); - if (virtual_addr.sa_family == AF_INET) { - net_ipv4_finalize(inner, IPPROTO_UDP); + if (virtual_addr.sa_family == NET_AF_INET) { + net_ipv4_finalize(inner, NET_IPPROTO_UDP); } else { - net_ipv6_finalize(inner, IPPROTO_UDP); + net_ipv6_finalize(inner, NET_IPPROTO_UDP); } net_buf_frag_add(outer->buffer, inner->buffer); @@ -1042,19 +1042,19 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, net_pkt_cursor_init(outer); - if (peer_addr.sa_family == AF_INET) { + if (peer_addr.sa_family == NET_AF_INET) { net_ipv4_finalize(outer, next_header); } else { net_ipv6_finalize(outer, next_header); } - ret = net_context_get(virtual_addr.sa_family, SOCK_DGRAM, IPPROTO_UDP, + ret = net_context_get(virtual_addr.sa_family, NET_SOCK_DGRAM, NET_IPPROTO_UDP, &udp_ctx); zassert_equal(ret, 0, "Create IP UDP context failed"); net_context_set_iface(udp_ctx, iface); - ret = net_context_bind(udp_ctx, (struct sockaddr *)&virtual_addr, + ret = net_context_bind(udp_ctx, (struct net_sockaddr *)&virtual_addr, addrlen); zassert_equal(ret, 0, "Context bind failure test failed"); @@ -1066,7 +1066,7 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip, net_pkt_cursor_init(outer); - if (peer_addr.sa_family == AF_INET) { + if (peer_addr.sa_family == NET_AF_INET) { verdict = net_ipv4_input(outer); } else { verdict = net_ipv6_input(outer); diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c index 3da31a3ca2c4b..5d29c4c2113c6 100644 --- a/tests/net/vlan/src/main.c +++ b/tests/net/vlan/src/main.c @@ -93,24 +93,24 @@ static unsigned char icmpv6_echo_reply[] = { }; /* Interface 1 addresses */ -static struct in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, +static struct net_in6_addr my_addr1 = { { { 0x20, 0x01, 0x0d, 0xb8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Interface 2 addresses */ -static struct in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr my_addr2 = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* VLAN Interface 3 addresses */ -static struct in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, +static struct net_in6_addr my_addr3 = { { { 0x20, 0x01, 0x0d, 0xb8, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; /* Extra address is assigned to ll_addr */ -static struct in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr ll_addr = { { { 0xfe, 0x80, 0x43, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0xf2, 0xaa, 0x29, 0x02, 0x04 } } }; /* Peer addresses */ -static struct in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, +static struct net_in6_addr peer_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; /* Keep track of all ethernet interfaces */ @@ -221,7 +221,7 @@ static int eth_tx(const struct device *dev, struct net_pkt *pkt) context->expecting_tag); zassert_equal(context->expecting_tag, - net_eth_vlan_get_vid(ntohs(hdr->vlan.tci)), + net_eth_vlan_get_vid(net_ntohs(hdr->vlan.tci)), "Invalid VLAN tag in ethernet header"); k_sleep(K_MSEC(10)); @@ -863,7 +863,7 @@ static void test_vlan_disable_all(void) zassert_equal(ret, -EINVAL, "Wrong iface type (%d)", ret); } -static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) +static bool add_neighbor(struct net_if *iface, struct net_in6_addr *addr) { struct net_linkaddr *ll_addr; struct net_nbr *nbr; @@ -886,11 +886,11 @@ static bool add_neighbor(struct net_if *iface, struct in6_addr *addr) } static void comm_sendto_recvfrom(int client_sock, - struct sockaddr *client_addr, - socklen_t client_addrlen, + struct net_sockaddr *client_addr, + net_socklen_t client_addrlen, int server_sock, - struct sockaddr *server_addr, - socklen_t server_addrlen) + struct net_sockaddr *server_addr, + net_socklen_t server_addrlen) { ssize_t sent = 0; @@ -931,8 +931,8 @@ ZTEST(net_vlan, test_vlan_ipv6_sendto_recvfrom) int ret; int client_sock; int server_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 server_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 server_addr; struct eth_context *ctx; if (NET_VLAN_MAX_COUNT == 0) { @@ -963,17 +963,17 @@ ZTEST(net_vlan, test_vlan_ipv6_sendto_recvfrom) zassert_true(ret, "Cannot add neighbor"); ret = zsock_bind(server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); zassert_equal(ret, 0, "bind failed"); test_started = true; comm_sendto_recvfrom(client_sock, - (struct sockaddr *)&client_addr, + (struct net_sockaddr *)&client_addr, sizeof(client_addr), server_sock, - (struct sockaddr *)&server_addr, + (struct net_sockaddr *)&server_addr, sizeof(server_addr)); ret = zsock_close(client_sock); @@ -988,18 +988,18 @@ ZTEST(net_vlan, test_zz_vlan_embed_ll_hdr) struct net_if *iface; int ret; int client_sock; - struct sockaddr_in6 client_addr; - struct sockaddr_in6 dest_addr; + struct net_sockaddr_in6 client_addr; + struct net_sockaddr_in6 dest_addr; struct net_if_addr *ifaddr; ssize_t sent = 0; struct ifreq ifreq = { 0 }; char ifname[CONFIG_NET_INTERFACE_NAME_LEN]; /* embed ll interface addresses */ - static struct in6_addr my_vlan_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0x90, 0, 0, 0, + static struct net_in6_addr my_vlan_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0x90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }; - static struct in6_addr peer_vlan_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0x90, 0, 0, 0, + static struct net_in6_addr peer_vlan_addr = { { { 0x20, 0x01, 0x0d, 0xb8, 0x90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }; if (NET_VLAN_MAX_COUNT == 0) { @@ -1043,7 +1043,7 @@ ZTEST(net_vlan, test_zz_vlan_embed_ll_hdr) net_ipaddr_copy(&dest_addr.sin6_addr, &peer_vlan_addr); sent = zsock_sendto(client_sock, TEST_STR_SMALL, strlen(TEST_STR_SMALL), - 0, (struct sockaddr *)&dest_addr, sizeof(dest_addr)); + 0, (struct net_sockaddr *)&dest_addr, sizeof(dest_addr)); zassert_equal(sent, strlen(TEST_STR_SMALL), "send (%d) failed %d/%s", sent, -errno, strerror(errno)); @@ -1075,7 +1075,7 @@ ZTEST(net_vlan, test_vlan_enable_disable_all) test_vlan_disable_all(); } -static bool add_peer_neighbor(struct net_if *iface, struct in6_addr *addr, +static bool add_peer_neighbor(struct net_if *iface, struct net_in6_addr *addr, uint8_t *lladdr) { struct net_linkaddr ll_addr = { @@ -1146,8 +1146,8 @@ ZTEST(net_vlan, test_vlan_tag_0) */ pkt = net_pkt_rx_alloc_with_buffer(iface, sizeof(icmpv6_echo_request), - AF_INET6, - IPPROTO_ICMPV6, + NET_AF_INET6, + NET_IPPROTO_ICMPV6, K_NO_WAIT); zassert_not_null(pkt, "Cannot allocate pkt"); diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/src/main.c b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/src/main.c index 7c76c28ced095..400b8a3f4a24c 100644 --- a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/src/main.c +++ b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/src/main.c @@ -75,8 +75,8 @@ ZTEST(fs_mgmt_hash_supported, test_supported) /* Check that the headers seem valid */ struct smp_hdr *response_hdr = (struct smp_hdr *)nb->data; - uint16_t len = ntohs(response_hdr->nh_len); - uint16_t group = ntohs(response_hdr->nh_group); + uint16_t len = net_ntohs(response_hdr->nh_len); + uint16_t group = net_ntohs(response_hdr->nh_group); zassert_equal(response_hdr->nh_op, MGMT_OP_READ_RSP, "Expected response to have rease response type"); diff --git a/tests/subsys/modem/modem_ppp/src/main.c b/tests/subsys/modem/modem_ppp/src/main.c index 84cfc73c0ed2f..742667748641e 100644 --- a/tests/subsys/modem/modem_ppp/src/main.c +++ b/tests/subsys/modem/modem_ppp/src/main.c @@ -502,7 +502,7 @@ ZTEST(modem_ppp, test_ip_frame_send) net_pkt_cursor_init(pkt); ret = net_pkt_write(pkt, ip_frame_unwrapped, sizeof(ip_frame_unwrapped)); zassert_true(ret == 0, "Failed to write data to allocated network packet"); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); /* Send network packet */ test_net_send(pkt); @@ -529,7 +529,7 @@ ZTEST(modem_ppp, test_ip_frame_send_multiple) net_pkt_cursor_init(pkts[i]); ret = net_pkt_write(pkts[i], ip_frame_unwrapped, sizeof(ip_frame_unwrapped)); zassert_true(ret == 0, "Failed to write data to allocated network packet"); - net_pkt_set_family(pkts[i], AF_INET); + net_pkt_set_family(pkts[i], NET_AF_INET); } /* Send net pkts */ @@ -554,7 +554,7 @@ ZTEST(modem_ppp, test_ip_frame_send_large) AF_UNSPEC, 0, K_NO_WAIT); net_pkt_cursor_init(pkt); - net_pkt_set_family(pkt, AF_INET); + net_pkt_set_family(pkt, NET_AF_INET); size = test_modem_ppp_fill_net_pkt(pkt, TEST_MODEM_PPP_IP_FRAME_SEND_LARGE_N); zassert_true(size == TEST_MODEM_PPP_IP_FRAME_SEND_LARGE_N, "Failed to fill net pkt"); test_net_send(pkt);