From 0bce71eee3f144b7ad15cd008ccc9e646d6663f4 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Thu, 10 Feb 2022 11:57:06 -0800 Subject: session: use transport endpoint cfg for listen Makes it similar to connects. Type: improvement Signed-off-by: Florin Coras Change-Id: I38c328670054e1a9ba4dc4ea8fe7519a5a09e8be --- src/plugins/http/http.c | 2 +- src/plugins/quic/quic.c | 3 ++- src/plugins/srtp/srtp.c | 2 +- src/vnet/session/application_local.c | 2 +- src/vnet/session/session.c | 4 ++-- src/vnet/session/transport.c | 2 +- src/vnet/session/transport.h | 4 ++-- src/vnet/tcp/tcp.c | 4 ++-- src/vnet/tls/tls.c | 2 +- src/vnet/udp/udp.c | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/plugins/http/http.c b/src/plugins/http/http.c index 657a0b54755..668aab0fa83 100644 --- a/src/plugins/http/http.c +++ b/src/plugins/http/http.c @@ -734,7 +734,7 @@ http_transport_connect (transport_endpoint_cfg_t *tep) } static u32 -http_start_listen (u32 app_listener_index, transport_endpoint_t *tep) +http_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) { vnet_listen_args_t _args = {}, *args = &_args; session_t *tc_listener, *app_listener; diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index 499eb8bc776..a0bacb6237d 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -1441,7 +1441,8 @@ quic_proto_on_close (u32 ctx_index, u32 thread_index) } static u32 -quic_start_listen (u32 quic_listen_session_index, transport_endpoint_t * tep) +quic_start_listen (u32 quic_listen_session_index, + transport_endpoint_cfg_t *tep) { vnet_listen_args_t _bargs, *args = &_bargs; transport_endpt_crypto_cfg_t *ccfg; diff --git a/src/plugins/srtp/srtp.c b/src/plugins/srtp/srtp.c index cc4b59de569..715e2c9e77c 100644 --- a/src/plugins/srtp/srtp.c +++ b/src/plugins/srtp/srtp.c @@ -706,7 +706,7 @@ srtp_disconnect (u32 ctx_handle, u32 thread_index) } static u32 -srtp_start_listen (u32 app_listener_index, transport_endpoint_t *tep) +srtp_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) { vnet_listen_args_t _bargs, *args = &_bargs; session_handle_t udp_al_handle; diff --git a/src/vnet/session/application_local.c b/src/vnet/session/application_local.c index 83def8eb730..8590d041600 100644 --- a/src/vnet/session/application_local.c +++ b/src/vnet/session/application_local.c @@ -820,7 +820,7 @@ ct_connect (app_worker_t * client_wrk, session_t * ll, } static u32 -ct_start_listen (u32 app_listener_index, transport_endpoint_t * tep) +ct_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) { session_endpoint_cfg_t *sep; ct_connection_t *ct; diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 42f24d2fb21..108fa361d26 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -1468,12 +1468,12 @@ session_open (session_endpoint_cfg_t *rmt, session_handle_t *rsh) int session_listen (session_t * ls, session_endpoint_cfg_t * sep) { - transport_endpoint_t *tep; + transport_endpoint_cfg_t *tep; int tc_index; u32 s_index; /* Transport bind/listen */ - tep = session_endpoint_to_transport (sep); + tep = session_endpoint_to_transport_cfg (sep); s_index = ls->session_index; tc_index = transport_start_listen (session_get_transport_proto (ls), s_index, tep); diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c index 92df3656a8c..540d6a615ac 100644 --- a/src/vnet/session/transport.c +++ b/src/vnet/session/transport.c @@ -341,7 +341,7 @@ transport_reset (transport_proto_t tp, u32 conn_index, u8 thread_index) u32 transport_start_listen (transport_proto_t tp, u32 session_index, - transport_endpoint_t * tep) + transport_endpoint_cfg_t *tep) { return tp_vfts[tp].start_listen (session_index, tep); } diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h index 02ab540f6a2..633bb1ecfd0 100644 --- a/src/vnet/session/transport.h +++ b/src/vnet/session/transport.h @@ -72,7 +72,7 @@ typedef struct _transport_proto_vft /* * Setup */ - u32 (*start_listen) (u32 session_index, transport_endpoint_t * lcl); + u32 (*start_listen) (u32 session_index, transport_endpoint_cfg_t *lcl); u32 (*stop_listen) (u32 conn_index); int (*connect) (transport_endpoint_cfg_t * rmt); void (*half_close) (u32 conn_index, u32 thread_index); @@ -140,7 +140,7 @@ void transport_half_close (transport_proto_t tp, u32 conn_index, void transport_close (transport_proto_t tp, u32 conn_index, u8 thread_index); void transport_reset (transport_proto_t tp, u32 conn_index, u8 thread_index); u32 transport_start_listen (transport_proto_t tp, u32 session_index, - transport_endpoint_t * tep); + transport_endpoint_cfg_t *tep); u32 transport_stop_listen (transport_proto_t tp, u32 conn_index); void transport_cleanup (transport_proto_t tp, u32 conn_index, u8 thread_index); diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c index ffe5c895cc9..d97fafa6f24 100644 --- a/src/vnet/tcp/tcp.c +++ b/src/vnet/tcp/tcp.c @@ -112,7 +112,7 @@ tcp_cc_algo_new_type (const tcp_cc_algorithm_t * vft) } static u32 -tcp_connection_bind (u32 session_index, transport_endpoint_t * lcl) +tcp_connection_bind (u32 session_index, transport_endpoint_cfg_t *lcl) { tcp_main_t *tm = &tcp_main; tcp_connection_t *listener; @@ -147,7 +147,7 @@ tcp_connection_bind (u32 session_index, transport_endpoint_t * lcl) } static u32 -tcp_session_bind (u32 session_index, transport_endpoint_t * tep) +tcp_session_bind (u32 session_index, transport_endpoint_cfg_t *tep) { return tcp_connection_bind (session_index, tep); } diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c index 01849178644..e201d478361 100644 --- a/src/vnet/tls/tls.c +++ b/src/vnet/tls/tls.c @@ -773,7 +773,7 @@ tls_disconnect (u32 ctx_handle, u32 thread_index) } u32 -tls_start_listen (u32 app_listener_index, transport_endpoint_t * tep) +tls_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) { vnet_listen_args_t _bargs, *args = &_bargs; transport_endpt_crypto_cfg_t *ccfg; diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c index 5f73e3968c0..98164b12705 100644 --- a/src/vnet/udp/udp.c +++ b/src/vnet/udp/udp.c @@ -165,7 +165,7 @@ udp_default_mtu (udp_main_t * um, u8 is_ip4) } static u32 -udp_session_bind (u32 session_index, transport_endpoint_t * lcl) +udp_session_bind (u32 session_index, transport_endpoint_cfg_t *lcl) { udp_main_t *um = vnet_get_udp_main (); vlib_main_t *vm = vlib_get_main (); -- cgit 1.2.3-korg