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

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• uspace/srv/net/tcp/conn.c (modified) (3 diffs)

uspace/srv/net/tcp/conn.c

@@ -36 +36 @@
 
 #include <adt/list.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <io/log.h>
@@ -354 +354 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_find_ref(%p)", sp);
-
+        
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare conn (f:(%x,%u), l:(%x,%u))",
+            sp->foreign.addr.ipv4, sp->foreign.port,
+            sp->local.addr.ipv4, sp->local.port);
+        
         fibril_mutex_lock(&conn_list_lock);
-
+        
         list_foreach(conn_list, link) {
                 tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link);
                 tcp_sockpair_t *csp = &conn->ident;
-                log_msg(LOG_DEFAULT, LVL_DEBUG2, "compare with conn (f:(%x,%u), l:(%x,%u))",
+                
+                log_msg(LOG_DEFAULT, LVL_DEBUG2, " - with (f:(%x,%u), l:(%x,%u))",
                     csp->foreign.addr.ipv4, csp->foreign.port,
                     csp->local.addr.ipv4, csp->local.port);
+                
                 if (tcp_sockpair_match(sp, csp)) {
                         tcp_conn_addref(conn);
@@ -369 +375 @@
                 }
         }
-
+        
         fibril_mutex_unlock(&conn_list_lock);
         return NULL;