[svn-commits] jpeeler: branch 1.6.0 r123387 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Jun 17 13:28:56 2008
New Revision: 123387

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

........
r123238 | jpeeler | 2008-06-16 18:05:18 -0500 (Mon, 16 Jun 2008) | 1 line

Fix some (more) variables that were forgotten to be renamed, related to 117658
........

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=123387&r1=123386&r2=123387
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Jun 17 13:28:56 2008
@@ -8273,7 +8273,7 @@
 							return NULL;
 						}
 
-						pris[span].sig = conf->chan.sig;
+						pris[span].sig = chan_sig;
 						pris[span].nodetype = conf->pri.nodetype;
 						pris[span].switchtype = myswitchtype;
 						pris[span].nsf = conf->pri.nsf;
@@ -8392,7 +8392,7 @@
 #endif
 		tmp->immediate = conf->chan.immediate;
 		tmp->transfertobusy = conf->chan.transfertobusy;
-		if (conf->chan.sig & __DAHDI_SIG_FXS) {
+		if (chan_sig & __DAHDI_SIG_FXS) {
 			tmp->mwimonitor_fsk = conf->chan.mwimonitor_fsk;
 			tmp->mwimonitor_neon = conf->chan.mwimonitor_neon;
 		}
@@ -8547,7 +8547,7 @@
 		tmp->sendcalleridafter = conf->chan.sendcalleridafter;
 		if (!here) {
 			tmp->locallyblocked = tmp->remotelyblocked = 0;
-			if ((conf->chan.sig == SIG_PRI) || (conf->chan.sig == SIG_BRI) || (conf->chan.sig == SIG_BRI_PTMP) || (conf->chan.sig == SIG_SS7))
+			if ((chan_sig == SIG_PRI) || (chan_sig == SIG_BRI) || (chan_sig == SIG_BRI_PTMP) || (chan_sig == SIG_SS7))
 				tmp->inservice = 0;
 			else /* We default to in service on protocols that don't have a reset */
 				tmp->inservice = 1;