Merged revisions 128125 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r128125 | mattf | 2008-07-04 22:39:07 -0500 (Fri, 04 Jul 2008) | 1 line

It would help if we actually parsed the ss7_explicitacm option in the config file...
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@128127 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

@@ -14166,6 +14166,17 @@ static int process_dahdi(struct dahdi_chan_conf *confp, struct ast_variable *v,
 				res = linkset_addsigchan(sigchan);
 				if (res < 0)
 					return -1;
+
+			} else if (!strcasecmp(v->name, "ss7_explicitacm")) {
+				struct dahdi_ss7 *link;
+				link = ss7_resolve_linkset(cur_linkset);
+				if (!link) {
+					ast_log(LOG_ERROR, "Invalid linkset number.  Must be between 1 and %d\n", NUM_SPANS + 1);
+					return -1;
+				}
+				if (ast_true(v->value))
+					link->flags |= LINKSET_FLAG_EXPLICITACM;
+
 #endif /* HAVE_SS7 */
 			} else if (!strcasecmp(v->name, "cadence")) {
 				/* setup to scan our argument */