Changes in uspace/srv/net/tcp/sock.c [05bfce7:257feec] in mainline

File:

• uspace/srv/net/tcp/sock.c (modified) (15 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);
 
@@ -425 +429 @@
 
         fibril_mutex_unlock(&socket->lock);
-
+        
         switch (trc) {
         case TCP_EOK:
@@ -436 +440 @@
                 assert(false);
         }
-
+        
         if (rc == EOK)
                 fibril_add_ready(socket->recv_fibril);
-
+        
         async_answer_0(callid, rc);
 }
@@ -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;
 
@@ -682 +687 @@
         socket = (tcp_sockdata_t *)sock_core->specific_data;
         fibril_mutex_lock(&socket->lock);
-
+        
         if (socket->conn == NULL) {
                 fibril_mutex_unlock(&socket->lock);
@@ -698 +703 @@
                     &socket->recv_buffer_lock);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Got data in sock recv_buffer");
 
@@ -718 +723 @@
                 assert(false);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "**** recv result -> %d", rc);
+        
         if (rc != EOK) {
                 fibril_mutex_unlock(&socket->recv_buffer_lock);
@@ -728 +734 @@
 
         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);
 
@@ -754 +770 @@
                 }
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "data read receive");
         if (!async_data_read_receive(&rcallid, &length)) {
@@ -762 +778 @@
                 return;
         }
-
+        
         if (length > data_len)
                 length = data_len;
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "data read finalize");
         rc = async_data_read_finalize(rcallid, socket->recv_buffer, length);
-
+        
         socket->recv_buffer_used -= length;
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_recvfrom: %zu left in buffer",
@@ -777 +793 @@
                 tcp_sock_notify_data(socket->sock_core);
         }
-
+        
         fibril_condvar_broadcast(&socket->recv_buffer_cv);
 
@@ -785 +801 @@
         SOCKET_SET_READ_DATA_LENGTH(answer, length);
         async_answer_1(callid, EOK, IPC_GET_ARG1(answer));
-
+        
         fibril_mutex_unlock(&socket->recv_buffer_lock);
         fibril_mutex_unlock(&socket->lock);