diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
| commit | 5c45a333c3cdfc4c7a817425a1c3ae88085c389b (patch) | |
| tree | f6a7db91df7b7fc7cb0ce2e31bc9d8bcde549128 /src/or/buffers.h | |
| parent | 35115496511f64c08849a039c926910739467169 (diff) | |
| parent | 647248729fa65f0e51d062e2af8f4e8b38592bf5 (diff) | |
| download | tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar.gz | |
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/or.h
The conflicts were all pretty trivial.
Diffstat (limited to 'src/or/buffers.h')
| -rw-r--r-- | src/or/buffers.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/buffers.h b/src/or/buffers.h index c947f0ba9..a93f0a846 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -25,6 +25,9 @@ size_t buf_datalen(const buf_t *buf); size_t buf_allocation(const buf_t *buf); size_t buf_slack(const buf_t *buf); +uint32_t buf_get_oldest_chunk_timestamp(const buf_t *buf, uint32_t now); +size_t buf_get_total_allocation(void); + int read_to_buf(tor_socket_t s, size_t at_most, buf_t *buf, int *reached_eof, int *socket_error); int read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf); |