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

Include statistics as to how many connections are IPv4 versus IPv6

Browse Source
This commit is contained in:
nils 2012-02-24 13:21:48 -08:00 committed by Linus Nordberg
parent abb886014e
commit 31e224173b
3 changed files with 61 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/or/geoip.c
View File

@ -970,7 +970,7 @@ geoip_get_dirreq_history(geoip_client_action_t action,
* to export geoip data yet. This counts both IPv4 and IPv6 clients * to export geoip data yet. This counts both IPv4 and IPv6 clients
* since they're in the same clientmap list. */ * since they're in the same clientmap list. */
char * char *
geoip_get_client_history(geoip_client_action_t action) geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, int *total_ipv6)
{ {
char *result = NULL; char *result = NULL;
unsigned granularity = IP_GRANULARITY; unsigned granularity = IP_GRANULARITY;
@ -981,6 +981,7 @@ geoip_get_client_history(geoip_client_action_t action)
clientmap_entry_t **ent; clientmap_entry_t **ent;
unsigned *counts = NULL; unsigned *counts = NULL;
unsigned total = 0; unsigned total = 0;
unsigned ipv4_count = 0, ipv6_count = 0;
if (!geoip_is_loaded()) if (!geoip_is_loaded())
return NULL; return NULL;
@ -996,7 +997,19 @@ geoip_get_client_history(geoip_client_action_t action)
tor_assert(0 <= country && country < n_countries); tor_assert(0 <= country && country < n_countries);
++counts[country]; ++counts[country];
++total; ++total;
switch (tor_addr_family(&(*ent)->addr)) {
case AF_INET:
ipv4_count++;
break;
case AF_INET6:
ipv6_count++;
break;
}
} }
if (total_ipv4)
(*total_ipv4) = ipv4_count;
if (total_ipv6)
(*total_ipv6) = ipv6_count;
/* Don't record anything if we haven't seen enough IPs. */ /* Don't record anything if we haven't seen enough IPs. */
if (total < MIN_IPS_TO_NOTE_ANYTHING) if (total < MIN_IPS_TO_NOTE_ANYTHING)
goto done; goto done;
@ -1152,6 +1165,9 @@ geoip_format_dirreq_stats(time_t now)
*v3_direct_dl_string, *v2_direct_dl_string, *v3_direct_dl_string, *v2_direct_dl_string,
*v3_tunneled_dl_string, *v2_tunneled_dl_string; *v3_tunneled_dl_string, *v2_tunneled_dl_string;
char *result; char *result;
int networkstatus_v2_ipv4, networkstatus_v2_ipv6,
networkstatus_v3_ipv4, networkstatus_v3_ipv6;
if (!start_of_dirreq_stats_interval) if (!start_of_dirreq_stats_interval)
return NULL; /* Not initialized. */ return NULL; /* Not initialized. */
@ -1159,8 +1175,8 @@ geoip_format_dirreq_stats(time_t now)
tor_assert(now >= start_of_dirreq_stats_interval); tor_assert(now >= start_of_dirreq_stats_interval);
format_iso_time(t, now); format_iso_time(t, now);
v2_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); v2_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2, &networkstatus_v2_ipv4, &networkstatus_v2_ipv6);
v3_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); v3_ips_string = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS, &networkstatus_v3_ipv4, &networkstatus_v3_ipv6);
v2_reqs_string = geoip_get_request_history( v2_reqs_string = geoip_get_request_history(
GEOIP_CLIENT_NETWORKSTATUS_V2); GEOIP_CLIENT_NETWORKSTATUS_V2);
v3_reqs_string = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS); v3_reqs_string = geoip_get_request_history(GEOIP_CLIENT_NETWORKSTATUS);
@ -1195,6 +1211,8 @@ geoip_format_dirreq_stats(time_t now)
tor_asprintf(&result, "dirreq-stats-end %s (%d s)\n" tor_asprintf(&result, "dirreq-stats-end %s (%d s)\n"
"dirreq-v3-ips %s\n" "dirreq-v3-ips %s\n"
"dirreq-v2-ips %s\n" "dirreq-v2-ips %s\n"
"dirreq-v3-ip-versions v4=%d,v6=%d\n"
"dirreq-v2-ip-versions v4=%d,v6=%d\n"
"dirreq-v3-reqs %s\n" "dirreq-v3-reqs %s\n"
"dirreq-v2-reqs %s\n" "dirreq-v2-reqs %s\n"
"dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u," "dirreq-v3-resp ok=%u,not-enough-sigs=%u,unavailable=%u,"
@ -1211,6 +1229,8 @@ geoip_format_dirreq_stats(time_t now)
(unsigned) (now - start_of_dirreq_stats_interval), (unsigned) (now - start_of_dirreq_stats_interval),
v3_ips_string ? v3_ips_string : "", v3_ips_string ? v3_ips_string : "",
v2_ips_string ? v2_ips_string : "", v2_ips_string ? v2_ips_string : "",
networkstatus_v3_ipv4, networkstatus_v3_ipv6,
networkstatus_v2_ipv4, networkstatus_v2_ipv6,
v3_reqs_string ? v3_reqs_string : "", v3_reqs_string ? v3_reqs_string : "",
v2_reqs_string ? v2_reqs_string : "", v2_reqs_string ? v2_reqs_string : "",
ns_v3_responses[GEOIP_SUCCESS], ns_v3_responses[GEOIP_SUCCESS],
@ -1369,6 +1389,7 @@ geoip_format_bridge_stats(time_t now)
char *out = NULL, *data = NULL; char *out = NULL, *data = NULL;
long duration = now - start_of_bridge_stats_interval; long duration = now - start_of_bridge_stats_interval;
char written[ISO_TIME_LEN+1]; char written[ISO_TIME_LEN+1];
int total_ipv4 = 0, total_ipv6 = 0;
if (duration < 0) if (duration < 0)
return NULL; return NULL;
@ -1376,13 +1397,16 @@ geoip_format_bridge_stats(time_t now)
return NULL; /* Not initialized. */ return NULL; /* Not initialized. */
format_iso_time(written, now); format_iso_time(written, now);
data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6);
tor_asprintf(&out, tor_asprintf(&out,
"bridge-stats-end %s (%ld s)\n" "bridge-stats-end %s (%ld s)\n"
"bridge-ips %s\n", "bridge-ips %s\n"
"bridge-ip-versions v4=%d,v6=%d\n",
written, duration, written, duration,
data ? data : ""); data ? data : "",
total_ipv4,
total_ipv6);
tor_free(data); tor_free(data);
return out; return out;
@ -1399,7 +1423,7 @@ format_bridge_stats_controller(time_t now)
(void) now; (void) now;
format_iso_time(started, start_of_bridge_stats_interval); format_iso_time(started, start_of_bridge_stats_interval);
data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, 0, 0);
tor_asprintf(&out, tor_asprintf(&out,
"TimeStarted=\"%s\" CountrySummary=%s", "TimeStarted=\"%s\" CountrySummary=%s",
@ -1525,17 +1549,21 @@ geoip_format_entry_stats(time_t now)
char t[ISO_TIME_LEN+1]; char t[ISO_TIME_LEN+1];
char *data = NULL; char *data = NULL;
char *result; char *result;
int total_ipv4, total_ipv6;
if (!start_of_entry_stats_interval) if (!start_of_entry_stats_interval)
return NULL; /* Not initialized. */ return NULL; /* Not initialized. */
tor_assert(now >= start_of_entry_stats_interval); tor_assert(now >= start_of_entry_stats_interval);
data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6);
format_iso_time(t, now); format_iso_time(t, now);
tor_asprintf(&result, "entry-stats-end %s (%u s)\nentry-ips %s\n", tor_asprintf(&result,
t, (unsigned) (now - start_of_entry_stats_interval), "entry-stats-end %s (%u s)\n"
data ? data : ""); "entry-ips %s\n"
"entry-ip-versions v4=%d,v6=%d\n",
t, (unsigned) (now - start_of_entry_stats_interval),
data ? data : "", total_ipv4, total_ipv6);
tor_free(data); tor_free(data);
return result; return result;
} }

2
src/or/geoip.h
View File

@ -33,7 +33,7 @@ void geoip_remove_old_clients(time_t cutoff);
void geoip_note_ns_response(geoip_client_action_t action, void geoip_note_ns_response(geoip_client_action_t action,
geoip_ns_response_t response); geoip_ns_response_t response);
char *geoip_get_client_history(geoip_client_action_t action); char *geoip_get_client_history(geoip_client_action_t action, int *total_ipv4, int *total_ipv6);
char *geoip_get_request_history(geoip_client_action_t action); char *geoip_get_request_history(geoip_client_action_t action);
int getinfo_helper_geoip(control_connection_t *control_conn, int getinfo_helper_geoip(control_connection_t *control_conn,
const char *question, char **answer, const char *question, char **answer,

26
src/test/test.c
View File

@ -1391,11 +1391,14 @@ test_geoip(void)
char *s = NULL; char *s = NULL;
const char *bridge_stats_1 = const char *bridge_stats_1 =
"bridge-stats-end 2010-08-12 13:27:30 (86400 s)\n" "bridge-stats-end 2010-08-12 13:27:30 (86400 s)\n"
"bridge-ips zz=24,xy=8\n", "bridge-ips zz=24,xy=8\n"
"bridge-ip-versions v4=11,v6=9\n",
*dirreq_stats_1 = *dirreq_stats_1 =
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n" "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
"dirreq-v3-ips ab=8\n" "dirreq-v3-ips ab=8\n"
"dirreq-v2-ips \n" "dirreq-v2-ips \n"
"dirreq-v3-ip-versions v4=1,v6=0\n"
"dirreq-v2-ip-versions v4=0,v6=0\n"
"dirreq-v3-reqs ab=8\n" "dirreq-v3-reqs ab=8\n"
"dirreq-v2-reqs \n" "dirreq-v2-reqs \n"
"dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0," "dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0,"
@ -1410,6 +1413,8 @@ test_geoip(void)
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n" "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
"dirreq-v3-ips \n" "dirreq-v3-ips \n"
"dirreq-v2-ips \n" "dirreq-v2-ips \n"
"dirreq-v3-ip-versions v4=0,v6=0\n"
"dirreq-v2-ip-versions v4=0,v6=0\n"
"dirreq-v3-reqs \n" "dirreq-v3-reqs \n"
"dirreq-v2-reqs \n" "dirreq-v2-reqs \n"
"dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0," "dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0,"
@ -1424,6 +1429,8 @@ test_geoip(void)
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n" "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
"dirreq-v3-ips \n" "dirreq-v3-ips \n"
"dirreq-v2-ips \n" "dirreq-v2-ips \n"
"dirreq-v3-ip-versions v4=0,v6=0\n"
"dirreq-v2-ip-versions v4=0,v6=0\n"
"dirreq-v3-reqs \n" "dirreq-v3-reqs \n"
"dirreq-v2-reqs \n" "dirreq-v2-reqs \n"
"dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0," "dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,"
@ -1438,6 +1445,8 @@ test_geoip(void)
"dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n" "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
"dirreq-v3-ips \n" "dirreq-v3-ips \n"
"dirreq-v2-ips \n" "dirreq-v2-ips \n"
"dirreq-v3-ip-versions v4=0,v6=0\n"
"dirreq-v2-ip-versions v4=0,v6=0\n"
"dirreq-v3-reqs \n" "dirreq-v3-reqs \n"
"dirreq-v2-reqs \n" "dirreq-v2-reqs \n"
"dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0," "dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,"
@ -1450,12 +1459,15 @@ test_geoip(void)
"dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n", "dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
*entry_stats_1 = *entry_stats_1 =
"entry-stats-end 2010-08-12 13:27:30 (86400 s)\n" "entry-stats-end 2010-08-12 13:27:30 (86400 s)\n"
"entry-ips ab=8\n", "entry-ips ab=8\n"
"entry-ip-versions v4=1,v6=0\n",
*entry_stats_2 = *entry_stats_2 =
"entry-stats-end 2010-08-12 13:27:30 (86400 s)\n" "entry-stats-end 2010-08-12 13:27:30 (86400 s)\n"
"entry-ips \n"; "entry-ips \n"
"entry-ip-versions v4=0,v6=0\n";
tor_addr_t addr; tor_addr_t addr;
struct in6_addr in6; struct in6_addr in6;
int total_ipv4, total_ipv6;
/* Populate the DB a bit. Add these in order, since we can't do the final /* Populate the DB a bit. Add these in order, since we can't do the final
* 'sort' step. These aren't very good IP addresses, but they're perfectly * 'sort' step. These aren't very good IP addresses, but they're perfectly
@ -1536,16 +1548,20 @@ test_geoip(void)
SET_TEST_ADDRESS(i); SET_TEST_ADDRESS(i);
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now);
} }
s = geoip_get_client_history(GEOIP_CLIENT_CONNECT); s = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6);
test_assert(s); test_assert(s);
test_streq("zz=24,ab=16,xy=8", s); test_streq("zz=24,ab=16,xy=8", s);
test_eq(total_ipv4, 16);
test_eq(total_ipv6, 13);
tor_free(s); tor_free(s);
/* Now clear out all the AB observations. */ /* Now clear out all the AB observations. */
geoip_remove_old_clients(now-6000); geoip_remove_old_clients(now-6000);
s = geoip_get_client_history(GEOIP_CLIENT_CONNECT); s = geoip_get_client_history(GEOIP_CLIENT_CONNECT, &total_ipv4, &total_ipv6);
test_assert(s); test_assert(s);
test_streq("zz=24,xy=8", s); test_streq("zz=24,xy=8", s);
test_eq(total_ipv4, 11);
test_eq(total_ipv6, 9);
/* Start testing bridge statistics by making sure that we don't output /* Start testing bridge statistics by making sure that we don't output
* bridge stats without initializing them. */ * bridge stats without initializing them. */