Changeset 779541b in mainline for uspace/srv/net/tcp/ucall.c

Timestamp:

2015-05-09T13:43:50Z (9 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.

File:

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

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;
 }