Changes in uspace/srv/net/tcp/sock.c [b1bd89ea:69a93df7] in mainline

File:

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

uspace/srv/net/tcp/sock.c

@@ -42 +42 @@
 #include <ipc/services.h>
 #include <ipc/socket.h>
+#include <net/modules.h>
 #include <net/socket.h>
 #include <ns.h>
@@ -88 +89 @@
         socket = (tcp_sockdata_t *)sock_core->specific_data;
         (void)socket;
-
-        /* XXX We need to initiate connection cleanup here */
 }
 
@@ -143 +142 @@
         sock->sock_core = sock_core;
 
+        refresh_answer(&answer, NULL);
         SOCKET_SET_SOCKET_ID(answer, sock_id);
 
         SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
         SOCKET_SET_HEADER_SIZE(answer, sizeof(tcp_header_t));
-        
-        async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
-            IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+        answer_call(callid, EOK, &answer, 3);
 }
 
@@ -468 +466 @@
         assert(asock_core != NULL);
 
+        refresh_answer(&answer, NULL);
+
         SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
         SOCKET_SET_SOCKET_ID(answer, asock_id);
         SOCKET_SET_ADDRESS_LENGTH(answer, sizeof(struct sockaddr_in));
-        
-        async_answer_3(callid, asock_core->socket_id,
-            IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
-            IPC_GET_ARG3(answer));
-        
+
+        answer_call(callid, asock_core->socket_id, &answer, 3);
+
         /* Push one fragment notification to client's queue */
         log_msg(LVL_DEBUG, "tcp_sock_accept(): notify data\n");
@@ -559 +557 @@
         }
 
-        IPC_SET_ARG1(answer, 0);
+        refresh_answer(&answer, NULL);
         SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
-        async_answer_2(callid, EOK, IPC_GET_ARG1(answer),
-            IPC_GET_ARG2(answer));
+        answer_call(callid, EOK, &answer, 2);
         fibril_mutex_unlock(&socket->lock);
 }
@@ -680 +677 @@
 
         SOCKET_SET_READ_DATA_LENGTH(answer, length);
-        async_answer_1(callid, EOK, IPC_GET_ARG1(answer));
-        
+        answer_call(callid, EOK, &answer, 1);
+
         /* Push one fragment notification to client's queue */
         tcp_sock_notify_data(sock_core);
@@ -838 +835 @@
                 }
         }
-
-        /* Clean up */
-        log_msg(LVL_DEBUG, "tcp_sock_connection: Clean up");
-        async_hangup(client.sess);
-        socket_cores_release(NULL, &client.sockets, &gsock, tcp_free_sock_data);
 }