[svn-commits] jpeeler: branch 1.6.0 r123178 - /branches/1.6.0/channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Jun 16 16:20:08 2008
New Revision: 123178

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123178
Log:
Fix some variables that were forgotten to be renamed, related to 117658. Couldn't merge from trunk since the chan_dahdi transition has not occurred here yet

Modified:
    branches/1.6.0/channels/chan_zap.c

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=123178&r1=123177&r2=123178
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Mon Jun 16 16:20:08 2008
@@ -8143,8 +8143,8 @@
 				}
 				if (conf->is_sig_auto)
 					chan_sig = sigtype_to_signalling(p.sigtype);
-				if (p.sigtype != (conf->chan.sig & 0x3ffff)) {
-					ast_log(LOG_ERROR, "Signalling requested on channel %d is %s but line is in %s signalling\n", channel, sig2str(conf->chan.sig), sig2str(p.sigtype));
+				if (p.sigtype != (chan_sig & 0x3ffff)) {
+					ast_log(LOG_ERROR, "Signalling requested on channel %d is %s but line is in %s signalling\n", channel, sig2str(chan_sig), sig2str(p.sigtype));
 					destroy_zt_pvt(&tmp);
 					return NULL;
 				}