diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-20 13:16:06 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-20 13:16:06 +0000 |
| commit | 6d2b0731ea49c44167befa9bfb7569a446af666a (patch) | |
| tree | 36725d4084e93698ebf511e6d9851ef448c68fb6 /channels/misdn_config.c | |
| parent | 90cf6e4287cdbc83661610a063b3bddc77dd70c1 (diff) | |
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/branches/1.4@59064 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn_config.c')
| -rw-r--r-- | channels/misdn_config.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 93455c068..541400b24 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -651,9 +651,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)) @@ -661,12 +664,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(); |