webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 12:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "General-functions.pl: rewrite IpInSubnet replace inet_ntoa"

Browse Source 
This reverts commit ab92dc0c84.

See comment in last commit
This commit is contained in:
Michael Tremer
2014-07-29 12:14:23 +02:00
parent 8df091d968
commit cea4fc3aaf
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config/cfgroot/general-functions.pl
View File

@@ -773,21 +773,12 @@ sub validportrange # used to check a port range
# Return: TRUE/FALSE
sub IpInSubnet
{
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));
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));
}
#