[svn-commits] irroot: branch irroot/distrotech-customers-trunk r333942 - in /team/irroot/di...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Aug 30 10:55:06 CDT 2011
Author: irroot
Date: Tue Aug 30 10:55:02 2011
New Revision: 333942
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333942
Log:
Revert RB1397 replace with RB1400 Call pickup race leaves orphaned channels or crashes.
Modified:
team/irroot/distrotech-customers-trunk/channels/chan_sip.c
team/irroot/distrotech-customers-trunk/main/channel.c
team/irroot/distrotech-customers-trunk/main/features.c
Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=333942&r1=333941&r2=333942
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Tue Aug 30 10:55:02 2011
@@ -6135,7 +6135,7 @@
if (!p) {
ast_debug(1, "Asked to hangup channel that was not connected\n");
- return -1;
+ return 0;
}
if (ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE) || ast->hangupcause == AST_CAUSE_ANSWERED_ELSEWHERE) {
ast_debug(1, "This call was answered elsewhere");
Modified: team/irroot/distrotech-customers-trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/channel.c?view=diff&rev=333942&r1=333941&r2=333942
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/channel.c (original)
+++ team/irroot/distrotech-customers-trunk/main/channel.c Tue Aug 30 10:55:02 2011
@@ -2773,47 +2773,57 @@
/*! \brief Hangup a channel */
int ast_hangup(struct ast_channel *chan)
{
- int res = 0;
char extra_str[64]; /* used for cel logging below */
- /* Don't actually hang up a channel that will masquerade as someone else, or
- if someone is going to masquerade as us */
+ ast_autoservice_stop(chan);
+
+ ao2_lock(channels);
ast_channel_lock(chan);
if (chan->audiohooks) {
ast_audiohook_detach_list(chan->audiohooks);
chan->audiohooks = NULL;
}
-
ast_framehook_list_destroy(chan);
- ast_autoservice_stop(chan);
-
- if (chan->masq) {
+ /*
+ * Do the masquerade if someone is setup to masquerade into us.
+ *
+ * NOTE: We must hold the channel lock after testing for a
+ * pending masquerade and setting the channel as a zombie to
+ * prevent __ast_channel_masquerade() from setting up a
+ * masquerade with a dead channel.
+ */
+ while (chan->masq) {
ast_channel_unlock(chan);
+ ao2_unlock(channels);
if (ast_do_masquerade(chan)) {
ast_log(LOG_WARNING, "Failed to perform masquerade\n");
- }
+
+ /* Abort the loop or we might never leave. */
+ ao2_lock(channels);
+ ast_channel_lock(chan);
+ break;
+ }
+ ao2_lock(channels);
ast_channel_lock(chan);
}
- if (chan->masq) {
- ast_log(LOG_WARNING, "%s getting hung up, but someone is trying to masq into us?!?\n", chan->name);
- ast_channel_unlock(chan);
- return 0;
- }
- /* If this channel is one which will be masqueraded into something,
- mark it as a zombie already, so we know to free it later */
if (chan->masqr) {
+ /*
+ * This channel is one which will be masqueraded into something.
+ * Mark it as a zombie already so ast_do_masquerade() will know
+ * to free it later.
+ */
ast_set_flag(chan, AST_FLAG_ZOMBIE);
ast_channel_unlock(chan);
+ ao2_unlock(channels);
return 0;
}
- ast_channel_unlock(chan);
ao2_unlink(channels, chan);
-
- ast_channel_lock(chan);
+ ao2_unlock(channels);
+
free_translation(chan);
/* Close audio stream */
if (chan->stream) {
@@ -2830,9 +2840,11 @@
chan->sched = NULL;
}
- if (chan->generatordata) /* Clear any tone stuff remaining */
- if (chan->generator && chan->generator->release)
+ if (chan->generatordata) { /* Clear any tone stuff remaining */
+ if (chan->generator && chan->generator->release) {
chan->generator->release(chan, chan->generatordata);
+ }
+ }
chan->generatordata = NULL;
chan->generator = NULL;
@@ -2874,20 +2886,19 @@
ast_cause2str(chan->hangupcause)
);
- if (chan->cdr && !ast_test_flag(chan->cdr, AST_CDR_FLAG_BRIDGED) &&
- !ast_test_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED) &&
- (chan->cdr->disposition != AST_CDR_NULL || ast_test_flag(chan->cdr, AST_CDR_FLAG_DIALED))) {
+ if (chan->cdr && !ast_test_flag(chan->cdr, AST_CDR_FLAG_BRIDGED) &&
+ !ast_test_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED) &&
+ (chan->cdr->disposition != AST_CDR_NULL || ast_test_flag(chan->cdr, AST_CDR_FLAG_DIALED))) {
ast_channel_lock(chan);
-
ast_cdr_end(chan->cdr);
ast_cdr_detach(chan->cdr);
chan->cdr = NULL;
ast_channel_unlock(chan);
}
- chan = ast_channel_release(chan);
-
- return res;
+ ast_channel_unref(chan);
+
+ return 0;
}
int ast_raw_answer(struct ast_channel *chan, int cdr_answer)
@@ -5958,48 +5969,81 @@
int res = -1;
struct ast_channel *final_orig, *final_clone, *base;
-retrymasq:
- final_orig = original;
- final_clone = clonechan;
-
- ast_channel_lock(original);
- while (ast_channel_trylock(clonechan)) {
- ast_channel_unlock(original);
- usleep(1);
- ast_channel_lock(original);
- }
-
- /* each of these channels may be sitting behind a channel proxy (i.e. chan_agent)
- and if so, we don't really want to masquerade it, but its proxy */
- if (original->_bridge && (original->_bridge != ast_bridged_channel(original)) && (original->_bridge->_bridge != original))
- final_orig = original->_bridge;
-
- if (clonechan->_bridge && (clonechan->_bridge != ast_bridged_channel(clonechan)) && (clonechan->_bridge->_bridge != clonechan))
- final_clone = clonechan->_bridge;
-
- if (final_clone->tech->get_base_channel && (base = final_clone->tech->get_base_channel(final_clone))) {
- final_clone = base;
- }
-
- if ((final_orig != original) || (final_clone != clonechan)) {
- /* Lots and lots of deadlock avoidance. The main one we're competing with
- * is ast_write(), which locks channels recursively, when working with a
- * proxy channel. */
- if (ast_channel_trylock(final_orig)) {
+ for (;;) {
+ final_orig = original;
+ final_clone = clonechan;
+
+ ast_channel_lock_both(original, clonechan);
+
+ if (ast_test_flag(original, AST_FLAG_ZOMBIE)
+ || ast_test_flag(clonechan, AST_FLAG_ZOMBIE)) {
+ /* Zombies! Run! */
+ ast_log(LOG_WARNING,
+ "Can't setup masquerade. One or both channels is dead. (%s <-- %s)\n",
+ original->name, clonechan->name);
ast_channel_unlock(clonechan);
ast_channel_unlock(original);
- goto retrymasq;
- }
- if (ast_channel_trylock(final_clone)) {
- ast_channel_unlock(final_orig);
+ return -1;
+ }
+
+ /*
+ * Each of these channels may be sitting behind a channel proxy
+ * (i.e. chan_agent) and if so, we don't really want to
+ * masquerade it, but its proxy
+ */
+ if (original->_bridge
+ && (original->_bridge != ast_bridged_channel(original))
+ && (original->_bridge->_bridge != original)) {
+ final_orig = original->_bridge;
+ }
+ if (clonechan->_bridge
+ && (clonechan->_bridge != ast_bridged_channel(clonechan))
+ && (clonechan->_bridge->_bridge != clonechan)) {
+ final_clone = clonechan->_bridge;
+ }
+ if (final_clone->tech->get_base_channel
+ && (base = final_clone->tech->get_base_channel(final_clone))) {
+ final_clone = base;
+ }
+
+ if ((final_orig != original) || (final_clone != clonechan)) {
+ /*
+ * Lots and lots of deadlock avoidance. The main one we're
+ * competing with is ast_write(), which locks channels
+ * recursively, when working with a proxy channel.
+ */
+ if (ast_channel_trylock(final_orig)) {
+ ast_channel_unlock(clonechan);
+ ast_channel_unlock(original);
+
+ /* Try again */
+ continue;
+ }
+ if (ast_channel_trylock(final_clone)) {
+ ast_channel_unlock(final_orig);
+ ast_channel_unlock(clonechan);
+ ast_channel_unlock(original);
+
+ /* Try again */
+ continue;
+ }
ast_channel_unlock(clonechan);
ast_channel_unlock(original);
- goto retrymasq;
- }
- ast_channel_unlock(clonechan);
- ast_channel_unlock(original);
- original = final_orig;
- clonechan = final_clone;
+ original = final_orig;
+ clonechan = final_clone;
+
+ if (ast_test_flag(original, AST_FLAG_ZOMBIE)
+ || ast_test_flag(clonechan, AST_FLAG_ZOMBIE)) {
+ /* Zombies! Run! */
+ ast_log(LOG_WARNING,
+ "Can't setup masquerade. One or both channels is dead. (%s <-- %s)\n",
+ original->name, clonechan->name);
+ ast_channel_unlock(clonechan);
+ ast_channel_unlock(original);
+ return -1;
+ }
+ }
+ break;
}
if (original == clonechan) {
@@ -6700,9 +6744,6 @@
/* Start by disconnecting the original's physical side */
if (clonechan->tech->hangup && clonechan->tech->hangup(clonechan)) {
ast_log(LOG_WARNING, "Hangup failed! Strange things may happen!\n");
- ast_channel_unlock(clonechan);
- ast_hangup(clonechan);
- clonechan = NULL;
res = -1;
goto done;
}
Modified: team/irroot/distrotech-customers-trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/features.c?view=diff&rev=333942&r1=333941&r2=333942
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/features.c (original)
+++ team/irroot/distrotech-customers-trunk/main/features.c Tue Aug 30 10:55:02 2011
@@ -6940,7 +6940,7 @@
int ast_can_pickup(struct ast_channel *chan)
{
- if (chan->tech_pvt && !chan->pbx && !chan->masq && !ast_test_flag(chan, AST_FLAG_ZOMBIE)
+ if (!chan->pbx && !chan->masq && !ast_test_flag(chan, AST_FLAG_ZOMBIE)
&& (chan->_state == AST_STATE_RINGING
|| chan->_state == AST_STATE_RING
/*
More information about the svn-commits
mailing list