X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_helper_macros.h;h=d49282e9e65f4b9109b6761ca309ee7eee25344f;hb=44db1caef;hp=57502570f118c85495c512e141aeb168b7b7ed65;hpb=f5db3711b28db4e364ac01be8b124dd24d573782;p=vpp.git

diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h
index 57502570f11..d49282e9e65 100644
--- a/src/vlibapi/api_helper_macros.h
+++ b/src/vlibapi/api_helper_macros.h
@@ -43,6 +43,25 @@ do {                                                                    \
     vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
+#define REPLY_MACRO_END(t)                                              \
+do {                                                                    \
+    vl_api_registration_t *rp;                                          \
+    rv = vl_msg_api_pd_handler (mp, rv);                                \
+    rp = vl_api_client_index_to_registration (mp->client_index);        \
+    if (rp == 0)                                                        \
+      return;                                                           \
+                                                                        \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                             \
+    rmp->_vl_msg_id = t+(REPLY_MSG_ID_BASE);                            \
+    rmp->context = mp->context;                                         \
+    rmp->retval = rv;                                                   \
+    api_main_t *am = vlibapi_get_main ();				\
+    void (*endian_fp) (void *);						\
+    endian_fp = am->msg_endian_handlers[t+(REPLY_MSG_ID_BASE)];		\
+    (*endian_fp) (rmp);							\
+    vl_api_send_msg (rp, (u8 *)rmp);                                    \
+} while(0);
+
 #define REPLY_MACRO2(t, body)                                           \
 do {                                                                    \
     vl_api_registration_t *rp;                                          \
@@ -59,6 +78,26 @@ do {                                                                    \
     vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
+#define REPLY_MACRO2_END(t, body)                                       \
+do {                                                                    \
+    vl_api_registration_t *rp;                                          \
+    rv = vl_msg_api_pd_handler (mp, rv);                                \
+    rp = vl_api_client_index_to_registration (mp->client_index);        \
+    if (rp == 0)                                                        \
+      return;                                                           \
+                                                                        \
+    rmp = vl_msg_api_alloc (sizeof (*rmp));                             \
+    rmp->_vl_msg_id = t+(REPLY_MSG_ID_BASE);                            \
+    rmp->context = mp->context;                                         \
+    rmp->retval = rv;                                                   \
+    do {body;} while (0);                                               \
+    api_main_t *am = vlibapi_get_main ();				\
+    void (*endian_fp) (void *);						\
+    endian_fp = am->msg_endian_handlers[t+(REPLY_MSG_ID_BASE)];		\
+    (*endian_fp) (rmp);							\
+    vl_api_send_msg (rp, (u8 *)rmp);                                    \
+} while(0);
+
 #define REPLY_MACRO2_ZERO(t, body)                                      \
 do {                                                                    \
     vl_api_registration_t *rp;                                          \
@@ -162,7 +201,47 @@ do {                                                                    \
     vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
-#define REPLY_AND_DETAILS_MACRO(t, p, body)			\
+#define REPLY_AND_DETAILS_MACRO(t, p, body)                                   \
+  do                                                                          \
+    {                                                                         \
+      if (pool_elts (p) == 0)                                                 \
+	{                                                                     \
+	  REPLY_MACRO (t);                                                    \
+	  break;                                                              \
+	}                                                                     \
+      vl_api_registration_t *rp;                                              \
+      rp = vl_api_client_index_to_registration (mp->client_index);            \
+      if (rp == 0)                                                            \
+	return;                                                               \
+      u32 cursor = clib_net_to_host_u32 (mp->cursor);                         \
+      vlib_main_t *vm = vlib_get_main ();                                     \
+      f64 start = vlib_time_now (vm);                                         \
+      if (pool_is_free_index (p, cursor))                                     \
+	{                                                                     \
+	  cursor = pool_next_index (p, cursor);                               \
+	  if (cursor == ~0)                                                   \
+	    rv = VNET_API_ERROR_INVALID_VALUE;                                \
+	}                                                                     \
+      while (cursor != ~0)                                                    \
+	{                                                                     \
+	  do                                                                  \
+	    {                                                                 \
+	      body;                                                           \
+	    }                                                                 \
+	  while (0);                                                          \
+	  cursor = pool_next_index (p, cursor);                               \
+	  if (vl_api_process_may_suspend (vm, rp, start))                     \
+	    {                                                                 \
+	      if (cursor != ~0)                                               \
+		rv = VNET_API_ERROR_EAGAIN;                                   \
+	      break;                                                          \
+	    }                                                                 \
+	}                                                                     \
+      REPLY_MACRO2 (t, ({ rmp->cursor = clib_host_to_net_u32 (cursor); }));   \
+    }                                                                         \
+  while (0);
+
+#define REPLY_AND_DETAILS_VEC_MACRO(t, v, mp, rmp, rv, body)	\
 do {								\
   vl_api_registration_t *rp;					\
   rp = vl_api_client_index_to_registration (mp->client_index);	\
@@ -171,17 +250,17 @@ do {								\
   u32 cursor = clib_net_to_host_u32 (mp->cursor);		\
   vlib_main_t *vm = vlib_get_main ();				\
   f64 start = vlib_time_now (vm);				\
-  if (pool_is_free_index (p, cursor)) {				\
-    cursor = pool_next_index (p, cursor);			\
-    if (cursor == ~0)						\
-      rv = VNET_API_ERROR_INVALID_VALUE;			\
-  }								\
-  while (cursor != ~0) {					\
+  if (!v || vec_len (v) == 0) {					\
+    cursor = ~0;						\
+    rv = VNET_API_ERROR_INVALID_VALUE;				\
+  } else if (cursor == ~0)					\
+      cursor = 0;						\
+  while (cursor != ~0 && cursor < vec_len (v)) {		\
     do {body;} while (0);					\
-    cursor = pool_next_index (p, cursor);			\
+    ++cursor;							\
     if (vl_api_process_may_suspend (vm, rp, start)) {   	\
-      if (cursor != ~0)						\
-        rv = VNET_API_ERROR_EAGAIN;				\
+      if (cursor < vec_len (v))					\
+	rv = VNET_API_ERROR_EAGAIN;				\
       break;							\
     }								\
   }								\
@@ -190,6 +269,7 @@ do {								\
   }));								\
 } while(0);
 
+
 /* "trust, but verify" */
 
 static inline uword
@@ -322,7 +402,8 @@ _(bfd_events)                                   \
 _(l2_arp_term_events)                           \
 _(ip6_ra_events)                                \
 _(dhcp6_pd_reply_events)                        \
-_(dhcp6_reply_events)
+_(dhcp6_reply_events)				\
+_(vrrp_vr_events)
 
 typedef struct
 {