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 <mjs@voltanet.io>

diff --git a/zebra/zebra_srv6.c b/zebra/zebra_srv6.c
index 5664a29682fd847b798bd5db2230a496eb37bfef..b11331a180a225b88063b728d4f9ccc83739cee0 100644 (file)
--- 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;
 }