Changes in uspace/srv/net/tcp/conn.c [b243da3:f597bc4] in mainline

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)))
+        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)
                 return false;
 
-        if ((patt->port != TCP_PORT_ANY) &&
-            (patt->port != sock->port))
+        if (patt->port != TCP_PORT_ANY &&
+            patt->port != sock->port)
                 return false;
 
@@ -355 +355 @@
         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);
+        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_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, " - with (f:(%u), l:(%u))",
-                    csp->foreign.port, csp->local.port);
+                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)) {
@@ -381 +384 @@
  * @param conn  Connection
  */
-void tcp_conn_reset(tcp_conn_t *conn)
+static void tcp_conn_reset(tcp_conn_t *conn)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);