typedef struct
{
- char uri[128];
+ session_endpoint_cfg_t sep;
u32 app_index;
u32 api_context;
} proxy_connect_args_t;
proxy_connect_args_t *pa = (proxy_connect_args_t *) data;
vnet_connect_args_t a;
- memset (&a, 0, sizeof (a));
+ clib_memset (&a, 0, sizeof (a));
a.api_context = pa->api_context;
a.app_index = pa->app_index;
- a.uri = pa->uri;
- vnet_connect_uri (&a);
+ clib_memcpy (&a.sep_ext, &pa->sep, sizeof (pa->sep));
+ vnet_connect (&a);
+ if (a.sep_ext.ext_cfg)
+ clib_mem_free (a.sep_ext.ext_cfg);
}
static void
{
if (vlib_get_thread_index () == 0)
{
- vnet_connect_uri (a);
+ vnet_connect (a);
+ if (a->sep_ext.ext_cfg)
+ clib_mem_free (a->sep_ext.ext_cfg);
}
else
{
proxy_connect_args_t args;
args.api_context = a->api_context;
args.app_index = a->app_index;
- clib_memcpy (args.uri, a->uri, vec_len (a->uri));
+ clib_memcpy (&args.sep, &a->sep_ext, sizeof (a->sep_ext));
vl_api_rpc_call_main_thread (proxy_cb_fn, (u8 *) & args, sizeof (args));
}
}
static int
proxy_add_segment_callback (u32 client_index, u64 segment_handle)
{
- clib_warning ("called...");
- return -1;
+ return 0;
+}
+
+static int
+proxy_transport_needs_crypto (transport_proto_t proto)
+{
+ return proto == TRANSPORT_PROTO_TLS;
}
static int
if (svm_fifo_set_event (ao_tx_fifo))
{
u32 ao_thread_index = ao_tx_fifo->master_thread_index;
- u32 ao_session_index = ao_tx_fifo->master_session_index;
+ u32 ao_session_index = ao_tx_fifo->shr->master_session_index;
if (session_send_io_evt_to_thread_custom (&ao_session_index,
ao_thread_index,
SESSION_IO_EVT_TX))
clib_spinlock_unlock_if_init (&pm->sessions_lock);
- a->uri = (char *) pm->client_uri;
+ clib_memcpy (&a->sep_ext, &pm->client_sep, sizeof (pm->client_sep));
a->api_context = proxy_index;
a->app_index = pm->active_open_app_index;
+
+ if (proxy_transport_needs_crypto (a->sep.transport_proto))
+ {
+ session_endpoint_alloc_ext_cfg (&a->sep_ext,
+ TRANSPORT_ENDPT_EXT_CFG_CRYPTO);
+ a->sep_ext.ext_cfg->crypto.ckpair_index = pm->ckpair_index;
+ }
+
proxy_call_main_thread (a);
}
session_t *ao_s;
ao_s = session_get_from_handle (pointer_to_uword (handlep));
+ if (session_get_transport_proto (ao_s) != TRANSPORT_PROTO_TCP)
+ return;
tc = session_get_transport (ao_s);
tcp_send_ack ((tcp_connection_t *) tc);
}
proxy_session_t *ps;
u8 thread_index = vlib_get_thread_index ();
- if (err)
- {
- clib_warning ("connection %d failed!", opaque);
- ASSERT (0);
- return 0;
- }
-
/*
* Setup proxy session handle.
*/
clib_spinlock_lock_if_init (&pm->sessions_lock);
ps = pool_elt_at_index (pm->sessions, opaque);
- ps->vpp_active_open_handle = session_handle (s);
- ps->active_open_establishing = 0;
+
+ /* Connection failed */
+ if (err)
+ {
+ vnet_disconnect_args_t _a, *a = &_a;
+
+ a->handle = ps->vpp_server_handle;
+ a->app_index = pm->server_app_index;
+ vnet_disconnect_session (a);
+ ps->po_disconnected = 1;
+ }
+ else
+ {
+ ps->vpp_active_open_handle = session_handle (s);
+ ps->active_open_establishing = 0;
+ }
/* Passive open session was already closed! */
if (ps->po_disconnected)
* Reset the active-open tx-fifo master indices so the active-open session
* will receive data, etc.
*/
- s->tx_fifo->master_session_index = s->session_index;
+ s->tx_fifo->shr->master_session_index = s->session_index;
s->tx_fifo->master_thread_index = s->thread_index;
/*
s->tx_fifo->refcnt++;
s->rx_fifo->refcnt++;
- svm_fifo_init_ooo_lookup (s->tx_fifo, 1 /* deq ooo */ );
- svm_fifo_init_ooo_lookup (s->rx_fifo, 0 /* enq ooo */ );
-
hash_set (pm->proxy_session_by_active_open_handle,
ps->vpp_active_open_handle, opaque);
if (svm_fifo_set_event (proxy_tx_fifo))
{
u8 thread_index = proxy_tx_fifo->master_thread_index;
- u32 session_index = proxy_tx_fifo->master_session_index;
+ u32 session_index = proxy_tx_fifo->shr->master_session_index;
return session_send_io_evt_to_thread_custom (&session_index,
thread_index,
SESSION_IO_EVT_TX);
a->session_cb_vft = &proxy_session_cb_vft;
a->options = options;
a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size;
+ a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = segment_size;
a->options[APP_OPTIONS_RX_FIFO_SIZE] = pm->fifo_size;
a->options[APP_OPTIONS_TX_FIFO_SIZE] = pm->fifo_size;
a->options[APP_OPTIONS_MAX_FIFO_SIZE] = pm->max_fifo_size;
{
proxy_main_t *pm = &proxy_main;
vnet_listen_args_t _a, *a = &_a;
+ int rv;
+
clib_memset (a, 0, sizeof (*a));
+
a->app_index = pm->server_app_index;
- a->uri = (char *) pm->server_uri;
- return vnet_bind_uri (a);
+ clib_memcpy (&a->sep_ext, &pm->server_sep, sizeof (pm->server_sep));
+ if (proxy_transport_needs_crypto (a->sep.transport_proto))
+ {
+ session_endpoint_alloc_ext_cfg (&a->sep_ext,
+ TRANSPORT_ENDPT_EXT_CFG_CRYPTO);
+ a->sep_ext.ext_cfg->crypto.ckpair_index = pm->ckpair_index;
+ }
+
+ rv = vnet_listen (a);
+ if (a->sep_ext.ext_cfg)
+ clib_mem_free (a->sep_ext.ext_cfg);
+
+ return rv;
+}
+
+static void
+proxy_server_add_ckpair (void)
+{
+ vnet_app_add_cert_key_pair_args_t _ck_pair, *ck_pair = &_ck_pair;
+ proxy_main_t *pm = &proxy_main;
+
+ clib_memset (ck_pair, 0, sizeof (*ck_pair));
+ ck_pair->cert = (u8 *) test_srv_crt_rsa;
+ ck_pair->key = (u8 *) test_srv_key_rsa;
+ ck_pair->cert_len = test_srv_crt_rsa_len;
+ ck_pair->key_len = test_srv_key_rsa_len;
+ vnet_app_add_cert_key_pair (ck_pair);
+
+ pm->ckpair_index = ck_pair->index;
}
static int
for (i = 0; i < num_threads; i++)
vec_validate (pm->rx_buf[i], pm->rcv_buffer_size);
+ proxy_server_add_ckpair ();
+
if (proxy_server_attach ())
{
clib_warning ("failed to attach server app");
proxy_server_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
{
- proxy_main_t *pm = &proxy_main;
+ unformat_input_t _line_input, *line_input = &_line_input;
char *default_server_uri = "tcp://0.0.0.0/23";
char *default_client_uri = "tcp://6.0.2.2/23";
+ u8 *server_uri = 0, *client_uri = 0;
+ proxy_main_t *pm = &proxy_main;
+ clib_error_t *error = 0;
int rv, tmp32;
u64 tmp64;
pm->prealloc_fifos = 0;
pm->private_segment_count = 0;
pm->private_segment_size = 0;
- pm->server_uri = 0;
- pm->client_uri = 0;
+
if (vlib_num_workers ())
clib_spinlock_init (&pm->sessions_lock);
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "fifo-size %U",
- unformat_memory_size, &pm->fifo_size))
+ if (unformat (line_input, "fifo-size %U", unformat_memory_size,
+ &pm->fifo_size))
;
- else if (unformat (input, "max-fifo-size %U",
- unformat_memory_size, &pm->max_fifo_size))
+ else if (unformat (line_input, "max-fifo-size %U", unformat_memory_size,
+ &pm->max_fifo_size))
;
- else if (unformat (input, "high-watermark %d", &tmp32))
+ else if (unformat (line_input, "high-watermark %d", &tmp32))
pm->high_watermark = (u8) tmp32;
- else if (unformat (input, "low-watermark %d", &tmp32))
+ else if (unformat (line_input, "low-watermark %d", &tmp32))
pm->low_watermark = (u8) tmp32;
- else if (unformat (input, "rcv-buf-size %d", &pm->rcv_buffer_size))
+ else if (unformat (line_input, "rcv-buf-size %d", &pm->rcv_buffer_size))
;
- else if (unformat (input, "prealloc-fifos %d", &pm->prealloc_fifos))
+ else if (unformat (line_input, "prealloc-fifos %d", &pm->prealloc_fifos))
;
- else if (unformat (input, "private-segment-count %d",
+ else if (unformat (line_input, "private-segment-count %d",
&pm->private_segment_count))
;
- else if (unformat (input, "private-segment-size %U",
+ else if (unformat (line_input, "private-segment-size %U",
unformat_memory_size, &tmp64))
{
if (tmp64 >= 0x100000000ULL)
- return clib_error_return
- (0, "private segment size %lld (%llu) too large", tmp64, tmp64);
+ {
+ error = clib_error_return (
+ 0, "private segment size %lld (%llu) too large", tmp64, tmp64);
+ goto done;
+ }
pm->private_segment_size = tmp64;
}
- else if (unformat (input, "server-uri %s", &pm->server_uri))
- vec_add1 (pm->server_uri, 0);
- else if (unformat (input, "client-uri %s", &pm->client_uri))
- vec_add1 (pm->client_uri, 0);
+ else if (unformat (line_input, "server-uri %s", &server_uri))
+ vec_add1 (server_uri, 0);
+ else if (unformat (line_input, "client-uri %s", &client_uri))
+ vec_add1 (client_uri, 0);
else
- return clib_error_return (0, "unknown input `%U'",
- format_unformat_error, input);
+ {
+ error = clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, line_input);
+ goto done;
+ }
}
- if (!pm->server_uri)
+ if (!server_uri)
{
clib_warning ("No server-uri provided, Using default: %s",
default_server_uri);
- pm->server_uri = format (0, "%s%c", default_server_uri, 0);
+ server_uri = format (0, "%s%c", default_server_uri, 0);
}
- if (!pm->client_uri)
+ if (!client_uri)
{
clib_warning ("No client-uri provided, Using default: %s",
default_client_uri);
- pm->client_uri = format (0, "%s%c", default_client_uri, 0);
+ client_uri = format (0, "%s%c", default_client_uri, 0);
+ }
+
+ if (parse_uri ((char *) server_uri, &pm->server_sep))
+ {
+ error = clib_error_return (0, "Invalid server uri %v", server_uri);
+ goto done;
+ }
+ if (parse_uri ((char *) client_uri, &pm->client_sep))
+ {
+ error = clib_error_return (0, "Invalid client uri %v", client_uri);
+ goto done;
}
vnet_session_enable_disable (vm, 1 /* turn on session and transport */ );
case 0:
break;
default:
- return clib_error_return (0, "server_create returned %d", rv);
+ error = clib_error_return (0, "server_create returned %d", rv);
}
- return 0;
+done:
+ unformat_free (line_input);
+ vec_free (client_uri);
+ vec_free (server_uri);
+ return error;
}
/* *INDENT-OFF* */