diff options
| author | teor <teor2345@gmail.com> | 2015-01-10 16:34:10 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2015-01-10 16:34:10 +1100 |
| commit | c200ab46b85cece87a4bcdbaacd41bc6539d1671 (patch) | |
| tree | f17e2c59dd076a73cce9787ecad3f8eeec88f705 /src/or/connection.c | |
| parent | fd7e9e9030cee9d8e863cea3f3f90226ae66fdfe (diff) | |
| parent | 6a9cae2e1dafb756b30fda541e8b5d68cfd45f89 (diff) | |
| download | tor-c200ab46b85cece87a4bcdbaacd41bc6539d1671.tar.gz tor-c200ab46b85cece87a4bcdbaacd41bc6539d1671.zip | |
Merge branch 'bug14001-clang-warning' into bug13111-empty-key-files-fn-empty
Conflicts:
src/or/router.c
Choose newer comment.
Merge changes to comment and function invocation.
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index c9c371c001..ce3fda89c1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3839,6 +3839,8 @@ connection_handle_write_impl(connection_t *conn, int force) tor_tls_get_n_raw_bytes(or_conn->tls, &n_read, &n_written); log_debug(LD_GENERAL, "After TLS write of %d: %ld read, %ld written", result, (long)n_read, (long)n_written); + or_conn->bytes_xmitted += result; + or_conn->bytes_xmitted_by_tls += n_written; /* So we notice bytes were written even on error */ /* XXXX024 This cast is safe since we can never write INT_MAX bytes in a * single set of TLS operations. But it looks kinda ugly. If we refactor |