Changeset 779541b in mainline for uspace/srv/net/tcp/conn.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/conn.c (modified) (4 diffs)

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