X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_test.c;h=c12041a2ee6f91a626fa74ab74c4adb7abef4654;hb=5c9083d52646153bdc917a7ae37da696d864ad1c;hp=bf3cea2a97ca9ea59466c59b33f41c02bce93a5e;hpb=8f107b3686998f1e74353db0b7d0baa10ed4b754;p=vpp.git diff --git a/src/vnet/session/session_test.c b/src/vnet/session/session_test.c index bf3cea2a97c..c12041a2ee6 100644 --- a/src/vnet/session/session_test.c +++ b/src/vnet/session/session_test.c @@ -53,18 +53,20 @@ dummy_session_connected_callback (u32 app_index, u32 api_context, return -1; } +static u32 dummy_segment_count; + int -dummy_add_segment_callback (u32 client_index, const u8 * seg_name, - u32 seg_size) +dummy_add_segment_callback (u32 client_index, const ssvm_private_t * fs) { - clib_warning ("called..."); - return -1; + dummy_segment_count = 1; + return 0; } int -dummy_redirect_connect_callback (u32 client_index, void *mp) +dummy_del_segment_callback (u32 client_index, const ssvm_private_t * fs) { - return VNET_API_ERROR_SESSION_REDIRECT; + dummy_segment_count = 0; + return 0; } void @@ -73,11 +75,14 @@ dummy_session_disconnect_callback (stream_session_t * s) clib_warning ("called..."); } +static u32 dummy_accept; + int dummy_session_accept_callback (stream_session_t * s) { - clib_warning ("called..."); - return -1; + dummy_accept = 1; + s->session_state = SESSION_STATE_READY; + return 0; } int @@ -93,23 +98,60 @@ static session_cb_vft_t dummy_session_cbs = { .session_connected_callback = dummy_session_connected_callback, .session_accept_callback = dummy_session_accept_callback, .session_disconnect_callback = dummy_session_disconnect_callback, - .builtin_server_rx_callback = dummy_server_rx_callback, - .redirect_connect_callback = dummy_redirect_connect_callback, + .builtin_app_rx_callback = dummy_server_rx_callback, + .add_segment_callback = dummy_add_segment_callback, + .del_segment_callback = dummy_del_segment_callback, }; /* *INDENT-ON* */ +static int +session_create_lookpback (u32 table_id, u32 * sw_if_index, + ip4_address_t * intf_addr) +{ + u8 intf_mac[6]; + + memset (intf_mac, 0, sizeof (intf_mac)); + + if (vnet_create_loopback_interface (sw_if_index, intf_mac, 0, 0)) + { + clib_warning ("couldn't create loopback. stopping the test!"); + return -1; + } + + if (table_id != 0) + ip_table_bind (FIB_PROTOCOL_IP4, *sw_if_index, table_id, 0); + + vnet_sw_interface_set_flags (vnet_get_main (), *sw_if_index, + VNET_SW_INTERFACE_FLAG_ADMIN_UP); + + if (ip4_add_del_interface_address (vlib_get_main (), *sw_if_index, + intf_addr, 24, 0)) + { + clib_warning ("couldn't assign loopback ip %U", format_ip4_address, + intf_addr); + return -1; + } + + return 0; +} + +static void +session_delete_loopback (u32 sw_if_index) +{ + /* fails spectacularly */ + /* vnet_delete_loopback_interface (sw_if_index); */ +} + static int session_test_basic (vlib_main_t * vm, unformat_input_t * input) { session_endpoint_t server_sep = SESSION_ENDPOINT_NULL; - u64 options[SESSION_OPTIONS_N_OPTIONS], bind4_handle, bind6_handle; - u8 segment_name[128]; + u64 options[APP_OPTIONS_N_OPTIONS], bind4_handle, bind6_handle; clib_error_t *error = 0; u32 server_index; memset (options, 0, sizeof (options)); options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; - options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_ACCEPT_REDIRECT; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; vnet_app_attach_args_t attach_args = { @@ -117,12 +159,13 @@ session_test_basic (vlib_main_t * vm, unformat_input_t * input) .options = options, .namespace_id = 0, .session_cb_vft = &dummy_session_cbs, - .segment_name = segment_name, + .name = format (0, "session_test"), }; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "app attached"); server_index = attach_args.app_index; + vec_free (attach_args.name); server_sep.is_ip4 = 1; vnet_bind_args_t bind_args = { @@ -167,20 +210,20 @@ session_test_basic (vlib_main_t * vm, unformat_input_t * input) static int session_test_namespace (vlib_main_t * vm, unformat_input_t * input) { - u64 options[SESSION_OPTIONS_N_OPTIONS], dummy_secret = 1234; + u64 options[APP_OPTIONS_N_OPTIONS], dummy_secret = 1234; u32 server_index, server_st_index, server_local_st_index; - u32 dummy_port = 1234, local_listener, client_index; + u32 dummy_port = 1234, client_index; u32 dummy_api_context = 4321, dummy_client_api_index = 1234; u32 dummy_server_api_index = ~0, sw_if_index = 0; session_endpoint_t server_sep = SESSION_ENDPOINT_NULL; session_endpoint_t client_sep = SESSION_ENDPOINT_NULL; session_endpoint_t intf_sep = SESSION_ENDPOINT_NULL; clib_error_t *error = 0; - u8 *ns_id = format (0, "appns1"), intf_mac[6]; + u8 *ns_id = format (0, "appns1"); app_namespace_t *app_ns; - u8 segment_name[128]; application_t *server; stream_session_t *s; + u64 handle; int code; server_sep.is_ip4 = 1; @@ -188,16 +231,14 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) client_sep.is_ip4 = 1; client_sep.port = dummy_port; memset (options, 0, sizeof (options)); - memset (intf_mac, 0, sizeof (intf_mac)); options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; - options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_ACCEPT_REDIRECT; vnet_app_attach_args_t attach_args = { .api_client_index = ~0, .options = options, .namespace_id = 0, .session_cb_vft = &dummy_session_cbs, - .segment_name = segment_name, + .name = format (0, "session_test"), }; vnet_bind_args_t bind_args = { @@ -206,10 +247,10 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) }; vnet_connect_args_t connect_args = { - .sep = client_sep, .app_index = 0, .api_context = 0, }; + clib_memcpy (&connect_args.sep, &client_sep, sizeof (client_sep)); vnet_unbind_args_t unbind_args = { .handle = bind_args.handle, @@ -328,9 +369,8 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) SESSION_TEST ((s->app_index == server_index), "app_index should be that of " "the server"); server_local_st_index = application_local_session_table (server); - local_listener = - session_lookup_local_endpoint (server_local_st_index, &server_sep); - SESSION_TEST ((local_listener != SESSION_INVALID_INDEX), + handle = session_lookup_local_endpoint (server_local_st_index, &server_sep); + SESSION_TEST ((handle != SESSION_INVALID_HANDLE), "listener should exist in local table"); /* @@ -348,12 +388,15 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) code = clib_error_get_code (error); SESSION_TEST ((code == VNET_API_ERROR_INVALID_VALUE), "error code should be invalid value (zero ip)"); + SESSION_TEST ((dummy_segment_count == 0), + "shouldn't have received request to map new segment"); connect_args.sep.ip.ip4.as_u8[0] = 127; error = vnet_connect (&connect_args); - SESSION_TEST ((error != 0), "client connect should return error code"); + SESSION_TEST ((error == 0), "client connect should not return error code"); code = clib_error_get_code (error); - SESSION_TEST ((code == VNET_API_ERROR_SESSION_REDIRECT), - "error code should be redirect"); + SESSION_TEST ((dummy_segment_count == 1), + "should've received request to map new segment"); + SESSION_TEST ((dummy_accept == 1), "should've received accept request"); detach_args.app_index = client_index; vnet_application_detach (&detach_args); @@ -380,9 +423,9 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) s = session_lookup_listener (server_st_index, &server_sep); SESSION_TEST ((s == 0), "listener should not exist in global table"); - local_listener = - session_lookup_local_endpoint (server_local_st_index, &server_sep); - SESSION_TEST ((s == 0), "listener should not exist in local table"); + handle = session_lookup_local_endpoint (server_local_st_index, &server_sep); + SESSION_TEST ((handle == SESSION_INVALID_HANDLE), + "listener should not exist in local table"); detach_args.app_index = server_index; vnet_application_detach (&detach_args); @@ -405,18 +448,16 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) s = session_lookup_listener (server_st_index, &server_sep); SESSION_TEST ((s == 0), "listener should not exist in global table"); server_local_st_index = application_local_session_table (server); - local_listener = - session_lookup_local_endpoint (server_local_st_index, &server_sep); - SESSION_TEST ((local_listener != SESSION_INVALID_INDEX), + handle = session_lookup_local_endpoint (server_local_st_index, &server_sep); + SESSION_TEST ((handle != SESSION_INVALID_HANDLE), "listener should exist in local table"); unbind_args.handle = bind_args.handle; error = vnet_unbind (&unbind_args); SESSION_TEST ((error == 0), "unbind should work"); - local_listener = - session_lookup_local_endpoint (server_local_st_index, &server_sep); - SESSION_TEST ((local_listener == SESSION_INVALID_INDEX), + handle = session_lookup_local_endpoint (server_local_st_index, &server_sep); + SESSION_TEST ((handle == SESSION_INVALID_HANDLE), "listener should not exist in local table"); /* @@ -444,15 +485,7 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) /* * Create loopback interface */ - if (vnet_create_loopback_interface (&sw_if_index, intf_mac, 0, 0)) - { - clib_warning ("couldn't create loopback. stopping the test!"); - return 0; - } - vnet_sw_interface_set_flags (vnet_get_main (), sw_if_index, - VNET_SW_INTERFACE_FLAG_ADMIN_UP); - ip4_add_del_interface_address (vlib_get_main (), sw_if_index, &intf_addr, - 24, 0); + session_create_lookpback (0, &sw_if_index, &intf_addr); /* * Update namespace @@ -485,9 +518,8 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) SESSION_TEST ((s->app_index == server_index), "app_index should be that of " "the server"); server_local_st_index = application_local_session_table (server); - local_listener = - session_lookup_local_endpoint (server_local_st_index, &server_sep); - SESSION_TEST ((local_listener != SESSION_INVALID_INDEX), + handle = session_lookup_local_endpoint (server_local_st_index, &server_sep); + SESSION_TEST ((handle != SESSION_INVALID_HANDLE), "zero listener should exist in local table"); detach_args.app_index = server_index; vnet_application_detach (&detach_args); @@ -495,9 +527,9 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) /* * Cleanup */ + vec_free (attach_args.name); vec_free (ns_id); - /* fails in multi core scenarions .. */ - /* vnet_delete_loopback_interface (sw_if_index); */ + session_delete_loopback (sw_if_index); return 0; } @@ -774,19 +806,20 @@ static int session_test_rules (vlib_main_t * vm, unformat_input_t * input) { session_endpoint_t server_sep = SESSION_ENDPOINT_NULL; - u64 options[SESSION_OPTIONS_N_OPTIONS]; + u64 options[APP_OPTIONS_N_OPTIONS]; u16 lcl_port = 1234, rmt_port = 4321; - u32 server_index, server_index2, app_index; + u32 server_index, server_index2; u32 dummy_server_api_index = ~0; transport_connection_t *tc; u32 dummy_port = 1111; clib_error_t *error = 0; - u8 segment_name[128], is_filtered = 0, *ns_id = format (0, "appns1"); + u8 is_filtered = 0, *ns_id = format (0, "appns1"); stream_session_t *listener, *s; app_namespace_t *default_ns = app_namespace_get_default (); u32 local_ns_index = default_ns->local_table_index; int verbose = 0, rv; app_namespace_t *app_ns; + u64 handle; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -809,7 +842,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) .options = options, .namespace_id = 0, .session_cb_vft = &dummy_session_cbs, - .segment_name = segment_name, + .name = format (0, "session_test"), }; vnet_bind_args_t bind_args = { @@ -821,7 +854,6 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) * Attach server with global and local default scope */ options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; - options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_ACCEPT_REDIRECT; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; attach_args.namespace_id = 0; @@ -895,8 +927,8 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) .port = rmt_port, .transport_proto = TRANSPORT_PROTO_TCP, }; - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index != server_index), "local session endpoint lookup " + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle != server_index), "local session endpoint lookup " "should not work (global scope)"); tc = session_lookup_connection_wt4 (0, &lcl_pref.fp_addr.ip4, @@ -920,8 +952,8 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) &is_filtered); SESSION_TEST ((tc->c_index == listener->connection_index), "optimized lookup for lcl port + 1 should work"); - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == server_index), "local session endpoint lookup " + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == server_index), "local session endpoint lookup " "should work (lcl ip was zeroed)"); /* @@ -953,8 +985,8 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) "should fail (deny rule)"); SESSION_TEST ((is_filtered == 1), "lookup should be filtered (deny)"); - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == APP_DROP_INDEX), "lookup for 1.2.3.4/32 1234 " + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == SESSION_DROP_HANDLE), "lookup for 1.2.3.4/32 1234 " "5.6.7.8/16 4321 in local table should return deny"); tc = session_lookup_connection_wt4 (0, &lcl_pref.fp_addr.ip4, @@ -988,9 +1020,9 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) "should fail (allow without app)"); SESSION_TEST ((is_filtered == 0), "lookup should NOT be filtered"); - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == APP_INVALID_INDEX), "lookup for 1.2.3.4/32 1234" - " 5.6.7.8/32 4321 in local table should return invalid"); + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == SESSION_INVALID_HANDLE), "lookup for 1.2.3.4/32 " + "1234 5.6.7.8/32 4321 in local table should return invalid"); if (verbose) { @@ -1000,15 +1032,15 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) } sep.ip.ip4.as_u32 += 1 << 24; - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == APP_DROP_INDEX), "lookup for 1.2.3.4/32 1234" + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == SESSION_DROP_HANDLE), "lookup for 1.2.3.4/32 1234" " 5.6.7.9/32 4321 in local table should return deny"); vnet_connect_args_t connect_args = { - .sep = sep, .app_index = attach_args.app_index, .api_context = 0, }; + clib_memcpy (&connect_args.sep, &sep, sizeof (sep)); /* Try connecting */ error = vnet_connect (&connect_args); @@ -1019,8 +1051,6 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) sep.ip.ip4.as_u32 -= 1 << 24; - - /* * Delete masking rule: 1.2.3.4/32 1234 5.6.7.8/32 4321 allow */ @@ -1054,8 +1084,8 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) TRANSPORT_PROTO_TCP); } - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == APP_DROP_INDEX), + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == SESSION_DROP_HANDLE), "local session endpoint lookup should return deny"); /* @@ -1070,8 +1100,8 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) error = vnet_session_rule_add_del (&args); SESSION_TEST ((error == 0), "Del 1.2.3.4/32 1234 5.6.7.8/32 4321 deny"); - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == APP_INVALID_INDEX), + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == SESSION_INVALID_HANDLE), "local session endpoint lookup should return invalid"); /* @@ -1087,8 +1117,8 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) args.table_args.rmt_port = 4321; error = vnet_session_rule_add_del (&args); SESSION_TEST ((error == 0), "Del 0/0 * 5.6.7.8/16 4321"); - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index != server_index), "local session endpoint lookup " + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle != server_index), "local session endpoint lookup " "should not work (removed)"); args.table_args.is_add = 0; @@ -1136,7 +1166,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) " not work (no-rule)"); /* - * Test tags. Add/del rule with tag + * Test tags. Add/overwrite/del rule with tag */ args.table_args.is_add = 1; args.table_args.lcl_port = 1234; @@ -1164,9 +1194,28 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) SESSION_TEST ((tc->c_index == listener->connection_index), "lookup 1.2.3.4/32 1234 5.6.7.8/16 4321 should work"); + vec_free (args.table_args.tag); + args.table_args.lcl_port = 1234; + args.table_args.lcl.fp_addr.ip4 = lcl_ip; + args.table_args.lcl.fp_len = 16; + args.table_args.tag = format (0, "test_rule_overwrite"); + error = vnet_session_rule_add_del (&args); + SESSION_TEST ((error == 0), + "Overwrite 1.2.3.4/16 1234 5.6.7.8/16 4321 deny tag test_rule" + " should work"); + if (verbose) + { + session_lookup_dump_rules_table (0, FIB_PROTOCOL_IP4, + TRANSPORT_PROTO_TCP); + session_lookup_dump_local_rules_table (local_ns_index, FIB_PROTOCOL_IP4, + TRANSPORT_PROTO_TCP); + } + args.table_args.is_add = 0; args.table_args.lcl_port += 1; error = vnet_session_rule_add_del (&args); + SESSION_TEST ((error == 0), "Del 1.2.3.4/32 1234 5.6.7.8/32 4321 deny " + "tag %v", args.table_args.tag); if (verbose) { session_lookup_dump_rules_table (0, FIB_PROTOCOL_IP4, @@ -1174,8 +1223,6 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) session_lookup_dump_local_rules_table (local_ns_index, FIB_PROTOCOL_IP4, TRANSPORT_PROTO_TCP); } - SESSION_TEST ((error == 0), "Del 1.2.3.4/32 1234 5.6.7.8/32 4321 deny " - "tag test_rule"); tc = session_lookup_connection_wt4 (0, &lcl_pref.fp_addr.ip4, &rmt_pref.fp_addr.ip4, lcl_port, rmt_port, TRANSPORT_PROTO_TCP, 0, @@ -1258,18 +1305,20 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) /* * Lookup default namespace */ - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == APP_INVALID_INDEX), + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == SESSION_INVALID_HANDLE), "lookup for 1.2.3.4/32 1234 5.6.7.8/32 4321 in local table " "should return allow (invalid)"); sep.port += 1; - app_index = session_lookup_local_endpoint (local_ns_index, &sep); - SESSION_TEST ((app_index == APP_DROP_INDEX), "lookup for 1.2.3.4/32 1234 " + handle = session_lookup_local_endpoint (local_ns_index, &sep); + SESSION_TEST ((handle == SESSION_DROP_HANDLE), "lookup for 1.2.3.4/32 1234 " "5.6.7.8/16 432*2* in local table should return deny"); + connect_args.app_index = server_index; - connect_args.sep = sep; + clib_memcpy (&connect_args.sep, &sep, sizeof (sep)); + error = vnet_connect (&connect_args); SESSION_TEST ((error != 0), "connect should fail"); rv = clib_error_get_code (error); @@ -1279,8 +1328,8 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) /* * Lookup test namespace */ - app_index = session_lookup_local_endpoint (app_ns->local_table_index, &sep); - SESSION_TEST ((app_index == APP_DROP_INDEX), "lookup for 1.2.3.4/32 1234 " + handle = session_lookup_local_endpoint (app_ns->local_table_index, &sep); + SESSION_TEST ((handle == SESSION_DROP_HANDLE), "lookup for 1.2.3.4/32 1234 " "5.6.7.8/16 4321 in local table should return deny"); connect_args.app_index = server_index; @@ -1312,20 +1361,21 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) vnet_application_detach (&detach_args); vec_free (ns_id); + vec_free (attach_args.name); return 0; } static int session_test_proxy (vlib_main_t * vm, unformat_input_t * input) { - u64 options[SESSION_OPTIONS_N_OPTIONS]; + u64 options[APP_OPTIONS_N_OPTIONS]; char *show_listeners = "sh session listeners tcp verbose"; char *show_local_listeners = "sh app ns table default"; unformat_input_t tmp_input; u32 server_index, app_index; u32 dummy_server_api_index = ~0, sw_if_index = 0; clib_error_t *error = 0; - u8 segment_name[128], intf_mac[6], sst, is_filtered = 0; + u8 is_filtered = 0; stream_session_t *s; transport_connection_t *tc; u16 lcl_port = 1234, rmt_port = 4321; @@ -1365,21 +1415,13 @@ session_test_proxy (vlib_main_t * vm, unformat_input_t * input) /* * Create loopback interface */ - memset (intf_mac, 0, sizeof (intf_mac)); - if (vnet_create_loopback_interface (&sw_if_index, intf_mac, 0, 0)) - { - clib_warning ("couldn't create loopback. stopping the test!"); - return 0; - } - vnet_sw_interface_set_flags (vnet_get_main (), sw_if_index, - VNET_SW_INTERFACE_FLAG_ADMIN_UP); - ip4_add_del_interface_address (vlib_get_main (), sw_if_index, &lcl_ip, - 24, 0); + session_create_lookpback (0, &sw_if_index, &lcl_ip); app_ns = app_namespace_get_default (); app_ns->sw_if_index = sw_if_index; memset (options, 0, sizeof (options)); + options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_ACCEPT_REDIRECT; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_IS_PROXY; options[APP_OPTIONS_PROXY_TRANSPORT] = 1 << TRANSPORT_PROTO_TCP; @@ -1390,7 +1432,7 @@ session_test_proxy (vlib_main_t * vm, unformat_input_t * input) .options = options, .namespace_id = 0, .session_cb_vft = &dummy_session_cbs, - .segment_name = segment_name, + .name = format (0, "session_test"), }; attach_args.api_client_index = dummy_server_api_index; @@ -1412,8 +1454,7 @@ session_test_proxy (vlib_main_t * vm, unformat_input_t * input) TRANSPORT_PROTO_TCP, 0, &is_filtered); SESSION_TEST ((tc != 0), "lookup 1.2.3.4 1234 5.6.7.8 4321 should be " "successful"); - sst = session_type_from_proto_and_ip (TRANSPORT_PROTO_TCP, 1); - s = listen_session_get (sst, tc->s_index); + s = listen_session_get (tc->s_index); SESSION_TEST ((s->app_index == server_index), "lookup should return the" " server"); @@ -1446,6 +1487,7 @@ session_test_proxy (vlib_main_t * vm, unformat_input_t * input) "local session endpoint lookup should not work after detach"); if (verbose) unformat_free (&tmp_input); + vec_free (attach_args.name); return 0; }