torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename circ_id_t to uint16_t for code clarity

Browse Source 
change message when using non-recommended tor version


svn:r954
This commit is contained in:
Roger Dingledine
2003-12-19 19:55:02 +00:00
parent 45a66c6955
commit a5e6ec244f
5 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/cpuworker.c
+8 -8
View File
@@ -30,18 +30,18 @@ int connection_cpu_finished_flushing(connection_t *conn) {
return 0;
}
static void tag_pack(char *tag, uint32_t addr, uint16_t port, circ_id_t circ_id) {
*(uint32_t *)tag = addr;
static void tag_pack(char *tag, uint32_t addr, uint16_t port, uint16_t circ_id) {
*(uint32_t *)tag = addr;
*(uint16_t *)(tag+4) = port;
*(circ_id_t *)(tag+6) = circ_id;
*(uint16_t *)(tag+6) = circ_id;
}
static void tag_unpack(char *tag, uint32_t *addr, uint16_t *port, circ_id_t *circ_id) {
static void tag_unpack(char *tag, uint32_t *addr, uint16_t *port, uint16_t *circ_id) {
struct in_addr in;
*addr = *(uint32_t *)tag;
*port = *(uint16_t *)(tag+4);
*circ_id = *(circ_id_t *)(tag+6);
*addr = *(uint32_t *)tag;
*port = *(uint16_t *)(tag+4);
*circ_id = *(uint16_t *)(tag+6);
in.s_addr = htonl(*addr);
log_fn(LOG_DEBUG,"onion was from %s:%d, circ_id %d.", inet_ntoa(in), *port, *circ_id);
@@ -51,7 +51,7 @@ int connection_cpu_process_inbuf(connection_t *conn) {
unsigned char buf[LEN_ONION_RESPONSE];
uint32_t addr;
uint16_t port;
circ_id_t circ_id;
uint16_t circ_id;
connection_t *p_conn;
circuit_t *circ;