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] BUG11466: fix routing.cgi the function call in
 routing.cgi was fixed to call the new "exact" function.
Date: Tue, 14 Nov 2017 13:15:35 +0000
Message-ID: <1510665335.4838.416.camel@ipfire.org>
In-Reply-To: <EEE4E2E6-C6B4-4947-84A1-E4682535361C@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6244960949998330338=="
List-Id: <development.lists.ipfire.org>

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

Hi,

this is only a part of the fix. The function itself was broken and you will n=
eed
to apply that patch, too. It is:

https://cgit.ipfire.org/ipfire-2.x.git/commit/?h=3Dnext&id=3D1047805dba564994=
a96da0adbfb6559a8609ec11

On Tue, 2017-11-14 at 14:11 +0100, ummeegge wrote:
> Hi Alex,
> wanted to give you a fast feedback that this do not work here. I a get an
> error message "This is the GREEN subnet" whereby it makes no difference whi=
ch
> subnet i do enter. The following line
>=20
> $errormessage .=3D &General::check_net_internal_range($settings{'IP'});

This function does not do what we actually want here. It gets rid of the erro=
r,
but does not allow to enter a subnet of any of the BLUE, GREEN or ORANGE
subnets.

Best,
-Michael

>=20
> solves it currently.
>=20
> Greetings,
>=20
> Erik
>=20
> Am 07.11.2017 um 15:10 schrieb Alexander Marx:
>=20
> > ---
> > html/cgi-bin/routing.cgi | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >=20
> > 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
> >=20
>=20
>=20

--===============6244960949998330338==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxvSzdIZ0FDZ2tRZ0hudy8yK1EKQ1FlUkl3Ly9YMkhFRjVBZDUr
TmxpRkViNDVyNVdVYUpDWW8wZVBYeE4xQThOdlc4REZ4cEdOcXgwZzlCVEJ1RQpHT2I3Ym1pUUYx
Sll0akJLL1JoWUVwejFCNjlwcldNc0RwZjZ0bnRwVXpFT3FLdTNnRFU3dVZWZGtValBLUnQ4CnRx
dWpINW40R2xML2JiY0RxdFRJZnR3R3pOTkxEa1R6UmdWQ0M3L0lZalYxeSt1YnppdkpKRmw0YjJQ
ZmtTK3IKaGxya1B2SUZsRFNSUkVFb0Z6Z2hmcENkVUJUdUZjM28vTVVNK1lxZFFySTRQVW0zQ1Fv
bVIvRGQ2aFRMVlpqTwpBcFpnbHV6NCtMLzZHc1JiamRzK3U1OG5ic0hXNUoyNHJSQ3kxS00xbjlT
MXVyakVMeVUvb3Y1bit6TGcxclZmCjNxSjkyNlZzYWpXcWxWRndGUFYxWnBoLzkwQ0lmU3ZoWVVk
SmN1TGgwdUhpd3RxOWVTZE1hTmpHd3pjSFRMQU4KUXIwQXBWelFYaVFnYVA1azR1N2sxMzN3L2pr
TU8zZFZHTkZZUHVZT05aWXVvczNpQkpxNEtYd3VMbmZJSE1kbQpnZFArbWdGUkd0YUY4cXdxV0tm
WG1oWUlzUEpKUWEyU21oeWE1ZnM4dEJ4SWtqK2xreTQ3VklNNVJ4bFI5S0pLCmhyNGtsYlVvOXhN
SndGR084WEh3Q3Rybm9rSk5iZGIvdHNHcjNCTnpaeG9xWUJ0cW0wQVkxNy82bEEwdFYzVjgKNjho
SXZnc1pFRTFWTDAvQnhXNjArK3hBMldnMGF0NVhkWlFWb0Q3cmh2Q3F0NTlLdGFERHMvU2ZKZXlu
MGd0Rwo2a2pjNXc1TWoyN0pHMmFBMmJJL1JTdnhteS90Y3hoUlAwMFozS3RjUVdvMytReWtDVnc9
Cj1QL3pYCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============6244960949998330338==--