From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] tor.cgi: look up Tor relay country codes using libloc
Date: Tue, 03 Nov 2020 12:50:18 +0100 [thread overview]
Message-ID: <521c62a4-a948-f340-1642-813f3e811374@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]
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(a)ipfire.org>
---
html/cgi-bin/tor.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.26.2
reply other threads:[~2020-11-03 11:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=521c62a4-a948-f340-1642-813f3e811374@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox