Changes in uspace/srv/net/tl/tcp/ucall.c [ae481e0:74c99b5] in mainline

File:

• uspace/srv/net/tl/tcp/ucall.c (modified) (14 diffs)

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

@@ -53 +53 @@
  * @param fsock         Foreign socket
  * @param acpass        Active/passive
- * @param oflags        Open flags
  * @param conn          Connection
  *
@@ -66 +65 @@
  */
 tcp_error_t tcp_uc_open(tcp_sock_t *lsock, tcp_sock_t *fsock, acpass_t acpass,
-    tcp_open_flags_t oflags, tcp_conn_t **conn)
+    tcp_conn_t **conn)
 {
         tcp_conn_t *nconn;
 
-        log_msg(LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)",
+        log_msg(LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %p)",
             lsock, fsock, acpass == ap_active ? "active" : "passive",
-            oflags == tcp_open_nonblock ? "nonblock" : "none", conn);
+            conn);
 
         nconn = tcp_conn_new(lsock, fsock);
@@ -82 +81 @@
         }
 
-        if (oflags == tcp_open_nonblock) {
-                *conn = nconn;
-                return TCP_EOK;
-        }
-
         /* Wait for connection to be established or reset */
         log_msg(LVL_DEBUG, "tcp_uc_open: Wait for connection.");
-        fibril_mutex_lock(&nconn->lock);
+        fibril_mutex_lock(&nconn->cstate_lock);
         while (nconn->cstate == st_listen ||
             nconn->cstate == st_syn_sent ||
             nconn->cstate == st_syn_received) {
-                fibril_condvar_wait(&nconn->cstate_cv, &nconn->lock);
+                fibril_condvar_wait(&nconn->cstate_cv, &nconn->cstate_lock);
         }
 
@@ -99 +93 @@
                 log_msg(LVL_DEBUG, "tcp_uc_open: Connection was reset.");
                 assert(nconn->cstate == st_closed);
-                fibril_mutex_unlock(&nconn->lock);
+                fibril_mutex_unlock(&nconn->cstate_lock);
                 return TCP_ERESET;
         }
 
-        fibril_mutex_unlock(&nconn->lock);
+        fibril_mutex_unlock(&nconn->cstate_lock);
         log_msg(LVL_DEBUG, "tcp_uc_open: Connection was established.");
 
         *conn = nconn;
-        log_msg(LVL_DEBUG, "tcp_uc_open -> %p", nconn);
         return TCP_EOK;
 }
@@ -120 +113 @@
         log_msg(LVL_DEBUG, "%s: tcp_uc_send()", conn->name);
 
-        fibril_mutex_lock(&conn->lock);
-
-        if (conn->cstate == st_closed) {
-                fibril_mutex_unlock(&conn->lock);
+        if (conn->cstate == st_closed)
                 return TCP_ENOTEXIST;
-        }
 
         if (conn->cstate == st_listen) {
@@ -132 +121 @@
         }
 
-
-        if (conn->snd_buf_fin) {
-                fibril_mutex_unlock(&conn->lock);
+        if (conn->snd_buf_fin)
                 return TCP_ECLOSING;
-        }
 
         while (size > 0) {
                 buf_free = conn->snd_buf_size - conn->snd_buf_used;
-                while (buf_free == 0 && !conn->reset) {
-                        log_msg(LVL_DEBUG, "%s: buf_free == 0, waiting.",
-                            conn->name);
-                        fibril_condvar_wait(&conn->snd_buf_cv, &conn->lock);
-                        buf_free = conn->snd_buf_size - conn->snd_buf_used;
-                }
-
-                if (conn->reset) {
-                        fibril_mutex_unlock(&conn->lock);
+                while (buf_free == 0 && !conn->reset)
+                        tcp_tqueue_new_data(conn);
+
+                if (conn->reset)
                         return TCP_ERESET;
-                }
 
                 xfer_size = min(size, buf_free);
@@ -159 +139 @@
                 conn->snd_buf_used += xfer_size;
                 size -= xfer_size;
-
-                tcp_tqueue_new_data(conn);
         }
 
         tcp_tqueue_new_data(conn);
-        fibril_mutex_unlock(&conn->lock);
 
         return TCP_EOK;
@@ -177 +154 @@
         log_msg(LVL_DEBUG, "%s: tcp_uc_receive()", conn->name);
 
-        fibril_mutex_lock(&conn->lock);
-
-        if (conn->cstate == st_closed) {
-                fibril_mutex_unlock(&conn->lock);
+        if (conn->cstate == st_closed)
                 return TCP_ENOTEXIST;
-        }
+
+        fibril_mutex_lock(&conn->rcv_buf_lock);
 
         /* Wait for data to become available */
         while (conn->rcv_buf_used == 0 && !conn->rcv_buf_fin && !conn->reset) {
                 log_msg(LVL_DEBUG, "tcp_uc_receive() - wait for data");
-                fibril_condvar_wait(&conn->rcv_buf_cv, &conn->lock);
+                fibril_condvar_wait(&conn->rcv_buf_cv, &conn->rcv_buf_lock);
         }
 
         if (conn->rcv_buf_used == 0) {
+                fibril_mutex_unlock(&conn->rcv_buf_lock);
+
                 *rcvd = 0;
                 *xflags = 0;
@@ -196 +173 @@
                 if (conn->rcv_buf_fin) {
                         /* End of data, peer closed connection */
-                        fibril_mutex_unlock(&conn->lock);
                         return TCP_ECLOSING;
                 } else {
                         /* Connection was reset */
                         assert(conn->reset);
-                        fibril_mutex_unlock(&conn->lock);
                         return TCP_ERESET;
                 }
@@ -217 +192 @@
         conn->rcv_wnd += xfer_size;
 
+        fibril_mutex_unlock(&conn->rcv_buf_lock);
+
         /* TODO */
         *xflags = 0;
@@ -226 +203 @@
             conn->name, xfer_size);
 
-        fibril_mutex_unlock(&conn->lock);
-
         return TCP_EOK;
 }
@@ -236 +211 @@
         log_msg(LVL_DEBUG, "%s: tcp_uc_close()", conn->name);
 
-        fibril_mutex_lock(&conn->lock);
-
-        if (conn->cstate == st_closed) {
-                fibril_mutex_unlock(&conn->lock);
+        if (conn->cstate == st_closed)
                 return TCP_ENOTEXIST;
-        }
-
-        if (conn->snd_buf_fin) {
-                fibril_mutex_unlock(&conn->lock);
+
+        if (conn->snd_buf_fin)
                 return TCP_ECLOSING;
-        }
 
         conn->snd_buf_fin = true;
         tcp_tqueue_new_data(conn);
 
-        fibril_mutex_unlock(&conn->lock);
         return TCP_EOK;
 }
@@ -265 +233 @@
 {
         log_msg(LVL_DEBUG, "tcp_uc_status()");
-        cstatus->cstate = conn->cstate;
-}
-
-/** Delete connection user call.
- *
- * (Not in spec.) Inform TCP that the user is done with this connection
- * and will not make any further calls/references to it. TCP can deallocate
- * the connection from now on.
- */
-void tcp_uc_delete(tcp_conn_t *conn)
-{
-        log_msg(LVL_DEBUG, "tcp_uc_delete()");
-        tcp_conn_delete(conn);
-}
-
-void tcp_uc_set_cstate_cb(tcp_conn_t *conn, tcp_cstate_cb_t cb, void *arg)
-{
-        log_msg(LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)",
-            conn, cb, arg);
-
-        conn->cstate_cb = cb;
-        conn->cstate_cb_arg = arg;
-}
+}
+
 
 /*
@@ -302 +249 @@
             sp->local.addr.ipv4, sp->local.port);
 
-        conn = tcp_conn_find_ref(sp);
-        if (conn == NULL) {
-                log_msg(LVL_WARN, "No connection found.");
+        conn = tcp_conn_find(sp);
+        if (conn != NULL && conn->cstate != st_closed) {
+                if (conn->ident.foreign.addr.ipv4 == TCP_IPV4_ANY)
+                        conn->ident.foreign.addr.ipv4 = sp->foreign.addr.ipv4;
+                if (conn->ident.foreign.port == TCP_PORT_ANY)
+                        conn->ident.foreign.port = sp->foreign.port;
+                if (conn->ident.local.addr.ipv4 == TCP_IPV4_ANY)
+                        conn->ident.local.addr.ipv4 = sp->local.addr.ipv4;
+
+                tcp_conn_segment_arrived(conn, seg);
+        } else {
+                if (conn == NULL)
+                        log_msg(LVL_WARN, "No connection found.");
+                else
+                        log_msg(LVL_WARN, "Connection is closed.");
                 tcp_unexpected_segment(sp, seg);
-                return;
-        }
-
-        fibril_mutex_lock(&conn->lock);
-
-        if (conn->cstate == st_closed) {
-                log_msg(LVL_WARN, "Connection is closed.");
-                tcp_unexpected_segment(sp, seg);
-                fibril_mutex_unlock(&conn->lock);
-                tcp_conn_delref(conn);
-                return;
-        }
-
-        if (conn->ident.foreign.addr.ipv4 == TCP_IPV4_ANY)
-                conn->ident.foreign.addr.ipv4 = sp->foreign.addr.ipv4;
-        if (conn->ident.foreign.port == TCP_PORT_ANY)
-                conn->ident.foreign.port = sp->foreign.port;
-        if (conn->ident.local.addr.ipv4 == TCP_IPV4_ANY)
-                conn->ident.local.addr.ipv4 = sp->local.addr.ipv4;
-
-        tcp_conn_segment_arrived(conn, seg);
-
-        fibril_mutex_unlock(&conn->lock);
-        tcp_conn_delref(conn);
+        }
 }