aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/session/application.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-06-11 12:31:31 -0700
committerDamjan Marion <dmarion@me.com>2019-06-12 20:18:45 +0000
commit87d663337931be870891a809cf86d1ee1974fedf (patch)
tree483c54e128d290f685a13b4b6f130c6f587dfc01 /src/vnet/session/application.c
parent87a9bf8c0399bc5424fbc129e31967cf504810a1 (diff)
session: use session handles as app listener handles
Type: refactor Change-Id: I421750147a8a821bd0b522daf6c2b7239e551f12 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/session/application.c')
-rw-r--r--src/vnet/session/application.c66
1 files changed, 18 insertions, 48 deletions
diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c
index 30957870860..0b8c8d4c70c 100644
--- a/src/vnet/session/application.c
+++ b/src/vnet/session/application.c
@@ -38,6 +38,7 @@ app_listener_alloc (application_t * app)
app_listener->app_index = app->app_index;
app_listener->session_index = SESSION_INVALID_INDEX;
app_listener->local_index = SESSION_INVALID_INDEX;
+ app_listener->ls_handle = SESSION_INVALID_HANDLE;
return app_listener;
}
@@ -47,14 +48,6 @@ app_listener_get (application_t * app, u32 app_listener_index)
return pool_elt_at_index (app->listeners, app_listener_index);
}
-static app_listener_t *
-app_listener_get_if_valid (application_t * app, u32 app_listener_index)
-{
- if (pool_is_free_index (app->listeners, app_listener_index))
- return 0;
- return pool_elt_at_index (app->listeners, app_listener_index);
-}
-
static void
app_listener_free (application_t * app, app_listener_t * app_listener)
{
@@ -64,45 +57,10 @@ app_listener_free (application_t * app, app_listener_t * app_listener)
clib_memset (app_listener, 0xfa, sizeof (*app_listener));
}
-static u32
-app_listener_id (app_listener_t * al)
-{
- ASSERT (al->app_index < 1 << 16 && al->al_index < 1 << 16);
- return (al->app_index << 16 | al->al_index);
-}
-
session_handle_t
app_listener_handle (app_listener_t * al)
{
- return ((u64) SESSION_LISTENER_PREFIX << 32 | (u64) app_listener_id (al));
-}
-
-static void
-app_listener_id_parse (u32 listener_id, u32 * app_index,
- u32 * app_listener_index)
-{
- *app_index = listener_id >> 16;
- *app_listener_index = listener_id & 0xFFFF;
-}
-
-void
-app_listener_handle_parse (session_handle_t handle, u32 * app_index,
- u32 * app_listener_index)
-{
- app_listener_id_parse (handle & 0xFFFFFFFF, app_index, app_listener_index);
-}
-
-static app_listener_t *
-app_listener_get_w_id (u32 listener_id)
-{
- u32 app_index, app_listener_index;
- application_t *app;
-
- app_listener_id_parse (listener_id, &app_index, &app_listener_index);
- app = application_get_if_valid (app_index);
- if (!app)
- return 0;
- return app_listener_get_if_valid (app, app_listener_index);
+ return al->ls_handle;
}
app_listener_t *
@@ -116,14 +74,24 @@ app_listener_get_w_session (session_t * ls)
return app_listener_get (app, ls->al_index);
}
+session_handle_t
+app_listen_session_handle (session_t * ls)
+{
+ app_listener_t *al;
+ al = app_listener_get_w_session (ls);
+ if (!al)
+ return listen_session_get_handle (ls);
+ return al->ls_handle;
+}
+
app_listener_t *
app_listener_get_w_handle (session_handle_t handle)
{
-
- if (handle >> 32 != SESSION_LISTENER_PREFIX)
+ session_t *ls;
+ ls = session_get_from_handle_if_valid (handle);
+ if (!ls)
return 0;
-
- return app_listener_get_w_id (handle & 0xFFFFFFFF);
+ return app_listener_get_w_session (ls);
}
app_listener_t *
@@ -202,6 +170,7 @@ app_listener_alloc_and_init (application_t * app,
ls = session_get_from_handle (lh);
app_listener = app_listener_get (app, al_index);
app_listener->local_index = ls->session_index;
+ app_listener->ls_handle = lh;
ls->al_index = al_index;
table_index = application_local_session_table (app);
@@ -234,6 +203,7 @@ app_listener_alloc_and_init (application_t * app,
ls = listen_session_get_from_handle (lh);
app_listener = app_listener_get (app, al_index);
app_listener->session_index = ls->session_index;
+ app_listener->ls_handle = lh;
ls->al_index = al_index;
/* Add to the global lookup table after transport was initialized.