diff options
| author | Evan Huus <eapache@gmail.com> | 2015-12-02 16:52:35 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-12-03 02:00:18 +0000 |
| commit | cda450ed591d73aab366569eb748659f194e7168 (patch) | |
| tree | eadf9b7c87e66fd8be09788f6eb82ec7aafda85f /epan/conversation.c | |
| parent | de87db6170f68ba6bb7e6859365c16deefc3864d (diff) | |
| download | wireshark-cda450ed591d73aab366569eb748659f194e7168.tar.gz | |
Fix address hashing broken in g4f39c60
We actually have to *use* the return value of the method, which the macro did
for us.
Change-Id: I240ca7e526a18054fe39c6c4ded902998dc2fef0
Reviewed-on: https://code.wireshark.org/review/12389
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index 0f48edc9ec..b6912e7689 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -197,15 +197,15 @@ conversation_hash_exact(gconstpointer v) hash_val = 0; tmp_addr.len = 4; - add_address_to_hash(hash_val, &key->addr1); + hash_val = add_address_to_hash(hash_val, &key->addr1); tmp_addr.data = &key->port1; - add_address_to_hash(hash_val, &tmp_addr); + hash_val = add_address_to_hash(hash_val, &tmp_addr); - add_address_to_hash(hash_val, &key->addr2); + hash_val = add_address_to_hash(hash_val, &key->addr2); tmp_addr.data = &key->port2; - add_address_to_hash(hash_val, &tmp_addr); + hash_val = add_address_to_hash(hash_val, &tmp_addr); hash_val += ( hash_val << 3 ); hash_val ^= ( hash_val >> 11 ); @@ -280,13 +280,13 @@ conversation_hash_no_addr2(gconstpointer v) hash_val = 0; tmp_addr.len = 4; - add_address_to_hash(hash_val, &key->addr1); + hash_val = add_address_to_hash(hash_val, &key->addr1); tmp_addr.data = &key->port1; - add_address_to_hash(hash_val, &tmp_addr); + hash_val = add_address_to_hash(hash_val, &tmp_addr); tmp_addr.data = &key->port2; - add_address_to_hash(hash_val, &tmp_addr); + hash_val = add_address_to_hash(hash_val, &tmp_addr); hash_val += ( hash_val << 3 ); hash_val ^= ( hash_val >> 11 ); @@ -345,12 +345,12 @@ conversation_hash_no_port2(gconstpointer v) hash_val = 0; tmp_addr.len = 4; - add_address_to_hash(hash_val, &key->addr1); + hash_val = add_address_to_hash(hash_val, &key->addr1); tmp_addr.data = &key->port1; - add_address_to_hash(hash_val, &tmp_addr); + hash_val = add_address_to_hash(hash_val, &tmp_addr); - add_address_to_hash(hash_val, &key->addr2); + hash_val = add_address_to_hash(hash_val, &key->addr2); hash_val += ( hash_val << 3 ); hash_val ^= ( hash_val >> 11 ); @@ -409,10 +409,10 @@ conversation_hash_no_addr2_or_port2(gconstpointer v) hash_val = 0; tmp_addr.len = 4; - add_address_to_hash(hash_val, &key->addr1); + hash_val = add_address_to_hash(hash_val, &key->addr1); tmp_addr.data = &key->port1; - add_address_to_hash(hash_val, &tmp_addr); + hash_val = add_address_to_hash(hash_val, &tmp_addr); hash_val += ( hash_val << 3 ); hash_val ^= ( hash_val >> 11 ); |