diff options
| -rw-r--r-- | epan/address.h | 18 | ||||
| -rw-r--r-- | epan/conversation.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-iax2.c | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/epan/address.h b/epan/address.h index 11f19d269e..bafeb2a590 100644 --- a/epan/address.h +++ b/epan/address.h @@ -123,16 +123,16 @@ typedef struct _address { } /* - * Hash an address into a hash value. + * Hash an address into a hash value (which must already have been set). */ -#define HASH_ADDRESS(hash_val, addr) { \ - const guint8 *HASH_ADDRESS_data; \ - int HASH_ADDRESS_index; \ - HASH_ADDRESS_data = (addr).data; \ - for (HASH_ADDRESS_index = 0; \ - HASH_ADDRESS_index < (addr).len; - HASH_ADDRESS_index++) \ - hash_val += addrdata[HASH_ADDRESS_index]; \ +#define ADD_ADDRESS_TO_HASH(hash_val, addr) { \ + const guint8 *ADD_ADDRESS_TO_HASH_data; \ + int ADD_ADDRESS_TO_HASH_index; \ + ADD_ADDRESS_TO_HASH_data = (addr).data; \ + for (ADD_ADDRESS_TO_HASH_index = 0; \ + ADD_ADDRESS_TO_HASH_index < (addr).len; + ADD_ADDRESS_TO_HASH_index++) \ + hash_val += addrdata[ADD_ADDRESS_TO_HASH_index]; \ } /* Types of port numbers Wireshark knows about. */ diff --git a/epan/conversation.c b/epan/conversation.c index 42c6ddeb5b..065c4f2bb0 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -189,9 +189,9 @@ conversation_hash_exact(gconstpointer v) guint hash_val; hash_val = 0; - HASH_ADDRESS(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, key->addr1); hash_val += key->port1; - HASH_ADDRESS(hash_val, key->addr2); + ADD_ADDRESS_TO_HASH(hash_val, key->addr2); hash_val += key->port2; return hash_val; @@ -260,7 +260,7 @@ conversation_hash_no_addr2(gconstpointer v) guint hash_val; hash_val = 0; - HASH_ADDRESS(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, key->addr1); hash_val += key->port1; hash_val += key->port2; @@ -314,9 +314,9 @@ conversation_hash_no_port2(gconstpointer v) guint hash_val; hash_val = 0; - HASH_ADDRESS(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, key->addr1); hash_val += key->port1; - HASH_ADDRESS(hash_val, key->addr2); + ADD_ADDRESS_TO_HASH(hash_val, key->addr2); return hash_val; } @@ -368,7 +368,7 @@ conversation_hash_no_addr2_or_port2(gconstpointer v) guint hash_val; hash_val = 0; - HASH_ADDRESS(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, key->addr1); hash_val += key->port1; return hash_val; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index ae020de79e..706ca0b89f 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -477,7 +477,7 @@ static guint iax_circuit_hash (gconstpointer v) int i; hash_val = 0; - HASH_ADDRESS(hash_val, key->addr); + ADD_ADDRESS_TO_HASH(hash_val, key->addr); hash_val += (guint)(key->ptype); hash_val += (guint)(key->port); hash_val += (guint)(key->callno); |