summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-10-31 22:04:09 -0400
committerNick Mathewson <nickm@torproject.org>2012-11-14 23:16:24 -0500
commit5ee1de65b09e51ed2eea740cfd95ade3abe99e58 (patch)
tree656ea533f06287b75121225b1e5a294c4ef821cc /src
parenta62c03fe2c60c8323083b5bf1102906da0ab5914 (diff)
downloadtor-5ee1de65b09e51ed2eea740cfd95ade3abe99e58.tar.gz
tor-5ee1de65b09e51ed2eea740cfd95ade3abe99e58.zip
Only send begin cell flags when we have some to send
Diffstat (limited to 'src')
-rw-r--r--src/or/connection_edge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 2a46529f01..e1c6938a93 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1683,7 +1683,7 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
ap_conn->socks_request->address : "",
ap_conn->socks_request->port);
payload_len = (int)strlen(payload)+1;
- if (payload_len <= RELAY_PAYLOAD_SIZE - 4) {
+ if (payload_len <= RELAY_PAYLOAD_SIZE - 4 && edge_conn->begincell_flags) {
set_uint32(payload + payload_len, htonl(edge_conn->begincell_flags));
payload_len += 4;
}