net: Convert network codebase to use renamed network APIs

Rename network symbols in network stack to use the renamed network APIs.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

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);

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 <zephyr/net/coap_service.h>
 
     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;

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) {

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.
 

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:

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));
 

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.

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

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

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;
 };