mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

backport candidate:

Browse Source 
Make it possible to read the PROTOCOLINFO response in a way that
conforms to our control-spec. Reported by Matt Edman.


svn:r11251
This commit is contained in:
Roger Dingledine 2007-08-22 07:57:10 +00:00
parent 353abd9830
commit c02fb8997b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -24,6 +24,8 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
- Stop putting the authentication cookie in a file called "0" - Stop putting the authentication cookie in a file called "0"
in your working directory if you don't specify anything for the in your working directory if you don't specify anything for the
new CookieAuthFile option. Reported by Matt Edman. 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 - Fix a minor memory leak when we fail to find enough suitable
servers to choose a circuit. Bugfix on 0.1.2.x. servers to choose a circuit. Bugfix on 0.1.2.x.
- Stop leaking part of the descriptor when we run into a particularly - Stop leaking part of the descriptor when we run into a particularly

2
doc/spec/control-spec.txt
View File

@ -741,7 +741,7 @@ $Id$
"PROTOCOLINFO" *(SP PIVERSION) CRLF "PROTOCOLINFO" *(SP PIVERSION) CRLF
The server reply format is: 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 InfoLine = AuthLine / VersionLine / OtherLine

2
src/or/control.c
View File

@ -2321,7 +2321,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len,
} }
connection_printf_to_buf(conn, connection_printf_to_buf(conn,
"250+PROTOCOLINFO 1\r\n" "250-PROTOCOLINFO 1\r\n"
"250-AUTH METHODS=%s%s%s\r\n" "250-AUTH METHODS=%s%s%s\r\n"
"250-VERSION Tor=%s\r\n" "250-VERSION Tor=%s\r\n"
"250 OK\r\n", "250 OK\r\n",