[Pkg-voip-commits] r5783 - /asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun May 25 18:23:58 2008
New Revision: 5783

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5783
Log:
zapata merge of 0.4.0-RC1, part 2

Modified:
    asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn

Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5783&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Sun May 25 18:23:58 2008
@@ -501,21 +501,28 @@
  			if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num))
  				timeout = matchdigittimeout;
  			else
-@@ -6697,6 +6811,13 @@ static int handle_init_event(struct zt_p
- 		break;
+@@ -6698,9 +6812,20 @@ static int handle_init_event(struct zt_p
  	case ZT_EVENT_NOALARM:
  		i->inalarm = 0;
+ 		if (!i->unknown_alarm) {
 +#ifdef HAVE_PRI
-+		if (i->pri &&
-+		    (i->pri->nodetype == BRI_CPE_PTMP || i->pri->nodetype == BRI_CPE)) {
++		    if (i->pri) {
++			if ((i->pri->nodetype == BRI_CPE_PTMP) || (i->pri->nodetype == BRI_CPE)) {
 +			/* dont annoy BRI TE mode users with layer2layer alarms */
-+			break;
-+		}
++			} else {
 +#endif
- 		if (!i->unknown_alarm) {
  			ast_log(LOG_NOTICE, "Alarm cleared on channel %d\n", i->channel);
  			manager_event(EVENT_FLAG_SYSTEM, "AlarmClear",
-@@ -6711,6 +6832,14 @@ static int handle_init_event(struct zt_p
+ 				"Channel: %d\r\n", i->channel);
++#ifdef HAVE_PRI
++			}
++		    }
++#endif
++
+ 		} else {
+ 			i->unknown_alarm = 0;
+ 		}
+@@ -6711,6 +6836,14 @@ static int handle_init_event(struct zt_p
  		do {
  			const char *alarm_str = alarm2str(res);