X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fvat.h;h=bcaddfe01267db2351c0e67e64d24424c335136a;hb=053204ab039d34a990ff0e14c32ce3b294fcce0e;hp=beeccd5dc67c86fec8aea268abbeca7659e18c76;hpb=e86a8edd3c14fb41ace2a12efd17bc7772bf623f;p=vpp.git

diff --git a/src/vat/vat.h b/src/vat/vat.h
index beeccd5dc67..bcaddfe0126 100644
--- a/src/vat/vat.h
+++ b/src/vat/vat.h
@@ -24,6 +24,7 @@
 #include <vppinfra/clib.h>
 #include <vppinfra/format.h>
 #include <vppinfra/error.h>
+#include <vppinfra/elog.h>
 #include <vppinfra/time.h>
 #include <vppinfra/macros.h>
 #include <vppinfra/socket.h>
@@ -47,17 +48,27 @@ typedef struct
    */
   u32 sub_id;
 
-  /* 0 = dot1q, 1=dot1ad */
-  u8 sub_dot1ad;
-
   /* Number of tags 0-2 */
   u8 sub_number_of_tags;
   u16 sub_outer_vlan_id;
   u16 sub_inner_vlan_id;
-  u8 sub_exact_match;
-  u8 sub_default;
-  u8 sub_outer_vlan_id_any;
-  u8 sub_inner_vlan_id_any;
+
+  union
+  {
+    u16 raw_flags;
+    struct
+    {
+      u16 no_tags:1;
+      u16 one_tag:1;
+      u16 two_tags:1;
+      /* 0 = dot1q, 1=dot1ad */
+      u16 sub_dot1ad:1;
+      u16 sub_exact_match:1;
+      u16 sub_default:1;
+      u16 sub_outer_vlan_id_any:1;
+      u16 sub_inner_vlan_id_any:1;
+    };
+  };
 
   /* vlan tag rewrite */
   u32 vtr_op;
@@ -129,7 +140,7 @@ typedef struct
 
   /* Graph node table */
   uword *graph_node_index_by_name;
-  vlib_node_t **graph_nodes;
+  vlib_node_t ***graph_nodes;
 
   /* ip tables */
   ip_details_t *ip_details_by_sw_if_index[2];
@@ -209,9 +220,14 @@ typedef struct
   ip4_nbr_counter_t **ip4_nbr_counters;
   ip6_nbr_counter_t **ip6_nbr_counters;
 
+  ssvm_private_t stat_segment;
+  clib_spinlock_t *stat_segment_lockp;
+
   socket_client_main_t *socket_client_main;
   u8 *socket_name;
 
+  elog_main_t elog_main;
+
   /* Convenience */
   vlib_main_t *vlib_main;
 } vat_main_t;
@@ -227,8 +243,8 @@ void do_one_file (vat_main_t * vam);
 int exec (vat_main_t * vam);
 
 /* Plugin API library functions */
-char *vat_plugin_path;
-char *vat_plugin_name_filter;
+extern char *vat_plugin_path;
+extern char *vat_plugin_name_filter;
 void vat_plugin_api_reference (void);
 uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
 uword unformat_ip4_address (unformat_input_t * input, va_list * args);