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

Tweak the fmt_addr32 code

Browse Source 
Clarify documentation, rename a local, and fix a memory leak.
This commit is contained in:
Nick Mathewson 2010-10-15 17:07:27 -04:00
parent 22f723e4a3
commit b97da61b5a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/config.c
View File

@ -2336,7 +2336,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
int explicit_ip=1; int explicit_ip=1;
int explicit_hostname=1; int explicit_hostname=1;
int from_interface=0; int from_interface=0;
char *tmpbuf; char *addr_string = NULL;
const char *address = options->Address; const char *address = options->Address;
int notice_severity = warn_severity <= LOG_NOTICE ? int notice_severity = warn_severity <= LOG_NOTICE ?
LOG_NOTICE : warn_severity; LOG_NOTICE : warn_severity;
@ -2410,7 +2410,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
} }
} }
tmpbuf = tor_dup_ip(addr); addr_string = tor_dup_ip(addr);
if (is_internal_IP(addr, 0) && options->_PublishServerDescriptor) { if (is_internal_IP(addr, 0) && options->_PublishServerDescriptor) {
/* make sure we're ok with publishing an internal IP */ /* make sure we're ok with publishing an internal IP */
if (!options->DirServers && !options->AlternateDirAuthority) { if (!options->DirServers && !options->AlternateDirAuthority) {
@ -2419,7 +2419,8 @@ resolve_my_address(int warn_severity, or_options_t *options,
log_fn(warn_severity, LD_CONFIG, log_fn(warn_severity, LD_CONFIG,
"Address '%s' resolves to private IP address '%s'. " "Address '%s' resolves to private IP address '%s'. "
"Tor servers that use the default DirServers must have public " "Tor servers that use the default DirServers must have public "
"IP addresses.", hostname, tmpbuf); "IP addresses.", hostname, addr_string);
tor_free(addr_string);
return -1; return -1;
} }
if (!explicit_ip) { if (!explicit_ip) {
@ -2427,7 +2428,8 @@ resolve_my_address(int warn_severity, or_options_t *options,
* they're using an internal address. */ * they're using an internal address. */
log_fn(warn_severity, LD_CONFIG, "Address '%s' resolves to private " log_fn(warn_severity, LD_CONFIG, "Address '%s' resolves to private "
"IP address '%s'. Please set the Address config option to be " "IP address '%s'. Please set the Address config option to be "
"the IP address you want to use.", hostname, tmpbuf); "the IP address you want to use.", hostname, addr_string);
tor_free(addr_string);
return -1; return -1;
} }
} }
@ -2439,7 +2441,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
* at least until dynamic IP address support becomes bulletproof. */ * at least until dynamic IP address support becomes bulletproof. */
log_notice(LD_NET, log_notice(LD_NET,
"Your IP address seems to have changed to %s. Updating.", "Your IP address seems to have changed to %s. Updating.",
tmpbuf); addr_string);
ip_address_changed(0); ip_address_changed(0);
} }
if (last_resolved_addr != *addr_out) { if (last_resolved_addr != *addr_out) {
@ -2458,12 +2460,12 @@ resolve_my_address(int warn_severity, or_options_t *options,
} }
control_event_server_status(LOG_NOTICE, control_event_server_status(LOG_NOTICE,
"EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s %s%s", "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s %s%s",
tmpbuf, method, h?"HOSTNAME=":"", h); addr_string, method, h?"HOSTNAME=":"", h);
} }
last_resolved_addr = *addr_out; last_resolved_addr = *addr_out;
if (hostname_out) if (hostname_out)
*hostname_out = tor_strdup(hostname); *hostname_out = tor_strdup(hostname);
tor_free(tmpbuf); tor_free(addr_string);
return 0; return 0;
} }