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

[SVN commits to the Asterisk project]

Author: mattf
Date: Fri Jul 11 16:39:48 2008
New Revision: 130294

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

........
r130293 | mattf | 2008-07-11 16:36:26 -0500 (Fri, 11 Jul 2008) | 1 line

Support new TRANSPORT definitions in libss7
........

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=130294&r1=130293&r2=130294
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Jul 11 16:39:48 2008
@@ -13057,7 +13057,11 @@
 			return -1;
 		}
 
-		ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDI, link->fds[curfd]);
+		if (p.sigtype == DAHDI_SIG_MTP2)
+			ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDIMTP2, link->fds[curfd]);
+		else
+			ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDIDCHAN, link->fds[curfd]);
+
 		link->numsigchans++;
 
 		memset(&si, 0, sizeof(si));