[tor-commits] [tor/master] Merge branch 'bug7011'

[nickm at torproject.org]

commit 7ea904cbc0acbe1575ff68700572da76e4e4b10d
Merge: 8b36d4c e6d1ab3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 22:31:06 2012 -0400

    Merge branch 'bug7011'
    
    Conflicts:
    	src/or/circuitbuild.c
    
    The conflict was trivial, since no line of code actually changed in
    both branches: There was a fmt_addr() that turned into fmt_addrport()
    in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
    master.

 changes/bug7011          |    6 +++++
 src/common/address.c     |   13 +++++++++++
 src/common/address.h     |    1 +
 src/or/circuitbuild.c    |   48 ++++++++++++++++++++--------------------
 src/or/config.c          |   20 ++++++++--------
 src/or/connection.c      |   32 +++++++++++++-------------
 src/or/connection_edge.c |    2 +-
 src/or/connection_or.c   |    8 +++---
 src/or/dirserv.c         |    6 +---
 src/or/dirvote.c         |   10 +++-----
 src/or/rendservice.c     |    4 +-
 src/or/statefile.c       |   11 ++++-----
 src/or/transports.c      |   54 ++++++++++++++++++++++++---------------------
 13 files changed, 117 insertions(+), 98 deletions(-)

diff --cc src/or/circuitbuild.c
index 749985f,71f4408..3e20797
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@@ -1979,16 -1955,16 +1979,16 @@@ circuit_handle_first_hop(origin_circuit
    tor_assert(firsthop->extend_info);
  
    /* now see if we're already connected to the first OR in 'route' */
-   log_debug(LD_CIRC,"Looking for firsthop '%s:%u'",
-             fmt_addr(&firsthop->extend_info->addr),
-             firsthop->extend_info->port);
+   log_debug(LD_CIRC,"Looking for firsthop '%s'",
+             fmt_addrport(&firsthop->extend_info->addr,
+                          firsthop->extend_info->port));
  
 -  n_conn = connection_or_get_for_extend(firsthop->extend_info->identity_digest,
 -                                        &firsthop->extend_info->addr,
 -                                        &msg,
 -                                        &should_launch);
 +  n_chan = channel_get_for_extend(firsthop->extend_info->identity_digest,
 +                                  &firsthop->extend_info->addr,
 +                                  &msg,
 +                                  &should_launch);
  
 -  if (!n_conn) {
 +  if (!n_chan) {
      /* not currently connected in a useful way. */
      log_info(LD_CIRC, "Next router is %s: %s",
               safe_str_client(extend_info_describe(firsthop->extend_info)),
@@@ -2491,14 -2464,14 +2491,14 @@@ circuit_extend(cell_t *cell, circuit_t 
      return -1;
    }
  
 -  n_conn = connection_or_get_for_extend(id_digest,
 -                                        &n_addr,
 -                                        &msg,
 -                                        &should_launch);
 +  n_chan = channel_get_for_extend(id_digest,
 +                                  &n_addr,
 +                                  &msg,
 +                                  &should_launch);
  
 -  if (!n_conn) {
 +  if (!n_chan) {
-     log_debug(LD_CIRC|LD_OR,"Next router (%s:%d): %s",
-               fmt_addr(&n_addr), (int)n_port, msg?msg:"????");
+     log_debug(LD_CIRC|LD_OR,"Next router (%s): %s",
+               fmt_addrport(&n_addr, n_port), msg?msg:"????");
  
      circ->n_hop = extend_info_new(NULL /*nickname*/,
                                      id_digest,