tor

commit 2a4663fee839b454b971e6cc9a3c24528a74b5ff
parent faced20ddfb9f38aeea8b3aec4642e9404869cdb
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 16 May 2022 08:43:42 -0400

Merge branch 'tor-gitlab/mr/562'

Diffstat:
M
src/feature/control/getinfo_geoip.c
 | 
5
+----
M
src/lib/geoip/geoip.c
 | 
4
++--
M
src/lib/geoip/geoip.h
 | 
6
+++---

3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/feature/control/getinfo_geoip.c b/src/feature/control/getinfo_geoip.c
@@ -44,10 +44,7 @@ getinfo_helper_geoip(control_connection_t *control_conn,
       *errmsg = "GeoIP data not loaded";
       return -1;
     }
-    if (family == AF_INET)
-      c = geoip_get_country_by_ipv4(tor_addr_to_ipv4h(&addr));
-    else                      /* AF_INET6 */
-      c = geoip_get_country_by_ipv6(tor_addr_to_in6(&addr));
+    c = geoip_get_country_by_addr(&addr);
     *answer = tor_strdup(geoip_get_country_name(c));
   }
   return 0;
diff --git a/src/lib/geoip/geoip.c b/src/lib/geoip/geoip.c
@@ -387,7 +387,7 @@ geoip_load_file(sa_family_t family, const char *filename, int severity)
  * be less than geoip_get_n_countries().  To decode it, call
  * geoip_get_country_name().
  */
-int
+STATIC int
 geoip_get_country_by_ipv4(uint32_t ipaddr)
 {
   geoip_ipv4_entry_t *ent;
@@ -403,7 +403,7 @@ geoip_get_country_by_ipv4(uint32_t ipaddr)
  * 0 for the 'unknown country'.  The return value will always be less than
  * geoip_get_n_countries().  To decode it, call geoip_get_country_name().
  */
-int
+STATIC int
 geoip_get_country_by_ipv6(const struct in6_addr *addr)
 {
   geoip_ipv6_entry_t *ent;
diff --git a/src/lib/geoip/geoip.h b/src/lib/geoip/geoip.h
@@ -21,14 +21,14 @@
 #ifdef GEOIP_PRIVATE
 STATIC int geoip_parse_entry(const char *line, sa_family_t family);
 STATIC void clear_geoip_db(void);
+
+STATIC int geoip_get_country_by_ipv4(uint32_t ipaddr);
+STATIC int geoip_get_country_by_ipv6(const struct in6_addr *addr);
 #endif /* defined(GEOIP_PRIVATE) */
 
 struct in6_addr;
 struct tor_addr_t;
 
-int geoip_get_country_by_ipv4(uint32_t ipaddr);
-int geoip_get_country_by_ipv6(const struct in6_addr *addr);
-
 /** A per-country GeoIP record. */
 typedef struct geoip_country_t {
   /** A nul-terminated two-letter country-code. */