aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-03-26 14:03:29 -0400
committerNick Mathewson <nickm@torproject.org>2012-03-26 14:03:29 -0400
commit6dcbfec82d1a76cf19dd385b1b91841189c8c4ab (patch)
treec7c88f7f54a3d425e764f56bb7fead0613c5257f /src/or/or.h
parent650e2aac46ed9857eed1863cefda45c632bb21eb (diff)
parente111e371b4f44456182e7f237837a0f9466487cd (diff)
downloadtor-6dcbfec82d1a76cf19dd385b1b91841189c8c4ab.tar.gz
tor-6dcbfec82d1a76cf19dd385b1b91841189c8c4ab.zip
Merge remote-tracking branch 'rransom-tor/safecookie-022-v3' into maint-0.2.2
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index c0714ee4c6..eecd3750a9 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1254,6 +1254,12 @@ typedef struct control_connection_t {
* connection. */
unsigned int is_owning_control_connection:1;
+ /** If we have sent an AUTHCHALLENGE reply on this connection and
+ * have not received a successful AUTHENTICATE command, points to
+ * the value which the client must send to authenticate itself;
+ * otherwise, NULL. */
+ char *safecookie_client_hash;
+
/** Amount of space allocated in incoming_cmd. */
uint32_t incoming_cmd_len;
/** Number of bytes currently stored in incoming_cmd. */