From 23a7743c160e21d971d77e244fe29492773cb76d Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Thu, 17 Nov 2022 12:08:56 -0500
Subject: [PATCH] MT#55984 obsolete `branches` hash table

This is not used anywhere.

Change-Id: I0a1e722e5a8e60904182abf2d9c6cae60d4befbd
(cherry picked from commit 8d413f601888bbfbce7d6fd49066e82564b9f9ed)
---
 daemon/call.c  | 13 +------------
 daemon/redis.c | 22 ----------------------
 include/call.h |  1 -
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/daemon/call.c b/daemon/call.c
index 5e0fc934d..0d5e4875d 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -3722,7 +3722,6 @@ static void __call_free(void *p) {
 
 		g_queue_clear(&m->medias);
 		g_hash_table_destroy(m->associated_tags);
-		g_hash_table_destroy(m->branches);
 		g_hash_table_destroy(m->media_ids);
 		free_ssrc_hash(&m->ssrc_hash);
 		if (m->last_out_sdp)
@@ -3909,7 +3908,6 @@ struct call_monologue *__monologue_create(struct call *call) {
 	ret->call = call;
 	ret->created = rtpe_now.tv_sec;
 	ret->associated_tags = g_hash_table_new(g_direct_hash, g_direct_equal);
-	ret->branches = g_hash_table_new(str_hash, str_equal);
 	ret->media_ids = g_hash_table_new(str_hash, str_equal);
 	ret->ssrc_hash = create_ssrc_hash_call();
 	ret->subscribers_ht = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -3938,19 +3936,10 @@ void __monologue_viabranch(struct call_monologue *ml, const str *viabranch) {
 		return;
 
 	__C_DBG("tagging monologue with viabranch '"STR_FORMAT"'", STR_FMT(viabranch));
-	if (ml->viabranch.s) {
+	if (ml->viabranch.s)
 		g_hash_table_remove(call->viabranches, &ml->viabranch);
-		for (GList *sub = ml->subscribers.head; sub; sub = sub->next) {
-			struct call_subscription *cs = sub->data;
-			g_hash_table_remove(cs->monologue->branches, &ml->viabranch);
-		}
-	}
 	call_str_cpy(call, &ml->viabranch, viabranch);
 	g_hash_table_insert(call->viabranches, &ml->viabranch, ml);
-	for (GList *sub = ml->subscribers.head; sub; sub = sub->next) {
-		struct call_subscription *cs = sub->data;
-		g_hash_table_insert(cs->monologue->branches, &ml->viabranch, ml);
-	}
 }
 
 static void __unconfirm_sinks(GQueue *q) {
diff --git a/daemon/redis.c b/daemon/redis.c
index 48cf18736..2eee66c77 100644
--- a/daemon/redis.c
+++ b/daemon/redis.c
@@ -1721,16 +1721,6 @@ static int json_link_tags(struct call *c, struct redis_list *tags, struct redis_
 		}
 		g_queue_clear(&q);
 
-		if (json_build_list(&q, c, "branches", i, tags, root_reader))
-			return -1;
-		for (l = q.head; l; l = l->next) {
-			other_ml = l->data;
-			if (!other_ml)
-			    return -1;
-			g_hash_table_insert(ml->branches, &other_ml->viabranch, other_ml);
-		}
-		g_queue_clear(&q);
-
 		if (json_build_list(&ml->medias, c, "medias", i, medias, root_reader))
 			return -1;
 	}
@@ -2509,18 +2499,6 @@ char* redis_encode_json(struct call *c) {
 
 			g_list_free(k);
 
-			k = g_hash_table_get_values(ml->branches);
-			snprintf(tmp, sizeof(tmp), "branches-%u", ml->unique_id);
-			json_builder_set_member_name(builder, tmp);
-			json_builder_begin_array (builder);
-			for (m = k; m; m = m->next) {
-				ml2 = m->data;
-				JSON_ADD_STRING("%u",ml2->unique_id);
-			}
-			json_builder_end_array (builder);
-
-			g_list_free(k);
-
 			snprintf(tmp, sizeof(tmp), "medias-%u", ml->unique_id);
 			json_builder_set_member_name(builder, tmp);
 			json_builder_begin_array (builder);
diff --git a/include/call.h b/include/call.h
index a65d8e3a5..51febc0ef 100644
--- a/include/call.h
+++ b/include/call.h
@@ -452,7 +452,6 @@ struct call_monologue {
 	enum termination_reason	term_reason;
 	const struct logical_intf *logical_intf;
 	GHashTable 		*associated_tags;
-	GHashTable		*branches;
 	GQueue			subscriptions; // who am I subscribed to (sources)
 	GHashTable		*subscriptions_ht; // for quick lookup
 	GQueue			subscribers; // who is subscribed to me (sinks)