Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ie70348406a2bfc156302687d2f5f98bc1a50c88f
ct_connection_t *sct, *cct;
app_worker_t *client_wrk;
segment_manager_t *sm;
ct_connection_t *sct, *cct;
app_worker_t *client_wrk;
segment_manager_t *sm;
fifo_segment_t *seg;
u64 segment_handle;
int err = 0;
session_t *cs;
fifo_segment_t *seg;
u64 segment_handle;
int err = 0;
session_t *cs;
ss_index = ss->session_index;
sct = (ct_connection_t *) session_get_transport (ss);
client_wrk = app_worker_get (sct->client_wrk);
ss_index = ss->session_index;
sct = (ct_connection_t *) session_get_transport (ss);
client_wrk = app_worker_get (sct->client_wrk);
+ opaque = sct->client_opaque;
sm = segment_manager_get (ss->rx_fifo->segment_manager);
seg = segment_manager_get_segment_w_lock (sm, ss->rx_fifo->segment_index);
sm = segment_manager_get (ss->rx_fifo->segment_manager);
seg = segment_manager_get_segment_w_lock (sm, ss->rx_fifo->segment_index);
sct->client_wrk);
segment_manager_segment_reader_unlock (sm);
session_close (ss);
sct->client_wrk);
segment_manager_segment_reader_unlock (sm);
session_close (ss);
/* This will allocate fifos for the session. They won't be used for
* exchanging data but they will be used to close the connection if
* the segment manager/worker is freed */
/* This will allocate fifos for the session. They won't be used for
* exchanging data but they will be used to close the connection if
* the segment manager/worker is freed */
- if (app_worker_init_connected (client_wrk, cs))
+ if ((err = app_worker_init_connected (client_wrk, cs)))
+ session_free (cs);
+ goto error;
- if (app_worker_connect_notify (client_wrk, cs, err, sct->client_opaque))
+ cs->session_state = SESSION_STATE_CONNECTING;
+
+ if (app_worker_connect_notify (client_wrk, cs, err, opaque))
+ segment_manager_dealloc_fifos (cs->rx_fifo, cs->tx_fifo);
+ session_free (cs);
cs->session_state = SESSION_STATE_READY;
return 0;
cs->session_state = SESSION_STATE_READY;
return 0;
+
+error:
+ app_worker_connect_notify (client_wrk, 0, err, opaque);
+ return -1;
session_t *s = (session_t *) session;
if (session_has_transport (s))
return 0;
session_t *s = (session_t *) session;
if (session_has_transport (s))
return 0;
+ /* As all other sessions, cut-throughs are scheduled by vpp for tx so let
+ * the scheduler's custom tx logic decide when to deschedule, i.e., after
+ * fifo is emptied. */
return ct_session_tx (s);
}
return ct_session_tx (s);
}