ip: Path MTU

[vpp.git] / src / vat / vat.h

diff --git a/src/vat/vat.h b/src/vat/vat.h
index e21940c..32de90e 100644 (file)
--- a/src/vat/vat.h
+++ b/src/vat/vat.h
@@ -48,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;
@@ -117,6 +127,8 @@ typedef struct
   u64 bytes;
 } ip6_nbr_counter_t;
 
+struct vat_registered_features_t;
+
 typedef struct
 {
   /* vpe input queue */
@@ -148,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;
@@ -218,6 +230,8 @@ typedef struct
 
   elog_main_t elog_main;
 
+  struct vat_registered_features_t *feature_function_registrations;
+
   /* Convenience */
   vlib_main_t *vlib_main;
 } vat_main_t;
@@ -257,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__ */
 
 /*