Changeset 779541b in mainline for uspace/srv/net/tcp

Timestamp:

2015-05-09T13:43:50Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1d4b815

Parents:

99ea91b2

Message:

TCP transport layer API - somewhat working.

Location:

uspace/srv/net/tcp

Files:

• Makefile (modified) (1 diff)
• conn.c (modified) (4 diffs)
• service.c (added)
• service.h (added)
• tcp.c (modified) (2 diffs)
• tcp_type.h (modified) (5 diffs)
• tqueue.c (modified) (1 diff)
• ucall.c (modified) (2 diffs)
• ucall.h (modified) (1 diff)

uspace/srv/net/tcp/Makefile

@@ -37 +37 @@
         rqueue.c \
         segment.c \
+        service.c \
         seq_no.c \
         tcp.c \

uspace/srv/net/tcp/conn.c

@@ -121 +121 @@
         fibril_condvar_initialize(&conn->cstate_cv);
 
-        conn->cstate_cb = NULL;
+        conn->cb = NULL;
 
         conn->cstate = st_listen;
@@ -275 +275 @@
 
         /* Run user callback function */
-        if (conn->cstate_cb != NULL) {
+        if (conn->cb != NULL && conn->cb->cstate_change != NULL) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - run user CB");
-                conn->cstate_cb(conn, conn->cstate_cb_arg);
+                conn->cb->cstate_change(conn, conn->cb_arg);
         } else {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - no user CB");
@@ -1007 +1007 @@
         /* Signal to the receive function that new data has arrived */
         fibril_condvar_broadcast(&conn->rcv_buf_cv);
+        if (conn->cb != NULL && conn->cb->recv_data != NULL)
+                conn->cb->recv_data(conn, conn->cb_arg);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Received %zu bytes of data.", xfer_size);
@@ -1098 +1100 @@
                 conn->rcv_buf_fin = true;
                 fibril_condvar_broadcast(&conn->rcv_buf_cv);
+                if (conn->cb != NULL && conn->cb->recv_data != NULL)
+                        conn->cb->recv_data(conn, conn->cb_arg);
 
                 tcp_segment_delete(seg);

uspace/srv/net/tcp/tcp.c

@@ -48 +48 @@
 #include "pdu.h"
 #include "rqueue.h"
+#include "service.h"
 #include "std.h"
 #include "tcp.h"
@@ -192 +193 @@
         }
 
-//      rc = tcp_sock_init();
-//      if (rc != EOK) {
-//              log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
-//              return ENOENT;
-//      }
+        rc = tcp_service_init();
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing service.");
+                return ENOENT;
+        }
 
         return EOK;

uspace/srv/net/tcp/tcp_type.h

@@ -96 +96 @@
         TCP_EINVPREC,
         /* Security/compartment not allowed */
-        TCP_EINVCOMP
+        TCP_EINVCOMP,
+        TCP_EAGAIN
 } tcp_error_t;
 
@@ -154 +155 @@
 typedef void (*tcp_cstate_cb_t)(tcp_conn_t *, void *);
 
+/** Connection callbacks */
+typedef struct {
+        void (*cstate_change)(tcp_conn_t *, void *);
+        void (*recv_data)(tcp_conn_t *, void *);
+} tcp_cb_t;
+
 /** Connection */
 struct tcp_conn {
@@ -159 +166 @@
         link_t link;
 
-        /** Connection state change callback function */
-        tcp_cstate_cb_t cstate_cb;
+        /** Connection callbacks function */
+        tcp_cb_t *cb;
         /** Argument to @c cstate_cb */
-        void *cstate_cb_arg;
+        void *cb_arg;
 
         /** Connection identification (local and foreign socket) */
@@ -318 +325 @@
 } tcp_pdu_t;
 
-typedef struct {
+/** TCP client connection */
+typedef struct tcp_cconn {
+        /** Connection */
+        tcp_conn_t *conn;
+        /** Connection ID for the client */
+        sysarg_t id;
+        /** Client */
+        struct tcp_client *client;
+        link_t lclient;
+} tcp_cconn_t;
+
+/** TCP client listener */
+typedef struct tcp_clst {
+        /** Connection */
+        tcp_conn_t *conn;
+        /** Listener ID for the client */
+        sysarg_t id;
+        /** Client */
+        struct tcp_client *client;
+        /** Link to tcp_client_t.clst */
+        link_t lclient;
+} tcp_clst_t;
+
+/** TCP client */
+typedef struct tcp_client {
+        /** Client callbac session */
         async_sess_t *sess;
-//      socket_cores_t sockets;
+        /** Client's connections */
+        list_t cconn; /* of tcp_cconn_t */
+        /** Client's listeners */
+        list_t clst;
 } tcp_client_t;
 
@@ -358 +393 @@
 } tcp_sock_lconn_t;
 
-
 #endif
 

uspace/srv/net/tcp/tqueue.c

@@ -285 +285 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG,
-            "tcp_transmit_segment(f:(%u),l:(%u), %p)",
+            "tcp_transmit_segment(l:(%u),f:(%u), %p)",
             sp->local.port, sp->foreign.port, seg);
         

uspace/srv/net/tcp/ucall.c

@@ -188 +188 @@
         /* Wait for data to become available */
         while (conn->rcv_buf_used == 0 && !conn->rcv_buf_fin && !conn->reset) {
+                tcp_conn_unlock(conn);
+                return TCP_EAGAIN;
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_receive() - wait for data");
                 fibril_condvar_wait(&conn->rcv_buf_cv, &conn->lock);
@@ -294 +296 @@
 }
 
-void tcp_uc_set_cstate_cb(tcp_conn_t *conn, tcp_cstate_cb_t cb, void *arg)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)",
+void tcp_uc_set_cb(tcp_conn_t *conn, tcp_cb_t *cb, void *arg)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_set_cb(%p, %p, %p)",
             conn, cb, arg);
 
-        conn->cstate_cb = cb;
-        conn->cstate_cb_arg = arg;
+        conn->cb = cb;
+        conn->cb_arg = arg;
 }
 

uspace/srv/net/tcp/ucall.h

@@ -50 +50 @@
 extern void tcp_uc_status(tcp_conn_t *, tcp_conn_status_t *);
 extern void tcp_uc_delete(tcp_conn_t *);
-extern void tcp_uc_set_cstate_cb(tcp_conn_t *, tcp_cstate_cb_t, void *);
+extern void tcp_uc_set_cb(tcp_conn_t *, tcp_cb_t *, void *);
 
 /*