X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fvat.h;h=32de90e44117665bf8ecfa2df227c5049781e489;hb=refs%2Fchanges%2F37%2F28837%2F3;hp=ddb4644848ad8af74e8a51228e3021b41a0ee016;hpb=90a63988fa01685626b6d6a01b79ea5370f7fbac;p=vpp.git

diff --git a/src/vat/vat.h b/src/vat/vat.h
index ddb4644848a..32de90e4411 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;
@@ -116,10 +127,12 @@ typedef struct
   u64 bytes;
 } ip6_nbr_counter_t;
 
+struct vat_registered_features_t;
+
 typedef struct
 {
   /* vpe input queue */
-  unix_shared_memory_queue_t *vl_input_queue;
+  svm_queue_t *vl_input_queue;
 
   /* interface name table */
   uword *sw_if_index_by_interface_name;
@@ -129,7 +142,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];
@@ -147,7 +160,7 @@ typedef struct
   uword *help_by_name;
 
   /* macro table */
-  macro_main_t macro_main;
+  clib_macro_main_t macro_main;
 
   /* Errors by number */
   uword *error_string_by_error_number;
@@ -209,9 +222,16 @@ 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;
+
+  struct vat_registered_features_t *feature_function_registrations;
+
   /* Convenience */
   vlib_main_t *vlib_main;
 } vat_main_t;
@@ -227,8 +247,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);
@@ -251,6 +271,31 @@ void api_cli_output (void *, const char *fmt, ...);
 void fformat_append_cr (FILE *, const char *fmt, ...);
 #endif
 
+
+typedef clib_error_t *(vat_feature_function_t) (vat_main_t * vam);
+typedef struct vat_registered_features_t
+{
+  vat_feature_function_t *function;
+  struct vat_registered_features_t *next;
+} vat_registered_features_t;
+
+
+#define VAT_REGISTER_FEATURE_FUNCTION(x)                               \
+    vat_registered_features_t _vat_feature_function_##x;               \
+static void __vlib_add_config_function_##x (void)                      \
+    __attribute__((__constructor__)) ;                                 \
+static void __vlib_add_config_function_##x (void)                      \
+{                                                                      \
+  vat_main_t * vam = &vat_main;                                                \
+  _vat_feature_function_##x.next = vam->feature_function_registrations;        \
+  vam->feature_function_registrations = &_vat_feature_function_##x;    \
+}                                                                      \
+ vat_registered_features_t _vat_feature_function_##x =		       \
+   {								       \
+    .function = x,						       \
+   }
+
+
 #endif /* __included_vat_h__ */
 
 /*