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

Fix some errant device states by making the devicestate API more strict in

Browse Source 
terms of the device argument (only without the unique identifier appended).
(closes issue #12771)
 Reported by: davidw
 Patches: 
       20080717__bug12771.diff.txt uploaded by Corydon76 (license 14)
 Tested by: davidw, jvandal, murf


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@133649 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-25 17:19:39 +00:00
parent 5ae8161b45
commit c5b4e1aec8
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/channel.c
View File

@@ -1201,7 +1201,7 @@ void ast_channel_free(struct ast_channel *chan)
struct ast_frame *f;
struct varshead *headp;
struct ast_datastore *datastore = NULL;
char name[AST_CHANNEL_NAME];
char name[AST_CHANNEL_NAME], *dashptr;
headp=&chan->varshead;
@@ -1234,6 +1234,9 @@ void ast_channel_free(struct ast_channel *chan)
sched_context_destroy(chan->sched);
ast_copy_string(name, chan->name, sizeof(name));
if ((dashptr = strrchr(name, '-'))) {
*dashptr = '\0';
}
/* Stop monitoring */
if (chan->monitor)
@@ -3669,13 +3672,19 @@ void ast_set_callerid(struct ast_channel *chan, const char *callerid, const char
int ast_setstate(struct ast_channel *chan, enum ast_channel_state state)
{
char name[AST_CHANNEL_NAME], *dashptr;
int oldstate = chan->_state;
if (oldstate == state)
return 0;
ast_copy_string(name, chan->name, sizeof(name));
if ((dashptr = strrchr(name, '-'))) {
*dashptr = '\0';
}
chan->_state = state;
ast_device_state_changed_literal(chan->name);
ast_device_state_changed_literal(name);
/* setstate used to conditionally report Newchannel; this is no more */
manager_event(EVENT_FLAG_CALL,
"Newstate",