X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fsnat%2Fsnat_test.c;h=50e81eaec46f74cc1e36d3ebd29f6bd0c018592d;hb=2d23eca3e583cc3408d4fafc3aae6fe5b1109e55;hp=c6f9a8ff62dcfda7cb64ed5b6d32e5a326d4cb8f;hpb=8a2aea3fce9dad7c729c82ee39ce95b4f357bc83;p=vpp.git

diff --git a/src/plugins/snat/snat_test.c b/src/plugins/snat/snat_test.c
index c6f9a8ff62d..50e81eaec46 100644
--- a/src/plugins/snat/snat_test.c
+++ b/src/plugins/snat/snat_test.c
@@ -109,12 +109,12 @@ _(SNAT_IPFIX_ENABLE_DISABLE_REPLY,                              \
 static int api_snat_add_address_range (vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
-  f64 timeout;
   ip4_address_t start_addr, end_addr;
   u32 start_host_order, end_host_order;
   vl_api_snat_add_address_range_t * mp;
   u8 is_add = 1;
   int count;
+  int ret;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -159,21 +159,20 @@ static int api_snat_add_address_range (vat_main_t * vam)
   mp->is_ip4 = 1;
   mp->is_add = is_add;
 
-  S; W;
-
-  /* NOTREACHED */
-  return 0;
+  S(mp);
+  W (ret);
+  return ret;
 }
 
 static int api_snat_interface_add_del_feature (vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
-  f64 timeout;
   vl_api_snat_interface_add_del_feature_t * mp;
   u32 sw_if_index;
   u8 sw_if_index_set = 0;
   u8 is_inside = 1; 
   u8 is_add = 1;
+  int ret;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -205,15 +204,14 @@ static int api_snat_interface_add_del_feature (vat_main_t * vam)
   mp->is_add = is_add;
   mp->is_inside = is_inside;
   
-  S; W;
-  /* NOTREACHED */
-  return 0;
+  S(mp);
+  W (ret);
+  return ret;
 }
 
 static int api_snat_add_static_mapping(vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
-  f64 timeout;
   vl_api_snat_add_static_mapping_t * mp;
   u8 external_addr_set = 0;
   u8 local_addr_set;
@@ -223,6 +221,7 @@ static int api_snat_add_static_mapping(vat_main_t * vam)
   u32 local_port = 0, external_port = 0, vrf_id = ~0;
   u32 sw_if_index = ~0;
   u8 sw_if_index_set = 0;
+  int ret;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -273,9 +272,9 @@ static int api_snat_add_static_mapping(vat_main_t * vam)
   memcpy (mp->local_ip_address, &local_addr, 4);
   memcpy (mp->external_ip_address, &external_addr, 4);
 
-  S; W;
-  /* NOTREACHED */
-  return 0;
+  S(mp);
+  W (ret);
+  return ret;
 }
 
 static void vl_api_snat_control_ping_reply_t_handler
@@ -317,8 +316,9 @@ static void vl_api_snat_static_mapping_details_t_handler
 
 static int api_snat_static_mapping_dump(vat_main_t * vam)
 {
-  f64 timeout;
   vl_api_snat_static_mapping_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
+  int ret;
 
   if (vam->json_output)
     {
@@ -331,16 +331,14 @@ static int api_snat_static_mapping_dump(vat_main_t * vam)
            "port", "vrf");
 
   M(SNAT_STATIC_MAPPING_DUMP, mp);
-  S;
+  S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
+  W (ret);
+  return ret;
 }
 
 static void vl_api_snat_show_config_reply_t_handler
@@ -376,8 +374,8 @@ static void vl_api_snat_show_config_reply_t_handler
 
 static int api_snat_show_config(vat_main_t * vam)
 {
-  f64 timeout;
   vl_api_snat_show_config_t * mp;
+  int ret;
 
   if (vam->json_output)
     {
@@ -386,9 +384,9 @@ static int api_snat_show_config(vat_main_t * vam)
     }
 
   M(SNAT_SHOW_CONFIG, mp);
-  S; W;
-  /* NOTREACHED */
-  return 0;
+  S(mp);
+  W (ret);
+  return ret;
 }
 
 static void vl_api_snat_address_details_t_handler
@@ -402,8 +400,9 @@ static void vl_api_snat_address_details_t_handler
 
 static int api_snat_address_dump(vat_main_t * vam)
 {
-  f64 timeout;
   vl_api_snat_address_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
+  int ret;
 
   if (vam->json_output)
     {
@@ -412,16 +411,14 @@ static int api_snat_address_dump(vat_main_t * vam)
     }
 
   M(SNAT_ADDRESS_DUMP, mp);
-  S;
+  S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
+  W (ret);
+  return ret;
 }
 
 static void vl_api_snat_interface_details_t_handler
@@ -436,8 +433,9 @@ static void vl_api_snat_interface_details_t_handler
 
 static int api_snat_interface_dump(vat_main_t * vam)
 {
-  f64 timeout;
   vl_api_snat_interface_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
+  int ret;
 
   if (vam->json_output)
     {
@@ -446,24 +444,22 @@ static int api_snat_interface_dump(vat_main_t * vam)
     }
 
   M(SNAT_INTERFACE_DUMP, mp);
-  S;
+  S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
+  W (ret);
+  return ret;
 }
 
 static int api_snat_set_workers (vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
-  f64 timeout;
   vl_api_snat_set_workers_t * mp;
   uword *bitmap;
+  int ret;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -479,10 +475,9 @@ static int api_snat_set_workers (vat_main_t * vam)
   M(SNAT_SET_WORKERS, mp);
   mp->worker_mask = clib_host_to_net_u64 (bitmap[0]);
 
-  S; W;
-
-  /* NOTREACHED */
-  return 0;
+  S(mp);
+  W (ret);
+  return ret;
 }
 
 static void vl_api_snat_worker_details_t_handler
@@ -497,8 +492,9 @@ static void vl_api_snat_worker_details_t_handler
 
 static int api_snat_worker_dump(vat_main_t * vam)
 {
-  f64 timeout;
   vl_api_snat_worker_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
+  int ret;
 
   if (vam->json_output)
     {
@@ -507,26 +503,24 @@ static int api_snat_worker_dump(vat_main_t * vam)
     }
 
   M(SNAT_WORKER_DUMP, mp);
-  S;
+  S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
+  W (ret);
+  return ret;
 }
 
 static int api_snat_ipfix_enable_disable (vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
-  f64 timeout;
   vl_api_snat_add_del_interface_addr_t * mp;
   u32 sw_if_index;
   u8 sw_if_index_set = 0;
   u8 is_add = 1;
+  int ret;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -553,9 +547,9 @@ static int api_snat_ipfix_enable_disable (vat_main_t * vam)
   mp->sw_if_index = ntohl(sw_if_index);
   mp->is_add = is_add;
   
-  S; W;
-  /* NOTREACHED */
-  return 0;
+  S(mp);
+  W (ret);
+  return ret;
 }
 
 static void vl_api_snat_interface_addr_details_t_handler
@@ -569,8 +563,9 @@ static void vl_api_snat_interface_addr_details_t_handler
 
 static int api_snat_interface_addr_dump(vat_main_t * vam)
 {
-  f64 timeout;
   vl_api_snat_interface_addr_dump_t * mp;
+  vl_api_snat_control_ping_t *mp_ping;
+  int ret;
 
   if (vam->json_output)
     {
@@ -579,26 +574,24 @@ static int api_snat_interface_addr_dump(vat_main_t * vam)
     }
 
   M(SNAT_INTERFACE_ADDR_DUMP, mp);
-  S;
+  S(mp);
+
   /* Use a control ping for synchronization */
-  {
-    vl_api_snat_control_ping_t *mp;
-    M(SNAT_CONTROL_PING, mp);
-    S;
-  }
-  W;
-  /* NOTREACHED */
-  return 0;
+  M(SNAT_CONTROL_PING, mp_ping);
+  S(mp_ping);
+
+  W (ret);
+  return ret;
 }
 
 static int api_snat_add_del_interface_addr (vat_main_t * vam)
 {
   unformat_input_t * i = vam->input;
-  f64 timeout;
   vl_api_snat_ipfix_enable_disable_t * mp;
   u32 domain_id = 0;
   u32 src_port = 0;
   u8 enable = 1;
+  int ret;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -620,9 +613,9 @@ static int api_snat_add_del_interface_addr (vat_main_t * vam)
   mp->src_port = htons((u16) src_port);
   mp->enable = enable;
 
-  S; W;
-  /* NOTREACHED */
-  return 0;
+  S(mp);
+  W (ret);
+  return ret;
 }
 
 /*