summaryrefslogtreecommitdiffstats
path: root/src/vnet/session/session.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-08-16 17:48:44 -0700
committerDamjan Marion <dmarion@me.com>2019-08-19 09:22:59 +0000
commitdfb3b8771292e4c863ca266856aa2b5eb7cc7518 (patch)
tree07d808f098db401d045706cb32994cc2630ea2ed /src/vnet/session/session.c
parent12f6936cd8f69f17820ef749515fcf4d50001c60 (diff)
session: add explicit reset api
Type: feature This can be used to forcefully close a session. It's only available to builtin applications for now. Transports must support the reset api otherwise normal close is used. Change-Id: I5e6d681cbc4c8045385e293e0e9d86fa2bf45849 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/session/session.c')
-rw-r--r--src/vnet/session/session.c46
1 files changed, 40 insertions, 6 deletions
diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index a102825c6f5..45292454e57 100644
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -144,7 +144,7 @@ session_add_self_custom_tx_evt (transport_connection_t * tc, u8 has_prio)
}
static void
-session_program_transport_close (session_t * s)
+session_program_transport_ctrl_evt (session_t * s, session_evt_type_t evt)
{
u32 thread_index = vlib_get_thread_index ();
session_evt_elt_t *elt;
@@ -158,10 +158,10 @@ session_program_transport_close (session_t * s)
elt = session_evt_alloc_ctrl (wrk);
clib_memset (&elt->evt, 0, sizeof (session_event_t));
elt->evt.session_handle = session_handle (s);
- elt->evt.event_type = SESSION_CTRL_EVT_CLOSE;
+ elt->evt.event_type = evt;
}
else
- session_send_ctrl_evt_to_thread (s, SESSION_CTRL_EVT_CLOSE);
+ session_send_ctrl_evt_to_thread (s, evt);
}
session_t *
@@ -888,7 +888,7 @@ session_transport_delete_notify (transport_connection_t * tc)
s->session_state = SESSION_STATE_CLOSED;
session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT);
svm_fifo_dequeue_drop_all (s->tx_fifo);
- session_program_transport_close (s);
+ session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE);
break;
case SESSION_STATE_TRANSPORT_DELETED:
break;
@@ -1194,12 +1194,26 @@ session_close (session_t * s)
* acknowledge the close */
if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED
|| s->session_state == SESSION_STATE_TRANSPORT_DELETED)
- session_program_transport_close (s);
+ session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE);
return;
}
s->session_state = SESSION_STATE_CLOSING;
- session_program_transport_close (s);
+ session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE);
+}
+
+/**
+ * Force a close without waiting for data to be flushed
+ */
+void
+session_reset (session_t * s)
+{
+ if (s->session_state >= SESSION_STATE_CLOSING)
+ return;
+ /* Drop all outstanding tx data */
+ svm_fifo_dequeue_drop_all (s->tx_fifo);
+ s->session_state = SESSION_STATE_CLOSING;
+ session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_RESET);
}
/**
@@ -1235,6 +1249,26 @@ session_transport_close (session_t * s)
}
/**
+ * Force transport close
+ */
+void
+session_transport_reset (session_t * s)
+{
+ if (s->session_state >= SESSION_STATE_APP_CLOSED)
+ {
+ if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED)
+ s->session_state = SESSION_STATE_CLOSED;
+ else if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED)
+ session_free_w_fifos (s);
+ return;
+ }
+
+ s->session_state = SESSION_STATE_APP_CLOSED;
+ transport_reset (session_get_transport_proto (s), s->connection_index,
+ s->thread_index);
+}
+
+/**
* Cleanup transport and session state.
*
* Notify transport of the cleanup and free the session. This should