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:37:38 +0000
Message-ID: <3740D80F-2CB1-422B-B507-B1D47386E0FC@ipfire.org>
In-Reply-To: <5e2c3c46-f8e5-8b2a-45bf-04c925f65f73@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2024207555537274970=="
List-Id: <location.lists.ipfire.org>

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

Thank you. Does this mean we are getting closer to tagging another release?

-Michael

> On 1 Mar 2022, at 21:52, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wro=
te:
>=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-importer=
.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 foll=
owing 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 f=
ormat: %s" % line)
> --=20
> 2.34.1


--===============2024207555537274970==--