X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fioam%2Fudp-ping%2Fudp_ping_test.c;h=d435b224476c47516ea1811372fcaecaa20c904e;hb=983ebaa3ee58f93729ad96d6af24e93784ae43d8;hp=4ec11351221707423fb7f95427b04eadd4351f8d;hpb=b6391a90c4940f2828ad7a637fca39ccbdd1fd07;p=vpp.git

diff --git a/src/plugins/ioam/udp-ping/udp_ping_test.c b/src/plugins/ioam/udp-ping/udp_ping_test.c
index 4ec11351221..d435b224476 100644
--- a/src/plugins/ioam/udp-ping/udp_ping_test.c
+++ b/src/plugins/ioam/udp-ping/udp_ping_test.c
@@ -21,36 +21,23 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
 
 /* Declare message IDs */
-#include <ioam/udp-ping/udp_ping_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/udp-ping/udp_ping_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
+#include <ioam/udp-ping/udp_ping.api_enum.h>
+#include <ioam/udp-ping/udp_ping.api_types.h>
 
 #define vl_endianfun		/* define message structures */
-#include <ioam/udp-ping/udp_ping_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
 #define vl_printfun
-#include <ioam/udp-ping/udp_ping_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
+#define vl_print(handle, ...)
 #define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/udp-ping/udp_ping_all_api_h.h>
+#include <ioam/udp-ping/udp_ping.api.h>
+#undef vl_endianfun
+#undef vl_printfun
 #undef vl_api_version
 
-
 typedef struct
 {
   /* API message ID base */
@@ -95,7 +82,7 @@ _(UDP_PING_EXPORT_REPLY, udp_ping_export_reply)                         \
 do {                                                            \
     vam->result_ready = 0;                                      \
     mp = vl_msg_api_alloc(sizeof(*mp));                         \
-    memset (mp, 0, sizeof (*mp));                               \
+    clib_memset (mp, 0, sizeof (*mp));                               \
     mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base);      \
     mp->client_index = vam->my_client_index;                    \
 } while(0);
@@ -117,11 +104,11 @@ do {                                            \
 } while(0);
 
 static int
-api_udp_ping_add_del_req (vat_main_t * vam)
+api_udp_ping_add_del (vat_main_t * vam)
 {
   udp_ping_test_main_t *sm = &udp_ping_test_main;
   unformat_input_t *input = vam->input;
-  vl_api_udp_ping_add_del_req_t *mp;
+  vl_api_udp_ping_add_del_t *mp;
   int rv = 0;
   ip6_address_t dst, src;
   u32 start_src_port, end_src_port;
@@ -152,7 +139,7 @@ api_udp_ping_add_del_req (vat_main_t * vam)
 	break;
     }
 
-  M (UDP_PING_ADD_DEL_REQ, udp_ping_add);
+  M (UDP_PING_ADD_DEL, udp_ping_add);
 
   clib_memcpy (mp->src_ip_address, &src, 16);
   clib_memcpy (mp->dst_ip_address, &dst, 16);
@@ -171,11 +158,11 @@ api_udp_ping_add_del_req (vat_main_t * vam)
 }
 
 static int
-api_udp_ping_export_req (vat_main_t * vam)
+api_udp_ping_export (vat_main_t * vam)
 {
   udp_ping_test_main_t *sm = &udp_ping_test_main;
   unformat_input_t *input = vam->input;
-  vl_api_udp_ping_export_req_t *mp;
+  vl_api_udp_ping_export_t *mp;
   int rv = 0;
   int is_add = 1;
   f64 timeout;
@@ -190,7 +177,7 @@ api_udp_ping_export_req (vat_main_t * vam)
 	break;
     }
 
-  M (UDP_PING_EXPORT_REQ, udp_ping_export);
+  M (UDP_PING_EXPORT, udp_ping_export);
 
   mp->enable = is_add;
 
@@ -205,13 +192,13 @@ api_udp_ping_export_req (vat_main_t * vam)
  * and that the data plane plugin processes
  */
 #define foreach_vpe_api_msg \
-_(udp_ping_add_del_req, "src <local IPv6 address>  start-src-port <first local port> "\
+_(udp_ping_add_del, "src <local IPv6 address>  start-src-port <first local port> "\
   "end-src-port <last local port> " \
   "dst <remote IPv6 address> start-dst-port <first destination port> "\
   "end-dst-port <last destination port> "\
   "interval <time interval in sec for which ping packet will be sent> "\
   "[disable]")                         \
-_(udp_ping_export_req, "export [disable]")                                         \
+_(udp_ping_export, "export [disable]")                                         \
 
 
 static void
@@ -242,7 +229,7 @@ udp_ping_test_api_hookup (vat_main_t * vam)
 }
 
 clib_error_t *
-vat_plugin_register (vat_main_t * vam)
+udp_ping_vat_plugin_register (vat_main_t * vam)
 {
   udp_ping_test_main_t *sm = &udp_ping_test_main;
   u8 *name;