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

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/net/tcp/conn.c (moved) (moved from uspace/srv/net/tl/tcp/conn.c ) (6 diffs)

uspace/srv/net/tcp/conn.c

@@ -184 +184 @@
 void tcp_conn_addref(tcp_conn_t *conn)
 {
-        log_msg(LVL_DEBUG, "%s: tcp_conn_addref(%p)", conn->name, conn);
+        log_msg(LVL_DEBUG2, "%s: tcp_conn_addref(%p)", conn->name, conn);
         atomic_inc(&conn->refcnt);
 }
@@ -196 +196 @@
 void tcp_conn_delref(tcp_conn_t *conn)
 {
-        log_msg(LVL_DEBUG, "%s: tcp_conn_delref(%p)", conn->name, conn);
+        log_msg(LVL_DEBUG2, "%s: tcp_conn_delref(%p)", conn->name, conn);
 
         if (atomic_predec(&conn->refcnt) == 0)
@@ -309 +309 @@
 }
 
-/** Compare two sockets.
- *
- * Two sockets are equal if the address is equal and the port number
- * is equal.
- */
+/** Match socket with pattern. */
 static bool tcp_socket_match(tcp_sock_t *sock, tcp_sock_t *patt)
 {
-        log_msg(LVL_DEBUG, "tcp_socket_match(sock=(%x,%u), pat=(%x,%u))",
+        log_msg(LVL_DEBUG2, "tcp_socket_match(sock=(%x,%u), pat=(%x,%u))",
             sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port);
 
@@ -327 +323 @@
                 return false;
 
-        log_msg(LVL_DEBUG, " -> match");
+        log_msg(LVL_DEBUG2, " -> match");
 
         return true;
 }
 
-/** Match socket with pattern. */
+/** Match socket pair with pattern. */
 static bool tcp_sockpair_match(tcp_sockpair_t *sp, tcp_sockpair_t *pattern)
 {
-        log_msg(LVL_DEBUG, "tcp_sockpair_match(%p, %p)", sp, pattern);
+        log_msg(LVL_DEBUG2, "tcp_sockpair_match(%p, %p)", sp, pattern);
 
         if (!tcp_socket_match(&sp->local, &pattern->local))
@@ -357 +353 @@
 tcp_conn_t *tcp_conn_find_ref(tcp_sockpair_t *sp)
 {
-        log_msg(LVL_DEBUG, "tcp_conn_find(%p)", sp);
+        log_msg(LVL_DEBUG, "tcp_conn_find_ref(%p)", sp);
 
         fibril_mutex_lock(&conn_list_lock);
@@ -364 +360 @@
                 tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link);
                 tcp_sockpair_t *csp = &conn->ident;
-                log_msg(LVL_DEBUG, "compare with conn (f:(%x,%u), l:(%x,%u))",
+                log_msg(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);