[asterisk-commits] rmudgett: branch rmudgett/dahdi_facility r220534 - /team/rmudgett/dahdi_facil...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 25 14:04:42 2009
New Revision: 220534

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220534
Log:
Merged change with modifications from -r216221 from:
https://origsvn.digium.com/svn/asterisk/team/mattf/asterisk-trunk-ntptmp

..........
r216221 | mattf | 2009-09-03 17:56:46 -0500 (Thu, 03 Sep 2009) | 1 line

First true NT-PTMP version doing broadcast calling that passes all of my
tests:
1.) Hangup initiated by network before any response received.
2.) Hangup initiated by network or user after response(s) are received but
nobody picks up.
3.) Someone picked up, call is connected, other calls competing are hung
up, and finally, either we or other side initiates clearing at the end of
the call.  This has been tested in true PTMP broadcast mode, with multiple
phones connected to the same NT port, and assigned the same MSN so that
multiple phones are competing for broadcasted call.

Modified:
    team/rmudgett/dahdi_facility/channels/sig_pri.c

Modified: team/rmudgett/dahdi_facility/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/channels/sig_pri.c?view=diff&rev=220534&r1=220533&r2=220534
==============================================================================
--- team/rmudgett/dahdi_facility/channels/sig_pri.c (original)
+++ team/rmudgett/dahdi_facility/channels/sig_pri.c Fri Sep 25 14:04:42 2009
@@ -1815,6 +1815,11 @@
 				pri_find_dchan(pri);
 				if (!pri_is_up(pri)) {
 					pri->resetting = 0;
+					if (pri->sig == SIG_BRI_PTMP) {
+						/* For PTMP connections with non persistent layer 2 we want
+						 * to *not* declare inalarm unless there actually is an alarm */
+						break;
+					}
 					/* Hangup active channels and put them in alarm mode */
 					for (i = 0; i < pri->numchans; i++) {
 						struct sig_pri_chan *p = pri->pvts[i];
@@ -1832,11 +1837,7 @@
 								if (p->owner)
 									ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV);
 							}
-							/* For PTMP connections with non persistent layer 2 we want
-							 * to *not* declare inalarm unless there actually is an alarm */
-							if (p->pri->sig != SIG_BRI_PTMP) {
-								p->inalarm = 1;
-							}
+							p->inalarm = 1;
 						}
 					}
 				}