X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.c;h=524e7b53663457d91d49c44dffae57abbcd48c86;hb=99368315;hp=1023c8c9a6248940344aec92325a801b5742ea6e;hpb=f8f516a8b0ccab2f5d9796f90419bf2661c750af;p=vpp.git diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c index 1023c8c9a62..524e7b53663 100644 --- a/src/vnet/session/application_interface.c +++ b/src/vnet/session/application_interface.c @@ -22,6 +22,65 @@ VPP's application/session API bind/unbind/connect/disconnect calls */ +/* + * TLS server cert and keys to be used for testing only + */ +const char test_srv_crt_rsa[] = + "-----BEGIN CERTIFICATE-----\r\n" + "MIID5zCCAs+gAwIBAgIJALeMYCEHrTtJMA0GCSqGSIb3DQEBCwUAMIGJMQswCQYD\r\n" + "VQQGEwJVUzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCFNhbiBKb3NlMQ4wDAYDVQQK\r\n" + "DAVDaXNjbzEOMAwGA1UECwwFZmQuaW8xFjAUBgNVBAMMDXRlc3R0bHMuZmQuaW8x\r\n" + "IjAgBgkqhkiG9w0BCQEWE3ZwcC1kZXZAbGlzdHMuZmQuaW8wHhcNMTgwMzA1MjEx\r\n" + "NTEyWhcNMjgwMzAyMjExNTEyWjCBiTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNB\r\n" + "MREwDwYDVQQHDAhTYW4gSm9zZTEOMAwGA1UECgwFQ2lzY28xDjAMBgNVBAsMBWZk\r\n" + "LmlvMRYwFAYDVQQDDA10ZXN0dGxzLmZkLmlvMSIwIAYJKoZIhvcNAQkBFhN2cHAt\r\n" + "ZGV2QGxpc3RzLmZkLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\r\n" + "4C1k8a1DuStgggqT4o09fP9sJ2dC54bxhS/Xk2VEfaIZ222WSo4X/syRVfVy9Yah\r\n" + "cpI1zJ/RDxaZSFhgA+nPZBrFMsrULkrdAOpOVj8eDEp9JuWdO2ODSoFnCvLxcYWB\r\n" + "Yc5kHryJpEaGJl1sFQSesnzMFty/59ta0stk0Fp8r5NhIjWvSovGzPo6Bhz+VS2c\r\n" + "ebIZh4x1t2hHaFcgm0qJoJ6DceReWCW8w+yOVovTolGGq+bpb2Hn7MnRSZ2K2NdL\r\n" + "+aLXpkZbS/AODP1FF2vTO1mYL290LO7/51vJmPXNKSDYMy5EvILr5/VqtjsFCwRL\r\n" + "Q4jcM/+GeHSAFWx4qIv0BwIDAQABo1AwTjAdBgNVHQ4EFgQUWa1SOB37xmT53tZQ\r\n" + "aXuLLhRI7U8wHwYDVR0jBBgwFoAUWa1SOB37xmT53tZQaXuLLhRI7U8wDAYDVR0T\r\n" + "BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAoUht13W4ya27NVzQuCMvqPWL3VM4\r\n" + "3xbPFk02FaGz/WupPu276zGlzJAZrbuDcQowwwU1Ni1Yygxl96s1c2M5rHDTrOKG\r\n" + "rK0hbkSFBo+i6I8u4HiiQ4rYmG0Hv6+sXn3of0HsbtDPGgWZoipPWDljPYEURu3e\r\n" + "3HRe/Dtsj9CakBoSDzs8ndWaBR+f4sM9Tk1cjD46Gq2T/qpSPXqKxEUXlzhdCAn4\r\n" + "twub17Bq2kykHpppCwPg5M+v30tHG/R2Go15MeFWbEJthFk3TZMjKL7UFs7fH+x2\r\n" + "wSonXb++jY+KmCb93C+soABBizE57g/KmiR2IxQ/LMjDik01RSUIaM0lLA==\r\n" + "-----END CERTIFICATE-----\r\n"; +const u32 test_srv_crt_rsa_len = sizeof (test_srv_crt_rsa); + +const char test_srv_key_rsa[] = + "-----BEGIN PRIVATE KEY-----\r\n" + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDgLWTxrUO5K2CC\r\n" + "CpPijT18/2wnZ0LnhvGFL9eTZUR9ohnbbZZKjhf+zJFV9XL1hqFykjXMn9EPFplI\r\n" + "WGAD6c9kGsUyytQuSt0A6k5WPx4MSn0m5Z07Y4NKgWcK8vFxhYFhzmQevImkRoYm\r\n" + "XWwVBJ6yfMwW3L/n21rSy2TQWnyvk2EiNa9Ki8bM+joGHP5VLZx5shmHjHW3aEdo\r\n" + "VyCbSomgnoNx5F5YJbzD7I5Wi9OiUYar5ulvYefsydFJnYrY10v5otemRltL8A4M\r\n" + "/UUXa9M7WZgvb3Qs7v/nW8mY9c0pINgzLkS8guvn9Wq2OwULBEtDiNwz/4Z4dIAV\r\n" + "bHioi/QHAgMBAAECggEBAMzGipP8+oT166U+NlJXRFifFVN1DvdhG9PWnOxGL+c3\r\n" + "ILmBBC08WQzmHshPemBvR6DZkA1H23cV5JTiLWrFtC00CvhXsLRMrE5+uWotI6yE\r\n" + "iofybMroHvD6/X5R510UX9hQ6MHu5ShLR5VZ9zXHz5MpTmB/60jG5dLx+jgcwBK8\r\n" + "LuGv2YB/WCUwT9QJ3YU2eaingnXtz/MrFbkbltrqlnBdlD+kTtw6Yac9y1XuuQXc\r\n" + "BPeulLNDuPolJVWbUvDBZrpt2dXTgz8ws1sv+wCNE0xwQJsqW4Nx3QkpibUL9RUr\r\n" + "CVbKlNfa9lopT6nGKlgX69R/uH35yh9AOsfasro6w0ECgYEA82UJ8u/+ORah+0sF\r\n" + "Q0FfW5MTdi7OAUHOz16pUsGlaEv0ERrjZxmAkHA/VRwpvDBpx4alCv0Hc39PFLIk\r\n" + "nhSsM2BEuBkTAs6/GaoNAiBtQVE/hN7awNRWVmlieS0go3Y3dzaE9IUMyj8sPOFT\r\n" + "5JdJ6BM69PHKCkY3dKdnnfpFEuECgYEA68mRpteunF1mdZgXs+WrN+uLlRrQR20F\r\n" + "ZyMYiUCH2Dtn26EzA2moy7FipIIrQcX/j+KhYNGM3e7MU4LymIO29E18mn8JODnH\r\n" + "sQOXzBTsf8A4yIVMkcuQD3bfb0JiUGYUPOidTp2N7IJA7+6Yc3vQOyb74lnKnJoO\r\n" + "gougPT2wS+cCgYAn7muzb6xFsXDhyW0Tm6YJYBfRS9yAWEuVufINobeBZPSl2cN1\r\n" + "Jrnw+HlrfTNbrJWuJmjtZJXUXQ6cVp2rUbjutNyRV4vG6iRwEXYQ40EJdkr1gZpi\r\n" + "CHQhuShuuPih2MNAy7EEbM+sXrDjTBR3bFqzuHPzu7dp+BshCFX3lRfAAQKBgGQt\r\n" + "K5i7IhCFDjb/+3IPLgOAK7mZvsvZ4eXD33TQ2eZgtut1PXtBtNl17/b85uv293Fm\r\n" + "VDISVcsk3eLNS8zIiT6afUoWlxAwXEs0v5WRfjl4radkGvgGiJpJYvyeM67877RB\r\n" + "EDSKc/X8ESLfOB44iGvZUEMG6zJFscx9DgN25iQZAoGAbyd+JEWwdVH9/K3IH1t2\r\n" + "PBkZX17kNWv+iVM1WyFjbe++vfKZCrOJiyiqhDeEqgrP3AuNMlaaduC3VRC3G5oV\r\n" + "Mj1tlhDWQ/qhvKdCKNdIVQYDE75nw+FRWV8yYkHAnXYW3tNoweDIwixE0hkPR1bc\r\n" + "oEjPLVNtx8SOj/M4rhaPT3I=\r\n" "-----END PRIVATE KEY-----\r\n"; +const u32 test_srv_key_rsa_len = sizeof (test_srv_key_rsa); + static u8 session_endpoint_is_local (session_endpoint_t * sep) { @@ -38,8 +97,8 @@ session_endpoint_is_zero (session_endpoint_t * sep) u8 session_endpoint_in_ns (session_endpoint_t * sep) { - u8 is_zero = ip_is_zero (&sep->ip, sep->is_ip4); - if (!is_zero && sep->sw_if_index != ENDPOINT_INVALID_INDEX + u8 is_lep = session_endpoint_is_local (sep); + if (!is_lep && sep->sw_if_index != ENDPOINT_INVALID_INDEX && !ip_interface_has_address (sep->sw_if_index, &sep->ip, sep->is_ip4)) { clib_warning ("sw_if_index %u not configured with ip %U", @@ -47,7 +106,7 @@ session_endpoint_in_ns (session_endpoint_t * sep) sep->is_ip4); return 0; } - return (is_zero || ip_is_local (sep->fib_index, &sep->ip, sep->is_ip4)); + return (is_lep || ip_is_local (sep->fib_index, &sep->ip, sep->is_ip4)); } int @@ -91,10 +150,10 @@ session_endpoint_update_for_app (session_endpoint_t * sep, static int vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle) { + u64 lh, ll_handle = SESSION_INVALID_HANDLE; application_t *app; u32 table_index; - u64 listener; - int rv, have_local = 0; + int rv; app = application_get_if_valid (app_index); if (!app) @@ -109,23 +168,23 @@ vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle) table_index = application_session_table (app, session_endpoint_fib_proto (sep)); - listener = session_lookup_endpoint_listener (table_index, sep, 1); - if (listener != SESSION_INVALID_HANDLE) + lh = session_lookup_endpoint_listener (table_index, sep, 1); + if (lh != SESSION_INVALID_HANDLE) return VNET_API_ERROR_ADDRESS_IN_USE; /* * Add session endpoint to local session table. Only binds to "inaddr_any" * (i.e., zero address) are added to local scope table. */ - if (application_has_local_scope (app) && session_endpoint_is_zero (sep)) + if (application_has_local_scope (app) && session_endpoint_is_local (sep)) { if ((rv = application_start_local_listen (app, sep, handle))) return rv; - have_local = 1; + ll_handle = *handle; } if (!application_has_global_scope (app)) - return (have_local - 1); + return (ll_handle == SESSION_INVALID_HANDLE ? -1 : 0); /* * Add session endpoint to global session table @@ -133,8 +192,22 @@ vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle) /* Setup listen path down to transport */ rv = application_start_listen (app, sep, handle); - if (rv && have_local) + if (rv && ll_handle != SESSION_INVALID_HANDLE) session_lookup_del_session_endpoint (table_index, sep); + + /* + * Store in local table listener the index of the transport layer + * listener. We'll need local listeners are hit and we need to + * return global handle + */ + if (ll_handle != SESSION_INVALID_HANDLE) + { + local_session_t *ll; + stream_session_t *tl; + ll = application_get_local_listener_w_handle (ll_handle); + tl = listen_session_get_from_handle (*handle); + ll->transport_listener_index = tl->session_index; + } return rv; } @@ -165,8 +238,8 @@ vnet_unbind_i (u32 app_index, session_handle_t handle) } int -vnet_connect_i (u32 client_index, u32 api_context, session_endpoint_t * sep, - void *mp) +application_connect (u32 client_index, u32 api_context, + session_endpoint_t * sep) { application_t *server, *client; u32 table_index, server_index, li; @@ -192,6 +265,9 @@ vnet_connect_i (u32 client_index, u32 api_context, session_endpoint_t * sep, if (lh == SESSION_DROP_HANDLE) return VNET_API_ERROR_APP_CONNECT_FILTERED; + if (lh == SESSION_INVALID_HANDLE) + goto global_scope; + local_session_parse_handle (lh, &server_index, &li); /* @@ -199,9 +275,9 @@ vnet_connect_i (u32 client_index, u32 api_context, session_endpoint_t * sep, * can happen if client is a generic proxy. Route connect through * global table instead. */ - if (server_index != client_index - && (server = application_get_if_valid (server_index))) + if (server_index != client_index) { + server = application_get (server_index); ll = application_get_local_listen_session (server, li); return application_local_session_connect (table_index, client, server, ll, api_context); @@ -212,6 +288,8 @@ vnet_connect_i (u32 client_index, u32 api_context, session_endpoint_t * sep, * If nothing found, check the global scope for locally attached * destinations. Make sure first that we're allowed to. */ + +global_scope: if (session_endpoint_is_local (sep)) return VNET_API_ERROR_SESSION_CONNECT; @@ -241,8 +319,9 @@ vnet_connect_i (u32 client_index, u32 api_context, session_endpoint_t * sep, /** * unformat a vnet URI * - * transport-proto://ip46-addr:port - * eg. tcp://ip46-addr:port + * transport-proto://[hostname]ip46-addr:port + * eg. tcp://ip46-addr:port + * tls://[testtsl.fd.io]ip46-addr:port * * u8 ip46_address[16]; * u16 port_in_host_byte_order; @@ -257,23 +336,42 @@ vnet_connect_i (u32 client_index, u32 api_context, session_endpoint_t * sep, uword unformat_vnet_uri (unformat_input_t * input, va_list * args) { - session_endpoint_t *sep = va_arg (*args, session_endpoint_t *); - u32 transport_proto = 0; + session_endpoint_extended_t *sep = va_arg (*args, + session_endpoint_extended_t *); + u32 transport_proto = 0, port; + if (unformat (input, "%U://%U/%d", unformat_transport_proto, - &transport_proto, unformat_ip4_address, &sep->ip.ip4, - &sep->port)) + &transport_proto, unformat_ip4_address, &sep->ip.ip4, &port)) { sep->transport_proto = transport_proto; - sep->port = clib_host_to_net_u16 (sep->port); + sep->port = clib_host_to_net_u16 (port); sep->is_ip4 = 1; return 1; } - if (unformat (input, "%U://%U/%d", unformat_transport_proto, - &transport_proto, unformat_ip6_address, &sep->ip.ip6, - &sep->port)) + else if (unformat (input, "%U://[%s]%U/%d", unformat_transport_proto, + &transport_proto, &sep->hostname, unformat_ip4_address, + &sep->ip.ip4, &port)) + { + sep->transport_proto = transport_proto; + sep->port = clib_host_to_net_u16 (port); + sep->is_ip4 = 1; + return 1; + } + else if (unformat (input, "%U://%U/%d", unformat_transport_proto, + &transport_proto, unformat_ip6_address, &sep->ip.ip6, + &port)) { sep->transport_proto = transport_proto; - sep->port = clib_host_to_net_u16 (sep->port); + sep->port = clib_host_to_net_u16 (port); + sep->is_ip4 = 0; + return 1; + } + else if (unformat (input, "%U://[%s]%U/%d", unformat_transport_proto, + &transport_proto, &sep->hostname, unformat_ip6_address, + &sep->ip.ip6, &port)) + { + sep->transport_proto = transport_proto; + sep->port = clib_host_to_net_u16 (port); sep->is_ip4 = 0; return 1; } @@ -281,10 +379,10 @@ unformat_vnet_uri (unformat_input_t * input, va_list * args) } static u8 *cache_uri; -static session_endpoint_t *cache_sep; +static session_endpoint_extended_t *cache_sep; int -parse_uri (char *uri, session_endpoint_t * sep) +parse_uri (char *uri, session_endpoint_extended_t * sep) { unformat_input_t _input, *input = &_input; @@ -355,10 +453,17 @@ vnet_application_attach (vnet_app_attach_args_t * a) u64 secret; int rv; - app = application_lookup (a->api_client_index); + if (a->api_client_index != APP_INVALID_INDEX) + app = application_lookup (a->api_client_index); + else if (a->name) + app = application_lookup_name (a->name); + else + return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0, + "api index or name must be provided"); + if (app) - return clib_error_return_code (0, VNET_API_ERROR_APP_ALREADY_ATTACHED, - 0, "app already attached"); + return clib_error_return_code (0, VNET_API_ERROR_APP_ALREADY_ATTACHED, 0, + "app already attached"); secret = a->options[APP_OPTIONS_NAMESPACE_SECRET]; if ((rv = session_validate_namespace (a->namespace_id, secret, @@ -366,11 +471,11 @@ vnet_application_attach (vnet_app_attach_args_t * a) return clib_error_return_code (0, rv, 0, "namespace validation: %d", rv); a->options[APP_OPTIONS_NAMESPACE] = app_ns_index; app = application_new (); - if ((rv = application_init (app, a->api_client_index, a->options, + if ((rv = application_init (app, a->api_client_index, a->name, a->options, a->session_cb_vft))) return clib_error_return_code (0, rv, 0, "app init: %d", rv); - a->app_event_queue_address = pointer_to_uword (app->event_queue); + a->app_evt_q = app->event_queue; sm = segment_manager_get (app->first_segment_manager); fs = segment_manager_get_segment_w_lock (sm, 0); @@ -408,29 +513,33 @@ vnet_application_detach (vnet_app_detach_args_t * a) int vnet_bind_uri (vnet_bind_args_t * a) { - session_endpoint_t sep = SESSION_ENDPOINT_NULL; + session_endpoint_extended_t sep = SESSION_ENDPOINT_EXT_NULL; int rv; rv = parse_uri (a->uri, &sep); if (rv) return rv; - return vnet_bind_i (a->app_index, &sep, &a->handle); + return vnet_bind_i (a->app_index, (session_endpoint_t *) & sep, &a->handle); } int vnet_unbind_uri (vnet_unbind_args_t * a) { + session_endpoint_extended_t sep = SESSION_ENDPOINT_EXT_NULL; stream_session_t *listener; - session_endpoint_t sep = SESSION_ENDPOINT_NULL; + u32 table_index; int rv; rv = parse_uri (a->uri, &sep); if (rv) return rv; - /* NOTE: only default table supported for uri */ - listener = session_lookup_listener (0, &sep); + /* NOTE: only default fib tables supported for uri apis */ + table_index = session_lookup_get_index_for_fib (fib_ip_proto (!sep.is_ip4), + 0); + listener = session_lookup_listener (table_index, + (session_endpoint_t *) & sep); if (!listener) return VNET_API_ERROR_ADDRESS_NOT_IN_USE; @@ -440,15 +549,16 @@ vnet_unbind_uri (vnet_unbind_args_t * a) clib_error_t * vnet_connect_uri (vnet_connect_args_t * a) { - session_endpoint_t sep_null = SESSION_ENDPOINT_NULL; + session_endpoint_extended_t sep = SESSION_ENDPOINT_EXT_NULL; int rv; /* Parse uri */ - a->sep = sep_null; - rv = parse_uri (a->uri, &a->sep); + rv = parse_uri (a->uri, &sep); if (rv) return clib_error_return_code (0, rv, 0, "app init: %d", rv); - if ((rv = vnet_connect_i (a->app_index, a->api_context, &a->sep, a->mp))) + + if ((rv = application_connect (a->app_index, a->api_context, + (session_endpoint_t *) & sep))) return clib_error_return_code (0, rv, 0, "connect failed"); return 0; } @@ -459,7 +569,18 @@ vnet_disconnect_session (vnet_disconnect_args_t * a) if (session_handle_is_local (a->handle)) { local_session_t *ls; - ls = application_get_local_session_from_handle (a->handle); + + /* Disconnect reply came to worker 1 not main thread */ + if (vlib_get_thread_index () == 1) + { + vlib_rpc_call_main_thread (vnet_disconnect_session, (u8 *) a, + sizeof (*a)); + return 0; + } + + if (!(ls = application_get_local_session_from_handle (a->handle))) + return 0; + if (ls->app_index != a->app_index && ls->client_index != a->app_index) { clib_warning ("app %u is neither client nor server for session %u", @@ -488,7 +609,7 @@ vnet_bind (vnet_bind_args_t * a) { int rv; if ((rv = vnet_bind_i (a->app_index, &a->sep, &a->handle))) - return clib_error_return_code (0, rv, 0, "bind failed"); + return clib_error_return_code (0, rv, 0, "bind failed: %d", rv); return 0; } @@ -497,16 +618,18 @@ vnet_unbind (vnet_unbind_args_t * a) { int rv; if ((rv = vnet_unbind_i (a->app_index, a->handle))) - return clib_error_return_code (0, rv, 0, "unbind failed"); + return clib_error_return_code (0, rv, 0, "unbind failed: %d", rv); return 0; } clib_error_t * vnet_connect (vnet_connect_args_t * a) { + session_endpoint_t *sep = (session_endpoint_t *) & a->sep; int rv; - if ((rv = vnet_connect_i (a->app_index, a->api_context, &a->sep, a->mp))) - return clib_error_return_code (0, rv, 0, "connect failed"); + + if ((rv = application_connect (a->app_index, a->api_context, sep))) + return clib_error_return_code (0, rv, 0, "connect failed: %d", rv); return 0; }