Changeset bdae198 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2013-08-04T12:01:10Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea50906

Parents:

b08879c2 (diff), d856110 (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/conn.c (modified) (3 diffs)

uspace/srv/net/tcp/conn.c

@@ -312 +312 @@
 static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG2,
+            "tcp_socket_match(sock=(%u), pat=(%u))", sock->port, patt->port);
+        
         if ((!inet_addr_is_any(&patt->addr)) &&
             (!inet_addr_compare(&patt->addr, &sock->addr)))
@@ -351 +354 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", sp);
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare conn (f:(%u), l:(%u))",
+            sp->foreign.port, sp->local.port);
         
         fibril_mutex_lock(&conn_list_lock);
@@ -357 +363 @@
                 tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link);
                 tcp_sockpair_t *csp = &conn->ident;
+                
+                log_msg(LOG_DEFAULT, LVL_DEBUG2, " - with (f:(%u), l:(%u))",
+                    csp->foreign.port, csp->local.port);
                 
                 if (tcp_sockpair_match(sp, csp)) {