[asterisk-commits] mattf: branch 1.6.0 r125983 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: mattf
Date: Fri Jun 27 14:01:16 2008
New Revision: 125983

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

........
r125982 | mattf | 2008-06-27 14:00:44 -0500 (Fri, 27 Jun 2008) | 1 line

Obviously somebody didn't compile with libss7 support when doing the DAHDI conversion.
........

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=125983&r1=125982&r2=125983
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Jun 27 14:01:16 2008
@@ -9135,7 +9135,7 @@
 	char tmp[256];
 
 	if (ioctl(p->subs[SUB_REAL].zfd, DAHDI_AUDIOMODE, &law) == -1)
-		ast_log(LOG_WARNING, "Unable to set audio mode on channel %d to %d: %s\n", p->channel, law, strrerror(errno));
+		ast_log(LOG_WARNING, "Unable to set audio mode on channel %d to %d: %s\n", p->channel, law, strerror(errno));
 	
 	if (linkset->type == SS7_ITU)
 		law = DAHDI_LAW_ALAW;
@@ -13042,7 +13042,7 @@
 			return -1;
 		}
 
-		ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDI, link->fds[curfd]);
+		ss7_add_link(link->ss7, SS7_TRANSPORT_ZAP, link->fds[curfd]);
 		link->numsigchans++;
 
 		memset(&si, 0, sizeof(si));