[tor-commits] [tor/master] hs: Move common defines to hs_common.h

[nickm at torproject.org]

commit e7b7e99cc72e1db14bad471fef69729bdc5eea94
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Dec 22 17:01:07 2016 -0500

    hs: Move common defines to hs_common.h
    
    Some of those defines will be used by the v3 HS protocol so move them to a
    common header out of rendservice.c. This is also ground work for prop224
    service implementation.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/hs_common.h   | 20 ++++++++++++++++++++
 src/or/rendservice.c | 17 -----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/or/hs_common.h b/src/or/hs_common.h
index 400345c..d7d4228 100644
--- a/src/or/hs_common.h
+++ b/src/or/hs_common.h
@@ -17,6 +17,26 @@
 /* Version 3 of the protocol (prop224). */
 #define HS_VERSION_THREE 3
 
+/** Try to maintain this many intro points per service by default. */
+#define NUM_INTRO_POINTS_DEFAULT 3
+/** Maximum number of intro points per service. */
+#define NUM_INTRO_POINTS_MAX 10
+/** Number of extra intro points we launch if our set of intro nodes is empty.
+ * See proposal 155, section 4. */
+#define NUM_INTRO_POINTS_EXTRA 2
+
+/** If we can't build our intro circuits, don't retry for this long. */
+#define INTRO_CIRC_RETRY_PERIOD (60*5)
+/** Don't try to build more than this many circuits before giving up for a
+ * while.*/
+#define MAX_INTRO_CIRCS_PER_PERIOD 10
+/** How many times will a hidden service operator attempt to connect to a
+ * requested rendezvous point before giving up? */
+#define MAX_REND_FAILURES 1
+/** How many seconds should we spend trying to connect to a requested
+ * rendezvous point before giving up? */
+#define MAX_REND_TIMEOUT 30
+
 /* String prefix for the signature of ESTABLISH_INTRO */
 #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1"
 
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 6b40ed9..9d4dc5b 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -98,23 +98,6 @@ struct rend_service_port_config_s {
   char unix_addr[FLEXIBLE_ARRAY_MEMBER];
 };
 
-/** Try to maintain this many intro points per service by default. */
-#define NUM_INTRO_POINTS_DEFAULT 3
-/** Maximum number of intro points per service. */
-#define NUM_INTRO_POINTS_MAX 10
-/** Number of extra intro points we launch if our set of intro nodes is
- * empty. See proposal 155, section 4. */
-#define NUM_INTRO_POINTS_EXTRA 2
-
-/** If we can't build our intro circuits, don't retry for this long. */
-#define INTRO_CIRC_RETRY_PERIOD (60*5)
-/** How many times will a hidden service operator attempt to connect to
- * a requested rendezvous point before giving up? */
-#define MAX_REND_FAILURES 1
-/** How many seconds should we spend trying to connect to a requested
- * rendezvous point before giving up? */
-#define MAX_REND_TIMEOUT 30
-
 /* Hidden service directory file names:
  * new file names should be added to rend_service_add_filenames_to_list()
  * for sandboxing purposes. */