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

Timestamp:

2012-04-20T07:32:57Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

097f421

Parents:

90f067d9 (diff), 606c369 (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 (moved) (moved from uspace/srv/net/tl/tcp/conn.c ) (3 diffs)

uspace/srv/net/tcp/conn.c

@@ -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)
 {
@@ -332 +328 @@
 }
 
-/** Match socket with pattern. */
+/** Match socket pair with pattern. */
 static bool tcp_sockpair_match(tcp_sockpair_t *sp, tcp_sockpair_t *pattern)
 {
@@ -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);