X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Funix%2Fplugin.h;h=1c46e6b196cbe9b292114879aea52558cbd4e63e;hb=19658c990b9514b4e42e9a6aeb93116a6213c148;hp=d9801ec439ae7f891813ddbc7b392591c794223f;hpb=1bfb0ddace3ebb9010275e4bdd847c8c493ff4b3;p=vpp.git

diff --git a/src/vlib/unix/plugin.h b/src/vlib/unix/plugin.h
index d9801ec439a..1c46e6b196c 100644
--- a/src/vlib/unix/plugin.h
+++ b/src/vlib/unix/plugin.h
@@ -56,15 +56,43 @@
  * vlib_load_new_plugins().
  */
 
-/* *INDENT-OFF* */
-typedef CLIB_PACKED(struct {
-  u8 default_disabled;
+typedef struct
+{
+  u8 default_disabled : 1;
+  u8 deep_bind : 1;
   const char version[32];
   const char version_required[32];
+  const char overrides[256];
   const char *early_init;
   const char *description;
-}) vlib_plugin_registration_t;
-/* *INDENT-ON* */
+} __clib_packed vlib_plugin_registration_t;
+
+/*
+ * Plugins may also use this registration format, which is
+ * easy enough to emit from e.g. a golang compiler.
+ */
+typedef struct
+{
+  uword data_segment_offset;
+  uword length;
+} vlib_r2_string_t;
+
+typedef struct
+{
+  int default_disabled;
+  vlib_r2_string_t version;
+  vlib_r2_string_t version_required;
+  vlib_r2_string_t overrides;
+  vlib_r2_string_t early_init;
+  vlib_r2_string_t description;
+} vlib_plugin_r2_t;
+
+#define foreach_r2_string_field                 \
+_(version)                                      \
+_(version_required)                             \
+_(overrides)                                    \
+_(early_init)                                   \
+_(description)
 
 typedef struct
 {
@@ -91,15 +119,23 @@ typedef struct
   /* loaded plugin info */
   plugin_info_t *plugin_info;
   uword *plugin_by_name_hash;
+  uword *plugin_overrides_by_name_hash;
 
-  /* path and name filter */
+  /* paths and name filters */
   u8 *plugin_path;
+  u8 *plugin_path_add;
   u8 *plugin_name_filter;
+  u8 *vat_plugin_path;
+  u8 *vat_plugin_name_filter;
+  u8 plugins_default_disable;
 
   /* plugin configs and hash by name */
   plugin_config_t *configs;
   uword *config_index_by_name;
 
+  /* Plugin log, avoid filling syslog w/ junk */
+  vlib_log_class_t logger;
+
   /* usual */
   vlib_main_t *vlib_main;
 } plugin_main_t;
@@ -110,10 +146,38 @@ clib_error_t *vlib_plugin_config (vlib_main_t * vm, unformat_input_t * input);
 int vlib_plugin_early_init (vlib_main_t * vm);
 int vlib_load_new_plugins (plugin_main_t * pm, int from_early_init);
 void *vlib_get_plugin_symbol (char *plugin_name, char *symbol_name);
+u8 *vlib_get_vat_plugin_path (void);
 
 #define VLIB_PLUGIN_REGISTER() \
   vlib_plugin_registration_t vlib_plugin_registration \
-  __attribute__((__section__(".vlib_plugin_registration")))
+  CLIB_NOSANITIZE_PLUGIN_REG_SECTION \
+  __clib_export __clib_section(".vlib_plugin_registration")
+
+/* Call a plugin init function: used for init function dependencies. */
+#define vlib_call_plugin_init_function(vm,p,x)                  \
+({                                                              \
+  clib_error_t *(*_f)(vlib_main_t *);                           \
+  uword *_fptr = 0;                                             \
+  clib_error_t * _error = 0;                                    \
+  _fptr= vlib_get_plugin_symbol                                 \
+    (p, CLIB_STRING_MACRO(_vlib_init_function_##x));            \
+  if (_fptr == 0)                                               \
+    {                                                           \
+      _error = clib_error_return                                \
+        (0, "Plugin %s and/or symbol %s not found.",            \
+         p, CLIB_STRING_MACRO(_vlib_init_function_##x));        \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      _f = (void *)(_fptr[0]);                                  \
+    }                                                           \
+  if (_fptr && ! hash_get (vm->init_functions_called, _f))      \
+    {                                                           \
+      hash_set1 (vm->init_functions_called, _f);                \
+      _error = _f (vm);                                         \
+    }                                                           \
+  _error;                                                       \
+ })
 
 #endif /* __included_plugin_h__ */