summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
4069f41)
Type: improvement
Change-Id: Ie063ee0a0c59a9ad632200ce2b23703bc0d936e6
Signed-off-by: Benoît Ganne <bganne@cisco.com>
(((_itf) < vec_len(adj_nbr_tables[_proto])) && \
(NULL != adj_nbr_tables[_proto][sw_if_index]))
(((_itf) < vec_len(adj_nbr_tables[_proto])) && \
(NULL != adj_nbr_tables[_proto][sw_if_index]))
+#define ADJ_NBR_ASSERT_NH_PROTO(nh_proto, err) \
+ do { \
+ ASSERT (nh_proto < FIB_PROTOCOL_IP_MAX); \
+ const fib_protocol_t nh_proto__ = (nh_proto); \
+ if (nh_proto__ >= FIB_PROTOCOL_IP_MAX) \
+ { \
+ clib_warning ("BUG: protocol %d > %d\n", \
+ (int)nh_proto__, \
+ FIB_PROTOCOL_IP_MAX); \
+ return err; \
+ } \
+ } while (0)
+
static void
adj_nbr_insert (fib_protocol_t nh_proto,
vnet_link_t link_type,
static void
adj_nbr_insert (fib_protocol_t nh_proto,
vnet_link_t link_type,
+ ADJ_NBR_ASSERT_NH_PROTO (nh_proto,);
+
if (sw_if_index >= vec_len(adj_nbr_tables[nh_proto]))
{
vec_validate(adj_nbr_tables[nh_proto], sw_if_index);
if (sw_if_index >= vec_len(adj_nbr_tables[nh_proto]))
{
vec_validate(adj_nbr_tables[nh_proto], sw_if_index);
+ ADJ_NBR_ASSERT_NH_PROTO (nh_proto,);
+
if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
return;
if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
return;
adj_nbr_key_t kv;
uword *p;
adj_nbr_key_t kv;
uword *p;
+ ADJ_NBR_ASSERT_NH_PROTO (nh_proto, ADJ_INDEX_INVALID);
+
ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
ADJ_NBR_SET_KEY(kv, link_type, nh_addr);
if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index))
adj_index_t ai, *ais, *aip;
adj_nbr_key_t *key;
adj_index_t ai, *ais, *aip;
adj_nbr_key_t *key;
+ ADJ_NBR_ASSERT_NH_PROTO (adj_nh_proto,);
+
if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
return;
if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
return;
adj_walk_cb_t cb,
void *ctx)
{
adj_walk_cb_t cb,
void *ctx)
{
+ ADJ_NBR_ASSERT_NH_PROTO (adj_nh_proto,);
+
if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
return;
if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
return;