Changeset 1d4b815 in mainline

Timestamp:

2015-05-09T19:05:48Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

309469de

Parents:

779541b

Message:

Properly wait for connection establishment.

Location:

uspace

Files:

• lib/c/generic/inet/tcp.c (modified) (2 diffs)
• lib/c/include/inet/tcp.h (modified) (1 diff)
• srv/net/tcp/conn.c (modified) (1 diff)
• srv/net/tcp/service.c (modified) (3 diffs)
• srv/net/tcp/tcp_type.h (modified) (1 diff)
• srv/net/tcp/ucall.c (modified) (1 diff)
• srv/net/tcp/ucall.h (modified) (1 diff)

uspace/lib/c/generic/inet/tcp.c

@@ -274 +274 @@
 int tcp_conn_wait_connected(tcp_conn_t *conn)
 {
-        async_usleep(1000 * 1000);
-        return 0;
+        fibril_mutex_lock(&conn->lock);
+        while (!conn->connected && !conn->conn_failed && !conn->conn_reset)
+                fibril_condvar_wait(&conn->cv, &conn->lock);
+
+        if (conn->connected) {
+                fibril_mutex_unlock(&conn->lock);
+                return EOK;
+        } else {
+                assert(conn->conn_failed || conn->conn_reset);
+                fibril_mutex_unlock(&conn->lock);
+                return EIO;
+        }
 }
 
@@ -442 +452 @@
 static void tcp_ev_connected(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
 {
+        tcp_conn_t *conn;
+        sysarg_t conn_id;
+        int rc;
+
         printf("tcp_ev_connected()\n");
-        async_answer_0(iid, ENOTSUP);
+        conn_id = IPC_GET_ARG1(*icall);
+
+        rc = tcp_conn_get(tcp, conn_id, &conn);
+        if (rc != EOK) {
+                printf("conn ID %zu not found\n",
+                    conn_id);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        fibril_mutex_lock(&conn->lock);
+        conn->connected = true;
+        fibril_condvar_broadcast(&conn->cv);
+        fibril_mutex_unlock(&conn->lock);
+
+        async_answer_0(iid, EOK);
 }
 
 static void tcp_ev_conn_failed(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
 {
+        tcp_conn_t *conn;
+        sysarg_t conn_id;
+        int rc;
+
         printf("tcp_ev_conn_failed()\n");
-        async_answer_0(iid, ENOTSUP);
+        conn_id = IPC_GET_ARG1(*icall);
+
+        rc = tcp_conn_get(tcp, conn_id, &conn);
+        if (rc != EOK) {
+                printf("conn ID %zu not found\n",
+                    conn_id);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        fibril_mutex_lock(&conn->lock);
+        conn->conn_failed = true;
+        fibril_condvar_broadcast(&conn->cv);
+        fibril_mutex_unlock(&conn->lock);
+
+        async_answer_0(iid, EOK);
 }
 
 static void tcp_ev_conn_reset(tcp_t *tcp, ipc_callid_t iid, ipc_call_t *icall)
 {
+        tcp_conn_t *conn;
+        sysarg_t conn_id;
+        int rc;
+
         printf("tcp_ev_conn_reset()\n");
-        async_answer_0(iid, ENOTSUP);
+        conn_id = IPC_GET_ARG1(*icall);
+
+        rc = tcp_conn_get(tcp, conn_id, &conn);
+        if (rc != EOK) {
+                printf("conn ID %zu not found\n",
+                    conn_id);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        fibril_mutex_lock(&conn->lock);
+        conn->conn_reset = true;
+        fibril_condvar_broadcast(&conn->cv);
+        fibril_mutex_unlock(&conn->lock);
+
+        async_answer_0(iid, EOK);
 }
 

uspace/lib/c/include/inet/tcp.h

@@ -52 +52 @@
         /** Some received data available in TCP server */
         bool data_avail;
+        bool connected;
+        bool conn_failed;
+        bool conn_reset;
 } tcp_conn_t;
 

uspace/srv/net/tcp/conn.c

@@ -277 +277 @@
         if (conn->cb != NULL && conn->cb->cstate_change != NULL) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - run user CB");
-                conn->cb->cstate_change(conn, conn->cb_arg);
+                conn->cb->cstate_change(conn, conn->cb_arg, old_state);
         } else {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - no user CB");

uspace/srv/net/tcp/service.c

@@ -56 +56 @@
 
 static void tcp_ev_data(tcp_cconn_t *);
-
-static void tcp_service_cstate_change(tcp_conn_t *, void *);
+static void tcp_ev_connected(tcp_cconn_t *);
+static void tcp_ev_conn_failed(tcp_cconn_t *);
+static void tcp_ev_conn_reset(tcp_cconn_t *);
+
+static void tcp_service_cstate_change(tcp_conn_t *, void *, tcp_cstate_t);
 static void tcp_service_recv_data(tcp_conn_t *, void *);
 
@@ -65 +68 @@
 };
 
-static void tcp_service_cstate_change(tcp_conn_t *conn, void *arg)
-{
+static void tcp_service_cstate_change(tcp_conn_t *conn, void *arg,
+    tcp_cstate_t old_state)
+{
+        tcp_cstate_t nstate;
+        tcp_cconn_t *cconn;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_service_cstate_change()");
+        nstate = conn->cstate;
+        cconn = tcp_uc_get_userptr(conn);
+
+        if ((old_state == st_syn_sent || old_state == st_syn_received) &&
+            (nstate == st_established)) {
+                /* Connection established */
+                tcp_ev_connected(cconn);
+        }
+
+        if (old_state != st_closed && nstate == st_closed && conn->reset) {
+                /* Connection reset */
+                tcp_ev_conn_reset(cconn);
+        }
+
+        /* XXX Failed to establish connection */
+        if (0) tcp_ev_conn_failed(cconn);
 }
 
@@ -87 +111 @@
         exch = async_exchange_begin(cconn->client->sess);
         aid_t req = async_send_1(exch, TCP_EV_DATA, cconn->id, NULL);
+        async_exchange_end(exch);
+
+        async_forget(req);
+}
+
+static void tcp_ev_connected(tcp_cconn_t *cconn)
+{
+        async_exch_t *exch;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ev_connected()");
+
+        exch = async_exchange_begin(cconn->client->sess);
+        aid_t req = async_send_1(exch, TCP_EV_CONNECTED, cconn->id, NULL);
+        async_exchange_end(exch);
+
+        async_forget(req);
+}
+
+static void tcp_ev_conn_failed(tcp_cconn_t *cconn)
+{
+        async_exch_t *exch;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ev_conn_failed()");
+
+        exch = async_exchange_begin(cconn->client->sess);
+        aid_t req = async_send_1(exch, TCP_EV_CONN_FAILED, cconn->id, NULL);
+        async_exchange_end(exch);
+
+        async_forget(req);
+}
+
+static void tcp_ev_conn_reset(tcp_cconn_t *cconn)
+{
+        async_exch_t *exch;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_ev_conn_reset()");
+
+        exch = async_exchange_begin(cconn->client->sess);
+        aid_t req = async_send_1(exch, TCP_EV_CONN_RESET, cconn->id, NULL);
         async_exchange_end(exch);
 

uspace/srv/net/tcp/tcp_type.h

@@ -157 +157 @@
 /** Connection callbacks */
 typedef struct {
-        void (*cstate_change)(tcp_conn_t *, void *);
+        void (*cstate_change)(tcp_conn_t *, void *, tcp_cstate_t);
         void (*recv_data)(tcp_conn_t *, void *);
 } tcp_cb_t;

uspace/srv/net/tcp/ucall.c

@@ -305 +305 @@
 }
 
+void *tcp_uc_get_userptr(tcp_conn_t *conn)
+{
+        return conn->cb_arg;
+}
+
 /*
  * Arriving segments

uspace/srv/net/tcp/ucall.h

@@ -51 +51 @@
 extern void tcp_uc_delete(tcp_conn_t *);
 extern void tcp_uc_set_cb(tcp_conn_t *, tcp_cb_t *, void *);
+extern void *tcp_uc_get_userptr(tcp_conn_t *);
 
 /*