From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: location@lists.ipfire.org
Subject: Re: [PATCH] location-importer: Fix parsing LACNIC-flavoured inetnums
Date: Wed, 02 Mar 2022 16:44:54 +0000
Message-ID: <B4AEC572-BE62-4C09-BD62-024224E1F774@ipfire.org>
In-Reply-To: <400a823a-80c6-7d84-3ef8-882444c3d4c6@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3072879799452327071=="
List-Id: <location.lists.ipfire.org>

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

Hello,

> On 2 Mar 2022, at 16:41, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wro=
te:
>=20
> Hello Michael,
>=20
>> Thank you. Does this mean we are getting closer to tagging another release?
>=20
> actually, I was thinking of putting this straight into production without t=
agging another
> release. For the latter, I would like to have some additional bugs resolved.

Do we do this?

> That is, of course, unless the xt_geoip/ipset changes introduced in Core Up=
date 165 / 166
> require an updated libloc and/or we don't want to ship a bunch of patches o=
n top of the current
> one.

Yes, the changes that I committed today and yesterday will bring massive perf=
ormance improvements and so should at least land in 166.

Best,
-Michael

>=20
> Thanks, and best regards,
> Peter M=C3=BCller
>=20
>>=20
>> -Michael
>>=20
>>> On 1 Mar 2022, at 21:52, Peter M=C3=BCller <peter.mueller(a)ipfire.org> w=
rote:
>>>=20
>>> My fault, again. :-/
>>>=20
>>> Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
>>> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
>>> ---
>>> src/python/location-importer.in | 6 +++---
>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>=20
>>> diff --git a/src/python/location-importer.in b/src/python/location-import=
er.in
>>> index 83fb5c7..fe13482 100644
>>> --- a/src/python/location-importer.in
>>> +++ b/src/python/location-importer.in
>>> @@ -3,7 +3,7 @@
>>> #                                                                        =
     #
>>> # libloc - A library to determine the location of someone on the Internet=
     #
>>> #                                                                        =
     #
>>> -# Copyright (C) 2020-2021 IPFire Development Team <info(a)ipfire.org>   =
        #
>>> +# Copyright (C) 2020-2022 IPFire Development Team <info(a)ipfire.org>   =
        #
>>> #                                                                        =
     #
>>> # This library is free software; you can redistribute it and/or          =
     #
>>> # modify it under the terms of the GNU Lesser General Public             =
     #
>>> @@ -691,9 +691,9 @@ class CLI(object):
>>>=20
>>> 						# How many octets do we need to add?
>>> 						# (LACNIC does not seem to have a /8 or greater assigned, so the fo=
llowing should suffice.)
>>> -						if ldigits =3D=3D 2:
>>> +						if ldigits =3D=3D 1:
>>> 							start_address =3D start_address[0] + ".0.0/" + start_address[1]
>>> -						elif ldigits =3D=3D 3:
>>> +						elif ldigits =3D=3D 2:
>>> 							start_address =3D start_address[0] + ".0/" + start_address[1]
>>> 						else:
>>> 							log.warning("Could not recover IPv4 address from line in LACNIC DB=
 format: %s" % line)
>>> --=20
>>> 2.34.1
>>=20


--===============3072879799452327071==--