Changeset 0ac2158 in mainline for uspace/srv/net/tl/tcp/sock.c

Timestamp:

2011-12-08T23:29:06Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d9e14fa4

Parents:

5f9ecd3

Message:

Determine local IP address, fill it in pseudo header.

File:

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

uspace/srv/net/tl/tcp/sock.c

@@ -39 +39 @@
 #include <errno.h>
 #include <io/log.h>
+#include <ip_client.h>
 #include <ipc/socket.h>
 #include <net/modules.h>
@@ -106 +107 @@
 
         sock->client = client;
+        sock->laddr.ipv4 = TCP_IPV4_ANY;
 
         sock_id = SOCKET_GET_SOCKET_ID(call);
@@ -211 +213 @@
         tcp_sockdata_t *socket;
         tcp_error_t trc;
+        tcp_sock_t lsocket;
         tcp_sock_t fsocket;
-        uint16_t lport;
+        device_id_t dev_id;
+        tcp_phdr_t *phdr;
+        size_t phdr_len;
 
         log_msg(LVL_DEBUG, "tcp_sock_connect()");
@@ -243 +248 @@
         }
 
-        lport = sock_core->port;
+        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);
+                if (rc != EOK) {
+                        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, "Local IP address is %x", socket->laddr.ipv4);
+                free(phdr);
+        }
+
+        lsocket.addr.ipv4 = socket->laddr.ipv4;
+        lsocket.port = sock_core->port;
         fsocket.addr.ipv4 = uint32_t_be2host(addr->sin_addr.s_addr);
         fsocket.port = uint16_t_be2host(addr->sin_port);
 
-        trc = tcp_uc_open(lport, &fsocket, ap_active, &socket->conn);
+        trc = tcp_uc_open(&lsocket, &fsocket, ap_active, &socket->conn);
 
         if (socket->conn != NULL)
@@ -280 +302 @@
         tcp_sockdata_t *asocket;
         tcp_error_t trc;
+        tcp_sock_t lsocket;
         tcp_sock_t fsocket;
         tcp_conn_t *conn;
@@ -305 +328 @@
         log_msg(LVL_DEBUG, " - open connection");
 
+        lsocket.addr.ipv4 = TCP_IPV4_ANY;
+        lsocket.port = sock_core->port;
         fsocket.addr.ipv4 = TCP_IPV4_ANY;
         fsocket.port = TCP_PORT_ANY;
 
-        trc = tcp_uc_open(sock_core->port, &fsocket, ap_passive, &conn);
+        trc = tcp_uc_open(&lsocket, &fsocket, ap_passive, &conn);
         if (conn != NULL)
                 conn->name = (char *)"S";