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

Revert "General-functions.pl: rewrite getnetworkip without inet_aton"

Browse Source 
This reverts commit 1be398ae38.

Some users reported some issues with the generated firewall ruleset
with the new function:
  http://forum.ipfire.org/index.php?topic=11124.0
This commit is contained in:
Michael Tremer
2014-07-29 12:12:38 +02:00
parent bc70c82737
commit 8df091d968
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,9 +413,9 @@ sub getnetworkip
#Gets: IP, CIDR (10.10.10.0-255, 24)
#Gives: 10.10.10.0
my ($ccdip,$ccdsubnet) = @_;
my $ip_address_binary = &Socket::inet_pton( AF_INET,$ccdip );
my $netmask_binary = &Socket::inet_pton(AF_INET,&iporsubtodec($ccdsubnet));
my $network_address = &Socket::inet_ntop( AF_INET,$ip_address_binary & $netmask_binary );
my $ip_address_binary = inet_aton( $ccdip );
my $netmask_binary = ~pack("N", (2**(32-$ccdsubnet))-1);
my $network_address = inet_ntoa( $ip_address_binary & $netmask_binary );
return $network_address;
}