From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] header.pl: Remove duplicate "IpInSubnet" function
Date: Wed, 13 Jan 2021 11:14:56 +0000
Message-ID: <3BD4383F-89CA-44BB-9B3B-C84A7AAD7DB3@ipfire.org>
In-Reply-To: <20210112181114.77-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6766398907466013937=="
List-Id: <development.lists.ipfire.org>

--===============6766398907466013937==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello,

Good catch :) I like cleaning up things :)

-Michael

> On 12 Jan 2021, at 18:11, Leo-Andres Hofmann <hofmann(a)leo-andres.de> wrot=
e:
>=20
> This function is deprecated. The commonly used and maintained "IpInSubnet" =
function can be found in general-functions.pl.
>=20
> Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
> ---
> config/cfgroot/header.pl | 22 +++-------------------
> 1 file changed, 3 insertions(+), 19 deletions(-)
>=20
> diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
> index e2e6fd689..5684c01c5 100644
> --- a/config/cfgroot/header.pl
> +++ b/config/cfgroot/header.pl
> @@ -311,22 +311,6 @@ sub getcgihash {
> 	return;
> }
>=20
> -
> -# Test if IP is within a subnet
> -# Call: IpInSubnet (Addr, Subnet, Subnet Mask)
> -#       Subnet can be an IP of the subnet: 10.0.0.0 or 10.0.0.1
> -#       Everything in dottted notation
> -# Return: TRUE/FALSE
> -sub IpInSubnet
> -{
> -    $ip =3D unpack('N', inet_aton(shift));
> -    $start =3D unpack('N', inet_aton(shift));
> -    $mask  =3D unpack('N', inet_aton(shift));
> -    $start &=3D $mask;  # base of subnet...
> -    $end   =3D $start + ~$mask;
> -    return (($ip >=3D $start) && ($ip <=3D $end));
> -}
> -
> sub escape($) {
> 	my $s =3D shift;
> 	return HTML::Entities::encode_entities($s);
> @@ -559,13 +543,13 @@ sub colorize {
> 		return "<font color=3D'".${Header::colourovpn}."'>".$string."</font>";
> 	} elsif ( $string =3D~ "lo" or $string =3D~ "127.0.0.0" ){
> 		return "<font color=3D'".${Header::colourfw}."'>".$string."</font>";
> -	} elsif ( $string =3D~ $ethsettings{'GREEN_DEV'} or &IpInSubnet($string2,=
$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){
> +	} elsif ( $string =3D~ $ethsettings{'GREEN_DEV'} or &General::IpInSubnet(=
$string2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){
> 		return "<font color=3D'".${Header::colourgreen}."'>".$string."</font>";
> 	} elsif (  $string =3D~ "ppp0" or $string =3D~ $ethsettings{'RED_DEV'} or =
$string =3D~ "0.0.0.0" or $string =3D~ $ethsettings{'RED_ADDRESS'} ){
> 		return "<font color=3D'".${Header::colourred}."'>".$string."</font>";
> -	} elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =3D~ $ethsettings{'=
BLUE_DEV'} or &IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$ethsettin=
gs{'BLUE_NETMASK'}) )){
> +	} elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =3D~ $ethsettings{'=
BLUE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$=
ethsettings{'BLUE_NETMASK'}) )){
> 		return "<font color=3D'".${Header::colourblue}."'>".$string."</font>";
> -	} elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =3D~ $ethsettings{'=
ORANGE_DEV'} or &IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'},$ethse=
ttings{'ORANGE_NETMASK'}) )){
> +	} elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =3D~ $ethsettings{'=
ORANGE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS=
'},$ethsettings{'ORANGE_NETMASK'}) )){
> 		return "<font color=3D'".${Header::colourorange}."'>".$string."</font>";
> 	} else {
> 		return $string;
> --=20
> 2.27.0.windows.1
>=20


--===============6766398907466013937==--