X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi.h;h=431155c5e093aba080335e4039bf7735a1981542;hb=7784140f2bd2d5ae44f2be1507ac25f102006155;hp=49f5d5fb08521fe081ccb545cb3a92ea441c47af;hpb=58eb866b15a45514dc356170f28640d6c9db8034;p=vpp.git

diff --git a/src/vlibapi/api.h b/src/vlibapi/api.h
index 49f5d5fb085..431155c5e09 100644
--- a/src/vlibapi/api.h
+++ b/src/vlibapi/api.h
@@ -23,17 +23,16 @@
 #include <stddef.h>
 #include <vppinfra/error.h>
 #include <svm/svm.h>
+#include <svm/queue.h>
 #include <vlib/vlib.h>
-#include <vlibmemory/unix_shared_memory_queue.h>
 #include <vlib/unix/unix.h>
 #include <vlibapi/api_common.h>
 
 /* *INDENT-OFF* */
-typedef CLIB_PACKED
-(struct
- {
-   u8 endian; u8 wrapped;
+typedef CLIB_PACKED ( struct {
    u32 nitems;
+   u32 msgtbl_size;
+   u8 wrapped;
 }) vl_api_trace_file_header_t;
 /* *INDENT-ON* */
 
@@ -56,7 +55,6 @@ int vl_msg_api_trace_save (api_main_t * am,
     _error;                                                             \
   })
 
-
 #define _VL_MSG_API_FUNCTION_SYMBOL(x, type)	\
   _vl_msg_api_##type##_function_##x
 
@@ -70,7 +68,7 @@ static void __vl_msg_api_add_##tag##_function_##x (void)                \
                                                                         \
 static void __vl_msg_api_add_##tag##_function_##x (void)                \
 {                                                                       \
- api_main_t * am = &api_main;                                           \
+ api_main_t * am = vlibapi_get_main();                                  \
  static _vl_msg_api_function_list_elt_t _vl_msg_api_function;           \
  _vl_msg_api_function.next_init_function                                \
     = am->tag##_function_registrations;                                 \
@@ -107,18 +105,22 @@ int vl_msg_api_trace_onoff (api_main_t * am, vl_api_trace_which_t which,
 int vl_msg_api_trace_free (api_main_t * am, vl_api_trace_which_t which);
 int vl_msg_api_trace_configure (api_main_t * am, vl_api_trace_which_t which,
 				u32 nitems);
-void vl_msg_api_handler_with_vm_node (api_main_t * am,
+void vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
 				      void *the_msg, vlib_main_t * vm,
-				      vlib_node_runtime_t * node);
+				      vlib_node_runtime_t * node,
+				      u8 is_private);
+u32 vl_msg_api_max_length (void *mp);
 vl_api_trace_t *vl_msg_api_trace_get (api_main_t * am,
 				      vl_api_trace_which_t which);
 void vl_msg_api_add_msg_name_crc (api_main_t * am, const char *string,
 				  u32 id);
+void vl_msg_api_add_version (api_main_t * am, const char *string,
+			     u32 major, u32 minor, u32 patch);
 /* node_serialize.c prototypes */
-u8 *vlib_node_serialize (vlib_node_main_t * nm, u8 * vector,
-			 u32 max_threads, int include_nexts,
-			 int include_stats);
-vlib_node_t **vlib_node_unserialize (u8 * vector);
+u8 *vlib_node_serialize (vlib_main_t * vm, vlib_node_t *** node_dups,
+			 u8 * vector, int include_nexts, int include_stats);
+vlib_node_t ***vlib_node_unserialize (u8 * vector);
+
 u32 vl_msg_api_get_msg_length (void *msg_arg);
 
 #endif /* included_api_h */