Changeset 98abd40 in mainline for uspace/srv/net/tcp/ucall.c

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/ucall.c (modified) (2 diffs)

uspace/srv/net/tcp/ucall.c

@@ -298 +298 @@
         tcp_conn_t *conn;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))",
-            sp->foreign.addr.ipv4, sp->foreign.port,
-            sp->local.addr.ipv4, sp->local.port);
-
         conn = tcp_conn_find_ref(sp);
         if (conn == NULL) {
@@ -319 +315 @@
         }
 
-        if (conn->ident.foreign.addr.ipv4 == TCP_IPV4_ANY)
-                conn->ident.foreign.addr.ipv4 = sp->foreign.addr.ipv4;
+        if (inet_addr_is_any(&conn->ident.foreign.addr))
+                conn->ident.foreign.addr = sp->foreign.addr;
+        
         if (conn->ident.foreign.port == TCP_PORT_ANY)
                 conn->ident.foreign.port = sp->foreign.port;
-        if (conn->ident.local.addr.ipv4 == TCP_IPV4_ANY)
-                conn->ident.local.addr.ipv4 = sp->local.addr.ipv4;
+        
+        if (inet_addr_is_any(&conn->ident.local.addr))
+                conn->ident.local.addr = sp->local.addr;
 
         tcp_conn_segment_arrived(conn, seg);