nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

more consistently use [gs]et_uint8

Browse Source
This commit is contained in:
Roger Dingledine 2012-10-02 20:39:58 -04:00
parent a80d8e09d3
commit 57b13ad5cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection_or.c
View File

@ -296,7 +296,7 @@ cell_pack(packed_cell_t *dst, const cell_t *src)
{ {
char *dest = dst->body; char *dest = dst->body;
set_uint16(dest, htons(src->circ_id)); set_uint16(dest, htons(src->circ_id));
*(uint8_t*)(dest+2) = src->command; set_uint8(dest+2, src->command);
memcpy(dest+3, src->payload, CELL_PAYLOAD_SIZE); memcpy(dest+3, src->payload, CELL_PAYLOAD_SIZE);
} }
@ -307,7 +307,7 @@ static void
cell_unpack(cell_t *dest, const char *src) cell_unpack(cell_t *dest, const char *src)
{ {
dest->circ_id = ntohs(get_uint16(src)); dest->circ_id = ntohs(get_uint16(src));
dest->command = *(uint8_t*)(src+2); dest->command = get_uint8(src+2);
memcpy(dest->payload, src+3, CELL_PAYLOAD_SIZE); memcpy(dest->payload, src+3, CELL_PAYLOAD_SIZE);
} }

2
src/or/relay.c
View File

@ -1231,7 +1231,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
return 0; return 0;
} }
if (circ->n_conn) { if (circ->n_conn) {
uint8_t trunc_reason = *(uint8_t*)(cell->payload + RELAY_HEADER_SIZE); uint8_t trunc_reason = get_uint8(cell->payload + RELAY_HEADER_SIZE);
circuit_clear_cell_queue(circ, circ->n_conn); circuit_clear_cell_queue(circ, circ->n_conn);
connection_or_send_destroy(circ->n_circ_id, circ->n_conn, connection_or_send_destroy(circ->n_circ_id, circ->n_conn,
trunc_reason); trunc_reason);