* [PATCH] location-importer: Fix parsing LACNIC-flavoured inetnums @ 2022-03-01 21:52 Peter Müller 2022-03-02 16:37 ` Michael Tremer 0 siblings, 1 reply; 4+ messages in thread From: Peter Müller @ 2022-03-01 21:52 UTC (permalink / raw) To: location [-- Attachment #1: Type: text/plain, Size: 1665 bytes --] My fault, again. :-/ Reported-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- src/python/location-importer.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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): # How many octets do we need to add? # (LACNIC does not seem to have a /8 or greater assigned, so the following should suffice.) - if ldigits == 2: + if ldigits == 1: start_address = start_address[0] + ".0.0/" + start_address[1] - elif ldigits == 3: + elif ldigits == 2: start_address = start_address[0] + ".0/" + start_address[1] else: log.warning("Could not recover IPv4 address from line in LACNIC DB format: %s" % line) -- 2.34.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] location-importer: Fix parsing LACNIC-flavoured inetnums 2022-03-01 21:52 [PATCH] location-importer: Fix parsing LACNIC-flavoured inetnums Peter Müller @ 2022-03-02 16:37 ` Michael Tremer 2022-03-02 16:41 ` Peter Müller 0 siblings, 1 reply; 4+ messages in thread From: Michael Tremer @ 2022-03-02 16:37 UTC (permalink / raw) To: location [-- Attachment #1: Type: text/plain, Size: 1895 bytes --] Thank you. Does this mean we are getting closer to tagging another release? -Michael > On 1 Mar 2022, at 21:52, Peter Müller <peter.mueller(a)ipfire.org> wrote: > > My fault, again. :-/ > > Reported-by: Michael Tremer <michael.tremer(a)ipfire.org> > Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> > --- > src/python/location-importer.in | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > 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): > > # How many octets do we need to add? > # (LACNIC does not seem to have a /8 or greater assigned, so the following should suffice.) > - if ldigits == 2: > + if ldigits == 1: > start_address = start_address[0] + ".0.0/" + start_address[1] > - elif ldigits == 3: > + elif ldigits == 2: > start_address = start_address[0] + ".0/" + start_address[1] > else: > log.warning("Could not recover IPv4 address from line in LACNIC DB format: %s" % line) > -- > 2.34.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] location-importer: Fix parsing LACNIC-flavoured inetnums 2022-03-02 16:37 ` Michael Tremer @ 2022-03-02 16:41 ` Peter Müller 2022-03-02 16:44 ` Michael Tremer 0 siblings, 1 reply; 4+ messages in thread From: Peter Müller @ 2022-03-02 16:41 UTC (permalink / raw) To: location [-- Attachment #1: Type: text/plain, Size: 2369 bytes --] Hello Michael, > Thank you. Does this mean we are getting closer to tagging another release? actually, I was thinking of putting this straight into production without tagging another release. For the latter, I would like to have some additional bugs resolved. That is, of course, unless the xt_geoip/ipset changes introduced in Core Update 165 / 166 require an updated libloc and/or we don't want to ship a bunch of patches on top of the current one. Thanks, and best regards, Peter Müller > > -Michael > >> On 1 Mar 2022, at 21:52, Peter Müller <peter.mueller(a)ipfire.org> wrote: >> >> My fault, again. :-/ >> >> Reported-by: Michael Tremer <michael.tremer(a)ipfire.org> >> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> >> --- >> src/python/location-importer.in | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> 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): >> >> # How many octets do we need to add? >> # (LACNIC does not seem to have a /8 or greater assigned, so the following should suffice.) >> - if ldigits == 2: >> + if ldigits == 1: >> start_address = start_address[0] + ".0.0/" + start_address[1] >> - elif ldigits == 3: >> + elif ldigits == 2: >> start_address = start_address[0] + ".0/" + start_address[1] >> else: >> log.warning("Could not recover IPv4 address from line in LACNIC DB format: %s" % line) >> -- >> 2.34.1 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] location-importer: Fix parsing LACNIC-flavoured inetnums 2022-03-02 16:41 ` Peter Müller @ 2022-03-02 16:44 ` Michael Tremer 0 siblings, 0 replies; 4+ messages in thread From: Michael Tremer @ 2022-03-02 16:44 UTC (permalink / raw) To: location [-- Attachment #1: Type: text/plain, Size: 2709 bytes --] Hello, > On 2 Mar 2022, at 16:41, Peter Müller <peter.mueller(a)ipfire.org> wrote: > > Hello Michael, > >> Thank you. Does this mean we are getting closer to tagging another release? > > actually, I was thinking of putting this straight into production without tagging 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 Update 165 / 166 > require an updated libloc and/or we don't want to ship a bunch of patches on top of the current > one. Yes, the changes that I committed today and yesterday will bring massive performance improvements and so should at least land in 166. Best, -Michael > > Thanks, and best regards, > Peter Müller > >> >> -Michael >> >>> On 1 Mar 2022, at 21:52, Peter Müller <peter.mueller(a)ipfire.org> wrote: >>> >>> My fault, again. :-/ >>> >>> Reported-by: Michael Tremer <michael.tremer(a)ipfire.org> >>> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> >>> --- >>> src/python/location-importer.in | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> 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): >>> >>> # How many octets do we need to add? >>> # (LACNIC does not seem to have a /8 or greater assigned, so the following should suffice.) >>> - if ldigits == 2: >>> + if ldigits == 1: >>> start_address = start_address[0] + ".0.0/" + start_address[1] >>> - elif ldigits == 3: >>> + elif ldigits == 2: >>> start_address = start_address[0] + ".0/" + start_address[1] >>> else: >>> log.warning("Could not recover IPv4 address from line in LACNIC DB format: %s" % line) >>> -- >>> 2.34.1 >> ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-02 16:44 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-03-01 21:52 [PATCH] location-importer: Fix parsing LACNIC-flavoured inetnums Peter Müller 2022-03-02 16:37 ` Michael Tremer 2022-03-02 16:41 ` Peter Müller 2022-03-02 16:44 ` Michael Tremer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox