[tor-commits] [tor/master] Remove Support022HiddenServices

[nickm@xxxxxxxxxxxxxx]

commit b3bd7a736c7a54406c087bfaa2bae3dec03ec7bd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 17 11:52:10 2014 -0500

    Remove Support022HiddenServices
    
    This has been already disabled in the directory consensus for a while;
    it didn't seem to break anything.
    
    Finally closes #7803.
---
 changes/bug7803     |    5 +++++
 src/or/config.c     |    2 +-
 src/or/or.h         |    3 ---
 src/or/rendclient.c |   20 ++------------------
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/changes/bug7803 b/changes/bug7803
new file mode 100644
index 0000000..7a2bba7
--- /dev/null
+++ b/changes/bug7803
@@ -0,0 +1,5 @@
+  o Removed features:
+    - Tor clients no longer support connecting to hidden services running on
+      Tor 0.2.2.x and earlier; the Support022HiddenServices option has been
+      removed.  (There shouldn't be any hidden services running these
+      versions on the network.)
diff --git a/src/or/config.c b/src/or/config.c
index 4b8c683..a0351d5 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -377,7 +377,7 @@ static config_var_t option_vars_[] = {
   OBSOLETE("StrictEntryNodes"),
   OBSOLETE("StrictExitNodes"),
   V(StrictNodes,                 BOOL,     "0"),
-  V(Support022HiddenServices,    AUTOBOOL, "auto"),
+  OBSOLETE("Support022HiddenServices"),
   V(TestSocks,                   BOOL,     "0"),
   V(TokenBucketRefillInterval,   MSEC_INTERVAL, "100 msec"),
   V(Tor2webMode,                 BOOL,     "0"),
diff --git a/src/or/or.h b/src/or/or.h
index 5ebe7bf..8a9c1cf 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4229,9 +4229,6 @@ typedef struct {
   /** How long (seconds) do we keep a guard before picking a new one? */
   int GuardLifetime;
 
-  /** Should we send the timestamps that pre-023 hidden services want? */
-  int Support022HiddenServices;
-
 } or_options_t;
 
 /** Persistent state for an onion router, as saved to disk. */
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 5e5a09e..f351ae7 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -130,16 +130,6 @@ rend_client_reextend_intro_circuit(origin_circuit_t *circ)
   return result;
 }
 
-/** Return true iff we should send timestamps in our INTRODUCE1 cells */
-static int
-rend_client_should_send_timestamp(void)
-{
-  if (get_options()->Support022HiddenServices >= 0)
-    return get_options()->Support022HiddenServices;
-
-  return networkstatus_get_param(NULL, "Support022HiddenServices", 1, 0, 1);
-}
-
 /** Called when we're trying to connect an ap conn; sends an INTRODUCE1 cell
  * down introcirc if possible.
  */
@@ -251,14 +241,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
              REND_DESC_COOKIE_LEN);
       v3_shift += 2+REND_DESC_COOKIE_LEN;
     }
-    if (rend_client_should_send_timestamp()) {
-      uint32_t now = (uint32_t)time(NULL);
-      now += 300;
-      now -= now % 600;
-      set_uint32(tmp+v3_shift+1, htonl(now));
-    } else {
-      set_uint32(tmp+v3_shift+1, 0);
-    }
+    /* Once this held a timestamp. */
+    set_uint32(tmp+v3_shift+1, 0);
     v3_shift += 4;
   } /* if version 2 only write version number */
   else if (entry->parsed->protocols & (1<<2)) {

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits