From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <Bernhard.Bitsch@gmx.de>
To: development@lists.ipfire.org
Subject: Aw: [PATCH] Fix network-functions net membership check
Date: Mon, 23 Dec 2019 22:27:47 +0100
Message-ID:
 <trinity-6529e88a-5762-441a-81d6-80c9c0af5f99-1577136467495@3c-app-gmx-bs55>
In-Reply-To: <20191223185412.13338-1-ipfr@tfitzgeorge.me.uk>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5723728986973909504=="
List-Id: <development.lists.ipfire.org>

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

Hi,

> Gesendet: Montag, 23. Dezember 2019 um 19:54 Uhr
> Von: "Tim FitzGeorge" <ipfr(a)tfitzgeorge.me.uk>
> An: development(a)lists.ipfire.org
> Betreff: [PATCH] Fix network-functions net membership check
>
> Replace textual comparison of two number with arithmetic in
> ip_address_in_Network().
>
> Fixes: 12263
> Signed-off-by: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk>
> ---
>  config/cfgroot/network-functions.pl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-f=
unctions.pl
> index 8649d0502..589044c2a 100644
> --- a/config/cfgroot/network-functions.pl
> +++ b/config/cfgroot/network-functions.pl
> @@ -295,7 +295,7 @@ sub ip_address_in_network($$) {
>  	# Find end address
>  	my $broadcast_bin =3D $network_bin ^ (~$netmask_bin % 2 ** 32);
>
> -	return (($address_bin ge $network_bin) && ($address_bin le $broadcast_bin=
));
> +	return (($address_bin =3D> $network_bin) && ($address_bin <=3D $broadcast=
_bin));

should work if you change '=3D>' to '>=3D'

>  }
>
>  sub setup_upstream_proxy() {
> --
> 2.16.4
>
>

Bernhard

--===============5723728986973909504==--