MODENDP-224

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15760 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_core.c b/src/switch_core.c
index c19273b4eacbee812723ea355c95ed7ff47f0be0..0dee04d28b62395218ffe0277a7f6a70d5f79745 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -867,8 +867,27 @@ SWITCH_DECLARE(switch_bool_t) switch_check_network_list_ip_token(const char *ip_
        if ((list = switch_core_hash_find(IP_LIST.hash, list_name))) {
                ok = switch_network_list_validate_ip_token(list, ip, token);
        } else if (strchr(list_name, '/')) {
-               switch_parse_cidr(list_name, &net, &mask, &bits);
-               ok = switch_test_subnet(ip, net, mask);
+               if (strchr(list_name, ','))  {
+                       char *list_name_dup = strdup(list_name);
+                       char *argv[32];
+                       int argc;
+
+                       switch_assert(list_name_dup);
+
+                       if ((argc = switch_separate_string(list_name_dup, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {
+                               int i;
+                               for (i = 0; i < argc; i++) {
+                                       switch_parse_cidr(argv[i], &net, &mask, &bits);
+                                       if ((ok = switch_test_subnet(ip, net, mask))) {
+                                               break;
+                                       }       
+                               }
+                       }
+                       free(list_name_dup);
+               } else {
+                       switch_parse_cidr(list_name, &net, &mask, &bits);
+                       ok = switch_test_subnet(ip, net, mask);
+               }
        }
        switch_mutex_unlock(runtime.global_mutex);
 
@@ -1014,25 +1033,8 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload)
 
                                                        if (id && user_cidr) {
                                                                char *token = switch_mprintf("%s@%s", id, domain);
-                                                               char *argv[100] = { 0 };
-                                                               char *dup_cidr = strdup(user_cidr);
-                                                               int argc, i = 0;
-                                                               
                                                                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);
+                                                               switch_network_list_add_cidr_token(list, user_cidr, ok, token);
                                                                free(token);
                                                        }
                                                }
@@ -1046,25 +1048,8 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload)
                                                                                
                                                                                if (id && user_cidr) {
                                                                                        char *token = switch_mprintf("%s@%s", id, domain);
-                                                                                       char *argv[100] = { 0 };
-                                                                                       char *dup_cidr = strdup(user_cidr);
-                                                                                       int argc, i = 0;
-                                                                                       
-                                                                                       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);
+                                                                                       switch_assert(token);                                                                                   
+                                                                                       switch_network_list_add_cidr_token(list, user_cidr, ok, token);
                                                                                        free(token);
                                                                                }
                                                                        }

diff --git a/src/switch_utils.c b/src/switch_utils.c
index f4be40350684baf07ab9c8b00a724f064249c512..71fa9eb538be01a4112de3b338b134128cf7609e 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -164,12 +164,14 @@ SWITCH_DECLARE(switch_bool_t) switch_network_list_validate_ip_token(switch_netwo
        return ok;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_network_list_add_cidr_token(switch_network_list_t *list, const char *cidr_str, switch_bool_t ok, const char *token)
+SWITCH_DECLARE(switch_status_t) switch_network_list_perform_add_cidr_token(switch_network_list_t *list, const char *cidr_str, switch_bool_t ok, const char *token)
 {
        uint32_t ip, mask, bits;
        switch_network_node_t *node;
 
        if (switch_parse_cidr(cidr_str, &ip, &mask, &bits)) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding %s (%s) [%s] to list %s\n",
+                       cidr_str, ok ? "allow" : "deny", switch_str_nil(token), list->name);
                return SWITCH_STATUS_GENERR;
        }
 
@@ -188,7 +190,37 @@ SWITCH_DECLARE(switch_status_t) switch_network_list_add_cidr_token(switch_networ
        node->next = list->node_head;
        list->node_head = node;
 
-       return SWITCH_STATUS_SUCCESS;   
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding %s (%s) [%s] to list %s\n", 
+                                         cidr_str, ok ? "allow" : "deny", switch_str_nil(token), list->name);
+
+       return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_network_list_add_cidr_token(switch_network_list_t *list, const char *cidr_str, switch_bool_t ok, const char *token)
+{
+       char *cidr_str_dup = NULL;
+       switch_status_t status = SWITCH_STATUS_SUCCESS;
+       
+       if (strchr(cidr_str, ',')) {
+               cidr_str_dup = strdup(cidr_str);
+               char *argv[32] = { 0 };
+               int i,argc;
+               
+               switch_assert(cidr_str_dup);
+               if ((argc = switch_separate_string(cidr_str_dup, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {               
+                       for (i = 0; i < argc; i++) {
+                               switch_status_t this_status;
+                               if ((this_status = switch_network_list_perform_add_cidr_token(list, argv[i], ok, token)) != SWITCH_STATUS_SUCCESS) {
+                                       status = this_status;
+                               }
+                       }
+               }
+       } else {
+               status = switch_network_list_perform_add_cidr_token(list, cidr_str, ok, token);
+       }
+       
+       switch_safe_free(cidr_str_dup);
+       return status;
 }
 
 SWITCH_DECLARE(switch_status_t) switch_network_list_add_host_mask(switch_network_list_t *list, const char *host, const char *mask_str, switch_bool_t ok)