sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 21:42:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

torcontrol: Improve comments

Browse Source
This commit is contained in:
Jack Grigg 2017-03-25 20:13:18 +13:00
parent b6ee855b41
commit d8e03c0340
No known key found for this signature in database
GPG Key ID: 665DBCD284F7DAFF
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/torcontrol.cpp
View File

@ -250,6 +250,8 @@ bool TorControlConnection::Command(const std::string &cmd, const ReplyHandlerCB&
/* Split reply line in the form 'AUTH METHODS=...' into a type /* Split reply line in the form 'AUTH METHODS=...' into a type
* 'AUTH' and arguments 'METHODS=...'. * 'AUTH' and arguments 'METHODS=...'.
* Grammar is implicitly defined in https://spec.torproject.org/control-spec by
* the server reply formats for PROTOCOLINFO (S3.21) and AUTHCHALLENGE (S3.24).
*/ */
static std::pair<std::string,std::string> SplitTorReplyLine(const std::string &s) static std::pair<std::string,std::string> SplitTorReplyLine(const std::string &s)
{ {
@ -265,6 +267,9 @@ static std::pair<std::string,std::string> SplitTorReplyLine(const std::string &s
} }
/** Parse reply arguments in the form 'METHODS=COOKIE,SAFECOOKIE COOKIEFILE=".../control_auth_cookie"'. /** Parse reply arguments in the form 'METHODS=COOKIE,SAFECOOKIE COOKIEFILE=".../control_auth_cookie"'.
* Grammar is implicitly defined in https://spec.torproject.org/control-spec by
* the server reply formats for PROTOCOLINFO (S3.21), AUTHCHALLENGE (S3.24),
* and ADD_ONION (S3.27). See also sections 2.1 and 2.3.
*/ */
static std::map<std::string,std::string> ParseTorReplyMapping(const std::string &s) static std::map<std::string,std::string> ParseTorReplyMapping(const std::string &s)
{ {
@ -280,7 +285,7 @@ static std::map<std::string,std::string> ParseTorReplyMapping(const std::string
return std::map<std::string,std::string>(); return std::map<std::string,std::string>();
++ptr; // skip '=' ++ptr; // skip '='
if (ptr < s.size() && s[ptr] == '"') { // Quoted string if (ptr < s.size() && s[ptr] == '"') { // Quoted string
++ptr; // skip '=' ++ptr; // skip opening '"'
bool escape_next = false; bool escape_next = false;
while (ptr < s.size() && (!escape_next && s[ptr] != '"')) { while (ptr < s.size() && (!escape_next && s[ptr] != '"')) {
escape_next = (s[ptr] == '\\'); escape_next = (s[ptr] == '\\');