aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-05 03:40:10 +0000
committermattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-05 03:40:10 +0000
commitaf8be9ea30ab3debd8684850a794fbee66901784 (patch)
treeed3d4301d9dd7c80234069e170db39e73516fdaa
parentc33d0e51858cc6decc5d15e293f9cf4dda0311cd (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@128127 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_dahdi.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 03a7f89fb..3d1c9c407 100644
--- a/channels/chan_dahdi.c
+++ b/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 */