Changeset 779541b in mainline for uspace/srv/net/tcp/conn.c
- Timestamp:
- 2015-05-09T13:43:50Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1d4b815
- Parents:
- 99ea91b2
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/tcp/conn.c
r99ea91b2 r779541b 121 121 fibril_condvar_initialize(&conn->cstate_cv); 122 122 123 conn->c state_cb = NULL;123 conn->cb = NULL; 124 124 125 125 conn->cstate = st_listen; … … 275 275 276 276 /* Run user callback function */ 277 if (conn->c state_cb!= NULL) {277 if (conn->cb != NULL && conn->cb->cstate_change != NULL) { 278 278 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_state_set() - run user CB"); 279 conn->c state_cb(conn, conn->cstate_cb_arg);279 conn->cb->cstate_change(conn, conn->cb_arg); 280 280 } else { 281 281 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 */ 1008 1008 fibril_condvar_broadcast(&conn->rcv_buf_cv); 1009 if (conn->cb != NULL && conn->cb->recv_data != NULL) 1010 conn->cb->recv_data(conn, conn->cb_arg); 1009 1011 1010 1012 log_msg(LOG_DEFAULT, LVL_DEBUG, "Received %zu bytes of data.", xfer_size); … … 1098 1100 conn->rcv_buf_fin = true; 1099 1101 fibril_condvar_broadcast(&conn->rcv_buf_cv); 1102 if (conn->cb != NULL && conn->cb->recv_data != NULL) 1103 conn->cb->recv_data(conn, conn->cb_arg); 1100 1104 1101 1105 tcp_segment_delete(seg);
Note:
See TracChangeset
for help on using the changeset viewer.