X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.c;h=f2a13be6144f2df1950e796f95c258d26c73ea67;hb=b384b543313b6b47a277c903e9d4fcd4343054fa;hp=4b30bd876a784c1abf2fd8bf8337ee0dabb63f2a;hpb=d79b41e993981df80245b0e6d90eb691bdaae648;p=vpp.git

diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c
index 4b30bd876a7..f2a13be6144 100644
--- a/src/vnet/session/application_interface.c
+++ b/src/vnet/session/application_interface.c
@@ -17,45 +17,37 @@
 #include <vnet/session/session.h>
 #include <vlibmemory/api.h>
 #include <vnet/dpo/load_balance.h>
-#include <vnet/fib/ip4_fib.h>
 
 /** @file
     VPP's application/session API bind/unbind/connect/disconnect calls
 */
 
 static u8
-ip_is_zero (ip46_address_t * ip46_address, u8 is_ip4)
+session_endpoint_is_local (session_endpoint_t * sep)
 {
-  if (is_ip4)
-    return (ip46_address->ip4.as_u32 == 0);
-  else
-    return (ip46_address->as_u64[0] == 0 && ip46_address->as_u64[1] == 0);
+  return (ip_is_zero (&sep->ip, sep->is_ip4)
+	  || ip_is_local_host (&sep->ip, sep->is_ip4));
 }
 
 static u8
-ip_is_local (ip46_address_t * ip46_address, u8 is_ip4)
+session_endpoint_is_zero (session_endpoint_t * sep)
 {
-  fib_node_index_t fei;
-  fib_entry_flag_t flags;
-  fib_prefix_t prefix;
+  return ip_is_zero (&sep->ip, sep->is_ip4);
+}
 
-  /* Check if requester is local */
-  if (is_ip4)
-    {
-      prefix.fp_len = 32;
-      prefix.fp_proto = FIB_PROTOCOL_IP4;
-    }
-  else
+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))
     {
-      prefix.fp_len = 128;
-      prefix.fp_proto = FIB_PROTOCOL_IP6;
+      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;
     }
-
-  clib_memcpy (&prefix.fp_addr, ip46_address, sizeof (ip46_address_t));
-  fei = fib_table_lookup (0, &prefix);
-  flags = fib_entry_get_flags (fei);
-
-  return (flags & FIB_ENTRY_FLAG_LOCAL);
+  return (is_zero || ip_is_local (sep->fib_index, &sep->ip, sep->is_ip4));
 }
 
 int
@@ -78,115 +70,206 @@ api_parse_session_handle (u64 handle, u32 * session_index, u32 * thread_index)
   return 0;
 }
 
-int
-vnet_bind_i (u32 api_client_index, ip46_address_t * ip46, u16 port_host_order,
-	     session_type_t sst, u64 * options, session_cb_vft_t * cb_fns,
-	     application_t ** app, u32 * len_seg_name, char *seg_name)
+static void
+session_endpoint_update_for_app (session_endpoint_t * sep,
+				 application_t * app)
 {
-  u8 *segment_name = 0;
-  application_t *server = 0;
-  stream_session_t *listener;
-  u8 is_ip4;
-
-  listener =
-    stream_session_lookup_listener (ip46,
-				    clib_host_to_net_u16 (port_host_order),
-				    sst);
+  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;
+    }
+}
 
-  if (listener)
-    return VNET_API_ERROR_ADDRESS_IN_USE;
+static int
+vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle)
+{
+  application_t *app;
+  u32 table_index;
+  u64 listener;
+  int rv, have_local = 0;
 
-  if (application_lookup (api_client_index))
+  app = application_get_if_valid (app_index);
+  if (!app)
     {
-      clib_warning ("Only one connection supported for now");
-      return VNET_API_ERROR_ADDRESS_IN_USE;
+      SESSION_DBG ("app not attached");
+      return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
     }
 
-  is_ip4 = SESSION_TYPE_IP4_UDP == sst || SESSION_TYPE_IP4_TCP == sst;
-  if (!ip_is_zero (ip46, is_ip4) && !ip_is_local (ip46, is_ip4))
-    return VNET_API_ERROR_INVALID_VALUE;
+  session_endpoint_update_for_app (sep, app);
+  if (!session_endpoint_in_ns (sep))
+    return VNET_API_ERROR_INVALID_VALUE_2;
 
-  /* Allocate and initialize stream server */
-  server = application_new (APP_SERVER, sst, api_client_index,
-			    options[SESSION_OPTIONS_FLAGS], cb_fns);
+  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)
+    return VNET_API_ERROR_ADDRESS_IN_USE;
 
-  application_server_init (server, options[SESSION_OPTIONS_SEGMENT_SIZE],
-			   options[SESSION_OPTIONS_ADD_SEGMENT_SIZE],
-			   options[SESSION_OPTIONS_RX_FIFO_SIZE],
-			   options[SESSION_OPTIONS_TX_FIFO_SIZE],
-			   &segment_name);
+  /*
+   * 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))
+    {
+      table_index = application_local_session_table (app);
+      listener = session_lookup_endpoint_listener (table_index, sep, 1);
+      if (listener != SESSION_INVALID_HANDLE)
+	return VNET_API_ERROR_ADDRESS_IN_USE;
+      session_lookup_add_session_endpoint (table_index, sep, app->index);
+      *handle = session_lookup_local_listener_make_handle (sep);
+      have_local = 1;
+    }
 
-  /* Setup listen path down to transport */
-  stream_session_start_listen (server->index, ip46, port_host_order);
+  if (!application_has_global_scope (app))
+    return (have_local - 1);
 
   /*
-   * Return values
+   * Add session endpoint to global session table
    */
 
-  ASSERT (vec_len (segment_name) <= 128);
-  *len_seg_name = vec_len (segment_name);
-  memcpy (seg_name, segment_name, *len_seg_name);
-  *app = server;
-
-  return 0;
+  /* Setup listen path down to transport */
+  rv = application_start_listen (app, sep, handle);
+  if (rv && have_local)
+    session_lookup_del_session_endpoint (table_index, sep);
+  return rv;
 }
 
 int
-vnet_unbind_i (u32 api_client_index)
+vnet_unbind_i (u32 app_index, u64 handle)
 {
-  application_t *server;
+  application_t *app = application_get_if_valid (app_index);
+  stream_session_t *listener = 0;
+  u32 table_index;
+
+  if (!app)
+    {
+      SESSION_DBG ("app (%d) not attached", app_index);
+      return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
+    }
 
   /*
-   * Find the stream_server_t corresponding to the api client
+   * Clean up local session table. If we have a listener session use it to
+   * find the port and proto. If not, the handle must be a local table handle
+   * so parse it.
    */
-  server = application_lookup (api_client_index);
-  if (!server)
-    return VNET_API_ERROR_INVALID_VALUE_2;
 
-  /* Clear the listener */
-  stream_session_stop_listen (server->index);
-  application_del (server);
+  if (application_has_local_scope (app))
+    {
+      session_endpoint_t sep = SESSION_ENDPOINT_NULL;
+      if (!session_lookup_local_is_handle (handle))
+	listener = listen_session_get_from_handle (handle);
+      if (listener)
+	{
+	  if (listen_session_get_local_session_endpoint (listener, &sep))
+	    {
+	      clib_warning ("broken listener");
+	      return -1;
+	    }
+	}
+      else
+	{
+	  if (session_lookup_local_listener_parse_handle (handle, &sep))
+	    {
+	      clib_warning ("can't parse handle");
+	      return -1;
+	    }
+	}
+      table_index = application_local_session_table (app);
+      session_lookup_del_session_endpoint (table_index, &sep);
+    }
 
+  /*
+   * Clear the global scope table of the listener
+   */
+  if (application_has_global_scope (app))
+    return application_stop_listen (app, handle);
   return 0;
 }
 
+static int
+app_connect_redirect (application_t * server, void *mp)
+{
+  return server->cb_fns.redirect_connect_callback (server->api_client_index,
+						   mp);
+}
+
 int
-vnet_connect_i (u32 api_client_index, u32 api_context, session_type_t sst,
-		ip46_address_t * ip46, u16 port, u64 * options, void *mp,
-		session_cb_vft_t * cb_fns)
+vnet_connect_i (u32 app_index, u32 api_context, session_endpoint_t * sep,
+		void *mp)
 {
-  stream_session_t *listener;
   application_t *server, *app;
+  u32 table_index, server_index;
+  stream_session_t *listener;
+
+  if (session_endpoint_is_zero (sep))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  app = application_get (app_index);
+  session_endpoint_update_for_app (sep, app);
 
   /*
-   * Figure out if connecting to a local server
+   * First check the 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.
    */
-  listener = stream_session_lookup_listener (ip46,
-					     clib_host_to_net_u16 (port),
-					     sst);
-  if (listener)
+  if (application_has_local_scope (app))
     {
-      server = application_get (listener->app_index);
+      table_index = application_local_session_table (app);
+      server_index = session_lookup_local_endpoint (table_index, sep);
+      if (server_index == APP_DROP_INDEX)
+	return VNET_API_ERROR_APP_CONNECT_FILTERED;
 
       /*
-       * Server is willing to have a direct fifo connection created
-       * instead of going through the state machine, etc.
+       * 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->flags & SESSION_OPTIONS_FLAGS_USE_FIFO)
-	return server->cb_fns.
-	  redirect_connect_callback (server->api_client_index, mp);
+      if (server_index != app_index)
+	{
+	  server = application_get (server_index);
+	  /*
+	   * Server is willing to have a direct fifo connection created
+	   * instead of going through the state machine, etc.
+	   */
+	  if (server && (server->flags & APP_OPTIONS_FLAGS_ACCEPT_REDIRECT))
+	    return app_connect_redirect (server, mp);
+	}
     }
 
-  /* Create client app */
-  app = application_new (APP_CLIENT, sst, api_client_index,
-			 options[SESSION_OPTIONS_FLAGS], cb_fns);
+  /*
+   * If nothing found, check the global scope for locally attached
+   * destinations. Make sure first that we're allowed to.
+   */
+  if (session_endpoint_is_local (sep))
+    return VNET_API_ERROR_SESSION_CONNECT;
 
-  app->api_context = api_context;
+  if (!application_has_global_scope (app))
+    return VNET_API_ERROR_APP_CONNECT_SCOPE;
+
+  table_index = application_session_table (app,
+					   session_endpoint_fib_proto (sep));
+  listener = session_lookup_listener (table_index, sep);
+  if (listener)
+    {
+      server = application_get (listener->app_index);
+      if (server && (server->flags & APP_OPTIONS_FLAGS_ACCEPT_REDIRECT))
+	return app_connect_redirect (server, mp);
+    }
 
   /*
-   * Not connecting to a local server. Create regular session
+   * Not connecting to a local server, propagate to transport
    */
-  return stream_session_open (sst, ip46, port, app->index);
+  if (application_open_session (app, sep, api_context))
+    return VNET_API_ERROR_SESSION_CONNECT;
+  return 0;
 }
 
 /**
@@ -209,241 +292,274 @@ vnet_connect_i (u32 api_client_index, u32 api_context, session_type_t sst,
 uword
 unformat_vnet_uri (unformat_input_t * input, va_list * args)
 {
-  ip46_address_t *address = va_arg (*args, ip46_address_t *);
-  session_type_t *sst = va_arg (*args, session_type_t *);
-  u16 *port = va_arg (*args, u16 *);
+  session_endpoint_t *sep = va_arg (*args, session_endpoint_t *);
 
-  if (unformat (input, "tcp://%U/%d", unformat_ip4_address, &address->ip4,
-		port))
+  if (unformat (input, "tcp://%U/%d", unformat_ip4_address, &sep->ip.ip4,
+		&sep->port))
     {
-      *sst = SESSION_TYPE_IP4_TCP;
+      sep->transport_proto = TRANSPORT_PROTO_TCP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 1;
       return 1;
     }
-  if (unformat (input, "udp://%U/%d", unformat_ip4_address, &address->ip4,
-		port))
+  if (unformat (input, "udp://%U/%d", unformat_ip4_address, &sep->ip.ip4,
+		&sep->port))
     {
-      *sst = SESSION_TYPE_IP4_UDP;
+      sep->transport_proto = TRANSPORT_PROTO_UDP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 1;
       return 1;
     }
-  if (unformat (input, "udp://%U/%d", unformat_ip6_address, &address->ip6,
-		port))
+  if (unformat (input, "udp://%U/%d", unformat_ip6_address, &sep->ip.ip6,
+		&sep->port))
     {
-      *sst = SESSION_TYPE_IP6_UDP;
+      sep->transport_proto = TRANSPORT_PROTO_UDP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 0;
       return 1;
     }
-  if (unformat (input, "tcp://%U/%d", unformat_ip6_address, &address->ip6,
-		port))
+  if (unformat (input, "tcp://%U/%d", unformat_ip6_address, &sep->ip.ip6,
+		&sep->port))
     {
-      *sst = SESSION_TYPE_IP6_TCP;
+      sep->transport_proto = TRANSPORT_PROTO_TCP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 0;
+      return 1;
+    }
+  if (unformat (input, "sctp://%U/%d", unformat_ip4_address, &sep->ip.ip4,
+		&sep->port))
+    {
+      sep->transport_proto = TRANSPORT_PROTO_SCTP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 1;
+      return 1;
+    }
+  if (unformat (input, "sctp://%U/%d", unformat_ip6_address, &sep->ip.ip6,
+		&sep->port))
+    {
+      sep->transport_proto = TRANSPORT_PROTO_SCTP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 0;
       return 1;
     }
-
   return 0;
 }
 
+static u8 *cache_uri;
+static session_endpoint_t *cache_sep;
+
 int
-parse_uri (char *uri, session_type_t * sst, ip46_address_t * addr,
-	   u16 * port_number_host_byte_order)
+parse_uri (char *uri, session_endpoint_t * sep)
 {
   unformat_input_t _input, *input = &_input;
 
+  if (cache_uri && !strncmp (uri, (char *) cache_uri, vec_len (cache_uri)))
+    {
+      *sep = *cache_sep;
+      return 0;
+    }
+
   /* Make sure */
   uri = (char *) format (0, "%s%c", uri, 0);
 
   /* Parse uri */
   unformat_init_string (input, uri, strlen (uri));
-  if (!unformat (input, "%U", unformat_vnet_uri, addr, sst,
-		 port_number_host_byte_order))
+  if (!unformat (input, "%U", unformat_vnet_uri, sep))
     {
       unformat_free (input);
       return VNET_API_ERROR_INVALID_VALUE;
     }
   unformat_free (input);
 
+  vec_free (cache_uri);
+  cache_uri = (u8 *) uri;
+  if (cache_sep)
+    clib_mem_free (cache_sep);
+  cache_sep = clib_mem_alloc (sizeof (*sep));
+  *cache_sep = *sep;
+
   return 0;
 }
 
-int
-vnet_bind_uri (vnet_bind_args_t * a)
+static int
+session_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index)
 {
-  application_t *server = 0;
-  u16 port_host_order;
-  session_type_t sst = SESSION_N_TYPES;
-  ip46_address_t ip46;
-  int rv;
+  app_namespace_t *app_ns;
+  if (vec_len (namespace_id) == 0)
+    {
+      /* Use default namespace */
+      *app_ns_index = 0;
+      return 0;
+    }
 
-  memset (&ip46, 0, sizeof (ip46));
-  rv = parse_uri (a->uri, &sst, &ip46, &port_host_order);
-  if (rv)
-    return rv;
+  *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;
+}
 
-  if ((rv = vnet_bind_i (a->api_client_index, &ip46, port_host_order, sst,
-			 a->options, a->session_cb_vft, &server,
-			 &a->segment_name_length, a->segment_name)))
-    return rv;
+/**
+ * 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 (sm->segment_indices[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;
 
-  a->server_event_queue_address = (u64) server->event_queue;
   return 0;
 }
 
-session_type_t
-session_type_from_proto_and_ip (session_api_proto_t proto, u8 is_ip4)
+/**
+ * Detach application from vpp
+ */
+int
+vnet_application_detach (vnet_app_detach_args_t * a)
 {
-  if (proto == SESSION_PROTO_TCP)
-    {
-      if (is_ip4)
-	return SESSION_TYPE_IP4_TCP;
-      else
-	return SESSION_TYPE_IP6_TCP;
-    }
-  else
+  application_t *app;
+  app = application_get_if_valid (a->app_index);
+
+  if (!app)
     {
-      if (is_ip4)
-	return SESSION_TYPE_IP4_UDP;
-      else
-	return SESSION_TYPE_IP6_UDP;
+      clib_warning ("app not attached");
+      return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
     }
 
-  return SESSION_N_TYPES;
+  application_del (app);
+  return 0;
+}
+
+int
+vnet_bind_uri (vnet_bind_args_t * a)
+{
+  session_endpoint_t sep = SESSION_ENDPOINT_NULL;
+  int rv;
+
+  rv = parse_uri (a->uri, &sep);
+  if (rv)
+    return rv;
+
+  return vnet_bind_i (a->app_index, &sep, &a->handle);
 }
 
 int
-vnet_unbind_uri (char *uri, u32 api_client_index)
+vnet_unbind_uri (vnet_unbind_args_t * a)
 {
-  u16 port_number_host_byte_order;
-  session_type_t sst = SESSION_N_TYPES;
-  ip46_address_t ip46_address;
   stream_session_t *listener;
+  session_endpoint_t sep = SESSION_ENDPOINT_NULL;
   int rv;
 
-  rv = parse_uri (uri, &sst, &ip46_address, &port_number_host_byte_order);
+  rv = parse_uri (a->uri, &sep);
   if (rv)
     return rv;
 
-  listener =
-    stream_session_lookup_listener (&ip46_address,
-				    clib_host_to_net_u16
-				    (port_number_host_byte_order), sst);
-
+  /* NOTE: only default table supported for uri */
+  listener = session_lookup_listener (0, &sep);
   if (!listener)
     return VNET_API_ERROR_ADDRESS_NOT_IN_USE;
 
-  /* External client? */
-  if (api_client_index != ~0)
-    {
-      ASSERT (vl_api_client_index_to_registration (api_client_index));
-    }
-
-  return vnet_unbind_i (api_client_index);
+  return vnet_unbind_i (a->app_index, listen_session_get_handle (listener));
 }
 
-int
+clib_error_t *
 vnet_connect_uri (vnet_connect_args_t * a)
 {
-  ip46_address_t ip46_address;
-  u16 port;
-  session_type_t sst;
-  application_t *app;
+  session_endpoint_t sep_null = SESSION_ENDPOINT_NULL;
   int rv;
 
-  app = application_lookup (a->api_client_index);
-  if (app)
-    {
-      clib_warning ("Already have a connect from this app");
-      return VNET_API_ERROR_INVALID_VALUE_2;
-    }
-
   /* Parse uri */
-  rv = parse_uri (a->uri, &sst, &ip46_address, &port);
+  a->sep = sep_null;
+  rv = parse_uri (a->uri, &a->sep);
   if (rv)
-    return rv;
-
-  return vnet_connect_i (a->api_client_index, a->api_context, sst,
-			 &ip46_address, port, a->options, a->mp,
-			 a->session_cb_vft);
+    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)))
+    return clib_error_return_code (0, rv, 0, "connect failed");
+  return 0;
 }
 
 int
-vnet_disconnect_session (u32 session_index, u32 thread_index)
+vnet_disconnect_session (vnet_disconnect_args_t * a)
 {
-  stream_session_t *session;
+  u32 index, thread_index;
+  stream_session_t *s;
+
+  session_parse_handle (a->handle, &index, &thread_index);
+  s = session_get_if_valid (index, thread_index);
 
-  session = stream_session_get (session_index, thread_index);
-  stream_session_disconnect (session);
+  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 == index);
 
+  session_send_session_evt_to_thread (a->handle, FIFO_EVENT_DISCONNECT,
+				      thread_index);
   return 0;
 }
 
-
-int
+clib_error_t *
 vnet_bind (vnet_bind_args_t * a)
 {
-  application_t *server = 0;
-  session_type_t sst = SESSION_N_TYPES;
   int rv;
-
-  sst = session_type_from_proto_and_ip (a->proto, a->tep.is_ip4);
-  if ((rv = vnet_bind_i (a->api_client_index, &a->tep.ip, a->tep.port, sst,
-			 a->options, a->session_cb_vft, &server,
-			 &a->segment_name_length, a->segment_name)))
-    return rv;
-
-  a->server_event_queue_address = (u64) server->event_queue;
-  a->handle = (u64) a->tep.vrf << 32 | (u64) server->session_index;
+  if ((rv = vnet_bind_i (a->app_index, &a->sep, &a->handle)))
+    return clib_error_return_code (0, rv, 0, "bind failed");
   return 0;
 }
 
-int
+clib_error_t *
 vnet_unbind (vnet_unbind_args_t * a)
 {
-  application_t *server;
-
-  if (a->api_client_index != ~0)
-    {
-      ASSERT (vl_api_client_index_to_registration (a->api_client_index));
-    }
-
-  /* Make sure this is the right one */
-  server = application_lookup (a->api_client_index);
-  ASSERT (server->session_index == (0xFFFFFFFF & a->handle));
-
-  /* TODO use handle to disambiguate namespaces/vrfs */
-  return vnet_unbind_i (a->api_client_index);
+  int rv;
+  if ((rv = vnet_unbind_i (a->app_index, a->handle)))
+    return clib_error_return_code (0, rv, 0, "unbind failed");
+  return 0;
 }
 
-int
+clib_error_t *
 vnet_connect (vnet_connect_args_t * a)
 {
-  session_type_t sst;
-  application_t *app;
-
-  app = application_lookup (a->api_client_index);
-  if (app)
-    {
-      clib_warning ("Already have a connect from this app");
-      return VNET_API_ERROR_INVALID_VALUE_2;
-    }
-
-  sst = session_type_from_proto_and_ip (a->proto, a->tep.is_ip4);
-  return vnet_connect_i (a->api_client_index, a->api_context, sst, &a->tep.ip,
-			 a->tep.port, a->options, a->mp, a->session_cb_vft);
-}
-
-int
-vnet_disconnect (vnet_disconnect_args_t * a)
-{
-  stream_session_t *session;
-  u32 session_index, thread_index;
-
-  if (api_parse_session_handle (a->handle, &session_index, &thread_index))
-    {
-      clib_warning ("Invalid handle");
-      return -1;
-    }
-
-  session = stream_session_get (session_index, thread_index);
-  stream_session_disconnect (session);
-
+  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");
   return 0;
 }