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

Merge commit 'karsten/bug997-hidservfetch'

parents 0d2976d6 ca8708a9

ChangeLog

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,15 @@ Changes in version 0.2.2.1-alpha - 2009-??-?? 
    - Directories that are configured with the --enable-geoip-stats flag

      now write their GeoIP stats to disk exactly every 24 hours.



  o Minor bugfixes

    - Hidden service clients didn't use a cached service descriptor that

      was older than 15 minutes, but wouldn't fetch a new one either. Now,

      use a cached descriptor no matter how old it is and only fetch a new

      one when all introduction points fail. Fix for bug 997. Patch from

      Marcus Griep.

    - Fix refetching of hidden service descriptors when all introduction

      points have turned out to not work. Fixes more of bug 997.



  o Deprecated and removed features:

    - The controller no longer accepts the old obsolete "addr-mappings/"

      GETINFO value.

src/or/connection_edge.c

+6 −16
Original line number Diff line number Diff line
@@ -1678,23 +1678,13 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, 
               safe_str(conn->rend_data->onion_address));

      rend_client_refetch_v2_renddesc(conn->rend_data);

    } else { /* r > 0 */

/** How long after we receive a hidden service descriptor do we consider

 * it valid? */

#define NUM_SECONDS_BEFORE_HS_REFETCH (60*15)

      if (now - entry->received < NUM_SECONDS_BEFORE_HS_REFETCH) {

      conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;

        log_info(LD_REND, "Descriptor is here and fresh enough. Great.");

      log_info(LD_REND, "Descriptor is here. Great.");

      if (connection_ap_handshake_attach_circuit(conn) < 0) {

        if (!conn->_base.marked_for_close)

          connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);

        return -1;

      }

      } else {

        conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT;

        log_info(LD_REND, "Stale descriptor %s. Re-fetching.",

                 safe_str(conn->rend_data->onion_address));

        rend_client_refetch_v2_renddesc(conn->rend_data);

      }

    }

    return 0;

  }

src/or/rendclient.c

+3 −4
Original line number Diff line number Diff line
@@ -447,10 +447,9 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) 
  return 1;

}



/** Start a connection to a hidden service directory to fetch a v2

 * rendezvous service descriptor for the base32-encoded service ID

 * <b>query</b>.

 */

/** Unless we already have a descriptor for <b>rend_query</b> with at least

 * one (possibly) working introduction point in it, start a connection to a

 * hidden service directory to fetch a v2 rendezvous service descriptor. */

void

rend_client_refetch_v2_renddesc(const rend_data_t *rend_query)

{

src/or/rendcommon.c

+5 −0
Original line number Diff line number Diff line
@@ -911,6 +911,11 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) 
  }

  if (!*e)

    return 0;

  tor_assert((*e)->parsed && (*e)->parsed->intro_nodes);

  /* XXX022 hack for now, to return "not found" if there are no intro

   * points remaining. See bug 997. */

  if (smartlist_len((*e)->parsed->intro_nodes) == 0)

    return 0;

  return 1;

}