diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 20:44:36 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 20:44:36 +0000 |
commit | 84241f46ada962c7b4b9b3cf0f1be134ee99b00c (patch) | |
tree | 3108e864be7f7c06df5331f7431cd67f2aee39be /epan/dissectors/packet-ndmp.c | |
parent | 81700ec3e08712eef97596828ea054c78af75a41 (diff) |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48399
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
-rw-r--r-- | epan/dissectors/packet-ndmp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 96b2cfaa7f..3b51cfc8f3 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -331,8 +331,8 @@ get_itl_nexus(packet_info *pinfo, gboolean create_new) { itl_nexus_t *itl; - if(create_new || !(itl=se_tree_lookup32_le(ndmp_conv_data->itl, pinfo->fd->num))){ - itl=se_alloc(sizeof(itl_nexus_t)); + if(create_new || !(itl=(itl_nexus_t *)se_tree_lookup32_le(ndmp_conv_data->itl, pinfo->fd->num))){ + itl=se_new(itl_nexus_t); itl->cmdset=0xff; itl->conversation=ndmp_conv_data->conversation; se_tree_insert32(ndmp_conv_data->itl, pinfo->fd->num, itl); @@ -1405,7 +1405,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo, cdb_tvb=tvb_new_subset(tvb, offset, tvb_len, tvb_rlen); if(ndmp_conv_data->task && !ndmp_conv_data->task->itlq){ - ndmp_conv_data->task->itlq=se_alloc(sizeof(itlq_nexus_t)); + ndmp_conv_data->task->itlq=se_new(itlq_nexus_t); ndmp_conv_data->task->itlq->lun=0xffff; ndmp_conv_data->task->itlq->first_exchange_frame=pinfo->fd->num; ndmp_conv_data->task->itlq->last_exchange_frame=0; @@ -3121,9 +3121,9 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ conversation = find_or_create_conversation(pinfo); - ndmp_conv_data=conversation_get_proto_data(conversation, proto_ndmp); + ndmp_conv_data=(ndmp_conv_data_t *)conversation_get_proto_data(conversation, proto_ndmp); if(!ndmp_conv_data){ - ndmp_conv_data=se_alloc(sizeof(ndmp_conv_data_t)); + ndmp_conv_data=se_new(ndmp_conv_data_t); ndmp_conv_data->version=NDMP_PROTOCOL_UNKNOWN; ndmp_conv_data->tasks=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "NDMP tasks"); ndmp_conv_data->itl=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "NDMP itl"); @@ -3175,7 +3175,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ DISSECTOR_ASSERT((pinfo != NULL) && (pinfo->private_data != NULL)); - tcpinfo = pinfo->private_data; + tcpinfo = (struct tcpinfo *)pinfo->private_data; seq = tcpinfo->seq; len = (ndmp_rm & RPC_RM_FRAGLEN) + 4; @@ -3187,7 +3187,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ tcpinfo->seq = nxt; - nfi = se_tree_lookup32(frags, seq); + nfi = (ndmp_frag_info *)se_tree_lookup32(frags, seq); if (!nfi) { @@ -3203,7 +3203,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if ( !(pinfo->fd->flags.visited)) { - nfi=se_alloc(sizeof(ndmp_frag_info)); + nfi=se_new(ndmp_frag_info); nfi->first_seq = seq; nfi->offset = 1; se_tree_insert32(frags, nxt, (void *)nfi); @@ -3236,7 +3236,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if ( !(pinfo->fd->flags.visited)) { - nfi=se_alloc(sizeof(ndmp_frag_info)); + nfi=se_new(ndmp_frag_info); nfi->first_seq = seq; nfi->offset = frag_num+1; se_tree_insert32(frags, nxt, (void *)nfi); @@ -3357,14 +3357,14 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(nh.type){ case NDMP_MESSAGE_REQUEST: if(!pinfo->fd->flags.visited){ - ndmp_conv_data->task=se_alloc(sizeof(ndmp_task_data_t)); + ndmp_conv_data->task=se_new(ndmp_task_data_t); ndmp_conv_data->task->request_frame=pinfo->fd->num; ndmp_conv_data->task->response_frame=0; ndmp_conv_data->task->ndmp_time=pinfo->fd->abs_ts; ndmp_conv_data->task->itlq=NULL; se_tree_insert32(ndmp_conv_data->tasks, nh.seq, ndmp_conv_data->task); } else { - ndmp_conv_data->task=se_tree_lookup32(ndmp_conv_data->tasks, nh.seq); + ndmp_conv_data->task=(ndmp_task_data_t *)se_tree_lookup32(ndmp_conv_data->tasks, nh.seq); } if(ndmp_conv_data->task && ndmp_conv_data->task->response_frame){ proto_item *it; @@ -3374,7 +3374,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; case NDMP_MESSAGE_REPLY: - ndmp_conv_data->task=se_tree_lookup32(ndmp_conv_data->tasks, nh.rep_seq); + ndmp_conv_data->task=(ndmp_task_data_t *)se_tree_lookup32(ndmp_conv_data->tasks, nh.rep_seq); if(ndmp_conv_data->task && !pinfo->fd->flags.visited){ ndmp_conv_data->task->response_frame=pinfo->fd->num; |