"autoreply" flag: autogenerate standard xxx_reply_t messages

Change-Id: I72298aaae7d172082ece3a8edea4217c11b28d79 Signed-off-by: Dave Barach <dave@barachs.net>
author: Dave Barach <dave@barachs.net> 2017-04-24 10:46:54 -0400
committer: Florin Coras <florin.coras@gmail.com> 2017-04-25 16:18:42 +0000
commit: 11b8dbf78af49d270a0e72abe7dea73eec30d85f (patch)
tree: 5c9c513483f5c468efcb64b82c03c32733dc3a77 /src/vnet
parent: 45d3496f3d86ee1a930ce0ffd6ca3d1730355eb8 (diff)
23 files changed, 132 insertions, 1366 deletions
diff --git a/src/vnet/bfd/bfd.api b/src/vnet/bfd/bfd.api
index 2cdcfad3fc8..7bcaa4c322f 100644
--- a/src/vnet/bfd/bfd.api
+++ b/src/vnet/bfd/bfd.api
@@ -18,43 +18,23 @@
     @param context - sender context, to match reply w/ request
     @param sw_if_index - interface to use as echo source
 */
-define bfd_udp_set_echo_source
+autoreply define bfd_udp_set_echo_source
 {
   u32 client_index;
   u32 context;
   u32 sw_if_index;
 };
 
-/** \brief Set BFD feature response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bfd_udp_set_echo_source_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Delete BFD echo source
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
 */
-define bfd_udp_del_echo_source
+autoreply define bfd_udp_del_echo_source
 {
   u32 client_index;
   u32 context;
 };
 
-/** \brief Delete BFD echo source response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bfd_udp_del_echo_source_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add UDP BFD session on interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -69,7 +49,7 @@ define bfd_udp_del_echo_source_reply
     @param bfd_key_id - key id sent out in BFD packets (if is_authenticated)
     @param conf_key_id - id of already configured key (if is_authenticated)
 */
-define bfd_udp_add
+autoreply define bfd_udp_add
 {
   u32 client_index;
   u32 context;
@@ -85,16 +65,6 @@ define bfd_udp_add
   u32 conf_key_id;
 };
 
-/** \brief Add UDP BFD session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bfd_udp_add_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Modify UDP BFD session on interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -106,7 +76,7 @@ define bfd_udp_add_reply
     @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
     @param detect_mult - detect multiplier (# of packets missed before connection goes down)
 */
-define bfd_udp_mod
+autoreply define bfd_udp_mod
 {
   u32 client_index;
   u32 context;
@@ -119,16 +89,6 @@ define bfd_udp_mod
   u8 detect_mult;
 };
 
-/** \brief Modify UDP BFD session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bfd_udp_mod_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Delete UDP BFD session on interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -137,7 +97,7 @@ define bfd_udp_mod_reply
     @param peer_addr - peer address
     @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
 */
-define bfd_udp_del
+autoreply define bfd_udp_del
 {
   u32 client_index;
   u32 context;
@@ -147,16 +107,6 @@ define bfd_udp_del
   u8 is_ipv6;
 };
 
-/** \brief Delete UDP BFD session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bfd_udp_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get all BFD sessions
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -206,7 +156,7 @@ define bfd_udp_session_details
     @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
     @param admin_up_down - set the admin state, 1 = up, 0 = down
 */
-define bfd_udp_session_set_flags
+autoreply define bfd_udp_session_set_flags
 {
   u32 client_index;
   u32 context;
@@ -217,23 +167,13 @@ define bfd_udp_session_set_flags
   u8 admin_up_down;
 };
 
-/** \brief Reply to bfd_udp_session_set_flags
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define bfd_udp_session_set_flags_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Register for BFD events
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param enable_disable - 1 => register for events, 0 => cancel registration
     @param pid - sender's pid
 */
-define want_bfd_events
+autoreply define want_bfd_events
 {
   u32 client_index;
   u32 context;
@@ -241,16 +181,6 @@ define want_bfd_events
   u32 pid;
 };
 
-/** \brief Reply for BFD events registration
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define want_bfd_events_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief BFD UDP - add/replace key to configuration
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -259,7 +189,7 @@ define want_bfd_events_reply
     @param auth_type - authentication type (RFC 5880/4.1/Auth Type)
     @param key - key data
 */
-define bfd_auth_set_key
+autoreply define bfd_auth_set_key
 {
   u32 client_index;
   u32 context;
@@ -269,16 +199,6 @@ define bfd_auth_set_key
   u8 key[20];
 };
 
-/** \brief BFD UDP - add/replace key reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define bfd_auth_set_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief BFD UDP - delete key from configuration
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -286,23 +206,13 @@ define bfd_auth_set_key_reply
     @param key_len - length of key (must be non-zero)
     @param key - key data
 */
-define bfd_auth_del_key
+autoreply define bfd_auth_del_key
 {
   u32 client_index;
   u32 context;
   u32 conf_key_id;
 };
 
-/** \brief BFD UDP - delete key reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define bfd_auth_del_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get a list of configured authentication keys
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -338,7 +248,7 @@ define bfd_auth_keys_details
     @param bfd_key_id - key id sent out in BFD packets
     @param conf_key_id - id of already configured key
 */
-define bfd_udp_auth_activate
+autoreply define bfd_udp_auth_activate
 {
   u32 client_index;
   u32 context;
@@ -351,16 +261,6 @@ define bfd_udp_auth_activate
   u32 conf_key_id;
 };
 
-/** \brief BFD UDP - activate/change authentication reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define bfd_udp_auth_activate_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief BFD UDP - deactivate authentication
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -370,7 +270,7 @@ define bfd_udp_auth_activate_reply
     @param is_ipv6 - local_addr, peer_addr are IPv6 if non-zero, otherwise IPv4
     @param is_delayed - change is applied once peer applies the change (on first received non-authenticated packet)
 */
-define bfd_udp_auth_deactivate
+autoreply define bfd_udp_auth_deactivate
 {
   u32 client_index;
   u32 context;
@@ -381,16 +281,6 @@ define bfd_udp_auth_deactivate
   u8 is_delayed;
 };
 
-/** \brief BFD UDP - deactivate authentication reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define bfd_udp_auth_deactivate_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/classify/classify.api b/src/vnet/classify/classify.api
index 51ebd6c8c6a..cacb9bed7d4 100644
--- a/src/vnet/classify/classify.api
+++ b/src/vnet/classify/classify.api
@@ -92,7 +92,7 @@ define classify_add_del_table_reply
            VRF id if action is 1 or 2.
     @param match[] - for add, match value for session, required
 */
-define classify_add_del_session
+autoreply define classify_add_del_session
 {
   u32 client_index;
   u32 context;
@@ -106,16 +106,6 @@ define classify_add_del_session
   u8 match[0];
 };
 
-/** \brief Classify add / del session response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the add/del session request
-*/
-define classify_add_del_session_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set/unset policer classify interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -127,7 +117,7 @@ define classify_add_del_session_reply
     Note: User is recommeneded to use just one valid table_index per call.
           (ip4_table_index, ip6_table_index, or l2_table_index)
 */
-define policer_classify_set_interface
+autoreply define policer_classify_set_interface
 {
   u32 client_index;
   u32 context;
@@ -138,16 +128,6 @@ define policer_classify_set_interface
   u8 is_add;
 };
 
-/** \brief Set/unset policer classify interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define policer_classify_set_interface_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get list of policer classify interfaces and tables
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -308,7 +288,7 @@ define classify_session_details
     Note: User is recommeneded to use just one valid table_index per call.
           (ip4_table_index, ip6_table_index, or l2_table_index)
 */
-define flow_classify_set_interface {
+autoreply define flow_classify_set_interface {
     u32 client_index;
     u32 context;
     u32 sw_if_index;
@@ -317,15 +297,6 @@ define flow_classify_set_interface {
     u8  is_add;
 };
 
-/** \brief Set/unset flow classify interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define flow_classify_set_interface_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief Get list of flow classify interfaces and tables
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -353,4 +324,4 @@ define flow_classify_details {
  * eval: (c-set-style "gnu")
  * End:
  */
- 
-\ No newline at end of file
+ 
diff --git a/src/vnet/cop/cop.api b/src/vnet/cop/cop.api
index b34dae8026e..693160018a4 100644
--- a/src/vnet/cop/cop.api
+++ b/src/vnet/cop/cop.api
@@ -20,7 +20,7 @@
     @param enable_disable - 1 => enable, 0 => disable
 */
 
-define cop_interface_enable_disable
+autoreply define cop_interface_enable_disable
 {
   u32 client_index;
   u32 context;
@@ -28,17 +28,6 @@ define cop_interface_enable_disable
   u8 enable_disable;
 };
 
-/** \brief cop: interface enable/disable junk filtration reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define cop_interface_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief cop: enable/disable whitelist filtration features on an interface
     Note: the supplied fib_id must match in order to remove the feature!
     
@@ -51,7 +40,7 @@ define cop_interface_enable_disable_reply
     @param default_cop -  1 => enable non-ip4, non-ip6 filtration 0=> disable it
 */
 
-define cop_whitelist_enable_disable
+autoreply define cop_whitelist_enable_disable
 {
   u32 client_index;
   u32 context;
@@ -62,17 +51,6 @@ define cop_whitelist_enable_disable
   u8 default_cop;
 };
 
-/** \brief cop: interface enable/disable junk filtration reply
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define cop_whitelist_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief get_node_graph - get a copy of the vpp node graph
     including the current set of graph arcs.
 
@@ -85,4 +63,4 @@ define cop_whitelist_enable_disable_reply
  * eval: (c-set-style "gnu")
  * End:
  */
- 
-\ No newline at end of file
+ 
diff --git a/src/vnet/devices/af_packet/af_packet.api b/src/vnet/devices/af_packet/af_packet.api
index 9fb2a2070f2..8d40ad60c02 100644
--- a/src/vnet/devices/af_packet/af_packet.api
+++ b/src/vnet/devices/af_packet/af_packet.api
@@ -46,7 +46,7 @@ define af_packet_create_reply
     @param context - sender context, to match reply w/ request
     @param host_if_name - interface name
 */
-define af_packet_delete
+autoreply define af_packet_delete
 {
   u32 client_index;
   u32 context;
@@ -54,16 +54,6 @@ define af_packet_delete
   u8 host_if_name[64];
 };
 
-/** \brief Delete host-interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define af_packet_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/devices/netmap/netmap.api b/src/vnet/devices/netmap/netmap.api
index 377ccffda4c..8dc698b999b 100644
--- a/src/vnet/devices/netmap/netmap.api
+++ b/src/vnet/devices/netmap/netmap.api
@@ -22,7 +22,7 @@
     @param is_pipe - is pipe
     @param is_master - 0=slave, 1=master
 */
-define netmap_create
+autoreply define netmap_create
 {
   u32 client_index;
   u32 context;
@@ -34,22 +34,12 @@ define netmap_create
   u8 is_master;
 };
 
-/** \brief Create netmap response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define netmap_create_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Delete netmap
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param netmap_if_name - interface name
 */
-define netmap_delete
+autoreply define netmap_delete
 {
   u32 client_index;
   u32 context;
@@ -57,16 +47,6 @@ define netmap_delete
   u8 netmap_if_name[64];
 };
 
-/** \brief Delete netmap response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define netmap_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/devices/virtio/vhost_user.api b/src/vnet/devices/virtio/vhost_user.api
index 4f604e45494..df7ce7abf2a 100644
--- a/src/vnet/devices/virtio/vhost_user.api
+++ b/src/vnet/devices/virtio/vhost_user.api
@@ -53,7 +53,7 @@ define create_vhost_user_if_reply
     @param sock_filename - unix socket filename, used to speak with frontend
     @param operation_mode - polling=0, interrupt=1, or adaptive=2
 */
-define modify_vhost_user_if
+autoreply define modify_vhost_user_if
 {
   u32 client_index;
   u32 context;
@@ -65,36 +65,16 @@ define modify_vhost_user_if
   u8 operation_mode;
 };
 
-/** \brief vhost-user interface modify response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define modify_vhost_user_if_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief vhost-user interface delete request
     @param client_index - opaque cookie to identify the sender
 */
-define delete_vhost_user_if
+autoreply define delete_vhost_user_if
 {
   u32 client_index;
   u32 context;
   u32 sw_if_index;
 };
 
-/** \brief vhost-user interface delete response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define delete_vhost_user_if_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Vhost-user interface details structure (fix this)
     @param sw_if_index - index of the interface
     @param interface_name - name of interface
diff --git a/src/vnet/dhcp/dhcp.api b/src/vnet/dhcp/dhcp.api
index 2db85a797e9..eb0b070d22c 100644
--- a/src/vnet/dhcp/dhcp.api
+++ b/src/vnet/dhcp/dhcp.api
@@ -24,7 +24,7 @@
     @param dhcp_server[] - server address
     @param dhcp_src_address[] - <fix this, need details>
 */
-define dhcp_proxy_config
+autoreply define dhcp_proxy_config
 {
   u32 client_index;
   u32 context;
@@ -36,16 +36,6 @@ define dhcp_proxy_config
   u8 dhcp_src_address[16];
 };
 
-/** \brief DHCP Proxy config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define dhcp_proxy_config_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief DHCP Proxy set / unset vss request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -55,7 +45,7 @@ define dhcp_proxy_config_reply
     @param is_ipv6 - ip6 if non-zero, else ip4
     @param is_add - set vss if non-zero, else delete
 */
-define dhcp_proxy_set_vss
+autoreply define dhcp_proxy_set_vss
 {
   u32 client_index;
   u32 context;
@@ -66,16 +56,6 @@ define dhcp_proxy_set_vss
   u8 is_add;
 };
 
-/** \brief DHCP proxy set / unset vss response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define dhcp_proxy_set_vss_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief DHCP Client config add / del request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -86,7 +66,7 @@ define dhcp_proxy_set_vss_reply
            via dhcp_compl_event API message if non-zero
     @param pid - sender's pid
 */
-define dhcp_client_config
+autoreply define dhcp_client_config
 {
   u32 client_index;
   u32 context;
@@ -97,16 +77,6 @@ define dhcp_client_config
   u32 pid;
 };
 
-/** \brief DHCP Client config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define dhcp_client_config_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Tell client about a DHCP completion event
     @param client_index - opaque cookie to identify the sender
     @param pid - client pid registered to receive notification
@@ -162,4 +132,4 @@ manual_endian manual_print define dhcp_proxy_details
  * Local Variables:
  * eval: (c-set-style "gnu")
  * End:
- */
-\ No newline at end of file
+ */
diff --git a/src/vnet/flow/flow.api b/src/vnet/flow/flow.api
index 0e0f99bf4e5..1c5e8c5c1fe 100644
--- a/src/vnet/flow/flow.api
+++ b/src/vnet/flow/flow.api
@@ -24,7 +24,7 @@
     @param template_interval - number of seconds after which to resend template
     @param udp_checksum - UDP checksum calculation enable flag
 */
-define set_ipfix_exporter
+autoreply define set_ipfix_exporter
 {
   u32 client_index;
   u32 context;
@@ -37,15 +37,6 @@ define set_ipfix_exporter
   u8 udp_checksum;
 };
 
-/** \brief Reply to IPFIX exporter configure request
-    @param context - sender context which was passed in the request
-*/
-define set_ipfix_exporter_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPFIX exporter dump request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -84,22 +75,13 @@ define ipfix_exporter_details
     @param domain_id - domain ID reported in IPFIX messages for classify stream
     @param src_port - source port of UDP session for classify stream
 */
-define set_ipfix_classify_stream {
+autoreply define set_ipfix_classify_stream {
     u32 client_index;
     u32 context;
     u32 domain_id;
     u16 src_port;
 };
 
-/** \brief IPFIX classify stream configure response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define set_ipfix_classify_stream_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief IPFIX classify stream dump request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -127,7 +109,7 @@ define ipfix_classify_stream_details {
     @param ip_version - version of IP used in the classifier table
     @param transport_protocol - transport protocol used in the classifier table or 255 for unspecified
 */
-define ipfix_classify_table_add_del {
+autoreply define ipfix_classify_table_add_del {
     u32 client_index;
     u32 context;
     u32 table_id;
@@ -136,14 +118,6 @@ define ipfix_classify_table_add_del {
     u8 is_add;
 };
 
-/** \brief IPFIX add classifier table response
-    @param context - sender context which was passed in the request
-*/
-define ipfix_classify_table_add_del_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief IPFIX classify tables dump request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/vnet/interface.api b/src/vnet/interface.api
index 85fd73fb280..9df63f18b37 100644
--- a/src/vnet/interface.api
+++ b/src/vnet/interface.api
@@ -6,7 +6,7 @@
     @param link_up_down - Oper state sent on change event, not used in config.
     @param deleted - interface was deleted
 */
-define sw_interface_set_flags
+autoreply define sw_interface_set_flags
 {
   u32 client_index;
   u32 context;
@@ -17,23 +17,13 @@ define sw_interface_set_flags
   u8 deleted;
 };
 
-/** \brief Reply to sw_interface_set_flags 
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define sw_interface_set_flags_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set interface MTU
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param sw_if_index - index of the interface to set MTU on
     @param mtu - MTU
 */
-define sw_interface_set_mtu
+autoreply define sw_interface_set_mtu
 {
   u32 client_index;
   u32 context;
@@ -41,23 +31,13 @@ define sw_interface_set_mtu
   u16 mtu;
 };
 
-/** \brief Reply to sw_interface_set_mtu
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define sw_interface_set_mtu_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Register for interface events
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param enable_disable - 1 => register for events, 0 => cancel registration
     @param pid - sender's pid
 */
-define want_interface_events
+autoreply define want_interface_events
 {
   u32 client_index;
   u32 context;
@@ -65,16 +45,6 @@ define want_interface_events
   u32 pid;
 };
 
-/** \brief Reply for interface events registration
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define want_interface_events_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Interface details structure (fix this) 
     @param sw_if_index - index of the interface
     @param sup_sw_if_index - index of parent interface if any, else same as sw_if_index  
@@ -184,7 +154,7 @@ define sw_interface_dump
     @param address_length - address length in bytes, 4 for ip4, 16 for ip6
     @param address - array of address bytes
 */
-define sw_interface_add_del_address
+autoreply define sw_interface_add_del_address
 {
   u32 client_index;
   u32 context;
@@ -196,16 +166,6 @@ define sw_interface_add_del_address
   u8 address[16];
 };
 
-/** \brief Reply to sw_interface_add_del_address
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define sw_interface_add_del_address_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Associate the specified interface with a fib table
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -213,7 +173,7 @@ define sw_interface_add_del_address_reply
     @param is_ipv6 - if non-zero ipv6, else ipv4
     @param vrf_id - fib table/vrd id to associate the interface with
 */
-define sw_interface_set_table
+autoreply define sw_interface_set_table
 {
   u32 client_index;
   u32 context;
@@ -222,16 +182,6 @@ define sw_interface_set_table
   u32 vrf_id;
 };
 
-/** \brief Reply to sw_interface_set_table
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define sw_interface_set_table_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get VRF id assigned to interface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -280,7 +230,7 @@ define vnet_interface_counters
     @param unnumbered_sw_if_index - interface which will use the address
     @param is_add - if non-zero set the association, else unset it
 */
-define sw_interface_set_unnumbered
+autoreply define sw_interface_set_unnumbered
 {
   u32 client_index;
   u32 context;
@@ -289,38 +239,18 @@ define sw_interface_set_unnumbered
   u8 is_add;
 };
 
-/** \brief Set unnumbered interface add / del response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_set_unnumbered_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Clear interface statistics
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param sw_if_index - index of the interface to clear statistics
 */
-define sw_interface_clear_stats
+autoreply define sw_interface_clear_stats
 {
   u32 client_index;
   u32 context;
   u32 sw_if_index;
 };
 
-/** \brief Reply to sw_interface_clear_stats 
-    @param context - sender context which was passed in the request
-    @param retval - return code of the set flags request
-*/
-define sw_interface_clear_stats_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set / clear software interface tag
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -328,7 +258,7 @@ define sw_interface_clear_stats_reply
     @param add_del - 1 = add, 0 = delete
     @param tag - an ascii tag
 */
-define sw_interface_tag_add_del 
+autoreply define sw_interface_tag_add_del 
 {
     u32 client_index;
     u32 context;
@@ -337,23 +267,13 @@ define sw_interface_tag_add_del
     u8 tag[64];
 };
 
-/** \brief Reply to set / clear software interface tag
-    @param context - sender context which was passed in the request
-    @param retval - return code for the request
-*/
-define sw_interface_tag_add_del_reply
-{
-    u32 context;
-    i32 retval;
-};
-
 /** \brief Set an interface's MAC address
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param sw_if_index - the interface whose MAC will be set
     @param mac_addr - the new MAC address
 */
-define sw_interface_set_mac_address
+autoreply define sw_interface_set_mac_address
 {
     u32 client_index;
     u32 context;
@@ -361,16 +281,6 @@ define sw_interface_set_mac_address
     u8 mac_address[6];
 };
 
-/** \brief Reply to setting an interface MAC address request
-    @param context - sender context which was passed in the request
-    @param retval - return code for the request
-*/
-define sw_interface_set_mac_address_reply
-{
-    u32 context;
-    i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api
index 6af1714f34d..7097a13014d 100644
--- a/src/vnet/ip/ip.api
+++ b/src/vnet/ip/ip.api
@@ -136,7 +136,7 @@ define ip_neighbor_details {
     @param mac_address - l2 address of the neighbor
     @param dst_address - ip4 or ip6 address of the neighbor
 */
-define ip_neighbor_add_del
+autoreply define ip_neighbor_add_del
 {
   u32 client_index;
   u32 context;
@@ -150,16 +150,6 @@ define ip_neighbor_add_del
   u8 dst_address[16];
 };
 
-/** \brief Reply for IP Neighbor add / delete request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ip_neighbor_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set the ip flow hash config for a fib request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -172,7 +162,7 @@ define ip_neighbor_add_del_reply
     @param proto -if non-zero include proto in flow hash
     @param reverse - if non-zero include reverse in flow hash
 */
-define set_ip_flow_hash
+autoreply define set_ip_flow_hash
 {
   u32 client_index;
   u32 context;
@@ -186,16 +176,6 @@ define set_ip_flow_hash
   u8 reverse;
 };
 
-/** \brief Set the ip flow hash config for a fib response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define set_ip_flow_hash_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 router advertisement config request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -213,7 +193,7 @@ define set_ip_flow_hash_reply
     @param initial_count -
     @param initial_interval -
 */
-define sw_interface_ip6nd_ra_config
+autoreply define sw_interface_ip6nd_ra_config
 {
   u32 client_index;
   u32 context;
@@ -233,16 +213,6 @@ define sw_interface_ip6nd_ra_config
   u32 initial_interval;
 };
 
-/** \brief IPv6 router advertisement config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_ip6nd_ra_config_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 router advertisement prefix config request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -272,7 +242,7 @@ define sw_interface_ip6nd_ra_config_reply
                      preferred [ADDRCONF].  A value of all one bits
                      (0xffffffff) represents infinity.
 */
-define sw_interface_ip6nd_ra_prefix
+autoreply define sw_interface_ip6nd_ra_prefix
 {
   u32 client_index;
   u32 context;
@@ -289,16 +259,6 @@ define sw_interface_ip6nd_ra_prefix
   u32 pref_lifetime;
 };
 
-/** \brief IPv6 router advertisement prefix config response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_ip6nd_ra_prefix_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 ND proxy config
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -306,7 +266,7 @@ define sw_interface_ip6nd_ra_prefix_reply
     @param address - The address of the host for which to proxy for
     @param is_add - Adding or deleting
 */
-define ip6nd_proxy_add_del
+autoreply define ip6nd_proxy_add_del
 {
   u32 client_index;
   u32 context;
@@ -315,16 +275,6 @@ define ip6nd_proxy_add_del
   u8 address[16];
 };
 
-/** \brief IPv6 ND proxy response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define ip6nd_proxy_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 ND proxy details returned after request
     @param context - sender context, to match reply w/ request
     @param retval - return code for the request
@@ -355,7 +305,7 @@ define ip6nd_proxy_dump
     @param sw_if_index - interface used to reach neighbor
     @param enable - if non-zero enable ip6 on interface, else disable
 */
-define sw_interface_ip6_enable_disable
+autoreply define sw_interface_ip6_enable_disable
 {
   u32 client_index;
   u32 context;
@@ -363,23 +313,13 @@ define sw_interface_ip6_enable_disable
   u8 enable;			/* set to true if enable */
 };
 
-/** \brief IPv6 interface enable / disable response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_ip6_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 set link local address on interface request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param sw_if_index - interface to set link local on
     @param address[] - the new link local address
 */
-define sw_interface_ip6_set_link_local_address
+autoreply define sw_interface_ip6_set_link_local_address
 {
   u32 client_index;
   u32 context;
@@ -387,16 +327,6 @@ define sw_interface_ip6_set_link_local_address
   u8 address[16];
 };
 
-/** \brief IPv6 set link local address on interface response
-    @param context - sender context, to match reply w/ request
-    @param retval - error code for the request
-*/
-define sw_interface_ip6_set_link_local_address_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add / del route request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -422,7 +352,7 @@ define sw_interface_ip6_set_link_local_address_reply
     @param next_hop_out_label_stack - the next-hop output label stack, outer most first
     @param next_hop_via_label - The next-hop is a resolved via a local label
 */
-define ip_add_del_route
+autoreply define ip_add_del_route
 {
   u32 client_index;
   u32 context;
@@ -452,16 +382,6 @@ define ip_add_del_route
   u32 next_hop_out_label_stack[next_hop_n_out_labels];
 };
 
-/** \brief Reply for add / del route request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ip_add_del_route_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add / del route request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -470,7 +390,7 @@ define ip_add_del_route_reply
 
     FIXME
 */
-define ip_mroute_add_del
+autoreply define ip_mroute_add_del
 {
   u32 client_index;
   u32 context;
@@ -488,16 +408,6 @@ define ip_mroute_add_del
   u8 src_address[16];
 };
 
-/** \brief Reply for add / del mroute request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ip_mroute_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump IP multicast fib table
     @param client_index - opaque cookie to identify the sender
 */
diff --git a/src/vnet/ipsec/ipsec.api b/src/vnet/ipsec/ipsec.api
index ef090f84c8f..203c5272432 100644
--- a/src/vnet/ipsec/ipsec.api
+++ b/src/vnet/ipsec/ipsec.api
@@ -20,7 +20,7 @@
     @param spd_id - SPD instance id (control plane allocated)
 */
 
-define ipsec_spd_add_del
+autoreply define ipsec_spd_add_del
 {
   u32 client_index;
   u32 context;
@@ -28,17 +28,6 @@ define ipsec_spd_add_del
   u32 spd_id;
 };
 
-/** \brief Reply for IPsec: Add/delete Security Policy Database entry
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_spd_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPsec: Add/delete SPD from interface
 
     @param client_index - opaque cookie to identify the sender
@@ -49,7 +38,7 @@ define ipsec_spd_add_del_reply
 */
 
 
-define ipsec_interface_add_del_spd
+autoreply define ipsec_interface_add_del_spd
 {
   u32 client_index;
   u32 context;
@@ -59,17 +48,6 @@ define ipsec_interface_add_del_spd
   u32 spd_id;
 };
 
-/** \brief Reply for IPsec: Add/delete SPD from interface
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_interface_add_del_spd_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPsec: Add/delete Security Policy Database entry
 
     See RFC 4301, 4.4.1.1 on how to match packet to selectors
@@ -95,7 +73,7 @@ define ipsec_interface_add_del_spd_reply
 
 */
 
-define ipsec_spd_add_del_entry
+autoreply define ipsec_spd_add_del_entry
 {
   u32 client_index;
   u32 context;
@@ -125,17 +103,6 @@ define ipsec_spd_add_del_entry
   u32 sa_id;
 };
 
-/** \brief Reply for IPsec: Add/delete Security Policy Database entry
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_spd_add_del_entry_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPsec: Add/delete Security Association Database entry
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -167,7 +134,7 @@ define ipsec_spd_add_del_entry_reply
      IPsec tunnel address copy mode (to support GDOI)
  */
 
-define ipsec_sad_add_del_entry
+autoreply define ipsec_sad_add_del_entry
 {
   u32 client_index;
   u32 context;
@@ -195,17 +162,6 @@ define ipsec_sad_add_del_entry
   u8 tunnel_dst_address[16];
 };
 
-/** \brief Reply for IPsec: Add/delete Security Association Database entry
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_sad_add_del_entry_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPsec: Update Security Association keys
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -219,7 +175,7 @@ define ipsec_sad_add_del_entry_reply
     @param integrity_key - integrity keying material
 */
 
-define ipsec_sa_set_key
+autoreply define ipsec_sa_set_key
 {
   u32 client_index;
   u32 context;
@@ -233,17 +189,6 @@ define ipsec_sa_set_key
   u8 integrity_key[128];
 };
 
-/** \brief Reply for IPsec: Update Security Association keys
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define ipsec_sa_set_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Add/delete profile
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -251,7 +196,7 @@ define ipsec_sa_set_key_reply
     @param name - IKEv2 profile name
     @param is_add - Add IKEv2 profile if non-zero, else delete
 */
-define ikev2_profile_add_del
+autoreply define ikev2_profile_add_del
 {
   u32 client_index;
   u32 context;
@@ -260,16 +205,6 @@ define ikev2_profile_add_del
   u8 is_add;
 };
 
-/** \brief Reply for IKEv2: Add/delete profile
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Set IKEv2 profile authentication method
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -280,7 +215,7 @@ define ikev2_profile_add_del_reply
     @param data_len - Authentication data length
     @param data - Authentication data (for rsa-sig cert file path)
 */
-define ikev2_profile_set_auth
+autoreply define ikev2_profile_set_auth
 {
   u32 client_index;
   u32 context;
@@ -292,16 +227,6 @@ define ikev2_profile_set_auth
   u8 data[0];
 };
 
-/** \brief Reply for IKEv2: Set IKEv2 profile authentication method
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_set_auth_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Set IKEv2 profile local/remote identification
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -312,7 +237,7 @@ define ikev2_profile_set_auth_reply
     @param data_len - Identification data length
     @param data - Identification data
 */
-define ikev2_profile_set_id
+autoreply define ikev2_profile_set_id
 {
   u32 client_index;
   u32 context;
@@ -324,16 +249,6 @@ define ikev2_profile_set_id
   u8 data[0];
 };
 
-/** \brief Reply for IKEv2:
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_set_id_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Set IKEv2 profile traffic selector parameters
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -346,7 +261,7 @@ define ikev2_profile_set_id_reply
     @param start_addr - The smallest address included in traffic selector
     @param end_addr - The largest address included in traffic selector
 */
-define ikev2_profile_set_ts
+autoreply define ikev2_profile_set_ts
 {
   u32 client_index;
   u32 context;
@@ -360,23 +275,13 @@ define ikev2_profile_set_ts
   u32 end_addr;
 };
 
-/** \brief Reply for IKEv2: Set IKEv2 profile traffic selector parameters
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_profile_set_ts_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Set IKEv2 local RSA private key
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
 
     @param key_file - Key file absolute path
 */
-define ikev2_set_local_key
+autoreply define ikev2_set_local_key
 {
   u32 client_index;
   u32 context;
@@ -384,16 +289,6 @@ define ikev2_set_local_key
   u8 key_file[256];
 };
 
-/** \brief Reply for IKEv2: Set IKEv2 local key
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_set_local_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Set IKEv2 responder interface and IP address
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -402,7 +297,7 @@ define ikev2_set_local_key_reply
     @param sw_if_index - interface index
     @param address - interface address
 */
-define ikev2_set_responder
+autoreply define ikev2_set_responder
 {
   u32 client_index;
   u32 context;
@@ -412,17 +307,6 @@ define ikev2_set_responder
   u8 address[4];
 };
 
-/** \brief Reply for IKEv2: Set IKEv2 responder interface and IP address
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_set_responder_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-
 /** \brief IKEv2: Set IKEv2 IKE transforms in SA_INIT proposal (RFC 7296)
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -434,7 +318,7 @@ define ikev2_set_responder_reply
     @param dh_group - Diffie-Hellman group
     
 */
-define ikev2_set_ike_transforms
+autoreply define ikev2_set_ike_transforms
 {
   u32 client_index;
   u32 context;
@@ -446,16 +330,6 @@ define ikev2_set_ike_transforms
   u32 dh_group;
 };
 
-/** \brief Reply for IKEv2: Set IKEv2 IKE transforms
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_set_ike_transforms_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Set IKEv2 ESP transforms in SA_INIT proposal (RFC 7296)
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -467,7 +341,7 @@ define ikev2_set_ike_transforms_reply
     @param dh_group - Diffie-Hellman group
     
 */
-define ikev2_set_esp_transforms
+autoreply define ikev2_set_esp_transforms
 {
   u32 client_index;
   u32 context;
@@ -479,16 +353,6 @@ define ikev2_set_esp_transforms
   u32 dh_group;
 };
 
-/** \brief Reply for IKEv2: Set IKEv2 ESP transforms
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_set_esp_transforms_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Set Child SA lifetime, limited by time and/or data
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -500,7 +364,7 @@ define ikev2_set_esp_transforms_reply
     @param lifetime_maxdata - SA maximum life time in bytes (0 to disable)
     
 */
-define ikev2_set_sa_lifetime
+autoreply define ikev2_set_sa_lifetime
 {
   u32 client_index;
   u32 context;
@@ -512,16 +376,6 @@ define ikev2_set_sa_lifetime
   u64 lifetime_maxdata;
 };
 
-/** \brief Reply for IKEv2: Set Child SA lifetime
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_set_sa_lifetime_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Initiate the SA_INIT exchange
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -529,7 +383,7 @@ define ikev2_set_sa_lifetime_reply
     @param name - IKEv2 profile name
     
 */
-define ikev2_initiate_sa_init
+autoreply define ikev2_initiate_sa_init
 {
   u32 client_index;
   u32 context;
@@ -537,16 +391,6 @@ define ikev2_initiate_sa_init
   u8 name[64];
 };
 
-/** \brief Reply for IKEv2: Initiate the SA_INIT exchange
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_initiate_sa_init_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Initiate the delete IKE SA exchange
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -554,7 +398,7 @@ define ikev2_initiate_sa_init_reply
     @param ispi - IKE SA initiator SPI
     
 */
-define ikev2_initiate_del_ike_sa
+autoreply define ikev2_initiate_del_ike_sa
 {
   u32 client_index;
   u32 context;
@@ -562,16 +406,6 @@ define ikev2_initiate_del_ike_sa
   u64 ispi;
 };
 
-/** \brief Reply for IKEv2: Initiate the delete IKE SA exchange
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_initiate_del_ike_sa_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Initiate the delete Child SA exchange
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -579,7 +413,7 @@ define ikev2_initiate_del_ike_sa_reply
     @param ispi - Child SA initiator SPI
     
 */
-define ikev2_initiate_del_child_sa
+autoreply define ikev2_initiate_del_child_sa
 {
   u32 client_index;
   u32 context;
@@ -587,16 +421,6 @@ define ikev2_initiate_del_child_sa
   u32 ispi;
 };
 
-/** \brief Reply for IKEv2: Initiate the delete Child SA exchange
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_initiate_del_child_sa_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IKEv2: Initiate the rekey Child SA exchange
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -604,7 +428,7 @@ define ikev2_initiate_del_child_sa_reply
     @param ispi - Child SA initiator SPI
     
 */
-define ikev2_initiate_rekey_child_sa
+autoreply define ikev2_initiate_rekey_child_sa
 {
   u32 client_index;
   u32 context;
@@ -612,16 +436,6 @@ define ikev2_initiate_rekey_child_sa
   u32 ispi;
 };
 
-/** \brief Reply for IKEv2: Initiate the rekey Child SA exchange
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define ikev2_initiate_rekey_child_sa_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump ipsec policy database data
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -682,4 +496,4 @@ define ipsec_spd_details {
  * eval: (c-set-style "gnu")
  * End:
  */
- 
-\ No newline at end of file
+ 
diff --git a/src/vnet/l2/l2.api b/src/vnet/l2/l2.api
index c23eebeca8c..db42d635174 100644
--- a/src/vnet/l2/l2.api
+++ b/src/vnet/l2/l2.api
@@ -70,66 +70,36 @@ define l2_fib_table_dump
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
 */
-define l2_fib_clear_table
+autoreply define l2_fib_clear_table
 {
   u32 client_index;
   u32 context;
 };
 
-/** \brief L2 fib clear table response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_fib_clear_table_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief L2 FIB flush bridge domain entries
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param bd_id - the entry's bridge domain id
 */
-define l2fib_flush_bd
+autoreply define l2fib_flush_bd
 {
   u32 client_index;
   u32 context;
   u32 bd_id;
 };
 
-/** \brief L2 FIB flush bridge domain entries response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2fib_flush_bd_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief L2 FIB flush interface entries
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param bd_id - the entry's bridge domain id
 */
-define l2fib_flush_int
+autoreply define l2fib_flush_int
 {
   u32 client_index;
   u32 context;
   u32 sw_if_index;
 };
 
-/** \brief L2 FIB flush interface entries response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2fib_flush_int_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief L2 FIB add entry request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -140,7 +110,7 @@ define l2fib_flush_int_reply
     @param static_mac - 
     @param filter_mac -
 */
-define l2fib_add_del
+autoreply define l2fib_add_del
 {
   u32 client_index;
   u32 context;
@@ -153,16 +123,6 @@ define l2fib_add_del
   u8 bvi_mac;
 };
 
-/** \brief L2 FIB add entry response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the add l2fib entry request
-*/
-define l2fib_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Set L2 flags request !!! TODO - need more info, feature bits in l2_input.h
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -196,7 +156,7 @@ define l2_flags_reply
     @param bd_id - the bridge domain to create
     @param mac_age - mac aging time in min, 0 for disabled
 */
-define bridge_domain_set_mac_age
+autoreply define bridge_domain_set_mac_age
 {
   u32 client_index;
   u32 context;
@@ -204,16 +164,6 @@ define bridge_domain_set_mac_age
   u8 mac_age;
 };
 
-/** \brief Set bridge domain response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the set l2 bits request
-*/
-define bridge_domain_set_mac_age_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief L2 bridge domain add or delete request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -226,7 +176,7 @@ define bridge_domain_set_mac_age_reply
     @param mac_age - mac aging time in min, 0 for disabled
     @param is_add - add or delete flag
 */
-define bridge_domain_add_del
+autoreply define bridge_domain_add_del
 {
   u32 client_index;
   u32 context;
@@ -240,16 +190,6 @@ define bridge_domain_add_del
   u8 is_add;
 };
 
-/** \brief L2 bridge domain add or delete response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the set bridge flags request
-*/
-define bridge_domain_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief L2 bridge domain request operational state details
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -337,7 +277,7 @@ define bridge_flags_reply
     @param tag1 - Needed for any push or translate vtr op
     @param tag2 - Needed for any push 2 or translate x-2 vtr ops
 */
-define l2_interface_vlan_tag_rewrite
+autoreply define l2_interface_vlan_tag_rewrite
 {
   u32 client_index;
   u32 context;
@@ -348,16 +288,6 @@ define l2_interface_vlan_tag_rewrite
   u32 tag2;			// second pushed tag
 };
 
-/** \brief L2 interface vlan tag rewrite response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_interface_vlan_tag_rewrite_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief L2 interface pbb tag rewrite configure request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -370,7 +300,7 @@ define l2_interface_vlan_tag_rewrite_reply
     @param b_vlanid - B-tag vlanid, needed for any push or translate qinq vtr op
     @param i_sid - I-tag service id, needed for any push or translate qinq vtr op
 */
-define l2_interface_pbb_tag_rewrite
+autoreply define l2_interface_pbb_tag_rewrite
 {
   u32 client_index;
   u32 context;
@@ -383,16 +313,6 @@ define l2_interface_pbb_tag_rewrite
   u32 i_sid;
 };
 
-/** \brief L2 interface pbb tag rewrite response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2_interface_pbb_tag_rewrite_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/l2tp/l2tp.api b/src/vnet/l2tp/l2tp.api
index 5a5a5a48a68..4587a8076ec 100644
--- a/src/vnet/l2tp/l2tp.api
+++ b/src/vnet/l2tp/l2tp.api
@@ -52,7 +52,7 @@ define l2tpv3_create_tunnel_reply
   u32 sw_if_index;
 };
 
-define l2tpv3_set_tunnel_cookies
+autoreply define l2tpv3_set_tunnel_cookies
 {
   u32 client_index;
   u32 context;
@@ -61,16 +61,6 @@ define l2tpv3_set_tunnel_cookies
   u64 new_remote_cookie;
 };
 
-/** \brief L2TP tunnel set cookies response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define l2tpv3_set_tunnel_cookies_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 define sw_if_l2tpv3_tunnel_details
 {
   u32 context;
@@ -91,7 +81,7 @@ define sw_if_l2tpv3_tunnel_dump
   u32 context;
 };
 
-define l2tpv3_interface_enable_disable
+autoreply define l2tpv3_interface_enable_disable
 {
   u32 client_index;
   u32 context;
@@ -99,13 +89,7 @@ define l2tpv3_interface_enable_disable
   u32 sw_if_index;
 };
 
-define l2tpv3_interface_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-define l2tpv3_set_lookup_key
+autoreply define l2tpv3_set_lookup_key
 {
   u32 client_index;
   u32 context;
@@ -113,12 +97,6 @@ define l2tpv3_set_lookup_key
   u8 key;
 };
 
-define l2tpv3_set_lookup_key_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
diff --git a/src/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api
index a50a5ccbe03..8bed71b3bf7 100644
--- a/src/vnet/lisp-cp/lisp.api
+++ b/src/vnet/lisp-cp/lisp.api
@@ -59,7 +59,7 @@ define lisp_add_del_locator_set_reply
     @param priority - priority of the lisp locator
     @param weight - weight of the lisp locator
 */
-define lisp_add_del_locator
+autoreply define lisp_add_del_locator
 {
   u32 client_index;
   u32 context;
@@ -70,16 +70,6 @@ define lisp_add_del_locator
   u8 weight;
 };
 
-/** \brief Reply for locator add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_locator_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete lisp eid-table
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -98,7 +88,7 @@ define lisp_add_del_locator_reply
       HMAC_SHA_256_128      2
     @param key - secret key
 */
-define lisp_add_del_local_eid
+autoreply define lisp_add_del_local_eid
 {
   u32 client_index;
   u32 context;
@@ -112,16 +102,6 @@ define lisp_add_del_local_eid
   u8 key[64];
 };
 
-/** \brief Reply for local_eid add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_local_eid_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add/delete map server
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -129,7 +109,7 @@ define lisp_add_del_local_eid_reply
     @param is_ipv6 - if non-zero the address is ipv6, else ipv4
     @param ip_address - map server IP address
 */
-define lisp_add_del_map_server
+autoreply define lisp_add_del_map_server
 {
   u32 client_index;
   u32 context;
@@ -138,16 +118,6 @@ define lisp_add_del_map_server
   u8 ip_address[16];
 };
 
-/** \brief Reply for lisp_add_del_map_server
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_map_server_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete map-resolver
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -155,7 +125,7 @@ define lisp_add_del_map_server_reply
     @param is_ipv6 - if non-zero the address is ipv6, else ipv4
     @param ip_address - array of address bytes
 */
-define lisp_add_del_map_resolver
+autoreply define lisp_add_del_map_resolver
 {
   u32 client_index;
   u32 context;
@@ -164,45 +134,25 @@ define lisp_add_del_map_resolver
   u8 ip_address[16];
 };
 
-/** \brief Reply for map_resolver add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_map_resolver_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief enable or disable LISP feature
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_en - enable protocol if non-zero, else disable
 */
-define lisp_enable_disable
+autoreply define lisp_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_en;
 };
 
-/** \brief Reply for gpe enable/disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief configure or disable LISP PITR node
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param ls_name - locator set name
     @param is_add - add locator set if non-zero, else disable pitr
 */
-define lisp_pitr_set_locator_set
+autoreply define lisp_pitr_set_locator_set
 {
   u32 client_index;
   u32 context;
@@ -210,16 +160,6 @@ define lisp_pitr_set_locator_set
   u8 ls_name[64];
 };
 
-/** \brief Reply for lisp_pitr_set_locator_set
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_pitr_set_locator_set_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief configure or disable use of PETR
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -227,7 +167,7 @@ define lisp_pitr_set_locator_set_reply
     @param address - PETR IP address
     @param is_add - add locator set if non-zero, else disable pitr
 */
-define lisp_use_petr
+autoreply define lisp_use_petr
 {
   u32 client_index;
   u32 context;
@@ -236,16 +176,6 @@ define lisp_use_petr
   u8 is_add;
 };
 
-/** \brief Reply for lisp_pitr_set_locator_set
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_use_petr_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for LISP PETR status
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -298,45 +228,25 @@ define show_lisp_rloc_probe_state_reply
     @param context - sender context, to match reply w/ request
     @param is_enable - enable if non-zero; disable otherwise
 */
-define lisp_rloc_probe_enable_disable
+autoreply define lisp_rloc_probe_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_enabled;
 };
 
-/** \brief Reply for lisp_rloc_probe_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_rloc_probe_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief enable/disable LISP map-register
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_enable - enable if non-zero; disable otherwise
 */
-define lisp_map_register_enable_disable
+autoreply define lisp_map_register_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_enabled;
 };
 
-/** \brief Reply for lisp_map_register_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_map_register_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get state of LISP map-register
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -366,23 +276,13 @@ define show_lisp_map_register_state_reply
       0 - destination only
       1 - source/destaination
 */
-define lisp_map_request_mode
+autoreply define lisp_map_request_mode
 {
   u32 client_index;
   u32 context;
   u8 mode;
 };
 
-/** \brief Reply for lisp_map_request_mode
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_map_request_mode_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for LISP map-request mode
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -430,7 +330,7 @@ typeonly manual_endian manual_print define remote_locator
     @param rloc_num - number of remote locators
     @param rlocs - remote locator records
 */
-manual_print manual_endian define lisp_add_del_remote_mapping
+autoreply manual_print manual_endian define lisp_add_del_remote_mapping
 {
   u32 client_index;
   u32 context;
@@ -448,16 +348,6 @@ manual_print manual_endian define lisp_add_del_remote_mapping
   vl_api_remote_locator_t rlocs[rloc_num];
 };
 
-/** \brief Reply for lisp_add_del_remote_mapping
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_remote_mapping_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete LISP adjacency adjacency
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -470,7 +360,7 @@ define lisp_add_del_remote_mapping_reply
     @param reid - remote EID
     @param leid - local EID
 */
-define lisp_add_del_adjacency
+autoreply define lisp_add_del_adjacency
 {
   u32 client_index;
   u32 context;
@@ -483,23 +373,13 @@ define lisp_add_del_adjacency
   u8 leid_len;
 };
 
-/** \brief Reply for lisp_add_del_adjacency
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_adjacency_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete map request itr rlocs
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_add - add address if non-zero, else delete
     @param locator_set_name - locator set name
 */
-define lisp_add_del_map_request_itr_rlocs
+autoreply define lisp_add_del_map_request_itr_rlocs
 {
   u32 client_index;
   u32 context;
@@ -512,12 +392,6 @@ define lisp_add_del_map_request_itr_rlocs
     @param retval - return code
 */
 
-define lisp_add_del_map_request_itr_rlocs_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief map/unmap vni/bd_index to vrf
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -525,7 +399,7 @@ define lisp_add_del_map_request_itr_rlocs_reply
     @param dp_table - virtual network id/bridge domain index
     @param vrf - vrf
 */
-define lisp_eid_table_add_del_map
+autoreply define lisp_eid_table_add_del_map
 {
   u32 client_index;
   u32 context;
@@ -535,16 +409,6 @@ define lisp_eid_table_add_del_map
   u8 is_l2;
 };
 
-/** \brief Reply for lisp_eid_table_add_del_map
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_eid_table_add_del_map_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for map lisp locator status
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/vnet/lisp-cp/one.api b/src/vnet/lisp-cp/one.api
index ca82f6940fb..2fa1edf6f91 100644
--- a/src/vnet/lisp-cp/one.api
+++ b/src/vnet/lisp-cp/one.api
@@ -59,7 +59,7 @@ define one_add_del_locator_set_reply
     @param priority - priority of the locator
     @param weight - weight of the locator
 */
-define one_add_del_locator
+autoreply define one_add_del_locator
 {
   u32 client_index;
   u32 context;
@@ -70,16 +70,6 @@ define one_add_del_locator
   u8 weight;
 };
 
-/** \brief Reply for locator add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_add_del_locator_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete ONE eid-table
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -98,7 +88,7 @@ define one_add_del_locator_reply
       HMAC_SHA_256_128      2
     @param key - secret key
 */
-define one_add_del_local_eid
+autoreply define one_add_del_local_eid
 {
   u32 client_index;
   u32 context;
@@ -112,16 +102,6 @@ define one_add_del_local_eid
   u8 key[64];
 };
 
-/** \brief Reply for local_eid add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_add_del_local_eid_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add/delete map server
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -129,7 +109,7 @@ define one_add_del_local_eid_reply
     @param is_ipv6 - if non-zero the address is ipv6, else ipv4
     @param ip_address - map server IP address
 */
-define one_add_del_map_server
+autoreply define one_add_del_map_server
 {
   u32 client_index;
   u32 context;
@@ -138,16 +118,6 @@ define one_add_del_map_server
   u8 ip_address[16];
 };
 
-/** \brief Reply for one_add_del_map_server
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_add_del_map_server_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete map-resolver
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -155,7 +125,7 @@ define one_add_del_map_server_reply
     @param is_ipv6 - if non-zero the address is ipv6, else ipv4
     @param ip_address - array of address bytes
 */
-define one_add_del_map_resolver
+autoreply define one_add_del_map_resolver
 {
   u32 client_index;
   u32 context;
@@ -164,45 +134,25 @@ define one_add_del_map_resolver
   u8 ip_address[16];
 };
 
-/** \brief Reply for map_resolver add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_add_del_map_resolver_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief enable or disable ONE feature
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_en - enable protocol if non-zero, else disable
 */
-define one_enable_disable
+autoreply define one_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_en;
 };
 
-/** \brief Reply for gpe enable/disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief configure or disable ONE PITR node
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param ls_name - locator set name
     @param is_add - add locator set if non-zero, else disable pitr
 */
-define one_pitr_set_locator_set
+autoreply define one_pitr_set_locator_set
 {
   u32 client_index;
   u32 context;
@@ -210,16 +160,6 @@ define one_pitr_set_locator_set
   u8 ls_name[64];
 };
 
-/** \brief Reply for one_pitr_set_locator_set
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_pitr_set_locator_set_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief configure or disable use of PETR
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -227,7 +167,7 @@ define one_pitr_set_locator_set_reply
     @param address - PETR IP address
     @param is_add - add locator set if non-zero, else disable PETR
 */
-define one_use_petr
+autoreply define one_use_petr
 {
   u32 client_index;
   u32 context;
@@ -236,16 +176,6 @@ define one_use_petr
   u8 is_add;
 };
 
-/** \brief Reply for one_use_petr
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_use_petr_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for ONE PETR status
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -298,45 +228,25 @@ define show_one_rloc_probe_state_reply
     @param context - sender context, to match reply w/ request
     @param is_enable - enable if non-zero; disable otherwise
 */
-define one_rloc_probe_enable_disable
+autoreply define one_rloc_probe_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_enabled;
 };
 
-/** \brief Reply for one_rloc_probe_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_rloc_probe_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief enable/disable ONE map-register
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_enable - enable if non-zero; disable otherwise
 */
-define one_map_register_enable_disable
+autoreply define one_map_register_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_enabled;
 };
 
-/** \brief Reply for one_map_register_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_map_register_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get state of ONE map-register
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -366,23 +276,13 @@ define show_one_map_register_state_reply
       0 - destination only
       1 - source/destaination
 */
-define one_map_request_mode
+autoreply define one_map_request_mode
 {
   u32 client_index;
   u32 context;
   u8 mode;
 };
 
-/** \brief Reply for one_map_request_mode
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_map_request_mode_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for ONE map-request mode
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -430,7 +330,7 @@ typeonly manual_endian manual_print define one_remote_locator
     @param rloc_num - number of remote locators
     @param rlocs - remote locator records
 */
-manual_print manual_endian define one_add_del_remote_mapping
+autoreply manual_print manual_endian define one_add_del_remote_mapping
 {
   u32 client_index;
   u32 context;
@@ -448,16 +348,6 @@ manual_print manual_endian define one_add_del_remote_mapping
   vl_api_one_remote_locator_t rlocs[rloc_num];
 };
 
-/** \brief Reply for one_add_del_remote_mapping
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_add_del_remote_mapping_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete ONE adjacency adjacency
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -470,7 +360,7 @@ define one_add_del_remote_mapping_reply
     @param reid - remote EID
     @param leid - local EID
 */
-define one_add_del_adjacency
+autoreply define one_add_del_adjacency
 {
   u32 client_index;
   u32 context;
@@ -483,23 +373,13 @@ define one_add_del_adjacency
   u8 leid_len;
 };
 
-/** \brief Reply for one_add_del_adjacency
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_add_del_adjacency_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete map request itr rlocs
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_add - add address if non-zero, else delete
     @param locator_set_name - locator set name
 */
-define one_add_del_map_request_itr_rlocs
+autoreply define one_add_del_map_request_itr_rlocs
 {
   u32 client_index;
   u32 context;
@@ -507,17 +387,6 @@ define one_add_del_map_request_itr_rlocs
   u8 locator_set_name[64];
 };
 
-/** \brief Reply for one_add_del_map_request_itr_rlocs
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-
-define one_add_del_map_request_itr_rlocs_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief map/unmap vni/bd_index to vrf
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -525,7 +394,7 @@ define one_add_del_map_request_itr_rlocs_reply
     @param dp_table - virtual network id/bridge domain index
     @param vrf - vrf
 */
-define one_eid_table_add_del_map
+autoreply define one_eid_table_add_del_map
 {
   u32 client_index;
   u32 context;
@@ -535,16 +404,6 @@ define one_eid_table_add_del_map
   u8 is_l2;
 };
 
-/** \brief Reply for one_eid_table_add_del_map
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define one_eid_table_add_del_map_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for map one locator status
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -901,31 +760,19 @@ define one_stats_details
   u32 bytes;
 };
 
-define one_stats_flush
+autoreply define one_stats_flush
 {
   u32 client_index;
   u32 context;
 };
 
-define one_stats_flush_reply
-{
-  u32 context;
-  i32 retval;
-};
-
-define one_stats_enable_disable
+autoreply define one_stats_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_en;
 };
 
-define one_stats_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 define show_one_stats_enable_disable
 {
   u32 client_index;
diff --git a/src/vnet/lisp-gpe/lisp_gpe.api b/src/vnet/lisp-gpe/lisp_gpe.api
index 43a6a6cd499..f79d18c1a60 100644
--- a/src/vnet/lisp-gpe/lisp_gpe.api
+++ b/src/vnet/lisp-gpe/lisp_gpe.api
@@ -43,7 +43,7 @@ typeonly manual_print manual_endian define gpe_locator
     @param loc_num - number of locators
     @param locs - array of remote locators
 */
-manual_print manual_endian define gpe_add_del_fwd_entry
+autoreply manual_print manual_endian define gpe_add_del_fwd_entry
 {
   u32 client_index;
   u32 context;
@@ -60,44 +60,24 @@ manual_print manual_endian define gpe_add_del_fwd_entry
   vl_api_gpe_locator_t locs[loc_num];
 };
 
-/** \brief Reply for gpe_fwd_entry add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define gpe_add_del_fwd_entry_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief enable or disable gpe protocol
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_en - enable protocol if non-zero, else disable
 */
-define gpe_enable_disable
+autoreply define gpe_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_en;
 };
 
-/** \brief Reply for gpe enable/disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define gpe_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete gpe_iface
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_add - add address if non-zero, else delete
 */
-define gpe_add_del_iface
+autoreply define gpe_add_del_iface
 {
   u32 client_index;
   u32 context;
@@ -107,16 +87,6 @@ define gpe_add_del_iface
   u32 vni;
 };
 
-/** \brief Reply for gpe_iface add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define gpe_add_del_iface_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 define gpe_fwd_entries_get
 {
   u32 client_index;
@@ -163,23 +133,13 @@ manual_endian manual_print define gpe_fwd_entry_path_details
     @param context - sender context, to match reply w/ request
     @param mode - LISP (value 0) or VXLAN (value 1)
 */
-define gpe_set_encap_mode
+autoreply define gpe_set_encap_mode
 {
   u32 client_index;
   u32 context;
   u8 mode;
 };
 
-/** \brief Reply for set_encap_mode
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define gpe_set_encap_mode_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief get GPE encapsulation mode
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/vnet/map/map.api b/src/vnet/map/map.api
index 4e4be85effa..d68f13f0bc9 100644
--- a/src/vnet/map/map.api
+++ b/src/vnet/map/map.api
@@ -62,22 +62,13 @@ define map_add_domain_reply
     @param context - sender context, to match reply w/ request
     @param index - MAP Domain index
 */
-define map_del_domain
+autoreply define map_del_domain
 {
   u32 client_index;
   u32 context;
   u32 index;
 };
 
-/** \brief Reply for MAP domain del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define map_del_domain_reply
-{
-  u32 context;
-  i32 retval;
-};
 
 /** \brief Add or Delete MAP rule from a domain (Only used for shared IPv4 per subscriber)
     @param client_index - opaque cookie to identify the sender
@@ -87,7 +78,7 @@ define map_del_domain_reply
     @param ip6_dst - MAP CE IPv6 address
     @param psid - Rule PSID
 */
-define map_add_del_rule
+autoreply define map_add_del_rule
 {
   u32 client_index;
   u32 context;
@@ -97,15 +88,6 @@ define map_add_del_rule
   u16 psid;
 };
 
-/** \brief Reply for MAP rule add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define map_add_del_rule_reply
-{
-  u32 context;
-  i32 retval;
-};
 
 /** \brief Get list of map domains
     @param client_index - opaque cookie to identify the sender
diff --git a/src/vnet/mpls/mpls.api b/src/vnet/mpls/mpls.api
index a1e1270a853..c8a3ffb7422 100644
--- a/src/vnet/mpls/mpls.api
+++ b/src/vnet/mpls/mpls.api
@@ -26,7 +26,7 @@
     @param mb_address_length - Length of IP prefix
     @param mb_address[16] - IP prefix/
 */
-define mpls_ip_bind_unbind
+autoreply define mpls_ip_bind_unbind
 {
   u32 client_index;
   u32 context;
@@ -40,16 +40,6 @@ define mpls_ip_bind_unbind
   u8 mb_address[16];
 };
 
-/** \brief Reply for MPLS IP bind/unbind request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define mpls_ip_bind_unbind_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief MPLS tunnel Add / del route
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -172,7 +162,7 @@ manual_endian manual_print define mpls_tunnel_details
     @param mr_next_hop_out_label_stack - the next-hop output label stack, outer most first
     @param next_hop_via_label - The next-hop is a resolved via a local label
 */
-define mpls_route_add_del
+autoreply define mpls_route_add_del
 {
   u32 client_index;
   u32 context;
@@ -199,16 +189,6 @@ define mpls_route_add_del
   u32 mr_next_hop_out_label_stack[mr_next_hop_n_out_labels];
 };
 
-/** \brief Reply for MPLS route add / del request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define mpls_route_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump MPLS fib table
     @param client_index - opaque cookie to identify the sender
 */
@@ -240,4 +220,4 @@ manual_endian manual_print define mpls_fib_details
  * eval: (c-set-style "gnu")
  * End:
  */
- 
-\ No newline at end of file
+ 
diff --git a/src/vnet/session/session.api b/src/vnet/session/session.api
index e207e46f686..4aef09da2a8 100644
--- a/src/vnet/session/session.api
+++ b/src/vnet/session/session.api
@@ -49,26 +49,17 @@ define application_attach_reply {
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
 */
- define application_detach {
+autoreply define application_detach {
     u32 client_index;
     u32 context;
  };
  
- /** \brief detach reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define application_detach_reply {
-    u32 context;
-    i32 retval;
-};
- 
 /** \brief vpp->client, please map an additional shared memory segment
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param segment_name - 
 */
-define map_another_segment {
+autoreply define map_another_segment {
     u32 client_index;
     u32 context;
     u32 segment_size;
@@ -83,7 +74,7 @@ define map_another_segment {
                  "tcp://::/0/80" [ipv6] etc.
     @param options - socket options, fifo sizes, etc.
 */
-define bind_uri {
+autoreply define bind_uri {
   u32 client_index;
   u32 context;
   u32 accept_cookie;
@@ -97,7 +88,7 @@ define bind_uri {
                  "tcp://::/0/80" [ipv6], etc.
     @param options - socket options, fifo sizes, etc.
 */
-define unbind_uri {
+autoreply define unbind_uri {
   u32 client_index;
   u32 context;
   u8 uri[128];
@@ -122,24 +113,6 @@ define connect_uri {
   u64 options[16];
 };
 
-/** \brief Bind reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define bind_uri_reply {
-    u32 context;
-    i32 retval;
-};
-
-/** \brief unbind reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define unbind_uri_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief vpp->client, connect reply
     @param context - sender context, to match reply w/ request
     @param retval - return code for the request
@@ -165,15 +138,6 @@ define connect_uri_reply {
   u8 segment_name[128];
 };
 
-/** \brief client->vpp
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define map_another_segment_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief vpp->client, accept this session
     @param context - sender context, to match reply w/ request
     @param listener_handle - tells client which listener this pertains to
@@ -290,7 +254,7 @@ define bind_sock {
     @param context - sender context, to match reply w/ request
     @param handle - bind handle obtained from bind reply
 */
-define unbind_sock {
+autoreply define unbind_sock {
   u32 client_index;
   u32 context;
   u64 handle;
@@ -339,15 +303,6 @@ define bind_sock_reply {
   u8 segment_name[128];
 };
 
-/** \brief unbind reply
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define unbind_sock_reply {
-  u32 context;
-  i32 retval;
-};
-
 /** \brief vpp/server->client, connect reply
     @param context - sender context, to match reply w/ request
     @param retval - return code for the request
@@ -378,23 +333,14 @@ define connect_sock_reply {
     @param context - sender context, to match reply w/ request
     @param is_enable - disable session layer if 0, enable otherwise
 */
-define session_enable_disable {
+autoreply define session_enable_disable {
   u32 client_index;
   u32 context;
   u8 is_enable;
 };
 
-/** \brief Reply for session enable/disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define session_enable_disable_reply {
-  u32 context;
-  i32 retval;
-};
-
 /*
  * Local Variables:
  * eval: (c-set-style "gnu")
  * End:
- */
-\ No newline at end of file
+ */
diff --git a/src/vnet/span/span.api b/src/vnet/span/span.api
index 4babdd834ee..914fd8d0b40 100644
--- a/src/vnet/span/span.api
+++ b/src/vnet/span/span.api
@@ -21,7 +21,7 @@
     @param sw_if_index_to - interface where the traffic is mirrored
     @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled
 */
-define sw_interface_span_enable_disable {
+autoreply define sw_interface_span_enable_disable {
     u32 client_index;
     u32 context;
     u32 sw_if_index_from;
@@ -29,14 +29,6 @@ define sw_interface_span_enable_disable {
     u8  state;
 };
 
-/** \brief Reply to SPAN enable/disable request
-    @param context - sender context which was passed in the request
-*/
-define sw_interface_span_enable_disable_reply {
-    u32 context;
-    i32 retval;
-};
-
 /** \brief SPAN dump request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/vnet/sr/sr.api b/src/vnet/sr/sr.api
index 5feadcb03ae..9e9007418b5 100644
--- a/src/vnet/sr/sr.api
+++ b/src/vnet/sr/sr.api
@@ -25,7 +25,7 @@
     @param fib_table  FIB table in which we should install the localsid entry
     @param nh_addr Next Hop IPv4/IPv6 address. Only for L2/L3 xconnect.
 */
-define sr_localsid_add_del
+autoreply define sr_localsid_add_del
 {
   u32 client_index;
   u32 context;
@@ -39,16 +39,6 @@ define sr_localsid_add_del
   u8 nh_addr[16];
 };
 
-/** \brief IPv6 SR LocalSID add/del request response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_localsid_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 SR policy add
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -59,7 +49,7 @@ define sr_localsid_add_del_reply
     @param fib_table is the VRF where to install the FIB entry for the BSID
     @param segments is a vector of IPv6 address composing the segment list
 */
-define sr_policy_add
+autoreply define sr_policy_add
 {
   u32 client_index;
   u32 context;
@@ -72,16 +62,6 @@ define sr_policy_add
   u8 segments[0];
 };
 
-/** \brief IPv6 SR Policy add request response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_policy_add_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 SR policy modification
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -94,7 +74,7 @@ define sr_policy_add_reply
     @param weight is the weight of the sid list. optional.
     @param is_encap Mode. Encapsulation or SRH insertion.
 */
-define sr_policy_mod
+autoreply define sr_policy_mod
 {
   u32 client_index;
   u32 context;
@@ -108,23 +88,13 @@ define sr_policy_mod
   u8 segments[0];
 };
 
-/** \brief IPv6 SR Policy modification request response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_policy_mod_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 SR policy deletion
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param bsid is the bindingSID of the SR Policy
     @param index is the index of the SR policy
 */
-define sr_policy_del
+autoreply define sr_policy_del
 {
   u32 client_index;
   u32 context;
@@ -132,16 +102,6 @@ define sr_policy_del
   u32 sr_policy_index;
 };
 
-/** \brief IPv6 SR Policy deletion request response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_policy_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief IPv6 SR steering add/del
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -154,7 +114,7 @@ define sr_policy_del_reply
     @param sw_if_index is the incoming interface for L2 traffic
     @param traffic_type describes the type of traffic
 */
-define sr_steering_add_del
+autoreply define sr_steering_add_del
 {
   u32 client_index;
   u32 context;
@@ -168,16 +128,6 @@ define sr_steering_add_del
   u8 traffic_type;
 };
 
-/** \brief IPv6 SR steering add/del request response
-    @param context - sender context, to match reply w/ request
-    @param retval - return value for request
-*/
-define sr_steering_add_del_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump the list of SR LocalSIDs
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
diff --git a/src/vnet/unix/tap.api b/src/vnet/unix/tap.api
index 1fd0bb09774..d9fba37134e 100644
--- a/src/vnet/unix/tap.api
+++ b/src/vnet/unix/tap.api
@@ -93,23 +93,13 @@ define tap_modify_reply
     @param context - sender context, to match reply w/ request
     @param sw_if_index - interface index of existing tap interface
 */
-define tap_delete
+autoreply define tap_delete
 {
   u32 client_index;
   u32 context;
   u32 sw_if_index;
 };
 
-/** \brief Reply for tap delete request
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define tap_delete_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Dump tap interfaces request */
 define sw_interface_tap_dump
 {
diff --git a/src/vnet/vxlan/vxlan.api b/src/vnet/vxlan/vxlan.api
index 048220fba52..6c331a58223 100644
--- a/src/vnet/vxlan/vxlan.api
+++ b/src/vnet/vxlan/vxlan.api
@@ -61,7 +61,7 @@ define vxlan_tunnel_details
     @param is_ipv6 - if non-zero, enable ipv6-vxlan-bypass, else ipv4-vxlan-bypass
     @param enable - if non-zero enable, else disable
 */
-define sw_interface_set_vxlan_bypass
+autoreply define sw_interface_set_vxlan_bypass
 {
   u32 client_index;
   u32 context;
@@ -69,13 +69,3 @@ define sw_interface_set_vxlan_bypass
   u8 is_ipv6;
   u8 enable;
 };
-
-/** \brief Interface set vxlan-bypass response
-    @param context - sender context, to match reply w/ request
-    @param retval - return code for the request
-*/
-define sw_interface_set_vxlan_bypass_reply
-{
-  u32 context;
-  i32 retval;
-};
-\ No newline at end of file
author	Dave Barach <dave@barachs.net>	2017-04-24 10:46:54 -0400
committer	Florin Coras <florin.coras@gmail.com>	2017-04-25 16:18:42 +0000
commit	11b8dbf78af49d270a0e72abe7dea73eec30d85f (patch)
tree	5c9c513483f5c468efcb64b82c03c32733dc3a77 /src/vnet
parent	45d3496f3d86ee1a930ce0ffd6ca3d1730355eb8 (diff)