From mboxrd@z Thu Jan  1 00:00:00 1970
From: ummeegge <ummeegge@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 14:22:20 +0100
Message-ID: <2003D144-9145-471A-9B14-D87A99AFADFA@ipfire.org>
In-Reply-To: <1510665335.4838.416.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4384650375096609611=="
List-Id: <development.lists.ipfire.org>

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

Ah OK,
thanks for clarifying Michael.

Best,

Erik

Am 14.11.2017 um 14:15 schrieb Michael Tremer:

> Hi,
>=20
> this is only a part of the fix. The function itself was broken and you will=
 need
> to apply that patch, too. It is:
>=20
> https://cgit.ipfire.org/ipfire-2.x.git/commit/?h=3Dnext&id=3D1047805dba5649=
94a96da0adbfb6559a8609ec11
>=20
> 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 wh=
ich
>> subnet i do enter. The following line
>>=20
>> $errormessage .=3D &General::check_net_internal_range($settings{'IP'});
>=20
> This function does not do what we actually want here. It gets rid of the er=
ror,
> but does not allow to enter a subnet of any of the BLUE, GREEN or ORANGE
> subnets.
>=20
> Best,
> -Michael
>=20
>>=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


--===============4384650375096609611==--