From e146f13fa0c315c41b8172b5f7bb65dfd612c325 Mon Sep 17 00:00:00 2001 From: shwethab Date: Thu, 9 Mar 2017 16:58:26 +0000 Subject: ioam: ip6 hop by hop ext header and SR header co-existence 1. Fix finding sr extension header 2. Fix for assert checks for space for sr header in packet headroom 3. ioam build warnings 4. Fix for SR header removal in presence of hbh ext header clib_memcpy with overlapping src/dst was failing Change-Id: I8576204eb571d1d4725a4e6976e18fe61cd1cd35 Signed-off-by: shwethab --- src/plugins/ioam/ip6/ioam_cache.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/ioam') diff --git a/src/plugins/ioam/ip6/ioam_cache.h b/src/plugins/ioam/ip6/ioam_cache.h index 75ec784bf52..3f69fa7255d 100644 --- a/src/plugins/ioam/ip6/ioam_cache.h +++ b/src/plugins/ioam/ip6/ioam_cache.h @@ -436,9 +436,9 @@ ioam_cache_sr_rewrite_template_create (void) /* This nodes address and the original dest will be * filled when the packet is processed */ - vec_add2 (segments, this_seg, 2); - memset (this_seg, 0xfe, 2 * sizeof (ip6_address_t)); - cm->sr_rewrite_template = ip6_compute_rewrite_string_insert (segments); + vec_add2 (segments, this_seg, 1); + memset (this_seg, 0xfe, sizeof (ip6_address_t)); + cm->sr_rewrite_template = ip6_sr_compute_rewrite_string_insert (segments); vec_free (segments); } -- cgit 1.2.3-korg