[or-cvs] r17547: {tor} Resume using the correct "REASON=" stream when telling the c (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-12-09 20:34:24 -0500 (Tue, 09 Dec 2008)
New Revision: 17547

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/control.c
Log:
Resume using the correct "REASON=" stream when telling the
controller why we closed a stream. Bugfix in 0.2.1.1-alpha.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-12-09 23:51:02 UTC (rev 17546)
+++ tor/trunk/ChangeLog	2008-12-10 01:34:24 UTC (rev 17547)
@@ -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,7 +10,11 @@
     - 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:
     - New DirPortFrontPage option that takes an html file and publishes

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-12-09 23:51:02 UTC (rev 17546)
+++ tor/trunk/src/or/control.c	2008-12-10 01:34:24 UTC (rev 17547)
@@ -3092,7 +3092,7 @@
   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);