aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-08-12 12:52:54 -0700
committerNeale Ranns <nranns@cisco.com>2017-08-13 09:08:38 +0000
commit0117d24a1f6d018933c8f3e4ecca269f57f431ab (patch)
tree187f234bd4221ec527d0c81906cfb9cb5e642084
parent44fe506ff3b9428180551ccf8eb3a5d3e24e5660 (diff)
default update adjacency function deos not return multicast adjacency
by not returning a multicast adjacency type when requested, but instead returning a nbr type, the mcast adj was never correctly deleted. hence when reused the adjacency object was not realocated from the pool and when it was freed a second time a crash occured. Change-Id: Ia74ae3e889db0dfba8ec3c6a0cccfef215587ff6 Signed-off-by: Neale Ranns <nranns@cisco.com>
-rw-r--r--src/vnet/interface.c46
1 files changed, 40 insertions, 6 deletions
diff --git a/src/vnet/interface.c b/src/vnet/interface.c
index 721259a7d04..159ce8c6494 100644
--- a/src/vnet/interface.c
+++ b/src/vnet/interface.c
@@ -41,6 +41,7 @@
#include <vnet/plugin/plugin.h>
#include <vnet/fib/ip6_fib.h>
#include <vnet/adj/adj.h>
+#include <vnet/adj/adj_mcast.h>
#define VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE (1 << 0)
#define VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE (1 << 1)
@@ -1411,16 +1412,49 @@ default_build_rewrite (vnet_main_t * vnm,
void
default_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
{
- u8 *rewrite;
+ ip_adjacency_t *adj;
- rewrite = vnet_build_rewrite_for_sw_interface (vnm, sw_if_index,
- adj_get_link_type (ai),
- NULL);
+ adj = adj_get (ai);
- adj_nbr_update_rewrite (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE, rewrite);
+ switch (adj->lookup_next_index)
+ {
+ case IP_LOOKUP_NEXT_ARP:
+ case IP_LOOKUP_NEXT_GLEAN:
+ /*
+ * default rewirte in neighbour adj
+ */
+ adj_nbr_update_rewrite
+ (ai,
+ ADJ_NBR_REWRITE_FLAG_COMPLETE,
+ vnet_build_rewrite_for_sw_interface (vnm,
+ sw_if_index,
+ adj_get_link_type (ai), NULL));
+ break;
+ case IP_LOOKUP_NEXT_MCAST:
+ /*
+ * mcast traffic also uses default rewrite string with no mcast
+ * switch time updates.
+ */
+ adj_mcast_update_rewrite
+ (ai,
+ vnet_build_rewrite_for_sw_interface (vnm,
+ sw_if_index,
+ adj_get_link_type (ai),
+ NULL), 0, 0);
+ break;
+ case IP_LOOKUP_NEXT_DROP:
+ case IP_LOOKUP_NEXT_PUNT:
+ case IP_LOOKUP_NEXT_LOCAL:
+ case IP_LOOKUP_NEXT_REWRITE:
+ case IP_LOOKUP_NEXT_MCAST_MIDCHAIN:
+ case IP_LOOKUP_NEXT_MIDCHAIN:
+ case IP_LOOKUP_NEXT_ICMP_ERROR:
+ case IP_LOOKUP_N_NEXT:
+ ASSERT (0);
+ break;
+ }
}
-
/*
* fd.io coding-style-patch-verification: ON
*