From ab92dc0c84cc6c11f90e753439567d80bac23e2b Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 8 May 2014 14:08:04 +0200 Subject: [PATCH] General-functions.pl: rewrite IpInSubnet replace inet_ntoa --- config/cfgroot/general-functions.pl | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 271dc41dac..a3f4311000 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -760,12 +760,21 @@ sub validportrange # used to check a port range # Return: TRUE/FALSE sub IpInSubnet { - my $ip = unpack('N', &Socket::inet_aton(shift)); - my $start = unpack('N', &Socket::inet_aton(shift)); - my $mask = unpack('N', &Socket::inet_aton(shift)); - $start &= $mask; # base of subnet... - my $end = $start + ~$mask; - return (($ip >= $start) && ($ip <= $end)); + my $addr = shift; + my $network = shift; + my $netmask = shift; + + my $addr_num = &Socket::inet_pton(AF_INET,$addr); + my $network_num = &Socket::inet_pton(AF_INET,$network); + my $netmask_num = &Socket::inet_pton(AF_INET,$netmask); + + # Find start address + my $network_start = $network_num & $netmask_num; + + # Find end address + my $network_end = $network_start ^ ~$netmask_num; + + return (($addr_num ge $network_start) && ($addr_num le $network_end)); } # -- 2.39.5