From f502d7af0f1d57d855cc67b3bb349226151c4b97 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Mon, 7 Jun 2021 14:26:25 -0400 Subject: [PATCH] zebra: srv6 cleanup Use NO_PROTO consistently in tests; make sure zapi client instance and session are used for srv6 'chunks'. Signed-off-by: Mark Stapp --- zebra/zebra_srv6.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c index 5664a29682..b11331a180 100644 --- a/zebra/zebra_srv6.c +++ b/zebra/zebra_srv6.c @@ -181,13 +181,13 @@ assign_srv6_locator_chunk(uint8_t proto, loc->status_up = false; chunk = srv6_locator_chunk_alloc(); - chunk->proto = 0; + chunk->proto = NO_PROTO; listnode_add(loc->chunks, chunk); zebra_srv6_locator_add(loc); } for (ALL_LIST_ELEMENTS_RO((struct list *)loc->chunks, node, chunk)) { - if (chunk->proto != 0 && chunk->proto != proto) + if (chunk->proto != NO_PROTO && chunk->proto != proto) continue; chunk_found = true; break; @@ -199,6 +199,8 @@ assign_srv6_locator_chunk(uint8_t proto, } chunk->proto = proto; + chunk->instance = instance; + chunk->session_id = session_id; return loc; } -- 2.39.5