webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-10 17:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1

Browse Source
This commit is contained in:
Alexander Marx
2014-09-26 12:53:05 +02:00
parent 59c2888bae 7a35d102cb
commit 0d0ee70f3b
45 changed files with 1197 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,7 @@ sub validip
sub validmask {
my $mask = shift;
return &Network::check_netmask($mask) or &Network::check_prefix($mask);
return &Network::check_netmask($mask) || &Network::check_prefix($mask);
}
sub validipormask
@@ -388,7 +388,9 @@ sub iporsubtocidr
}
sub getnetworkip {
return &Network::get_netaddress(shift);
my $arg = join("/", @_);
return &Network::get_netaddress($arg);
}
sub getccdbc