diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-01-21 12:21:29 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-01-21 12:21:29 +0000 |
commit | 37b1c97c13aa05c6eb44687d95409709a46b0070 (patch) | |
tree | 1f46c927d6bdbdb46be081dd4936a0c8f6bac074 /asn1/goose | |
parent | 00bf1ba8d3eec4fc5ee3c2c47921d9e821447213 (diff) |
From Martin Lutz:
Updated the GOOSE dissector ASN.1 file to be able to display data for UTC timestamps.
svn path=/trunk/; revision=40628
Diffstat (limited to 'asn1/goose')
-rw-r--r-- | asn1/goose/goose.asn | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/asn1/goose/goose.asn b/asn1/goose/goose.asn index 5247ac98a6..3caf0c2813 100644 --- a/asn1/goose/goose.asn +++ b/asn1/goose/goose.asn @@ -116,21 +116,29 @@ UtcTime ::= OCTET STRING -- format and size defined in 8.1.3.6. TimeOfDay ::= OCTET STRING -- (SIZE (4 | 6)) FloatingPoint ::= OCTET STRING -Data ::= CHOICE { + +Data ::= CHOICE + { -- context tag 0 is reserved for AccessResult - array [1] IMPLICIT SEQUENCE OF Data, - structure [2] IMPLICIT SEQUENCE OF Data, - boolean [3] IMPLICIT BOOLEAN, - bit-string [4] IMPLICIT BIT STRING, - integer [5] IMPLICIT INTEGER, - unsigned [6] IMPLICIT INTEGER, - floating-point [7] IMPLICIT FloatingPoint, - real [8] IMPLICIT REAL, - octet-string [9] IMPLICIT OCTET STRING, - visible-string [10] IMPLICIT VisibleString, - binary-time [12] IMPLICIT TimeOfDay, - bcd [13] IMPLICIT INTEGER, - booleanArray [14] IMPLICIT BIT STRING -} + array [1] IMPLICIT SEQUENCE OF Data, + structure [2] IMPLICIT SEQUENCE OF Data, + boolean [3] IMPLICIT BOOLEAN, + bit-string [4] IMPLICIT BIT STRING, + integer [5] IMPLICIT INTEGER, + unsigned [6] IMPLICIT INTEGER, + floating-point [7] IMPLICIT FloatingPoint, + real [8] IMPLICIT REAL, + octet-string [9] IMPLICIT OCTET STRING, + visible-string [10] IMPLICIT VisibleString, + binary-time [12] IMPLICIT TimeOfDay, + bcd [13] IMPLICIT INTEGER, + booleanArray [14] IMPLICIT BIT STRING, + objId [15] IMPLICIT OBJECT IDENTIFIER, + ..., + mMSString [16] IMPLICIT MMSString, + utc-time [17] IMPLICIT UtcTime -- added by IEC61850 8.1 G3 + } + +MMSString ::= UTF8String END |