aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-07-14 21:06:49 -0400
committerRoger Dingledine <arma@torproject.org>2010-07-14 21:06:49 -0400
commit54cdac97f150f670e60f7ce0590e3bbf428d394a (patch)
tree2c90c082aa6fae3192684e8288b686d8fc5c2ed0
parent6048571100635b96daa266fcce9e192c36b877ed (diff)
downloadtor-54cdac97f150f670e60f7ce0590e3bbf428d394a.tar
tor-54cdac97f150f670e60f7ce0590e3bbf428d394a.tar.gz
print right controller purpose string for measure-timeout circs
-rw-r--r--changes/string-for-measure-timeout-circs4
-rw-r--r--src/or/circuitlist.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/string-for-measure-timeout-circs b/changes/string-for-measure-timeout-circs
new file mode 100644
index 000000000..39e7f9616
--- /dev/null
+++ b/changes/string-for-measure-timeout-circs
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - When the controller is reporting the purpose of circuits that
+ didn't finish building before the circuit build timeout, it was
+ printing UNKNOWN_13. Now print EXPIRED. Bugfix on 0.2.2.14-alpha.
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index d71d6a21b..e18e89266 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -352,6 +352,8 @@ circuit_purpose_to_controller_string(uint8_t purpose)
case CIRCUIT_PURPOSE_TESTING:
return "TESTING";
+ case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT:
+ return "EXPIRED";
case CIRCUIT_PURPOSE_CONTROLLER:
return "CONTROLLER";