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

openvpn ccd: Fix subnet mask validation.

Browse Source
This commit is contained in:
Alexander Marx
2012-11-21 11:49:53 +01:00
committed by Michael Tremer
parent 52d08bcbd2
commit 290007b3b0
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,13 +383,13 @@ sub validipandmask
if ($ccdip=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1>0 && $1<=255 && $2>=0 && $2<=255 && $3>=0 && $3<=255 && $4<=255 ))) {
#Subnet in decimal and valid?
if ($ccdsubnet=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) {
for (my $i=8;$i<=30;$i++){
for (my $i=8;$i<=32;$i++){
if (&General::cidrtosub($i) eq $ccdsubnet){
return 1;
}
}
#Subnet already in binary format?
}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=30 && $1>=8))){
}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
return 1;
}else{
return 0;