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

Timestamp:

2012-05-04T10:57:48Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

35a35651

Parents:

90924df (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 (moved) (moved from uspace/srv/net/tl/tcp/sock.c ) (13 diffs)

uspace/srv/net/tcp/sock.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
+#include <inet/inet.h>
 #include <io/log.h>
-#include <ip_client.h>
+#include <ipc/services.h>
 #include <ipc/socket.h>
-#include <net/modules.h>
 #include <net/socket.h>
+#include <ns.h>
 
 #include "sock.h"
@@ -63 +64 @@
 static socket_ports_t gsock;
 
+static void tcp_sock_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 static void tcp_sock_cstate_cb(tcp_conn_t *conn, void *arg);
 
-void tcp_sock_init(void)
-{
+int tcp_sock_init(void)
+{
+        int rc;
+
         socket_ports_initialize(&gsock);
+
+        async_set_client_connection(tcp_sock_connection);
+
+        rc = service_register(SERVICE_TCP);
+        if (rc != EOK)
+                return EEXIST;
+
+        return EOK;
 }
 
@@ -76 +88 @@
         socket = (tcp_sockdata_t *)sock_core->specific_data;
         (void)socket;
+
+        /* XXX We need to initiate connection cleanup here */
 }
 
@@ -129 +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));
 }
 
@@ -273 +288 @@
         tcp_sock_t lsocket;
         tcp_sock_t fsocket;
-        nic_device_id_t dev_id;
-        tcp_phdr_t *phdr;
-        size_t phdr_len;
 
         log_msg(LVL_DEBUG, "tcp_sock_connect()");
@@ -309 +321 @@
 
         if (socket->laddr.ipv4 == TCP_IPV4_ANY) {
-                /* Find route to determine local IP address. */
-                rc = ip_get_route_req(ip_sess, IPPROTO_TCP,
-                    (struct sockaddr *)addr, sizeof(*addr), &dev_id,
-                    (void **)&phdr, &phdr_len);
+                /* Determine local IP address */
+                inet_addr_t loc_addr, rem_addr;
+
+                rem_addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
+                rc = inet_get_srcaddr(&rem_addr, 0, &loc_addr);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, rc);
-                        log_msg(LVL_DEBUG, "tcp_transmit_connect: Failed to find route.");
-                        return;
-                }
-
-                socket->laddr.ipv4 = uint32_t_be2host(phdr->src_addr);
+                        log_msg(LVL_DEBUG, "tcp_sock_connect: Failed to "
+                            "determine local address.");
+                        return;
+                }
+
+                socket->laddr.ipv4 = loc_addr.ipv4;
                 log_msg(LVL_DEBUG, "Local IP address is %x", socket->laddr.ipv4);
-                free(phdr);
         }
 
@@ -455 +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");
@@ -546 +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);
 }
@@ -666 +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);
@@ -713 +727 @@
         }
 
-        rc = socket_destroy(net_sess, socket_id, &client->sockets, &gsock,
+        rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             tcp_free_sock_data);
         if (rc != EOK) {
@@ -764 +778 @@
 }
 
-int tcp_sock_connection(async_sess_t *sess, ipc_callid_t iid, ipc_call_t icall)
+static void tcp_sock_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         ipc_callid_t callid;
@@ -773 +787 @@
         async_answer_0(iid, EOK);
 
-        client.sess = sess;
+        client.sess = async_callback_receive(EXCHANGE_SERIALIZE);
         socket_cores_initialize(&client.sockets);
 
@@ -825 +839 @@
         }
 
-        return EOK;
+        /* 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);
 }