diff options
author | Ole Troan <ot@cisco.com> | 2016-06-10 13:22:36 +0200 |
---|---|---|
committer | Dave Barach <openvpp@barachs.net> | 2016-06-14 17:10:53 +0000 |
commit | 964f93e59f72b93191ed938d823af337b7d2c17e (patch) | |
tree | 1e41c9174c4a3d931a92068d1be2b5d7893c1c2c /vnet/vnet/sr | |
parent | 07929f2612585bd28dce8cc56c0297215a20953a (diff) |
Fix node siblings
Siblings did not work at all. Fixed by generating sibling relationships
earlier in vlib_node_main_init(). Also adding a node dynamically before
nodes were initialised failed for sibling nodes.
Change-Id: I2fb73eb33a6f5ee216f566074e18ed495e20634d
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'vnet/vnet/sr')
-rw-r--r-- | vnet/vnet/sr/sr.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/vnet/vnet/sr/sr.c b/vnet/vnet/sr/sr.c index e7992ad92ae..845bf95c423 100644 --- a/vnet/vnet/sr/sr.c +++ b/vnet/vnet/sr/sr.c @@ -1953,8 +1953,6 @@ static clib_error_t * sr_init (vlib_main_t * vm) ip6_sr_main_t * sm = &sr_main; clib_error_t * error = 0; vlib_node_t * ip6_lookup_node, * ip6_rewrite_node; - vlib_node_t * ip6_rewrite_local_node; - u32 verify_next_index; if ((error = vlib_call_init_function (vm, ip_main_init))) return error; @@ -1989,10 +1987,6 @@ static clib_error_t * sr_init (vlib_main_t * vm) ip6_rewrite_node = vlib_get_node_by_name (vm, (u8 *)"ip6-rewrite"); ASSERT(ip6_rewrite_node); - - ip6_rewrite_local_node = vlib_get_node_by_name (vm, - (u8 *)"ip6-rewrite-local"); - ASSERT(ip6_rewrite_local_node); /* Add a disposition to ip6_lookup for the sr rewrite node */ sm->ip6_lookup_sr_next_index = @@ -2008,15 +2002,6 @@ static clib_error_t * sr_init (vlib_main_t * vm) sm->ip6_rewrite_sr_next_index = vlib_node_add_next (vm, ip6_rewrite_node->index, sr_fix_dst_addr_node.index); - /* - * Fix ip6-rewrite-local, sibling of the above. The sibling bitmap - * isn't set up at this point, so we have to do it manually - */ - verify_next_index = vlib_node_add_next - (vm, ip6_rewrite_local_node->index, - sr_fix_dst_addr_node.index); - - ASSERT(sm->ip6_rewrite_sr_next_index == verify_next_index); OpenSSL_add_all_digests(); |