More ADDRESS macro to address function conversions.

Replace remaining calls to SET_ADDRESS, CMP_ADDRESS, ADDRESSES_EQUAL,
COPY_ADDRESS, and COPY_ADDRESS_SHALLOW with their lower-case
equivalents.

Replace all ADD_ADDRESS_TO_HASH calls with add_address_to_hash.

Change-Id: I4cff857d7a84085abe0bccd52d2605d2a468bf6f
Reviewed-on: https://code.wireshark.org/review/11229
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

16 files changed, 65 insertions, 65 deletions

diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c
index 6bf411ffab..5b7c04f8d2 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);
+    add_address_to_hash( tmp, address1);
     key = (tmp << 16) | clnp_ref1 ;
 
-    ADD_ADDRESS_TO_HASH( tmp, address2);
+    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);
+    add_address_to_hash( tmp, address1);
     key = (tmp << 16) | clnp_ref1 ;
 
-    ADD_ADDRESS_TO_HASH( tmp, address2);
+    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 1b9c95357e..ab5cd5e312 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -199,15 +199,15 @@ conversation_hash_exact(gconstpointer v)
 	hash_val = 0;
 	tmp_addr.len  = 4;
 
-	ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+	add_address_to_hash(hash_val, &key->addr1);
 
 	tmp_addr.data = &key->port1;
-	ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+	add_address_to_hash(hash_val, &tmp_addr);
 
-	ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+	add_address_to_hash(hash_val, &key->addr2);
 
 	tmp_addr.data = &key->port2;
-	ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+	add_address_to_hash(hash_val, &tmp_addr);
 
 	hash_val += ( hash_val << 3 );
 	hash_val ^= ( hash_val >> 11 );
@@ -282,13 +282,13 @@ conversation_hash_no_addr2(gconstpointer v)
 	hash_val = 0;
 	tmp_addr.len  = 4;
 
-	ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+	add_address_to_hash(hash_val, &key->addr1);
 
 	tmp_addr.data = &key->port1;
-	ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+	add_address_to_hash(hash_val, &tmp_addr);
 
 	tmp_addr.data = &key->port2;
-	ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+	add_address_to_hash(hash_val, &tmp_addr);
 
 	hash_val += ( hash_val << 3 );
 	hash_val ^= ( hash_val >> 11 );
@@ -347,12 +347,12 @@ conversation_hash_no_port2(gconstpointer v)
 	hash_val = 0;
 	tmp_addr.len  = 4;
 
-	ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+	add_address_to_hash(hash_val, &key->addr1);
 
 	tmp_addr.data = &key->port1;
-	ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+	add_address_to_hash(hash_val, &tmp_addr);
 
-	ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+	add_address_to_hash(hash_val, &key->addr2);
 
 	hash_val += ( hash_val << 3 );
 	hash_val ^= ( hash_val >> 11 );
@@ -411,10 +411,10 @@ conversation_hash_no_addr2_or_port2(gconstpointer v)
 	hash_val = 0;
 	tmp_addr.len  = 4;
 
-	ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+	add_address_to_hash(hash_val, &key->addr1);
 
 	tmp_addr.data = &key->port1;
-	ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+	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 b342d3fb5c..974b1e8a4a 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);
+    add_address_to_hash(hash_val, &key->addr1);
     hash_val += key->port1;
-    ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+    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);
+    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 c67c18c0e0..d48118d2b2 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);
+    add_address_to_hash( tmp, address1);
     key = (tmp << 16) | clnp_ref1 ;
 
-    ADD_ADDRESS_TO_HASH( tmp, address2);
+    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);
+    add_address_to_hash( tmp, address1);
     key = (tmp << 16) | clnp_ref1 ;
 
-    ADD_ADDRESS_TO_HASH( tmp, address2);
+    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 f44f3c1b33..2b4632d2ec 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);
+    add_address_to_hash(hash_val1, &key1->src);
+    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 0f362f986a..7b981f99f6 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -640,7 +640,7 @@ static guint iax_circuit_hash(gconstpointer v)
   guint                  hash_val;
 
   hash_val = 0;
-  ADD_ADDRESS_TO_HASH(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);
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 1c9a5774f1..e40dc439cc 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -7334,8 +7334,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);
+    add_address_to_hash(val, &tmplt_p->src_addr);
+    add_address_to_hash(val, &tmplt_p->dst_addr);
 
     return val;
 }
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index 2dae3da8f6..e7da2a2eec 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -157,9 +157,9 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   col_clear(pinfo->cinfo, COL_INFO);
 
   TVB_SET_ADDRESS (&pinfo->dl_src, AT_ETHER, tvb, 6, 6);
-  COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src);
+  copy_address_shallow(&pinfo->src, &pinfo->dl_src);
   TVB_SET_ADDRESS (&pinfo->dl_dst, AT_ETHER, tvb, 0, 6);
-  COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst);
+  copy_address_shallow(&pinfo->dst, &pinfo->dl_dst);
 
   if (tree)
     {
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 3016b4e3f8..69ebaceb97 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -2676,8 +2676,8 @@ pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar)
         proto_tree *sub_tree;
         address   controllermac_addr, devicemac_addr;
 
-        SET_ADDRESS(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
-        SET_ADDRESS(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
+        set_address(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
+        set_address(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
 
         sub_tree = proto_tree_add_subtree_format(tree, tvb, 0, 0, ett_pn_io_ar_info, &sub_item,
             "ARUUID:%s ContrMAC:%s ContrAlRef:0x%x DevMAC:%s DevAlRef:0x%x InCR:0x%x OutCR=0x%x",
@@ -9683,8 +9683,8 @@ pn_io_ar_conv_filter(packet_info *pinfo)
         return NULL;
     }
 
-    SET_ADDRESS(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
-    SET_ADDRESS(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
+    set_address(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
+    set_address(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
 
     guid_str = guid_to_str(wmem_packet_scope(), (const e_guid_t*) &ar->aruuid);
     buf = g_strdup_printf(
@@ -9710,8 +9710,8 @@ pn_io_ar_conv_data_filter(packet_info *pinfo)
         return NULL;
     }
 
-    SET_ADDRESS(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
-    SET_ADDRESS(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
+    set_address(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
+    set_address(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
 
     controllermac_str = address_to_str(wmem_packet_scope(), &controllermac_addr);
     devicemac_str = address_to_str(wmem_packet_scope(), &devicemac_addr);
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index adf1882042..94de1f9ae2 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -425,7 +425,7 @@ cba_object_dump(void)
 
     for(pdevs = cba_pdevs; pdevs != NULL; pdevs = g_list_next(pdevs)) {
         pdev = pdevs->data;
-        SET_ADDRESS(&addr, AT_IPv4, 4, pdev->ip);
+        set_address(&addr, AT_IPv4, 4, pdev->ip);
         g_warning("PDev #%5u: %s IFs:%u", pdev->first_packet, address_to_str(wmem_packet_scope(), &addr),
             pdev->object ? g_list_length(pdev->object->interfaces) : 0);
 
@@ -641,7 +641,7 @@ cba_acco_add(packet_info *pinfo, const char *acco)
         return NULL;
     }
 
-    SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+    set_address(&addr, AT_IPv4, 4, &ip);
     pdev = cba_pdev_add(pinfo, &addr);
     delim++;
 
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index 4bb89bbec9..df681aa603 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -439,17 +439,17 @@ dissect_PNDCP_Suboption_IP(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
         /* IPAddress */
         offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_ip, &ip);
-        SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+        set_address(&addr, AT_IPv4, 4, &ip);
         proto_item_append_text(block_item, ", IP: %s", address_to_str(wmem_packet_scope(), &addr));
 
         /* Subnetmask */
         offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_subnetmask, &ip);
-        SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+        set_address(&addr, AT_IPv4, 4, &ip);
         proto_item_append_text(block_item, ", Subnet: %s", address_to_str(wmem_packet_scope(), &addr));
 
         /* StandardGateway */
         offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_standard_gateway, &ip);
-        SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+        set_address(&addr, AT_IPv4, 4, &ip);
         proto_item_append_text(block_item, ", Gateway: %s", address_to_str(wmem_packet_scope(), &addr));
         break;
     default:
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index a509b63b15..7858f78ee4 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -231,8 +231,8 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree,void *data _U_
    uinfo->set_termid = -1;
    uinfo->string_data = NULL;
    uinfo->key_buffer = NULL;
-   SET_ADDRESS(&uinfo->it_ip, AT_NONE, 0, NULL);
-   SET_ADDRESS(&uinfo->ni_ip, AT_NONE, 0, NULL);
+   set_address(&uinfo->it_ip, AT_NONE, 0, NULL);
+   set_address(&uinfo->ni_ip, AT_NONE, 0, NULL);
    uinfo->it_port = 0;
 
    offset+=4;
@@ -288,15 +288,15 @@ dissect_payload(proto_tree *overall_unistim_tree,tvbuff_t *tvb, gint offset, pac
    /*UNISTIM only so no term id but further payload work*/
          /* Collect info for tap */
          /* If no term id then packet sourced from NI */
-         COPY_ADDRESS(&(uinfo->ni_ip), &(pinfo->src));
-         COPY_ADDRESS(&(uinfo->it_ip), &(pinfo->dst));
+         copy_address(&(uinfo->ni_ip), &(pinfo->src));
+         copy_address(&(uinfo->it_ip), &(pinfo->dst));
          uinfo->it_port = pinfo->destport;
          break;
       case 0x02:
    /*UNISTIM with term id*/
          /* Termid packs are always sourced from the it, so collect relevant infos */
-         COPY_ADDRESS(&(uinfo->ni_ip),&(pinfo->dst));
-         COPY_ADDRESS(&(uinfo->it_ip),&(pinfo->src));
+         copy_address(&(uinfo->ni_ip),&(pinfo->dst));
+         copy_address(&(uinfo->it_ip),&(pinfo->src));
          uinfo->it_port = pinfo->srcport;
          uinfo->termid = tvb_get_ntohl(tvb,offset);
 
@@ -2314,7 +2314,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
                guint16 far_port;
 
                far_ip_addr = tvb_get_ipv4(tvb, offset-4);
-               SET_ADDRESS(&far_addr, AT_IPv4, 4, &far_ip_addr);
+               set_address(&far_addr, AT_IPv4, 4, &far_ip_addr);
 
                far_port = tvb_get_ntohs(tvb, offset-8);
                rtp_add_address(pinfo, &far_addr, far_port, 0, "UNISTIM", pinfo->fd->num, FALSE, NULL);
diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c
index 9fc792419e..621ef44220 100644
--- a/plugins/wimax/packet-wmx.c
+++ b/plugins/wimax/packet-wmx.c
@@ -267,7 +267,7 @@ gboolean is_down_link(packet_info *pinfo)
 	if (pinfo->p2p_dir == P2P_DIR_RECV)
 		return TRUE;
 	if (pinfo->p2p_dir == P2P_DIR_UNKNOWN)
-		if(bs_address.len && !CMP_ADDRESS(&bs_address, &pinfo->src))
+		if(bs_address.len && !cmp_address(&bs_address, &pinfo->src))
 			return TRUE;
 	return FALSE;
 }
diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c
index afa3d19a28..2e9d6d213e 100644
--- a/plugins/wimax/wimax_fch_decoder.c
+++ b/plugins/wimax/wimax_fch_decoder.c
@@ -106,7 +106,7 @@ static void dissect_wimax_fch_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
 
 	/* save the base station address (once) */
 	if(!bs_address.len)
-		COPY_ADDRESS(&bs_address, &(pinfo->src));
+		copy_address(&bs_address, &(pinfo->src));
 	/* update the info column */
 	col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "FCH");
 	if (tree)
diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c
index 9c90694ece..88951083fd 100644
--- a/ui/gtk/conversation_hastables_dlg.c
+++ b/ui/gtk/conversation_hastables_dlg.c
@@ -53,41 +53,41 @@ conversation_hash_exact(gconstpointer v)
     const conversation_key *key = (const conversation_key *)v;
     guint hash_val;
     int i;
-    const guint8 *ADD_ADDRESS_TO_HASH_data;
+    const guint8 *add_address_to_hash_data;
 
     hash_val = 0;
 #if 0
-    ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+    add_address_to_hash(hash_val, &key->addr1);
     hash_val += key->port1;
-    ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+    add_address_to_hash(hash_val, &key->addr2);
     hash_val += key->port2;
 
     return hash_val;
 #endif
     for ( i = 0; i < key->addr1.len; i++ ) {
-        ADD_ADDRESS_TO_HASH_data = (const guint8 *)((&key->addr1)->data);
-        hash_val += ADD_ADDRESS_TO_HASH_data[i];
+        add_address_to_hash_data = (const guint8 *)((&key->addr1)->data);
+        hash_val += add_address_to_hash_data[i];
         hash_val += ( hash_val << 10 );
         hash_val ^= ( hash_val >> 6 );
     }
 
     for ( i = 0; i < 4; i++ ) {
-        ADD_ADDRESS_TO_HASH_data = (const guint8 *)(&key->port1);
-        hash_val += ADD_ADDRESS_TO_HASH_data[i];
+        add_address_to_hash_data = (const guint8 *)(&key->port1);
+        hash_val += add_address_to_hash_data[i];
         hash_val += ( hash_val << 10 );
         hash_val ^= ( hash_val >> 6 );
     }
 
     for ( i = 0; i < key->addr2.len; i++ ) {
-        ADD_ADDRESS_TO_HASH_data = (const guint8 *)((&key->addr2)->data);
-        hash_val += ADD_ADDRESS_TO_HASH_data[i];
+        add_address_to_hash_data = (const guint8 *)((&key->addr2)->data);
+        hash_val += add_address_to_hash_data[i];
         hash_val += ( hash_val << 10 );
         hash_val ^= ( hash_val >> 6 );
     }
 
     for ( i = 0; i < 4; i++ ) {
-        ADD_ADDRESS_TO_HASH_data = (const guint8 *)(&key->port2);
-        hash_val += ADD_ADDRESS_TO_HASH_data[i];
+        add_address_to_hash_data = (const guint8 *)(&key->port2);
+        hash_val += add_address_to_hash_data[i];
         hash_val += ( hash_val << 10 );
         hash_val ^= ( hash_val >> 6 );
     }
@@ -106,9 +106,9 @@ conversation_hash_exact_old(gconstpointer v)
     guint hash_val;
 
     hash_val = 0;
-    ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+    add_address_to_hash(hash_val, &key->addr1);
     hash_val += key->port1;
-    ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+    add_address_to_hash(hash_val, &key->addr2);
     hash_val += key->port2;
 
     return hash_val;
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 0e4e82d9ea..0a630276b4 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -3160,7 +3160,7 @@ unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e
                 }
             } else {
                 /* If no term id use ips / port to find entry */
-                if(addresses_equal(&tmp_unistim_info->it_ip, &pinfo->dst) && ADDRESSES_EQUAL(&tmp_unistim_info->ni_ip,&pinfo->src) && (tmp_unistim_info->it_port == pinfo->destport)) {
+                if(addresses_equal(&tmp_unistim_info->it_ip, &pinfo->dst) && addresses_equal(&tmp_unistim_info->ni_ip,&pinfo->src) && (tmp_unistim_info->it_port == pinfo->destport)) {
                     if(tmp_listinfo->call_state == VOIP_COMPLETED || tmp_listinfo->call_state == VOIP_UNKNOWN) {
                         /* Do nothing previous call */
                     } else {
@@ -3168,7 +3168,7 @@ unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e
                         break;
                     }
                 }
-                else if(addresses_equal(&tmp_unistim_info->it_ip, &pinfo->src) && ADDRESSES_EQUAL(&tmp_unistim_info->ni_ip,&pinfo->dst) && (tmp_unistim_info->it_port == pinfo->srcport)) {
+                else if(addresses_equal(&tmp_unistim_info->it_ip, &pinfo->src) && addresses_equal(&tmp_unistim_info->ni_ip,&pinfo->dst) && (tmp_unistim_info->it_port == pinfo->srcport)) {
                     if(tmp_listinfo->call_state == VOIP_COMPLETED || tmp_listinfo->call_state == VOIP_UNKNOWN) {
                         /* Do nothing, it ain't our call.. */
                     } else {