commit e4d1187584038593a75140d9a8e47024c9eba04c Author: Roger Dingledine arma@torproject.org Date: Wed Jul 18 21:00:27 2018 -0400

refactor logic to decide how much to package from inbuf

no actual changes in behavior --- src/core/or/relay.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 5197ee613..05fee57a1 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -2102,14 +2102,15 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, if (!bytes_to_process) return 0;

- if (!package_partial && bytes_to_process < RELAY_PAYLOAD_SIZE) - return 0; + length = RELAY_PAYLOAD_SIZE;

- if (bytes_to_process > RELAY_PAYLOAD_SIZE) { - length = RELAY_PAYLOAD_SIZE; - } else { - length = bytes_to_process; + if (bytes_to_process < length) { /* not a full payload available */ + if (package_partial) + length = bytes_to_process; /* just take whatever's available now */ + else + return 0; /* nothing to do until we have a full payload */ } + stats_n_data_bytes_packaged += length; stats_n_data_cells_packaged += 1;