X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Facl%2Fmanual_fns.h;h=f9f42c5fa36d3dccdc226442aec1fe2b094ffe99;hb=492a5d0bd;hp=cf9c3abc386388dc292cac1a0d052fd7b359aec0;hpb=cbbd08e1d41deae5745a83d1f941d4133e110826;p=vpp.git

diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h
index cf9c3abc386..f9f42c5fa36 100644
--- a/src/plugins/acl/manual_fns.h
+++ b/src/plugins/acl/manual_fns.h
@@ -19,12 +19,34 @@
 #include <vnet/ip/format.h>
 #include <vnet/ethernet/ethernet.h>
 
+#define vl_endianfun            /* define message structures */
+#include <acl/acl_types.api.h>
+#undef vl_endianfun
+
 /* Macro to finish up custom dump fns */
 #define PRINT_S \
     vec_add1 (s, 0);                            \
     vl_print (handle, (char *)s);               \
     vec_free (s);
 
+static inline void
+vl_api_acl_rule_t_array_endian(vl_api_acl_rule_t *rules, u32 count)
+{
+  u32 i;
+  for(i=0; i<count; i++) {
+    vl_api_acl_rule_t_endian (&rules[i]);
+  }
+}
+
+static inline void
+vl_api_macip_acl_rule_t_array_endian(vl_api_macip_acl_rule_t *rules, u32 count)
+{
+  u32 i;
+  for(i=0; i<count; i++) {
+    vl_api_macip_acl_rule_t_endian (&rules[i]);
+  }
+}
+
 static inline void
 vl_api_acl_details_t_endian (vl_api_acl_details_t * a)
 {
@@ -33,7 +55,7 @@ vl_api_acl_details_t_endian (vl_api_acl_details_t * a)
   a->acl_index = clib_net_to_host_u32 (a->acl_index);
   /* a->tag[0..63] = a->tag[0..63] (no-op) */
   a->count = clib_net_to_host_u32 (a->count);
-  vl_api_acl_rule_t_endian (a->r);
+  vl_api_acl_rule_t_array_endian (a->r, a->count);
 }
 
 static inline void
@@ -44,7 +66,7 @@ vl_api_macip_acl_details_t_endian (vl_api_macip_acl_details_t * a)
   a->acl_index = clib_net_to_host_u32 (a->acl_index);
   /* a->tag[0..63] = a->tag[0..63] (no-op) */
   a->count = clib_net_to_host_u32 (a->count);
-  vl_api_macip_acl_rule_t_endian (a->r);
+  vl_api_macip_acl_rule_t_array_endian (a->r, a->count);
 }
 
 
@@ -57,7 +79,7 @@ vl_api_acl_add_replace_t_endian (vl_api_acl_add_replace_t * a)
   a->acl_index = clib_net_to_host_u32 (a->acl_index);
   /* a->tag[0..63] = a->tag[0..63] (no-op) */
   a->count = clib_net_to_host_u32 (a->count);
-  vl_api_acl_rule_t_endian (a->r);
+  vl_api_acl_rule_t_array_endian (a->r, a->count);
 }
 
 static inline void
@@ -68,7 +90,19 @@ vl_api_macip_acl_add_t_endian (vl_api_macip_acl_add_t * a)
   a->context = clib_net_to_host_u32 (a->context);
   /* a->tag[0..63] = a->tag[0..63] (no-op) */
   a->count = clib_net_to_host_u32 (a->count);
-  vl_api_macip_acl_rule_t_endian (a->r);
+  vl_api_macip_acl_rule_t_array_endian (a->r, a->count);
+}
+
+static inline void
+vl_api_macip_acl_add_replace_t_endian (vl_api_macip_acl_add_replace_t * a)
+{
+  a->_vl_msg_id = clib_net_to_host_u16 (a->_vl_msg_id);
+  a->client_index = clib_net_to_host_u32 (a->client_index);
+  a->context = clib_net_to_host_u32 (a->context);
+  a->acl_index = clib_net_to_host_u32 (a->acl_index);
+  /* a->tag[0..63] = a->tag[0..63] (no-op) */
+  a->count = clib_net_to_host_u32 (a->count);
+  vl_api_macip_acl_rule_t_array_endian (a->r, a->count);
 }
 
 static inline u8 *
@@ -120,8 +154,6 @@ vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle)
   return handle;
 }
 
-
-
 static inline void *
 vl_api_macip_acl_rule_t_print (vl_api_macip_acl_rule_t * a, void *handle)
 {
@@ -197,7 +229,7 @@ vl_api_acl_details_t_print (vl_api_acl_details_t * a, void *handle)
   u32 count = clib_net_to_host_u32 (a->count);
   if (count > 0x100000)
     {
-      s = format (s, "WARN: acl_defails count endianness wrong? Fixup to avoid long loop.\n");
+      s = format (s, "WARN: acl_details count endianness wrong? Fixup to avoid long loop.\n");
       count = a->count;
     }
 
@@ -226,7 +258,7 @@ vl_api_macip_acl_details_t_print (vl_api_macip_acl_details_t * a,
   u32 count = clib_net_to_host_u32 (a->count);
   if (count > 0x100000)
     {
-      s = format (s, "WARN: macip_acl_defails count endianness wrong? Fixup to avoid long loop.\n");
+      s = format (s, "WARN: macip_acl_details count endianness wrong? Fixup to avoid long loop.\n");
       count = a->count;
     }
 
@@ -257,7 +289,7 @@ vl_api_macip_acl_add_t_print (vl_api_macip_acl_add_t * a, void *handle)
       count = a->count;
     }
 
-  s = format (0, "SCRIPT: macip_acl_add ");
+  s = format (s, "SCRIPT: macip_acl_add ");
   if (a->tag[0])
     s = format (s, "tag %s ", a->tag);
 
@@ -274,6 +306,36 @@ vl_api_macip_acl_add_t_print (vl_api_macip_acl_add_t * a, void *handle)
   return handle;
 }
 
+static inline void *
+vl_api_macip_acl_add_replace_t_print (vl_api_macip_acl_add_replace_t * a, void *handle)
+{
+  u8 *s = 0;
+  int i;
+  u32 acl_index = clib_net_to_host_u32 (a->acl_index);
+  u32 count = clib_net_to_host_u32 (a->count);
+  if (count > 0x100000)
+    {
+      s = format (s, "WARN: macip_acl_add_replace count endianness wrong? Fixup to avoid long loop.\n");
+      count = a->count;
+    }
+
+  s = format (s, "SCRIPT: macip_acl_add_replace %d count %d ",
+        acl_index, count);
+  if (a->tag[0])
+    s = format (s, "tag %s ", a->tag);
+
+  s = format (s, "count %d \\\n", count);
+
+  PRINT_S;
+
+  for (i = 0; i < count; i++)
+    vl_api_macip_acl_rule_t_print (&a->r[i], handle);
+
+  s = format (0, "\n");
+  PRINT_S;
+
+  return handle;
+}
 
 static inline void *
 vl_api_acl_interface_set_acl_list_t_print (vl_api_acl_interface_set_acl_list_t
@@ -299,6 +361,30 @@ vl_api_acl_interface_set_acl_list_t_print (vl_api_acl_interface_set_acl_list_t
   return handle;
 }
 
+static inline void *
+vl_api_acl_interface_set_etype_whitelist_t_print (vl_api_acl_interface_set_etype_whitelist_t
+					   * a, void *handle)
+{
+  u8 *s;
+  int i;
+
+  s = format
+    (0, "SCRIPT: acl_interface_set_etype_whitelist sw_if_index %d count %d\n",
+     clib_net_to_host_u32 (a->sw_if_index), (u32) a->count);
+
+  s = format (s, "    input ");
+
+  for (i = 0; i < a->count; i++)
+    {
+      if (i == a->n_input)
+        s = format (s, "output ");
+      s = format (s, "%x ", clib_net_to_host_u16 (a->whitelist[i]));
+    }
+
+  PRINT_S;
+  return handle;
+}
+
 static inline void *
 vl_api_acl_interface_add_del_t_print (vl_api_acl_interface_add_del_t * a,
 				      void *handle)