diff options
Diffstat (limited to 'src/core/or/circuitmux.c')
-rw-r--r-- | src/core/or/circuitmux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index 88f9ac7923..e7309553c4 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -216,9 +216,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)); } /* Declare the struct chanid_circid_muxinfo_map type */ @@ -1361,4 +1362,3 @@ circuitmux_compare_muxes, (circuitmux_t *cmux_1, circuitmux_t *cmux_2)) return 0; } } - |