Resume using the correct "REASON=" stream when telling the

controller why we closed a stream. Bugfix in 0.2.1.1-alpha.

svn:r17547

diff --git a/ChangeLog b/ChangeLog
index 29b0e6de9e64db1e0355b3946d00be6d89a823be..6a71272ec94dab0819473f8881e08b296ab8c363 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,4 @@
 Changes in version 0.2.1.9-alpha - 200?-??-??
-
   o Minor features:
     - Give a better error message when an overzealous init script says,
       "sudo -u username tor --user username".  Makes Bug 882 easier
@@ -11,6 +10,10 @@ Changes in version 0.2.1.9-alpha - 200?-??-??
     - Finally remove deprecated "EXTENEDED_FORMAT" feature.  It has
       been called EXTENDED_EVENTS since 0.1.2.4-alpha.
 
+  o Minor bugfixes:
+    - Resume using the correct "REASON=" stream when telling the
+      controller why we closed a stream. Bugfix in 0.2.1.1-alpha.
+
 
 Changes in version 0.2.1.8-alpha - 2008-12-08
   o Major features:

diff --git a/src/or/control.c b/src/or/control.c
index 93db3c379fae1fb6c0b630e1e8b5baa2967b5c54..231a88ad14d9a808394bd707313b8b894d1f42a5 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3092,7 +3092,7 @@ control_event_stream_status(edge_connection_t *conn, stream_status_event_t tp,
   if (reason_code && (tp == STREAM_EVENT_FAILED ||
                       tp == STREAM_EVENT_CLOSED ||
                       tp == STREAM_EVENT_FAILED_RETRIABLE)) {
-    const char *reason_str = stream_end_reason_to_string(reason_code);
+    const char *reason_str = stream_end_reason_to_control_string(reason_code);
     char *r = NULL;
     if (!reason_str) {
       r = tor_malloc(16);