Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipsec: Changes to make ipsec encoder/decoders reusable by the plugins
[vpp.git]
/
src
/
vnet
/
lisp-cp
/
lisp_api.c
diff --git
a/src/vnet/lisp-cp/lisp_api.c
b/src/vnet/lisp-cp/lisp_api.c
index
cb2eb0d
..
3f18a5d
100644
(file)
--- a/
src/vnet/lisp-cp/lisp_api.c
+++ b/
src/vnet/lisp-cp/lisp_api.c
@@
-27,10
+27,6
@@
#include <vnet/vnet_msg_enum.h>
#include <vnet/vnet_msg_enum.h>
-#define vl_api_remote_locator_t_endian vl_noop_handler
-#define vl_api_remote_locator_t_print vl_noop_handler
-#define vl_api_local_locator_t_endian vl_noop_handler
-#define vl_api_local_locator_t_print vl_noop_handler
#define vl_api_lisp_add_del_locator_set_t_endian vl_noop_handler
#define vl_api_lisp_add_del_locator_set_t_print vl_noop_handler
#define vl_api_lisp_add_del_locator_set_t_endian vl_noop_handler
#define vl_api_lisp_add_del_locator_set_t_print vl_noop_handler
@@
-102,8
+98,9
@@
unformat_lisp_locs (vl_api_remote_locator_t * rmt_locs, u32 rloc_num)
{
/* remote locators */
r = &rmt_locs[i];
{
/* remote locators */
r = &rmt_locs[i];
- memset (&loc, 0, sizeof (loc));
- gid_address_ip_set (&loc.address, &r->addr, r->is_ip4 ? IP4 : IP6);
+ clib_memset (&loc, 0, sizeof (loc));
+ gid_address_ip_set (&loc.address, &r->addr,
+ r->is_ip4 ? AF_IP4 : AF_IP6);
loc.priority = r->priority;
loc.weight = r->weight;
loc.priority = r->priority;
loc.weight = r->weight;
@@
-126,9
+123,9
@@
vl_api_lisp_add_del_locator_set_t_handler (vl_api_lisp_add_del_locator_set_t *
u8 *locator_name = NULL;
int i;
u8 *locator_name = NULL;
int i;
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (a, 0, sizeof (a[0]));
- mp->locator_set_name[
63
] = 0;
+ mp->locator_set_name[
sizeof (mp->locator_set_name) - 1
] = 0;
locator_name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (locator_name);
locator_name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (locator_name);
@@
-137,7
+134,7
@@
vl_api_lisp_add_del_locator_set_t_handler (vl_api_lisp_add_del_locator_set_t *
a->local = 1;
locator_num = clib_net_to_host_u32 (mp->locator_num);
a->local = 1;
locator_num = clib_net_to_host_u32 (mp->locator_num);
- memset (&locator, 0, sizeof (locator));
+
clib_
memset (&locator, 0, sizeof (locator));
for (i = 0; i < locator_num; i++)
{
ls_loc = &mp->locators[i];
for (i = 0; i < locator_num; i++)
{
ls_loc = &mp->locators[i];
@@
-175,8
+172,8
@@
vl_api_lisp_add_del_locator_t_handler (vl_api_lisp_add_del_locator_t * mp)
u32 ls_index = ~0;
u8 *locator_name = NULL;
u32 ls_index = ~0;
u8 *locator_name = NULL;
- memset (&locator, 0, sizeof (locator));
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (&locator, 0, sizeof (locator));
+
clib_
memset (a, 0, sizeof (a[0]));
locator.sw_if_index = ntohl (mp->sw_if_index);
locator.priority = mp->priority;
locator.sw_if_index = ntohl (mp->sw_if_index);
locator.priority = mp->priority;
@@
-184,7
+181,7
@@
vl_api_lisp_add_del_locator_t_handler (vl_api_lisp_add_del_locator_t * mp)
locator.local = 1;
vec_add1 (locators, locator);
locator.local = 1;
vec_add1 (locators, locator);
- mp->locator_set_name[
63
] = 0;
+ mp->locator_set_name[
sizeof (mp->locator_set_name) - 1
] = 0;
locator_name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (locator_name);
locator_name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (locator_name);
@@
-209,13
+206,13
@@
unformat_lisp_eid_api (gid_address_t * dst, u32 vni, u8 type, void *src,
{
case 0: /* ipv4 */
gid_address_type (dst) = GID_ADDR_IP_PREFIX;
{
case 0: /* ipv4 */
gid_address_type (dst) = GID_ADDR_IP_PREFIX;
- gid_address_ip_set (dst, src, IP4);
+ gid_address_ip_set (dst, src,
AF_
IP4);
gid_address_ippref_len (dst) = len;
ip_prefix_normalize (&gid_address_ippref (dst));
break;
case 1: /* ipv6 */
gid_address_type (dst) = GID_ADDR_IP_PREFIX;
gid_address_ippref_len (dst) = len;
ip_prefix_normalize (&gid_address_ippref (dst));
break;
case 1: /* ipv6 */
gid_address_type (dst) = GID_ADDR_IP_PREFIX;
- gid_address_ip_set (dst, src, IP6);
+ gid_address_ip_set (dst, src,
AF_
IP6);
gid_address_ippref_len (dst) = len;
ip_prefix_normalize (&gid_address_ippref (dst));
break;
gid_address_ippref_len (dst) = len;
ip_prefix_normalize (&gid_address_ippref (dst));
break;
@@
-244,15
+241,15
@@
vl_api_lisp_add_del_local_eid_t_handler (vl_api_lisp_add_del_local_eid_t * mp)
u32 locator_set_index = ~0, map_index = ~0;
vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
u8 *name = NULL, *key = NULL;
u32 locator_set_index = ~0, map_index = ~0;
vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
u8 *name = NULL, *key = NULL;
- memset (a, 0, sizeof (a[0]));
- memset (eid, 0, sizeof (eid[0]));
+
clib_
memset (a, 0, sizeof (a[0]));
+
clib_
memset (eid, 0, sizeof (eid[0]));
rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->eid, mp->prefix_len);
if (rv)
goto out;
rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->eid, mp->prefix_len);
if (rv)
goto out;
- mp->locator_set_name[
63
] = 0;
+ mp->locator_set_name[
sizeof (mp->locator_set_name) - 1
] = 0;
name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (name);
p = hash_get_mem (lcm->locator_set_index_by_name, name);
name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (name);
p = hash_get_mem (lcm->locator_set_index_by_name, name);
@@
-303,9
+300,9
@@
vl_api_lisp_add_del_map_server_t_handler (vl_api_lisp_add_del_map_server_t
int rv = 0;
ip_address_t addr;
int rv = 0;
ip_address_t addr;
- memset (&addr, 0, sizeof (addr));
+
clib_
memset (&addr, 0, sizeof (addr));
- ip_address_set (&addr, mp->ip_address, mp->is_ipv6 ?
IP6 :
IP4);
+ ip_address_set (&addr, mp->ip_address, mp->is_ipv6 ?
AF_IP6 : AF_
IP4);
rv = vnet_lisp_add_del_map_server (&addr, mp->is_add);
REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_SERVER_REPLY);
rv = vnet_lisp_add_del_map_server (&addr, mp->is_add);
REPLY_MACRO (VL_API_LISP_ADD_DEL_MAP_SERVER_REPLY);
@@
-319,10
+316,10
@@
vl_api_lisp_add_del_map_resolver_t_handler (vl_api_lisp_add_del_map_resolver_t
int rv = 0;
vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
int rv = 0;
vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (a, 0, sizeof (a[0]));
a->is_add = mp->is_add;
a->is_add = mp->is_add;
- ip_address_set (&a->address, mp->ip_address, mp->is_ipv6 ?
IP6 :
IP4);
+ ip_address_set (&a->address, mp->ip_address, mp->is_ipv6 ?
AF_IP6 : AF_
IP4);
rv = vnet_lisp_add_del_map_resolver (a);
rv = vnet_lisp_add_del_map_resolver (a);
@@
-395,6
+392,7
@@
vl_api_lisp_pitr_set_locator_set_t_handler (vl_api_lisp_pitr_set_locator_set_t
int rv = 0;
u8 *ls_name = 0;
int rv = 0;
u8 *ls_name = 0;
+ mp->ls_name[sizeof (mp->ls_name) - 1] = 0;
ls_name = format (0, "%s", mp->ls_name);
vec_terminate_c_string (ls_name);
rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
ls_name = format (0, "%s", mp->ls_name);
vec_terminate_c_string (ls_name);
rv = vnet_lisp_pitr_set_locator_set (ls_name, mp->is_add);
@@
-410,7
+408,7
@@
vl_api_lisp_use_petr_t_handler (vl_api_lisp_use_petr_t * mp)
int rv = 0;
ip_address_t addr;
int rv = 0;
ip_address_t addr;
- ip_address_set (&addr, &mp->address, mp->is_ip4 ?
IP4 :
IP6);
+ ip_address_set (&addr, &mp->address, mp->is_ip4 ?
AF_IP4 : AF_
IP6);
rv = vnet_lisp_use_petr (&addr, mp->is_add);
REPLY_MACRO (VL_API_LISP_USE_PETR_REPLY);
rv = vnet_lisp_use_petr (&addr, mp->is_add);
REPLY_MACRO (VL_API_LISP_USE_PETR_REPLY);
@@
-419,7
+417,6
@@
vl_api_lisp_use_petr_t_handler (vl_api_lisp_use_petr_t * mp)
static void
vl_api_show_lisp_use_petr_t_handler (vl_api_show_lisp_use_petr_t * mp)
{
static void
vl_api_show_lisp_use_petr_t_handler (vl_api_show_lisp_use_petr_t * mp)
{
- unix_shared_memory_queue_t *q = NULL;
vl_api_show_lisp_use_petr_reply_t *rmp = NULL;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
mapping_t *m;
vl_api_show_lisp_use_petr_reply_t *rmp = NULL;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
mapping_t *m;
@@
-429,13
+426,7
@@
vl_api_show_lisp_use_petr_t_handler (vl_api_show_lisp_use_petr_t * mp)
u8 status = 0;
gid_address_t addr;
u8 status = 0;
gid_address_t addr;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
-
- memset (&addr, 0, sizeof (addr));
+ clib_memset (&addr, 0, sizeof (addr));
status = lcm->flags & LISP_FLAG_USE_PETR;
if (status)
{
status = lcm->flags & LISP_FLAG_USE_PETR;
if (status)
{
@@
-456,12
+447,12
@@
vl_api_show_lisp_use_petr_t_handler (vl_api_show_lisp_use_petr_t * mp)
ip_address_t *ip = &gid_address_ip (&addr);
switch (ip_addr_version (ip))
{
ip_address_t *ip = &gid_address_ip (&addr);
switch (ip_addr_version (ip))
{
- case IP4:
+ case
AF_
IP4:
clib_memcpy (rmp->address, &ip_addr_v4 (ip),
sizeof (ip_addr_v4 (ip)));
break;
clib_memcpy (rmp->address, &ip_addr_v4 (ip),
sizeof (ip_addr_v4 (ip)));
break;
- case IP6:
+ case
AF_
IP6:
clib_memcpy (rmp->address, &ip_addr_v6 (ip),
sizeof (ip_addr_v6 (ip)));
break;
clib_memcpy (rmp->address, &ip_addr_v6 (ip),
sizeof (ip_addr_v6 (ip)));
break;
@@
-469,7
+460,7
@@
vl_api_show_lisp_use_petr_t_handler (vl_api_show_lisp_use_petr_t * mp)
default:
ASSERT (0);
}
default:
ASSERT (0);
}
- rmp->is_ip4 = (gid_address_ip_version (&addr) == IP4);
+ rmp->is_ip4 = (gid_address_ip_version (&addr) ==
AF_
IP4);
});
/* *INDENT-ON* */
}
});
/* *INDENT-ON* */
}
@@
-483,7
+474,7
@@
static void
u8 *locator_set_name = NULL;
vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
u8 *locator_set_name = NULL;
vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
- mp->locator_set_name[
63
] = 0;
+ mp->locator_set_name[
sizeof (mp->locator_set_name) - 1
] = 0;
locator_set_name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (locator_set_name);
locator_set_name = format (0, "%s", mp->locator_set_name);
vec_terminate_c_string (locator_set_name);
@@
-507,7
+498,7
@@
static void
gid_address_t _eid, *eid = &_eid;
u32 rloc_num = clib_net_to_host_u32 (mp->rloc_num);
gid_address_t _eid, *eid = &_eid;
u32 rloc_num = clib_net_to_host_u32 (mp->rloc_num);
- memset (eid, 0, sizeof (eid[0]));
+
clib_
memset (eid, 0, sizeof (eid[0]));
rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->eid, mp->eid_len);
rv = unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->eid, mp->eid_len);
@@
-519,7
+510,7
@@
static void
if (!mp->is_add)
{
vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
if (!mp->is_add)
{
vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
- memset (a, 0, sizeof (*a));
+
clib_
memset (a, 0, sizeof (*a));
gid_address_copy (&a->reid, eid);
a->is_add = 0;
rv = vnet_lisp_add_del_adjacency (a);
gid_address_copy (&a->reid, eid);
a->is_add = 0;
rv = vnet_lisp_add_del_adjacency (a);
@@
-534,7
+525,7
@@
static void
if (mp->is_add)
{
vnet_lisp_add_del_mapping_args_t _m_args, *m_args = &_m_args;
if (mp->is_add)
{
vnet_lisp_add_del_mapping_args_t _m_args, *m_args = &_m_args;
- memset (m_args, 0, sizeof (m_args[0]));
+
clib_
memset (m_args, 0, sizeof (m_args[0]));
gid_address_copy (&m_args->eid, eid);
m_args->action = mp->action;
m_args->is_static = 1;
gid_address_copy (&m_args->eid, eid);
m_args->action = mp->action;
m_args->is_static = 1;
@@
-563,7
+554,7
@@
vl_api_lisp_add_del_adjacency_t_handler (vl_api_lisp_add_del_adjacency_t * mp)
vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
int rv = 0;
vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
int rv = 0;
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (a, 0, sizeof (a[0]));
rv = unformat_lisp_eid_api (&a->leid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->leid, mp->leid_len);
rv = unformat_lisp_eid_api (&a->leid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->leid, mp->leid_len);
@@
-582,13
+573,13
@@
send_reply:
static void
send_lisp_locator_details (lisp_cp_main_t * lcm,
static void
send_lisp_locator_details (lisp_cp_main_t * lcm,
- locator_t * loc,
- u
nix_shared_memory_queue_t * q, u
32 context)
+ locator_t * loc,
vl_api_registration_t * reg,
+ u32 context)
{
vl_api_lisp_locator_details_t *rmp;
rmp = vl_msg_api_alloc (sizeof (*rmp));
{
vl_api_lisp_locator_details_t *rmp;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+
clib_
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_DETAILS);
rmp->context = context;
rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_DETAILS);
rmp->context = context;
@@
-605,25
+596,23
@@
send_lisp_locator_details (lisp_cp_main_t * lcm,
rmp->priority = loc->priority;
rmp->weight = loc->weight;
rmp->priority = loc->priority;
rmp->weight = loc->weight;
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t * mp)
{
u8 *ls_name = 0;
}
static void
vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t * mp)
{
u8 *ls_name = 0;
-
unix_shared_memory_queue_t *q
= 0;
+
vl_api_registration_t *reg
= 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;
uword *p = 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;
uword *p = 0;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
if (mp->is_index_set)
ls_index = htonl (mp->ls_index);
if (mp->is_index_set)
ls_index = htonl (mp->ls_index);
@@
-647,7
+636,7
@@
vl_api_lisp_locator_dump_t_handler (vl_api_lisp_locator_dump_t * mp)
vec_foreach (locit, lsit->locator_indices)
{
loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
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);
+ send_lisp_locator_details (lcm, loc,
reg
, mp->context);
};
out:
vec_free (ls_name);
};
out:
vec_free (ls_name);
@@
-656,14
+645,14
@@
out:
static void
send_lisp_locator_set_details (lisp_cp_main_t * lcm,
locator_set_t * lsit,
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
ls_index)
+
vl_api_registration_t * reg, u32 context
,
+ u32 ls_index)
{
vl_api_lisp_locator_set_details_t *rmp;
u8 *str = 0;
rmp = vl_msg_api_alloc (sizeof (*rmp));
{
vl_api_lisp_locator_set_details_t *rmp;
u8 *str = 0;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+
clib_
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_SET_DETAILS);
rmp->context = context;
rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_SET_DETAILS);
rmp->context = context;
@@
-681,22
+670,20
@@
send_lisp_locator_set_details (lisp_cp_main_t * lcm,
vec_free (str);
}
vec_free (str);
}
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp)
{
}
static void
vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp)
{
-
unix_shared_memory_queue_t *q = NULL
;
+
vl_api_registration_t *reg
;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
locator_set_t *lsit = NULL;
u8 filter;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
locator_set_t *lsit = NULL;
u8 filter;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
filter = mp->filter;
/* *INDENT-OFF* */
filter = mp->filter;
/* *INDENT-OFF* */
@@
-707,7
+694,7
@@
vl_api_lisp_locator_set_dump_t_handler (vl_api_lisp_locator_set_dump_t * mp)
{
continue;
}
{
continue;
}
- send_lisp_locator_set_details (lcm, lsit,
q
, mp->context,
+ send_lisp_locator_set_details (lcm, lsit,
reg
, mp->context,
lsit - lcm->locator_set_pool);
}));
/* *INDENT-ON* */
lsit - lcm->locator_set_pool);
}));
/* *INDENT-ON* */
@@
-722,7
+709,7
@@
lisp_fid_put_api (u8 * dst, fid_address_t * src, u8 * prefix_length)
switch (fid_addr_type (src))
{
case FID_ADDR_IP_PREF:
switch (fid_addr_type (src))
{
case FID_ADDR_IP_PREF:
- if (ip_prefix_version (ippref) == IP4)
+ if (ip_prefix_version (ippref) ==
AF_
IP4)
clib_memcpy (dst, &ip_prefix_v4 (ippref), 4);
else
clib_memcpy (dst, &ip_prefix_v6 (ippref), 16);
clib_memcpy (dst, &ip_prefix_v4 (ippref), 4);
else
clib_memcpy (dst, &ip_prefix_v6 (ippref), 16);
@@
-749,9
+736,9
@@
fid_type_to_api_type (fid_address_t * fid)
{
case FID_ADDR_IP_PREF:
ippref = &fid_addr_ippref (fid);
{
case FID_ADDR_IP_PREF:
ippref = &fid_addr_ippref (fid);
- if (ip_prefix_version (ippref) == IP4)
+ if (ip_prefix_version (ippref) ==
AF_
IP4)
return 0;
return 0;
- else if (ip_prefix_version (ippref) == IP6)
+ else if (ip_prefix_version (ippref) ==
AF_
IP6)
return 1;
else
return ~0;
return 1;
else
return ~0;
@@
-767,8
+754,8
@@
fid_type_to_api_type (fid_address_t * fid)
static void
send_lisp_eid_table_details (mapping_t * mapit,
static void
send_lisp_eid_table_details (mapping_t * mapit,
-
unix_shared_memory_queue_t * q
,
- u
32 context, u
8 filter)
+
vl_api_registration_t * reg, u32 context
,
+ u8 filter)
{
fid_address_t *fid;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
{
fid_address_t *fid;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
@@
-805,7
+792,7
@@
send_lisp_eid_table_details (mapping_t * mapit,
mac = gid_address_mac (gid);
rmp = vl_msg_api_alloc (sizeof (*rmp));
mac = gid_address_mac (gid);
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+
clib_
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_DETAILS);
ls = pool_elt_at_index (lcm->locator_set_pool, mapit->locator_set_index);
rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_DETAILS);
ls = pool_elt_at_index (lcm->locator_set_pool, mapit->locator_set_index);
@@
-832,7
+819,7
@@
send_lisp_eid_table_details (mapping_t * mapit,
break;
case GID_ADDR_IP_PREFIX:
rmp->eid_prefix_len = ip_prefix_len (ip_prefix);
break;
case GID_ADDR_IP_PREFIX:
rmp->eid_prefix_len = ip_prefix_len (ip_prefix);
- if (ip_prefix_version (ip_prefix) == IP4)
+ if (ip_prefix_version (ip_prefix) ==
AF_
IP4)
{
rmp->eid_type = 0; /* ipv4 type */
clib_memcpy (rmp->eid, &ip_prefix_v4 (ip_prefix),
{
rmp->eid_type = 0; /* ipv4 type */
clib_memcpy (rmp->eid, &ip_prefix_v4 (ip_prefix),
@@
-856,27
+843,25
@@
send_lisp_eid_table_details (mapping_t * mapit,
rmp->vni = clib_host_to_net_u32 (gid_address_vni (gid));
rmp->key_id = clib_host_to_net_u16 (mapit->key_id);
memcpy (rmp->key, mapit->key, vec_len (mapit->key));
rmp->vni = clib_host_to_net_u32 (gid_address_vni (gid));
rmp->key_id = clib_host_to_net_u16 (mapit->key_id);
memcpy (rmp->key, mapit->key, vec_len (mapit->key));
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp)
{
u32 mi;
}
static void
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
;
+
vl_api_registration_t *reg
;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
mapping_t *mapit = NULL;
gid_address_t _eid, *eid = &_eid;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
mapping_t *mapit = NULL;
gid_address_t _eid, *eid = &_eid;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
if (mp->eid_set)
{
if (mp->eid_set)
{
- memset (eid, 0, sizeof (*eid));
+
clib_
memset (eid, 0, sizeof (*eid));
unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->eid, mp->prefix_length);
unformat_lisp_eid_api (eid, clib_net_to_host_u32 (mp->vni),
mp->eid_type, mp->eid, mp->prefix_length);
@@
-886,7
+871,7
@@
vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp)
return;
mapit = pool_elt_at_index (lcm->mapping_pool, mi);
return;
mapit = pool_elt_at_index (lcm->mapping_pool, mi);
- send_lisp_eid_table_details (mapit,
q
, mp->context,
+ send_lisp_eid_table_details (mapit,
reg
, mp->context,
0 /* ignore filter */ );
}
else
0 /* ignore filter */ );
}
else
@@
-894,7
+879,7
@@
vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp)
/* *INDENT-OFF* */
pool_foreach (mapit, lcm->mapping_pool,
({
/* *INDENT-OFF* */
pool_foreach (mapit, lcm->mapping_pool,
({
- send_lisp_eid_table_details(mapit,
q
, mp->context,
+ send_lisp_eid_table_details(mapit,
reg
, mp->context,
mp->filter);
}));
/* *INDENT-ON* */
mp->filter);
}));
/* *INDENT-ON* */
@@
-902,24
+887,24
@@
vl_api_lisp_eid_table_dump_t_handler (vl_api_lisp_eid_table_dump_t * mp)
}
static void
}
static void
-send_lisp_map_server_details (ip_address_t * ip,
- u
nix_shared_memory_queue_t * q, u
32 context)
+send_lisp_map_server_details (ip_address_t * ip,
vl_api_registration_t * reg,
+ u32 context)
{
vl_api_lisp_map_server_details_t *rmp = NULL;
rmp = vl_msg_api_alloc (sizeof (*rmp));
{
vl_api_lisp_map_server_details_t *rmp = NULL;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+
clib_
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_SERVER_DETAILS);
switch (ip_addr_version (ip))
{
rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_SERVER_DETAILS);
switch (ip_addr_version (ip))
{
- case IP4:
+ case
AF_
IP4:
rmp->is_ipv6 = 0;
clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
sizeof (ip_addr_v4 (ip)));
break;
rmp->is_ipv6 = 0;
clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
sizeof (ip_addr_v4 (ip)));
break;
- case IP6:
+ case
AF_
IP6:
rmp->is_ipv6 = 1;
clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
sizeof (ip_addr_v6 (ip)));
rmp->is_ipv6 = 1;
clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
sizeof (ip_addr_v6 (ip)));
@@
-930,47
+915,45
@@
send_lisp_map_server_details (ip_address_t * ip,
}
rmp->context = context;
}
rmp->context = context;
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
vl_api_lisp_map_server_dump_t_handler (vl_api_lisp_map_server_dump_t * mp)
{
}
static void
vl_api_lisp_map_server_dump_t_handler (vl_api_lisp_map_server_dump_t * mp)
{
-
unix_shared_memory_queue_t *q = NULL
;
+
vl_api_registration_t *reg
;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
lisp_msmr_t *mr;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
lisp_msmr_t *mr;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
vec_foreach (mr, lcm->map_servers)
{
vec_foreach (mr, lcm->map_servers)
{
- send_lisp_map_server_details (&mr->address,
q
, mp->context);
+ send_lisp_map_server_details (&mr->address,
reg
, mp->context);
}
}
static void
send_lisp_map_resolver_details (ip_address_t * ip,
}
}
static void
send_lisp_map_resolver_details (ip_address_t * ip,
-
unix_shared_memory_queue_t * q
, u32 context)
+
vl_api_registration_t * reg
, u32 context)
{
vl_api_lisp_map_resolver_details_t *rmp = NULL;
rmp = vl_msg_api_alloc (sizeof (*rmp));
{
vl_api_lisp_map_resolver_details_t *rmp = NULL;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+
clib_
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_RESOLVER_DETAILS);
switch (ip_addr_version (ip))
{
rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_RESOLVER_DETAILS);
switch (ip_addr_version (ip))
{
- case IP4:
+ case
AF_
IP4:
rmp->is_ipv6 = 0;
clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
sizeof (ip_addr_v4 (ip)));
break;
rmp->is_ipv6 = 0;
clib_memcpy (rmp->ip_address, &ip_addr_v4 (ip),
sizeof (ip_addr_v4 (ip)));
break;
- case IP6:
+ case
AF_
IP6:
rmp->is_ipv6 = 1;
clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
sizeof (ip_addr_v6 (ip)));
rmp->is_ipv6 = 1;
clib_memcpy (rmp->ip_address, &ip_addr_v6 (ip),
sizeof (ip_addr_v6 (ip)));
@@
-981,58
+964,54
@@
send_lisp_map_resolver_details (ip_address_t * ip,
}
rmp->context = context;
}
rmp->context = context;
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
vl_api_lisp_map_resolver_dump_t_handler (vl_api_lisp_map_resolver_dump_t * mp)
{
}
static void
vl_api_lisp_map_resolver_dump_t_handler (vl_api_lisp_map_resolver_dump_t * mp)
{
-
unix_shared_memory_queue_t *q = NULL
;
+
vl_api_registration_t *reg
;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
lisp_msmr_t *mr;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
lisp_msmr_t *mr;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
vec_foreach (mr, lcm->map_resolvers)
{
vec_foreach (mr, lcm->map_resolvers)
{
- send_lisp_map_resolver_details (&mr->address,
q
, mp->context);
+ send_lisp_map_resolver_details (&mr->address,
reg
, mp->context);
}
}
static void
}
}
static void
-send_eid_table_map_pair (hash_pair_t * p,
- u
nix_shared_memory_queue_t * q, u
32 context)
+send_eid_table_map_pair (hash_pair_t * p,
vl_api_registration_t * reg,
+ u32 context)
{
vl_api_lisp_eid_table_map_details_t *rmp = NULL;
rmp = vl_msg_api_alloc (sizeof (*rmp));
{
vl_api_lisp_eid_table_map_details_t *rmp = NULL;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+
clib_
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_MAP_DETAILS);
rmp->vni = clib_host_to_net_u32 (p->key);
rmp->dp_table = clib_host_to_net_u32 (p->value[0]);
rmp->context = context;
rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_MAP_DETAILS);
rmp->vni = clib_host_to_net_u32 (p->key);
rmp->dp_table = clib_host_to_net_u32 (p->value[0]);
rmp->context = context;
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t *
mp)
{
}
static void
vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t *
mp)
{
-
unix_shared_memory_queue_t *q = NULL
;
+
vl_api_registration_t *reg
;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
hash_pair_t *p;
uword *vni_table = 0;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
hash_pair_t *p;
uword *vni_table = 0;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
if (mp->is_l2)
{
if (mp->is_l2)
{
@@
-1046,22
+1025,22
@@
vl_api_lisp_eid_table_map_dump_t_handler (vl_api_lisp_eid_table_map_dump_t *
/* *INDENT-OFF* */
hash_foreach_pair (p, vni_table,
({
/* *INDENT-OFF* */
hash_foreach_pair (p, vni_table,
({
- send_eid_table_map_pair (p,
q
, mp->context);
+ send_eid_table_map_pair (p,
reg
, mp->context);
}));
/* *INDENT-ON* */
}
static void
}));
/* *INDENT-ON* */
}
static void
-send_eid_table_vni (u32 vni,
unix_shared_memory_queue_t * q
, u32 context)
+send_eid_table_vni (u32 vni,
vl_api_registration_t * reg
, u32 context)
{
vl_api_lisp_eid_table_vni_details_t *rmp = 0;
rmp = vl_msg_api_alloc (sizeof (*rmp));
{
vl_api_lisp_eid_table_vni_details_t *rmp = 0;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+
clib_
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_VNI_DETAILS);
rmp->context = context;
rmp->vni = clib_host_to_net_u32 (vni);
rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_VNI_DETAILS);
rmp->context = context;
rmp->vni = clib_host_to_net_u32 (vni);
- vl_
msg_api_send_shmem (q, (u8 *) &
rmp);
+ vl_
api_send_msg (reg, (u8 *)
rmp);
}
static void
}
static void
@@
-1074,14
+1053,14
@@
lisp_adjacency_copy (vl_api_lisp_adjacency_t * dst, lisp_adjacency_t * adjs)
for (i = 0; i < n; i++)
{
adj = vec_elt_at_index (adjs, i);
for (i = 0; i < n; i++)
{
adj = vec_elt_at_index (adjs, i);
- memset (&a, 0, sizeof (a));
+
clib_
memset (&a, 0, sizeof (a));
switch (gid_address_type (&adj->reid))
{
case GID_ADDR_IP_PREFIX:
a.reid_prefix_len = gid_address_ippref_len (&adj->reid);
a.leid_prefix_len = gid_address_ippref_len (&adj->leid);
switch (gid_address_type (&adj->reid))
{
case GID_ADDR_IP_PREFIX:
a.reid_prefix_len = gid_address_ippref_len (&adj->reid);
a.leid_prefix_len = gid_address_ippref_len (&adj->leid);
- if (gid_address_ip_version (&adj->reid) == IP4)
+ if (gid_address_ip_version (&adj->reid) ==
AF_
IP4)
{
a.eid_type = 0; /* ipv4 type */
clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 4);
{
a.eid_type = 0; /* ipv4 type */
clib_memcpy (a.reid, &gid_address_ip (&adj->reid), 4);
@@
-1165,14
+1144,12
@@
vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t *
{
hash_pair_t *p;
u32 *vnis = 0;
{
hash_pair_t *p;
u32 *vnis = 0;
-
unix_shared_memory_queue_t *q
= 0;
+
vl_api_registration_t *reg
= 0;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
/* *INDENT-OFF* */
hash_foreach_pair (p, lcm->table_id_by_vni,
/* *INDENT-OFF* */
hash_foreach_pair (p, lcm->table_id_by_vni,
@@
-1187,7
+1164,7
@@
vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t *
hash_foreach_pair (p, vnis,
({
hash_foreach_pair (p, vnis,
({
- send_eid_table_vni (p->key,
q
, mp->context);
+ send_eid_table_vni (p->key,
reg
, mp->context);
}));
/* *INDENT-ON* */
}));
/* *INDENT-ON* */
@@
-1197,16
+1174,9
@@
vl_api_lisp_eid_table_vni_dump_t_handler (vl_api_lisp_eid_table_vni_dump_t *
static void
vl_api_show_lisp_status_t_handler (vl_api_show_lisp_status_t * mp)
{
static void
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;
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;
- }
-
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY,
({
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_SHOW_LISP_STATUS_REPLY,
({
@@
-1220,19
+1190,12
@@
static void
vl_api_lisp_get_map_request_itr_rlocs_t_handler
(vl_api_lisp_get_map_request_itr_rlocs_t * mp)
{
vl_api_lisp_get_map_request_itr_rlocs_t_handler
(vl_api_lisp_get_map_request_itr_rlocs_t * mp)
{
- unix_shared_memory_queue_t *q = NULL;
vl_api_lisp_get_map_request_itr_rlocs_reply_t *rmp = NULL;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
locator_set_t *loc_set = 0;
u8 *tmp_str = 0;
int rv = 0;
vl_api_lisp_get_map_request_itr_rlocs_reply_t *rmp = NULL;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
locator_set_t *loc_set = 0;
u8 *tmp_str = 0;
int rv = 0;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
-
if (~0 == lcm->mreq_itr_rlocs)
{
tmp_str = format (0, " ");
if (~0 == lcm->mreq_itr_rlocs)
{
tmp_str = format (0, " ");
@@
-1258,7
+1221,6
@@
static void
static void
vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
{
static void
vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
{
- unix_shared_memory_queue_t *q = NULL;
vl_api_show_lisp_pitr_reply_t *rmp = NULL;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
mapping_t *m;
vl_api_show_lisp_pitr_reply_t *rmp = NULL;
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
mapping_t *m;
@@
-1266,13
+1228,10
@@
vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
u8 *tmp_str = 0;
int rv = 0;
u8 *tmp_str = 0;
int rv = 0;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ u8 is_enabled = (lcm->flags & LISP_FLAG_PITR_MODE)
+ && lcm->pitr_map_index != ~0;
- if (!
lcm->lisp_pitr
)
+ if (!
is_enabled
)
{
tmp_str = format (0, "N/A");
}
{
tmp_str = format (0, "N/A");
}
@@
-1295,7
+1254,7
@@
vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_SHOW_LISP_PITR_REPLY,
({
/* *INDENT-OFF* */
REPLY_MACRO2(VL_API_SHOW_LISP_PITR_REPLY,
({
- rmp->status = lcm->
lisp_pitr
;
+ rmp->status = lcm->
flags & LISP_FLAG_PITR_MODE
;
strncpy((char *) rmp->locator_set_name, (char *) tmp_str,
ARRAY_LEN(rmp->locator_set_name) - 1);
}));
strncpy((char *) rmp->locator_set_name, (char *) tmp_str,
ARRAY_LEN(rmp->locator_set_name) - 1);
}));
@@
-1305,7
+1264,7
@@
vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
/*
* lisp_api_hookup
* Add vpe's API message handlers to the table.
/*
* lisp_api_hookup
* Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has alread
y
mapped shared memory and
* added the client registration handlers.
* See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
*/
* added the client registration handlers.
* See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
*/