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

Name variables more consistently.

Browse Source
This commit is contained in:
Linus Nordberg 2012-10-19 23:23:04 +02:00
parent 9d71d97e9d
commit 8c9b427425
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/geoip.c
View File

@ -1428,7 +1428,7 @@ static char *bridge_stats_extrainfo = NULL;
char *
geoip_format_bridge_stats(time_t now)
{
char *out = NULL, *data = NULL, *ipver = NULL;
char *out = NULL, *country_data = NULL, *ipver_data = NULL;
long duration = now - start_of_bridge_stats_interval;
char written[ISO_TIME_LEN+1];
@ -1438,17 +1438,17 @@ geoip_format_bridge_stats(time_t now)
return NULL; /* Not initialized. */
format_iso_time(written, now);
geoip_get_client_history(GEOIP_CLIENT_CONNECT, &data, &ipver);
geoip_get_client_history(GEOIP_CLIENT_CONNECT, &country_data, &ipver_data);
tor_asprintf(&out,
"bridge-stats-end %s (%ld s)\n"
"bridge-ips %s\n"
"bridge-ip-versions %s\n",
written, duration,
data ? data : "",
ipver ? ipver : "");
tor_free(data);
tor_free(ipver);
country_data ? country_data : "",
ipver_data ? ipver_data : "");
tor_free(country_data);
tor_free(ipver_data);
return out;
}

2
src/or/or.h
View File

@ -3657,7 +3657,7 @@ typedef struct {
* the bridge authority guess which countries have blocked access to us. */
int BridgeRecordUsageByCountry;
/** Optionally, IPv4 and IPv6 GeoIP data */
/** Optionally, IPv4 and IPv6 GeoIP data. */
char *GeoIPFile;
char *GeoIPv6File;

2
src/or/policies.c
View File

@ -323,7 +323,7 @@ addr_is_in_cc_list(uint32_t addr, const smartlist_t *cc_list)
if (!cc_list)
return 0;
/* XXX: ipv4 specific */
/* XXXXipv6 */
tor_addr_from_ipv4h(&tar, addr);
country = geoip_get_country_by_addr(&tar);
name = geoip_get_country_name(country);