Index: uspace/srv/net/inetsrv/icmp.c
===================================================================
--- uspace/srv/net/inetsrv/icmp.c	(revision f4a27304e844833aa9099ff8d5c0dc1dacb26f19)
+++ uspace/srv/net/inetsrv/icmp.c	(revision c0f34601ec08693b7f731529896e78b6c700bc00)
@@ -153,5 +153,5 @@
 		return ENOMEM;
 	
-	icmp_echo_t *request = (icmp_echo_t *)rdata;
+	icmp_echo_t *request = (icmp_echo_t *) rdata;
 	
 	request->type = ICMP_ECHO_REQUEST;
Index: uspace/srv/net/inetsrv/inet_std.h
===================================================================
--- uspace/srv/net/inetsrv/inet_std.h	(revision f4a27304e844833aa9099ff8d5c0dc1dacb26f19)
+++ uspace/srv/net/inetsrv/inet_std.h	(revision c0f34601ec08693b7f731529896e78b6c700bc00)
@@ -90,4 +90,14 @@
 };
 
+/** Bits in ip6_frag_header_t.offsmf */
+enum flags_offsmt_bits {
+	/** More fragments */
+	OF_FLAG_M = 0,
+	/** Fragment offset, highest bit */
+	OF_FRAGOFF_h = 15,
+	/** Fragment offset, lowest bit */
+	OF_FRAGOFF_l = 3
+};
+
 /** IPv6 Datagram header (fixed part) */
 typedef struct {
@@ -114,6 +124,6 @@
 	/** Reserved */
 	uint8_t reserved;
-	/** Fragment Offset, Flags */
-	uint16_t foff_flags;
+	/** Fragmentation offset, reserved and M flag */
+	uint16_t offsmf;
 	/** Identification */
 	uint32_t id;
Index: uspace/srv/net/tcp/conn.c
===================================================================
--- uspace/srv/net/tcp/conn.c	(revision f4a27304e844833aa9099ff8d5c0dc1dacb26f19)
+++ uspace/srv/net/tcp/conn.c	(revision c0f34601ec08693b7f731529896e78b6c700bc00)
@@ -312,4 +312,7 @@
 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)))
@@ -351,4 +354,7 @@
 {
 	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);
@@ -357,4 +363,7 @@
 		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);
 		
 		if (tcp_sockpair_match(sp, csp)) {
Index: uspace/srv/net/tcp/tcp.c
===================================================================
--- uspace/srv/net/tcp/tcp.c	(revision f4a27304e844833aa9099ff8d5c0dc1dacb26f19)
+++ uspace/srv/net/tcp/tcp.c	(revision c0f34601ec08693b7f731529896e78b6c700bc00)
@@ -54,6 +54,4 @@
 #define NAME       "tcp"
 
-#define IP_PROTO_TCP 6
-
 static int tcp_inet_ev_recv(inet_dgram_t *dgram);
 static void tcp_received_pdu(tcp_pdu_t *pdu);
Index: uspace/srv/net/tcp/tqueue.c
===================================================================
--- uspace/srv/net/tcp/tqueue.c	(revision f4a27304e844833aa9099ff8d5c0dc1dacb26f19)
+++ uspace/srv/net/tcp/tqueue.c	(revision c0f34601ec08693b7f731529896e78b6c700bc00)
@@ -282,4 +282,8 @@
 void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
 {
+	log_msg(LOG_DEFAULT, LVL_DEBUG,
+	    "tcp_transmit_segment(f:(%u),l:(%u), %p)",
+	    sp->local.port, sp->foreign.port, seg);
+	
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
 	    seg->seq, seg->wnd);
Index: uspace/srv/net/tcp/ucall.c
===================================================================
--- uspace/srv/net/tcp/ucall.c	(revision f4a27304e844833aa9099ff8d5c0dc1dacb26f19)
+++ uspace/srv/net/tcp/ucall.c	(revision c0f34601ec08693b7f731529896e78b6c700bc00)
@@ -298,4 +298,8 @@
 	tcp_conn_t *conn;
 
+	log_msg(LOG_DEFAULT, LVL_DEBUG,
+	    "tcp_as_segment_arrived(f:(%u), l:(%u))",
+	    sp->foreign.port, sp->local.port);
+
 	conn = tcp_conn_find_ref(sp);
 	if (conn == NULL) {
Index: uspace/srv/net/udp/assoc.c
===================================================================
--- uspace/srv/net/udp/assoc.c	(revision f4a27304e844833aa9099ff8d5c0dc1dacb26f19)
+++ uspace/srv/net/udp/assoc.c	(revision c0f34601ec08693b7f731529896e78b6c700bc00)
@@ -372,4 +372,7 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
+	log_msg(LOG_DEFAULT, LVL_DEBUG,
+	    "udp_socket_match(sock=(%u), pat=(%u))", sock->port, patt->port);
+	
 	if ((!inet_addr_is_any(&patt->addr)) &&
 	    (!inet_addr_compare(&patt->addr, &sock->addr)))