X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.c;h=a6d1a029f1336a5b4bcc814f6415926ba7807a82;hb=8ac1d6d05;hp=12a5701fdf35375cfbe7671368be5cb32443a0e2;hpb=371ca50a74a9c4f1b74c4c1b65c6fdec610fcfc3;p=vpp.git

diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c
index 12a5701fdf3..a6d1a029f13 100644
--- a/src/vnet/session/application_interface.c
+++ b/src/vnet/session/application_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2016-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -13,310 +13,19 @@
  * limitations under the License.
  */
 #include <vnet/session/application_interface.h>
-
+#include <vnet/session/application.h>
 #include <vnet/session/session.h>
-#include <vlibmemory/api.h>
-#include <vnet/dpo/load_balance.h>
 
 /** @file
     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"
-  "MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n"
-  "MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n"
-  "MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n"
-  "A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n"
-  "AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n"
-  "owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n"
-  "NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n"
-  "tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n"
-  "hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n"
-  "HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n"
-  "VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n"
-  "FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQEFBQADggEBAJxnXClY\r\n"
-  "oHkbp70cqBrsGXLybA74czbO5RdLEgFs7rHVS9r+c293luS/KdliLScZqAzYVylw\r\n"
-  "UfRWvKMoWhHYKp3dEIS4xTXk6/5zXxhv9Rw8SGc8qn6vITHk1S1mPevtekgasY5Y\r\n"
-  "iWQuM3h4YVlRH3HHEMAD1TnAexfXHHDFQGe+Bd1iAbz1/sH9H8l4StwX6egvTK3M\r\n"
-  "wXRwkKkvjKaEDA9ATbZx0mI8LGsxSuCqe9r9dyjmttd47J1p1Rulz3CLzaRcVIuS\r\n"
-  "RRQfaD8neM9c1S/iJ/amTVqJxA1KOdOS5780WhPfSArA+g4qAmSjelc3p4wWpha8\r\n"
-  "zhuYwjVuX6JHG0c=\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 RSA PRIVATE KEY-----\r\n"
-  "MIIEpAIBAAKCAQEAwU2j3efNHdEE10lyuJmsDnjkOjxKzzoTFtBa5M2jAIin7h5r\r\n"
-  "lqdStJDvLXJ6PiSa/LY0rCT1d+AmZIycsCh9odrqjObJHJa8/sEEUrM21KP64bF2\r\n"
-  "2JDBYbRmUjaiJlOqq3ReB30Zgtsq2B+g2Q0cLUlm91slc0boC4pPaQy1AJDh2oIQ\r\n"
-  "Zn2uVCuLZXmRoeJhw81ASQjuaAzxi4bSRr/QuKoRAx5/VqgaHkQYDw+Fi9qLRF7i\r\n"
-  "GMZiL8dmjfpd2H3zJ4kpAcWQDj8n8TDISg7v1t7HxydrxwU9esQCPJodPg/oNJhb\r\n"
-  "y3NLUpbYEaIsgIhpOVrTD7DeWS8Rx/fqEgEwlwIDAQABAoIBAQCXR0S8EIHFGORZ\r\n"
-  "++AtOg6eENxD+xVs0f1IeGz57Tjo3QnXX7VBZNdj+p1ECvhCE/G7XnkgU5hLZX+G\r\n"
-  "Z0jkz/tqJOI0vRSdLBbipHnWouyBQ4e/A1yIJdlBtqXxJ1KE/ituHRbNc4j4kL8Z\r\n"
-  "/r6pvwnTI0PSx2Eqs048YdS92LT6qAv4flbNDxMn2uY7s4ycS4Q8w1JXnCeaAnYm\r\n"
-  "WYI5wxO+bvRELR2Mcz5DmVnL8jRyml6l6582bSv5oufReFIbyPZbQWlXgYnpu6He\r\n"
-  "GTc7E1zKYQGG/9+DQUl/1vQuCPqQwny0tQoX2w5tdYpdMdVm+zkLtbajzdTviJJa\r\n"
-  "TWzL6lt5AoGBAN86+SVeJDcmQJcv4Eq6UhtRr4QGMiQMz0Sod6ettYxYzMgxtw28\r\n"
-  "CIrgpozCc+UaZJLo7UxvC6an85r1b2nKPCLQFaggJ0H4Q0J/sZOhBIXaoBzWxveK\r\n"
-  "nupceKdVxGsFi8CDy86DBfiyFivfBj+47BbaQzPBj7C4rK7UlLjab2rDAoGBAN2u\r\n"
-  "AM2gchoFiu4v1HFL8D7lweEpi6ZnMJjnEu/dEgGQJFjwdpLnPbsj4c75odQ4Gz8g\r\n"
-  "sw9lao9VVzbusoRE/JGI4aTdO0pATXyG7eG1Qu+5Yc1YGXcCrliA2xM9xx+d7f+s\r\n"
-  "mPzN+WIEg5GJDYZDjAzHG5BNvi/FfM1C9dOtjv2dAoGAF0t5KmwbjWHBhcVqO4Ic\r\n"
-  "BVvN3BIlc1ue2YRXEDlxY5b0r8N4XceMgKmW18OHApZxfl8uPDauWZLXOgl4uepv\r\n"
-  "whZC3EuWrSyyICNhLY21Ah7hbIEBPF3L3ZsOwC+UErL+dXWLdB56Jgy3gZaBeW7b\r\n"
-  "vDrEnocJbqCm7IukhXHOBK8CgYEAwqdHB0hqyNSzIOGY7v9abzB6pUdA3BZiQvEs\r\n"
-  "3LjHVd4HPJ2x0N8CgrBIWOE0q8+0hSMmeE96WW/7jD3fPWwCR5zlXknxBQsfv0gP\r\n"
-  "3BC5PR0Qdypz+d+9zfMf625kyit4T/hzwhDveZUzHnk1Cf+IG7Q+TOEnLnWAWBED\r\n"
-  "ISOWmrUCgYAFEmRxgwAc/u+D6t0syCwAYh6POtscq9Y0i9GyWk89NzgC4NdwwbBH\r\n"
-  "4AgahOxIxXx2gxJnq3yfkJfIjwf0s2DyP0kY2y6Ua1OeomPeY9mrIS4tCuDQ6LrE\r\n"
-  "TB6l9VGoxJL4fyHnZb8L5gGvnB1bbD8cL6YPaDiOhcRseC9vBiEuVg==\r\n"
-  "-----END RSA 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)
-{
-  return (ip_is_zero (&sep->ip, sep->is_ip4)
-	  || ip_is_local_host (&sep->ip, sep->is_ip4));
-}
-
-static u8
-session_endpoint_is_zero (session_endpoint_t * sep)
-{
-  return ip_is_zero (&sep->ip, sep->is_ip4);
-}
-
-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
-      && !ip_interface_has_address (sep->sw_if_index, &sep->ip, sep->is_ip4))
-    {
-      clib_warning ("sw_if_index %u not configured with ip %U",
-		    sep->sw_if_index, format_ip46_address, &sep->ip,
-		    sep->is_ip4);
-      return 0;
-    }
-  return (is_zero || ip_is_local (sep->fib_index, &sep->ip, sep->is_ip4));
-}
-
-int
-api_parse_session_handle (u64 handle, u32 * session_index, u32 * thread_index)
-{
-  session_manager_main_t *smm = vnet_get_session_manager_main ();
-  stream_session_t *pool;
-
-  *thread_index = handle & 0xFFFFFFFF;
-  *session_index = handle >> 32;
-
-  if (*thread_index >= vec_len (smm->sessions))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  pool = smm->sessions[*thread_index];
-
-  if (pool_is_free_index (pool, *session_index))
-    return VNET_API_ERROR_INVALID_VALUE_2;
-
-  return 0;
-}
-
-static void
-session_endpoint_update_for_app (session_endpoint_t * sep,
-				 application_t * app)
-{
-  app_namespace_t *app_ns;
-  app_ns = app_namespace_get (app->ns_index);
-  if (app_ns)
-    {
-      /* Ask transport and network to bind to/connect using local interface
-       * that "supports" app's namespace. This will fix our local connection
-       * endpoint.
-       */
-      sep->sw_if_index = app_ns->sw_if_index;
-      sep->fib_index =
-	sep->is_ip4 ? app_ns->ip4_fib_index : app_ns->ip6_fib_index;
-    }
-}
-
-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;
-  int rv;
-
-  app = application_get_if_valid (app_index);
-  if (!app)
-    {
-      SESSION_DBG ("app not attached");
-      return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
-    }
-
-  session_endpoint_update_for_app (sep, app);
-  if (!session_endpoint_in_ns (sep))
-    return VNET_API_ERROR_INVALID_VALUE_2;
-
-  table_index = application_session_table (app,
-					   session_endpoint_fib_proto (sep));
-  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 ((rv = application_start_local_listen (app, sep, handle)))
-	return rv;
-      ll_handle = *handle;
-    }
-
-  if (!application_has_global_scope (app))
-    return (ll_handle == SESSION_INVALID_HANDLE ? -1 : 0);
-
-  /*
-   * Add session endpoint to global session table
-   */
-
-  /* Setup listen path down to transport */
-  rv = application_start_listen (app, sep, handle);
-  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;
-}
-
-int
-vnet_unbind_i (u32 app_index, session_handle_t handle)
-{
-  application_t *app;
-  int rv;
-
-  if (!(app = application_get_if_valid (app_index)))
-    {
-      SESSION_DBG ("app (%d) not attached", app_index);
-      return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
-    }
-
-  if (application_has_local_scope (app))
-    {
-      if ((rv = application_stop_local_listen (app, handle)))
-	return rv;
-    }
-
-  /*
-   * Clear the global scope table of the listener
-   */
-  if (application_has_global_scope (app))
-    return application_stop_listen (app, handle);
-  return 0;
-}
-
-int
-application_connect (u32 client_index, u32 api_context,
-		     session_endpoint_t * sep)
-{
-  application_t *server, *client;
-  u32 table_index, server_index, li;
-  stream_session_t *listener;
-  local_session_t *ll;
-  u64 lh;
-
-  if (session_endpoint_is_zero (sep))
-    return VNET_API_ERROR_INVALID_VALUE;
-
-  client = application_get (client_index);
-  session_endpoint_update_for_app (sep, client);
-
-  /*
-   * First check the local scope for locally attached destinations.
-   * If we have local scope, we pass *all* connects through it since we may
-   * have special policy rules even for non-local destinations, think proxy.
-   */
-  if (application_has_local_scope (client))
-    {
-      table_index = application_local_session_table (client);
-      lh = session_lookup_local_endpoint (table_index, 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);
-
-      /*
-       * Break loop if rule in local table points to connecting app. This
-       * can happen if client is a generic proxy. Route connect through
-       * global table instead.
-       */
-      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);
-	}
-    }
-
-  /*
-   * 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;
-
-  if (!application_has_global_scope (client))
-    return VNET_API_ERROR_APP_CONNECT_SCOPE;
-
-  table_index = application_session_table (client,
-					   session_endpoint_fib_proto (sep));
-  listener = session_lookup_listener (table_index, sep);
-  if (listener)
-    {
-      server = application_get (listener->app_index);
-      if (server)
-	return application_local_session_connect (table_index, client, server,
-						  (local_session_t *)
-						  listener, api_context);
-    }
-
-  /*
-   * Not connecting to a local server, propagate to transport
-   */
-  if (application_open_session (client, sep, api_context))
-    return VNET_API_ERROR_SESSION_CONNECT;
-  return 0;
-}
-
 /**
  * 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;
@@ -331,12 +40,20 @@ global_scope:
 uword
 unformat_vnet_uri (unformat_input_t * input, va_list * args)
 {
-  session_endpoint_t *sep = va_arg (*args, session_endpoint_t *);
+  session_endpoint_cfg_t *sep = va_arg (*args, session_endpoint_cfg_t *);
   u32 transport_proto = 0, port;
 
-  if (unformat
-      (input, "%U://%U/%d", unformat_transport_proto, &transport_proto,
-       unformat_ip4_address, &sep->ip.ip4, &port))
+  if (unformat (input, "%U://%U/%d", unformat_transport_proto,
+		&transport_proto, 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://[%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);
@@ -352,14 +69,30 @@ unformat_vnet_uri (unformat_input_t * input, va_list * args)
       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;
+    }
+  else if (unformat (input, "%U://session/%lu", unformat_transport_proto,
+		     &transport_proto, &sep->parent_handle))
+    {
+      sep->transport_proto = transport_proto;
+      sep->ip.ip4.as_u32 = 1;	/* ip need to be non zero in vnet */
+      return 1;
+    }
   return 0;
 }
 
 static u8 *cache_uri;
-static session_endpoint_t *cache_sep;
+static session_endpoint_cfg_t *cache_sep;
 
 int
-parse_uri (char *uri, session_endpoint_t * sep)
+parse_uri (char *uri, session_endpoint_cfg_t * sep)
 {
   unformat_input_t _input, *input = &_input;
 
@@ -391,199 +124,57 @@ parse_uri (char *uri, session_endpoint_t * sep)
   return 0;
 }
 
-static int
-session_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index)
-{
-  app_namespace_t *app_ns;
-  if (vec_len (namespace_id) == 0)
-    {
-      /* Use default namespace */
-      *app_ns_index = 0;
-      return 0;
-    }
-
-  *app_ns_index = app_namespace_index_from_id (namespace_id);
-  if (*app_ns_index == APP_NAMESPACE_INVALID_INDEX)
-    return VNET_API_ERROR_APP_INVALID_NS;
-  app_ns = app_namespace_get (*app_ns_index);
-  if (!app_ns)
-    return VNET_API_ERROR_APP_INVALID_NS;
-  if (app_ns->ns_secret != secret)
-    return VNET_API_ERROR_APP_WRONG_NS_SECRET;
-  return 0;
-}
-
-/**
- * Attach application to vpp
- *
- * Allocates a vpp app, i.e., a structure that keeps back pointers
- * to external app and a segment manager for shared memory fifo based
- * communication with the external app.
- */
-clib_error_t *
-vnet_application_attach (vnet_app_attach_args_t * a)
-{
-  svm_fifo_segment_private_t *fs;
-  application_t *app = 0;
-  segment_manager_t *sm;
-  u32 app_ns_index = 0;
-  u64 secret;
-  int rv;
-
-  app = application_lookup (a->api_client_index);
-  if (app)
-    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,
-					&app_ns_index)))
-    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,
-			      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);
-  sm = segment_manager_get (app->first_segment_manager);
-  fs = segment_manager_get_segment_w_lock (sm, 0);
-
-  if (application_is_proxy (app))
-    application_setup_proxy (app);
-
-  ASSERT (vec_len (fs->ssvm.name) <= 128);
-  a->segment = &fs->ssvm;
-  a->app_index = app->index;
-
-  segment_manager_segment_reader_unlock (sm);
-
-  return 0;
-}
-
-/**
- * Detach application from vpp
- */
 int
-vnet_application_detach (vnet_app_detach_args_t * a)
+vnet_bind_uri (vnet_listen_args_t * a)
 {
-  application_t *app;
-  app = application_get_if_valid (a->app_index);
-
-  if (!app)
-    {
-      clib_warning ("app not attached");
-      return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
-    }
-
-  application_del (app);
-  return 0;
-}
-
-int
-vnet_bind_uri (vnet_bind_args_t * a)
-{
-  session_endpoint_t sep = SESSION_ENDPOINT_NULL;
+  session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
   int rv;
 
   rv = parse_uri (a->uri, &sep);
   if (rv)
     return rv;
-
-  return vnet_bind_i (a->app_index, &sep, &a->handle);
+  sep.app_wrk_index = 0;
+  clib_memcpy (&a->sep_ext, &sep, sizeof (sep));
+  return vnet_listen (a);
 }
 
 int
-vnet_unbind_uri (vnet_unbind_args_t * a)
+vnet_unbind_uri (vnet_unlisten_args_t * a)
 {
-  session_endpoint_t sep = SESSION_ENDPOINT_NULL;
-  stream_session_t *listener;
+  session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
+  application_t *app;
+  session_t *listener;
+  u32 table_index;
   int rv;
 
-  rv = parse_uri (a->uri, &sep);
-  if (rv)
+  if ((rv = parse_uri (a->uri, &sep)))
     return rv;
 
-  /* NOTE: only default table supported for uri */
-  listener = session_lookup_listener (0, &sep);
+  app = application_get (a->app_index);
+  if (!app)
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  table_index = application_session_table (app, fib_ip_proto (!sep.is_ip4));
+  listener = session_lookup_listener (table_index,
+				      (session_endpoint_t *) & sep);
   if (!listener)
     return VNET_API_ERROR_ADDRESS_NOT_IN_USE;
-
-  return vnet_unbind_i (a->app_index, listen_session_get_handle (listener));
-}
-
-clib_error_t *
-vnet_connect_uri (vnet_connect_args_t * a)
-{
-  session_endpoint_t sep = SESSION_ENDPOINT_NULL;
-  int rv;
-
-  /* Parse uri */
-  rv = parse_uri (a->uri, &sep);
-  if (rv)
-    return clib_error_return_code (0, rv, 0, "app init: %d", rv);
-
-  if ((rv = application_connect (a->app_index, a->api_context, &sep)))
-    return clib_error_return_code (0, rv, 0, "connect failed");
-  return 0;
+  a->handle = listen_session_get_handle (listener);
+  return vnet_unlisten (a);
 }
 
 int
-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);
-      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",
-			a->app_index, a->app_index);
-	  return VNET_API_ERROR_INVALID_VALUE;
-	}
-      return application_local_session_disconnect (a->app_index, ls);
-    }
-  else
-    {
-      stream_session_t *s;
-      s = session_get_from_handle_if_valid (a->handle);
-      if (!s || s->app_index != a->app_index)
-	return VNET_API_ERROR_INVALID_VALUE;
-
-      /* We're peeking into another's thread pool. Make sure */
-      ASSERT (s->session_index == session_index_from_handle (a->handle));
-
-      stream_session_disconnect (s);
-    }
-  return 0;
-}
-
-clib_error_t *
-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 0;
-}
-
-clib_error_t *
-vnet_unbind (vnet_unbind_args_t * a)
+vnet_connect_uri (vnet_connect_args_t * a)
 {
+  session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
   int rv;
-  if ((rv = vnet_unbind_i (a->app_index, a->handle)))
-    return clib_error_return_code (0, rv, 0, "unbind failed");
-  return 0;
-}
 
-clib_error_t *
-vnet_connect (vnet_connect_args_t * a)
-{
-  session_endpoint_t *sep = &a->sep;
-  int rv;
+  if ((rv = parse_uri (a->uri, &sep)))
+    return rv;
 
-  if ((rv = application_connect (a->app_index, a->api_context, sep)))
-    return clib_error_return_code (0, rv, 0, "connect failed");
+  clib_memcpy (&a->sep_ext, &sep, sizeof (sep));
+  if ((rv = vnet_connect (a)))
+    return rv;
   return 0;
 }