kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous minor fixes to sig_analog.

Browse Source 
*  Sanity adjustments to __analog_ss_thread for sig_analog environment.
*  Deleted some duplicated code.
*  Fixed analog_ss_thread_start passing the wrong pointer.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@210869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2009-08-06 20:15:11 +00:00
parent d7fa19a999
commit d669ba24d7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
channels/sig_analog.c
View File

@@ -1337,10 +1337,14 @@ static void *__analog_ss_thread(void *data)
ast_log(LOG_DEBUG, "%s %d\n", __FUNCTION__, p->channel); ast_log(LOG_DEBUG, "%s %d\n", __FUNCTION__, p->channel);
if (!chan) {
/* What happened to the channel? */
goto quit;
}
/* in the bizarre case where the channel has become a zombie before we /* in the bizarre case where the channel has become a zombie before we
even get started here, abort safely even get started here, abort safely
*/ */
if (!p) { if (!chan->tech_pvt) {
ast_log(LOG_WARNING, "Channel became a zombie before simple switch could be started (%s)\n", chan->name); ast_log(LOG_WARNING, "Channel became a zombie before simple switch could be started (%s)\n", chan->name);
ast_hangup(chan); ast_hangup(chan);
goto quit; goto quit;
@@ -2098,13 +2102,11 @@ static void *__analog_ss_thread(void *data)
goto quit; goto quit;
default: default:
ast_log(LOG_WARNING, "Don't know how to handle simple switch with signalling %s on channel %d\n", analog_sigtype_to_str(p->sig), p->channel); ast_log(LOG_WARNING, "Don't know how to handle simple switch with signalling %s on channel %d\n", analog_sigtype_to_str(p->sig), p->channel);
res = analog_play_tone(p, index, ANALOG_TONE_CONGESTION); break;
if (res < 0)
ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", p->channel);
} }
res = analog_play_tone(p, index, ANALOG_TONE_CONGESTION); res = analog_play_tone(p, index, ANALOG_TONE_CONGESTION);
if (res < 0) if (res < 0)
ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", p->channel); ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", p->channel);
ast_hangup(chan); ast_hangup(chan);
quit: quit:
analog_decrease_ss_count(p); analog_decrease_ss_count(p);
@@ -2114,7 +2116,8 @@ quit:
int analog_ss_thread_start(struct analog_pvt *p, struct ast_channel *chan) int analog_ss_thread_start(struct analog_pvt *p, struct ast_channel *chan)
{ {
pthread_t threadid; pthread_t threadid;
return ast_pthread_create_detached(&threadid, NULL, __analog_ss_thread, chan);
return ast_pthread_create_detached(&threadid, NULL, __analog_ss_thread, p);
} }
static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_channel *ast) static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_channel *ast)