[or-cvs] [tor/master] print right controller purpose string for measure-timeout circs

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Wed, 14 Jul 2010 21:06:49 -0400
Subject: print right controller purpose string for measure-timeout circs
Commit: 54cdac97f150f670e60f7ce0590e3bbf428d394a

---
 changes/string-for-measure-timeout-circs |    4 ++++
 src/or/circuitlist.c                     |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)
 create mode 100644 changes/string-for-measure-timeout-circs

diff --git a/changes/string-for-measure-timeout-circs b/changes/string-for-measure-timeout-circs
new file mode 100644
index 0000000..39e7f96
--- /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 d71d6a2..e18e892 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";
 
-- 
1.7.1