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

Timestamp:

2011-11-20T19:13:53Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

eea65f4

Parents:

854e79a6

Message:

Make active OPEN wait for connection establishment (or reset).

File:

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

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

@@ -111 +111 @@
         tqueue_inited = true;
 
+        /* Connection state change signalling */
+        fibril_mutex_initialize(&conn->cstate_lock);
+        fibril_condvar_initialize(&conn->cstate_cv);
+
         conn->cstate = st_listen;
         conn->fin_is_acked = false;
@@ -152 +156 @@
 }
 
+static void tcp_conn_state_set(tcp_conn_t *conn, tcp_cstate_t nstate)
+{
+        fibril_mutex_lock(&conn->cstate_lock);
+        conn->cstate = nstate;
+        fibril_condvar_broadcast(&conn->cstate_cv);
+        fibril_mutex_unlock(&conn->cstate_lock);
+}
+
 /** Synchronize connection.
  *
@@ -165 +177 @@
 
         tcp_tqueue_ctrl_seg(conn, CTL_SYN);
-        conn->cstate = st_syn_sent;
+        tcp_conn_state_set(conn, st_syn_sent);
 }
 
@@ -179 +191 @@
         case st_established:
                 log_msg(LVL_DEBUG, "FIN sent -> Fin-Wait-1");
-                conn->cstate = st_fin_wait_1;
+                tcp_conn_state_set(conn, st_fin_wait_1);
                 break;
         case st_close_wait:
                 log_msg(LVL_DEBUG, "FIN sent -> Last-Ack");
-                conn->cstate = st_last_ack;
+                tcp_conn_state_set(conn, st_last_ack);
                 break;
         default:
@@ -328 +340 @@
         conn->snd_wl2 = seg->seq;
 
-        conn->cstate = st_syn_received;
+        tcp_conn_state_set(conn, st_syn_received);
 
         tcp_tqueue_ctrl_seg(conn, CTL_SYN | CTL_ACK /* XXX */);
@@ -357 +369 @@
                 log_msg(LVL_DEBUG, "Connection reset. -> Closed");
                 /* XXX Signal user error */
-                conn->cstate = st_closed;
+                tcp_conn_state_set(conn, st_closed);
                 /* XXX delete connection */
                 return;
@@ -397 +409 @@
         if (seq_no_syn_acked(conn)) {
                 log_msg(LVL_DEBUG, " syn acked -> Established");
-                conn->cstate = st_established;
+                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");
-                conn->cstate = st_syn_received;
+                tcp_conn_state_set(conn, st_syn_received);
                 tcp_tqueue_ctrl_seg(conn, CTL_SYN | CTL_ACK /* XXX */);
         }
@@ -517 +529 @@
         log_msg(LVL_DEBUG, "SYN ACKed -> Established");
 
-        conn->cstate = st_established;
+        tcp_conn_state_set(conn, st_established);
 
         /* XXX Not mentioned in spec?! */
@@ -590 +602 @@
         if (conn->fin_is_acked) {
                 log_msg(LVL_DEBUG, " FIN acked -> Fin-Wait-2");
-                conn->cstate = st_fin_wait_2;
+                tcp_conn_state_set(conn, st_fin_wait_2);
         }
 
@@ -656 +668 @@
                 log_msg(LVL_DEBUG, " FIN acked -> Closed");
                 tcp_conn_remove(conn);
-                conn->cstate = st_closed;
+                tcp_conn_state_set(conn, st_closed);
                 return cp_done;
         }
@@ -844 +856 @@
                 case st_established:
                         log_msg(LVL_DEBUG, "FIN received -> Close-Wait");
-                        conn->cstate = st_close_wait;
+                        tcp_conn_state_set(conn, st_close_wait);
                         break;
                 case st_fin_wait_1:
                         log_msg(LVL_DEBUG, "FIN received -> Closing");
-                        conn->cstate = st_closing;
+                        tcp_conn_state_set(conn, st_closing);
                         break;
                 case st_fin_wait_2:
                         log_msg(LVL_DEBUG, "FIN received -> Time-Wait");
-                        conn->cstate = st_time_wait;
+                        tcp_conn_state_set(conn, st_time_wait);
                         /* Start the Time-Wait timer */
                         tcp_conn_tw_timer_set(conn);
@@ -980 +992 @@
 
         tcp_conn_remove(conn);
-        conn->cstate = st_closed;
+        tcp_conn_state_set(conn, st_closed);
 }