Prop 209: Add path bias counts for timeouts and other mechanisms.

Turns out there's more than one way to block a tagged circuit.

This seems to successfully handle all of the normal exit circuits. Hidden
services need additional tweaks, still.

1 files changed, 28 insertions, 8 deletions

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 317a08847..1e64aaf98 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1021,7 +1021,8 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
       digestmap_set(added_by, d, tor_strdup(line->value+HEX_DIGEST_LEN+1));
     } else if (!strcasecmp(line->key, "EntryGuardPathBias")) {
       const or_options_t *options = get_options();
-      unsigned hop_cnt, success_cnt, timeouts;
+      unsigned hop_cnt, success_cnt, timeouts, collapsed, successful_closed,
+               unusable;
 
       if (!node) {
         *msg = tor_strdup("Unable to parse entry nodes: "
@@ -1030,19 +1031,33 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
       }
 
       /* First try 3 params, then 2. */
-      if (tor_sscanf(line->value, "%u %u %u", &success_cnt, &hop_cnt,
-                     &timeouts) != 3) {
-        timeouts = 0;
+      // XXX: We want to convert this to floating point before merge
+      /* In the long run: circuit_success ~= successful_circuit_close + 
+       *                                     collapsed_circuits +
+       *                                     unusable_circuits */
+      if (tor_sscanf(line->value, "%u %u %u %u %u %u",
+                  &hop_cnt, &success_cnt, &successful_closed,
+                  &collapsed, &unusable, &timeouts) != 6) {
         if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) {
-          log_warn(LD_GENERAL, "Unable to parse guard path bias info: "
-                 "Misformated EntryGuardPathBias %s", escaped(line->value));
           continue;
         }
+        log_info(LD_GENERAL, "Reading old-style EntryGuardPathBias %s",
+                 escaped(line->value));
+
+        successful_closed = success_cnt;
+        timeouts = 0;
+        collapsed = 0;
+        unusable = 0;
       }
 
       node->first_hops = hop_cnt;
       node->circuit_successes = success_cnt;
+
+      node->successful_circuits_closed = successful_closed;
       node->timeouts = timeouts;
+      node->collapsed_circuits = collapsed;
+      node->unusable_circuits = unusable;
+
       log_info(LD_GENERAL, "Read %u/%u path bias for node %s",
                node->circuit_successes, node->first_hops, node->nickname);
       /* Note: We rely on the < comparison here to allow us to set a 0
@@ -1180,8 +1195,13 @@ entry_guards_update_state(or_state_t *state)
       if (e->first_hops) {
         *next = line = tor_malloc_zero(sizeof(config_line_t));
         line->key = tor_strdup("EntryGuardPathBias");
-        tor_asprintf(&line->value, "%u %u %u",
-                     e->circuit_successes, e->first_hops, e->timeouts);
+        /* In the long run: circuit_success ~= successful_circuit_close + 
+         *                                     collapsed_circuits +
+         *                                     unusable_circuits */
+        tor_asprintf(&line->value, "%u %u %u %u %u %u",
+                     e->first_hops, e->circuit_successes,
+                     pathbias_get_closed_count(e), e->collapsed_circuits,
+                     e->unusable_circuits, e->timeouts);
         next = &(line->next);
       }