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>
This commit is contained in:
Mark Stapp 2021-06-07 14:26:25 -04:00
parent 16bd37d687
commit f502d7af0f

View File

@ -181,13 +181,13 @@ assign_srv6_locator_chunk(uint8_t proto,
loc->status_up = false; loc->status_up = false;
chunk = srv6_locator_chunk_alloc(); chunk = srv6_locator_chunk_alloc();
chunk->proto = 0; chunk->proto = NO_PROTO;
listnode_add(loc->chunks, chunk); listnode_add(loc->chunks, chunk);
zebra_srv6_locator_add(loc); zebra_srv6_locator_add(loc);
} }
for (ALL_LIST_ELEMENTS_RO((struct list *)loc->chunks, node, chunk)) { 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; continue;
chunk_found = true; chunk_found = true;
break; break;
@ -199,6 +199,8 @@ assign_srv6_locator_chunk(uint8_t proto,
} }
chunk->proto = proto; chunk->proto = proto;
chunk->instance = instance;
chunk->session_id = session_id;
return loc; return loc;
} }