quic: enable stable quic tests

[vpp.git] / src / plugins / mactime / mactime_test.c

diff --git a/src/plugins/mactime/mactime_test.c b/src/plugins/mactime/mactime_test.c
index 9ba28da..c9c1a47 100644 (file)
--- a/src/plugins/mactime/mactime_test.c
+++ b/src/plugins/mactime/mactime_test.c
@@ -19,6 +19,7 @@
 #include <vlibmemory/api.h>
 #include <vppinfra/error.h>
 #include <vppinfra/time_range.h>
+#include <vnet/ethernet/ethernet.h>
 
 uword vat_unformat_sw_if_index (unformat_input_t * input, va_list * args);
 
@@ -79,22 +80,6 @@ _(mactime_add_del_range_reply)
 foreach_standard_reply_retval_handler;
 #undef _
 
-static u8 *
-format_mac_address (u8 * s, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
-                a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-static uword
-unformat_mac_address (unformat_input_t * input, va_list * args)
-{
-  u8 *a = va_arg (*args, u8 *);
-  return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
-                  &a[4], &a[5]);
-}
-
 /*
  * Table of message reply handlers, must include boilerplate handlers
  * we just generated
@@ -144,6 +129,23 @@ api_mactime_enable_disable (vat_main_t * vam)
   return ret;
 }
 
+/* These two ought to be in a library somewhere but they aren't */
+static uword
+my_unformat_mac_address (unformat_input_t * input, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
+                  &a[4], &a[5]);
+}
+
+static u8 *
+my_format_mac_address (u8 * s, va_list * args)
+{
+  u8 *a = va_arg (*args, u8 *);
+  return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+                a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
 static int
 api_mactime_add_del_range (vat_main_t * vam)
 {
@@ -156,7 +158,10 @@ api_mactime_add_del_range (vat_main_t * vam)
   int mac_set = 0;
   u8 is_add = 1;
   u8 allow = 0;
+  u8 allow_quota = 0;
   u8 drop = 0;
+  u8 no_udp_10001 = 0;
+  u64 data_quota = 0;
   int ret;
   int ii;
 
@@ -171,6 +176,9 @@ api_mactime_add_del_range (vat_main_t * vam)
       else if (unformat (i, "allow-range %U",
                         unformat_clib_timebase_range_vector, &rp))
        allow = 1;
+      else if (unformat (i, "allow-quota-range %U",
+                        unformat_clib_timebase_range_vector, &rp))
+       allow_quota = 1;
       else if (unformat (i, "drop-range %U",
                         unformat_clib_timebase_range_vector, &rp))
        drop = 1;
@@ -178,10 +186,16 @@ api_mactime_add_del_range (vat_main_t * vam)
        allow = 1;
       else if (unformat (i, "drop-static"))
        drop = 1;
-      else if (unformat (i, "mac %U", unformat_mac_address, mac_address))
+      else if (unformat (i, "no-udp-10001"))
+       no_udp_10001 = 1;
+      else if (unformat (i, "mac %U", my_unformat_mac_address, mac_address))
        mac_set = 1;
       else if (unformat (i, "del"))
        is_add = 0;
+      else if (unformat (i, "data-quota %lldM", &data_quota))
+       data_quota <<= 20;
+      else if (unformat (i, "data-quota %lldG", &data_quota))
+       data_quota <<= 30;
       else
        break;
     }
@@ -196,11 +210,12 @@ api_mactime_add_del_range (vat_main_t * vam)
     }
 
   /* allow-range / drop-range parse errors cause this condition */
-  if (is_add && allow == 0 && drop == 0)
+  if (is_add && allow == 0 && drop == 0 && allow_quota == 0)
     {
       vec_free (rp);
       vec_free (device_name);
-      errmsg ("neither allow nor drop set, parse error...\n");
+      errmsg ("parse error...\n");
+      return -99;
     }
 
   /* Unlikely, but check anyhow */
@@ -215,7 +230,7 @@ api_mactime_add_del_range (vat_main_t * vam)
   /* Cough up a device name if none set */
   if (name_set == 0)
     {
-      device_name = format (0, "mac %U%c", format_mac_address,
+      device_name = format (0, "mac %U%c", my_format_mac_address,
                            mac_address, 0);
     }
 
@@ -224,6 +239,9 @@ api_mactime_add_del_range (vat_main_t * vam)
   mp->is_add = is_add;
   mp->drop = drop;
   mp->allow = allow;
+  mp->allow_quota = allow_quota;
+  mp->no_udp_10001 = no_udp_10001;
+  mp->data_quota = clib_host_to_net_u64 (data_quota);
   memcpy (mp->mac_address, mac_address, sizeof (mp->mac_address));
   memcpy (mp->device_name, device_name, vec_len (device_name));
   mp->count = clib_host_to_net_u32 (vec_len (rp));
@@ -282,25 +300,7 @@ mactime_api_hookup (vat_main_t * vam)
 #undef _
 }
 
-clib_error_t *
-vat_plugin_register (vat_main_t * vam)
-{
-  mactime_test_main_t *sm = &mactime_test_main;
-  u8 *name;
-
-  sm->vat_main = vam;
-
-  /* Ask the vpp engine for the first assigned message-id */
-  name = format (0, "mactime_%08x%c", api_version, 0);
-  sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
-  if (sm->msg_id_base != (u16) ~ 0)
-    mactime_api_hookup (vam);
-
-  vec_free (name);
-
-  return 0;
-}
+VAT_PLUGIN_REGISTER (mactime);
 
 /*
  * fd.io coding-style-patch-verification: ON