Changeset a2e3ee6 in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2013-06-20T16:45:58Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

• uspace/srv/net/tcp/sock.c (modified) (6 diffs)

uspace/srv/net/tcp/sock.c

@@ -179 +179 @@
         }
 
-        sock->laddr.ipv4 = TCP_IPV4_ANY;
+        inet_addr_any(&sock->laddr);
         sock->lconn = NULL;
         sock->backlog = 0;
@@ -314 +314 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - open connections");
         
-        lsocket.addr.ipv4 = TCP_IPV4_ANY;
+        inet_addr_any(&lsocket.addr);
         lsocket.port = sock_core->port;
-        fsocket.addr.ipv4 = TCP_IPV4_ANY;
+        
+        inet_addr_any(&fsocket.addr);
         fsocket.port = TCP_PORT_ANY;
         
@@ -396 +397 @@
         fibril_mutex_lock(&socket->lock);
 
-        if (socket->laddr.ipv4 == TCP_IPV4_ANY) {
+        if (inet_addr_is_any(&socket->laddr)) {
                 /* Determine local IP address */
-                inet_addr_t loc_addr, rem_addr;
-
-                rem_addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
+                inet_addr_t loc_addr;
+                inet_addr_t rem_addr;
+                
+                inet_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
+                    &rem_addr);
                 rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);
                 if (rc != EOK) {
@@ -409 +412 @@
                         return;
                 }
-
-                socket->laddr.ipv4 = loc_addr.ipv4;
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Local IP address is %x", socket->laddr.ipv4);
-        }
-
-        lsocket.addr.ipv4 = socket->laddr.ipv4;
+                
+                socket->laddr = loc_addr;
+        }
+        
+        lsocket.addr = socket->laddr;
         lsocket.port = sock_core->port;
-        fsocket.addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
+        
+        inet_addr_unpack(uint32_t_be2host(addr->sin_addr.s_addr),
+            &fsocket.addr);
         fsocket.port = uint16_t_be2host(addr->sin_port);
 
@@ -507 +511 @@
         /* Replenish listening connection */
 
-        lsocket.addr.ipv4 = TCP_IPV4_ANY;
+        inet_addr_any(&lsocket.addr);
         lsocket.port = sock_core->port;
-        fsocket.addr.ipv4 = TCP_IPV4_ANY;
+        
+        inet_addr_any(&fsocket.addr);
         fsocket.port = TCP_PORT_ANY;
 
@@ -728 +733 @@
 
         if (IPC_GET_IMETHOD(call) == NET_SOCKET_RECVFROM) {
-                /* Fill addr */
+                /* Fill address */
                 rsock = &socket->conn->ident.foreign;
+                
+                uint32_t rsock_addr;
+                int rc = inet_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_addr.s_addr = host2uint32_t_be(rsock_addr);
                 addr.sin_port = host2uint16_t_be(rsock->port);