]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Only send begin cell flags when we have some to send
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Nov 2012 02:04:09 +0000 (22:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2012 04:16:24 +0000 (23:16 -0500)
src/or/connection_edge.c

index 2a46529f011ce75d93474f0ea7e74823cbd95aee..e1c6938a93171fb5a725695ffd300c27d597a80d 100644 (file)
@@ -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;
   }