#include <vnet/map/map.h>
#include <vnet/cop/cop.h>
#include <vnet/ip/ip6_hop_by_hop.h>
+#include <vnet/ip/ip_source_and_port_range_check.h>
#include <vnet/policer/xlate.h>
#include <vnet/policer/policer.h>
#include <vnet/policer/police.h>
_(lisp_pitr_set_locator_set_reply) \
_(lisp_add_del_map_request_itr_rlocs_reply) \
_(lisp_eid_table_add_del_map_reply) \
-_(vxlan_gpe_add_del_tunnel_reply) \
+_(vxlan_gpe_add_del_tunnel_reply) \
_(af_packet_delete_reply) \
_(policer_classify_set_interface_reply) \
_(netmap_create_reply) \
_(netmap_delete_reply) \
_(ipfix_enable_reply) \
_(pg_capture_reply) \
-_(pg_enable_disable_reply)
+_(pg_enable_disable_reply) \
+_(ip_source_and_port_range_check_add_del_reply) \
+_(ip_source_and_port_range_check_interface_add_del_reply)
#define _(n) \
static void vl_api_##n##_t_handler \
_(GET_NEXT_INDEX_REPLY, get_next_index_reply) \
_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply) \
_(PG_CAPTURE_REPLY, pg_capture_reply) \
-_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply)
+_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply) \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY, \
+ ip_source_and_port_range_check_add_del_reply) \
+_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY, \
+ ip_source_and_port_range_check_interface_add_del_reply)
/* M: construct, but don't yet send a message */
W;
}
+/** Used for parsing LISP eids */
+typedef CLIB_PACKED(struct{
+ u8 addr[16]; /**< eid address */
+ u32 len; /**< prefix length if IP */
+ u8 type; /**< type of eid */
+}) lisp_eid_vat_t;
+
+static uword
+unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
+{
+ lisp_eid_vat_t * a = va_arg(*args, lisp_eid_vat_t *);
+
+ memset(a, 0, sizeof(a[0]));
+
+ if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len)) {
+ a->type = 0; /* ipv4 type */
+ } else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr,
+ &a->len)) {
+ a->type = 1; /* ipv6 type */
+ } else if (unformat (input, "%U", unformat_ethernet_address, a->addr)) {
+ a->type = 2; /* mac type */
+ } else {
+ return 0;
+ }
+
+ if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128)) {
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+lisp_eid_size_vat (u8 type)
+{
+ switch (type) {
+ case 0:
+ return 4;
+ case 1:
+ return 16;
+ case 2:
+ return 6;
+ }
+ return 0;
+}
+
+static void
+lisp_eid_put_vat (u8 * dst, u8 eid[16], u8 type)
+{
+ clib_memcpy(dst, eid, lisp_eid_size_vat(type));
+}
+
/** Used for transferring locators via VPP API */
typedef CLIB_PACKED(struct
{
vl_api_lisp_add_del_local_eid_t *mp;
f64 timeout = ~0;
u8 is_add = 1;
- u8 eidv4_set = 0;
- u8 eidv6_set = 0;
- u8 eid_type = (u8)~0;
- ip4_address_t eidv4;
- ip6_address_t eidv6;
- u8 mac[6] = {0};
- u32 tmp_eid_lenght = ~0;
- u8 eid_lenght = ~0;
- u8 *locator_set_name = NULL;
+ u8 eid_set = 0;
+ lisp_eid_vat_t _eid, *eid = &_eid;
+ u8 *locator_set_name = 0;
u8 locator_set_name_set = 0;
u32 vni = 0;
is_add = 0;
} else if (unformat(input, "vni %d", &vni)) {
;
- } else if (unformat(input, "eid %U/%d", unformat_ip4_address,
- &eidv4, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv4_set = 1;
- eid_type = 0; /* ipv4 type */
- } else if (unformat(input, "eid %U/%d", unformat_ip6_address,
- &eidv6, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv6_set = 1;
- eid_type = 1; /* ipv6 type */
- } else if (unformat(input, "eid %U", unformat_ethernet_address, mac)) {
- eid_type = 2; /* mac type */
+ } else if (unformat(input, "eid %U", unformat_lisp_eid_vat, eid)) {
+ eid_set = 1;
} else if (unformat(input, "locator-set %s", &locator_set_name)) {
locator_set_name_set = 1;
} else
return -99;
}
- if ((u8)~0 == eid_type) {
+ if (0 == eid_set) {
errmsg ("EID address not set!");
vec_free(locator_set_name);
return -99;
}
vec_add1(locator_set_name, 0);
- if (eidv4_set && eidv6_set) {
- errmsg ("both eid v4 and v6 addresses set\n");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (eidv4_set && eid_lenght > 32) {
- errmsg ("eid prefix to big\n");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (eidv6_set && eid_lenght > 128) {
- errmsg ("eid prefix to big\n");
- vec_free(locator_set_name);
- return -99;
- }
-
/* Construct the API message */
M(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
mp->is_add = is_add;
- switch (eid_type) {
- case 0: /* ipv4 */
- clib_memcpy (mp->eid, &eidv4, sizeof(eidv4));
- break;
- case 1: /* ipv6 */
- clib_memcpy (mp->eid, &eidv6, sizeof(eidv6));
- break;
- case 2: /* mac */
- clib_memcpy (mp->eid, mac, 6);
- break;
- }
- mp->eid_type = eid_type;
- mp->prefix_len = eid_lenght;
+ lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
+ mp->eid_type = eid->type;
+ mp->prefix_len = eid->len;
mp->vni = clib_host_to_net_u32(vni);
clib_memcpy(mp->locator_set_name, locator_set_name,
vec_len(locator_set_name));
+
vec_free(locator_set_name);
/* send it... */
return 0;
}
+/** Used for transferring locators via VPP API */
+typedef CLIB_PACKED(struct
+{
+ u8 is_ip4; /**< is locator an IPv4 address? */
+ u8 priority; /**< locator priority */
+ u8 weight; /**< locator weight */
+ u8 addr[16]; /**< IPv4/IPv6 address */
+}) rloc_t;
+
static int
api_lisp_gpe_add_del_fwd_entry(vat_main_t * vam)
{
vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
f64 timeout = ~0;
u8 is_add = 1;
- u8 eidv4_set = 0, slocv4_set = 0, dlocv4_set = 0;
- u8 eidv6_set = 0, slocv6_set = 0, dlocv6_set = 0;
- ip4_address_t eidv4, slocv4, dlocv4;
- ip6_address_t eidv6, slocv6, dlocv6;
- u32 tmp_eid_lenght = ~0;
- u8 eid_lenght = ~0;
+ lisp_eid_vat_t _rmt_eid, * rmt_eid = &_rmt_eid;
+ lisp_eid_vat_t _lcl_eid, * lcl_eid = &_lcl_eid;
+ u8 rmt_eid_set = 0, lcl_eid_set = 0;
+ u32 action = ~0, p, w;
+ ip4_address_t rmt_rloc4, lcl_rloc4;
+ ip6_address_t rmt_rloc6, lcl_rloc6;
+ rloc_t * rmt_locs = 0, * lcl_locs = 0, rloc, * curr_rloc = 0;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
if (unformat(input, "del")) {
is_add = 0;
- } else if (unformat(input, "eid %U/%d", unformat_ip4_address,
- &eidv4, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv4_set = 1;
- } else if (unformat(input, "eid %U/%d", unformat_ip6_address,
- &eidv6, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv6_set = 1;
- } else if (unformat(input, "sloc %U", unformat_ip4_address, &slocv4)) {
- slocv4_set = 1;
- } else if (unformat(input, "sloc %U", unformat_ip6_address, &slocv6)) {
- slocv6_set = 1;
- } else if (unformat(input, "dloc %U", unformat_ip4_address, &dlocv4)) {
- dlocv4_set = 1;
- } else if (unformat(input, "dloc %U", unformat_ip6_address, &dlocv6)) {
- dlocv6_set = 1;
- } else
- break;
- }
-
- if (eidv4_set && eidv6_set) {
- errmsg ("both eid v4 and v6 addresses set\n");
- return -99;
- }
-
- if (!eidv4_set && !eidv6_set) {
- errmsg ("eid addresses not set\n");
- return -99;
- }
-
- if (slocv4_set && slocv6_set) {
- errmsg ("both source v4 and v6 addresses set\n");
- return -99;
- }
-
- if (!slocv4_set && !slocv6_set) {
- errmsg ("source addresses not set\n");
- return -99;
- }
-
- if (dlocv4_set && dlocv6_set) {
- errmsg ("both destination v4 and v6 addresses set\n");
- return -99;
+ } else if (unformat(input, "rmt_eid %U", unformat_lisp_eid_vat,
+ rmt_eid)) {
+ rmt_eid_set = 1;
+ } else if (unformat(input, "lcl_eid %U", unformat_lisp_eid_vat,
+ lcl_eid)) {
+ lcl_eid_set = 1;
+ } else if (unformat(input, "p %d w %d", &p, &w)) {
+ if (!curr_rloc) {
+ errmsg ("No RLOC configured for setting priority/weight!");
+ return -99;
+ }
+ curr_rloc->priority = p;
+ curr_rloc->weight = w;
+ } else if (unformat(input, "loc-pair %U %U", unformat_ip4_address,
+ &lcl_rloc4, unformat_ip4_address, &rmt_rloc4)) {
+ rloc.is_ip4 = 1;
+ clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4));
+ vec_add1 (lcl_locs, rloc);
+ clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4));
+ vec_add1 (rmt_locs, rloc);
+ curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ } else if (unformat(input, "loc-pair %U", unformat_ip6_address,
+ &lcl_rloc6, unformat_ip6_address, &rmt_rloc6)) {
+ rloc.is_ip4 = 0;
+ clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6));
+ vec_add1 (lcl_locs, rloc);
+ clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6));
+ vec_add1 (rmt_locs, rloc);
+ curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ } else if (unformat(input, "action %d", &action)) {
+ ;
+ } else {
+ clib_warning ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- if (dlocv4_set && dlocv6_set) {
- errmsg ("destination addresses not set\n");
+ if (!rmt_eid_set) {
+ errmsg ("remote eid addresses not set\n");
return -99;
}
- if (!(slocv4_set == dlocv4_set && slocv6_set == dlocv6_set)) {
- errmsg ("mixing type of source and destination address\n");
+ if (lcl_eid_set && rmt_eid->type != lcl_eid->type) {
+ errmsg ("eid types don't match\n");
return -99;
}
M(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
mp->is_add = is_add;
- if (eidv6_set) {
- mp->eid_is_ipv6 = 1;
- clib_memcpy(mp->eid_ip_address, &eidv6, sizeof(eidv6));
- } else {
- mp->eid_is_ipv6 = 0;
- clib_memcpy(mp->eid_ip_address, &eidv4, sizeof(eidv4));
- }
- mp->eid_prefix_len = eid_lenght;
- if (slocv6_set) {
- mp->address_is_ipv6 = 1;
- clib_memcpy(mp->source_ip_address, &slocv6, sizeof(slocv6));
- clib_memcpy(mp->destination_ip_address, &dlocv6, sizeof(dlocv6));
- } else {
- mp->address_is_ipv6 = 0;
- clib_memcpy(mp->source_ip_address, &slocv4, sizeof(slocv4));
- clib_memcpy(mp->destination_ip_address, &dlocv4, sizeof(dlocv4));
- }
+ lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
+ lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type);
+ mp->eid_type = rmt_eid->type;
+ mp->rmt_len = rmt_eid->len;
+ mp->lcl_len = lcl_eid->len;
+
+ mp->loc_num = vec_len (rmt_locs);
+ clib_memcpy (mp->lcl_locs, lcl_locs,
+ (sizeof(rloc_t) * vec_len(lcl_locs)));
+ clib_memcpy (mp->rmt_locs, rmt_locs,
+ (sizeof(rloc_t) * vec_len(rmt_locs)));
+ vec_free(lcl_locs);
+ vec_free(rmt_locs);
/* send it... */
S;
return 0;
}
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
-{
- u8 is_ip4; /**< is locator an IPv4 address? */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
- u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
-
/**
* Enable/disable LISP proxy ITR.
*
f64 timeout = ~0;
unformat_input_t * input = vam->input;
vl_api_lisp_eid_table_add_del_map_t *mp;
- u8 is_add = 1, vni_set = 0, vrf_set = 0;
- u32 vni, vrf;
+ u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0;
+ u32 vni, vrf, bd_index;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
is_add = 0;
else if (unformat(input, "vrf %d", &vrf))
vrf_set = 1;
+ else if (unformat(input, "bd_index %d", &bd_index))
+ bd_index_set = 1;
else if (unformat(input, "vni %d", &vni))
vni_set = 1;
else
break;
}
- if (!vni_set || !vrf_set)
+ if (!vni_set || (!vrf_set && !bd_index_set))
{
errmsg ("missing arguments!");
return -99;
mp->is_add = is_add;
mp->vni = htonl (vni);
- mp->vrf = htonl (vrf);
+ mp->dp_table = htonl (vrf);
+ mp->is_l2 = bd_index_set;
/* send */
S;
f64 timeout = ~0;
u32 vni = 0;
//TODO: seid need remove
- ip4_address_t seid4, eid4, rloc4;
- ip6_address_t seid6, eid6, rloc6;
- u8 eid_mac[6] = {0};
- u8 seid_mac[6] = {0};
- u8 eid_type;
- u32 eid_len = 0, len;
- u8 is_add = 1, del_all = 0;
+ lisp_eid_vat_t _eid, * eid = &_eid;
+ lisp_eid_vat_t _seid, * seid = &_seid;
+ u8 is_add = 1, del_all = 0, eid_set = 0;
u32 action = ~0, p, w;
+ ip4_address_t rloc4;
+ ip6_address_t rloc6;
rloc_t * rlocs = 0, rloc, * curr_rloc = 0;
- eid_type = (u8)~0;
-
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
if (unformat(input, "del-all")) {
is_add = 0;
} else if (unformat(input, "add")) {
is_add = 1;
- } else if (unformat(input, "deid %U/%d", unformat_ip4_address,
- &eid4, &len)) {
- eid_type = 0; /* ipv4 */
- if (32 < len) {
- clib_warning ("Deid prefix length to big, %d!", len);
- return -99;
- }
- eid_len = len;
- } else if (unformat(input, "deid %U/%d", unformat_ip6_address,
- &eid6, &len)) {
- eid_type = 1; /* ipv6 */
- if (128 < len) {
- clib_warning ("Deid prefix length to big, %d!", len);
- return -99;
- }
- eid_len = len;
- } else if (unformat(input, "deid %U", unformat_ethernet_address,
- eid_mac)) {
- eid_type = 2; /* mac */
+ } else if (unformat(input, "deid %U", unformat_lisp_eid_vat, eid)) {
+ eid_set = 1;
+ } else if (unformat(input, "seid %U", unformat_lisp_eid_vat, &seid)) {
//TODO: Need remove, but first must be remove from CSIT test
- } else if (unformat(input, "seid %U/%d", unformat_ip4_address,
- &seid4, &len)) {
- } else if (unformat(input, "seid %U/%d", unformat_ip6_address,
- &seid6, &len)) {
- ;
- } else if (unformat(input, "seid %U", unformat_ethernet_address,
- seid_mac)) {
- ;
} else if (unformat(input, "vni %d", &vni)) {
;
} else if (unformat(input, "p %d w %d", &p, &w)) {
}
}
- if ((u8)~0 == eid_type) {
+ if (0 == eid_set) {
errmsg ("missing params!");
return -99;
}
mp->is_add = is_add;
mp->vni = htonl (vni);
mp->action = (u8) action;
- mp->eid_len = eid_len;
+ mp->eid_len = eid->len;
mp->del_all = del_all;
- mp->eid_type = eid_type;
-
- switch (mp->eid_type) {
- case 0:
- clib_memcpy (mp->eid, &eid4, sizeof (eid4));
- break;
- case 1:
- clib_memcpy (mp->eid, &eid6, sizeof (eid6));
- break;
- case 2:
- clib_memcpy (mp->eid, eid_mac, 6);
- break;
- default:
- errmsg ("unknown EID type %d!", mp->eid_type);
- return 0;
- }
+ mp->eid_type = eid->type;
+ lisp_eid_put_vat(mp->eid, eid->addr, eid->type);
mp->rloc_num = vec_len (rlocs);
clib_memcpy (mp->rlocs, rlocs, (sizeof (rloc_t) * vec_len (rlocs)));
unformat_input_t * input = vam->input;
vl_api_lisp_gpe_add_del_iface_t *mp;
f64 timeout = ~0;
- u8 is_set = 0;
- u8 is_add = 1;
- u32 table_id, vni;
+ u8 is_set = 0, is_add = 1, is_l2 = 0;
+ u32 dp_table, vni;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
} else if (unformat(input, "down")) {
is_set = 1;
is_add = 0;
- } else if (unformat(input, "table_id %d", &table_id)) {
+ } else if (unformat(input, "table_id %d", &dp_table)) {
;
+ } else if (unformat(input, "bd_id %d", &dp_table)) {
+ is_l2 = 1;
} else if (unformat(input, "vni %d", &vni)) {
;
} else
M(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
mp->is_add = is_add;
- mp->table_id = table_id;
+ mp->dp_table = dp_table;
+ mp->is_l2 = is_l2;
mp->vni = vni;
/* send it... */
return 0;
}
+int api_ip_source_and_port_range_check_add_del (vat_main_t *vam)
+{
+ unformat_input_t * input = vam->input;
+ vl_api_ip_source_and_port_range_check_add_del_t *mp;
+ f64 timeout;
+
+ u16 * low_ports = 0;
+ u16 * high_ports = 0;
+ u16 this_low;
+ u16 this_hi;
+ ip4_address_t ip4_addr;
+ ip6_address_t ip6_addr;
+ u32 length;
+ u32 tmp, tmp2;
+ u8 prefix_set = 0;
+ u32 vrf_id =~0;
+ u8 is_add = 1;
+ u8 is_ipv6 = 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
+ {
+ prefix_set = 1;
+ }
+ else if (unformat (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
+ {
+ prefix_set = 1;
+ is_ipv6 = 1;
+ }
+ else if (unformat (input, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (input, "del"))
+ is_add = 0;
+ else if (unformat (input, "port %d", &tmp))
+ {
+ if (tmp == 0 || tmp > 65535) {
+ errmsg ("port %d out of range", tmp);
+ return -99;
+ }
+ this_low = tmp;
+ this_hi = this_low + 1;
+ vec_add1 (low_ports, this_low);
+ vec_add1 (high_ports, this_hi);
+ }
+ else if (unformat (input, "range %d - %d", &tmp, &tmp2))
+ {
+ if ((tmp > tmp2) ||
+ (tmp == 0) ||
+ (tmp2 > 65535)) {
+ errmsg ("incorrect range parameters\n");
+ return -99;
+ }
+ this_low = tmp;
+ /* Note: in debug CLI +1 is added to high before
+ passing to real fn that does "the work"
+ (ip_source_and_port_range_check_add_del).
+ This fn is a wrapper around the binary API fn a
+ control plane will call, which expects this increment
+ to have occurred. Hence letting the binary API control
+ plane fn do the increment for consistency between VAT
+ and other control planes.
+ */
+ this_hi = tmp2;
+ vec_add1 (low_ports, this_low);
+ vec_add1 (high_ports, this_hi);
+ }
+ else
+ break;
+ }
+
+ if (prefix_set == 0) {
+ errmsg ("<address>/<mask> not specified\n");
+ return -99;
+ }
+
+ if (vrf_id == ~0) {
+ errmsg ("VRF ID required, not specified\n");
+ return -99;
+ }
+
+ if (vrf_id == 0) {
+ errmsg ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
+ return -99;
+ }
+
+ if (vec_len(low_ports) == 0) {
+ errmsg ("At least one port or port range required\n");
+ return -99;
+ }
+
+ M(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, ip_source_and_port_range_check_add_del);
+
+ mp->is_add = is_add;
+
+ if (is_ipv6) {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
+ } else {
+ mp->is_ipv6 = 0;
+ clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
+ }
+
+ mp->mask_length = length;
+ mp->number_of_ranges = vec_len (low_ports);
+
+ clib_memcpy (mp->low_ports, low_ports, vec_len(low_ports));
+ vec_free(low_ports);
+
+ clib_memcpy (mp->high_ports, high_ports, vec_len(high_ports));
+ vec_free (high_ports);
+
+ mp->vrf_id = ntohl(vrf_id);
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
+
+int api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam)
+{
+ unformat_input_t * input = vam->input;
+ vl_api_ip_source_and_port_range_check_interface_add_del_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ int vrf_set = 0;
+ u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0;
+ u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0;
+ u8 is_add = 1;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (input, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id))
+ vrf_set=1;
+ else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id))
+ vrf_set=1;
+ else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id))
+ vrf_set=1;
+ else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id))
+ vrf_set=1;
+ else if (unformat (input, "del"))
+ is_add = 0;
+ else
+ break;
+ }
+
+ if (sw_if_index == ~0) {
+ errmsg ("Interface required but not specified\n");
+ return -99;
+ }
+
+ if (vrf_set == 0) {
+ errmsg ("VRF ID required but not specified\n");
+ return -99;
+ }
+
+ if (tcp_out_vrf_id == 0
+ || udp_out_vrf_id == 0
+ || tcp_in_vrf_id == 0
+ || udp_in_vrf_id == 0) {
+ errmsg ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, ip_source_and_port_range_check_interface_add_del);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+ mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id);
+ mp->udp_out_vrf_id = ntohl (udp_out_vrf_id);
+ mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id);
+ mp->udp_in_vrf_id = ntohl (udp_in_vrf_id);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
+}
+
static int q_or_quit (vat_main_t * vam)
{
longjmp (vam->jump_buf, 1);
_(lisp_add_del_local_eid,"vni <vni> eid " \
"<ipv4|ipv6>/<prefix> | <L2 address> " \
"locator-set <locator_name> [del]") \
-_(lisp_gpe_add_del_fwd_entry, "eid <ip4|6-addr>/<prefix> " \
- "sloc <ip4/6-addr> dloc <ip4|6-addr> [del]") \
+_(lisp_gpe_add_del_fwd_entry, "rmt_eid <eid> [lcl_eid <eid>] vni <vni>" \
+ "dp_table <table> loc-pair <lcl_loc> <rmt_loc> ... [del]") \
_(lisp_add_del_map_resolver, "<ip4|6-addr> [del]") \
_(lisp_gpe_enable_disable, "enable|disable") \
_(lisp_enable_disable, "enable|disable") \
_(get_next_index, "node-name <node-name> next-node-name <node-name>") \
_(pg_create_interface, "if_id <nn>") \
_(pg_capture, "if_id <nnn> pcap <file_name> count <nnn> [disable]") \
-_(pg_enable_disable, "[stream <id>] disable")
+_(pg_enable_disable, "[stream <id>] disable") \
+_(ip_source_and_port_range_check_add_del, \
+ "<ip-addr>/<mask> range <nn>-<nn> vrf <id>") \
+_(ip_source_and_port_range_check_interface_add_del, \
+ "<intf> | sw_if_index <nn> [tcp-out-vrf <id>] [tcp-in-vrf <id>]" \
+ "[udp-in-vrf <id>] [udp-out-vrf <id>]")
/* List of command functions, CLI names map directly to functions */
#define foreach_cli_function \