aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cfdp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-cfdp.c')
-rw-r--r--epan/dissectors/packet-cfdp.c51
1 files changed, 21 insertions, 30 deletions
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c
index 570ca626f7..369a55bcfa 100644
--- a/epan/dissectors/packet-cfdp.c
+++ b/epan/dissectors/packet-cfdp.c
@@ -476,13 +476,12 @@ static guint32 dissect_cfdp_filestore_req_tlv(tvbuff_t *tvb, proto_tree *tree, g
tlv_len = tvb_get_guint8(tvb, offset);
offset += 1;
if(tlv_len > 0){
- proto_item *cfdp_filestore_req;
proto_tree *cfdp_filestore_req_tree;
guint8 aux_byte;
/* Create a TLV subtree */
- cfdp_filestore_req = proto_tree_add_text(tree, tvb, offset-2, tlv_len+2, "Filestore Request TLV");
- cfdp_filestore_req_tree = proto_item_add_subtree(cfdp_filestore_req, ett_cfdp_filestore_req);
+ cfdp_filestore_req_tree = proto_tree_add_subtree(tree, tvb, offset-2, tlv_len+2,
+ ett_cfdp_filestore_req, NULL, "Filestore Request TLV");
proto_tree_add_uint(cfdp_filestore_req_tree, hf_cfdp_tlv_len, tvb, offset-1, 1, tlv_len);
@@ -518,13 +517,12 @@ static guint32 dissect_cfdp_filestore_resp_tlv(tvbuff_t *tvb, proto_tree *tree,
tlv_len = tvb_get_guint8(tvb, offset);
offset += 1;
if(tlv_len > 0){
- proto_item *cfdp_filestore_resp;
proto_tree *cfdp_filestore_resp_tree;
guint8 aux_byte;
/* Create a subtree */
- cfdp_filestore_resp = proto_tree_add_text(tree, tvb, offset-2, tlv_len+2, "Filestore Response TLV");
- cfdp_filestore_resp_tree = proto_item_add_subtree(cfdp_filestore_resp, ett_cfdp_filestore_resp);
+ cfdp_filestore_resp_tree = proto_tree_add_subtree(tree, tvb, offset-2, tlv_len+2,
+ ett_cfdp_filestore_resp, NULL, "Filestore Response TLV");
proto_tree_add_uint(cfdp_filestore_resp_tree, hf_cfdp_tlv_len, tvb, offset-1, 1, tlv_len);
@@ -595,12 +593,11 @@ static guint32 dissect_cfdp_fault_location_tlv(tvbuff_t *tvb, proto_tree *tree,
tlv_len = tvb_get_guint8(tvb, offset);
offset += 1;
if(tlv_len > 0){
- proto_item *cfdp_fault_location;
proto_tree *cfdp_fault_location_tree;
/* Create a subtree */
- cfdp_fault_location = proto_tree_add_text(tree, tvb, offset-2, tlv_len+2, "Fault location TLV");
- cfdp_fault_location_tree = proto_item_add_subtree(cfdp_fault_location, ett_cfdp_fault_location);
+ cfdp_fault_location_tree = proto_tree_add_subtree(tree, tvb, offset-2, tlv_len+2,
+ ett_cfdp_fault_location, NULL, "Fault location TLV");
proto_tree_add_uint(cfdp_fault_location_tree, hf_cfdp_tlv_len, tvb, offset-1, 1, tlv_len);
@@ -615,7 +612,6 @@ static guint32 dissect_cfdp_fault_location_tlv(tvbuff_t *tvb, proto_tree *tree,
static guint32 dissect_cfdp_msg_to_user_tlv(tvbuff_t *tvb, proto_tree *tree, guint32 ext_offset){
guint8 aux_byte, tlv_type, tlv_len;
- proto_item *cfdp_msg_to_user;
proto_tree *cfdp_msg_to_user_tree;
guint32 offset = ext_offset;
@@ -628,8 +624,8 @@ static guint32 dissect_cfdp_msg_to_user_tlv(tvbuff_t *tvb, proto_tree *tree, gui
offset += 1;
/* Create a subtree */
- cfdp_msg_to_user = proto_tree_add_text(tree, tvb, offset-2, tlv_len+2, "Message To User TLV");
- cfdp_msg_to_user_tree = proto_item_add_subtree(cfdp_msg_to_user, ett_cfdp_filestore_resp);
+ cfdp_msg_to_user_tree = proto_tree_add_subtree(tree, tvb, offset-2, tlv_len+2,
+ ett_cfdp_filestore_resp, NULL, "Message To User TLV");
proto_tree_add_uint(cfdp_msg_to_user_tree, hf_cfdp_tlv_len, tvb, offset-1, 1, tlv_len);
@@ -863,7 +859,6 @@ static guint32 dissect_cfdp_msg_to_user_tlv(tvbuff_t *tvb, proto_tree *tree, gui
static guint32 dissect_cfdp_fault_handler_overr_tlv(tvbuff_t *tvb, proto_tree *tree, guint32 ext_offset){
guint8 aux_byte, tlv_len;
- proto_item *cfdp_fault_hdl_overr;
proto_tree *cfdp_fault_hdl_overr_tree;
guint32 offset = ext_offset;
@@ -873,8 +868,8 @@ static guint32 dissect_cfdp_fault_handler_overr_tlv(tvbuff_t *tvb, proto_tree *t
offset += 1;
/* Create a subtree */
- cfdp_fault_hdl_overr = proto_tree_add_text(tree, tvb, offset-2, tlv_len+2, "Fault Handler Override TLV");
- cfdp_fault_hdl_overr_tree = proto_item_add_subtree(cfdp_fault_hdl_overr, ett_cfdp_fault_hdl_overr);
+ cfdp_fault_hdl_overr_tree = proto_tree_add_subtree(tree, tvb, offset-2, tlv_len+2,
+ ett_cfdp_fault_hdl_overr, NULL, "Fault Handler Override TLV");
proto_tree_add_uint(cfdp_fault_hdl_overr_tree, hf_cfdp_tlv_len, tvb, offset-1, 1, tlv_len);
@@ -890,7 +885,6 @@ static guint32 dissect_cfdp_fault_handler_overr_tlv(tvbuff_t *tvb, proto_tree *t
static guint32 dissect_cfdp_flow_label_tlv(tvbuff_t *tvb, proto_tree *tree, guint32 ext_offset){
guint8 tlv_len;
- proto_item *cfdp_flow_label;
proto_tree *cfdp_flow_label_tree;
guint32 offset = ext_offset;
@@ -900,8 +894,8 @@ static guint32 dissect_cfdp_flow_label_tlv(tvbuff_t *tvb, proto_tree *tree, guin
offset += 1;
/* Create a subtree */
- cfdp_flow_label = proto_tree_add_text(tree, tvb, offset-2, tlv_len+2, "Flow Label TLV");
- cfdp_flow_label_tree = proto_item_add_subtree(cfdp_flow_label, ett_cfdp_flow_label);
+ cfdp_flow_label_tree = proto_tree_add_subtree(tree, tvb, offset-2, tlv_len+2,
+ ett_cfdp_flow_label, NULL, "Flow Label TLV");
/* It is undefined, so no specific encoding */
proto_tree_add_text(cfdp_flow_label_tree, tvb, offset, tlv_len, "Flow label");
@@ -913,7 +907,6 @@ static guint32 dissect_cfdp_flow_label_tlv(tvbuff_t *tvb, proto_tree *tree, guin
static guint32 dissect_cfdp_eof_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ext_offset, guint ext_packet_len){
guint8 aux_byte, tlv_type, tlv_len;
- proto_item *cfdp_fault_location;
proto_tree *cfdp_fault_location_tree;
guint32 offset = ext_offset;
@@ -938,8 +931,8 @@ static guint32 dissect_cfdp_eof_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre
if(tlv_type == FAULT_LOCATION){
tlv_len = tvb_get_guint8(tvb, offset);
offset += 1;
- cfdp_fault_location = proto_tree_add_text(tree, tvb, offset-2, tlv_len+2, "Fault location TLV");
- cfdp_fault_location_tree = proto_item_add_subtree(cfdp_fault_location, ett_cfdp_fault_location);
+ cfdp_fault_location_tree = proto_tree_add_subtree(tree, tvb, offset-2, tlv_len+2,
+ ett_cfdp_fault_location, NULL, "Fault location TLV");
proto_tree_add_text(cfdp_fault_location_tree, tvb, offset, tlv_len, "Entity");
offset += tlv_len;
@@ -1147,8 +1140,8 @@ dissect_cfdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
cfdp_packet = proto_tree_add_item(tree, proto_cfdp, tvb, 0, length, ENC_NA);
cfdp_tree = proto_item_add_subtree(cfdp_packet, ett_cfdp);
- cfdp_header = proto_tree_add_text(cfdp_tree, tvb, offset, cfdp_packet_header_length, "CFDP Header");
- cfdp_header_tree = proto_item_add_subtree(cfdp_header, ett_cfdp_header);
+ cfdp_header_tree = proto_tree_add_subtree(cfdp_tree, tvb, offset, cfdp_packet_header_length,
+ ett_cfdp_header, &cfdp_header, "CFDP Header");
first_byte = tvb_get_guint8(tvb, offset);
@@ -1194,8 +1187,8 @@ dissect_cfdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *cfdp_file_directive_header_tree;
guint8 directive_code;
- cfdp_file_directive_header = proto_tree_add_text(cfdp_tree, tvb, offset, cfdp_packet_data_length, "CFDP File Directive");
- cfdp_file_directive_header_tree = proto_item_add_subtree(cfdp_file_directive_header, ett_cfdp_file_directive_header);
+ cfdp_file_directive_header_tree = proto_tree_add_subtree(cfdp_tree, tvb, offset, cfdp_packet_data_length,
+ ett_cfdp_file_directive_header, &cfdp_file_directive_header, "CFDP File Directive");
directive_code = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(cfdp_file_directive_header_tree, hf_cfdp_file_directive_type, tvb, offset, 1, directive_code);
@@ -1240,13 +1233,12 @@ dissect_cfdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item_set_end(cfdp_file_directive_header, tvb, offset);
}else{
- proto_item *cfdp_file_data_header;
proto_tree *cfdp_file_data_header_tree;
col_add_fstr(pinfo->cinfo, COL_INFO, "File Data PDU");
- cfdp_file_data_header = proto_tree_add_text(cfdp_tree, tvb, offset, cfdp_packet_data_length, "CFDP File Data");
- cfdp_file_data_header_tree = proto_item_add_subtree(cfdp_file_data_header, ett_cfdp_file_data_header);
+ cfdp_file_data_header_tree = proto_tree_add_subtree(cfdp_tree, tvb, offset, cfdp_packet_data_length,
+ ett_cfdp_file_data_header, NULL, "CFDP File Data");
proto_tree_add_item(cfdp_file_data_header_tree, hf_cfdp_file_data_offset, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -1260,8 +1252,7 @@ dissect_cfdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *cfdp_crc;
proto_tree *cfdp_crc_tree;
- cfdp_crc = proto_tree_add_text(cfdp_tree, tvb, offset, 2, "CRC");
- cfdp_crc_tree = proto_item_add_subtree(cfdp_crc, ett_cfdp_crc);
+ cfdp_crc_tree = proto_tree_add_subtree(cfdp_tree, tvb, offset, 2, ett_cfdp_crc, &cfdp_crc, "CRC");
proto_tree_add_item(cfdp_crc_tree, hf_cfdp_crc, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 15:54:04 +0000