aboutsummaryrefslogtreecommitdiffstats
path: root/channels/misdn_config.c
diff options
context:
space:
mode:
authorcrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-18 09:36:16 +0000
committercrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-18 09:36:16 +0000
commit8d21cf4fa07f14e7f3a890e057a8d816c3a65c69 (patch)
treed045dea209917142944d8ee85a2d5980fdb51458 /channels/misdn_config.c
parent7188fd81cffe0cd2dcb2ea4f9bc87962d9e0e14b (diff)
Merged revisions 59064 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r59064 | crichter | 2007-03-20 14:16:06 +0100 (Di, 20 Mär 2007) | 21 lines Merged revisions 58849-58850,59062-59063 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r58849 | crichter | 2007-03-13 12:58:16 +0100 (Di, 13 Mär 2007) | 1 line added method standard_dec for dialing out on groups, to avoid conflicts, which caused issues with some ISDN providers ........ r58850 | crichter | 2007-03-13 13:58:32 +0100 (Di, 13 Mär 2007) | 1 line fixed the crypt_keys stuff ........ r59062 | crichter | 2007-03-20 10:18:06 +0100 (Di, 20 Mär 2007) | 1 line avoid sending a disconnect when we already received one. ........ r59063 | crichter | 2007-03-20 10:23:22 +0100 (Di, 20 Mär 2007) | 1 line modified a loglevel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@64952 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn_config.c')
-rw-r--r--channels/misdn_config.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 9f6a3b767..70f1c793c 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -658,9 +658,12 @@ int misdn_cfg_is_port_valid (int port)
int misdn_cfg_is_group_method (char *group, enum misdn_cfg_method meth)
{
int i, re = 0;
- char *method = NULL;
+ char *method ;
misdn_cfg_lock();
+
+ method = port_cfg[0][map[MISDN_CFG_METHOD]].str;
+
for (i = 1; i <= max_ports; i++) {
if (port_cfg[i] && port_cfg[i][map[MISDN_CFG_GROUPNAME]].str) {
if (!strcasecmp(port_cfg[i][map[MISDN_CFG_GROUPNAME]].str, group))
@@ -668,12 +671,15 @@ int misdn_cfg_is_group_method (char *group, enum misdn_cfg_method meth)
port_cfg[i][map[MISDN_CFG_METHOD]].str : port_cfg[0][map[MISDN_CFG_METHOD]].str);
}
}
+
if (method) {
switch (meth) {
case METHOD_STANDARD: re = !strcasecmp(method, "standard");
break;
case METHOD_ROUND_ROBIN: re = !strcasecmp(method, "round_robin");
break;
+ case METHOD_STANDARD_DEC: re = !strcasecmp(method, "standard_dec");
+ break;
}
}
misdn_cfg_unlock();