mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
Adjust straggling users of payload field
svn:r250
This commit is contained in:
parent
32a3e704b4
commit
5c514620fc
@ -670,7 +670,7 @@ repeat_connection_package_raw_inbuf:
|
||||
* compressing.
|
||||
* 2)
|
||||
*/
|
||||
len = connection_compress_from_buf(cell.payload,
|
||||
len = connection_compress_from_buf(cell.payload+TOPIC_HEADER_SIZE,
|
||||
CELL_PAYLOAD_SIZE - TOPIC_HEADER_SIZE,
|
||||
conn, Z_SYNC_FLUSH);
|
||||
if (len < 0)
|
||||
@ -684,7 +684,8 @@ repeat_connection_package_raw_inbuf:
|
||||
cell.length = amount_to_process;
|
||||
}
|
||||
|
||||
if(connection_fetch_from_buf(cell.payload, cell.length, conn) < 0)
|
||||
if(connection_fetch_from_buf(cell.payload+TOPIC_HEADER_SIZE,
|
||||
cell.length, conn) < 0)
|
||||
return -1;
|
||||
#endif
|
||||
|
||||
|
@ -153,7 +153,7 @@ int connection_edge_process_data_cell(cell_t *cell, circuit_t *circ, int edge_ty
|
||||
}
|
||||
|
||||
#ifdef USE_ZLIB
|
||||
if(connection_decompress_to_buf(cell->payload,
|
||||
if(connection_decompress_to_buf(cell->payload + TOPIC_HEADER_SIZE,
|
||||
cell->length - TOPIC_HEADER_SIZE,
|
||||
conn, Z_SYNC_FLUSH) < 0) {
|
||||
log(LOG_INFO,"connection_edge_process_data_cell(): write to buf failed. Marking for close.");
|
||||
@ -161,7 +161,7 @@ int connection_edge_process_data_cell(cell_t *cell, circuit_t *circ, int edge_ty
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
if(connection_write_to_buf(cell->payload,
|
||||
if(connection_write_to_buf(cell->payload + TOPIC_HEADER_SIZE,
|
||||
cell->length - TOPIC_HEADER_SIZE, conn) < 0) {
|
||||
conn->marked_for_close = 1;
|
||||
return 0;
|
||||
|
@ -310,7 +310,6 @@ static int onion_process(circuit_t *circ) {
|
||||
int chooselen(double cw)
|
||||
{
|
||||
int len = 2;
|
||||
int retval = 0;
|
||||
uint8_t coin;
|
||||
|
||||
if ((cw < 0) || (cw >= 1)) /* invalid parameter */
|
||||
|
Loading…
Reference in New Issue
Block a user