diff options
Diffstat (limited to 'src/plugins/lb')
| -rw-r--r-- | src/plugins/lb/api.c | 77 | ||||
| -rw-r--r-- | src/plugins/lb/lb.api | 8 |
2 files changed, 4 insertions, 81 deletions
diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c index 253cf5b5ba8..176da24ce16 100644 --- a/src/plugins/lb/api.c +++ b/src/plugins/lb/api.c @@ -65,19 +65,6 @@ vl_api_lb_conf_t_handler REPLY_MACRO (VL_API_LB_CONF_REPLY); } -static void *vl_api_lb_conf_t_print -(vl_api_lb_conf_t *mp, void * handle) -{ - u8 * s; - s = format (0, "SCRIPT: lb_conf "); - s = format (s, "%U ", format_ip4_address, (ip4_address_t *)&mp->ip4_src_address); - s = format (s, "%U ", format_ip6_address, (ip6_address_t *)&mp->ip6_src_address); - s = format (s, "%u ", mp->sticky_buckets_per_core); - s = format (s, "%u ", mp->flow_timeout); - FINISH; -} - - static void vl_api_lb_add_del_vip_t_handler (vl_api_lb_add_del_vip_t * mp) @@ -142,38 +129,6 @@ vl_api_lb_add_del_vip_t_handler REPLY_MACRO (VL_API_LB_ADD_DEL_VIP_REPLY); } -static void *vl_api_lb_add_del_vip_t_print -(vl_api_lb_add_del_vip_t *mp, void * handle) -{ - u8 * s; - s = format (0, "SCRIPT: lb_add_del_vip "); - s = format (s, "%U", format_vl_api_prefix, - &mp->pfx); - - s = format (s, "%s ", (mp->encap == LB_API_ENCAP_TYPE_GRE4)? "gre4" - : (mp->encap == LB_API_ENCAP_TYPE_GRE6)? "gre6" - : (mp->encap == LB_API_ENCAP_TYPE_NAT4)? "nat4" - : (mp->encap == LB_API_ENCAP_TYPE_NAT6)? "nat6" - : "l3dsr"); - - if (mp->encap==LB_API_ENCAP_TYPE_L3DSR) - { - s = format (s, "dscp %u ", mp->dscp); - } - - if ((mp->encap==LB_API_ENCAP_TYPE_NAT4) - || (mp->encap==LB_API_ENCAP_TYPE_NAT6)) - { - s = format (s, "type %u ", mp->type); - s = format (s, "port %u ", mp->port); - s = format (s, "target_port %u ", mp->target_port); - } - - s = format (s, "%u ", mp->new_flows_table_length); - s = format (s, "%s ", mp->is_del?"del":"add"); - FINISH; -} - static void vl_api_lb_add_del_as_t_handler (vl_api_lb_add_del_as_t * mp) @@ -206,25 +161,6 @@ done: REPLY_MACRO (VL_API_LB_ADD_DEL_AS_REPLY); } -static void *vl_api_lb_add_del_as_t_print -(vl_api_lb_add_del_as_t *mp, void * handle) -{ - u8 * s; - ip46_address_t address; - s = format (0, "SCRIPT: lb_add_del_as "); - s = format (s, "%U ", format_vl_api_prefix, - &mp->pfx); - s = format(s, "%u ", mp->protocol); - if (ip_address_decode (&mp->as_address, &address) == IP46_TYPE_IP6) - s = format (s, "%U ", format_ip6_address, - (ip6_address_t *) & address.ip6); - else - s = format (s, "%U ", format_ip4_address, - (ip6_address_t *) & address.ip4); - s = format (s, "%s ", mp->is_del?"del":"add"); - FINISH; -} - static void vl_api_lb_vip_dump_t_handler (vl_api_lb_vip_dump_t * mp) @@ -407,19 +343,6 @@ static void vl_api_lb_add_del_intf_nat6_t_handler REPLY_MACRO (VL_API_LB_ADD_DEL_INTF_NAT6_REPLY); } -static void *vl_api_lb_flush_vip_t_print -(vl_api_lb_flush_vip_t *mp, void * handle) -{ - u8 * s; - s = format (0, "SCRIPT: lb_add_del_vip "); - s = format (s, "%U/%d", format_vl_api_address, - &mp->pfx.address, mp->pfx.len); - s = format (s, "protocol %u ", mp->protocol); - s = format (s, "port %u ", mp->port); - - FINISH; -} - #include <lb/lb.api.c> static clib_error_t * lb_api_init (vlib_main_t * vm) { diff --git a/src/plugins/lb/lb.api b/src/plugins/lb/lb.api index 564fe232451..4bf30e76b59 100644 --- a/src/plugins/lb/lb.api +++ b/src/plugins/lb/lb.api @@ -12,7 +12,7 @@ import "vnet/interface_types.api"; @param flow_timeout - Time in seconds after which, if no packet is received for a given flow, the flow is removed from the established flow table. */ -autoreply manual_print define lb_conf +autoreply define lb_conf { u32 client_index; u32 context; @@ -38,7 +38,7 @@ autoreply manual_print define lb_conf for this VIP (must be power of 2). @param is_del - The VIP should be removed. */ -autoreply manual_print define lb_add_del_vip { +autoreply define lb_add_del_vip { u32 client_index; u32 context; vl_api_address_with_prefix_t pfx; @@ -64,7 +64,7 @@ autoreply manual_print define lb_add_del_vip { @param is_del - The AS should be removed. @param is_flush - The sessions related to this AS should be flushed. */ -autoreply manual_print define lb_add_del_as { +autoreply define lb_add_del_as { u32 client_index; u32 context; vl_api_address_with_prefix_t pfx; @@ -83,7 +83,7 @@ autoreply manual_print define lb_add_del_as { @param protocol - tcp or udp. @param port - destination port. */ -autoreply manual_print define lb_flush_vip { +autoreply define lb_flush_vip { u32 client_index; u32 context; vl_api_address_with_prefix_t pfx; |