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-cpdlc | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
| download | wireshark-4e1b5ea866dd332294246c4800efe77431010ad8.tar.gz | |
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-cpdlc')
| -rw-r--r-- | asn1/atn-cpdlc/atn-cpdlc.cnf | 2 | ||||
| -rw-r--r-- | asn1/atn-cpdlc/packet-atn-cpdlc-template.c | 36 |
2 files changed, 21 insertions, 17 deletions
diff --git a/asn1/atn-cpdlc/atn-cpdlc.cnf b/asn1/atn-cpdlc/atn-cpdlc.cnf index bd31909c54..b1ef6efb53 100644 --- a/asn1/atn-cpdlc/atn-cpdlc.cnf +++ b/asn1/atn-cpdlc/atn-cpdlc.cnf @@ -11,7 +11,7 @@ #.OMIT_ASSIGNMENT #.END -#.PDU +#.PDU_NEW AircraftPDUs GroundPDUs ProtectedAircraftPDUs diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index 61e51a287d..ddc09c0bba 100644 --- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -69,22 +69,26 @@ void proto_reg_handoff_atn_cpdlc(void); static const char *object_identifier_id; /* forward declarations */ -static void dissect_GroundPDUs_PDU( +static int dissect_GroundPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); -static void dissect_AircraftPDUs_PDU( + proto_tree *tree _U_, + void *data _U_); +static int dissect_AircraftPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); -static void dissect_ProtectedGroundPDUs_PDU( + proto_tree *tree _U_, + void *data _U_); +static int dissect_ProtectedGroundPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); -static void dissect_ProtectedAircraftPDUs_PDU( + proto_tree *tree _U_, + void *data _U_); +static int dissect_ProtectedAircraftPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); + proto_tree *tree _U_, + void *data _U_); #include "packet-atn-cpdlc-hf.c" @@ -172,12 +176,12 @@ dissect_atn_cpdlc( dissect_ProtectedGroundPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); }else { /* downlink PDU's = Aircraft PDU's */ dissect_ProtectedAircraftPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); } break; case cpdlc: @@ -186,12 +190,12 @@ dissect_atn_cpdlc( dissect_GroundPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); }else { /* downlink PDU's = Aircraft PDU's */ dissect_AircraftPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); } break; default: @@ -217,7 +221,7 @@ dissect_atn_cpdlc_heur( switch(type){ case um: TRY { - dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL); + dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; is_pm = TRUE; break;} @@ -226,7 +230,7 @@ dissect_atn_cpdlc_heur( is_pm = FALSE;} ENDTRY; TRY { - dissect_GroundPDUs_PDU(tvb, pinfo, NULL); + dissect_GroundPDUs_PDU(tvb, pinfo, NULL, NULL); is_pm = FALSE; is_atn_cpdlc = TRUE; break;} @@ -237,7 +241,7 @@ dissect_atn_cpdlc_heur( break; case dm: TRY { - dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL); + dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; is_pm = TRUE; break;} @@ -246,7 +250,7 @@ dissect_atn_cpdlc_heur( is_pm = FALSE; } ENDTRY; TRY{ - dissect_AircraftPDUs_PDU(tvb, pinfo, NULL); + dissect_AircraftPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; is_pm = FALSE; break;} |