[asterisk-commits] dbailey: branch 1.6.1 r170458 - /branches/1.6.1/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: dbailey
Date: Fri Jan 23 10:35:53 2009
New Revision: 170458

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=170458
Log:
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


Modified:
    branches/1.6.1/channels/chan_dahdi.c

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=170458&r1=170457&r2=170458
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Jan 23 10:35:53 2009
@@ -7310,16 +7310,16 @@
 			/* 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);