X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Funittest%2Fsession_test.c;h=c504d8df15d641667738832000403e460a3d9c7d;hb=5a2ec8fc41d14ffc5275ab88761c1fb7e0420a33;hp=e24516668ffdb9b1a117249d003856a86fb9136c;hpb=053a0e44edb21713e0825f9c09ba4af12e686b38;p=vpp.git diff --git a/src/plugins/unittest/session_test.c b/src/plugins/unittest/session_test.c index e24516668ff..c504d8df15d 100644 --- a/src/plugins/unittest/session_test.c +++ b/src/plugins/unittest/session_test.c @@ -63,14 +63,14 @@ dummy_session_connected_callback (u32 app_index, u32 api_context, static u32 dummy_segment_count; int -dummy_add_segment_callback (u32 client_index, const ssvm_private_t * fs) +dummy_add_segment_callback (u32 client_index, u64 segment_handle) { dummy_segment_count = 1; return 0; } int -dummy_del_segment_callback (u32 client_index, const ssvm_private_t * fs) +dummy_del_segment_callback (u32 client_index, u64 segment_handle) { dummy_segment_count = 0; return 0; @@ -388,9 +388,9 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) * main thread, even when we have workers and we avoid polling main thread, * i.e., we can't cleanup pending disconnects, so force cleanup for both */ - stream_session_cleanup (s); + session_transport_cleanup (s); s = session_get (accepted_session_index, accepted_session_thread); - stream_session_cleanup (s); + session_transport_cleanup (s); vnet_app_detach_args_t detach_args = { .app_index = server_index, @@ -419,7 +419,7 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) u64 options[APP_OPTIONS_N_OPTIONS], dummy_secret = 1234; u32 server_index, server_st_index, server_local_st_index; u32 dummy_port = 1234, client_index, server_wrk_index; - u32 dummy_api_context = 4321, dummy_client_api_index = 1234; + u32 dummy_api_context = 4321, dummy_client_api_index = ~0; 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; @@ -1493,7 +1493,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) app_ns = app_namespace_get_from_id (ns_id); attach_args.namespace_id = ns_id; - attach_args.api_client_index = dummy_server_api_index - 1; + attach_args.api_client_index = dummy_server_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server2 attached"); server_index2 = attach_args.app_index;