nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

More approx_time() calls. Noted by forest.

Browse Source 
svn:r17702
This commit is contained in:
Nick Mathewson 2008-12-19 18:51:35 +00:00
parent 60d6175906
commit 8c90a4b7ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/connection_or.c
View File

@ -285,12 +285,12 @@ int
connection_or_flushed_some(or_connection_t *conn) connection_or_flushed_some(or_connection_t *conn)
{ {
size_t datalen = buf_datalen(conn->_base.outbuf); size_t datalen = buf_datalen(conn->_base.outbuf);
time_t now = time(NULL);
/* If we're under the low water mark, add cells until we're just over the /* If we're under the low water mark, add cells until we're just over the
* high water mark. */ * high water mark. */
if (datalen < OR_CONN_LOWWATER) { if (datalen < OR_CONN_LOWWATER) {
ssize_t n = (OR_CONN_HIGHWATER - datalen + CELL_NETWORK_SIZE-1) ssize_t n = (OR_CONN_HIGHWATER - datalen + CELL_NETWORK_SIZE-1)
/ CELL_NETWORK_SIZE; / CELL_NETWORK_SIZE;
time_t now = approx_time();
while (conn->active_circuits && n > 0) { while (conn->active_circuits && n > 0) {
int flushed; int flushed;
flushed = connection_or_flush_from_first_active_circuit(conn, 1, now); flushed = connection_or_flush_from_first_active_circuit(conn, 1, now);
@ -962,7 +962,7 @@ connection_or_write_cell_to_buf(const cell_t *cell, or_connection_t *conn)
connection_write_to_buf(networkcell.body, CELL_NETWORK_SIZE, TO_CONN(conn)); connection_write_to_buf(networkcell.body, CELL_NETWORK_SIZE, TO_CONN(conn));
if (cell->command != CELL_PADDING) if (cell->command != CELL_PADDING)
conn->timestamp_last_added_nonpadding = time(NULL); conn->timestamp_last_added_nonpadding = approx_time();
} }
/** Pack a variable-length <b>cell</b> into wire-format, and write it onto /** Pack a variable-length <b>cell</b> into wire-format, and write it onto
@ -980,7 +980,7 @@ connection_or_write_var_cell_to_buf(const var_cell_t *cell,
connection_write_to_buf(hdr, sizeof(hdr), TO_CONN(conn)); connection_write_to_buf(hdr, sizeof(hdr), TO_CONN(conn));
connection_write_to_buf(cell->payload, cell->payload_len, TO_CONN(conn)); connection_write_to_buf(cell->payload, cell->payload_len, TO_CONN(conn));
if (cell->command != CELL_PADDING) if (cell->command != CELL_PADDING)
conn->timestamp_last_added_nonpadding = time(NULL); conn->timestamp_last_added_nonpadding = approx_time();
} }
/** See whether there's a variable-length cell waiting on <b>conn</b>'s /** See whether there's a variable-length cell waiting on <b>conn</b>'s