session: cleanup attach flags

[vpp.git] / src / vnet / session / session_test.c

diff --git a/src/vnet/session/session_test.c b/src/vnet/session/session_test.c
index bf3cea2..64657c1 100644 (file)
--- a/src/vnet/session/session_test.c
+++ b/src/vnet/session/session_test.c
@@ -102,7 +102,7 @@ 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;
+  u64 options[APP_OPTIONS_N_OPTIONS], bind4_handle, bind6_handle;
   u8 segment_name[128];
   clib_error_t *error = 0;
   u32 server_index;
@@ -167,7 +167,7 @@ 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_api_context = 4321, dummy_client_api_index = 1234;
@@ -774,7 +774,7 @@ 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 dummy_server_api_index = ~0;
@@ -1136,7 +1136,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 +1164,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 +1193,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,
@@ -1318,7 +1335,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input)
 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;