_(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered) \
_(CREATE_LOOPBACK, create_loopback) \
_(CONTROL_PING, control_ping) \
+_(NOPRINT_CONTROL_PING, noprint_control_ping) \
_(CLI_REQUEST, cli_request) \
_(SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit) \
_(L2_PATCH_ADD_DEL, l2_patch_add_del) \
_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set) \
_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map) \
_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \
-_(LISP_LOCAL_EID_TABLE_DUMP, lisp_local_eid_table_dump) \
+_(LISP_LOCATOR_DUMP, lisp_locator_dump) \
+_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump) \
_(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump) \
_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump) \
_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump) \
-_(LISP_ENABLE_DISABLE_STATUS_DUMP, \
- lisp_enable_disable_status_dump) \
+_(SHOW_LISP_STATUS, show_lisp_status) \
_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, \
lisp_add_del_map_request_itr_rlocs) \
_(LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs) \
}));
}
+static void vl_api_noprint_control_ping_t_handler
+(vl_api_noprint_control_ping_t *mp)
+{
+ vl_api_noprint_control_ping_reply_t * rmp;
+ int rv = 0;
+
+ REPLY_MACRO2(VL_API_NOPRINT_CONTROL_PING_REPLY,
+ ({
+ rmp->vpe_pid = ntohl (getpid());
+ }));
+}
+
static void shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
{
u8 **shmem_vecp = (u8 **)arg;
gid_address_type (&eid) = GID_ADDR_IP_PREFIX;
ip_address_set(ip_eid, mp->eid, IP4);
ip_prefix_len(prefp) = mp->prefix_len;
+ ip_prefix_normalize(prefp);
break;
case 1: /* ipv6 */
gid_address_type (&eid) = GID_ADDR_IP_PREFIX;
ip_address_set(ip_eid, mp->eid, IP6);
ip_prefix_len(prefp) = mp->prefix_len;
+ ip_prefix_normalize(prefp);
break;
case 2: /* l2 mac */
gid_address_type (&eid) = GID_ADDR_MAC;
ip_addr_version(ip_eid) = IP4;
}
ip_prefix_len(prefp) = mp->eid_prefix_len;
+ ip_prefix_normalize(prefp);
if (mp->address_is_ipv6) {
clib_memcpy(&ip_addr_v6(slocator), mp->source_ip_address,
u8 addr[16]; /**< IPv4/IPv6 address */
}) rloc_t;
-static void
-send_lisp_locator_set_details_set_address
-(vl_api_lisp_locator_set_details_t *rmp,
- gid_address_t *gid_address)
-{
- ip_prefix_t *ip_addr;
-
- if (gid_address_type(gid_address) != GID_ADDR_IP_PREFIX) {
- return;
- }
-
- ip_addr = &gid_address_ippref(gid_address);
- rmp->prefix_len = ip_prefix_len(ip_addr);
- rmp->is_ipv6 = ip_prefix_version(ip_addr);
- ip_address_copy_addr(rmp->ip_address, &ip_prefix_addr(ip_addr));
-}
-
static void
vl_api_lisp_add_del_remote_mapping_t_handler (
vl_api_lisp_add_del_remote_mapping_t *mp)
locator_t rloc, * rlocs = 0;
vl_api_lisp_add_del_remote_mapping_reply_t * rmp;
int rv = 0;
- gid_address_t _seid, * seid = &_seid;
- gid_address_t _deid, * deid = &_deid;
- ip_prefix_t * seid_pref = &gid_address_ippref(seid);
- ip_prefix_t * deid_pref = &gid_address_ippref(deid);
-
- /* TODO remove seid from API */
- memset (seid, 0, sizeof (seid[0]));
- memset (deid, 0, sizeof (deid[0]));
- ip_address_t * seid_addr = &ip_prefix_addr(seid_pref);
- ip_address_t * deid_addr = &ip_prefix_addr(deid_pref);
- ip_prefix_len(seid_pref) = mp->seid_len;
- ip_prefix_len(deid_pref) = mp->deid_len;
- u8 * seid_mac = gid_address_mac (seid);
- u8 * deid_mac = gid_address_mac (deid);
- gid_address_vni (seid) = ntohl (mp->vni);
- gid_address_vni (deid) = ntohl (mp->vni);
+ gid_address_t _eid, * eid = &_eid;
+ ip_prefix_t * eid_pref = &gid_address_ippref(eid);
+
+ memset (eid, 0, sizeof (eid[0]));
+ ip_address_t * eid_addr = &ip_prefix_addr(eid_pref);
+ ip_prefix_len(eid_pref) = mp->eid_len;
+ u8 * eid_mac = gid_address_mac (eid);
+ gid_address_vni (eid) = ntohl (mp->vni);
switch (mp->eid_type)
{
case 0: /* ipv4 */
- gid_address_type(seid) = GID_ADDR_IP_PREFIX;
- gid_address_type(deid) = GID_ADDR_IP_PREFIX;
- ip_address_set (seid_addr, mp->seid, IP4);
- ip_address_set (deid_addr, mp->deid, IP4);
+ gid_address_type(eid) = GID_ADDR_IP_PREFIX;
+ ip_address_set (eid_addr, mp->eid, IP4);
+ ip_prefix_normalize (eid_pref);
break;
case 1: /* ipv6 */
- gid_address_type(seid) = GID_ADDR_IP_PREFIX;
- gid_address_type(deid) = GID_ADDR_IP_PREFIX;
- ip_address_set (seid_addr, mp->seid, IP6);
- ip_address_set (deid_addr, mp->deid, IP6);
+ gid_address_type(eid) = GID_ADDR_IP_PREFIX;
+ ip_address_set (eid_addr, mp->eid, IP6);
+ ip_prefix_normalize (eid_pref);
break;
case 2: /* l2 mac */
- gid_address_type(seid) = GID_ADDR_MAC;
- gid_address_type(deid) = GID_ADDR_MAC;
- clib_memcpy (seid_mac, mp->seid, 6);
- clib_memcpy (deid_mac, mp->deid, 6);
+ gid_address_type(eid) = GID_ADDR_MAC;
+ clib_memcpy (eid_mac, mp->eid, 6);
break;
default:
rv = VNET_API_ERROR_INVALID_EID_TYPE;
if (!mp->is_add) {
vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
- gid_address_copy(&a->deid, deid);
+ gid_address_copy(&a->deid, eid);
a->is_add = 0;
rv = vnet_lisp_add_del_adjacency (a);
- } else {
- /* NOTE: for now this works as a static remote mapping, i.e.,
- * not authoritative and ttl infinite. */
- rv = vnet_lisp_add_del_mapping (deid, rlocs, mp->action, 0, ~0,
- mp->is_add, 0);
-
- /* TODO remove once CSIT switched to lisp_add_del_adjacency */
- vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
- gid_address_copy(&a->seid, seid);
- gid_address_copy(&a->deid, deid);
- a->is_add = 1;
- vnet_lisp_add_del_adjacency (a);
+ if (rv) {
+ goto out;
+ }
}
+ /* NOTE: for now this works as a static remote mapping, i.e.,
+ * not authoritative and ttl infinite. */
+ rv = vnet_lisp_add_del_mapping (eid, rlocs, mp->action, 0, ~0,
+ mp->is_add, 0);
+
if (mp->del_all)
vnet_lisp_clear_all_remote_adjacencies ();
+out:
vec_free (rlocs);
send_reply:
REPLY_MACRO(VL_API_LISP_ADD_DEL_REMOTE_MAPPING_REPLY);
gid_address_type(&a->deid) = GID_ADDR_IP_PREFIX;
ip_address_set (seid_addr, mp->seid, IP4);
ip_address_set (deid_addr, mp->deid, IP4);
+ ip_prefix_normalize (seid_pref);
+ ip_prefix_normalize (deid_pref);
break;
case 1: /* ipv6 */
gid_address_type(&a->seid) = GID_ADDR_IP_PREFIX;
gid_address_type(&a->deid) = GID_ADDR_IP_PREFIX;
ip_address_set (seid_addr, mp->seid, IP6);
ip_address_set (deid_addr, mp->deid, IP6);
+ ip_prefix_normalize (seid_pref);
+ ip_prefix_normalize (deid_pref);
break;
case 2: /* l2 mac */
gid_address_type(&a->seid) = GID_ADDR_MAC;
REPLY_MACRO(VL_API_LISP_ADD_DEL_ADJACENCY_REPLY);
}
+static void
+send_lisp_locator_details (lisp_cp_main_t *lcm,
+ locator_t *loc,
+ unix_shared_memory_queue_t *q,
+ u32 context)
+{
+ vl_api_lisp_locator_details_t *rmp;
+
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs(VL_API_LISP_LOCATOR_DETAILS);
+ rmp->context = context;
+
+ rmp->local = loc->local;
+ if (loc->local) {
+ rmp->sw_if_index = ntohl(loc->sw_if_index);
+ } else {
+ rmp->is_ipv6 = gid_address_ip_version(&loc->address);
+ ip_address_copy_addr(rmp->ip_address, &gid_address_ip(&loc->address));
+ }
+ rmp->priority = loc->priority;
+ rmp->weight = loc->weight;
+
+ vl_msg_api_send_shmem (q, (u8 *)&rmp);
+}
+
+static void
+vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t *mp)
+{
+ unix_shared_memory_queue_t * q = 0;
+ lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+ locator_set_t * lsit = 0;
+ locator_t * loc = 0;
+ u32 ls_index = ~0, * locit = 0;
+ u8 filter;
+
+ q = vl_api_client_index_to_input_queue (mp->client_index);
+ if (q == 0) {
+ return;
+ }
+
+ ls_index = htonl(mp->locator_set_index);
+
+ lsit = pool_elt_at_index(lcm->locator_set_pool, ls_index);
+
+ filter = mp->filter;
+ if (filter && !((1 == filter && lsit->local) ||
+ (2 == filter && !lsit->local))) {
+ return;
+ }
+
+ vec_foreach(locit, lsit->locator_indices) {
+ loc = pool_elt_at_index(lcm->locator_pool, locit[0]);
+ send_lisp_locator_details(lcm, loc, q, mp->context);
+ };
+}
+
static void
send_lisp_locator_set_details (lisp_cp_main_t *lcm,
locator_set_t *lsit,
unix_shared_memory_queue_t *q,
u32 context,
- u32 index)
+ u32 ls_index)
{
vl_api_lisp_locator_set_details_t *rmp;
- locator_t *loc = NULL;
- u32 * locit = NULL;
- u8 * str = NULL;
+ u8 * str = 0;
- vec_foreach (locit, lsit->locator_indices) {
- loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs(VL_API_LISP_LOCATOR_SET_DETAILS);
- rmp->local = lsit->local;
- if (lsit->local) {
- ASSERT(lsit->name != NULL);
- strncpy((char *) rmp->locator_set_name,
- (char *) lsit->name, ARRAY_LEN(rmp->locator_set_name) - 1);
- rmp->sw_if_index = htonl(loc->sw_if_index);
- } else {
- str = format(0, "remote-%d", index);
- strncpy((char *) rmp->locator_set_name, (char *) str,
- ARRAY_LEN(rmp->locator_set_name) - 1);
- send_lisp_locator_set_details_set_address(rmp, &loc->address);
-
- vec_free(str);
- }
- rmp->priority = loc->priority;
- rmp->weight = loc->weight;
- rmp->context = context;
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs(VL_API_LISP_LOCATOR_SET_DETAILS);
+ rmp->context = context;
- vl_msg_api_send_shmem (q, (u8 *)&rmp);
+ rmp->local = lsit->local;
+ rmp->locator_set_index= htonl(ls_index);
+ if (lsit->local) {
+ ASSERT(lsit->name != NULL);
+ strncpy((char *) rmp->locator_set_name,
+ (char *) lsit->name, ARRAY_LEN(rmp->locator_set_name) - 1);
+ } else {
+ str = format(0, "remote-%d", ls_index);
+ strncpy((char *) rmp->locator_set_name, (char *) str,
+ ARRAY_LEN(rmp->locator_set_name) - 1);
+ vec_free(str);
}
+
+ vl_msg_api_send_shmem (q, (u8 *)&rmp);
}
static void
lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
locator_set_t * lsit = NULL;
u32 index;
+ u8 filter;
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0) {
return;
}
+ filter = mp->filter;
index = 0;
pool_foreach (lsit, lcm->locator_set_pool,
({
+ if (filter && !((1 == filter && lsit->local) ||
+ (2 == filter && !lsit->local))) {
+ index++;
+ continue;
+ }
+
send_lisp_locator_set_details(lcm, lsit, q, mp->context, index++);
}));
}
static void
-send_lisp_local_eid_table_details (mapping_t *mapit,
+send_lisp_eid_table_details (mapping_t *mapit,
unix_shared_memory_queue_t *q,
- u32 context)
+ u32 context, u8 filter)
{
- vl_api_lisp_local_eid_table_details_t *rmp = NULL;
+ vl_api_lisp_eid_table_details_t *rmp = NULL;
lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
locator_set_t *ls = NULL;
gid_address_t *gid = NULL;
u8 * mac = 0;
ip_prefix_t *ip_prefix = NULL;
- u8 * str = NULL;
ls = pool_elt_at_index (lcm->locator_set_pool,
mapit->locator_set_index);
+
+ switch (filter) {
+ case 0:
+ break;
+ case 1:
+ if (!ls->local) {
+ return;
+ }
+ break;
+ case 2:
+ if (ls->local) {
+ return;
+ }
+ break;
+ default:
+ clib_warning("Filter error, unknown filter: %d\n", filter);
+ return;
+ }
+
gid = &mapit->eid;
ip_prefix = &gid_address_ippref(gid);
mac = gid_address_mac(gid);
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs(VL_API_LISP_LOCAL_EID_TABLE_DETAILS);
- if (ls->local) {
- ASSERT(ls->name != NULL);
- strncpy((char *) rmp->locator_set_name,
- (char *) ls->name, ARRAY_LEN(rmp->locator_set_name) - 1);
- } else {
- str = format(0, "remote-%d", mapit->locator_set_index);
- strncpy((char *) rmp->locator_set_name, (char *) str,
- ARRAY_LEN(rmp->locator_set_name) - 1);
- vec_free(str);
- }
+ rmp->_vl_msg_id = ntohs(VL_API_LISP_EID_TABLE_DETAILS);
+ rmp->locator_set_index = mapit->locator_set_index;
+ rmp->is_local = ls->local;
+ rmp->ttl = mapit->ttl;
+ rmp->authoritative = mapit->authoritative;
switch (gid_address_type (gid))
{
}
static void
-vl_api_lisp_local_eid_table_dump_t_handler (
- vl_api_lisp_local_eid_table_dump_t *mp)
+vl_api_lisp_eid_table_dump_t_handler (
+ vl_api_lisp_eid_table_dump_t *mp)
{
u32 mi;
unix_shared_memory_queue_t * q = NULL;
return;
mapit = pool_elt_at_index (lcm->mapping_pool, mi);
- send_lisp_local_eid_table_details(mapit, q, mp->context);
+ send_lisp_eid_table_details(mapit, q, mp->context, mp->filter);
} else {
pool_foreach (mapit, lcm->mapping_pool,
({
- send_lisp_local_eid_table_details(mapit, q, mp->context);
+ send_lisp_eid_table_details(mapit, q, mp->context,
+ mp->filter);
}));
}
}
}
static void
-send_lisp_enable_disable_details (unix_shared_memory_queue_t *q,
- u32 context)
-{
- vl_api_lisp_enable_disable_status_details_t *rmp = NULL;
-
- rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
- rmp->_vl_msg_id = ntohs(VL_API_LISP_ENABLE_DISABLE_STATUS_DETAILS);
-
- rmp->gpe_status = vnet_lisp_gpe_enable_disable_status ();
- rmp->feature_status = vnet_lisp_enable_disable_status ();
- rmp->context = context;
-
- vl_msg_api_send_shmem (q, (u8 *)&rmp);
-}
-
-static void
-vl_api_lisp_enable_disable_status_dump_t_handler
-(vl_api_lisp_enable_disable_status_dump_t *mp)
+vl_api_show_lisp_status_t_handler
+(vl_api_show_lisp_status_t *mp)
{
unix_shared_memory_queue_t * q = NULL;
+ vl_api_show_lisp_status_reply_t *rmp = NULL;
+ int rv = 0;
q = vl_api_client_index_to_input_queue (mp->client_index);
if (q == 0) {
return;
}
- send_lisp_enable_disable_details(q, mp->context);
+ REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY,
+ ({
+ rmp->gpe_status = vnet_lisp_gpe_enable_disable_status ();
+ rmp->feature_status = vnet_lisp_enable_disable_status ();
+ }));
}
static void