Changes in uspace/srv/net/udp/sock.c [ccb5165:257feec] in mainline

File:

• uspace/srv/net/udp/sock.c (modified) (14 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;
+        
+        inet_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);
@@ -221 +222 @@
                 assert(false);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, " - success");
         async_answer_0(callid, rc);
@@ -269 +270 @@
                 }
                 
-                fsock.addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
+                inet_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 (inet_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;
+                inet_addr_t loc_addr;
+                inet_addr_t rem_addr;
+                
+                rem_addr = fsock_ptr ? fsock.addr :
+                    socket->assoc->ident.foreign.addr;
                 
                 int rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);
@@ -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;
@@ -427 +428 @@
         socket = (udp_sockdata_t *)sock_core->specific_data;
         fibril_mutex_lock(&socket->lock);
-
+        
         if (socket->assoc == NULL) {
                 fibril_mutex_unlock(&socket->lock);
@@ -443 +444 @@
                     &socket->recv_buffer_lock);
         }
-
+        
         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;
@@ -466 +467 @@
                 assert(false);
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "**** udp_uc_receive -> %d", rc);
+        
         if (rc != EOK) {
                 fibril_mutex_unlock(&socket->recv_buffer_lock);
@@ -476 +478 @@
 
         if (IPC_GET_IMETHOD(call) == NET_SOCKET_RECVFROM) {
-                /* Fill addr */
+                /* Fill address */
+                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_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");
@@ -509 +520 @@
                 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);
@@ -518 +529 @@
         if (length < data_len && rc == EOK)
                 rc = EOVERFLOW;
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "read_data_length <- %zu", length);
         IPC_SET_ARG2(answer, 0);
@@ -525 +536 @@
         async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
             IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
-
+        
         socket->recv_buffer_used = 0;
-
+        
         fibril_condvar_broadcast(&socket->recv_buffer_cv);
         fibril_mutex_unlock(&socket->recv_buffer_lock);
@@ -602 +613 @@
         while (true) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "[] wait for rcv buffer empty()");
-                while (sock->recv_buffer_used != 0 && sock->sock_core != NULL) {
+                while ((sock->recv_buffer_used != 0) && (sock->sock_core != NULL)) {
                         fibril_condvar_wait(&sock->recv_buffer_cv,
                             &sock->recv_buffer_lock);