From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG11278: enable creation from subnets of internal networks Date: Tue, 10 Jan 2017 15:10:17 +0100 Message-ID: <1484057417-18971-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2383664557124341205==" List-Id: --===============2383664557124341205== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable In firewallgroups it was not possible to create new networks that are subnets= of IPFire internal networks. Now this is possible for all internal networks. Signed-off-by: Alexander Marx --- config/cfgroot/general-functions.pl | 8 ++++---- config/cfgroot/network-functions.pl | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun= ctions.pl index 188bb7f..081e4e3 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -553,10 +553,10 @@ sub check_net_internal{ $cidr=3D&iporsubtocidr($cidr); #check if we use one of ipfire's networks (green,orange,blue) &readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne= '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($own= net{'GREEN_NETMASK'}))){ $errormessage=3D$Lang::tr{'ccd err green'};return $e= rrormessage;} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne= '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ow= nnet{'ORANGE_NETMASK'}))){ $errormessage=3D$Lang::tr{'ccd err orange'};return= $errormessage;} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0= .0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{= 'BLUE_NETMASK'}))){ $errormessage=3D$Lang::tr{'ccd err blue'};return $errorme= ssage;} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0= .0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'= RED_NETMASK'}))){ $errormessage=3D$Lang::tr{'ccd err red'};return $errormessa= ge;} + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne= '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'= GREEN_NETMASK'}",$network)){ $errormessage=3D$Lang::tr{'ccd err green'};retur= n $errormessage;} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne= '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{= 'ORANGE_NETMASK'}",$network)){ $errormessage=3D$Lang::tr{'ccd err orange'};re= turn $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0= .0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE= _NETMASK'}",$network)){ $errormessage=3D$Lang::tr{'ccd err blue'};return $err= ormessage;} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.= 0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NE= TMASK'}",$network)){ $errormessage=3D$Lang::tr{'ccd err red'};return $errorme= ssage;} } =20 sub validport diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-fun= ctions.pl index 70fa5ed..5559be5 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -102,6 +102,19 @@ sub bin2ip($) { return $address; } =20 +#Takes two network addresses and compares them against each other +#returns true if equal or false if not +sub network_equal{ + my $network1 =3D shift; + my $network2 =3D shift; + my $bin1 =3D &network2bin($network1); + my $bin2 =3D &network2bin($network2); + if ($bin1 eq $bin2){ + return 1; + } + return 0; +} + # Takes a network in either a.b.c.d/a.b.c.d or a.b.c.d/e notation # and will return an 32 bit integer representing the start # address and an other one representing the network mask. --=20 2.7.4 --===============2383664557124341205==--