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

Timestamp:

2011-11-21T22:46:37Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1812a0d

Parents:

eea65f4

Message:

Fix off-by-one bug in BIT_V.
Fix FIN being sent too early.
Fix FIN not being sent.
Fix seg→len from decoded PDU.
Add segment dumps.

File:

• uspace/srv/net/tl/tcp/conn.c (modified) (10 diffs)

uspace/srv/net/tl/tcp/conn.c

@@ -190 +190 @@
         case st_syn_received:
         case st_established:
-                log_msg(LVL_DEBUG, "FIN sent -> Fin-Wait-1");
+                log_msg(LVL_DEBUG, "%s: FIN sent -> Fin-Wait-1", conn->name);
                 tcp_conn_state_set(conn, st_fin_wait_1);
                 break;
         case st_close_wait:
-                log_msg(LVL_DEBUG, "FIN sent -> Last-Ack");
+                log_msg(LVL_DEBUG, "%s: FIN sent -> Last-Ack", conn->name);
                 tcp_conn_state_set(conn, st_last_ack);
                 break;
         default:
-                log_msg(LVL_ERROR, "Connection state %d", conn->cstate);
+                log_msg(LVL_ERROR, "%s: Connection state %d", conn->name,
+                    conn->cstate);
                 assert(false);
         }
@@ -367 +368 @@
 
         if ((seg->ctrl & CTL_RST) != 0) {
-                log_msg(LVL_DEBUG, "Connection reset. -> Closed");
+                log_msg(LVL_DEBUG, "%s: Connection reset. -> Closed",
+                    conn->name);
                 /* XXX Signal user error */
                 tcp_conn_state_set(conn, st_closed);
@@ -408 +410 @@
 
         if (seq_no_syn_acked(conn)) {
-                log_msg(LVL_DEBUG, " syn acked -> Established");
+                log_msg(LVL_DEBUG, "%s: syn acked -> Established", conn->name);
                 tcp_conn_state_set(conn, st_established);
                 tcp_tqueue_ctrl_seg(conn, CTL_ACK /* XXX */);
         } else {
-                log_msg(LVL_DEBUG, " syn not acked -> Syn-Received");
+                log_msg(LVL_DEBUG, "%s: syn not acked -> Syn-Received",
+                    conn->name);
                 tcp_conn_state_set(conn, st_syn_received);
                 tcp_tqueue_ctrl_seg(conn, CTL_SYN | CTL_ACK /* XXX */);
@@ -527 +530 @@
         }
 
-        log_msg(LVL_DEBUG, "SYN ACKed -> Established");
+        log_msg(LVL_DEBUG, "%s: SYN ACKed -> Established", conn->name);
 
         tcp_conn_state_set(conn, st_established);
@@ -601 +604 @@
 
         if (conn->fin_is_acked) {
-                log_msg(LVL_DEBUG, " FIN acked -> Fin-Wait-2");
+                log_msg(LVL_DEBUG, "%s: FIN acked -> Fin-Wait-2", conn->name);
                 tcp_conn_state_set(conn, st_fin_wait_2);
         }
@@ -666 +669 @@
 
         if (conn->fin_is_acked) {
-                log_msg(LVL_DEBUG, " FIN acked -> Closed");
+                log_msg(LVL_DEBUG, "%s: FIN acked -> Closed", conn->name);
                 tcp_conn_remove(conn);
                 tcp_conn_state_set(conn, st_closed);
@@ -815 +818 @@
                 tcp_conn_trim_seg_to_wnd(conn, seg);
         } else {
+                log_msg(LVL_DEBUG, "%s: Nothing left in segment, dropping "
+                    "(xfer_size=%zu, SEG.LEN=%zu, seg->ctrl=%u)",
+                    conn->name, xfer_size, seg->len, (unsigned)seg->ctrl);
                 /* Nothing left in segment */
                 tcp_segment_delete(seg);
@@ -855 +861 @@
                 case st_syn_received:
                 case st_established:
-                        log_msg(LVL_DEBUG, "FIN received -> Close-Wait");
+                        log_msg(LVL_DEBUG, "%s: FIN received -> Close-Wait",
+                            conn->name);
                         tcp_conn_state_set(conn, st_close_wait);
                         break;
                 case st_fin_wait_1:
-                        log_msg(LVL_DEBUG, "FIN received -> Closing");
+                        log_msg(LVL_DEBUG, "%s: FIN received -> Closing",
+                            conn->name);
                         tcp_conn_state_set(conn, st_closing);
                         break;
                 case st_fin_wait_2:
-                        log_msg(LVL_DEBUG, "FIN received -> Time-Wait");
+                        log_msg(LVL_DEBUG, "%s: FIN received -> Time-Wait",
+                            conn->name);
                         tcp_conn_state_set(conn, st_time_wait);
                         /* Start the Time-Wait timer */
@@ -904 +913 @@
 {
         log_msg(LVL_DEBUG, "tcp_conn_seg_process(%p, %p)", conn, seg);
+        tcp_segment_dump(seg);
 
         /* Check whether segment is acceptable */
@@ -989 +999 @@
 
         log_msg(LVL_DEBUG, "tw_timeout_func(%p)", conn);
-        log_msg(LVL_DEBUG, " TW Timeout -> Closed");
+        log_msg(LVL_DEBUG, "%s: TW Timeout -> Closed", conn->name);
 
         tcp_conn_remove(conn);