From 7c6d5f255e87f58d55076382f93868ee165e2448 Mon Sep 17 00:00:00 2001
From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Mon, 28 Oct 2019 21:39:18 -0400
Subject: [PATCH] zebra: Put freeing code in nhg_ctx_free()

Put the code to free the data held by a nhg_ctx
in nhg_ctx_free() as well. We do it similiarly for
the dplane_ctx.

Let nhg_ctx_fini() be any other routines that need to
be handled before freeing.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
---
 zebra/zebra_nhg.c | 62 ++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 7fe66ff77f..fbbf76930c 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -552,20 +552,6 @@ zebra_nhg_find_nexthop(uint32_t id, struct nexthop *nh, afi_t afi, int type)
 	return nhe;
 }
 
-static struct nhg_ctx *nhg_ctx_new()
-{
-	struct nhg_ctx *new = NULL;
-
-	new = XCALLOC(MTYPE_NHG_CTX, sizeof(struct nhg_ctx));
-
-	return new;
-}
-
-static void nhg_ctx_free(struct nhg_ctx *ctx)
-{
-	XFREE(MTYPE_NHG_CTX, ctx);
-}
-
 static uint32_t nhg_ctx_get_id(const struct nhg_ctx *ctx)
 {
 	return ctx->id;
@@ -621,6 +607,36 @@ static struct nh_grp *nhg_ctx_get_grp(struct nhg_ctx *ctx)
 	return ctx->u.grp;
 }
 
+static struct nhg_ctx *nhg_ctx_new()
+{
+	struct nhg_ctx *new = NULL;
+
+	new = XCALLOC(MTYPE_NHG_CTX, sizeof(struct nhg_ctx));
+
+	return new;
+}
+
+static void nhg_ctx_free(struct nhg_ctx **ctx)
+{
+	struct nexthop *nh;
+
+	if (ctx == NULL)
+		return;
+
+	assert((*ctx) != NULL);
+
+	if (nhg_ctx_get_count(*ctx))
+		goto done;
+
+	nh = nhg_ctx_get_nh(*ctx);
+
+	nexthop_del_labels(nh);
+
+done:
+	XFREE(MTYPE_NHG_CTX, *ctx);
+	*ctx = NULL;
+}
+
 static struct nhg_ctx *nhg_ctx_init(uint32_t id, struct nexthop *nh,
 				    struct nh_grp *grp, vrf_id_t vrf_id,
 				    afi_t afi, int type, uint8_t count)
@@ -869,23 +885,13 @@ static int nhg_ctx_process_del(struct nhg_ctx *ctx)
 	return 0;
 }
 
-static void nhg_ctx_process_finish(struct nhg_ctx *ctx)
+static void nhg_ctx_fini(struct nhg_ctx **ctx)
 {
-	struct nexthop *nh;
-
 	/*
 	 * Just freeing for now, maybe do something more in the future
 	 * based on flag.
 	 */
 
-	if (nhg_ctx_get_count(ctx))
-		goto done;
-
-	nh = nhg_ctx_get_nh(ctx);
-
-	nexthop_del_labels(nh);
-
-done:
 	nhg_ctx_free(ctx);
 }
 
@@ -941,7 +947,7 @@ int nhg_ctx_process(struct nhg_ctx *ctx)
 
 	nhg_ctx_set_status(ctx, (ret ? NHG_CTX_FAILURE : NHG_CTX_SUCCESS));
 
-	nhg_ctx_process_finish(ctx);
+	nhg_ctx_fini(&ctx);
 
 	return ret;
 }
@@ -970,7 +976,7 @@ int zebra_nhg_kernel_find(uint32_t id, struct nexthop *nh, struct nh_grp *grp,
 		return nhg_ctx_process(ctx);
 
 	if (queue_add(ctx)) {
-		nhg_ctx_process_finish(ctx);
+		nhg_ctx_fini(&ctx);
 		return -1;
 	}
 
@@ -987,7 +993,7 @@ int zebra_nhg_kernel_del(uint32_t id)
 	nhg_ctx_set_op(ctx, NHG_CTX_OP_DEL);
 
 	if (queue_add(ctx)) {
-		nhg_ctx_process_finish(ctx);
+		nhg_ctx_fini(&ctx);
 		return -1;
 	}