Changeset 004a5fe in mainline for uspace/srv/net/tl/tcp/state.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/state.c (modified) (2 diffs)

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

@@ -58 +58 @@
  * connection.
  */
-void tcp_uc_open(uint16_t lport, tcp_sock_t *fsock, acpass_t acpass,
+tcp_error_t tcp_uc_open(uint16_t lport, tcp_sock_t *fsock, acpass_t acpass,
     tcp_conn_t **conn)
 {
@@ -77 +77 @@
                 /* Synchronize (initiate) connection */
                 tcp_conn_sync(nconn);
+
+                /* Wait for connection to be established or reset */
+                log_msg(LVL_DEBUG, "tcp_uc_open: Wait for connection.");
+                fibril_mutex_lock(&nconn->cstate_lock);
+                while (nconn->cstate == st_syn_sent ||
+                    nconn->cstate == st_syn_received) {
+                        fibril_condvar_wait(&nconn->cstate_cv, &nconn->cstate_lock);
+                }
+                if (nconn->cstate != st_established) {
+                        log_msg(LVL_DEBUG, "tcp_uc_open: Connection was reset.");
+                        assert(nconn->cstate == st_closed);
+                        fibril_mutex_unlock(&nconn->cstate_lock);
+                        return TCP_ERESET;
+                }
+                fibril_mutex_unlock(&nconn->cstate_lock);
+                log_msg(LVL_DEBUG, "tcp_uc_open: Connection was established.");
         }
 
         *conn = nconn;
+        return TCP_EOK;
 }