From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/5] location-functions.pl: Use a single script-wide db_handle. Date: Sat, 07 Nov 2020 19:47:20 +0100 Message-ID: <20201107184724.3590-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2442886050643517336==" List-Id: --===============2442886050643517336== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Create and use a single script-wide database handle for libloc to prevent from creating multiple ones. This helps saving memory, especially on small systems. Reference #12515. Signed-off-by: Stefan Schantl --- config/cfgroot/location-functions.pl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/location-f= unctions.pl index 2cfe7f908..9b1d0bfb5 100644 --- a/config/cfgroot/location-functions.pl +++ b/config/cfgroot/location-functions.pl @@ -55,6 +55,9 @@ our $keyfile =3D "$location_dir/signing-key.pem"; # Directory which contains the exported databases. our $xt_geoip_db_directory =3D "/usr/share/xt_geoip/"; =20 +# Create libloc database handle. +my $db_handle =3D &init(); + # ## Tiny function to init the location database. # @@ -86,7 +89,7 @@ sub verify ($) { ## Function to the the country code of a given address. # sub lookup_country_code($$) { - my ($db_handle, $address) =3D @_; + my ($address) =3D @_; =20 # Lookup the given address. my $country_code =3D &Location::lookup_country_code($db_handle, $address); @@ -174,9 +177,6 @@ sub get_full_country_name($) { =20 # Function to get all available locations. sub get_locations() { - # Create libloc database handle. - my $db_handle =3D &init(); - # Get locations which are stored in the location database. my @database_locations =3D &Location::database_countries($db_handle); =20 @@ -197,9 +197,6 @@ sub address_has_flags($) { # Array to store the flags of the address. my @flags; =20 - # Init libloc database handle. - my $db_handle =3D &init(); - # Loop through the hash of possible network flags. foreach my $flag (keys(%network_flags)) { # Check if the address has the current flag. --=20 2.20.1 --===============2442886050643517336==--