Better split between dissectors and fixes for s4406 SEQ OF defined extensions

svn path=/trunk/; revision=18108

5 files changed, 47 insertions, 9 deletions

diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c
index 8b883f38ac..a3fa7f5dbc 100644
--- a/asn1/s4406/packet-s4406-template.c
+++ b/asn1/s4406/packet-s4406-template.c
@@ -78,7 +78,7 @@ dissect_s4406(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	if (check_col(pinfo->cinfo, COL_INFO))
 	  col_add_str(pinfo->cinfo, COL_INFO, "Military");
 
-	dissect_x420_InformationObject(TRUE, tvb, offset, pinfo , tree, -1);
+	dissect_s4406_InformationObject(TRUE, tvb, offset, pinfo , tree, -1);
 }
 
 
diff --git a/asn1/s4406/s4406.asn b/asn1/s4406/s4406.asn
index f9251dba39..c759a154cf 100644
--- a/asn1/s4406/s4406.asn
+++ b/asn1/s4406/s4406.asn
@@ -8,7 +8,7 @@ BEGIN
 IMPORTS
 
 -- IPMS information objects
-IPMS-EXTENSION, ORDescriptor
+IPMS-EXTENSION, ORDescriptor, IPM, IPN, MessageParameters
 ---
 FROM IPMSInformationObjects { joint-iso-ccitt  mhs-motis(6) ipms(1)
 	modules(0) information-objects(2) }
@@ -43,12 +43,22 @@ FROM IPMSInformationObjects { joint-iso-ccitt  mhs-motis(6) ipms(1)
 FROM MTSAbstractService {joint-iso-ccitt  mhs-motis(6) mts(3)
 	modules(0) mts-abstract-service(1) };
 
+-- Information object
+InformationObject ::= CHOICE {mm  [0]  IPM,
+                              mn [1]   IPN
+}
+
+MMMessageData ::= IPM
+MMMessageParameters ::= MessageParameters
+
 -- exempted address
 
 --exempted-address IPMS-EXTENSION
 --	VALUE SEQUENCE OF ExemptedAddress
 --	::= id-nato-mmhs-mm-exempted-address
 
+ExemptedAddressSeq ::= ExemptedAddress
+
 ExemptedAddress ::= ORDescriptor
 
 
@@ -180,6 +190,8 @@ MessageIdentifier ::= MilitaryString
 --	VALUE SEQUENCE OF AddressListDesignator
 --	::=id-nato-mmhs-mm-address-list-indicator
 
+AddressListDesignatorSeq ::= SEQUENCE OF AddressListDesignator
+
 AddressListDesignator ::=SET {
 	type	[0]	INTEGER
 				{ primaryAddressList(0), copyAddressList(1) },
@@ -195,6 +207,8 @@ AddressListRequest ::= INTEGER { action(0), info(1), both(2) }
 --	VALUE SEQUENCE OF OtherRecipientDesignator
 --	::=id-nato-mmhs-mm-other-recipients-indicator
 
+OtherRecipientDesignatorSeq ::= SEQUENCE OF OtherRecipientDesignator
+
 OtherRecipientDesignator ::= SET {
 	type	[0]	INTEGER { primary(0), copy(1) },
 	designator	[1]	MilitaryString }
@@ -206,6 +220,8 @@ OtherRecipientDesignator ::= SET {
 --	VALUE SEQUENCE OF PilotInformation
 --	::= id-nato-mmhs-mm-pilot-forwarding-info
 
+PilotInformationSeq ::= SEQUENCE OF PilotInformation
+
 PilotInformation ::= SEQUENCE {
 	pilotPrecedence	[0]	PilotPrecedence OPTIONAL,
 		-- Note: Values 0 to 15 are reserved for NATO defined precedence levels.
diff --git a/asn1/s4406/s4406.cnf b/asn1/s4406/s4406.cnf
index f5850b38bc..69ff66db9f 100644
--- a/asn1/s4406/s4406.cnf
+++ b/asn1/s4406/s4406.cnf
@@ -36,22 +36,30 @@ SecurityInformationLabels
 PrimaryPrecedence 		B "1.3.26.0.4406.0.2.0" "primary-precedence"
 CopyPrecedence 			B "1.3.26.0.4406.0.2.1" "copy-precedence"
 MessageType 			B "1.3.26.0.4406.0.2.2" "message-type"
-AddressListDesignator 		B "1.3.26.0.4406.0.2.3" "address-list-indicator"
-ExemptedAddress 		B "1.3.26.0.4406.0.2.4" "exempted-address"
+AddressListDesignatorSeq 	B "1.3.26.0.4406.0.2.3" "address-list-indicator"
+ExemptedAddressSeq 		B "1.3.26.0.4406.0.2.4" "exempted-address"
 ExtendedAuthorisationInfo 	B "1.3.26.0.4406.0.2.5" "extended-authorisation-info"
 DistributionCodes 		B "1.3.26.0.4406.0.2.6" "distribution-codes"
 HandlingInstructions 		B "1.3.26.0.4406.0.2.7" "handling-instructions"
 MessageInstructions 		B "1.3.26.0.4406.0.2.8" "message-instructions"
 CodressMessage 			B "1.3.26.0.4406.0.2.9" "codress-message"
 OriginatorReference 		B "1.3.26.0.4406.0.2.10" "originator-reference"
-OtherRecipientDesignator 	B "1.3.26.0.4406.0.2.11" "other-recipients-indicator"
-PilotInformation 		B "1.3.26.0.4406.0.2.12" "pilot-forwarding-info"
+OtherRecipientDesignatorSeq 	B "1.3.26.0.4406.0.2.11" "other-recipients-indicator"
+PilotInformationSeq 		B "1.3.26.0.4406.0.2.12" "pilot-forwarding-info"
 Acp127MessageIdentifier 	B "1.3.26.0.4406.0.2.13" "acp127-message-identifierr"
 OriginatorPlad 			B "1.3.26.0.4406.0.2.14" "originator-plad"
 SecurityInformationLabels 	B "1.3.26.0.4406.0.2.17" "information-labels"
 
 PriorityLevelQualifier		B "1.3.26.0.4406.0.8.0"	 "priority-level-qualifier"
 
+
+
+MMMessageData			B "1.3.26.0.4406.0.7.9" "mm-message"
+MMMessageParameters		B "1.3.26.0.4406.0.7.10" "mm-message-parameters"
+
+InformationObject	 	B "2.6.1.4.17.1.3.26.0.4406.0.4.1" 	"id-et-content-p772"
+
+
 #.FN_BODY T_dist_value
 /* XXX: not implemented */
 
diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf
index 5596ecc11c..61af6bf794 100644
--- a/asn1/x420/x420-exp.cnf
+++ b/asn1/x420/x420-exp.cnf
@@ -1,12 +1,18 @@
 #.IMPORT_TAG
 InformationObject        BER_CLASS_ANY/*choice*/ -1/*choice*/
+IPM                      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 ORDescriptor             BER_CLASS_UNI BER_UNI_TAG_SET
 ExtensionsField          BER_CLASS_UNI BER_UNI_TAG_SET
+MessageParameters        BER_CLASS_UNI BER_UNI_TAG_SET
+IPN                      BER_CLASS_UNI BER_UNI_TAG_SET
 #.END
 
 #.TYPE_ATTR
 InformationObject        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x420_InformationObject_vals)  BITMASK = 0
+IPM                      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ORDescriptor             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ExtensionsField          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+MessageParameters        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+IPN                      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 #.END
 
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index d46da6e9c7..9eed9c8f3d 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -1,3 +1,6 @@
+#.TYPE_ATTR
+Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
+
 #.MODULE_IMPORT
 MTSAbstractService	x411
 AuthenticationFramework	x509af
@@ -13,6 +16,9 @@ ACSE-1			acse
 ORDescriptor
 InformationObject
 ExtensionsField
+IPM
+IPN
+MessageParameters
 
 #.FIELD_RENAME
 
@@ -50,7 +56,7 @@ AbsenceAdvice		B "2.6.1.19.0"  "id-on-absence-advice"
 ChangeOfAddressAdvice	B "2.6.1.19.1"  "id-on-change-of-address-advice"
 IPMAssemblyInstructions	B "2.6.1.17.2"  "id-mst-assembly-instructions"
 
-IncompleteCopy			B "2.6.1.5.0"	"id-hex-languages"
+IncompleteCopy			B "2.6.1.5.0"	"id-hex-incomplete-copy"
 Languages			B "2.6.1.5.1"	"id-hex-languages"
 AutoSubmitted			B "2.6.1.5.2"	"id-hex-auto-submitted"
 BodyPartSignatures		B "2.6.1.5.3"	"id-hex-body-part-signatures"
@@ -99,8 +105,8 @@ ForwardedContentParameters 	B "2.6.1.11.17.2.6.1.10.0" 	"id-ep-content-p2"
 InformationObject		B "2.6.1.4.17.2.6.1.10.0" 	"id-et-content-p2"
 #p722
 ForwardedContentParameters 	B "2.6.1.11.17.1.3.26.0.4406.0.4.1" 	"id-ep-content-p772"
-# this will display as P22 for now
-InformationObject	 	B "2.6.1.4.17.1.3.26.0.4406.0.4.1" 	"id-et-content-p772"
+
+
 # PKCS#7Bodypart {id-et 18} defined in cms.cnf
 
 #.FN_PARS IPMSExtension/type
@@ -162,3 +168,5 @@ InformationObject	 	B "2.6.1.4.17.1.3.26.0.4406.0.4.1" 	"id-et-content-p772"
 /* XXX Not implemented yet */
 
 
+#.END
+