X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_api.c;h=0285691182ea9b92920e6de5a09e2713776413e1;hb=8c2dd1bf54af71e4b256bdf885efe2ac53fc6c86;hp=6a0d77eed12e9fff7fbe1bf803421f6c3dcf040c;hpb=288eaab5964b9211350acad8d742fae4789577fe;p=vpp.git diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c index 6a0d77eed12..0285691182e 100755 --- a/src/vnet/session/session_api.c +++ b/src/vnet/session/session_api.c @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -201,13 +202,13 @@ static int send_session_accept_callback (session_t * s) { app_worker_t *server_wrk = app_worker_get (s->app_wrk_index); - transport_proto_vft_t *tp_vft; vl_api_accept_session_t *mp; vl_api_registration_t *reg; transport_connection_t *tc; session_t *listener; svm_msg_q_t *vpp_queue; application_t *server; + app_listener_t *al; server = application_get (server_wrk->app_index); reg = @@ -229,7 +230,8 @@ send_session_accept_callback (session_t * s) if (session_has_transport (s)) { listener = listen_session_get (s->listener_index); - mp->listener_handle = listen_session_get_handle (listener); + al = app_listener_get (server, listener->al_index); + mp->listener_handle = app_listener_handle (al); if (application_is_proxy (server)) { listener = @@ -241,8 +243,8 @@ send_session_accept_callback (session_t * s) vpp_queue = session_manager_get_vpp_event_queue (s->thread_index); mp->vpp_event_queue_address = pointer_to_uword (vpp_queue); mp->handle = session_handle (s); - tp_vft = transport_protocol_get_vft (session_get_transport_proto (s)); - tc = tp_vft->get_connection (s->connection_index, s->thread_index); + tc = transport_get_connection (session_get_transport_proto (s), + s->connection_index, s->thread_index); mp->port = tc->rmt_port; mp->is_ip4 = tc->is_ip4; clib_memcpy_fast (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip)); @@ -254,22 +256,16 @@ send_session_accept_callback (session_t * s) if (application_local_session_listener_has_transport (ls)) { listener = listen_session_get (ls->listener_index); - mp->listener_handle = listen_session_get_handle (listener); + al = app_listener_get (server, listener->al_index); + mp->listener_handle = app_listener_handle (al); mp->is_ip4 = session_type_is_ip4 (listener->session_type); } else { ll = application_get_local_listen_session (server, ls->listener_index); - if (ll->transport_listener_index != ~0) - { - listener = listen_session_get (ll->transport_listener_index); - mp->listener_handle = listen_session_get_handle (listener); - } - else - { - mp->listener_handle = application_local_session_handle (ll); - } + al = app_listener_get (server, ll->al_index); + mp->listener_handle = app_listener_handle (al); mp->is_ip4 = session_type_is_ip4 (ll->listener_session_type); } mp->handle = application_local_session_handle (ls); @@ -420,12 +416,12 @@ mq_send_session_accepted_cb (session_t * s) app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); svm_msg_q_msg_t _msg, *msg = &_msg; svm_msg_q_t *vpp_queue, *app_mq; - transport_proto_vft_t *tp_vft; transport_connection_t *tc; session_t *listener; session_accepted_msg_t *mp; session_event_t *evt; application_t *app; + app_listener_t *al; app = application_get (app_wrk->app_index); app_mq = app_wrk->event_queue; @@ -445,7 +441,8 @@ mq_send_session_accepted_cb (session_t * s) if (session_has_transport (s)) { listener = listen_session_get (s->listener_index); - mp->listener_handle = listen_session_get_handle (listener); + al = app_listener_get (app, listener->al_index); + mp->listener_handle = app_listener_handle (al); if (application_is_proxy (app)) { listener = @@ -457,8 +454,8 @@ mq_send_session_accepted_cb (session_t * s) vpp_queue = session_manager_get_vpp_event_queue (s->thread_index); mp->vpp_event_queue_address = pointer_to_uword (vpp_queue); mp->handle = session_handle (s); - tp_vft = transport_protocol_get_vft (session_get_transport_proto (s)); - tc = tp_vft->get_connection (s->connection_index, s->thread_index); + tc = transport_get_connection (session_get_transport_proto (s), + s->connection_index, s->thread_index); mp->port = tc->rmt_port; mp->is_ip4 = tc->is_ip4; clib_memcpy_fast (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip)); @@ -477,21 +474,15 @@ mq_send_session_accepted_cb (session_t * s) if (application_local_session_listener_has_transport (ls)) { listener = listen_session_get (ls->listener_index); - mp->listener_handle = listen_session_get_handle (listener); + al = app_listener_get (app, listener->al_index); + mp->listener_handle = app_listener_handle (al); mp->is_ip4 = session_type_is_ip4 (listener->session_type); } else { ll = application_get_local_listen_session (app, ls->listener_index); - if (ll->transport_listener_index != ~0) - { - listener = listen_session_get (ll->transport_listener_index); - mp->listener_handle = listen_session_get_handle (listener); - } - else - { - mp->listener_handle = application_local_session_handle (ll); - } + al = app_listener_get (app, ll->al_index); + mp->listener_handle = app_listener_handle (al); mp->is_ip4 = session_type_is_ip4 (ll->listener_session_type); } mp->handle = application_local_session_handle (ls); @@ -676,11 +667,12 @@ mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context, svm_msg_q_msg_t _msg, *msg = &_msg; svm_msg_q_t *app_mq, *vpp_evt_q; transport_connection_t *tc; - session_t *ls = 0; session_bound_msg_t *mp; app_worker_t *app_wrk; session_event_t *evt; application_t *app; + app_listener_t *al; + session_t *ls = 0; app_wrk = app_worker_get (app_wrk_index); app = application_get (app_wrk->app_index); @@ -707,7 +699,8 @@ mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context, mp->handle = handle; if (application_has_global_scope (app)) { - ls = listen_session_get_from_handle (handle); + al = app_listener_get_w_handle (handle); + ls = app_listener_get_session (al); tc = listen_session_get_transport (ls); mp->lcl_port = tc->lcl_port; mp->lcl_is_ip4 = tc->is_ip4; @@ -764,7 +757,6 @@ vl_api_application_attach_t_handler (vl_api_application_attach_t * mp) ssvm_private_t *segp, *evt_q_segment; vnet_app_attach_args_t _a, *a = &_a; vl_api_registration_t *reg; - clib_error_t *error = 0; u8 fd_flags = 0; reg = vl_api_client_index_to_registration (mp->client_index); @@ -803,10 +795,9 @@ vl_api_application_attach_t_handler (vl_api_application_attach_t * mp) mp->namespace_id_len); } - if ((error = vnet_application_attach (a))) + if ((rv = vnet_application_attach (a))) { - rv = clib_error_get_code (error); - clib_error_report (error); + clib_warning ("attach returned: %d", rv); vec_free (a->namespace_id); goto done; } @@ -890,7 +881,7 @@ static void vl_api_bind_uri_t_handler (vl_api_bind_uri_t * mp) { transport_connection_t *tc = 0; - vnet_bind_args_t _a, *a = &_a; + vnet_listen_args_t _a, *a = &_a; vl_api_bind_uri_reply_t *rmp; session_t *s; application_t *app = 0; @@ -926,7 +917,8 @@ done: rmp->handle = a->handle; if (app && application_has_global_scope (app)) { - s = listen_session_get_from_handle (a->handle); + app_listener_t* al = app_listener_get_w_handle(a->handle); + s = app_listener_get_session(al); tc = listen_session_get_transport (s); rmp->lcl_is_ip4 = tc->is_ip4; rmp->lcl_port = tc->lcl_port; @@ -957,7 +949,7 @@ vl_api_unbind_uri_t_handler (vl_api_unbind_uri_t * mp) { vl_api_unbind_uri_reply_t *rmp; application_t *app; - vnet_unbind_args_t _a, *a = &_a; + vnet_unlisten_args_t _a, *a = &_a; int rv; if (session_manager_is_enabled () == 0) @@ -988,7 +980,6 @@ vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp) vl_api_connect_session_reply_t *rmp; vnet_connect_args_t _a, *a = &_a; application_t *app; - clib_error_t *error = 0; int rv = 0; if (session_manager_is_enabled () == 0) @@ -1004,11 +995,8 @@ vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp) a->uri = (char *) mp->uri; a->api_context = mp->context; a->app_index = app->app_index; - if ((error = vnet_connect_uri (a))) - { - rv = clib_error_get_code (error); - clib_error_report (error); - } + if ((rv = vnet_connect_uri (a))) + clib_warning ("connect_uri returned: %d", rv); } else { @@ -1144,14 +1132,14 @@ vl_api_accept_session_reply_t_handler (vl_api_accept_session_reply_t * mp) if (session_handle_is_local (mp->handle)) { - ls = application_get_local_session_from_handle (mp->handle); + ls = app_worker_get_local_session_from_handle (mp->handle); if (!ls || ls->app_wrk_index != mp->context) { clib_warning ("server %u doesn't own local handle %llu", mp->context, mp->handle); return; } - if (application_local_session_connect_notify (ls)) + if (app_worker_local_session_connect_notify (ls)) return; ls->session_state = SESSION_STATE_READY; } @@ -1182,16 +1170,16 @@ vl_api_map_another_segment_reply_t_handler (vl_api_map_another_segment_reply_t static void vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp) { + vnet_listen_args_t _a, *a = &_a; + transport_connection_t *tc = 0; vl_api_bind_sock_reply_t *rmp; - vnet_bind_args_t _a, *a = &_a; - int rv = 0; - clib_error_t *error; + svm_msg_q_t *vpp_evt_q; application_t *app = 0; app_worker_t *app_wrk; - session_t *s; - transport_connection_t *tc = 0; ip46_address_t *ip46; - svm_msg_q_t *vpp_evt_q; + app_listener_t *al; + session_t *s; + int rv = 0; if (session_manager_is_enabled () == 0) { @@ -1217,11 +1205,8 @@ vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp) a->app_index = app->app_index; a->wrk_map_index = mp->wrk_index; - if ((error = vnet_bind (a))) - { - rv = clib_error_get_code (error); - clib_error_report (error); - } + if ((rv = vnet_listen (a))) + clib_warning ("listen returned: %d", rv); done: /* *INDENT-OFF* */ @@ -1233,7 +1218,8 @@ done: rmp->lcl_is_ip4 = mp->is_ip4; if (app && application_has_global_scope (app)) { - s = listen_session_get_from_handle (a->handle); + al = app_listener_get_w_handle (a->handle); + s = app_listener_get_session (al); tc = listen_session_get_transport (s); clib_memcpy_fast (rmp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); if (session_transport_service_type (s) == TRANSPORT_SERVICE_CL) @@ -1261,9 +1247,8 @@ static void vl_api_unbind_sock_t_handler (vl_api_unbind_sock_t * mp) { vl_api_unbind_sock_reply_t *rmp; - vnet_unbind_args_t _a, *a = &_a; + vnet_unlisten_args_t _a, *a = &_a; application_t *app; - clib_error_t *error; int rv = 0; if (session_manager_is_enabled () == 0) @@ -1278,11 +1263,8 @@ vl_api_unbind_sock_t_handler (vl_api_unbind_sock_t * mp) a->app_index = app->app_index; a->handle = mp->handle; a->wrk_map_index = mp->wrk_index; - if ((error = vnet_unbind (a))) - { - rv = clib_error_get_code (error); - clib_error_report (error); - } + if ((rv = vnet_unlisten (a))) + clib_warning ("unlisten returned: %d", rv); } done: @@ -1295,7 +1277,6 @@ vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp) vl_api_connect_session_reply_t *rmp; vnet_connect_args_t _a, *a = &_a; application_t *app = 0; - clib_error_t *error = 0; int rv = 0; if (session_manager_is_enabled () == 0) @@ -1328,11 +1309,8 @@ vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp) a->api_context = mp->context; a->app_index = app->app_index; a->wrk_map_index = mp->wrk_index; - if ((error = vnet_connect (a))) - { - rv = clib_error_get_code (error); - clib_error_report (error); - } + if ((rv = vnet_connect (a))) + clib_warning ("connect returned: %u", rv); vec_free (a->sep_ext.hostname); } else @@ -1361,7 +1339,6 @@ vl_api_app_worker_add_del_t_handler (vl_api_app_worker_add_del_t * mp) int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0; vl_api_app_worker_add_del_reply_t *rmp; vl_api_registration_t *reg; - clib_error_t *error = 0; application_t *app; u8 fd_flags = 0; @@ -1388,11 +1365,10 @@ vl_api_app_worker_add_del_t_handler (vl_api_app_worker_add_del_t * mp) .api_client_index = mp->client_index, .is_add = mp->is_add }; - error = vnet_app_worker_add_del (&args); - if (error) + rv = vnet_app_worker_add_del (&args); + if (rv) { - rv = clib_error_get_code (error); - clib_error_report (error); + clib_warning ("app worker add/del returned: %d", rv); goto done; } @@ -1442,7 +1418,6 @@ static void vl_api_app_namespace_add_del_t_handler (vl_api_app_namespace_add_del_t * mp) { vl_api_app_namespace_add_del_reply_t *rmp; - clib_error_t *error = 0; u32 appns_index = 0; u8 *ns_id = 0; int rv = 0; @@ -1468,13 +1443,8 @@ vl_api_app_namespace_add_del_t_handler (vl_api_app_namespace_add_del_t * mp) .ip6_fib_id = clib_net_to_host_u32 (mp->ip6_fib_id), .is_add = 1 }; - error = vnet_app_namespace_add_del (&args); - if (error) - { - rv = clib_error_get_code (error); - clib_error_report (error); - } - else + rv = vnet_app_namespace_add_del (&args); + if (!rv) { appns_index = app_namespace_index_from_id (ns_id); if (appns_index == APP_NAMESPACE_INVALID_INDEX) @@ -1500,7 +1470,6 @@ vl_api_session_rule_add_del_t_handler (vl_api_session_rule_add_del_t * mp) vl_api_session_rule_add_del_reply_t *rmp; session_rule_add_del_args_t args; session_rule_table_add_del_args_t *table_args = &args.table_args; - clib_error_t *error; u8 fib_proto; int rv = 0; @@ -1525,12 +1494,9 @@ vl_api_session_rule_add_del_t_handler (vl_api_session_rule_add_del_t * mp) clib_memset (&table_args->rmt.fp_addr, 0, sizeof (table_args->rmt.fp_addr)); ip_set (&table_args->lcl.fp_addr, mp->lcl_ip, mp->is_ip4); ip_set (&table_args->rmt.fp_addr, mp->rmt_ip, mp->is_ip4); - error = vnet_session_rule_add_del (&args); - if (error) - { - rv = clib_error_get_code (error); - clib_error_report (error); - } + rv = vnet_session_rule_add_del (&args); + if (rv) + clib_warning ("rule add del returned: %d", rv); vec_free (table_args->tag); REPLY_MACRO (VL_API_SESSION_RULE_ADD_DEL_REPLY); }