From: Ian Goldberg <iang@cs.uwaterloo.ca>
Date: Thu, 21 Jul 2011 13:49:00 +0000 (-0400)
Subject: Improve log messages for optimistic data retry
X-Git-Tag: tor-0.2.3.3-alpha~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2bd0397ff2388a6e5a09e0cb8253f4dccf63e21;p=thirdparty%2Ftor.git

Improve log messages for optimistic data retry
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index a7e3c1656b..4d3e25458e 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2441,8 +2441,10 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn)
   if ((connection_get_inbuf_len(TO_CONN(ap_conn)) ||
        ap_conn->sending_optimistic_data) &&
       connection_ap_supports_optimistic_data(ap_conn)) {
-    log_info(LD_APP, "Sending up to %ld bytes of queued-up data",
-             connection_get_inbuf_len(TO_CONN(ap_conn)));
+    log_info(LD_APP, "Sending up to %ld + %ld bytes of queued-up data",
+             connection_get_inbuf_len(TO_CONN(ap_conn)),
+	     ap_conn->sending_optimistic_data ?
+		generic_buffer_len(ap_conn->sending_optimistic_data) : 0);
     if (connection_edge_package_raw_inbuf(ap_conn, 1, NULL) < 0) {
       connection_mark_for_close(TO_CONN(ap_conn));
     }