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 | |
parent | de87db6170f68ba6bb7e6859365c16deefc3864d (diff) |
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>
-rw-r--r-- | asn1/atn-ulcs/packet-atn-ulcs-template.c | 8 | ||||
-rw-r--r-- | epan/conversation.c | 24 | ||||
-rw-r--r-- | epan/conversation_table.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-atn-ulcs.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-netlogon.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-iax2.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-netflow.c | 4 | ||||
-rw-r--r-- | ui/gtk/conversation_hastables_dlg.c | 8 |
8 files changed, 32 insertions, 32 deletions
diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 5b7c04f8d2..b4f0bda6a7 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -511,10 +511,10 @@ atn_conversation_t * find_atn_conversation( guint32 key = 0; guint32 tmp = 0; - add_address_to_hash( tmp, address1); + tmp = add_address_to_hash( tmp, address1); key = (tmp << 16) | clnp_ref1 ; - add_address_to_hash( tmp, address2); + tmp = add_address_to_hash( tmp, address2); key = (tmp << 24) | key ; /* search for atn conversation */ @@ -537,10 +537,10 @@ atn_conversation_t * create_atn_conversation( guint32 key = 0; guint32 tmp = 0; - add_address_to_hash( tmp, address1); + tmp = add_address_to_hash( tmp, address1); key = (tmp << 16) | clnp_ref1 ; - add_address_to_hash( tmp, address2); + tmp = add_address_to_hash( tmp, address2); key = (tmp << 24) | key ; /* search for aircraft entry */ 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 ); diff --git a/epan/conversation_table.c b/epan/conversation_table.c index 974b1e8a4a..a907b5fff8 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -229,9 +229,9 @@ conversation_hash(gconstpointer v) guint hash_val; hash_val = 0; - add_address_to_hash(hash_val, &key->addr1); + hash_val = add_address_to_hash(hash_val, &key->addr1); hash_val += key->port1; - add_address_to_hash(hash_val, &key->addr2); + hash_val = add_address_to_hash(hash_val, &key->addr2); hash_val += key->port2; hash_val ^= key->conv_id; @@ -723,7 +723,7 @@ host_hash(gconstpointer v) guint hash_val; hash_val = 0; - add_address_to_hash(hash_val, &key->myaddress); + hash_val = add_address_to_hash(hash_val, &key->myaddress); hash_val += key->port; return hash_val; } diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index d48118d2b2..cdbaee766b 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -1914,10 +1914,10 @@ atn_conversation_t * find_atn_conversation( guint32 key = 0; guint32 tmp = 0; - add_address_to_hash( tmp, address1); + tmp = add_address_to_hash( tmp, address1); key = (tmp << 16) | clnp_ref1 ; - add_address_to_hash( tmp, address2); + tmp = add_address_to_hash( tmp, address2); key = (tmp << 24) | key ; /* search for atn conversation */ @@ -1940,10 +1940,10 @@ atn_conversation_t * create_atn_conversation( guint32 key = 0; guint32 tmp = 0; - add_address_to_hash( tmp, address1); + tmp = add_address_to_hash( tmp, address1); key = (tmp << 16) | clnp_ref1 ; - add_address_to_hash( tmp, address2); + tmp = add_address_to_hash( tmp, address2); key = (tmp << 24) | key ; /* search for aircraft entry */ diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 2b4632d2ec..6d8f527665 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -605,8 +605,8 @@ netlogon_auth_hash (gconstpointer k) } } - add_address_to_hash(hash_val1, &key1->src); - add_address_to_hash(hash_val1, &key1->dst); + hash_val1 = add_address_to_hash(hash_val1, &key1->src); + hash_val1 = add_address_to_hash(hash_val1, &key1->dst); return hash_val1; } static int diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 5b9a368d22..933381b1d8 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -642,7 +642,7 @@ static guint iax_circuit_hash(gconstpointer v) guint hash_val; hash_val = 0; - add_address_to_hash(hash_val, &key->addr); + hash_val = add_address_to_hash(hash_val, &key->addr); hash_val += (guint)(key->ptype); hash_val += (guint)(key->port); hash_val += (guint)(key->callno); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index a0250e77d3..7a380991e3 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -7335,8 +7335,8 @@ v9_v10_tmplt_table_hash(gconstpointer k) val = tmplt_p->src_id + (tmplt_p->tmplt_id << 9) + tmplt_p->src_port + tmplt_p->dst_port; - add_address_to_hash(val, &tmplt_p->src_addr); - add_address_to_hash(val, &tmplt_p->dst_addr); + val = add_address_to_hash(val, &tmplt_p->src_addr); + val = add_address_to_hash(val, &tmplt_p->dst_addr); return val; } diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c index 88951083fd..1e2df8cfc8 100644 --- a/ui/gtk/conversation_hastables_dlg.c +++ b/ui/gtk/conversation_hastables_dlg.c @@ -57,9 +57,9 @@ conversation_hash_exact(gconstpointer v) hash_val = 0; #if 0 - add_address_to_hash(hash_val, &key->addr1); + hash_val = add_address_to_hash(hash_val, &key->addr1); hash_val += key->port1; - add_address_to_hash(hash_val, &key->addr2); + hash_val = add_address_to_hash(hash_val, &key->addr2); hash_val += key->port2; return hash_val; @@ -106,9 +106,9 @@ conversation_hash_exact_old(gconstpointer v) guint hash_val; hash_val = 0; - add_address_to_hash(hash_val, &key->addr1); + hash_val = add_address_to_hash(hash_val, &key->addr1); hash_val += key->port1; - add_address_to_hash(hash_val, &key->addr2); + hash_val = add_address_to_hash(hash_val, &key->addr2); hash_val += key->port2; return hash_val; |