From Graeme Lunt:

Here are a number of small patches for asn1 based dissectors:

acse:
  release request/response column information (many X.400/X.500 unbinds are
empty)
  "standardised" PNAME to "ISO 8650-1 OSI Association Control Service"
  fix for crash when using EXTERNAL dissector

rtse:
  column information when attempting a resume

x509if:
  generation of LDAP-style DNs from RDNSequences 
  new function x509if_get_last_dn() to get the last DN generated.

x509af:
  DSS parameters
  certificate extension naming
  subject naming of certificate

x509sat:
  Guide syntax (as SET now supported)
  PDU exports.
  
cms:
  verification of message digest attribute (SHA-1 and MD5)
  
ess:
  enumerated/restrictive/permissive/informative security categories

x411:
  generation of string encoding of X.400 addresses, trace information and message identifiers.

s4406:
  separate types for primary and copy precedence to allow better filtering (e.g. primary precedence = flash)
  priority-level-qualifier


svn path=/trunk/; revision=16508

1 files changed, 19 insertions, 2 deletions

diff --git a/asn1/s4406/s4406.asn b/asn1/s4406/s4406.asn
index c1f8773d2a..f9251dba39 100644
--- a/asn1/s4406/s4406.asn
+++ b/asn1/s4406/s4406.asn
@@ -130,7 +130,7 @@ OriginatorReference ::= MilitaryString
 --	VALUE MMHSPrecedence
 --	::= id-nato-mmhs-mm-primary-precedence
 
-MMHSPrecedence ::= INTEGER {deferred (0), routine (1), priority (2), immediate (3),
+PrimaryPrecedence ::= INTEGER {deferred (0), routine (1), priority (2), immediate (3),
 	flash (4), override (5), 
 -- these are used by some National systems XXX need to verify
 	ecp(16), critic(17), override(18)}
@@ -145,6 +145,13 @@ MMHSPrecedence ::= INTEGER {deferred (0), routine (1), priority (2), immediate (
 --	VALUE MMHSPrecedence 
 --	::= id-nato-mmhs-mm-copy-precedence
 
+-- we have expanded MMHSPrecedence to PrimaryPrecedence and CopyPrecedence to
+-- all rules to be written to highlight high priority messages.
+CopyPrecedence ::= INTEGER {deferred (0), routine (1), priority (2), immediate (3),
+	flash (4), override (5), 
+-- these are used by some National systems XXX need to verify
+	ecp(16), critic(17), override(18)}
+
 -- Note: Values 0 to 15 are reserved for NATO defined precedence levels. 
 -- Values 16 to 31 are reserved for national user.
 
@@ -200,13 +207,19 @@ OtherRecipientDesignator ::= SET {
 --	::= id-nato-mmhs-mm-pilot-forwarding-info
 
 PilotInformation ::= SEQUENCE {
-	pilotPrecedence	[0]	MMHSPrecedence OPTIONAL,
+	pilotPrecedence	[0]	PilotPrecedence OPTIONAL,
 		-- Note: Values 0 to 15 are reserved for NATO defined precedence levels.
 		-- Values 16 to 31 are reserved for national use.
 	pilotRecipient	[1]	SEQUENCE OF ORDescriptor OPTIONAL,
 	pilotSecurity	[2]	--Message--SecurityLabel OPTIONAL,
 	pilotHandling	[3]	SEQUENCE OF MilitaryString OPTIONAL}
 
+PilotPrecedence ::= INTEGER {deferred (0), routine (1), priority (2), immediate (3),
+	flash (4), override (5), 
+-- these are used by some National systems XXX need to verify
+	ecp(16), critic(17), override(18)}
+
+
 
 -- Acp127 message identifier
 -- a string to store routing indicator, station serial number and julian file 
@@ -261,4 +274,8 @@ BodyPartSequenceNumber ::= INTEGER
 -- Annex B for instruction on the use of its replacement, the
 -- ESSSecurityLabel.
 
+PriorityLevelQualifier ::= ENUMERATED {
+  low(0),
+  high(1) }
+
 END -- of Military heading extensions used in MMS