Changeset c0f3460 in mainline

Timestamp:

2013-07-16T16:28:09Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

fc4bf2a

Parents:

f4a27304

Message:

cherrypick trivial changes from lp:~as-s/helenos/ipv6

Location:

uspace/srv/net

Files:

• inetsrv/icmp.c (modified) (1 diff)
• inetsrv/inet_std.h (modified) (2 diffs)
• tcp/conn.c (modified) (3 diffs)
• tcp/tcp.c (modified) (1 diff)
• tcp/tqueue.c (modified) (1 diff)
• tcp/ucall.c (modified) (1 diff)
• udp/assoc.c (modified) (1 diff)

uspace/srv/net/inetsrv/icmp.c

@@ -153 +153 @@
                 return ENOMEM;
         
-        icmp_echo_t *request = (icmp_echo_t *)rdata;
+        icmp_echo_t *request = (icmp_echo_t *) rdata;
         
         request->type = ICMP_ECHO_REQUEST;

uspace/srv/net/inetsrv/inet_std.h

@@ -90 +90 @@
 };
 
+/** 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 +124 @@
         /** Reserved */
         uint8_t reserved;
-        /** Fragment Offset, Flags */
-        uint16_t foff_flags;
+        /** Fragmentation offset, reserved and M flag */
+        uint16_t offsmf;
         /** Identification */
         uint32_t id;

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)))
@@ -351 +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);
@@ -357 +363 @@
                 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)) {

uspace/srv/net/tcp/tcp.c

@@ -54 +54 @@
 #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);

uspace/srv/net/tcp/tqueue.c

@@ -282 +282 @@
 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);

uspace/srv/net/tcp/ucall.c

@@ -298 +298 @@
         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) {

uspace/srv/net/udp/assoc.c

@@ -372 +372 @@
 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)))