Consolidation of FTBP dissector into the X420 dissector.

svn path=/trunk/; revision=22178

5 files changed, 283 insertions, 5 deletions

diff --git a/asn1/x420/Makefile.nmake b/asn1/x420/Makefile.nmake
index aa4ef2d173..955a907bea 100644
--- a/asn1/x420/Makefile.nmake
+++ b/asn1/x420/Makefile.nmake
@@ -9,13 +9,15 @@ UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
 PROTOCOL_NAME=x420
 DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
 
+ASN_FILE_LIST=x420.asn ftbp.asn
+
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
 $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(PROTOCOL_NAME).asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf
 !IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn
+	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(ASN_FILE_LIST)
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/x420/ftbp.asn b/asn1/x420/ftbp.asn
new file mode 100644
index 0000000000..cc931e8ee6
--- /dev/null
+++ b/asn1/x420/ftbp.asn
@@ -0,0 +1,255 @@
+-- Module IPMSFileTransferBodyPartType (X.420:06/1999)
+IPMSFileTransferBodyPartType {joint-iso-itu-t mhs(6) ipms(1) modules(0)
+  file-transfer-body-part-type(9)} DEFINITIONS IMPLICIT TAGS ::=
+BEGIN
+
+-- Prologue
+-- Exports everything.
+IMPORTS
+  -- FTAM Attribute Types
+  Attribute-Extensions, Concurrency-Access, Date-and-Time-Attribute,
+    Legal-Qualification-Attribute, Object-Availability-Attribute,
+    Object-Size-Attribute, Pathname, Permitted-Actions-Attribute,
+    Private-Use-Attribute
+    --==
+    FROM ISO8571-FTAM {iso standard 8571 application-context(1) iso-ftam(1)}
+  -- ACSE definitions of AP-title and AE-qualifier
+  EXTERNALt, 
+  AE-qualifier, AP-title
+    --==
+    FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) apdus(0)
+      version1(1)}
+  -- IPMS Information Objects
+  EXTENDED-BODY-PART-TYPE, ExtensionsField
+    --==
+    FROM IPMSInformationObjects {joint-iso-itu-t mhs(6) ipms(1) modules(0)
+      information-objects(2) version-1999(1)}
+  -- IPMS Object Identifiers
+--  id-ep-file-transfer, id-et-file-transfer
+    --==
+--    FROM IPMSObjectIdentifiers {joint-iso-itu-t mhs(6) ipms(1) modules(0)
+--      object-identifiers(0) version-1999(1)}
+  -- MTS Abstract Service
+  ORName
+    --==
+    FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0)
+      mts-abstract-service(1) version-1999(1)};
+
+-- File Transfer body part
+--file-transfer-body-part EXTENDED-BODY-PART-TYPE ::= {
+--  PARAMETERS  {FileTransferParameters
+--               IDENTIFIED BY  id-ep-file-transfer},
+--  DATA        {FileTransferData
+--               IDENTIFIED BY  id-et-file-transfer}
+--}
+
+FileTransferParameters ::= SEQUENCE {
+  related-stored-file  [0]  RelatedStoredFile OPTIONAL,
+  contents-type
+    [1]  ContentsTypeParameter OPTIONAL
+--      DEFAULT
+--        document-type:
+--          {document-type-name
+--           {iso standard 8571 document-type(5) unstructured-binary(3)}}--,
+  environment          [2]  EnvironmentParameter OPTIONAL,
+  compression          [3]  CompressionParameter OPTIONAL,
+  file-attributes      [4]  FileAttributes OPTIONAL,
+  extensions           [5]  ExtensionsField OPTIONAL
+}
+
+FileTransferData ::= SEQUENCE OF EXTERNALt
+
+-- This conveys a sequence of data values representing file contents;
+-- The rules for generating this sequence are implied by the value of the contents-type parameter.
+RelatedStoredFile ::=
+  SET OF
+    SEQUENCE {file-identifier  FileIdentifier,
+              relationship
+                Relationship OPTIONAL -- DEFAULT explicit-relationship:unspecified
+    }
+
+FileIdentifier ::= CHOICE {
+  pathname-and-version  [0]  PathnameandVersion,
+  cross-reference       [1]  CrossReference
+}
+
+PathnameandVersion ::= SEQUENCE {
+  pathname      [0]  Pathname-Attribute,
+  file-version  [1]  GraphicString OPTIONAL
+}
+
+CrossReference ::= SEQUENCE {
+  application-cross-reference  [0]  OCTET STRING,
+  message-reference            [1]  MessageReference OPTIONAL,
+  body-part-reference          [2]  INTEGER OPTIONAL
+}
+
+MessageReference ::= SET {
+  user                      [0]  ORName OPTIONAL,
+  -- Defined in 8.5.5 of ITU-T Rec. X.411 | ISO/IEC 10021-4
+  user-relative-identifier  [1]  PrintableString
+}
+
+Relationship ::= CHOICE {
+  explicit-relationship     [0]  ExplicitRelationship,
+  descriptive-relationship  [1]  GraphicString
+}
+
+ExplicitRelationship ::= INTEGER {
+  unspecified(0), new-file(1), replacement(2), extension(3)}
+
+ContentsTypeParameter ::= Contents-Type-Attribute
+
+Contents-Type-Attribute ::= CHOICE {
+  document-type
+    [0]  SEQUENCE {document-type-name  Document-Type-Name,
+                   parameter           [0]  --DOCUMENT-PARAMETER.&Type -- ANY OPTIONAL
+  },
+  -- The actual types to be used for values of the parameter field
+  -- are defined in the named document type.
+  constraint-set-and-abstract-syntax
+    [1]  SEQUENCE {constraint-set-name   Constraint-Set-Name,
+                   abstract-syntax-name  Abstract-Syntax-Name}
+}
+
+Document-Type-Name ::= OBJECT IDENTIFIER
+
+--DOCUMENT-PARAMETER ::= CLASS {&Type  
+--}
+
+Constraint-Set-Name ::= OBJECT IDENTIFIER
+
+Abstract-Syntax-Name ::= OBJECT IDENTIFIER
+
+EnvironmentParameter ::= SEQUENCE {
+  application-reference  [0]  GeneralIdentifier OPTIONAL,
+  machine                [1]  GeneralIdentifier OPTIONAL,
+  operating-system       [2]  OBJECT IDENTIFIER OPTIONAL,
+  user-visible-string    [3]  SEQUENCE OF GraphicString OPTIONAL
+}
+
+GeneralIdentifier ::= CHOICE {
+  registered-identifier   [0]  OBJECT IDENTIFIER,
+  descriptive-identifier  [1]  SEQUENCE OF GraphicString
+}
+
+CompressionParameter ::= SEQUENCE {
+  compression-algorithm-id
+    [0]  -- COMPRESSION-ALGORITHM.&id({CompressionAlgorithmTable}) --OBJECT IDENTIFIER,
+  compression-algorithm-param
+    [1]  --COMPRESSION-ALGORITHM.&Type
+--           ({CompressionAlgorithmTable}{@compression-algorithm-id})
+         ANY
+}
+
+--COMPRESSION-ALGORITHM ::= TYPE-IDENTIFIER
+
+--CompressionAlgorithmTable COMPRESSION-ALGORITHM ::=
+--  {...}
+
+FileAttributes ::= SEQUENCE {
+  pathname                                      Pathname-Attribute OPTIONAL,
+  permitted-actions
+    [1]  Permitted-Actions-Attribute OPTIONAL,
+  storage-account                               [3]  Account-Attribute OPTIONAL,
+  date-and-time-of-creation
+    [4]  Date-and-Time-Attribute OPTIONAL,
+  date-and-time-of-last-modification
+    [5]  Date-and-Time-Attribute OPTIONAL,
+  date-and-time-of-last-read-access
+    [6]  Date-and-Time-Attribute OPTIONAL,
+  date-and-time-of-last-attribute-modification
+    [7]  Date-and-Time-Attribute OPTIONAL,
+  identity-of-creator
+    [8]  User-Identity-Attribute OPTIONAL,
+  identity-of-last-modifier
+    [9]  User-Identity-Attribute OPTIONAL,
+  identity-of-last-reader
+    [10]  User-Identity-Attribute OPTIONAL,
+  identity-of-last-attribute-modifier
+    [11]  User-Identity-Attribute OPTIONAL,
+  object-availability
+    [12]  Object-Availability-Attribute OPTIONAL,
+  object-size
+    [13]  Object-Size-Attribute OPTIONAL,
+  future-object-size
+    [14]  Object-Size-Attribute OPTIONAL,
+  access-control
+    [15]  Access-Control-Attribute OPTIONAL,
+  legal-qualifications
+    [16]  Legal-Qualification-Attribute OPTIONAL,
+  private-use
+    [17]  Private-Use-Attribute OPTIONAL,
+  attribute-extensions
+    [22]  Attribute-Extensions OPTIONAL
+}
+
+Pathname-Attribute ::= CHOICE {
+  incomplete-pathname  [0]  Pathname,
+  complete-pathname    [23]  Pathname
+}
+
+Account-Attribute ::= CHOICE {
+  no-value-available  [0]  NULL,
+  -- Indicates partial support of this attribute
+  actual-values       Account
+}
+
+Account ::= GraphicString
+
+User-Identity-Attribute ::= CHOICE {
+  no-value-available  [0]  NULL,
+  -- Indicates partial support of this attribute.
+  actual-values       User-Identity
+}
+
+User-Identity ::= GraphicString
+
+Access-Control-Attribute ::= CHOICE {
+  no-value-available  [0]  NULL,
+  -- Indicates partial support of this attribute.
+  actual-values       [1]  SET OF Access-Control-Element
+}
+
+--  The semantics of this attribute are described in ISO 8571-2
+Access-Control-Element ::= SEQUENCE {
+  action-list         [0]  Access-Request,
+  concurrency-access  [1]  Concurrency-Access OPTIONAL,
+  identity            [2]  User-Identity OPTIONAL,
+  passwords           [3]  Access-Passwords OPTIONAL,
+  location            [4]  Application-Entity-Title OPTIONAL
+}
+
+Access-Request ::= BIT STRING {
+  read(0), insert(1), replace(2), extend(3), erase(4), read-attribute(5),
+  change-attribute(6), delete-object(7)}
+
+Access-Passwords ::= SEQUENCE {
+  read-password              [0]  Password,
+  insert-password            [1]  Password,
+  replace-password           [2]  Password,
+  extend-password            [3]  Password,
+  erase-password             [4]  Password,
+  read-attribute-password    [5]  Password,
+  change-attribute-password  [6]  Password,
+  delete-password            [7]  Password,
+  pass-passwords             [8]  Pass-Passwords,
+  link-password              [9]  Password
+}
+
+Password ::= CHOICE {
+  graphic-string  GraphicString,
+  octet-string    OCTET STRING
+}
+
+Pass-Passwords ::= SEQUENCE OF Password
+
+Application-Entity-Title ::= SEQUENCE {
+  ap-title      AP-title,
+  ae-qualifier  AE-qualifier
+}
+
+END -- of IPMSFileTransferBodyPartType
+
+-- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
+
diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c
index 2ea131ab9c..4bae685b41 100644
--- a/asn1/x420/packet-x420-template.c
+++ b/asn1/x420/packet-x420-template.c
@@ -42,6 +42,7 @@
 
 #include "packet-x509af.h"
 #include "packet-x509ce.h"
+#include "packet-ftam.h"
 #include "packet-x411.h"
 
 #include "packet-x420.h"
diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf
index a2a0b88f62..6a70fb1e17 100644
--- a/asn1/x420/x420-exp.cnf
+++ b/asn1/x420/x420-exp.cnf
@@ -1,10 +1,11 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# .\x420-exp.cnf
-# ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn
+# ./x420-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn ftbp.asn
 
 #.MODULE
-IPMSInformationObjects  x420
+IPMSInformationObjects        x420
+IPMSFileTransferBodyPartType  x420
 #.END
 
 #.IMPORT_TAG
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index fa15a9a079..99afc2943d 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -4,11 +4,17 @@ Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
 #.MODULE_IMPORT
 MTSAbstractService	x411
 
+#.INCLUDE ../ftam/ftam-exp.cnf
 #.INCLUDE ../x411/x411-exp.cnf
 #.INCLUDE ../x509af/x509af-exp.cnf
 #.INCLUDE ../x509ce/x509ce-exp.cnf
 #.INCLUDE ../acse/acse-exp.cnf
 
+
+#.MODULE
+x420		x420
+ftbp		ftbp
+
 #.EXPORTS
 ORDescriptor
 InformationObject
@@ -43,11 +49,18 @@ G3FacsimileParameters/non-basic-parameters	g3facsimile_non_basic_parameters
 BodyPart/encrypted		encrypted_bp
 CirculationSignatureData/algorithm-identifier	circulation-signature-algorithm-identifier
 
+Account-Attribute/actual-values		account-actual-values
+User-Identity-Attribute/actual-values	identity-actual-values
+
+MessageReference/user-relative-identifier user-relative-identifier-ref
+
 #.PDU
 OriginatingUA
 AbsenceAdvice
 ChangeOfAddressAdvice
 IPMAssemblyInstructions
+FileTransferData
+FileTransferParameters
 
 #.REGISTER
 OriginatingUA 			B "1.2.826.0.1004.10.1.1" "nexor-originating-ua"
@@ -89,7 +102,8 @@ BilaterallyDefinedBodyPart 	B "2.6.1.4.9" 	"id-et-bilaterally-defined"
 
 GeneralTextParameters		B "2.6.1.11.11"	"id-ep-general-text"
 GeneralTextData				B "2.6.1.4.11"	"id-et-general-text"
-# FileTransferBodyPart {id-et 12} in a separate dissector (ftbp)
+FileTransferParameters	B	"2.6.1.11.12"	"id-ep-file-transfer"
+FileTransferData	B	"2.6.1.4.12"	"id-et-file-transfer"
 # {id-et 13} is no longer defined
 # ForwardedReportBodyPart {id-et 14} defined in x411.cnf
 MessageParameters 			B "2.6.1.11.15" "id-ep-notification"
@@ -166,6 +180,11 @@ ForwardedContentParameters 	B "2.6.1.11.17.1.3.26.0.4406.0.4.1" 	"id-ep-content-
 #.FN_BODY NationallyDefinedBodyPart
 /* XXX Not implemented yet */
 
+#.FN_BODY Contents-Type-Attribute/document-type/parameter
+/* XXX: Not implemented yet */
+
+#.FN_BODY CompressionParameter/compression-algorithm-param
+/* XXX: Not implemented yet */
 
 #.END