Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.

Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>

4 files changed, 55 insertions, 47 deletions

diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index dbdd771c2a..53ca996442 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -354,28 +354,28 @@ cba_build_color_filter(packet_info *pinfo)
         switch(GPOINTER_TO_UINT(profinet_type)) {
         case 1:
             return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 0)",
-                ip_to_str( (const guint8 *)pinfo->net_dst.data),
-                ip_to_str( (const guint8 *)pinfo->net_src.data),
-                ip_to_str( (const guint8 *)pinfo->net_src.data),
-                ip_to_str( (const guint8 *)pinfo->net_dst.data));
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst),
+                address_to_str(wmem_packet_scope(), &pinfo->net_src),
+                address_to_str(wmem_packet_scope(), &pinfo->net_src),
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst));
         case 2:
             return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.dcom == 0)",
-                ip_to_str( (const guint8 *)pinfo->net_src.data),
-                ip_to_str( (const guint8 *)pinfo->net_dst.data),
-                ip_to_str( (const guint8 *)pinfo->net_dst.data),
-                ip_to_str( (const guint8 *)pinfo->net_src.data));
+                address_to_str(wmem_packet_scope(), &pinfo->net_src),
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst),
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst),
+                address_to_str(wmem_packet_scope(), &pinfo->net_src));
         case 3:
             return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.srt == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.srt == 0)",
-                ip_to_str( (const guint8 *)pinfo->net_dst.data),
-                ip_to_str( (const guint8 *)pinfo->net_src.data),
-                ip_to_str( (const guint8 *)pinfo->net_src.data),
-                ip_to_str( (const guint8 *)pinfo->net_dst.data));
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst),
+                address_to_str(wmem_packet_scope(), &pinfo->net_src),
+                address_to_str(wmem_packet_scope(), &pinfo->net_src),
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst));
         case 4:
             return g_strdup_printf("(ip.src eq %s and ip.dst eq %s and cba.acco.srt == 1) || (ip.src eq %s and ip.dst eq %s and cba.acco.srt == 0)",
-                ip_to_str( (const guint8 *)pinfo->net_src.data),
-                ip_to_str( (const guint8 *)pinfo->net_dst.data),
-                ip_to_str( (const guint8 *)pinfo->net_dst.data),
-                ip_to_str( (const guint8 *)pinfo->net_src.data));
+                address_to_str(wmem_packet_scope(), &pinfo->net_src),
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst),
+                address_to_str(wmem_packet_scope(), &pinfo->net_dst),
+                address_to_str(wmem_packet_scope(), &pinfo->net_src));
         default:
             return NULL;
         }
@@ -420,11 +420,13 @@ cba_object_dump(void)
     cba_pdev_t  *pdev;
     cba_ldev_t  *ldev;
     cba_frame_t *frame;
+    address     addr;
 
 
     for(pdevs = cba_pdevs; pdevs != NULL; pdevs = g_list_next(pdevs)) {
         pdev = pdevs->data;
-        g_warning("PDev #%5u: %s IFs:%u", pdev->first_packet, ip_to_str(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);
 
         for(ldevs = pdev->ldevs; ldevs != NULL; ldevs = g_list_next(ldevs)) {
@@ -465,22 +467,22 @@ cba_object_dump(void)
 
 
 cba_pdev_t *
-cba_pdev_find(packet_info *pinfo, const guint8 *ip, e_uuid_t *ipid)
+cba_pdev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid)
 {
     cba_pdev_t       *pdev;
     dcom_interface_t *interf;
 
 
-    interf = dcom_interface_find(pinfo, ip, ipid);
+    interf = dcom_interface_find(pinfo, addr, ipid);
     if (interf != NULL) {
         pdev = (cba_pdev_t *)interf->parent->private_data;
         if (pdev == NULL) {
             expert_add_info_format(pinfo, NULL, &ei_cba_acco_pdev_find, "pdev_find: no pdev for IP:%s IPID:%s",
-                ip_to_str(ip), guids_resolve_uuid_to_str(ipid));
+                address_to_str(wmem_packet_scope(), addr), guids_resolve_uuid_to_str(ipid));
         }
     } else {
         expert_add_info_format(pinfo, NULL, &ei_cba_acco_pdev_find_unknown_interface, "pdev_find: unknown interface of IP:%s IPID:%s",
-            ip_to_str(ip), guids_resolve_uuid_to_str(ipid));
+            address_to_str(wmem_packet_scope(), addr), guids_resolve_uuid_to_str(ipid));
         pdev = NULL;
     }
 
@@ -489,7 +491,7 @@ cba_pdev_find(packet_info *pinfo, const guint8 *ip, e_uuid_t *ipid)
 
 
 cba_pdev_t *
-cba_pdev_add(packet_info *pinfo, const guint8 *ip)
+cba_pdev_add(packet_info *pinfo, const address *addr)
 {
     GList      *cba_iter;
     cba_pdev_t *pdev;
@@ -498,14 +500,14 @@ cba_pdev_add(packet_info *pinfo, const guint8 *ip)
     /* find pdev */
     for(cba_iter = cba_pdevs; cba_iter != NULL; cba_iter = g_list_next(cba_iter)) {
         pdev = (cba_pdev_t *)cba_iter->data;
-        if (memcmp(pdev->ip, ip, 4) == 0) {
+        if (memcmp(pdev->ip, addr->data, 4) == 0) {
             return pdev;
         }
     }
 
     /* not found, create a new */
     pdev = (cba_pdev_t *)wmem_alloc(wmem_file_scope(), sizeof(cba_pdev_t));
-    memcpy( (void *) (pdev->ip), ip, 4);
+    memcpy( (void *) (pdev->ip), addr->data, 4);
     pdev->first_packet = pinfo->fd->num;
     pdev->ldevs        = NULL;
     pdev->object       = NULL;
@@ -589,12 +591,12 @@ cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name)
 
 
 cba_ldev_t *
-cba_ldev_find(packet_info *pinfo, const void *ip, e_uuid_t *ipid) {
+cba_ldev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid) {
     dcom_interface_t *interf;
     cba_ldev_t       *ldev;
 
 
-    interf = dcom_interface_find(pinfo, (const guint8 *)ip, ipid);
+    interf = dcom_interface_find(pinfo, addr, ipid);
     if (interf != NULL) {
         ldev = (cba_ldev_t *)interf->private_data;
 
@@ -603,11 +605,11 @@ cba_ldev_find(packet_info *pinfo, const void *ip, e_uuid_t *ipid) {
         }
         if (ldev == NULL) {
             expert_add_info_format(pinfo, NULL, &ei_cba_acco_ldev_unknown, "Unknown LDev of %s",
-                ip_to_str((const guint8 *)ip));
+                address_to_str(wmem_packet_scope(), addr));
         }
     } else {
         expert_add_info_format(pinfo, NULL, &ei_cba_acco_ipid_unknown, "Unknown IPID of %s",
-            ip_to_str((const guint8 *)ip));
+            address_to_str(wmem_packet_scope(), addr));
         ldev = NULL;
     }
 
@@ -623,6 +625,7 @@ cba_acco_add(packet_info *pinfo, const char *acco)
     guint32     ip;
     cba_pdev_t *pdev;
     cba_ldev_t *ldev;
+    address    addr;
 
 
     ip_str = g_strdup(acco);
@@ -638,7 +641,8 @@ cba_acco_add(packet_info *pinfo, const char *acco)
         return NULL;
     }
 
-    pdev = cba_pdev_add(pinfo, (guint8 *) &ip);
+    SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+    pdev = cba_pdev_add(pinfo, &addr);
     delim++;
 
     ldev = cba_ldev_add(pinfo, pdev, delim);
@@ -1298,7 +1302,7 @@ dissect_ICBAAccoServer_Connect_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE);
     PROTO_ITEM_SET_GENERATED(item);
@@ -1450,7 +1454,7 @@ dissect_ICBAAccoServer2_Connect2_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE);
     PROTO_ITEM_SET_GENERATED(item);
@@ -1724,7 +1728,7 @@ dissect_ICBAAccoServer_Disconnect_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, di, drep,
                         &u32ArraySize);
 
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     /* link connection infos to the call */
     if (prov_ldev != NULL) {
@@ -1873,7 +1877,7 @@ dissect_ICBAAccoServer_DisconnectMe_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE);
     PROTO_ITEM_SET_GENERATED(item);
@@ -1944,7 +1948,7 @@ dissect_ICBAAccoServerSRT_DisconnectMe_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE);
     PROTO_ITEM_SET_GENERATED(item);
@@ -2160,7 +2164,7 @@ dissect_ICBAAccoServerSRT_ConnectCR_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE);
     PROTO_ITEM_SET_GENERATED(item);
@@ -2390,7 +2394,7 @@ dissect_ICBAAccoServerSRT_DisconnectCR_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE);
     PROTO_ITEM_SET_GENERATED(item);
@@ -2525,7 +2529,7 @@ dissect_ICBAAccoServerSRT_Connect_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    prov_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE);
     PROTO_ITEM_SET_GENERATED(item);
@@ -3240,7 +3244,7 @@ dissect_ICBAAccoCallback_OnDataChanged_rqst(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep);
 
     /* get corresponding provider ldev */
-    cons_ldev = cba_ldev_find(pinfo, pinfo->net_dst.data, &di->call_data->object_uuid);
+    cons_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid);
 
     item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE);
     PROTO_ITEM_SET_GENERATED(item);
diff --git a/plugins/profinet/packet-dcom-cba-acco.h b/plugins/profinet/packet-dcom-cba-acco.h
index d7c35779e1..6951851ba1 100644
--- a/plugins/profinet/packet-dcom-cba-acco.h
+++ b/plugins/profinet/packet-dcom-cba-acco.h
@@ -48,13 +48,13 @@ typedef struct cba_ldev_s {
 extern GList *cba_pdevs;
 
 extern cba_pdev_t *
-cba_pdev_find(packet_info *pinfo, const guint8 *ip, e_uuid_t *ipid);
+cba_pdev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid);
 
 extern void
 cba_pdev_link(packet_info *pinfo, cba_pdev_t *pdev, dcom_interface_t *pdev_interf);
 
 extern cba_pdev_t *
-cba_pdev_add(packet_info *pinfo, const guint8 *ip);
+cba_pdev_add(packet_info *pinfo, const address *addr);
 
 extern void
 cba_ldev_link(packet_info *pinfo, cba_ldev_t *ldev, dcom_interface_t *ldev_interf);
@@ -63,7 +63,7 @@ extern void
 cba_ldev_link_acco(packet_info *pinfo, cba_ldev_t *ldev, dcom_interface_t *acco_interf);
 
 extern cba_ldev_t *
-cba_ldev_find(packet_info *pinfo, const void *ip, e_uuid_t *ipid);
+cba_ldev_find(packet_info *pinfo, const address *addr, e_uuid_t *ipid);
 
 extern cba_ldev_t *
 cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name);
diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c
index 412f61236e..e44e5c421d 100644
--- a/plugins/profinet/packet-dcom-cba.c
+++ b/plugins/profinet/packet-dcom-cba.c
@@ -602,9 +602,9 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_resp(tvbuff_t *tvb, int offset,
     if (ldev_name != NULL && ldev_interf != NULL) {
         /* XXX - this is a hack to create a pdev interface */
         /* as I currently don't understand the objref process for a root interface! */
-        pdev_interf = dcom_interface_new(pinfo, (const guint8 *)pinfo->net_dst.data, &uuid_ICBAPhysicalDevice, 0, 0, &di->call_data->object_uuid);
+        pdev_interf = dcom_interface_new(pinfo, &pinfo->net_dst, &uuid_ICBAPhysicalDevice, 0, 0, &di->call_data->object_uuid);
         if (pdev_interf != NULL) {
-            pdev = cba_pdev_add(pinfo, (const guint8 *)pinfo->net_dst.data);
+            pdev = cba_pdev_add(pinfo, &pinfo->net_dst);
             cba_pdev_link(pinfo, pdev, pdev_interf);
 
             ldev = cba_ldev_add(pinfo, pdev, ldev_name);
@@ -792,7 +792,7 @@ dissect_ICBALogicalDevice_get_ACCO_resp(tvbuff_t *tvb, int offset,
         expert_add_info(pinfo, NULL, &ei_cba_acco_interface_pointer_unresolved);
     }
 
-    ldev = cba_ldev_find(pinfo, pinfo->net_src.data, &di->call_data->object_uuid);
+    ldev = cba_ldev_find(pinfo, &pinfo->net_src, &di->call_data->object_uuid);
 
     /* "crosslink" interface and its object */
     if (ldev != NULL && acco_interf != NULL) {
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index b17c12f415..e96c77d547 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -386,6 +386,7 @@ dissect_PNDCP_Suboption_IP(tvbuff_t *tvb, int offset, packet_info *pinfo,
     guint16     block_qualifier;
     guint32     ip;
     proto_item *item = NULL;
+    address     addr;
 
 
     /* SuboptionIPParameter */
@@ -434,15 +435,18 @@ 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);
-        proto_item_append_text(block_item, ", IP: %s", ip_to_str((guint8*)&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);
-        proto_item_append_text(block_item, ", Subnet: %s", ip_to_str((guint8*)&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);
-        proto_item_append_text(block_item, ", Gateway: %s", ip_to_str((guint8*)&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:
         offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, block_length);