From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH v2] BUG11278: enable creation from subnets of internal networks Date: Wed, 11 Jan 2017 17:24:09 +0000 Message-ID: <1484155449.3113.2.camel@ipfire.org> In-Reply-To: <1484057638-19086-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5996593875979773880==" List-Id: --===============5996593875979773880== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Third time lucky, eh? On Tue, 2017-01-10 at 15:13 +0100, Alexander Marx wrote: > 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-functions.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=&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($ownnet{'GR > EEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return > $errormessage;} > - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && > $ownnet{'ORANGE_NETADDRESS'}  ne '0.0.0.0') && > &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'O > RANGE_NETMASK'}))){ $errormessage=$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{'BLU > E_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return > $errormessage;} > - if (($ownnet{'RED_NETADDRESS'}  ne '' && > $ownnet{'RED_NETADDRESS'}  ne '0.0.0.0') && > &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_ > NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return > $errormessage;} > + if (($ownnet{'GREEN_NETADDRESS'}   ne '' && > $ownnet{'GREEN_NETADDRESS'}  ne '0.0.0.0') && > &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_N > ETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err green'};return > $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=$Lang::tr{'ccd err > orange'};return $errormessage;} > + if (($ownnet{'BLUE_NETADDRESS'}  ne '' && > $ownnet{'BLUE_NETADDRESS'}  ne '0.0.0.0') && > &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NET > MASK'}",$network)){ $errormessage=$Lang::tr{'ccd err blue'};return > $errormessage;} > + if (($ownnet{'RED_NETADDRESS'}  ne '' && > $ownnet{'RED_NETADDRESS'}  ne '0.0.0.0') && > &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMA > SK'}",$network)){ $errormessage=$Lang::tr{'ccd err red'};return > $errormessage;} >  } >   >  sub validport > diff --git a/config/cfgroot/network-functions.pl > b/config/cfgroot/network-functions.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; >  } >   > +#Takes two network addresses and compares them against each other > +#returns true if equal or false if not > +sub network_equal{ > + my $network1 = shift; > + my $network2 = shift; > + my $bin1 = &network2bin($network1); > + my $bin2 = &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. --===============5996593875979773880== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSllkbW81QUFvSkVJQjU4UDl2a0FrSEhhSVFBSzhnbCtBQ0x3WXRoZ3dnYVNLenA5ZUYK ZlQ4TEhhbFRZaFNJYm51Q3orMkdMaGVBa1QvZHFuWndxZjRPaVdnOU5JeXJRaUZTRjQ2MTBMQjZi eE1FM1R0RgpqbXVVSlFwQmZINzQxWVhxQkRFM0JUaHFnbmlQbm5hYzE2R2dkaDZUc0xkdlE4UEhI N08za1pubHoyZ1EyTmRRCnpQR2pXYVQ2bzU1QTliQWJwSjlNcjMxR3ZOTHVqVjNmYk0yU29xZEd6 R3JCSTdHa29OVFdncFRnRTE1cDBaa0wKZ2NwNkg0c3RXVWk5VkNQR1g1RzQ4NUx4RE1ndDh6L3Bo YUs4V1ErNWVwWElxM252ZWEyNHhueGNGUEk1d0RpNwpockdBUFJyU2RhQkxrb21XNVpqdnJCQkxh aWtQU0ZnK1JucHluanNkOUhnb2hEMGh5YXorakVPbXdJR2VpSk1oCm14REVoSUwxUmIrb3Y3QkJP THpST011V0JhWUYvVkt3a25zb0F3ZmtOWDZ1cDJzL2p4RkxDS1ViOUthVzNhSHkKeWd1elpPRkxW ZTBIaGlhOUpXZ1RFd3ZIa1E5dVA4eUJ1R2NhcXRWdDMrdGZGeXBxNHpVSS8wM0VTeFJhR2o5Zgor czdFd1Y5TnNYazE2VG5NWEJCVVRobHN6Q0Ziek8vLzlCUkZiZDZBWVZ0S3hhU0hhZHV2RW9sQlhC WUtpaWRyCmFBbUVwdjI3ZE5XcXFNSllKSUFQZTlqQ1laajA4TC9DUkFoL3lmd2FTZm1ib2ZIOXJV cWdoTVNDeGNLdmFqbFYKL2l3a1YyR3RwaWwxWFZkOU9TOXpMTDNxMng2cjdadjVRNTdaMGk3b2pS WGdHN0M5ZnlmNjZhMmVKN2JVZWhkbQorWTNtN0hzRkxqN3FBa0ErQzAwcAo9VWtBUQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============5996593875979773880==--