From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: Re: [PATCH 1/4] location-functions.pl: add functions for fetching AS information Date: Wed, 11 Nov 2020 14:53:34 +0100 Message-ID: <019568e7-1247-4e08-9eb7-f49217d6a255@ipfire.org> In-Reply-To: <4FC96A47-6500-45ED-8C73-7DBB3473AC0D@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0749848898014227359==" List-Id: --===============0749848898014227359== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Michael, sorry for replying late on this. > Yes, that is indeed a bit outdated by now. >=20 > Should we not have one big patch fixing that in the whole repository? Yes, that would probably be the better way of doing this. I will take care of= it... > Yes, I think we should keep things under the licenses that they are under. >=20 > Otherwise we might need to collect people=E2=80=99s consent and there might= be other implications too. All right, second version of the patchset is en route... :-) Thanks, and best regards, Peter M=C3=BCller > Hi, >=20 >> On 6 Nov 2020, at 13:57, Peter M=C3=BCller wr= ote: >> >> Hello Michael, >> >>> What is the reason for upgrading the license of this file to GPLv3? >> >> actually, there is none. Whenever I edit a file containing license informa= tion, >> I try to update outdated information ("Michael Tremer & Christian Schmidt"= et al.) >> in order to tidy things up. >=20 > Yes, that is indeed a bit outdated by now. >=20 > Should we not have one big patch fixing that in the whole repository? >=20 >> It completely slipped my mind that we have a mixture of GPLv3 (some LFS fi= les) >> and GPLv2 here... Do you want me to send in an updated patchset? >=20 > Yes, I think we should keep things under the licenses that they are under. >=20 > Otherwise we might need to collect people=E2=80=99s consent and there might= be other implications too. >=20 > Best, > -Michael >=20 >> Thanks, and best regards, >> Peter M=C3=BCller >> >>> Hello, >>> >>>> On 3 Nov 2020, at 14:28, Peter M=C3=BCller = wrote: >>>> >>>> Signed-off-by: Peter M=C3=BCller >>>> --- >>>> config/cfgroot/location-functions.pl | 68 +++++++++++++++++++--------- >>>> 1 file changed, 46 insertions(+), 22 deletions(-) >>>> >>>> diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/locat= ion-functions.pl >>>> index 2cfe7f908..ee03a6611 100644 >>>> --- a/config/cfgroot/location-functions.pl >>>> +++ b/config/cfgroot/location-functions.pl >>>> @@ -1,25 +1,23 @@ >>>> #!/usr/bin/perl -w >>>> -#######################################################################= ##### >>>> -# = # >>>> -# This file is part of the IPFire Firewall. = # >>>> -# = # >>>> -# IPFire is free software; you can redistribute it and/or modify = # >>>> -# it under the terms of the GNU General Public License as published by = # >>>> -# the Free Software Foundation; either version 2 of the License, or = # >>>> -# (at your option) any later version. = # >>>> -# = # >>>> -# IPFire is distributed in the hope that it will be useful, = # >>>> -# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >>>> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >>>> -# GNU General Public License for more details. = # >>>> -# = # >>>> -# You should have received a copy of the GNU General Public License = # >>>> -# along with IPFire; if not, write to the Free Software = # >>>> -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 = USA # >>>> -# = # >>>> -# Copyright (C) 2015 - 2020 IPFire Team . = # >>>> -# = # >>>> -#######################################################################= ##### >>>> +#######################################################################= ######## >>>> +# = # >>>> +# IPFire.org - A linux based firewall = # >>>> +# Copyright (C) 2007-2020 IPFire Team = # >>>> +# = # >>>> +# This program is free software: you can redistribute it and/or modify = # >>>> +# it under the terms of the GNU General Public License as published by = # >>>> +# the Free Software Foundation, either version 3 of the License, or = # >>>> +# (at your option) any later version. = # >>>> +# = # >>>> +# This program is distributed in the hope that it will be useful, = # >>>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >>>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >>>> +# GNU General Public License for more details. = # >>>> +# = # >>>> +# You should have received a copy of the GNU General Public License = # >>>> +# along with this program. If not, see .= # >>>> +# = # >>>> +#######################################################################= ######## >>> >>> What is the reason for upgrading the license of this file to GPLv3? >>> >>>> >>>> package Location::Functions; >>>> >>>> @@ -83,7 +81,7 @@ sub verify ($) { >>>> } >>>> >>>> # >>>> -## Function to the the country code of a given address. >>>> +## Function to get the country code of a given address. >>>> # >>>> sub lookup_country_code($$) { >>>> my ($db_handle, $address) =3D @_; >>>> @@ -221,4 +219,30 @@ sub address_has_flags($) { >>>> return @flags; >>>> } >>>> >>>> +# >>>> +## Function to get the Autonomous System Number of a given address. >>>> +# >>>> +sub lookup_asn($$) { >>>> + my ($db_handle, $address) =3D @_; >>>> + >>>> + # Lookup the given address. >>>> + my $asn =3D &Location::lookup_asn($db_handle, $address); >>>> + >>>> + # Return the number of the Autonomous System >>>> + return $asn; >>>> +} >>>> + >>>> +# >>>> +## Function to get the name of an Autonomous System. >>>> +# >>>> +sub get_as_name($$) { >>>> + my ($db_handle, $asn) =3D @_; >>>> + >>>> + # Fetch the name of this AS... >>>> + my $as_name =3D &Location::get_as_name($db_handle, $asn); >>>> + >>>> + # Return the name of the Autonomous System >>>> + return $as_name; >>>> +} >>>> + >>>> 1; >>>> --=20 >>>> 2.26.2 >>> >=20 --===============0749848898014227359==--