aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_dahdi.c
diff options
context:
space:
mode:
authordbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 16:35:53 +0000
committerdbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 16:35:53 +0000
commit8cf5eb1f9fdf1802eec8aa7ce1ed8f9fb6027b92 (patch)
tree8b0b314c338af6ccd9695a2bae65db9c6b8fd10b /channels/chan_dahdi.c
parentecd581b5743abb33543ce89a6d2e5ea78181ff3a (diff)
MWI messages included in CID spill was not being properly handled and prevented the call from being processed
(issue #14313) Reported by: seandarcy Tested by: dbailey git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170458 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
-rw-r--r--channels/chan_dahdi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 20b9ef398..30437bebc 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7310,16 +7310,16 @@ static void *ss_thread(void *data)
/* If generated using Ring Pulse Alert, then ring has been answered as a call and needs to be hungup */
if (p->mwimonitor_rpas) {
ast_hangup(chan);
+ return NULL;
}
- return NULL;
} else if (flags & CID_NOMSGWAITING) {
ast_log(LOG_NOTICE, "MWI: Channel %d no message waiting!\n", p->channel);
notify_message(p->mailbox, 0);
/* If generated using Ring Pulse Alert, then ring has been answered as a call and needs to be hungup */
if (p->mwimonitor_rpas) {
ast_hangup(chan);
+ return NULL;
}
- return NULL;
}
ast_setstate(chan, AST_STATE_RING);