fix MODAPP-113

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

diff --git a/src/switch_core.c b/src/switch_core.c
index 6d75542a231a1277d483866bb68bd57f86bf22ff..e64fc049f3b3c2298776ce8728da504cebc3968c 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -700,6 +700,8 @@ SWITCH_DECLARE(switch_bool_t) switch_check_network_list_ip(const char *ip_str, c
        switch_mutex_lock(runtime.global_mutex);
        switch_inet_pton(AF_INET, ip_str, &ip);
 
+       ip = htonl(ip);
+
        if ((list = switch_core_hash_find(IP_LIST.hash, list_name))) {
                ok = switch_network_list_validate_ip(list, ip);
        } else if (strchr(list_name, '/')) {

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 346be5ada9adc9657935b62ece502425e74227b7..fb371517ce2a562f2a5e0d6e5b64eec1e60f5066 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -169,7 +169,10 @@ SWITCH_DECLARE(int) switch_parse_cidr(const char *string, uint32_t *ip, uint32_t
 
        bits = atoi(bit_str);
        switch_inet_pton(AF_INET, host, ip);
-       *mask = 0xFFFFFFFF & ~(0xFFFFFFFF << bits);
+       *ip = htonl(*ip);
+
+       *mask = 0xFFFFFFFF & ~(0xFFFFFFFF >> bits);
+
        *bitp = bits;
 
        return 0;