Changeset 854e79a6 in mainline for uspace/srv/net/tl/tcp/state.c

Timestamp:

2011-11-17T14:53:35Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

004a5fe

Parents:

4f3f6285

Message:

TCP user call error codes. Some state checking and error reporting from
user calls.

File:

• uspace/srv/net/tl/tcp/state.c (modified) (8 diffs)

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

@@ -54 +54 @@
  * @param acpass        Active/passive
  * @param conn          Connection
+ *
+ * XXX We should be able to call active open on an existing listening
+ * connection.
  */
 void tcp_uc_open(uint16_t lport, tcp_sock_t *fsock, acpass_t acpass,
@@ -80 +83 @@
 
 /** SEND user call */
-void tcp_uc_send(tcp_conn_t *conn, void *data, size_t size, xflags_t flags)
+tcp_error_t tcp_uc_send(tcp_conn_t *conn, void *data, size_t size,
+    xflags_t flags)
 {
         size_t buf_free;
@@ -86 +90 @@
 
         log_msg(LVL_DEBUG, "tcp_uc_send()");
+
+        if (conn->cstate == st_closed)
+                return TCP_ENOTEXIST;
+
+        if (conn->cstate == st_listen) {
+                /* Change connection to active */
+                tcp_conn_sync(conn);
+        }
+
+        if (conn->snd_buf_fin)
+                return TCP_ECLOSING;
 
         while (size > 0) {
@@ -102 +117 @@
 
         tcp_tqueue_new_data(conn);
+
+        return TCP_EOK;
 }
 
 /** RECEIVE user call */
-void tcp_uc_receive(tcp_conn_t *conn, void *buf, size_t size, size_t *rcvd,
-    xflags_t *xflags)
+tcp_error_t tcp_uc_receive(tcp_conn_t *conn, void *buf, size_t size,
+    size_t *rcvd, xflags_t *xflags)
 {
         size_t xfer_size;
@@ -112 +129 @@
         log_msg(LVL_DEBUG, "tcp_uc_receive()");
 
-        /*
-         * XXX Handle all states for all user calls properly, return
-         * errors as appropriate.
-         */
         if (conn->cstate == st_closed)
-                return;
-
+                return TCP_ENOTEXIST;
 
         fibril_mutex_lock(&conn->rcv_buf_lock);
@@ -130 +142 @@
         if (conn->rcv_buf_used == 0) {
                 /* End of data, peer closed connection. */
-                /* XXX How should RECEIVE signal end of data? */
                 assert(conn->rcv_buf_fin);
                 *rcvd = 0;
                 *xflags = 0;
-                return;
+                return TCP_ECLOSING;
         }
 
@@ -158 +169 @@
         log_msg(LVL_DEBUG, "tcp_uc_receive() - returning %zu bytes",
             xfer_size);
+
+        return TCP_EOK;
 }
 
 /** CLOSE user call */
-void tcp_uc_close(tcp_conn_t *conn)
+tcp_error_t tcp_uc_close(tcp_conn_t *conn)
 {
         log_msg(LVL_DEBUG, "tcp_uc_close()");
+
+        if (conn->cstate == st_closed)
+                return TCP_ENOTEXIST;
+
+        if (conn->snd_buf_fin)
+                return TCP_ECLOSING;
 
         conn->snd_buf_fin = true;
         tcp_tqueue_new_data(conn);
+
+        return TCP_EOK;
 }
 
@@ -211 +232 @@
 }
 
-/** Retransmission timeout */
-void tcp_to_retransmit(void)
-{
-        log_msg(LVL_DEBUG, "tcp_to_retransmit()");
-}
-
 /**
  * @}