record the router purpose at each step of the circuit path.

i have the feeling this will come in handy.

svn:r10139

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 83a59fcd07107c10fe34f9723e650253321ce3fb..a555900ec0036e8d0a830b5021f624439920d123 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1732,9 +1732,19 @@ extend_info_from_router(routerinfo_t *r)
   info->onion_key = crypto_pk_dup_key(r->onion_pkey);
   info->addr = r->addr;
   info->port = r->or_port;
+  info->router_purpose = r->purpose;
   return info;
 }
 
+/** What router purpose is <b>digest</b>?
+ * It's a general purpose router unless it's on our bridges list.
+ */
+static uint8_t
+get_router_purpose_from_digest(char *digest) {
+  (void)digest;
+  return ROUTER_PURPOSE_GENERAL; /* XXX020 */
+}
+
 /** Allocate and return a new extend_info_t that can be used to build a
  * circuit to or through the router <b>r</b>. */
 extend_info_t *
@@ -1748,6 +1758,7 @@ extend_info_from_routerstatus(routerstatus_t *s)
   info->onion_key = NULL; /* routerstatus doesn't know this */
   info->addr = s->addr;
   info->port = s->or_port;
+  info->router_purpose = get_router_purpose_from_digest(info->identity_digest);
   return info;
 }
 

diff --git a/src/or/or.h b/src/or/or.h
index 4d27b433397383015c65606b3ed5456b6ab8a5bc..8836060c205c5272558b5c2295aef21a74e72194 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1118,11 +1118,13 @@ typedef struct {
   unsigned int is_bad_exit:1; /**< Do we think this exit is censored, borked,
                                * or otherwise nasty? */
 
-/** Tor can use this desc for circuit-building. */
+/** Tor can use this router for general positions in circuits. */
 #define ROUTER_PURPOSE_GENERAL 0
-/** Tor should avoid using this desc for circuit-building. */
+/** Tor should avoid using this router for circuit-building. */
 #define ROUTER_PURPOSE_CONTROLLER 1
-  uint8_t purpose; /** Should Tor use this desc for circuit-building? */
+/** Tor should use this router only for bridge positions in circuits. */
+#define ROUTER_PURPOSE_BRIDGE 1
+  uint8_t purpose; /** What positions in a circuit is this router good for? */
 
   /* The below items are used only by authdirservers for
    * reachability testing. */
@@ -1297,6 +1299,7 @@ typedef struct extend_info_t {
   char identity_digest[DIGEST_LEN]; /**< Hash of this router's identity key. */
   uint32_t addr; /**< IP address in host order. */
   uint16_t port; /**< OR port. */
+  uint8_t router_purpose; /**< General, controller, or bridge. */
   crypto_pk_env_t *onion_key; /**< Current onionskin key. */
 } extend_info_t;