diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-06 15:31:47 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-13 11:24:07 +0000 |
| commit | 4e1b5ea866dd332294246c4800efe77431010ad8 (patch) | |
| tree | 8cda568a450b29fd7bbfcbbf03d840ab9f123190 /asn1/atn-ulcs | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'asn1/atn-ulcs')
| -rw-r--r-- | asn1/atn-ulcs/atn-ulcs.cnf | 4 | ||||
| -rw-r--r-- | asn1/atn-ulcs/packet-atn-ulcs-template.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/asn1/atn-ulcs/atn-ulcs.cnf b/asn1/atn-ulcs/atn-ulcs.cnf index 5584b50e14..fce5459851 100644 --- a/asn1/atn-ulcs/atn-ulcs.cnf +++ b/asn1/atn-ulcs/atn-ulcs.cnf @@ -16,7 +16,7 @@ PDV-list/presentation-data-values/single-ASN1-type pdv-list_presentation-data-va PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_arbitrary #.END -#.PDU +#.PDU_NEW Fully-encoded-data ACSE-apdu #.END @@ -74,7 +74,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar dissect_ACSE_apdu_PDU( tvb_new_subset_remaining(tvb_usr, 0), pinfo, - atn_ulcs_tree); + atn_ulcs_tree, NULL); break; case 3: /* USER data; call subdissector for CM, CPDLC ... */ diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 51e51d545c..c5af4a642b 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -174,10 +174,11 @@ static int dissect_atn_ulcs_T_externalt_encoding_arbitrary( proto_tree *tree _U_, int hf_index _U_); -static void dissect_ACSE_apdu_PDU( +static int dissect_ACSE_apdu_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); + proto_tree *tree _U_, + void *data _U_); guint32 dissect_per_object_descriptor_t( tvbuff_t *tvb, @@ -604,7 +605,7 @@ dissect_atn_ulcs( dissect_Fully_encoded_data_PDU( tvb, pinfo, - atn_ulcs_tree); + atn_ulcs_tree, NULL); return offset + tvb_reported_length_remaining(tvb, offset ) ; @@ -712,7 +713,7 @@ dissect_atn_ulcs( dissect_ACSE_apdu_PDU( tvb_new_subset_remaining(tvb, offset), pinfo, - atn_ulcs_tree); + atn_ulcs_tree, NULL); return offset + tvb_reported_length_remaining(tvb, offset ); |