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

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

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=(%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)
+        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)))
                 return false;
 
-        if (patt->port != TCP_PORT_ANY &&
-            patt->port != sock->port)
+        if ((patt->port != TCP_PORT_ANY) &&
+            (patt->port != sock->port))
                 return false;
 
@@ -354 +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);
-
+        
         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))",
-                    csp->foreign.addr.ipv4, csp->foreign.port,
-                    csp->local.addr.ipv4, csp->local.port);
+                
+                log_msg(LOG_DEFAULT, LVL_DEBUG2, " - with (f:(%u), l:(%u))",
+                    csp->foreign.port, csp->local.port);
+                
                 if (tcp_sockpair_match(sp, csp)) {
                         tcp_conn_addref(conn);
@@ -369 +373 @@
                 }
         }
-
+        
         fibril_mutex_unlock(&conn_list_lock);
         return NULL;