From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG11466: Fix broken function check_net_internal_exact. Fixes #11466 Date: Wed, 25 Oct 2017 11:42:28 +0200 Message-ID: <1508924548-9876-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3695220641939404792==" List-Id: --===============3695220641939404792== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The check_net_internal_exact function needs subnetmask in cidr notation to wo= rk. Routing.cgi was also updated to use this function. --- config/cfgroot/general-functions.pl | 8 ++++---- html/cgi-bin/routing.cgi | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun= ctions.pl index 0577afe..024285e 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -579,10 +579,10 @@ sub check_net_internal_exact{ $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') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'= GREEN_NETMASK'}", $network)){ $errormessage=3D$Lang::tr{'ccd err green'};retu= rn $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'};r= eturn $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 $er= rormessage;} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0= .0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_N= ETMASK'}", $network)){ $errormessage=3D$Lang::tr{'ccd err red'};return $error= message;} + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne= '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/".&iporsu= btocidr($ownnet{'GREEN_NETMASK'}), $network)){ $errormessage=3D$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'}/".&ipors= ubtocidr($ownnet{'ORANGE_NETMASK'}), $network)){ $errormessage=3D$Lang::tr{'c= cd err orange'};return $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0= .0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/".&iporsubtoc= idr($ownnet{'BLUE_NETMASK'}), $network)){ $errormessage=3D$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'}/".&iporsubtoci= dr($ownnet{'RED_NETMASK'}), $network)){ $errormessage=3D$Lang::tr{'ccd err re= d'};return $errormessage;} } =20 sub validport diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 15989bd..f2014e2 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { last; } #Is the network part of an internal network? - $errormessage .=3D &General::check_net_internal($settings{'IP'}); + $errormessage .=3D &General::check_net_internal_exact($settings{'IP'}); last; } =20 --=20 2.7.4 --===============3695220641939404792==--