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

Merge branch 'maint-0.4.5' into maint-0.4.6

Browse Source
This commit is contained in:
Nick Mathewson
2021-06-10 08:42:15 -04:00
parent 1d11675adb 1da8621c0a
commit 69bd4a8a2d
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/or/circuitmux.c
+4 -3
View File
@@ -169,9 +169,10 @@ chanid_circid_entries_eq(chanid_circid_muxinfo_t *a,
static inline unsigned int
chanid_circid_entry_hash(chanid_circid_muxinfo_t *a)
{
return (((unsigned int)(a->circ_id) << 8) ^
((unsigned int)((a->chan_id >> 32) & 0xffffffff)) ^
((unsigned int)(a->chan_id & 0xffffffff)));
uint8_t data[8 + 4];
set_uint64(data, a->chan_id);
set_uint32(data + 8, a->circ_id);
return (unsigned) siphash24g(data, sizeof(data));
}
/* Emit a bunch of hash table stuff */