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_mcast.c
diff --git
a/src/vnet/adj/adj_mcast.c
b/src/vnet/adj/adj_mcast.c
index
755abfd
..
5906522
100644
(file)
--- a/
src/vnet/adj/adj_mcast.c
+++ b/
src/vnet/adj/adj_mcast.c
@@
-66,11
+66,12
@@
adj_mcast_add_or_lock (fib_protocol_t proto,
adj->lookup_next_index = IP_LOOKUP_NEXT_MCAST;
adj->ia_nh_proto = proto;
adj->ia_link = link_type;
adj->lookup_next_index = IP_LOOKUP_NEXT_MCAST;
adj->ia_nh_proto = proto;
adj->ia_link = link_type;
+ adj->ia_node_index = adj_get_mcast_node(proto);
adj_mcasts[proto][sw_if_index] = adj_get_index(adj);
adj_lock(adj_get_index(adj));
adj_mcasts[proto][sw_if_index] = adj_get_index(adj);
adj_lock(adj_get_index(adj));
- vnet_rewrite_init(vnm, sw_if_index,
- adj
_get_mcast_node(proto)
,
+ vnet_rewrite_init(vnm, sw_if_index,
link_type,
+ adj
->ia_node_index
,
vnet_tx_node_index_for_sw_interface(vnm, sw_if_index),
&adj->rewrite_header);
vnet_tx_node_index_for_sw_interface(vnm, sw_if_index),
&adj->rewrite_header);
@@
-88,6
+89,8
@@
adj_mcast_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));
}
@@
-95,14
+98,13
@@
adj_mcast_add_or_lock (fib_protocol_t proto,
* adj_mcast_update_rewrite
*
* Update the adjacency's rewrite string. A NULL string implies the
* adj_mcast_update_rewrite
*
* Update the adjacency's rewrite string. A NULL string implies the
- * rew
irte is reset (i.e. when ARP/ND etn
ry is gone).
+ * rew
rite is reset (i.e. when ARP/ND ent
ry is gone).
* NB: the adj being updated may be handling traffic in the DP.
*/
void
adj_mcast_update_rewrite (adj_index_t adj_index,
u8 *rewrite,
* NB: the adj being updated may be handling traffic in the DP.
*/
void
adj_mcast_update_rewrite (adj_index_t adj_index,
u8 *rewrite,
- u8 offset,
- u32 mask)
+ u8 offset)
{
ip_adjacency_t *adj;
{
ip_adjacency_t *adj;
@@
-121,24
+123,22
@@
adj_mcast_update_rewrite (adj_index_t adj_index,
adj->rewrite_header.sw_if_index),
rewrite);
/*
adj->rewrite_header.sw_if_index),
rewrite);
/*
- * set the fields corresponding to the mcast IP address rewrite
- * The mask must be stored in network byte order, since the packet's
- * IP address will also be in network order.
+ * set the offset corresponding to the mcast IP address rewrite
*/
adj->rewrite_header.dst_mcast_offset = offset;
*/
adj->rewrite_header.dst_mcast_offset = offset;
- adj->rewrite_header.dst_mcast_mask = clib_host_to_net_u32(mask);
}
/**
* adj_mcast_midchain_update_rewrite
*
* Update the adjacency's rewrite string. A NULL string implies the
}
/**
* adj_mcast_midchain_update_rewrite
*
* Update the adjacency's rewrite string. A NULL string implies the
- * rew
irte is reset (i.e. when ARP/ND etn
ry is gone).
+ * rew
rite is reset (i.e. when ARP/ND ent
ry is gone).
* NB: the adj being updated may be handling traffic in the DP.
*/
void
adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
adj_midchain_fixup_t fixup,
* NB: the adj being updated may be handling traffic in the DP.
*/
void
adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
adj_midchain_fixup_t fixup,
+ const void *fixup_data,
adj_flags_t flags,
u8 *rewrite,
u8 offset,
adj_flags_t flags,
u8 *rewrite,
u8 offset,
@@
-151,7
+151,7
@@
adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
adj = adj_get(adj_index);
/*
adj = adj_get(adj_index);
/*
- * one time only update. since we don't support cha
i
nging the tunnel
+ * one time only update. since we don't support changing the tunnel
* src,dst, this is all we need.
*/
ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_MCAST);
* src,dst, this is all we need.
*/
ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_MCAST);
@@
-160,7
+160,7
@@
adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
*/
ASSERT(NULL != rewrite);
*/
ASSERT(NULL != rewrite);
- adj_midchain_setup(adj_index, fixup, flags);
+ adj_midchain_setup(adj_index, fixup, f
ixup_data, f
lags);
/*
* update the adj's rewrite string and build the arc
/*
* update the adj's rewrite string and build the arc
@@
-173,13
+173,7
@@
adj_mcast_midchain_update_rewrite (adj_index_t adj_index,
adj->rewrite_header.sw_if_index),
rewrite);
adj->rewrite_header.sw_if_index),
rewrite);
- /*
- * set the fields corresponding to the mcast IP address rewrite
- * The mask must be stored in network byte order, since the packet's
- * IP address will also be in network order.
- */
adj->rewrite_header.dst_mcast_offset = offset;
adj->rewrite_header.dst_mcast_offset = offset;
- adj->rewrite_header.dst_mcast_mask = clib_host_to_net_u32(mask);
}
void
}
void
@@
-229,12
+223,14
@@
VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(adj_mcast_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
-adj_
nbr
_hw_sw_interface_state_change (vnet_main_t * vnm,
- u32 sw_if_index,
- void *arg)
+static
walk_rc_t
+adj_
mcast
_hw_sw_interface_state_change (vnet_main_t * vnm,
+
u32 sw_if_index,
+
void *arg)
{
adj_mcast_interface_state_change(vnm, sw_if_index, (uword) arg);
{
adj_mcast_interface_state_change(vnm, sw_if_index, (uword) arg);
+
+ return (WALK_CONTINUE);
}
/**
}
/**
@@
-255,7
+251,7
@@
adj_mcast_hw_interface_state_change (vnet_main_t * vnm,
0);
vnet_hw_interface_walk_sw(vnm, hw_if_index,
0);
vnet_hw_interface_walk_sw(vnm, hw_if_index,
- adj_
nbr
_hw_sw_interface_state_change,
+ adj_
mcast
_hw_sw_interface_state_change,
(void*) sw_flags);
return (NULL);
(void*) sw_flags);
return (NULL);
@@
-336,7
+332,12
@@
format_adj_mcast (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);
- ip_adjacency_t * adj = adj_get(index);
+ ip_adjacency_t * adj;
+
+ if (!adj_is_valid(index))
+ return format(s, "<invalid adjacency>");
+
+ adj = adj_get(index);
s = format(s, "%U-mcast: ",
format_fib_protocol, adj->ia_nh_proto);
s = format(s, "%U-mcast: ",
format_fib_protocol, adj->ia_nh_proto);
@@
-354,14
+355,13
@@
format_adj_mcast_midchain (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-mcast-midchain: ",
format_fib_protocol, adj->ia_nh_proto);
s = format (s, "%U",
format_vnet_rewrite,
ip_adjacency_t * adj = adj_get(index);
s = format(s, "%U-mcast-midchain: ",
format_fib_protocol, adj->ia_nh_proto);
s = format (s, "%U",
format_vnet_rewrite,
-
vnm->vlib_main,
&adj->rewrite_header,
+ &adj->rewrite_header,
sizeof (adj->rewrite_data), 0);
s = format (s, "\n%Ustacked-on:\n%U%U",
format_white_space, indent,
sizeof (adj->rewrite_data), 0);
s = format (s, "\n%Ustacked-on:\n%U%U",
format_white_space, indent,
@@
-387,11
+387,13
@@
const static dpo_vft_t adj_mcast_dpo_vft = {
.dv_lock = adj_dpo_lock,
.dv_unlock = adj_dpo_unlock,
.dv_format = format_adj_mcast,
.dv_lock = adj_dpo_lock,
.dv_unlock = adj_dpo_unlock,
.dv_format = format_adj_mcast,
+ .dv_get_urpf = adj_dpo_get_urpf,
};
const static dpo_vft_t adj_mcast_midchain_dpo_vft = {
.dv_lock = adj_dpo_lock,
.dv_unlock = adj_dpo_unlock,
.dv_format = format_adj_mcast_midchain,
};
const static dpo_vft_t adj_mcast_midchain_dpo_vft = {
.dv_lock = adj_dpo_lock,
.dv_unlock = adj_dpo_unlock,
.dv_format = format_adj_mcast_midchain,
+ .dv_get_urpf = adj_dpo_get_urpf,
};
/**
};
/**