[svn-commits] kpfleming: branch 1.6.0 r106947 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Sat Mar  8 10:14:57 2008
New Revision: 106947

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106947
Log:
Merged revisions 106946 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r106946 | kpfleming | 2008-03-08 10:03:48 -0600 (Sat, 08 Mar 2008) | 10 lines

Merged revisions 106945 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106945 | kpfleming | 2008-03-08 09:59:42 -0600 (Sat, 08 Mar 2008) | 2 lines

don't generate D-Channel "up" and "down" messages unless the channel state is actually changing; also, generate the "up" message when an implicit "up" occurs due to reception of a normal event when we thought the channel was "down"

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Sat Mar  8 10:14:57 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684,106707,106789,106896
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684,106707,106789,106896,106946

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=106947&r1=106946&r2=106947
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Sat Mar  8 10:14:57 2008
@@ -10299,8 +10299,18 @@
 		if (e) {
 			if (pri->debug)
 				pri_dump_event(pri->dchans[which], e);
-			if (e->e != PRI_EVENT_DCHAN_DOWN)
+
+			if (e->e != PRI_EVENT_DCHAN_DOWN) {
+				if (!(pri->dchanavail[which] & DCHAN_UP)) {
+					ast_verb(2, "%s D-Channel on span %d up\n", pri_order(which), pri->span);
+				}
 				pri->dchanavail[which] |= DCHAN_UP;
+			} else {
+				if (pri->dchanavail[which] & DCHAN_UP) {
+					ast_verb(2, "%s D-Channel on span %d down\n", pri_order(which), pri->span);
+				}
+				pri->dchanavail[which] &= ~DCHAN_UP;
+			}
 
 			if ((e->e != PRI_EVENT_DCHAN_UP) && (e->e != PRI_EVENT_DCHAN_DOWN) && (pri->pri != pri->dchans[which]))
 				/* Must be an NFAS group that has the secondary dchan active */
@@ -10308,8 +10318,6 @@
 
 			switch (e->e) {
 			case PRI_EVENT_DCHAN_UP:
-				ast_verb(2, "%s D-Channel on span %d up\n", pri_order(which), pri->span);
-				pri->dchanavail[which] |= DCHAN_UP;
 				if (!pri->pri) pri_find_dchan(pri);
 
 				/* Note presense of D-channel */
@@ -10328,8 +10336,6 @@
 					}
 				break;
 			case PRI_EVENT_DCHAN_DOWN:
-				ast_verb(2, "%s D-Channel on span %d down\n", pri_order(which), pri->span);
-				pri->dchanavail[which] &= ~DCHAN_UP;
 				pri_find_dchan(pri);
 				if (!pri_is_up(pri)) {
 					pri->resetting = 0;