[tor-commits] [tor/master] Only send begin cell flags when we have some to send

[nickm at torproject.org]

commit 5ee1de65b09e51ed2eea740cfd95ade3abe99e58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 31 22:04:09 2012 -0400

    Only send begin cell flags when we have some to send
---
 src/or/connection_edge.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 2a46529..e1c6938 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;
   }