[asterisk-commits] mattf: branch mattf/bug13495 r161535 - /team/mattf/bug13495/channels/

[SVN commits to the Asterisk project]

Author: mattf
Date: Sat Dec  6 12:47:44 2008
New Revision: 161535

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161535
Log:
Update branch to reflect API update of ss7_add_link (new adjpointcode parameter)

Modified:
    team/mattf/bug13495/channels/chan_dahdi.c

Modified: team/mattf/bug13495/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/mattf/bug13495/channels/chan_dahdi.c?view=diff&rev=161535&r1=161534&r2=161535
==============================================================================
--- team/mattf/bug13495/channels/chan_dahdi.c (original)
+++ team/mattf/bug13495/channels/chan_dahdi.c Sat Dec  6 12:47:44 2008
@@ -14137,10 +14137,15 @@
 			return -1;
 		}
 
+		if (cur_adjpointcode < 0) {
+			ast_log(LOG_ERROR, "Unspecified adjpointcode!\n");
+			return -1;
+		}
+
 		if (p.sigtype == DAHDI_SIG_MTP2)
-			ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDIMTP2, link->fds[curfd], cur_slc);
+			ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDIMTP2, link->fds[curfd], cur_slc, cur_adjpointcode);
 		else
-			ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDIDCHAN, link->fds[curfd], cur_slc);
+			ss7_add_link(link->ss7, SS7_TRANSPORT_DAHDIDCHAN, link->fds[curfd], cur_slc, cur_adjpointcode);
 
 		link->numsigchans++;
 
@@ -14158,13 +14163,6 @@
 			link->linkstate[curfd] = LINKSTATE_DOWN | LINKSTATE_INALARM;
 			ss7_link_alarm(link->ss7, link->fds[curfd]);
 		}
-	}
-
-	if (cur_adjpointcode < 0) {
-		ast_log(LOG_ERROR, "Unspecified adjpointcode!\n");
-		return -1;
-	} else {
-		ss7_set_adjpc(link->ss7, link->fds[curfd], cur_adjpointcode);
 	}
 
 	if (cur_defaultdpc < 0) {