[or-cvs] r11251: backport candidate: Make it possible to read the PROTOCOLINF (in tor/trunk: . doc/spec src/or)

[arma at seul.org]

Author: arma
Date: 2007-08-22 03:57:10 -0400 (Wed, 22 Aug 2007)
New Revision: 11251

Modified:
   tor/trunk/ChangeLog
   tor/trunk/doc/spec/control-spec.txt
   tor/trunk/src/or/control.c
Log:
backport candidate:
Make it possible to read the PROTOCOLINFO response in a way that
conforms to our control-spec. Reported by Matt Edman.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-22 03:22:51 UTC (rev 11250)
+++ tor/trunk/ChangeLog	2007-08-22 07:57:10 UTC (rev 11251)
@@ -24,6 +24,8 @@
     - Stop putting the authentication cookie in a file called "0"
       in your working directory if you don't specify anything for the
       new CookieAuthFile option. Reported by Matt Edman.
+    - Make it possible to read the PROTOCOLINFO response in a way that
+      conforms to our control-spec. Reported by Matt Edman.
     - Fix a minor memory leak when we fail to find enough suitable
       servers to choose a circuit. Bugfix on 0.1.2.x.
     - Stop leaking part of the descriptor when we run into a particularly

Modified: tor/trunk/doc/spec/control-spec.txt
===================================================================
--- tor/trunk/doc/spec/control-spec.txt	2007-08-22 03:22:51 UTC (rev 11250)
+++ tor/trunk/doc/spec/control-spec.txt	2007-08-22 07:57:10 UTC (rev 11251)
@@ -741,7 +741,7 @@
     "PROTOCOLINFO" *(SP PIVERSION) CRLF
 
   The server reply format is:
-    "250+PROTOCOLINFO" SP PIVERSION CRLF *InfoLine "250 OK" CRLF
+    "250-PROTOCOLINFO" SP PIVERSION CRLF *InfoLine "250 OK" CRLF
 
     InfoLine = AuthLine / VersionLine / OtherLine
 

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2007-08-22 03:22:51 UTC (rev 11250)
+++ tor/trunk/src/or/control.c	2007-08-22 07:57:10 UTC (rev 11251)
@@ -2321,7 +2321,7 @@
     }
 
     connection_printf_to_buf(conn,
-                             "250+PROTOCOLINFO 1\r\n"
+                             "250-PROTOCOLINFO 1\r\n"
                              "250-AUTH METHODS=%s%s%s\r\n"
                              "250-VERSION Tor=%s\r\n"
                              "250 OK\r\n",