diff mbox series

tor.cgi: look up Tor relay country codes using libloc

Message ID 521c62a4-a948-f340-1642-813f3e811374@ipfire.org
State Accepted
Commit c63ea6cf49daacd51a77f9c2bbcf9856f686a0f7
Headers
Series tor.cgi: look up Tor relay country codes using libloc |

Commit Message

Peter Müller Nov. 3, 2020, 11:50 a.m. UTC 
  Tor provides a function to resolve a relay's IP address into a country
code by taking advantage of a (heavily outdated) GeoIP database shipped
with it.

We should consequently use libloc for doing this, since it can be
confusing if those results differ from active connections in the
connection tracking CGI (where we _use_ libloc) and such tasks are why
we invented libloc in the first place. :-)

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 html/cgi-bin/tor.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 7447bd791..14bfcfe90 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -912,7 +912,7 @@  sub TorNodeDescription() {
 			$node->{'address'} = $3;
 			$node->{'port'}    = $4;
 
-			my $country_code = &TorGetInfo($tor, "ip-to-country/$node->{'address'}");
+			my $country_code = &Location::Functions::lookup_country_code($db_handle, $node->{'address'});
 			$node->{'country_code'} = $country_code;
 
 		# Flags