Add reaper functions to want events APIs (VPP-1304)

[vpp.git] / src / vlibapi / api_helper_macros.h

diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h
index fc9374f..fe9cde0 100644 (file)
--- a/src/vlibapi/api_helper_macros.h
+++ b/src/vlibapi/api_helper_macros.h
@@ -40,7 +40,7 @@ do {                                                                    \
     rmp->context = mp->context;                                         \
     rmp->retval = ntohl(rv);                                            \
                                                                         \
-    vl_msg_api_send (rp, (u8 *)rmp);                                    \
+    vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
 #define REPLY_MACRO2(t, body)                                           \
@@ -56,7 +56,7 @@ do {                                                                    \
     rmp->context = mp->context;                                         \
     rmp->retval = ntohl(rv);                                            \
     do {body;} while (0);                                               \
-    vl_msg_api_send (rp, (u8 *)rmp);                                    \
+    vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
 #define REPLY_MACRO3(t, n, body)                                        \
@@ -72,7 +72,7 @@ do {                                                                    \
     rmp->context = mp->context;                                         \
     rmp->retval = ntohl(rv);                                            \
     do {body;} while (0);                                               \
-    vl_msg_api_send (rp, (u8 *)rmp);                                    \
+    vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
 #define REPLY_MACRO4(t, n, body)                                        \
@@ -103,7 +103,7 @@ do {                                                                    \
     rmp->retval = ntohl(rv);                                            \
     if (!is_error)                                                      \
       do {body;} while (0);                                             \
-    vl_msg_api_send (rp, (u8 *)rmp);                                    \
+    vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
 /* "trust, but verify" */
@@ -207,7 +207,25 @@ static void vl_api_want_##lca##_t_handler (                             \
                                                                         \
 reply:                                                                  \
     REPLY_MACRO (VL_API_WANT_##UCA##_REPLY);                            \
-}
+}                                                                       \
+                                                                        \
+static clib_error_t * vl_api_want_##lca##_t_reaper (u32 client_index)   \
+{                                                                       \
+    vpe_api_main_t *vam = &vpe_api_main;                                \
+    vpe_client_registration_t *rp;                                      \
+    uword *p;                                                           \
+                                                                        \
+    p = hash_get (vam->lca##_registrations, client_index);              \
+    if (p)                                                              \
+      {                                                                 \
+        rp = pool_elt_at_index (vam->lca##_registrations, p[0]);        \
+        pool_put (vam->lca##_registrations, rp);                        \
+        hash_unset (vam->lca##_registration_hash, client_index);        \
+      }                                                                 \
+    return (NULL);                                                      \
+}                                                                       \
+                                                                        \
+VL_MSG_API_REAPER_FUNCTION (vl_api_want_##lca##_t_reaper);              \
 
 #define foreach_registration_hash               \
 _(interface_events)                             \
@@ -218,7 +236,9 @@ _(from_netconf_client)                          \
 _(oam_events)                                   \
 _(bfd_events)                                   \
 _(wc_ip6_nd_events)                             \
-_(wc_ip4_arp_events)
+_(wc_ip4_arp_events)                            \
+_(ip6_ra_events)                                \
+_(dhcp6_pd_reply_events)
 
 typedef struct
 {