From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :

Remove C++ incompatibilities from profinet plugin

svn path=/trunk/; revision=48039

1 files changed, 46 insertions, 46 deletions

diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index 4e03764cd0..0cb2451a5c 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -413,7 +413,7 @@ cba_pdev_find(packet_info *pinfo, const guint8 *ip, e_uuid_t *ipid)
 
     interf = dcom_interface_find(pinfo, ip, ipid);
     if (interf != NULL) {
-        pdev = interf->parent->private_data;
+        pdev = (cba_pdev_t *)interf->parent->private_data;
         if (pdev == NULL) {
             expert_add_info_format(pinfo, NULL, PI_UNDECODED, PI_NOTE, "pdev_find: no pdev for IP:%s IPID:%s",
                 ip_to_str(ip), guids_resolve_uuid_to_str(ipid));
@@ -437,14 +437,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_iter->data;
+        pdev = (cba_pdev_t *)cba_iter->data;
         if (memcmp(pdev->ip, ip, 4) == 0) {
             return pdev;
         }
     }
 
     /* not found, create a new */
-    pdev = se_alloc(sizeof(cba_pdev_t));
+    pdev = (cba_pdev_t *)se_alloc(sizeof(cba_pdev_t));
     memcpy( (void *) (pdev->ip), ip, 4);
     pdev->first_packet = pinfo->fd->num;
     pdev->ldevs        = NULL;
@@ -503,14 +503,14 @@ cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name)
 
     /* find ldev */
     for(cba_iter = pdev->ldevs; cba_iter != NULL; cba_iter = g_list_next(cba_iter)) {
-        ldev = cba_iter->data;
+        ldev = (cba_ldev_t *)cba_iter->data;
         if (strcmp(ldev->name, name) == 0) {
             return ldev;
         }
     }
 
     /* not found, create a new */
-    ldev = se_alloc(sizeof(cba_ldev_t));
+    ldev = (cba_ldev_t *)se_alloc(sizeof(cba_ldev_t));
     ldev->name         = se_strdup(name);
     ldev->first_packet = pinfo->fd->num;
     ldev->ldev_object  = NULL;
@@ -529,26 +529,26 @@ cba_ldev_add(packet_info *pinfo, cba_pdev_t *pdev, const char *name)
 
 
 cba_ldev_t *
-cba_ldev_find(packet_info *pinfo, const guint8 *ip, e_uuid_t *ipid) {
+cba_ldev_find(packet_info *pinfo, const void *ip, e_uuid_t *ipid) {
     /*dcerpc_info *info = (dcerpc_info *)pinfo->private_data;*/
     dcom_interface_t *interf;
     cba_ldev_t       *ldev;
 
 
-    interf = dcom_interface_find(pinfo, ip, ipid);
+    interf = dcom_interface_find(pinfo, (const guint8 *)ip, ipid);
     if (interf != NULL) {
-        ldev = interf->private_data;
+        ldev = (cba_ldev_t *)interf->private_data;
 
         if (ldev == NULL) {
-            ldev = interf->parent->private_data;
+            ldev = (cba_ldev_t *)interf->parent->private_data;
         }
         if (ldev == NULL) {
             expert_add_info_format(pinfo, NULL, PI_UNDECODED, PI_NOTE, "Unknown LDev of %s",
-                ip_to_str(ip));
+                ip_to_str((const guint8 *)ip));
         }
     } else {
         expert_add_info_format(pinfo, NULL, PI_UNDECODED, PI_NOTE, "Unknown IPID of %s",
-            ip_to_str(ip));
+            ip_to_str((const guint8 *)ip));
         ldev = NULL;
     }
 
@@ -677,7 +677,7 @@ cba_frame_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *prov_ld
 
     /* find frame */
     for(cba_iter = cons_ldev->consframes; cba_iter != NULL; cba_iter = g_list_next(cba_iter)) {
-        frame = cba_iter->data;
+        frame = (cba_frame_t *)cba_iter->data;
         if ( frame->conscrid == conscrid &&
             memcmp(frame->consmac, consmac, 6) == 0 &&
             cba_packet_in_range(pinfo, frame->packet_connect, frame->packet_disconnect, frame->packet_disconnectme)) {
@@ -685,7 +685,7 @@ cba_frame_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *prov_ld
         }
     }
 
-    frame = se_alloc(sizeof(cba_frame_t));
+    frame = (cba_frame_t *)se_alloc(sizeof(cba_frame_t));
 
     frame->consparent          = cons_ldev;
     frame->provparent          = prov_ldev;
@@ -738,7 +738,7 @@ cba_frame_disconnectme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cba_
 
 
     for(frames = cons_ldev->consframes; frames != NULL; frames = g_list_next(frames)) {
-        frame = frames->data;
+        frame = (cba_frame_t *)frames->data;
 
         if ( frame->provparent == prov_ldev &&
             cba_packet_in_range(pinfo, frame->packet_connect, frame->packet_disconnect, frame->packet_disconnectme)) {
@@ -771,15 +771,15 @@ cba_frame_find_by_cons(packet_info *pinfo, const guint8 *consmac, guint16 conscr
 
     /* find pdev */
     for(pdevs = cba_pdevs; pdevs != NULL; pdevs = g_list_next(pdevs)) {
-        pdev = pdevs->data;
+        pdev = (cba_pdev_t *)pdevs->data;
 
         /* find ldev */
         for(ldevs = pdev->ldevs; ldevs != NULL; ldevs = g_list_next(ldevs)) {
-            ldev = ldevs->data;
+            ldev = (cba_ldev_t *)ldevs->data;
 
             /* find frame */
             for(frames = ldev->consframes; frames != NULL; frames = g_list_next(frames)) {
-                frame = frames->data;
+                frame = (cba_frame_t *)frames->data;
 
                 if ( frame->conscrid == conscrid &&
                     memcmp(frame->consmac, consmac, 6) == 0 &&
@@ -806,7 +806,7 @@ cba_frame_find_by_provcrid(packet_info *pinfo, cba_ldev_t *prov_ldev, guint32 pr
     }
 
     for(frames = prov_ldev->provframes; frames != NULL; frames = g_list_next(frames)) {
-        frame = frames->data;
+        frame = (cba_frame_t *)frames->data;
 
         if ( frame->provcrid == provcrid &&
             cba_packet_in_range(pinfo, frame->packet_connect, frame->packet_disconnect, frame->packet_disconnectme)) {
@@ -903,7 +903,7 @@ cba_connection_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *pr
     if (cons_frame != NULL) {
         /* SRT: search in frame */
         for(cba_iter = cons_frame->conns; cba_iter != NULL; cba_iter = g_list_next(cba_iter)) {
-            conn = cba_iter->data;
+            conn = (cba_connection_t *)cba_iter->data;
             if (conn->consid == consid) {
                 return conn;
             }
@@ -911,7 +911,7 @@ cba_connection_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *pr
     } else {
         /* DCOM: search in ldev */
         for(cba_iter = cons_ldev->consconns; cba_iter != NULL; cba_iter = g_list_next(cba_iter)) {
-            conn = cba_iter->data;
+            conn = (cba_connection_t *)cba_iter->data;
             if ( conn->consid == consid &&
                 cba_packet_in_range(pinfo, conn->packet_connect, conn->packet_disconnect, conn->packet_disconnectme)) {
                 return conn;
@@ -919,7 +919,7 @@ cba_connection_connect(packet_info *pinfo, cba_ldev_t *cons_ldev, cba_ldev_t *pr
         }
     }
 
-    conn = se_alloc(sizeof(cba_connection_t));
+    conn = (cba_connection_t *)se_alloc(sizeof(cba_connection_t));
 
     conn->consparentacco      = cons_ldev;
     conn->provparentacco      = prov_ldev;
@@ -980,7 +980,7 @@ cba_connection_disconnectme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 
     for(conns = cons_ldev->consconns; conns != NULL; conns = g_list_next(conns)) {
-        conn = conns->data;
+        conn = (cba_connection_t *)conns->data;
 
         if ( conn->provparentacco == prov_ldev &&
             cba_packet_in_range(pinfo, conn->packet_connect, conn->packet_disconnect, conn->packet_disconnectme)) {
@@ -1008,7 +1008,7 @@ cba_connection_find_by_provid(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree
 
 
     for(cba_iter = prov_ldev->provconns; cba_iter != NULL; cba_iter = g_list_next(cba_iter)) {
-        conn = cba_iter->data;
+        conn = (cba_connection_t *)cba_iter->data;
         if ( conn->provid == provid &&
             cba_packet_in_range(pinfo, conn->packet_connect, conn->packet_disconnect, conn->packet_disconnectme)) {
             return conn;
@@ -1279,7 +1279,7 @@ dissect_ICBAAccoServer_Connect_rqst(tvbuff_t *tvb, int offset,
 
     /* link connections infos to the call */
     if (prov_ldev != NULL && cons_ldev != NULL) {
-        call = se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
+        call = (server_connect_call_t *)se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
         call->conn_count = 0;
         call->frame      = NULL;
         call->conns      = (cba_connection_t **) (call+1);
@@ -1328,7 +1328,7 @@ dissect_ICBAAccoServer_Connect_rqst(tvbuff_t *tvb, int offset,
             conn = cba_connection_connect(pinfo, cons_ldev, prov_ldev, /*cons_frame*/ NULL,
                 u16QoSType, u16QoSValue, szItem, u32ConsID, 0,
                 /* XXX - VarType must be translated to new type description if it includes an array (0x2000) */
-                se_memdup(&u16VarType, 2), 1);
+                (guint16 *)se_memdup(&u16VarType, 2), 1);
 
             cba_connection_info(tvb, pinfo, sub_tree, conn);
         } else {
@@ -1439,7 +1439,7 @@ dissect_ICBAAccoServer2_Connect2_rqst(tvbuff_t *tvb, int offset,
 
     /* link connection infos to the call */
     if (prov_ldev != NULL && cons_ldev != NULL) {
-        call = se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
+        call = (server_connect_call_t *)se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
         call->conn_count = 0;
         call->frame      = NULL;
         call->conns      = (cba_connection_t **) (call+1);
@@ -1481,7 +1481,7 @@ dissect_ICBAAccoServer2_Connect2_rqst(tvbuff_t *tvb, int offset,
 
             /* limit the allocation to a reasonable size */
             if (u32ArraySize2 < 1000) {
-                typedesc = se_alloc0(u32ArraySize2 * 2);
+                typedesc = (guint16 *)se_alloc0(u32ArraySize2 * 2);
                 typedesclen = u32ArraySize2;
             } else {
                 typedesc = NULL;
@@ -1566,7 +1566,7 @@ dissect_ICBAAccoServer_Connect_resp(tvbuff_t *tvb, int offset,
     proto_item  *item;
     dcerpc_info *info         = (dcerpc_info *)pinfo->private_data;
     cba_connection_t *conn;
-    server_connect_call_t *call = info->call_data->private_data;
+    server_connect_call_t *call = (server_connect_call_t *)info->call_data->private_data;
 
 
     offset = dissect_dcom_that(tvb, offset, pinfo, tree, drep);
@@ -1675,7 +1675,7 @@ dissect_ICBAAccoServer_Disconnect_rqst(tvbuff_t *tvb, int offset,
 
     /* link connection infos to the call */
     if (prov_ldev != NULL) {
-        call = se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
+        call = (server_connect_call_t *)se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
         call->conn_count = 0;
         call->frame      = NULL;
         call->conns      = (cba_connection_t **) (call+1);
@@ -1720,7 +1720,7 @@ dissect_ICBAAccoServer_Disconnect_resp(tvbuff_t *tvb, int offset,
     proto_item  *item;
     dcerpc_info *info = (dcerpc_info *)pinfo->private_data;
     cba_connection_t *conn;
-    server_connect_call_t *call = info->call_data->private_data;
+    server_connect_call_t *call = (server_connect_call_t *)info->call_data->private_data;
 
 
     offset = dissect_dcom_that(tvb, offset, pinfo, tree, drep);
@@ -1836,7 +1836,7 @@ dissect_ICBAAccoServer_DisconnectMe_rqst(tvbuff_t *tvb, int offset,
     cons_ldev = cba_acco_add(pinfo, szStr);
 
     if (prov_ldev != NULL && cons_ldev != NULL) {
-        call = se_alloc(sizeof(server_disconnectme_call_t));
+        call = (server_disconnectme_call_t *)se_alloc(sizeof(server_disconnectme_call_t));
         call->cons = cons_ldev;
         call->prov = prov_ldev;
         info->call_data->private_data = call;
@@ -1868,7 +1868,7 @@ dissect_ICBAAccoServer_DisconnectMe_resp(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
                     &u32HResult);
 
-    call = info->call_data->private_data;
+    call = (server_disconnectme_call_t *)info->call_data->private_data;
     if (call) {
         cba_connection_disconnectme(tvb, pinfo, tree, call->cons, call->prov);
     }
@@ -1909,7 +1909,7 @@ dissect_ICBAAccoServerSRT_DisconnectMe_rqst(tvbuff_t *tvb, int offset,
     cons_ldev = cba_acco_add(pinfo, szStr);
 
     if (prov_ldev != NULL && cons_ldev != NULL) {
-        call = se_alloc(sizeof(server_disconnectme_call_t));
+        call = (server_disconnectme_call_t *)se_alloc(sizeof(server_disconnectme_call_t));
         call->cons = cons_ldev;
         call->prov = prov_ldev;
         info->call_data->private_data = call;
@@ -1941,7 +1941,7 @@ dissect_ICBAAccoServerSRT_DisconnectMe_resp(tvbuff_t *tvb, int offset,
     offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
                     &u32HResult);
 
-    call = info->call_data->private_data;
+    call = (server_disconnectme_call_t *)info->call_data->private_data;
     if (call) {
         cba_frame_disconnectme(tvb, pinfo, tree, call->cons, call->prov);
     }
@@ -2172,7 +2172,7 @@ dissect_ICBAAccoServerSRT_ConnectCR_rqst(tvbuff_t *tvb, int offset,
 
     /* link frame infos to the call */
     if (prov_ldev != NULL && cons_ldev != NULL && u32ArraySize < 100) {
-        call = se_alloc(sizeof(server_frame_call_t) + u32ArraySize * sizeof(cba_frame_t *));
+        call = (server_frame_call_t *)se_alloc(sizeof(server_frame_call_t) + u32ArraySize * sizeof(cba_frame_t *));
         call->frame_count = 0;
         call->frames = (cba_frame_t **) (call+1);
         info->call_data->private_data = call;
@@ -2243,7 +2243,7 @@ dissect_ICBAAccoServerSRT_ConnectCR_resp(tvbuff_t *tvb, int offset,
     proto_item  *item;
     cba_frame_t *frame;
     dcerpc_info *info        = (dcerpc_info *)pinfo->private_data;
-    server_frame_call_t *call = info->call_data->private_data;
+    server_frame_call_t *call = (server_frame_call_t *)info->call_data->private_data;
 
 
     offset = dissect_dcom_that(tvb, offset, pinfo, tree, drep);
@@ -2361,7 +2361,7 @@ dissect_ICBAAccoServerSRT_DisconnectCR_rqst(tvbuff_t *tvb, int offset,
 
     /* link frame infos to the call */
     if (prov_ldev != NULL) {
-        call = se_alloc(sizeof(server_frame_call_t) + u32ArraySize * sizeof(cba_frame_t *));
+        call = (server_frame_call_t *)se_alloc(sizeof(server_frame_call_t) + u32ArraySize * sizeof(cba_frame_t *));
         call->frame_count = 0;
         call->frames      = (cba_frame_t **) (call+1);
         info->call_data->private_data = call;
@@ -2404,7 +2404,7 @@ dissect_ICBAAccoServerSRT_DisconnectCR_resp(tvbuff_t *tvb, int offset,
     cba_frame_t *frame;
     proto_item  *item;
     dcerpc_info *info         = (dcerpc_info *)pinfo->private_data;
-    server_frame_call_t *call = info->call_data->private_data;
+    server_frame_call_t *call = (server_frame_call_t *)info->call_data->private_data;
 
 
     offset = dissect_dcom_that(tvb, offset, pinfo, tree, drep);
@@ -2514,7 +2514,7 @@ dissect_ICBAAccoServerSRT_Connect_rqst(tvbuff_t *tvb, int offset,
 
     /* link connections infos to the call */
     if (frame != NULL) {
-        call = se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
+        call = (server_connect_call_t *)se_alloc(sizeof(server_connect_call_t) + u32ArraySize * sizeof(cba_connection_t *));
         call->conn_count = 0;
         call->frame = frame;
         call->conns = (cba_connection_t **) (call+1);
@@ -2554,7 +2554,7 @@ dissect_ICBAAccoServerSRT_Connect_rqst(tvbuff_t *tvb, int offset,
             u32VariableOffset = dissect_dcom_dcerpc_array_size(tvb, u32VariableOffset, pinfo, sub_tree, drep,
                                 &u32ArraySize2);
 
-            typedesc = se_alloc0(u32ArraySize2 * 2);
+            typedesc = (guint16 *)se_alloc0(u32ArraySize2 * 2);
             typedesclen = u32ArraySize2;
 
             /* extended type description will build an array here */
@@ -2635,7 +2635,7 @@ dissect_ICBAAccoServerSRT_Connect_resp(tvbuff_t *tvb, int offset,
     proto_item  *item;
     dcerpc_info *info = (dcerpc_info *)pinfo->private_data;
 
-    server_connect_call_t *call = info->call_data->private_data;
+    server_connect_call_t *call = (server_connect_call_t *)info->call_data->private_data;
     cba_connection_t      *conn;
 
 
@@ -3112,7 +3112,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb,
             /* XXX - expensive! */
             cba_frame_incoming_data(tvb, pinfo, sub_tree, frame);
             for(conns = frame->conns; conns != NULL; conns = g_list_next(conns)) {
-                conn = conns->data;
+                conn = (cba_connection_t *)conns->data;
                 if (conn->frame_offset == item_offset) {
                     cba_connection_info(tvb, pinfo, sub_tree, conn);
                     break;
@@ -3123,7 +3123,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb,
             /* XXX - expensive! */
             if (cons_ldev != NULL) {
                 for(conns = cons_ldev->consconns; conns != NULL; conns = g_list_next(conns)) {
-                    conn = conns->data;
+                    conn = (cba_connection_t *)conns->data;
                     if (conn->consid == u32ID) {
                         cba_connection_info(tvb, pinfo, sub_tree, conn);
                         cba_connection_incoming_data(tvb, pinfo, sub_tree, conn);
@@ -3181,7 +3181,7 @@ dissect_CBA_Connection_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-CBA");
 
-    frame = cba_frame_find_by_cons(pinfo, pinfo->dl_dst.data, u16FrameID);
+    frame = cba_frame_find_by_cons(pinfo, (const guint8 *)pinfo->dl_dst.data, u16FrameID);
 
     dissect_CBA_Connection_Data(tvb, pinfo, tree, frame ? frame->consparent : NULL, frame);
 
@@ -3318,7 +3318,7 @@ dissect_ICBAAccoServer2_GetConnectionData_rqst(tvbuff_t *tvb, int offset,
 
     /* link ldev to the call */
     if (cons_ldev != NULL) {
-        call = se_alloc(sizeof(cba_ldev_t *));
+        call = (cba_ldev_t **)se_alloc(sizeof(cba_ldev_t *));
         *call = cons_ldev;
         info->call_data->private_data = call;
     }
@@ -3341,7 +3341,7 @@ dissect_ICBAAccoServer2_GetConnectionData_resp(tvbuff_t *tvb, int offset,
     guint32       u32HResult;
     proto_item   *item;
     dcerpc_info  *info      = (dcerpc_info *)pinfo->private_data;
-    cba_ldev_t  **call      = info->call_data->private_data;
+    cba_ldev_t  **call      = (cba_ldev_t **)info->call_data->private_data;
     cba_ldev_t   *cons_ldev = (call!=NULL) ? *call : NULL;