From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG11278: Cleanup function for network check Date: Tue, 10 Jan 2017 14:12:27 +0100 Message-ID: <1484053947-16959-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5077965629917801884==" List-Id: --===============5077965629917801884== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Deleted some code which is also used in another function Signed-off-by: Alexander Marx --- config/cfgroot/general-functions.pl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun= ctions.pl index 298e68c..188bb7f 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -540,13 +540,9 @@ sub checksubnets return $errormessage; } } - - #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;} +=09 + #call check_net_internal + &General::check_net_internal($ccdnet); } =20 sub check_net_internal{ --=20 2.7.4 --===============5077965629917801884==--