X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Flb%2Fapi.c;h=fe1d7e43d6960ce01e672fdb50598de7acbdab12;hb=03e1d559f912513e1bc2ffc615b7833471afc790;hp=ad92b9b97dd997feb9de227cb06cfe5b172b3f48;hpb=a0cb32cb9fba93ec4b91e7d227c07d1b2099091b;p=vpp.git diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c index ad92b9b97dd..fe1d7e43d69 100644 --- a/src/plugins/lb/api.c +++ b/src/plugins/lb/api.c @@ -19,52 +19,26 @@ #include #include -#include +#include #include #include #include +#include +#include /* define message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include -#undef vl_endianfun +#include +#include -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun - -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version #define REPLY_MSG_ID_BASE lbm->msg_id_base #include -/* List of message types that this plugin understands */ -#define foreach_lb_plugin_api_msg \ -_(LB_CONF, lb_conf) \ -_(LB_ADD_DEL_VIP, lb_add_del_vip) \ -_(LB_ADD_DEL_AS, lb_add_del_as) \ -_(LB_FLUSH_VIP, lb_flush_vip) \ - - -/* Macro to finish up custom dump fns */ -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static void vl_api_lb_conf_t_handler @@ -72,36 +46,23 @@ vl_api_lb_conf_t_handler { lb_main_t *lbm = &lb_main; vl_api_lb_conf_reply_t * rmp; + u32 sticky_buckets_per_core, flow_timeout; int rv = 0; - if (mp->sticky_buckets_per_core == ~0) { - mp->sticky_buckets_per_core = lbm->per_cpu_sticky_buckets; - } - if (mp->flow_timeout == ~0) { - mp->flow_timeout = lbm->flow_timeout; - } + sticky_buckets_per_core = mp->sticky_buckets_per_core == ~0 + ? lbm->per_cpu_sticky_buckets + : ntohl(mp->sticky_buckets_per_core); + flow_timeout = mp->flow_timeout == ~0 + ? lbm->flow_timeout + : ntohl(mp->flow_timeout); rv = lb_conf((ip4_address_t *)&mp->ip4_src_address, - (ip6_address_t *)&mp->ip6_src_address, - mp->sticky_buckets_per_core, - mp->flow_timeout); + (ip6_address_t *)&mp->ip6_src_address, + sticky_buckets_per_core, flow_timeout); 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) @@ -109,7 +70,7 @@ vl_api_lb_add_del_vip_t_handler lb_main_t *lbm = &lb_main; vl_api_lb_conf_reply_t * rmp; int rv = 0; - lb_vip_add_args_t args; + lb_vip_add_args_t args = {}; /* if port == 0, it means all-port VIP */ if (mp->port == 0) @@ -117,46 +78,46 @@ vl_api_lb_add_del_vip_t_handler mp->protocol = ~0; } - memcpy (&(args.prefix.ip6), mp->ip_prefix, sizeof(args.prefix.ip6)); + ip_address_decode (&mp->pfx.address, &(args.prefix)); if (mp->is_del) { u32 vip_index; - if (!(rv = lb_vip_find_index(&(args.prefix), mp->prefix_length, + if (!(rv = lb_vip_find_index(&(args.prefix), mp->pfx.len, mp->protocol, ntohs(mp->port), &vip_index))) rv = lb_vip_del(vip_index); } else { u32 vip_index; lb_vip_type_t type = 0; - if (ip46_prefix_is_ip4(&(args.prefix), mp->prefix_length)) { - if (mp->encap == LB_ENCAP_TYPE_GRE4) + if (ip46_prefix_is_ip4(&(args.prefix), mp->pfx.len)) { + if (mp->encap == LB_API_ENCAP_TYPE_GRE4) type = LB_VIP_TYPE_IP4_GRE4; - else if (mp->encap == LB_ENCAP_TYPE_GRE6) + else if (mp->encap == LB_API_ENCAP_TYPE_GRE6) type = LB_VIP_TYPE_IP4_GRE6; - else if (mp->encap == LB_ENCAP_TYPE_L3DSR) + else if (mp->encap == LB_API_ENCAP_TYPE_L3DSR) type = LB_VIP_TYPE_IP4_L3DSR; - else if (mp->encap == LB_ENCAP_TYPE_NAT4) + else if (mp->encap == LB_API_ENCAP_TYPE_NAT4) type = LB_VIP_TYPE_IP4_NAT4; } else { - if (mp->encap == LB_ENCAP_TYPE_GRE4) + if (mp->encap == LB_API_ENCAP_TYPE_GRE4) type = LB_VIP_TYPE_IP6_GRE4; - else if (mp->encap == LB_ENCAP_TYPE_GRE6) + else if (mp->encap == LB_API_ENCAP_TYPE_GRE6) type = LB_VIP_TYPE_IP6_GRE6; - else if (mp->encap == LB_ENCAP_TYPE_NAT6) + else if (mp->encap == LB_API_ENCAP_TYPE_NAT6) type = LB_VIP_TYPE_IP6_NAT6; } - args.plen = mp->prefix_length; + args.plen = mp->pfx.len; args.protocol = mp->protocol; args.port = ntohs(mp->port); args.type = type; args.new_length = ntohl(mp->new_flows_table_length); - if (mp->encap == LB_ENCAP_TYPE_L3DSR) { + if (mp->encap == LB_API_ENCAP_TYPE_L3DSR) { args.encap_args.dscp = (u8)(mp->dscp & 0x3F); } - else if ((mp->encap == LB_ENCAP_TYPE_NAT4) - ||(mp->encap == LB_ENCAP_TYPE_NAT6)) { + else if ((mp->encap == LB_API_ENCAP_TYPE_NAT4) + ||(mp->encap == LB_API_ENCAP_TYPE_NAT6)) { args.encap_args.srv_type = mp->type; args.encap_args.target_port = ntohs(mp->target_port); } @@ -166,36 +127,78 @@ 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) +static void +vl_api_lb_add_del_vip_v2_t_handler (vl_api_lb_add_del_vip_v2_t *mp) { - u8 * s; - s = format (0, "SCRIPT: lb_add_del_vip "); - s = format (s, "%U ", format_ip46_prefix, - (ip46_address_t *)mp->ip_prefix, mp->prefix_length, IP46_TYPE_ANY); - - s = format (s, "%s ", (mp->encap == LB_ENCAP_TYPE_GRE4)? "gre4" - : (mp->encap == LB_ENCAP_TYPE_GRE6)? "gre6" - : (mp->encap == LB_ENCAP_TYPE_NAT4)? "nat4" - : (mp->encap == LB_ENCAP_TYPE_NAT6)? "nat6" - : "l3dsr"); - - if (mp->encap==LB_ENCAP_TYPE_L3DSR) + lb_main_t *lbm = &lb_main; + vl_api_lb_conf_reply_t *rmp; + int rv = 0; + lb_vip_add_args_t args = {}; + + /* if port == 0, it means all-port VIP */ + if (mp->port == 0) { - s = format (s, "dscp %u ", mp->dscp); + mp->protocol = ~0; } - if ((mp->encap==LB_ENCAP_TYPE_NAT4) - || (mp->encap==LB_ENCAP_TYPE_NAT6)) + ip_address_decode (&mp->pfx.address, &(args.prefix)); + + if (mp->is_del) { - s = format (s, "type %u ", mp->type); - s = format (s, "port %u ", mp->port); - s = format (s, "target_port %u ", mp->target_port); + u32 vip_index; + if (!(rv = lb_vip_find_index (&(args.prefix), mp->pfx.len, mp->protocol, + ntohs (mp->port), &vip_index))) + rv = lb_vip_del (vip_index); } - - s = format (s, "%u ", mp->new_flows_table_length); - s = format (s, "%s ", mp->is_del?"del":"add"); - FINISH; + else + { + u32 vip_index; + lb_vip_type_t type = 0; + + if (ip46_prefix_is_ip4 (&(args.prefix), mp->pfx.len)) + { + if (mp->encap == LB_API_ENCAP_TYPE_GRE4) + type = LB_VIP_TYPE_IP4_GRE4; + else if (mp->encap == LB_API_ENCAP_TYPE_GRE6) + type = LB_VIP_TYPE_IP4_GRE6; + else if (mp->encap == LB_API_ENCAP_TYPE_L3DSR) + type = LB_VIP_TYPE_IP4_L3DSR; + else if (mp->encap == LB_API_ENCAP_TYPE_NAT4) + type = LB_VIP_TYPE_IP4_NAT4; + } + else + { + if (mp->encap == LB_API_ENCAP_TYPE_GRE4) + type = LB_VIP_TYPE_IP6_GRE4; + else if (mp->encap == LB_API_ENCAP_TYPE_GRE6) + type = LB_VIP_TYPE_IP6_GRE6; + else if (mp->encap == LB_API_ENCAP_TYPE_NAT6) + type = LB_VIP_TYPE_IP6_NAT6; + } + + args.plen = mp->pfx.len; + args.protocol = mp->protocol; + args.port = ntohs (mp->port); + args.type = type; + args.new_length = ntohl (mp->new_flows_table_length); + + if (mp->src_ip_sticky) + args.src_ip_sticky = 1; + + if (mp->encap == LB_API_ENCAP_TYPE_L3DSR) + { + args.encap_args.dscp = (u8) (mp->dscp & 0x3F); + } + else if ((mp->encap == LB_API_ENCAP_TYPE_NAT4) || + (mp->encap == LB_API_ENCAP_TYPE_NAT6)) + { + args.encap_args.srv_type = mp->type; + args.encap_args.target_port = ntohs (mp->target_port); + } + + rv = lb_vip_add (args, &vip_index); + } + REPLY_MACRO (VL_API_LB_ADD_DEL_VIP_V2_REPLY); } static void @@ -207,16 +210,17 @@ vl_api_lb_add_del_as_t_handler int rv = 0; u32 vip_index; ip46_address_t vip_ip_prefix; - - memcpy(&vip_ip_prefix.ip6, mp->vip_ip_prefix, - sizeof(vip_ip_prefix.ip6)); - ip46_address_t as_address; - memcpy(&as_address.ip6, mp->as_address, - sizeof(as_address.ip6)); + /* if port == 0, it means all-port VIP */ + if (mp->port == 0) + { + mp->protocol = ~0; + } + ip_address_decode (&mp->pfx.address, &vip_ip_prefix); + ip_address_decode (&mp->as_address, &as_address); - if ((rv = lb_vip_find_index(&vip_ip_prefix, mp->vip_prefix_length, + if ((rv = lb_vip_find_index(&vip_ip_prefix, mp->pfx.len, mp->protocol, ntohs(mp->port), &vip_index))) goto done; @@ -229,17 +233,116 @@ 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) +static void +vl_api_lb_vip_dump_t_handler +(vl_api_lb_vip_dump_t * mp) +{ + + vl_api_registration_t *reg; + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + lb_main_t *lbm = &lb_main; + vl_api_lb_vip_details_t * rmp; + int msg_size = 0; + lb_vip_t *vip = 0; + + /* construct vip list */ + pool_foreach (vip, lbm->vips) { + /* Hide placeholder VIP */ + if (vip != lbm->vips) { + msg_size = sizeof (*rmp); + rmp = vl_msg_api_alloc (msg_size); + memset (rmp, 0, msg_size); + rmp->_vl_msg_id = + htons (VL_API_LB_VIP_DETAILS + lbm->msg_id_base); + rmp->context = mp->context; + + ip_address_encode(&vip->prefix, IP46_TYPE_ANY, &rmp->vip.pfx.address); + rmp->vip.pfx.len = vip->plen; + rmp->vip.protocol = htonl (vip->protocol); + rmp->vip.port = htons(vip->port); + rmp->encap = htonl(vip->type); + rmp->dscp = vip->encap_args.dscp; + rmp->srv_type = vip->encap_args.srv_type; + rmp->target_port = htons(vip->encap_args.target_port); + rmp->flow_table_length = htonl(vip->new_flow_table_mask + 1); + + vl_api_send_msg (reg, (u8 *) rmp); + } + } + + +} + +static void send_lb_as_details + (vl_api_registration_t * reg, u32 context, lb_vip_t * vip) +{ + vl_api_lb_as_details_t *rmp; + lb_main_t *lbm = &lb_main; + int msg_size = 0; + u32 *as_index; + + /* construct as list under this vip */ + lb_as_t *as; + + pool_foreach (as_index, vip->as_indexes) { + /* Hide placeholder As for specific VIP */ + if (*as_index != 0) { + as = &lbm->ass[*as_index]; + msg_size = sizeof (*rmp); + rmp = vl_msg_api_alloc (msg_size); + memset (rmp, 0, msg_size); + rmp->_vl_msg_id = + htons (VL_API_LB_AS_DETAILS + lbm->msg_id_base); + rmp->context = context; + ip_address_encode(&vip->prefix, IP46_TYPE_ANY, (vl_api_address_t *)&rmp->vip.pfx.address); + rmp->vip.pfx.len = vip->plen; + rmp->vip.protocol = htonl (vip->protocol); + rmp->vip.port = htons(vip->port); + ip_address_encode(&as->address, IP46_TYPE_ANY, &rmp->app_srv); + rmp->flags = as->flags; + rmp->in_use_since = htonl(as->last_used); + + vl_api_send_msg (reg, (u8 *) rmp); + } + } + + +} + +static void +vl_api_lb_as_dump_t_handler +(vl_api_lb_as_dump_t * mp) { - u8 * s; - s = format (0, "SCRIPT: lb_add_del_as "); - s = format (s, "%U ", format_ip46_prefix, - (ip46_address_t *)mp->vip_ip_prefix, mp->vip_prefix_length, IP46_TYPE_ANY); - s = format (s, "%U ", format_ip46_address, - (ip46_address_t *)mp->as_address, IP46_TYPE_ANY); - s = format (s, "%s ", mp->is_del?"del":"add"); - FINISH; + lb_main_t *lbm = &lb_main; + lb_vip_t *vip = 0; + u8 dump_all = 0; + ip46_address_t prefix; + + vl_api_registration_t *reg; + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + clib_memcpy(&prefix.ip6, mp->pfx.address.un.ip6, sizeof(mp->pfx.address.un.ip6)); + + dump_all = (prefix.ip6.as_u64[0] == 0) && (prefix.ip6.as_u64[1] == 0); + + /* *INDENT-OFF* */ + pool_foreach (vip, lbm->vips) + { + if ( dump_all + || ((prefix.as_u64[0] == vip->prefix.as_u64[0]) + && (prefix.as_u64[1] == vip->prefix.as_u64[1]) + && (mp->protocol == vip->protocol) + && (mp->port == vip->port)) ) + { + send_lb_as_details(reg, mp->context, vip); + } + } + /* *INDENT-ON* */ } static void @@ -258,9 +361,9 @@ vl_api_lb_flush_vip_t_handler mp->protocol = ~0; } - memcpy (&(vip_prefix.ip6), mp->ip_prefix, sizeof(vip_prefix.ip6)); + memcpy (&(vip_prefix.ip6), mp->pfx.address.un.ip6, sizeof(vip_prefix.ip6)); - vip_plen = mp->prefix_length; + vip_plen = mp->pfx.len; rv = lb_vip_find_index(&vip_prefix, vip_plen, mp->protocol, ntohs(mp->port), &vip_index); @@ -270,74 +373,58 @@ vl_api_lb_flush_vip_t_handler REPLY_MACRO (VL_API_LB_FLUSH_VIP_REPLY); } -static void *vl_api_lb_flush_vip_t_print -(vl_api_lb_flush_vip_t *mp, void * handle) +static void vl_api_lb_add_del_intf_nat4_t_handler + (vl_api_lb_add_del_intf_nat4_t * mp) { - u8 * s; - s = format (0, "SCRIPT: lb_add_del_vip "); - s = format (s, "%U ", format_ip46_prefix, - (ip46_address_t *)mp->ip_prefix, mp->prefix_length, IP46_TYPE_ANY); + lb_main_t *lbm = &lb_main; + vl_api_lb_add_del_intf_nat4_reply_t *rmp; + u32 sw_if_index = ntohl (mp->sw_if_index); + u8 is_del; + int rv = 0; + + is_del = !mp->is_add; + + VALIDATE_SW_IF_INDEX (mp); - s = format (s, "protocol %u ", mp->protocol); - s = format (s, "port %u ", mp->port); + rv = lb_nat4_interface_add_del(sw_if_index, is_del); - FINISH; + BAD_SW_IF_INDEX_LABEL; + + REPLY_MACRO (VL_API_LB_ADD_DEL_INTF_NAT4_REPLY); } -/* Set up the API message handling tables */ -static clib_error_t * -lb_plugin_api_hookup (vlib_main_t *vm) +static void vl_api_lb_add_del_intf_nat6_t_handler + (vl_api_lb_add_del_intf_nat6_t * mp) { -lb_main_t *lbm = &lb_main; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + lbm->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_lb_plugin_api_msg; -#undef _ - - return 0; -} + lb_main_t *lbm = &lb_main; + vl_api_lb_add_del_intf_nat6_reply_t *rmp; + u32 sw_if_index = ntohl (mp->sw_if_index); + u8 is_del; + int rv = 0; -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list + is_del = !mp->is_add; -static void -setup_message_id_table (lb_main_t * lmp, api_main_t * am) -{ -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lmp->msg_id_base); - foreach_vl_msg_name_crc_lb ; -#undef _ + VALIDATE_SW_IF_INDEX (mp); + + rv = lb_nat6_interface_add_del(sw_if_index, is_del); + + BAD_SW_IF_INDEX_LABEL; + + REPLY_MACRO (VL_API_LB_ADD_DEL_INTF_NAT6_REPLY); } +#include static clib_error_t * lb_api_init (vlib_main_t * vm) { lb_main_t * lbm = &lb_main; - clib_error_t * error = 0; - u8 * name; lbm->vlib_main = vm; lbm->vnet_main = vnet_get_main(); - name = format (0, "lb_%08x%c", api_version, 0); - /* Ask for a correctly-sized block of API message decode slots */ - lbm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - - error = lb_plugin_api_hookup (vm); - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (lbm, &api_main); - - vec_free (name); + lbm->msg_id_base = setup_message_id_table (); - return error; + return 0; } VLIB_INIT_FUNCTION (lb_api_init);