X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_helper_macros.h;h=2662df8356b3df40c2eb38e1a77e1ffcf8427e46;hb=2a1ca787b;hp=fc9374f8a26a987579331c7ab9e4e80cb19ea91b;hpb=59b2565cd91a67ced650739f36129650830211ac;p=vpp.git

diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h
index fc9374f8a26..2662df8356b 100644
--- 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,22 @@ 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_MACRO_DETAILS2(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 = htons((t)+(REPLY_MSG_ID_BASE));                   \
+    rmp->context = mp->context;                                         \
+    do {body;} while (0);                                               \
+    vl_api_send_msg (rp, (u8 *)rmp);                                    \
 } while(0);
 
 #define REPLY_MACRO3(t, n, body)                                        \
@@ -72,7 +87,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)                                        \
@@ -94,7 +109,7 @@ do {                                                                    \
         if (!rmp)                                                       \
           return;                                                       \
                                                                         \
-        memset (rmp, 0, sizeof (*rmp));                                 \
+        clib_memset (rmp, 0, sizeof (*rmp));                                 \
         rv = VNET_API_ERROR_TABLE_TOO_BIG;                              \
         is_error = 1;                                                   \
       }                                                                 \
@@ -103,7 +118,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" */
@@ -115,7 +130,7 @@ vnet_sw_if_index_is_api_valid (u32 sw_if_index)
 }
 
 #define VALIDATE_SW_IF_INDEX(mp)				\
- do { u32 __sw_if_index = ntohl(mp->sw_if_index);		\
+ do { u32 __sw_if_index = ntohl((mp)->sw_if_index);		\
     if (!vnet_sw_if_index_is_api_valid(__sw_if_index)) {        \
         rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
         goto bad_sw_if_index;                                   \
@@ -129,7 +144,7 @@ bad_sw_if_index:                                \
 } while (0);
 
 #define VALIDATE_RX_SW_IF_INDEX(mp)				\
- do { u32 __rx_sw_if_index = ntohl(mp->rx_sw_if_index);		\
+ do { u32 __rx_sw_if_index = ntohl((mp)->rx_sw_if_index);       \
     if (!vnet_sw_if_index_is_api_valid(__rx_sw_if_index)) {     \
         rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;                \
         goto bad_rx_sw_if_index;				\
@@ -183,7 +198,7 @@ static void vl_api_want_##lca##_t_handler (                             \
     p = hash_get (vam->lca##_registration_hash, mp->client_index);      \
     if (p) {                                                            \
         if (mp->enable_disable) {                                       \
-            clib_warning ("pid %d: already enabled...", mp->pid);       \
+	    clib_warning ("pid %d: already enabled...", ntohl(mp->pid)); \
             rv = VNET_API_ERROR_INVALID_REGISTRATION;                   \
             goto reply;                                                 \
         } else {                                                        \
@@ -207,7 +222,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##_registration_hash, 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 +251,10 @@ _(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)                        \
+_(dhcp6_reply_events)
 
 typedef struct
 {