[Asterisk-code-review] res stasis: Plug reference leak on stolen channels (asterisk[14])

[George Joseph]

George Joseph has uploaded this change for review. ( https://gerrit.asterisk.org/5861


Change subject: res_stasis:  Plug reference leak on stolen channels
......................................................................

res_stasis:  Plug reference leak on stolen channels

When a stasis channel is stolen by another app, the control
structure is unreffed but never unlinked from the app_controls
container.  This causes the channel reference to leak.

Added OBJ_UNLINK to the callback in channel_stolen_cb.

Also added some additional channel lifecycle debug messages to
channel.c.

ASTERISK-27059 #close
Repoorted-by: George Joseph

Change-Id: Ib820936cd49453f20156971785e7f4f182c56e14
---
M main/channel.c
M res/res_stasis.c
2 files changed, 10 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/61/5861/1

diff --git a/main/channel.c b/main/channel.c
index 371a89f..c23f77a 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1006,6 +1006,9 @@
 	 * the world know of its existance
 	 */
 	ast_channel_stage_snapshot_done(tmp);
+
+	ast_debug(1, "Channel %p '%s' allocated\n", tmp, ast_channel_name(tmp));
+
 	return tmp;
 }
 
@@ -2230,6 +2233,8 @@
 	char device_name[AST_CHANNEL_NAME];
 	ast_callid callid;
 
+	ast_debug(1, "Channel %p '%s' destroying\n", chan, ast_channel_name(chan));
+
 	/* Stop monitoring */
 	if (ast_channel_monitor(chan)) {
 		ast_channel_monitor(chan)->stop(chan, 0);
@@ -2672,6 +2677,9 @@
 		return;
 	}
 
+	ast_debug(1, "Channel %p '%s' hanging up.  Refs: %d\n", chan, ast_channel_name(chan),
+		ao2_ref(chan, 0));
+
 	ast_autoservice_stop(chan);
 
 	ast_channel_lock(chan);
@@ -2731,7 +2739,6 @@
 		ast_assert(ast_test_flag(ast_channel_flags(chan), AST_FLAG_BLOCKING) == 0);
 	}
 
-	ast_debug(1, "Hanging up channel '%s'\n", ast_channel_name(chan));
 	if (ast_channel_tech(chan)->hangup) {
 		ast_channel_tech(chan)->hangup(chan);
 	}
@@ -10785,7 +10792,6 @@
 
 	ast_channel_unlock(dest);
 	ast_channel_unlock(source);
-
 	channel_do_masquerade(dest, source);
 	return 0;
 }
diff --git a/res/res_stasis.c b/res/res_stasis.c
index c68aa8a..48190a8 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -1072,7 +1072,7 @@
 	struct stasis_app_control *control;
 
 	/* find control */
-	control = ao2_callback(app_controls, 0, masq_match_cb, old_chan);
+	control = ao2_callback(app_controls, OBJ_UNLINK, masq_match_cb, old_chan);
 	if (!control) {
 		ast_log(LOG_ERROR, "Could not find control for masqueraded channel\n");
 		return;
@@ -1086,6 +1086,7 @@
 	remove_masquerade_store(old_chan);
 
 	ao2_cleanup(control);
+
 }
 
 static void channel_replaced_cb(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan)

-- 
To view, visit https://gerrit.asterisk.org/5861
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib820936cd49453f20156971785e7f4f182c56e14
Gerrit-Change-Number: 5861
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20170616/69cd7531/attachment.html>