From ac9432fdb64cd7fa7d9719760e5f33c93e5a1406 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Tue, 23 Jun 2015 13:21:41 -0300
Subject: [PATCH] app_dial: Hold reference to calling channel formats when
dialing outbound.
Currently when requesting a channel the native formats of the
calling channel are provided to the core for usage when dialing
the outbound channel. This occurs without holding the channel lock
or keeping a reference to the formats. This is problematic as
the channel driver may end up changing the formats during this time.
In the case of chan_sip this happens when an SDP negotiation
completes.
This change makes it so app_dial keeps a reference to the native
formats of the calling channel which guarantees that they will
remain valid for the period of time needed.
ASTERISK-25172 #close
Change-Id: I2f0a67bd0d5d14c3bdbaae552b4b1613a283f0db
(cherry picked from commit 3b2b004d699b8cc7b808f62536bb2bc4db8b4e0e)
---
apps/app_dial.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/apps/app_dial.c b/apps/app_dial.c
index a806d92852..974dd7cd25 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -875,8 +875,17 @@ static void do_forward(struct chanlist *o, struct cause_args *num,
c = o->chan = NULL;
cause = AST_CAUSE_BUSY;
} else {
+ struct ast_format_cap *nativeformats;
+
+ ast_channel_lock(in);
+ nativeformats = ao2_bump(ast_channel_nativeformats(in));
+ ast_channel_unlock(in);
+
/* Setup parameters */
- c = o->chan = ast_request(tech, ast_channel_nativeformats(in), NULL, in, stuff, &cause);
+ c = o->chan = ast_request(tech, nativeformats, NULL, in, stuff, &cause);
+
+ ao2_cleanup(nativeformats);
+
if (c) {
if (single && !caller_entertained) {
ast_channel_make_compatible(in, o->chan);
@@ -2337,6 +2346,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
char *tech = strsep(&number, "/");
size_t tech_len;
size_t number_len;
+ struct ast_format_cap *nativeformats;
num_dialed++;
if (ast_strlen_zero(number)) {
@@ -2387,9 +2397,15 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
* through the CONNECTED_LINE dialplan function.
*/
ast_party_connected_line_copy(&tmp->connected, ast_channel_connected(chan));
+
+ nativeformats = ao2_bump(ast_channel_nativeformats(chan));
+
ast_channel_unlock(chan);
- tc = ast_request(tmp->tech, ast_channel_nativeformats(chan), NULL, chan, tmp->number, &cause);
+ tc = ast_request(tmp->tech, nativeformats, NULL, chan, tmp->number, &cause);
+
+ ao2_cleanup(nativeformats);
+
if (!tc) {
/* If we can't, just go on to the next call */
ast_log(LOG_WARNING, "Unable to create channel of type '%s' (cause %d - %s)\n",
--
GitLab