#include <vppinfra/byte_order.h>
#include <vppinfra/string.h>
-#include <vlibapi/api.h>
+#include <vpp/api/types.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <vpp/app/version.h>
+#include <vnet/ip/ip_types_api.h>
/* define message IDs */
#include <lb/lb_msg_enum.h>
_(LB_CONF, lb_conf) \
_(LB_ADD_DEL_VIP, lb_add_del_vip) \
_(LB_ADD_DEL_AS, lb_add_del_as) \
+_(LB_VIP_DUMP, lb_vip_dump) \
+_(LB_AS_DUMP, lb_as_dump) \
_(LB_FLUSH_VIP, lb_flush_vip) \
mp->protocol = ~0;
}
- memcpy (&(args.prefix.ip6), mp->ip_prefix, sizeof(args.prefix.ip6));
+ memcpy (&(args.prefix), &mp->pfx, sizeof(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);
}
{
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, "%U", format_vl_api_prefix,
+ &mp->pfx);
- 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"
+ 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_ENCAP_TYPE_L3DSR)
+ if (mp->encap==LB_API_ENCAP_TYPE_L3DSR)
{
s = format (s, "dscp %u ", mp->dscp);
}
- if ((mp->encap==LB_ENCAP_TYPE_NAT4)
- || (mp->encap==LB_ENCAP_TYPE_NAT6))
+ 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);
u32 vip_index;
ip46_address_t vip_ip_prefix;
- memcpy(&vip_ip_prefix.ip6, mp->vip_ip_prefix,
- sizeof(vip_ip_prefix.ip6));
+ memcpy(&vip_ip_prefix, &mp->pfx,
+ sizeof(vip_ip_prefix));
ip46_address_t as_address;
- memcpy(&as_address.ip6, mp->as_address,
- sizeof(as_address.ip6));
+ memcpy(&as_address, &mp->as_address,
+ sizeof(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;
(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_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, "%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)
+{
+
+ 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 dummy 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;
+ u32 asindex = 0;
+
+ /* construct as list under this vip */
+ lb_as_t *as;
+
+ pool_foreach(as_index, vip->as_indexes, {
+ /* Hide dummy 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);
+ asindex++;
+ }
+ });
+
+
+}
+
+static void
+vl_api_lb_as_dump_t_handler
+(vl_api_lb_as_dump_t * mp)
+{
+ 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
vl_api_lb_flush_vip_t_handler
(vl_api_lb_flush_vip_t * mp)
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);
{
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, "%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);
Code Review / vpp.git / blobdiff