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

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>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 7447bd79160c85a64593c369bbb45545c226af1f..14bfcfe90079548b136f305c5a8cf481bc2d4124 100644 (file)
--- 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