Commit a6a1b8b8 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote branch 'origin/maint-0.2.1'

parents a4065cd8 a168cd2a

ChangeLog

+3 −0
Original line number Diff line number Diff line
@@ -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

src/or/config.c

+3 −5
Original line number Diff line number Diff line
@@ -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)) {