X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.c;h=f2a13be6144f2df1950e796f95c258d26c73ea67;hb=refs%2Fchanges%2F09%2F10109%2F17;hp=8dab3d67bce4954f41da756a2ca605683d002e14;hpb=a2ff7b8cfc829ffbb6d5de7534efb51f7cba9cf3;p=vpp.git diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c index 8dab3d67bce..f2a13be6144 100644 --- a/src/vnet/session/application_interface.c +++ b/src/vnet/session/application_interface.c @@ -326,7 +326,22 @@ unformat_vnet_uri (unformat_input_t * input, va_list * args) 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; } @@ -398,11 +413,11 @@ session_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index) 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; - u8 *seg_name; - u64 secret; u32 app_ns_index = 0; + u64 secret; int rv; app = application_lookup (a->api_client_index); @@ -422,16 +437,15 @@ vnet_application_attach (vnet_app_attach_args_t * a) a->app_event_queue_address = pointer_to_uword (app->event_queue); sm = segment_manager_get (app->first_segment_manager); - segment_manager_get_segment_info (sm->segment_indices[0], - &seg_name, &a->segment_size); + fs = segment_manager_get_segment (sm->segment_indices[0]); if (application_is_proxy (app)) application_setup_proxy (app); - a->segment_name_length = vec_len (seg_name); - a->segment_name = seg_name; - ASSERT (vec_len (a->segment_name) <= 128); + ASSERT (vec_len (fs->ssvm.name) <= 128); + a->segment = &fs->ssvm; a->app_index = app->index; + return 0; }