Changeset 19a4f73 in mainline for uspace/srv/net/udp/sock.c

Timestamp:

2013-06-20T15:21:48Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a2e3ee6

Parents:

3e66428

Message:

udp: use new network address infrastructure (towards IPv6 support)

File:

• uspace/srv/net/udp/sock.c (modified) (7 diffs)

uspace/srv/net/udp/sock.c

@@ -199 +199 @@
         }
 
-        socket = (udp_sockdata_t *)sock_core->specific_data;
-
-        fsock.addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
+        socket = (udp_sockdata_t *) sock_core->specific_data;
+        
+        inet2_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
+            &fsock.addr);
         fsock.port = sock_core->port;
         urc = udp_uc_set_local(socket->assoc, &fsock);
@@ -269 +270 @@
                 }
                 
-                fsock.addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
+                inet2_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
+                    &fsock.addr);
                 fsock.port = uint16_t_be2host(addr->sin_port);
                 fsock_ptr = &fsock;
@@ -314 +316 @@
         fibril_mutex_lock(&socket->lock);
         
-        if (socket->assoc->ident.local.addr.ipv4 == UDP_IPV4_ANY) {
+        if (inet2_addr_is_any(&socket->assoc->ident.local.addr)) {
                 /* Determine local IP address */
-                inet_addr_t loc_addr, rem_addr;
-                
-                rem_addr.ipv4 = fsock_ptr ? fsock.addr.ipv4 :
-                    socket->assoc->ident.foreign.addr.ipv4;
-                
-                int rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);
+                inet2_addr_t loc_addr;
+                inet2_addr_t rem_addr;
+                
+                rem_addr = fsock_ptr ? fsock.addr :
+                    socket->assoc->ident.foreign.addr;
+                
+                int rc = inet2_get_srcaddr(&rem_addr, 0, &loc_addr);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&socket->lock);
@@ -330 +333 @@
                 }
                 
-                socket->assoc->ident.local.addr.ipv4 = loc_addr.ipv4;
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Local IP address is %x",
-                    socket->assoc->ident.local.addr.ipv4);
+                socket->assoc->ident.local.addr = loc_addr;
         }
         
@@ -410 +411 @@
         size_t data_len;
         udp_error_t urc;
-        udp_sock_t rsock;
+        udp_sock_t *rsock;
         struct sockaddr_in addr;
         int rc;
@@ -446 +447 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Got data in sock recv_buffer");
 
-        rsock = socket->recv_fsock;
+        rsock = &socket->recv_fsock;
         data_len = socket->recv_buffer_used;
         urc = socket->recv_error;
@@ -476 +477 @@
 
         if (IPC_GET_IMETHOD(call) == NET_SOCKET_RECVFROM) {
-                /* Fill addr */
+                /* Fill address */
+                uint32_t rsock_addr;
+                int rc = inet2_addr_pack(&rsock->addr, &rsock_addr);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&socket->recv_buffer_lock);
+                        fibril_mutex_unlock(&socket->lock);
+                        async_answer_0(callid, rc);
+                        return;
+                }
+                
                 addr.sin_family = AF_INET;
-                addr.sin_addr.s_addr = host2uint32_t_be(rsock.addr.ipv4);
-                addr.sin_port = host2uint16_t_be(rsock.port);
+                addr.sin_addr.s_addr = host2uint32_t_be(rsock_addr);
+                addr.sin_port = host2uint16_t_be(rsock->port);
 
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "addr read receive");