sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.1'

This commit is contained in:
Nick Mathewson 2010-02-09 12:58:25 -05:00
parent a4065cd832 a168cd2a54
commit a6a1b8b815
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -66,6 +66,9 @@ Changes in version 0.2.1.23 - 2010-0?-??
on, detect the OpenSSL version at run-time, not compile time. We
need to do this because Apple doesn't update its dev-tools headers
when it updates its libraries in a security patch.
- Refactor resolve_my_address() a little, to not use gethostbyname()
anymore. Fixes bug 1244; bugfix on 0.0.2pre25. Reported by Mike
Mestnik.
o Minor features:
- Avoid a mad rush at the beginning of each month when each client

8
src/or/config.c
View File

@ -2193,7 +2193,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
uint32_t *addr_out, char **hostname_out)
{
struct in_addr in;
struct hostent *rent;
uint32_t addr;
char hostname[256];
int explicit_ip=1;
int explicit_hostname=1;
@ -2223,8 +2223,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
if (tor_inet_aton(hostname, &in) == 0) {
/* then we have to resolve it */
explicit_ip = 0;
rent = (struct hostent *)gethostbyname(hostname);
if (!rent) {
if(!tor_lookup_hostname(hostname, &addr)) {
uint32_t interface_ip;
if (explicit_hostname) {
@ -2247,8 +2246,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
"local interface. Using that.", tmpbuf);
strlcpy(hostname, "<guessed from interfaces>", sizeof(hostname));
} else {
tor_assert(rent->h_length == 4);
memcpy(&in.s_addr, rent->h_addr, rent->h_length);
in.s_addr = htonl(addr);
if (!explicit_hostname &&
is_internal_IP(ntohl(in.s_addr), 0)) {