diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-20 21:35:40 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-22 21:08:21 +0000 |
| commit | 9356d5c689fa911b0b13d4b2a0cd6e9208d60f6d (patch) | |
| tree | f3265efe4137c8a09995b448bf0c4bcdecf4e5a9 /asn1/atn-ulcs | |
| parent | 2c0214efff7b3421355e42ee7f3075c2f3181d3e (diff) | |
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef
Reviewed-on: https://code.wireshark.org/review/2509
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1/atn-ulcs')
| -rw-r--r-- | asn1/atn-ulcs/atn-ulcs.cnf | 10 | ||||
| -rw-r--r-- | asn1/atn-ulcs/packet-atn-ulcs-template.c | 37 |
2 files changed, 12 insertions, 35 deletions
diff --git a/asn1/atn-ulcs/atn-ulcs.cnf b/asn1/atn-ulcs/atn-ulcs.cnf index 4307146488..f3f01aeed3 100644 --- a/asn1/atn-ulcs/atn-ulcs.cnf +++ b/asn1/atn-ulcs/atn-ulcs.cnf @@ -68,13 +68,9 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar /* call appropiate dissector for bitstring data */ switch(ulcs_context_value){ case 1: /* ACSE PDU*/ - ti = proto_tree_add_text( - root_tree, - tvb, - offset, - 0, - ATN_ACSE_PROTO ); - atn_ulcs_tree = proto_item_add_subtree(ti, ett_atn_acse); + atn_ulcs_tree = proto_tree_add_subtree( + root_tree, tvb, offset, 0, + ett_atn_acse, NULL, ATN_ACSE_PROTO ); dissect_ACSE_apdu_PDU( tvb_new_subset_remaining(tvb_usr, 0), diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 5b67456ece..37322a3a0c 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -616,16 +616,9 @@ dissect_atn_ulcs( value_ses_pres = tvb_get_ntohs(tvb, offset); /* SPDU: dissect session layer */ - ti = proto_tree_add_text( - tree, - tvb, - offset, - 0, - ATN_SES_PROTO ); - - atn_ulcs_tree = proto_item_add_subtree( - ti, - ett_atn_ses); + atn_ulcs_tree = proto_tree_add_subtree( + tree, tvb, offset, 0, + ett_atn_ses, NULL, ATN_SES_PROTO ); /* get SPDU (1 octet) */ value_ses = tvb_get_guint8(tvb, offset); @@ -675,14 +668,9 @@ dissect_atn_ulcs( offset++; /* PPDU: dissect presentation layer */ - ti = proto_tree_add_text( - tree, - tvb, - offset, - 0, - ATN_PRES_PROTO ); - - atn_ulcs_tree = proto_item_add_subtree(ti, ett_atn_pres); + atn_ulcs_tree = proto_tree_add_subtree( + tree, tvb, offset, 0, + ett_atn_pres, NULL, ATN_PRES_PROTO ); value_pres = tvb_get_guint8(tvb, offset); @@ -718,16 +706,9 @@ dissect_atn_ulcs( offset++; /* ACSE PDU: dissect application layer */ - ti = proto_tree_add_text( - tree, - tvb, - offset, - 0, - ATN_ACSE_PROTO ); - - atn_ulcs_tree = proto_item_add_subtree( - ti, - ett_atn_acse); + atn_ulcs_tree = proto_tree_add_subtree( + tree, tvb, offset, 0, + ett_atn_acse, NULL, ATN_ACSE_PROTO ); dissect_ACSE_apdu_PDU( tvb_new_subset_remaining(tvb, offset), |