Changeset ecf823a in mainline for uspace/srv/net/tl/tcp/conn.c

Timestamp:

2011-12-31T10:01:19Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

96cd5b4

Parents:

3819ce5 (diff), 852052d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

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

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

@@ -121 +121 @@
         fibril_condvar_initialize(&conn->cstate_cv);
 
+        conn->cstate_cb = NULL;
+
         conn->cstate = st_listen;
         conn->reset = false;
@@ -243 +245 @@
         tcp_cstate_t old_state;
 
+        log_msg(LVL_DEBUG, "tcp_conn_state_set(%p)", conn);
+
         old_state = conn->cstate;
         conn->cstate = nstate;
         fibril_condvar_broadcast(&conn->cstate_cv);
+
+        /* Run user callback function */
+        if (conn->cstate_cb != NULL) {
+                log_msg(LVL_DEBUG, "tcp_conn_state_set() - run user CB");
+                conn->cstate_cb(conn, conn->cstate_cb_arg);
+        } else {
+                log_msg(LVL_DEBUG, "tcp_conn_state_set() - no user CB");
+        }
 
         assert(old_state != st_closed);