aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/atn-cm
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2015-08-09 12:20:54 -0400
committerBill Meier <wmeier@newsguy.com>2015-08-09 16:30:05 +0000
commitc5af152628f84cfddfa3d872d8be5b58d9a0ae03 (patch)
treebc0337c7da51eb15f30951497138e1bdebdad32d /asn1/atn-cm
parentdbf314a4ab3e005bc9650d69f47fb44aa446fb58 (diff)
Trivial: Convert 'tabs' indentation to '4 space' indentation
Change-Id: If71dd8a04050ce11e37ad88ee862419313c06639 Reviewed-on: https://code.wireshark.org/review/9946 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'asn1/atn-cm')
-rw-r--r--asn1/atn-cm/atn-cm.asn197
-rw-r--r--asn1/atn-cm/atn-cm.cnf18
-rw-r--r--asn1/atn-cm/packet-atn-cm-template.c317
3 files changed, 258 insertions, 274 deletions
diff --git a/asn1/atn-cm/atn-cm.asn b/asn1/atn-cm/atn-cm.asn
index ccd9bbe198..fdbf4ddf70 100644
--- a/asn1/atn-cm/atn-cm.asn
+++ b/asn1/atn-cm/atn-cm.asn
@@ -1,10 +1,5 @@
--- c-basic-offset: 2; tab-width: 2; indent-tabs-mode: t
--- vi: set shiftwidth=2 tabstop=2 noexpandtab:
--- :indentSize=2:tabSize=2:noTabs=false:
-
-
-- ICAO doc 9705 Edition 2 Contact Management (CM)
-CMMessageSetVersion1 DEFINITIONS AUTOMATIC TAGS ::=
+CMMessageSetVersion1 DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
-- ----------------------------------------------------------------------------------
@@ -14,24 +9,24 @@ BEGIN
CMAircraftMessage ::= CHOICE
{
- cmLogonRequest [0] CMLogonRequest,
- cmContactResponse [1] CMContactResponse,
- cmAbortReason [2] CMAbortReason,
- ...
-}
+ cmLogonRequest [0] CMLogonRequest,
+ cmContactResponse [1] CMContactResponse,
+ cmAbortReason [2] CMAbortReason,
+ ...
+}
-- Ground-generated messages
CMGroundMessage ::= CHOICE
{
- cmLogonResponse [0] CMLogonResponse,
- cmUpdate [1] CMUpdate,
- cmContactRequest [2] CMContactRequest,
- cmForwardRequest [3] CMForwardRequest,
- cmAbortReason [4] CMAbortReason,
- cmForwardResponse [5] CMForwardResponse,
- ...
-}
+ cmLogonResponse [0] CMLogonResponse,
+ cmUpdate [1] CMUpdate,
+ cmContactRequest [2] CMContactRequest,
+ cmForwardRequest [3] CMForwardRequest,
+ cmAbortReason [4] CMAbortReason,
+ cmForwardResponse [5] CMForwardResponse,
+ ...
+}
-- ----------------------------------------------------------------------------------
-- CM Message Components
@@ -42,145 +37,145 @@ Airport ::=IA5String (SIZE(4))
APAddress ::= CHOICE
{
- longTsap [0] LongTsap,
- shortTsap [1] ShortTsap
-}
+ longTsap [0] LongTsap,
+ shortTsap [1] ShortTsap
+}
AEQualifier ::= INTEGER (0..255)
--- ATN AE-Qualifier Numeric Values are described in 4
+-- ATN AE-Qualifier Numeric Values are described in 4
AEQualifierVersion ::= SEQUENCE
{
- aeQualifier AEQualifier,
- apVersion VersionNumber
-}
+ aeQualifier AEQualifier,
+ apVersion VersionNumber
+}
AEQualifierVersionAddress ::= SEQUENCE
{
- aeQualifier AEQualifier,
- apVersion VersionNumber,
- apAddress APAddress
-}
+ aeQualifier AEQualifier,
+ apVersion VersionNumber,
+ apAddress APAddress
+}
CMAbortReason ::= ENUMERATED
{
- timer-expired (0),
- undefined-error (1),
- invalid-PDU (2),
- protocol-error (3),
- dialogue-acceptance-not-permitted (4),
- dialogue-end-not-accepted (5),
- communication-service-error (6),
- communication-service-failure (7),
- invalid-QOS-parameter (8),
- expected-PDU-missing (9),
- ...
-}
-
+ timer-expired (0),
+ undefined-error (1),
+ invalid-PDU (2),
+ protocol-error (3),
+ dialogue-acceptance-not-permitted (4),
+ dialogue-end-not-accepted (5),
+ communication-service-error (6),
+ communication-service-failure (7),
+ invalid-QOS-parameter (8),
+ expected-PDU-missing (9),
+ ...
+}
+
CMContactRequest ::= SEQUENCE
{
- facilityDesignation FacilityDesignation,
- address LongTsap
-}
+ facilityDesignation FacilityDesignation,
+ address LongTsap
+}
-CMContactResponse ::= Response
+CMContactResponse ::= Response
-CMForwardRequest ::= CMLogonRequest
+CMForwardRequest ::= CMLogonRequest
CMForwardResponse ::= ENUMERATED
{
- success (0),
- incompatible-version (1),
- service-not-supported (2)
+ success (0),
+ incompatible-version (1),
+ service-not-supported (2)
}
CMLogonRequest ::= SEQUENCE
{
- aircraftFlightIdentification [0] AircraftFlightIdentification,
- cMLongTSAP [1] LongTsap,
+ aircraftFlightIdentification [0] AircraftFlightIdentification,
+ cMLongTSAP [1] LongTsap,
- groundInitiatedApplications [2] SEQUENCE SIZE (1..256) OF AEQualifierVersionAddress OPTIONAL,
- airOnlyInitiatedApplications [3] SEQUENCE SIZE (1..256) OF AEQualifierVersion OPTIONAL,
- facilityDesignation [4] FacilityDesignation OPTIONAL,
- airportDeparture [5] Airport OPTIONAL,
- airportDestination [6] Airport OPTIONAL,
- dateTimeDepartureETD [7] DateTime OPTIONAL
-}
+ groundInitiatedApplications [2] SEQUENCE SIZE (1..256) OF AEQualifierVersionAddress OPTIONAL,
+ airOnlyInitiatedApplications [3] SEQUENCE SIZE (1..256) OF AEQualifierVersion OPTIONAL,
+ facilityDesignation [4] FacilityDesignation OPTIONAL,
+ airportDeparture [5] Airport OPTIONAL,
+ airportDestination [6] Airport OPTIONAL,
+ dateTimeDepartureETD [7] DateTime OPTIONAL
+}
CMLogonResponse ::= SEQUENCE
{
- airInitiatedApplications [0] SEQUENCE SIZE (1..256) OF AEQualifierVersionAddress
- OPTIONAL,
- groundOnlyInitiatedApplications [1] SEQUENCE SIZE (1..256) OF AEQualifierVersion
- OPTIONAL
-}
+ airInitiatedApplications [0] SEQUENCE SIZE (1..256) OF AEQualifierVersionAddress
+ OPTIONAL,
+ groundOnlyInitiatedApplications [1] SEQUENCE SIZE (1..256) OF AEQualifierVersion
+ OPTIONAL
+}
CMUpdate ::= CMLogonResponse
Date ::= SEQUENCE
{
- year Year,
- month Month,
- day Day
+ year Year,
+ month Month,
+ day Day
}
- -- The Date field does not have to correspond to the flight if the field is not to be used;
- -- the field's value can be assigned a meaningless, but compliant, value locally. If operational
- -- use of the Date field is intended, there must be bilateral agreements in place to ensure its proper
- -- use. This is a local implementation issue.
+ -- The Date field does not have to correspond to the flight if the field is not to be used;
+ -- the field's value can be assigned a meaningless, but compliant, value locally. If operational
+ -- use of the Date field is intended, there must be bilateral agreements in place to ensure its proper
+ -- use. This is a local implementation issue.
DateTime ::= SEQUENCE
{
- date Date,
- time Time
-}
+ date Date,
+ time Time
+}
Day ::= INTEGER (1..31)
- --unit = Day, Range (1..31), resolution = 1
+ --unit = Day, Range (1..31), resolution = 1
FacilityDesignation ::= IA5String (SIZE(4..8))
LongTsap ::= SEQUENCE
{
- rDP OCTET STRING (SIZE(5)),
- shortTsap ShortTsap
-}
+ rDP OCTET STRING (SIZE(5)),
+ shortTsap ShortTsap
+}
Month ::= INTEGER (1..12)
- --unit = Month, Range (1..12), resolution = 1
+ --unit = Month, Range (1..12), resolution = 1
Response ::= ENUMERATED
{
- contactSuccess (0),
- contactNotSuccessful (1)
-}
+ contactSuccess (0),
+ contactNotSuccessful (1)
+}
ShortTsap ::= SEQUENCE
{
- aRS [0] OCTET STRING (SIZE(3)) OPTIONAL,
- -- the aRS contains the ICAO 24 bit aircraft address when the ShortTsap belongs to an aircraft;
- -- or a ground address when the Short Tsap belongs to a ground system
- locSysNselTsel [1] OCTET STRING (SIZE(10..11))
-}
+ aRS [0] OCTET STRING (SIZE(3)) OPTIONAL,
+ -- the aRS contains the ICAO 24 bit aircraft address when the ShortTsap belongs to an aircraft;
+ -- or a ground address when the Short Tsap belongs to a ground system
+ locSysNselTsel [1] OCTET STRING (SIZE(10..11))
+}
Time ::= SEQUENCE
{
- hours Timehours,
- minutes Timeminutes
-}
+ hours Timehours,
+ minutes Timeminutes
+}
-Timehours ::= INTEGER (0..23)
+Timehours ::= INTEGER (0..23)
-- units = hour, range (0..23), resolution = 1 hour
-Timeminutes ::= INTEGER (0..59)
+Timeminutes ::= INTEGER (0..59)
-- units = minute, range (0..59), resolution = 1 minute
-VersionNumber ::= INTEGER (1..255)
- -- VersionNumber 0 is reserved for the Dialogue Service
+VersionNumber ::= INTEGER (1..255)
+ -- VersionNumber 0 is reserved for the Dialogue Service
Year ::= INTEGER (1996..2095)
- --unit = Year, Range (1996..2095), resolution = 1
+ --unit = Year, Range (1996..2095), resolution = 1
END
@@ -188,12 +183,12 @@ END
-- Editor modelines - http://www.wireshark.org/tools/modelines.html
--
-- Local variables:
--- c-basic-offset: 2
--- tab-width: 2
--- indent-tabs-mode: t
+-- c-basic-offset: 4
+-- tab-width: 8
+-- indent-tabs-mode: nil
-- End:
--
--- vi: set shiftwidth=2 tabstop=2 noexpandtab:
--- :indentSize=2:tabSize=2:noTabs=false:
+-- vi: set shiftwidth=4 tabstop=8 expandtab:
+-- :indentSize=4:tabSize=8:noTabs=true:
--
diff --git a/asn1/atn-cm/atn-cm.cnf b/asn1/atn-cm/atn-cm.cnf
index 38e23bc0bd..4f7d282f6d 100644
--- a/asn1/atn-cm/atn-cm.cnf
+++ b/asn1/atn-cm/atn-cm.cnf
@@ -1,24 +1,20 @@
-# c-basic-offset: 2; tab-width: 2; indent-tabs-mode: t
-# vi: set shiftwidth=2 tabstop=2 noexpandtab:
-# :indentSize=2:tabSize=2:noTabs=false:
-
#.MODULE_IMPORT
#.EXPORTS
#.PDU_NEW
- CMAircraftMessage
- CMGroundMessage
+ CMAircraftMessage
+ CMGroundMessage
#.END
#
# Editor modelines - http://www.wireshark.org/tools/modelines.html
#
# Local variables:
-# c-basic-offset: 2
-# tab-width: 2
-# indent-tabs-mode: t
+# c-basic-offset: 4
+# tab-width: 8
+# indent-tabs-mode: nil
# End:
#
-# vi: set shiftwidth=2 tabstop=2 noexpandtab:
-# :indentSize=2:tabSize=2:noTabs=false:
+# vi: set shiftwidth=4 tabstop=8 expandtab:
+# :indentSize=4:tabSize=8:noTabs=true:
diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c
index 46373fd277..4dddf6ef53 100644
--- a/asn1/atn-cm/packet-atn-cm-template.c
+++ b/asn1/atn-cm/packet-atn-cm-template.c
@@ -1,9 +1,3 @@
-/* c-basic-offset: 2; tab-width: 2; indent-tabs-mode: t
- * vi: set shiftwidth=2 tabstop=2 noexpandtab:
- * :indentSize=2:tabSize=2:noTabs=false:
- */
-
-
/* packet-atn-cm.c
* By Mathias Guettler <guettler@web.de>
* Copyright 2013
@@ -67,185 +61,184 @@ static int proto_atn_cm = -1;
static int
dissect_atn_cm(
- tvbuff_t *tvb,
- packet_info *pinfo,
- proto_tree *tree,
- void *data _U_)
+ tvbuff_t *tvb,
+ packet_info *pinfo,
+ proto_tree *tree,
+ void *data _U_)
{
- int type;
- proto_tree *sub_tree;
-
- sub_tree = proto_tree_add_subtree(
- tree, tvb, 0, -1, ett_atn_cm, NULL, ATN_CM_PROTO);
-
- /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , ENC_NA); */
- /* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */
-
- /* determine whether it is uplink or downlink */
- type = check_heur_msg_type(pinfo);
-
- switch(type){
- case um:
- dissect_CMGroundMessage_PDU(
- tvb,
- pinfo,
- sub_tree, NULL);
- break;
- case dm:
- dissect_CMAircraftMessage_PDU(
- tvb,
- pinfo,
- sub_tree, NULL);
- break;
- default:
- break;
- }
- return tvb_reported_length_remaining(tvb, 0);
+ int type;
+ proto_tree *sub_tree;
+
+ sub_tree = proto_tree_add_subtree(
+ tree, tvb, 0, -1, ett_atn_cm, NULL, ATN_CM_PROTO);
+
+ /* ti = proto_tree_add_item(tree, proto_atn_cm, tvb, 0, 0 , ENC_NA); */
+ /* sub_tree = proto_item_add_subtree(ti, ett_atn_cm_pdu); */
+
+ /* determine whether it is uplink or downlink */
+ type = check_heur_msg_type(pinfo);
+
+ switch(type){
+ case um:
+ dissect_CMGroundMessage_PDU(
+ tvb,
+ pinfo,
+ sub_tree, NULL);
+ break;
+ case dm:
+ dissect_CMAircraftMessage_PDU(
+ tvb,
+ pinfo,
+ sub_tree, NULL);
+ break;
+ default:
+ break;
+ }
+ return tvb_reported_length_remaining(tvb, 0);
}
static gboolean
dissect_atn_cm_heur(
- tvbuff_t *tvb,
- packet_info *pinfo,
- proto_tree *tree,
- void *data _U_)
+ tvbuff_t *tvb,
+ packet_info *pinfo,
+ proto_tree *tree,
+ void *data _U_)
{
- atn_conversation_t *atn_cv = NULL;
- volatile gboolean is_atn_cm = FALSE;
- int type;
-
- /* determine whether it is uplink or downlink */
- type = check_heur_msg_type(pinfo);
-
- /* heuristically decode message */
- switch(type){
- case um:
- TRY {
- dissect_CMGroundMessage_PDU(
- tvb,
- pinfo,
- NULL, NULL);
- /* no exception thrown: looks like it is a CM PDU */
- is_atn_cm = TRUE; }
- CATCH_ALL {
- is_atn_cm = FALSE; }
- ENDTRY;
- break;
- case dm:
- TRY {
- dissect_CMAircraftMessage_PDU(
- tvb,
- pinfo,
- NULL, NULL);
- /* no exception thrown: looks like it is a CM PDU */
- is_atn_cm = TRUE;}
- CATCH_ALL {
- is_atn_cm = FALSE; }
- ENDTRY;
- break;
- default:
- break;
- }
-
- if (is_atn_cm == TRUE) {
- /* note: */
- /* all subsequent PDU's belonging to this conversation are considered CM */
- /* if the first CM PDU has been decoded succesfully */
- /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */
-
- /* DT: dstref present, srcref is always zero */
- if((pinfo->clnp_dstref) &&
- (!pinfo->clnp_srcref)){
-
- atn_cv = find_atn_conversation(
- &pinfo->dst,
- pinfo->clnp_dstref,
- &pinfo->src );
- }
- /* CR: srcref present, dstref is always zero */
- if((!pinfo->clnp_dstref) &&
- (pinfo->clnp_srcref)){
-
- atn_cv = find_atn_conversation(
- &pinfo->src,
- pinfo->clnp_srcref,
- &pinfo->dst );
-
- }
- /* CC: srcref and dstref present */
- if((pinfo->clnp_dstref) &&
- (pinfo->clnp_srcref)){
- atn_cv = find_atn_conversation(
- &pinfo->src,
- pinfo->clnp_srcref,
- &pinfo->dst );
- }
- if(atn_cv){
- atn_cv->ae_qualifier = cma;
- }
- dissect_atn_cm(
- tvb,
- pinfo,
- tree,
- NULL);
- }
-
- return is_atn_cm;
+ atn_conversation_t *atn_cv = NULL;
+ volatile gboolean is_atn_cm = FALSE;
+ int type;
+
+ /* determine whether it is uplink or downlink */
+ type = check_heur_msg_type(pinfo);
+
+ /* heuristically decode message */
+ switch(type){
+ case um:
+ TRY {
+ dissect_CMGroundMessage_PDU(
+ tvb,
+ pinfo,
+ NULL, NULL);
+ /* no exception thrown: looks like it is a CM PDU */
+ is_atn_cm = TRUE; }
+ CATCH_ALL {
+ is_atn_cm = FALSE; }
+ ENDTRY;
+ break;
+ case dm:
+ TRY {
+ dissect_CMAircraftMessage_PDU(
+ tvb,
+ pinfo,
+ NULL, NULL);
+ /* no exception thrown: looks like it is a CM PDU */
+ is_atn_cm = TRUE;}
+ CATCH_ALL {
+ is_atn_cm = FALSE; }
+ ENDTRY;
+ break;
+ default:
+ break;
+ }
+
+ if (is_atn_cm == TRUE) {
+ /* note: */
+ /* all subsequent PDU's belonging to this conversation are considered CM */
+ /* if the first CM PDU has been decoded succesfully */
+ /* (This is done in "atn-ulcs" by using "call_dissector_with_data()") */
+
+ /* DT: dstref present, srcref is always zero */
+ if((pinfo->clnp_dstref) &&
+ (!pinfo->clnp_srcref)){
+
+ atn_cv = find_atn_conversation(
+ &pinfo->dst,
+ pinfo->clnp_dstref,
+ &pinfo->src );
+ }
+ /* CR: srcref present, dstref is always zero */
+ if((!pinfo->clnp_dstref) &&
+ (pinfo->clnp_srcref)){
+
+ atn_cv = find_atn_conversation(
+ &pinfo->src,
+ pinfo->clnp_srcref,
+ &pinfo->dst );
+
+ }
+ /* CC: srcref and dstref present */
+ if((pinfo->clnp_dstref) &&
+ (pinfo->clnp_srcref)){
+ atn_cv = find_atn_conversation(
+ &pinfo->src,
+ pinfo->clnp_srcref,
+ &pinfo->dst );
+ }
+ if(atn_cv){
+ atn_cv->ae_qualifier = cma;
+ }
+ dissect_atn_cm(
+ tvb,
+ pinfo,
+ tree,
+ NULL);
+ }
+
+ return is_atn_cm;
}
void proto_register_atn_cm (void)
{
static hf_register_info hf_atn_cm[] = {
- #include "packet-atn-cm-hfarr.c"
+ #include "packet-atn-cm-hfarr.c"
};
- static gint *ett[] = {
- #include "packet-atn-cm-ettarr.c"
- &ett_atn_cm
- };
-
- /* register CM application */
- proto_atn_cm = proto_register_protocol(
- ATN_CM_PROTO ,
- "ATN-CM",
- "atn-cm");
-
- proto_register_field_array(
- proto_atn_cm,
- hf_atn_cm,
- array_length(hf_atn_cm));
-
- proto_register_subtree_array(
- ett,
- array_length(ett));
-
- new_register_dissector(
- "atn-cm",
- dissect_atn_cm,
- proto_atn_cm);
+ static gint *ett[] = {
+ #include "packet-atn-cm-ettarr.c"
+ &ett_atn_cm
+ };
+
+ /* register CM application */
+ proto_atn_cm = proto_register_protocol(
+ ATN_CM_PROTO ,
+ "ATN-CM",
+ "atn-cm");
+
+ proto_register_field_array(
+ proto_atn_cm,
+ hf_atn_cm,
+ array_length(hf_atn_cm));
+
+ proto_register_subtree_array(
+ ett,
+ array_length(ett));
+
+ new_register_dissector(
+ "atn-cm",
+ dissect_atn_cm,
+ proto_atn_cm);
}
void proto_reg_handoff_atn_cm(void)
{
- /* add session dissector to subdissector list*/
- heur_dissector_add(
- "atn-ulcs",
- dissect_atn_cm_heur,
- "ATN-CM over ATN-ULCS",
- "atn-cm-ulcs",
- proto_atn_cm, HEURISTIC_ENABLE);
+ /* add session dissector to subdissector list*/
+ heur_dissector_add(
+ "atn-ulcs",
+ dissect_atn_cm_heur,
+ "ATN-CM over ATN-ULCS",
+ "atn-cm-ulcs",
+ proto_atn_cm, HEURISTIC_ENABLE);
}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local variables:
- * c-basic-offset: 2
- * tab-width: 2
- * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=2 tabstop=2 noexpandtab:
- * :indentSize=2:tabSize=2:noTabs=false:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/
-