diff options
Diffstat (limited to 'epan/dissectors/packet-ltp.c')
| -rw-r--r-- | epan/dissectors/packet-ltp.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 4738ab7813..ec33a46701 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -226,9 +226,6 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int int dissected_data_size = 0; int data_count = 1; - proto_item *ltp_data_item; - proto_item *ltp_data_data_item; - proto_tree *ltp_data_tree; proto_tree *ltp_data_data_tree; @@ -298,8 +295,7 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int } /* Create a subtree for data segment and add the other fields under it */ - ltp_data_item = proto_tree_add_text(ltp_tree, tvb,frame_offset, segment_offset, "Data Segment"); - ltp_data_tree = proto_item_add_subtree(ltp_data_item, ett_data_segm); + ltp_data_tree = proto_tree_add_subtree(ltp_tree, tvb,frame_offset, segment_offset, ett_data_segm, NULL, "Data Segment"); proto_tree_add_uint64(ltp_data_tree,hf_ltp_data_clid, tvb, frame_offset,client_id_size,client_id); frame_offset += client_id_size; @@ -357,8 +353,8 @@ dissect_data_segment(proto_tree *ltp_tree, tvbuff_t *tvb,packet_info *pinfo,int data_length = tvb_length(new_tvb); while(dissected_data_size < data_length) { - ltp_data_data_item = proto_tree_add_text(ltp_data_tree, tvb,frame_offset, 0, "Data[%d]",data_count); - ltp_data_data_tree = proto_item_add_subtree(ltp_data_data_item, ett_data_data_segm); + ltp_data_data_tree = proto_tree_add_subtree_format(ltp_data_tree, tvb,frame_offset, 0, + ett_data_data_segm, NULL, "Data[%d]",data_count); datatvb = tvb_new_subset(new_tvb, data_offset, (int)data_length - dissected_data_size, tvb_length(new_tvb)); bundle_size = call_dissector(bundle_handle, datatvb, pinfo, ltp_data_data_tree); @@ -416,8 +412,7 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree, proto_tree *ltp_rpt_clm_tree; /* Create the subtree for report segment under the main LTP tree and all the report segment fields under it */ - ltp_rpt_item = proto_tree_add_text(ltp_tree, tvb, frame_offset, -1, "Report Segment"); - ltp_rpt_tree = proto_item_add_subtree(ltp_rpt_item, ett_rpt_segm); + ltp_rpt_tree = proto_tree_add_subtree(ltp_tree, tvb, frame_offset, -1, ett_rpt_segm, <p_rpt_item, "Report Segment"); /* Extract the report segment info */ rpt_sno = evaluate_sdnv_64(tvb, frame_offset, &rpt_sno_size); @@ -457,8 +452,7 @@ dissect_report_segment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ltp_tree, proto_tree_add_uint(ltp_rpt_tree, hf_ltp_rpt_clm_cnt, tvb, frame_offset + segment_offset, rcpt_clm_cnt_size, rcpt_clm_cnt); segment_offset += rcpt_clm_cnt_size; - ltp_rpt_clm_item = proto_tree_add_text(ltp_rpt_tree, tvb, frame_offset + segment_offset, -1, "Reception claims"); - ltp_rpt_clm_tree = proto_item_add_subtree(ltp_rpt_clm_item, ett_rpt_clm); + ltp_rpt_clm_tree = proto_tree_add_subtree(ltp_rpt_tree, tvb, frame_offset + segment_offset, -1, ett_rpt_clm, <p_rpt_clm_item, "Reception claims"); /* There can be multiple reception claims in the same report segment */ for(i = 0; i<rcpt_clm_cnt; i++){ @@ -485,7 +479,6 @@ dissect_report_ack_segment(proto_tree *ltp_tree, tvbuff_t *tvb,int frame_offset) int rpt_sno_size; int segment_offset = 0; - proto_item *ltp_rpt_ack_item; proto_tree *ltp_rpt_ack_tree; /* Extracing receipt serial number info */ @@ -497,8 +490,8 @@ dissect_report_ack_segment(proto_tree *ltp_tree, tvbuff_t *tvb,int frame_offset) } /* Creating tree for the report ack segment */ - ltp_rpt_ack_item = proto_tree_add_text(ltp_tree, tvb,frame_offset, segment_offset, "Report Ack Segment"); - ltp_rpt_ack_tree = proto_item_add_subtree(ltp_rpt_ack_item, ett_rpt_ack_segm); + ltp_rpt_ack_tree = proto_tree_add_subtree(ltp_tree, tvb,frame_offset, segment_offset, + ett_rpt_ack_segm, NULL, "Report Ack Segment"); proto_tree_add_uint64(ltp_rpt_ack_tree, hf_ltp_rpt_ack_sno, tvb, frame_offset,rpt_sno_size, rpt_sno); return segment_offset; @@ -509,15 +502,13 @@ static int dissect_cancel_segment(proto_tree * ltp_tree, tvbuff_t *tvb,int frame_offset){ guint8 reason_code; - proto_item *ltp_cancel_item; proto_tree *ltp_cancel_tree; /* The cancel segment has only one byte, which contains the reason code. */ reason_code = tvb_get_guint8(tvb,frame_offset); /* Creating tree for the cancel segment */ - ltp_cancel_item = proto_tree_add_text(ltp_tree, tvb,frame_offset, 1, "Cancel Segment"); - ltp_cancel_tree = proto_item_add_subtree(ltp_cancel_item, ett_session_mgmt); + ltp_cancel_tree = proto_tree_add_subtree(ltp_tree, tvb,frame_offset, 1, ett_session_mgmt, NULL, "Cancel Segment"); proto_tree_add_uint_format_value(ltp_cancel_tree, hf_ltp_cancel_code, tvb, frame_offset, 1, reason_code, "%x (%s)", reason_code, val_to_str_const(reason_code,ltp_cancel_codes,"Reserved")); @@ -536,7 +527,6 @@ dissect_header_extn(proto_tree *ltp_tree, tvbuff_t *tvb,int frame_offset,int hdr int i; int extn_offset = 0; - proto_item *ltp_hdr_extn_item; proto_tree *ltp_hdr_extn_tree; /* There can be more than one header extensions */ @@ -558,8 +548,7 @@ dissect_header_extn(proto_tree *ltp_tree, tvbuff_t *tvb,int frame_offset,int hdr return 0; } } - ltp_hdr_extn_item = proto_tree_add_text(ltp_tree, tvb,frame_offset, extn_offset, "Header Extension"); - ltp_hdr_extn_tree = proto_item_add_subtree(ltp_hdr_extn_item, ett_hdr_extn); + ltp_hdr_extn_tree = proto_tree_add_subtree(ltp_tree, tvb,frame_offset, extn_offset, ett_hdr_extn, NULL, "Header Extension"); for(i = 0; i < hdr_extn_cnt; i++){ proto_tree_add_uint_format_value(ltp_hdr_extn_tree, hf_ltp_hdr_extn_tag, tvb, frame_offset, 1, extn_type[i], "%x (%s)", extn_type[i], val_to_str_const(extn_type[i],extn_tag_codes,"Unassigned/Reserved")); @@ -585,7 +574,6 @@ dissect_trailer_extn(proto_tree *ltp_tree, tvbuff_t *tvb,int frame_offset,int tr int i; int extn_offset = 0; - proto_item *ltp_trl_extn_item; proto_tree *ltp_trl_extn_tree; DISSECTOR_ASSERT(trl_extn_cnt < LTP_MAX_TRL_EXTN); @@ -612,8 +600,7 @@ dissect_trailer_extn(proto_tree *ltp_tree, tvbuff_t *tvb,int frame_offset,int tr return 0; } } - ltp_trl_extn_item = proto_tree_add_text(ltp_tree, tvb,frame_offset, extn_offset, "Header Extension"); - ltp_trl_extn_tree = proto_item_add_subtree(ltp_trl_extn_item, ett_trl_extn); + ltp_trl_extn_tree = proto_tree_add_subtree(ltp_tree, tvb,frame_offset, extn_offset, ett_trl_extn, NULL, "Header Extension"); for(i = 0; i < trl_extn_cnt; i++){ proto_tree_add_uint_format_value(ltp_trl_extn_tree, hf_ltp_trl_extn_tag, tvb, frame_offset, 1, extn_type[i], "%x (%s)", extn_type[i], val_to_str_const(extn_type[i],extn_tag_codes,"Unassigned/Reserved")); @@ -687,8 +674,7 @@ dissect_ltp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) ltp_tree = proto_item_add_subtree(ti, ett_ltp); /* Adding Header Subtree */ - ltp_header_item = proto_tree_add_text(ltp_tree, tvb, frame_offset, header_offset+1, "LTP Header"); - ltp_header_tree = proto_item_add_subtree(ltp_header_item, ett_ltp_hdr); + ltp_header_tree = proto_tree_add_subtree(ltp_tree, tvb, frame_offset, header_offset+1, ett_ltp_hdr, NULL, "LTP Header"); proto_tree_add_uint(ltp_header_tree,hf_ltp_version,tvb,frame_offset,1,hi_nibble(ltp_hdr)); ltp_type = lo_nibble(ltp_hdr); |