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

Timestamp:

2012-05-04T10:41:44Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af42a2b

Parents:

6efb4d2 (diff), d21e935c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

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>
@@ -89 +88 @@
         socket = (tcp_sockdata_t *)sock_core->specific_data;
         (void)socket;
+
+        /* XXX We need to initiate connection cleanup here */
 }
 
@@ -142 +143 @@
         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));
-        answer_call(callid, EOK, &answer, 3);
+        
+        async_answer_3(callid, EOK, IPC_GET_ARG1(answer),
+            IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
 }
 
@@ -466 +468 @@
         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));
-
-        answer_call(callid, asock_core->socket_id, &answer, 3);
-
+        
+        async_answer_3(callid, asock_core->socket_id,
+            IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
+            IPC_GET_ARG3(answer));
+        
         /* Push one fragment notification to client's queue */
         log_msg(LVL_DEBUG, "tcp_sock_accept(): notify data\n");
@@ -557 +559 @@
         }
 
-        refresh_answer(&answer, NULL);
+        IPC_SET_ARG1(answer, 0);
         SOCKET_SET_DATA_FRAGMENT_SIZE(answer, FRAGMENT_SIZE);
-        answer_call(callid, EOK, &answer, 2);
+        async_answer_2(callid, EOK, IPC_GET_ARG1(answer),
+            IPC_GET_ARG2(answer));
         fibril_mutex_unlock(&socket->lock);
 }
@@ -677 +680 @@
 
         SOCKET_SET_READ_DATA_LENGTH(answer, length);
-        answer_call(callid, EOK, &answer, 1);
-
+        async_answer_1(callid, EOK, IPC_GET_ARG1(answer));
+        
         /* Push one fragment notification to client's queue */
         tcp_sock_notify_data(sock_core);
@@ -835 +838 @@
                 }
         }
+
+        /* 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);
 }