nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

New GETINFO target to check if geoip is loaded

Browse Source 
Closes ticket 23237.
This commit is contained in:
Nick Mathewson 2017-08-25 12:25:05 -04:00
parent b91dce9454
commit 96aed28f14
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/feature23237 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (controller):
- Added new GETINFO targets ip-to-country/{ipv4,ipv6}-available, so
controllers can tell whether the geoip databases are loaded.
Closes ticket 23237.

9
src/or/geoip.c
View File

@ -1665,6 +1665,15 @@ getinfo_helper_geoip(control_connection_t *control_conn,
sa_family_t family; sa_family_t family;
tor_addr_t addr; tor_addr_t addr;
question += strlen("ip-to-country/"); question += strlen("ip-to-country/");
if (!strcmp(question, "ipv4-available") ||
!strcmp(question, "ipv6-available")) {
family = !strcmp(question, "ipv4-available") ? AF_INET : AF_INET6;
const int available = geoip_is_loaded(family);
tor_asprintf(answer, "%d", !! available);
return 0;
}
family = tor_addr_parse(&addr, question); family = tor_addr_parse(&addr, question);
if (family != AF_INET && family != AF_INET6) { if (family != AF_INET && family != AF_INET6) {
*errmsg = "Invalid address family"; *errmsg = "Invalid address family";