Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: Protocol Independent IP Neighbors
[vpp.git]
/
src
/
vnet
/
adj
/
adj_glean.c
diff --git
a/src/vnet/adj/adj_glean.c
b/src/vnet/adj/adj_glean.c
index
82d0a46
..
338d732
100644
(file)
--- a/
src/vnet/adj/adj_glean.c
+++ b/
src/vnet/adj/adj_glean.c
@@
-24,19
+24,19
@@
*/
static adj_index_t *adj_gleans[FIB_PROTOCOL_MAX];
*/
static adj_index_t *adj_gleans[FIB_PROTOCOL_MAX];
-static inline
vlib_node_registration_t*
+static inline
u32
adj_get_glean_node (fib_protocol_t proto)
{
switch (proto) {
case FIB_PROTOCOL_IP4:
adj_get_glean_node (fib_protocol_t proto)
{
switch (proto) {
case FIB_PROTOCOL_IP4:
- return (
&ip4_glean_node
);
+ return (
ip4_glean_node.index
);
case FIB_PROTOCOL_IP6:
case FIB_PROTOCOL_IP6:
- return (
&ip6_glean_node
);
+ return (
ip6_glean_node.index
);
case FIB_PROTOCOL_MPLS:
break;
}
ASSERT(0);
case FIB_PROTOCOL_MPLS:
break;
}
ASSERT(0);
- return (
NULL
);
+ return (
~0
);
}
/*
}
/*
@@
-48,6
+48,7
@@
adj_get_glean_node (fib_protocol_t proto)
*/
adj_index_t
adj_glean_add_or_lock (fib_protocol_t proto,
*/
adj_index_t
adj_glean_add_or_lock (fib_protocol_t proto,
+ vnet_link_t linkt,
u32 sw_if_index,
const ip46_address_t *nh_addr)
{
u32 sw_if_index,
const ip46_address_t *nh_addr)
{
@@
-61,15
+62,24
@@
adj_glean_add_or_lock (fib_protocol_t proto,
adj->lookup_next_index = IP_LOOKUP_NEXT_GLEAN;
adj->ia_nh_proto = proto;
adj->lookup_next_index = IP_LOOKUP_NEXT_GLEAN;
adj->ia_nh_proto = proto;
+ adj->ia_link = linkt;
+ adj->ia_node_index = adj_get_glean_node(proto);
adj_gleans[proto][sw_if_index] = adj_get_index(adj);
if (NULL != nh_addr)
{
adj->sub_type.glean.receive_addr = *nh_addr;
}
adj_gleans[proto][sw_if_index] = adj_get_index(adj);
if (NULL != nh_addr)
{
adj->sub_type.glean.receive_addr = *nh_addr;
}
+ else
+ {
+ adj->sub_type.glean.receive_addr = zero_addr;
+ }
adj->rewrite_header.sw_if_index = sw_if_index;
adj->rewrite_header.data_bytes = 0;
adj->rewrite_header.sw_if_index = sw_if_index;
adj->rewrite_header.data_bytes = 0;
+ adj->rewrite_header.max_l3_packet_bytes =
+ vnet_sw_interface_get_mtu(vnet_get_main(), sw_if_index,
+ vnet_link_to_mtu(linkt));
adj_lock(adj_get_index(adj));
vnet_update_adjacency_for_sw_interface(vnet_get_main(),
adj_lock(adj_get_index(adj));
vnet_update_adjacency_for_sw_interface(vnet_get_main(),
@@
-82,6
+92,8
@@
adj_glean_add_or_lock (fib_protocol_t proto,
adj_lock(adj_get_index(adj));
}
adj_lock(adj_get_index(adj));
}
+ adj_delegate_adj_created(adj);
+
return (adj_get_index(adj));
}
return (adj_get_index(adj));
}
@@
-100,7
+112,7
@@
adj_glean_update_rewrite (adj_index_t adj_index)
vnet_rewrite_for_sw_interface(vnet_get_main(),
adj_fib_proto_2_nd(adj->ia_nh_proto),
adj->rewrite_header.sw_if_index,
vnet_rewrite_for_sw_interface(vnet_get_main(),
adj_fib_proto_2_nd(adj->ia_nh_proto),
adj->rewrite_header.sw_if_index,
- adj
_get_glean_node(adj->ia_nh_proto)->
index,
+ adj
->ia_node_
index,
VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
&adj->rewrite_header,
sizeof (adj->rewrite_data));
VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
&adj->rewrite_header,
sizeof (adj->rewrite_data));
@@
-164,12
+176,14
@@
VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(adj_glean_interface_state_change);
* @brief Invoked on each SW interface of a HW interface when the
* HW interface state changes
*/
* @brief Invoked on each SW interface of a HW interface when the
* HW interface state changes
*/
-static
void
+static
walk_rc_t
adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
u32 sw_if_index,
void *arg)
{
adj_glean_interface_state_change(vnm, sw_if_index, (uword) arg);
adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
u32 sw_if_index,
void *arg)
{
adj_glean_interface_state_change(vnm, sw_if_index, (uword) arg);
+
+ return (WALK_CONTINUE);
}
/**
}
/**
@@
-253,16
+267,10
@@
format_adj_glean (u8* s, va_list *ap)
{
index_t index = va_arg(*ap, index_t);
CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
{
index_t index = va_arg(*ap, index_t);
CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
- vnet_main_t * vnm = vnet_get_main();
ip_adjacency_t * adj = adj_get(index);
s = format(s, "%U-glean: %U",
format_fib_protocol, adj->ia_nh_proto,
ip_adjacency_t * adj = adj_get(index);
s = format(s, "%U-glean: %U",
format_fib_protocol, adj->ia_nh_proto,
- format_vnet_sw_interface_name,
- vnm,
- vnet_get_sw_interface(vnm,
- adj->rewrite_header.sw_if_index));
- s = format (s, " %U",
format_vnet_rewrite,
&adj->rewrite_header, sizeof (adj->rewrite_data), 0);
format_vnet_rewrite,
&adj->rewrite_header, sizeof (adj->rewrite_data), 0);