Changeset 3aa2642a in mainline

Timestamp:

2011-12-04T12:46:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bf600510

Parents:

704586fb

Message:

Allow accepting connection from arbitray foreign address, port.

Location:

uspace/srv/net/tl/tcp

Files:

• conn.c (modified) (2 diffs)
• sock.c (modified) (1 diff)
• tcp_type.h (modified) (1 diff)
• ucall.c (modified) (1 diff)

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

@@ -212 +212 @@
  * is equal.
  */
-static bool tcp_socket_equal(tcp_sock_t *a, tcp_sock_t *b)
-{
-        log_msg(LVL_DEBUG, "tcp_socket_equal((%x,%u), (%x,%u))",
-            a->addr.ipv4, a->port, b->addr.ipv4, b->port);
-
-        if (a->addr.ipv4 != b->addr.ipv4)
+static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt)
+{
+        log_msg(LVL_DEBUG, "tcp_socket_match(sock=(%x,%u), pat=(%x,%u))",
+            sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port);
+
+        if (patt->addr.ipv4 != TCP_IPV4_ANY &&
+            patt->addr.ipv4 != sock->addr.ipv4)
                 return false;
 
-        if (a->port != b->port)
+        if (patt->port != TCP_PORT_ANY &&
+            patt->port != sock->port)
                 return false;
 
@@ -233 +235 @@
         log_msg(LVL_DEBUG, "tcp_sockpair_match(%p, %p)", sp, pattern);
 
-        if (!tcp_socket_equal(&sp->local, &pattern->local))
+        if (!tcp_socket_match(&sp->local, &pattern->local))
                 return false;
 
-        if (!tcp_socket_equal(&sp->foreign, &pattern->foreign))
+        if (!tcp_socket_match(&sp->foreign, &pattern->foreign))
                 return false;
 

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

@@ -305 +305 @@
         log_msg(LVL_DEBUG, " - open connection");
 
-        fsocket.addr.ipv4 = 0x7f000001; /* XXX */
-        fsocket.port = 1025; /* XXX */
+        fsocket.addr.ipv4 = TCP_IPV4_ANY;
+        fsocket.port = TCP_PORT_ANY;
 
         trc = tcp_uc_open(sock_core->port, &fsocket, ap_passive, &conn);

uspace/srv/net/tl/tcp/tcp_type.h

@@ -119 +119 @@
 } tcp_sock_t;
 
+enum netaddr {
+        TCP_IPV4_ANY = 0
+};
+
+enum tcp_port {
+        TCP_PORT_ANY = 0
+};
+
 typedef struct {
         tcp_sock_t local;

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

@@ -242 +242 @@
         conn = tcp_conn_find(sp);
         if (conn != NULL && conn->cstate != st_closed) {
+                if (conn->ident.foreign.addr.ipv4 == TCP_IPV4_ANY)
+                        conn->ident.foreign.addr.ipv4 = sp->foreign.addr.ipv4;
+                if (conn->ident.foreign.port == TCP_PORT_ANY)
+                        conn->ident.foreign.port = sp->foreign.port;
+
                 tcp_conn_segment_arrived(conn, seg);
         } else {