Commit 965afb49 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

cleanups on r13442. 

oh, and this should be backported too.


svn:r13444
parent f882a2fc

ChangeLog

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ Changes in version 0.2.0.19-alpha - 2008-02-?? 
    - If we're a relay, avoid picking ourselves as an introduction point,

      a rendezvous point, or as the final hop for internal circuits. Bug

      reported by taranis and lodger. Bugfix on 0.1.2.x.

    - Patch from "Andrew S. Lists" to catch when we contact a directory

      mirror at IP address X and he says we look like we're coming from

      IP address X. Bugfix on 0.1.2.x.



  o Minor bugfixes:

    - Directory caches now fetch certificates from all authorities

src/or/router.c

+7 −6
Original line number Diff line number Diff line
@@ -1460,7 +1460,8 @@ check_descriptor_ipaddress_changed(time_t now) 
 * headers. */

static uint32_t last_guessed_ip = 0;



/** A directory server told us our IP address is <b>suggestion</b>.

/** A directory server <b>d_conn</b> told us our IP address is

 * <b>suggestion</b>.

 * If this address is different from the one we think we are now, and

 * if our computer doesn't actually know its IP address, then switch. */

void
@@ -1497,9 +1498,9 @@ router_new_address_suggestion(const char *suggestion, 
  }

  if (addr == d_conn->_base.addr) {

    /* Don't believe anybody who says our IP is their IP. */

    log_notice(LD_DIR, "A directory server told us our IP is %s, but that "

              "seems to be the IP of the directory server saying these "

              "things. Ignoring.", suggestion);

    log_debug(LD_DIR, "A directory server told us our IP address is %s, "

              "but he's just reporting his own IP address. Ignoring.",

              suggestion);

    return;

  }

src/or/or.h

+2 −2

File changed.

Contains only whitespace changes.