diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-08-09 23:17:13 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-08-09 23:17:13 +0000 |
| commit | b99b1116be609fa4a614bf3ab5301fef3d74da0c (patch) | |
| tree | 43e6a5dbb777a4f5bcfc064893a65da9cb161d92 /channels | |
| parent | 1626b29f6faf09b4655c2695a3cf89afc0c72bda (diff) | |
Merged revisions 331265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r331265 | rmudgett | 2011-08-09 18:12:49 -0500 (Tue, 09 Aug 2011) | 22 lines
Merged revisions 331248 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r331248 | rmudgett | 2011-08-09 17:12:59 -0500 (Tue, 09 Aug 2011) | 15 lines
Misc minor items found in code.
* Add some reentrancy protection in pbx.c when creating the contexts_table
hash table.
* Fix inverted test in chan_sip.c conditional code.
* Fix uninitialized variable and use of the wrong variable in chan_iax2.c.
* Fix test of return value in app_parkandannounce.c. Explicitly testing
for -1 is bad if the function does not actually return that value when it
fails.
* Fixup some comments and add some curly braces in features.c.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 5 | ||||
| -rw-r--r-- | channels/chan_sip.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index a5765d015..62efe31b1 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -9349,7 +9349,8 @@ static void *iax_park_thread(void *stuff) struct ast_channel *chan1, *chan2; struct iax_dual *d; struct ast_frame *f; - int ext; + int ext = 0; + d = stuff; chan1 = d->chan1; chan2 = d->chan2; @@ -10794,7 +10795,7 @@ static int socket_process(struct iax2_thread *thread) pbx_builtin_setvar_helper(owner, "BLINDTRANSFER", bridged_chan->name); pbx_builtin_setvar_helper(bridged_chan, "BLINDTRANSFER", owner->name); - if (ast_parking_ext_valid(ies.called_number, c, iaxs[fr->callno]->context)) { + if (ast_parking_ext_valid(ies.called_number, owner, iaxs[fr->callno]->context)) { ast_debug(1, "Parking call '%s'\n", bridged_chan->name); if (iax_park(bridged_chan, owner, ies.called_number)) { ast_log(LOG_WARNING, "Failed to park call '%s'\n", diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2df2713a2..ed0e3bb65 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21319,7 +21319,7 @@ static void *sip_park_thread(void *stuff) res = ast_park_call(transferee, transferer, 0, d->parkexten, &ext); #ifdef WHEN_WE_KNOW_THAT_THE_CLIENT_SUPPORTS_MESSAGE - if (!res) { + if (res) { transmit_message_with_text(transferer->tech_pvt, "Unable to park call.\n", 0, 0); } else { /* Then tell the transferer what happened */ |