diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2021-06-09 09:07:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 09:07:53 -0400 |
| commit | 6dbaa012be0455d8f9fd10e843ca034bd79bb264 (patch) | |
| tree | 4bc5178b7963d2f76c1c35d01da07530c106b6ee /lib/srv6.c | |
| parent | 41b5e3d88f2335663b9907bf6a297de654ff50e1 (diff) | |
| parent | f502d7af0f1d57d855cc67b3bb349226151c4b97 (diff) | |
Merge pull request #8807 from mjstapp/fix_srv6_delete
lib,zebra: srv6 cleanup
Diffstat (limited to 'lib/srv6.c')
| -rw-r--r-- | lib/srv6.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/srv6.c b/lib/srv6.c index ceb769ef76..ccb94b2f76 100644 --- a/lib/srv6.c +++ b/lib/srv6.c @@ -129,6 +129,8 @@ struct srv6_locator *srv6_locator_alloc(const char *name) locator = XCALLOC(MTYPE_SRV6_LOCATOR, sizeof(struct srv6_locator)); strlcpy(locator->name, name, sizeof(locator->name)); locator->chunks = list_new(); + locator->chunks->del = (void (*)(void *))srv6_locator_chunk_free; + QOBJ_REG(locator, srv6_locator); return locator; } @@ -144,7 +146,12 @@ struct srv6_locator_chunk *srv6_locator_chunk_alloc(void) void srv6_locator_free(struct srv6_locator *locator) { - XFREE(MTYPE_SRV6_LOCATOR, locator); + if (locator) { + QOBJ_UNREG(locator); + list_delete(&locator->chunks); + + XFREE(MTYPE_SRV6_LOCATOR, locator); + } } void srv6_locator_chunk_free(struct srv6_locator_chunk *chunk) |