kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for coma-delimited lists in a user's cidr attribute 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13661 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene 2009-06-06 01:37:26 +00:00
parent 5a437fa315
commit b317e46aae
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/switch_core.c
View File

@ -1000,15 +1000,25 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload)
if (id && user_cidr) {
char *token = switch_mprintf("%s@%s", id, domain);
switch_assert(token);
char *argv[100] = { 0 };
char *dup_cidr = strdup(user_cidr);
int argc, i = 0;
if (switch_network_list_add_cidr_token(list, user_cidr, ok, token) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding %s (%s) [%s] to list %s\n",
user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding %s (%s) [%s] to list %s\n",
user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name);
switch_assert(token);
switch_assert(dup_cidr);
if ((argc = switch_separate_string(dup_cidr, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {
for (i = 0; i < argc; i++) {
if (switch_network_list_add_cidr_token(list, argv[i], ok, token) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding %s (%s) [%s] to list %s\n",
argv[i], ok ? "allow" : "deny", switch_str_nil(token), name);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding %s (%s) [%s] to list %s\n",
argv[i], ok ? "allow" : "deny", switch_str_nil(token), name);
}
}
}
free(dup_cidr);
free(token);
}
}
@ -1022,22 +1032,32 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload)
if (id && user_cidr) {
char *token = switch_mprintf("%s@%s", id, domain);
switch_assert(token);
char *argv[100] = { 0 };
char *dup_cidr = strdup(user_cidr);
int argc, i = 0;
if (switch_network_list_add_cidr_token(list, user_cidr, ok, token) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding %s (%s) [%s] to list %s\n",
user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding %s (%s) [%s] to list %s\n",
user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name);
switch_assert(token);
switch_assert(dup_cidr);
if ((argc = switch_separate_string(dup_cidr, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {
for (i = 0; i < argc; i++) {
if (switch_network_list_add_cidr_token(list, argv[i], ok, token) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding %s (%s) [%s] to list %s\n",
argv[i], ok ? "allow" : "deny", switch_str_nil(token), name);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding %s (%s) [%s] to list %s\n",
argv[i], ok ? "allow" : "deny", switch_str_nil(token), name);
}
}
}
free(dup_cidr);
free(token);
}
}
}
}
}
switch_xml_free(xml_root);
} else if (cidr) {
if (switch_network_list_add_cidr(list, cidr, ok) == SWITCH_STATUS_SUCCESS) {