commit 00d4889e52789fdce2bbe376b932392df6929d55 Author: Steven Cheung steven.cheung@sri.com Date: Mon Apr 2 12:15:29 2012 -0700
removed a noisy debug statement --- src/steg/http.cc | 6 +++++- src/steg/payloads.cc | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/steg/http.cc b/src/steg/http.cc index a4fd790..a41afb8 100644 --- a/src/steg/http.cc +++ b/src/steg/http.cc @@ -236,7 +236,11 @@ http_steg_t::transmit_room(size_t pref, size_t lo, size_t hi) } }
- log_assert(hi >= lo); + if (hi < lo) + log_abort("hi<lo: client=%d type=%d hi=%ld lo=%ld", + config->is_clientside, type, + (unsigned long)hi, (unsigned long)lo); + return clamp(pref + rng_range_geom(hi - lo, 8), lo, hi); }
diff --git a/src/steg/payloads.cc b/src/steg/payloads.cc index 8a766c5..f5f35b8 100644 --- a/src/steg/payloads.cc +++ b/src/steg/payloads.cc @@ -1050,17 +1050,15 @@ unsigned int capacityPDF (char* buf, int len) {
while (bp < (buf+len)) { streamStart = strInBinary("stream", 6, bp, (buf+len)-bp); - // streamStart = strstr(bp, "stream"); if (streamStart == NULL) break; bp = streamStart+6; streamEnd = strInBinary("endstream", 9, bp, (buf+len)-bp); - // streamEnd = strstr(bp, "endstream"); if (streamEnd == NULL) break; // count the number of char between streamStart+6 and streamEnd size = streamEnd - (streamStart+6) - 2; // 2 for \r\n before streamEnd if (size > 0) { cnt = cnt + size; - log_debug("capacity of pdf increase by %d", size); + // log_debug("capacity of pdf increase by %d", size); } bp += 9; }
tor-commits@lists.torproject.org