Update MAP_DialoguePDU to 3GPP TS 29.002 V8.1.0 (2007-03) update makefiles and

rename the asn file.

TCAP ad Id and update makefiles.

svn path=/trunk/; revision=21845

11 files changed, 154 insertions, 203 deletions

diff --git a/asn1/MAP_Dialogue/MAP-DialogueInformation.asn b/asn1/MAP_Dialogue/MAP-DialogueInformation.asn
new file mode 100644
index 0000000000..9e7c075922
--- /dev/null
+++ b/asn1/MAP_Dialogue/MAP-DialogueInformation.asn
@@ -0,0 +1,127 @@
+-- $Id$
+-- 17.4	MAP Dialogue Information
+-- 3GPP TS 29.002 V8.1.0 (2007-03)
+MAP-DialogueInformation {
+   itu-t identified-organization (4) etsi (0) mobileDomain (0)
+   gsm-Network (1) modules (3) map-DialogueInformation (3) version11 (11)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+
+::=
+
+BEGIN
+
+EXPORTS
+	map-DialogueAS,
+	MAP-DialoguePDU
+
+;
+
+IMPORTS
+	gsm-NetworkId,
+	as-Id
+FROM MobileDomainDefinitions {
+   itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+   mobileDomainDefinitions (0) version1 (1)}
+
+	AddressString
+FROM MAP-CommonDataTypes {
+   itu-t identified-organization (4) etsi (0) mobileDomain (0)
+   gsm-Network(1) modules (3) map-CommonDataTypes (18) version11 (11)}
+
+	ExtensionContainer
+FROM MAP-ExtensionDataTypes {
+   itu-t identified-organization (4) etsi (0) mobileDomain (0)
+   gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version11 (11)}
+
+
+;
+
+
+-- abstract syntax name for MAP-DialoguePDU
+
+map-DialogueAS  OBJECT IDENTIFIER ::=
+	{gsm-NetworkId as-Id map-DialoguePDU (1) version1 (1)}
+
+MAP-DialoguePDU ::= CHOICE {
+	map-open		[0] MAP-OpenInfo,
+	map-accept	[1] MAP-AcceptInfo,
+	map-close		[2] MAP-CloseInfo,
+	map-refuse	[3] MAP-RefuseInfo,
+	map-userAbort	[4] MAP-UserAbortInfo,
+	map-providerAbort	[5] MAP-ProviderAbortInfo}
+
+MAP-OpenInfo ::= SEQUENCE {
+	destinationReference	[0] AddressString	OPTIONAL,
+	originationReference	[1] AddressString	OPTIONAL,
+	...,
+	extensionContainer	ExtensionContainer	OPTIONAL
+	-- extensionContainer must not be used in version 2
+	}
+
+MAP-AcceptInfo ::= SEQUENCE {
+	...,
+	extensionContainer	ExtensionContainer	OPTIONAL
+	-- extensionContainer must not be used in version 2
+	}
+
+MAP-CloseInfo ::= SEQUENCE {
+	...,
+	extensionContainer	ExtensionContainer	OPTIONAL
+	-- extensionContainer must not be used in version 2
+	}
+
+MAP-RefuseInfo ::= SEQUENCE {
+	reason	Reason,
+	...,
+	extensionContainer	ExtensionContainer	OPTIONAL,
+	-- extensionContainer must not be used in version 2
+	alternativeApplicationContext	OBJECT IDENTIFIER	OPTIONAL
+	-- alternativeApplicationContext must not be used in version 2
+	}
+
+Reason ::= ENUMERATED {
+	noReasonGiven	(0),
+	invalidDestinationReference	(1),
+	invalidOriginatingReference	(2)}
+
+MAP-UserAbortInfo ::= SEQUENCE {
+	map-UserAbortChoice	MAP-UserAbortChoice,
+	...,
+	extensionContainer	ExtensionContainer	OPTIONAL
+	-- extensionContainer must not be used in version 2
+	}
+
+MAP-UserAbortChoice ::= CHOICE {
+	userSpecificReason	[0] NULL,
+	userResourceLimitation	[1] NULL,
+	resourceUnavailable	[2] ResourceUnavailableReason,
+	applicationProcedureCancellation	[3] ProcedureCancellationReason}
+
+ResourceUnavailableReason ::= ENUMERATED {
+	shortTermResourceLimitation  (0),
+	longTermResourceLimitation  (1)}
+
+ProcedureCancellationReason ::= ENUMERATED {
+	handoverCancellation  (0),
+	radioChannelRelease  (1),
+	networkPathRelease  (2),
+	callRelease  (3),
+	associatedProcedureFailure  (4),
+	tandemDialogueRelease  (5),
+	remoteOperationsFailure  (6)}
+
+MAP-ProviderAbortInfo ::= SEQUENCE {
+	map-ProviderAbortReason	MAP-ProviderAbortReason,
+	...,
+	extensionContainer	ExtensionContainer	OPTIONAL
+	-- extensionContainer must not be used in version 2
+	}
+
+MAP-ProviderAbortReason ::= ENUMERATED {
+	abnormalDialogue  (0),
+	invalidPDU  (1)}
+
+END
diff --git a/asn1/MAP_Dialogue/MAP_DialoguePDU.asn b/asn1/MAP_Dialogue/MAP_DialoguePDU.asn
deleted file mode 100644
index 40547437eb..0000000000
--- a/asn1/MAP_Dialogue/MAP_DialoguePDU.asn
+++ /dev/null
@@ -1,143 +0,0 @@
-MAP-DialogueInformation {
-	itu-t identified-organization (4) etsi (0) mobileDomain (0)
-	gsm-Network (1) modules (3) map-DialogueInformation (3) version9 (9)}
-
-DEFINITIONS
-
-IMPLICIT TAGS
-	::=
-
-BEGIN
-
-EXPORTS
-	map-DialogueAS,
-	MAP-DialoguePDU,
-	map-ProtectedDialogueAS,
-	MAP-ProtectedDialoguePDU
-	;
-
-IMPORTS
-	gsm-NetworkId,
-	as-Id
-FROM MobileDomainDefinitions {
-	itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
-	mobileDomainDefinitions (0) version1 (1)}
-
-	AddressString
-FROM MAP-CommonDataTypes {
-	itu-t identified-organization (4) etsi (0) mobileDomain (0)
-	gsm-Network(1) modules (3) map-CommonDataTypes (18) version9 (9)}
-
-	ExtensionContainer
-FROM MAP-ExtensionDataTypes {
-	itu-t identified-organization (4) etsi (0) mobileDomain (0)
-	gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version9 (9)}
-
-	SecurityHeader,
-	ProtectedPayload
-FROM MAP-ST-DataTypes {
-	itu-t identified-organization (4) etsi (0) mobileDomain (0)
-	gsm-Network (1) modules (3) map-ST-DataTypes (27) version9 (9)}
-;
--- abstract syntax name for MAP-DialoguePDU
-
-map-DialogueAS OBJECT IDENTIFIER ::=
-	{gsm-NetworkId as-Id map-DialoguePDU (1) version1 (1)}
-;
-
-MAP-DialoguePDU ::= CHOICE {
-	map-open 		[0] IMPLICIT MAP-OpenInfo,
-	map-accept 		[1] IMPLICIT MAP-AcceptInfo,
-	map-close 		[2] IMPLICIT MAP-CloseInfo,
-	map-refuse 		[3] IMPLICIT MAP-RefuseInfo,
-	map-userAbort 		[4] IMPLICIT MAP-UserAbortInfo,
-	map-providerAbort 	[5] IMPLICIT MAP-ProviderAbortInfo}
-
-MAP-OpenInfo ::= SEQUENCE {
-	destinationReference [0] IMPLICIT AddressString OPTIONAL,
-	originationReference [1] IMPLICIT AddressString OPTIONAL,
-	...,
-	extensionContainer ExtensionContainer OPTIONAL
--- extensionContainer must not be used in version 2
-}
-
-MAP-AcceptInfo ::= SEQUENCE {
-	...,
-	extensionContainer ExtensionContainer OPTIONAL
--- extensionContainer must not be used in version 2
-}
-
-MAP-CloseInfo ::= SEQUENCE {
-	...,
-	extensionContainer ExtensionContainer OPTIONAL
--- extensionContainer must not be used in version 2
-}
-
-MAP-RefuseInfo ::= SEQUENCE {
-	reason Reason,
-	...,
-	extensionContainer ExtensionContainer OPTIONAL,
--- extensionContainer must not be used in version 2
-	alternativeApplicationContext OBJECT IDENTIFIER OPTIONAL
--- alternativeApplicationContext must not be used in version 2
-}
-
-Reason ::= ENUMERATED {
-	noReasonGiven (0),
-	invalidDestinationReference (1),
-	invalidOriginatingReference (2),
-	encapsulatedAC-NotSupported (3) ,
-	transportProtectionNotAdequate (4)}
--- encapsulatedAC-NotSupported and transportProtectionNotAdequate must not be used in
--- dialogues with an AC different from secureTransportHandling
-
-MAP-UserAbortInfo ::= SEQUENCE {
-	map-UserAbortChoice MAP-UserAbortChoice,
-	...,
-	extensionContainer ExtensionContainer OPTIONAL
--- extensionContainer must not be used in version 2
-}
-
-MAP-UserAbortChoice ::= CHOICE {
-	userSpecificReason 			[0] IMPLICIT NULL,
-	userResourceLimitation 			[1] IMPLICIT NULL,
-	resourceUnavailable 			[2] IMPLICIT ResourceUnavailableReason,
-	applicationProcedureCancellation 	[3] IMPLICIT ProcedureCancellationReason}
-
-ResourceUnavailableReason ::= ENUMERATED {
-	shortTermResourceLimitation (0),
-	longTermResourceLimitation (1)}
-
-ProcedureCancellationReason ::= ENUMERATED {
-	handoverCancellation (0),
-	radioChannelRelease (1),
-	networkPathRelease (2),
-	callRelease (3),
-	associatedProcedureFailure (4),
-	tandemDialogueRelease (5),
-	remoteOperationsFailure (6)}
-
-MAP-ProviderAbortInfo ::= SEQUENCE {
-	map-ProviderAbortReason MAP-ProviderAbortReason,
-	...,
-	extensionContainer ExtensionContainer OPTIONAL
--- extensionContainer must not be used in version 2
-}
-
-MAP-ProviderAbortReason ::= ENUMERATED {
-	abnormalDialogue (0),
-	invalidPDU (1)}
--- abstract syntax name for MAP-ProtectedDialoguePDU
-map-ProtectedDialogueAS OBJECT IDENTIFIER ::=
-	{gsm-NetworkId as-Id map-ProtectedDialoguePDU (3) version1 (1)}
-
-MAP-ProtectedDialoguePDU ::= SEQUENCE {
-	encapsulatedAC OBJECT IDENTIFIER,
-	securityHeader SecurityHeader OPTIONAL,
-	protectedPayload ProtectedPayload OPTIONAL,
-	...}
--- The protectedPayload carries the result of applying the security function
--- defined in 3GPP TS 33.200 to the encoding of the securely transported
--- MAP-DialoguePDU
-
-END
diff --git a/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf b/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf
index 70e0f28d91..dcfbeb2bd5 100644
--- a/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf
+++ b/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf
@@ -21,4 +21,8 @@ MAP-DialoguePDU
 
 #.FIELD_RENAME
 
+#.REGISTER
+MAP-DialoguePDU				B "0.4.0.0.1.1.1.1" "map-DialogueAS"
+# MAP-ProtectedDialoguePDU	B "0.4.0.0.1.1.3.1" "map-ProtectedDialogueAS"
+
 #.END
diff --git a/asn1/MAP_Dialogue/Makefile b/asn1/MAP_Dialogue/Makefile
index c25a1536f1..aaa34acdf7 100644
--- a/asn1/MAP_Dialogue/Makefile
+++ b/asn1/MAP_Dialogue/Makefile
@@ -1,13 +1,14 @@
 # $Id$
 
 DISSECTOR_FILES=packet-MAP_DialoguePDU.c packet-MAP_DialoguePDU.h
+MAP_DIALOUGE_PDU_ASN=MAP-DialogueInformation.asn
 
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf
-	python ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(MAP_DIALOUGE_PDU_ASN) packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf
+	python ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template $(MAP_DIALOUGE_PDU_ASN)
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/MAP_Dialogue/Makefile.nmake b/asn1/MAP_Dialogue/Makefile.nmake
index 5918e3d8d6..e970edb3f2 100644
--- a/asn1/MAP_Dialogue/Makefile.nmake
+++ b/asn1/MAP_Dialogue/Makefile.nmake
@@ -8,14 +8,15 @@ UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
 
 PROTOCOL_NAME=MAP_DialoguePDU
 DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
+MAP_DIALOUGE_PDU_ASN=MAP-DialogueInformation.asn
 
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(MAP_DIALOUGE_PDU_ASN) packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf
 !IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn
+	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template $(MAP_DIALOUGE_PDU_ASN)
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
index 835de236b0..64786ae2fe 100644
--- a/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
+++ b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
@@ -76,7 +76,5 @@ void proto_register_MAP_DialoguePDU(void) {
 
 /*--- proto_reg_handoff_MAP_DialoguePDU ---------------------------------------*/
 void proto_reg_handoff_MAP_DialoguePDU(void) {
-	register_ber_oid_dissector("0.4.0.0.1.1.1.1", dissect_MAP_DialoguePDU_PDU, proto_MAP_DialoguePDU, 
-	  "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) map-DialoguePDU(1) version1(1)");
-
+#include "packet-MAP_DialoguePDU-dis-tab.c" 
 }
diff --git a/asn1/tcap/Makefile b/asn1/tcap/Makefile
index b64ee4fbb5..d07bbe10e6 100644
--- a/asn1/tcap/Makefile
+++ b/asn1/tcap/Makefile
@@ -1,13 +1,14 @@
 # $Id$
 
 DISSECTOR_FILES=packet-tcap.c packet-tcap.h
+TCAP_ASN=tcap.asn
 
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py tcap.asn packet-tcap-template.c packet-tcap-template.h tcap.cnf 
-	python ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(TCAP_ASN) packet-tcap-template.c packet-tcap-template.h tcap.cnf 
+	python ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template $(TCAP_ASN)
 
 clean:
 	rm -f parsetab.py $(DISSECTOR_FILES)
diff --git a/asn1/tcap/Makefile.nmake b/asn1/tcap/Makefile.nmake
index 72adee46d9..ab82f91e27 100644
--- a/asn1/tcap/Makefile.nmake
+++ b/asn1/tcap/Makefile.nmake
@@ -8,14 +8,15 @@ UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
 
 PROTOCOL_NAME=tcap
 DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
+TCAP_ASN=tcap.asn
 
 all: generate_dissector
 
 generate_dissector: $(DISSECTOR_FILES)
 
-$(DISSECTOR_FILES): ../../tools/asn2wrs.py tcap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h tcap.cnf 
+$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(TCAP_ASN) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h tcap.cnf 
 !IFDEF PYTHON
-	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c tcap.cnf -s packet-$(PROTOCOL_NAME)-template tcap.asn
+	$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c tcap.cnf -s packet-$(PROTOCOL_NAME)-template $(TCAP_ASN)
 !ELSE
 	@echo Error: You need Python to use asn2wrs.py
 	@exit 1
diff --git a/asn1/tcap/tcap.asn b/asn1/tcap/tcap.asn
index 1afb819d1c..b9b15e5ae3 100644
--- a/asn1/tcap/tcap.asn
+++ b/asn1/tcap/tcap.asn
@@ -1,4 +1,4 @@
-
+-- $Id$
 DialoguePDUs { ccitt recommendation q 773 modules (2) dialoguePDUs(2) version1 (1) }
 
 DEFINITIONS ::=
diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c
index dcb19d14fd..de92ff9314 100644
--- a/epan/dissectors/packet-MAP_DialoguePDU.c
+++ b/epan/dissectors/packet-MAP_DialoguePDU.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* .\packet-MAP_DialoguePDU.c                                                 */
-/* ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
+/* ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP-DialogueInformation.asn */
 
 /* Input file: packet-MAP-DialoguePDU-template.c */
 
@@ -72,9 +72,6 @@ static int hf_MAP_DialoguePDU_userResourceLimitation = -1;  /* NULL */
 static int hf_MAP_DialoguePDU_resourceUnavailable = -1;  /* ResourceUnavailableReason */
 static int hf_MAP_DialoguePDU_applicationProcedureCancellation = -1;  /* ProcedureCancellationReason */
 static int hf_MAP_DialoguePDU_map_ProviderAbortReason = -1;  /* MAP_ProviderAbortReason */
-static int hf_MAP_DialoguePDU_encapsulatedAC = -1;  /* OBJECT_IDENTIFIER */
-static int hf_MAP_DialoguePDU_securityHeader = -1;  /* SecurityHeader */
-static int hf_MAP_DialoguePDU_protectedPayload = -1;  /* ProtectedPayload */
 
 /*--- End of included file: packet-MAP_DialoguePDU-hf.c ---*/
 #line 47 "packet-MAP-DialoguePDU-template.c"
@@ -91,7 +88,6 @@ static gint ett_MAP_DialoguePDU_MAP_RefuseInfo = -1;
 static gint ett_MAP_DialoguePDU_MAP_UserAbortInfo = -1;
 static gint ett_MAP_DialoguePDU_MAP_UserAbortChoice = -1;
 static gint ett_MAP_DialoguePDU_MAP_ProviderAbortInfo = -1;
-static gint ett_MAP_DialoguePDU_MAP_ProtectedDialoguePDU = -1;
 
 /*--- End of included file: packet-MAP_DialoguePDU-ett.c ---*/
 #line 50 "packet-MAP-DialoguePDU-template.c"
@@ -110,12 +106,6 @@ static int dissect_originationReference_impl(proto_tree *tree _U_, tvbuff_t *tvb
 static int dissect_extensionContainer(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
   return dissect_gsm_map_ExtensionContainer(FALSE, tvb, offset, actx, tree, hf_MAP_DialoguePDU_extensionContainer);
 }
-static int dissect_securityHeader(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_gsm_map_SecurityHeader(FALSE, tvb, offset, actx, tree, hf_MAP_DialoguePDU_securityHeader);
-}
-static int dissect_protectedPayload(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_gsm_map_ProtectedPayload(FALSE, tvb, offset, actx, tree, hf_MAP_DialoguePDU_protectedPayload);
-}
 
 
 static const ber_sequence_t MAP_OpenInfo_sequence[] = {
@@ -175,8 +165,6 @@ static const value_string MAP_DialoguePDU_Reason_vals[] = {
   {   0, "noReasonGiven" },
   {   1, "invalidDestinationReference" },
   {   2, "invalidOriginatingReference" },
-  {   3, "encapsulatedAC-NotSupported" },
-  {   4, "transportProtectionNotAdequate" },
   { 0, NULL }
 };
 
@@ -203,9 +191,6 @@ dissect_MAP_DialoguePDU_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *t
 static int dissect_alternativeApplicationContext(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
   return dissect_MAP_DialoguePDU_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_MAP_DialoguePDU_alternativeApplicationContext);
 }
-static int dissect_encapsulatedAC(proto_tree *tree _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_) {
-  return dissect_MAP_DialoguePDU_OBJECT_IDENTIFIER(FALSE, tvb, offset, actx, tree, hf_MAP_DialoguePDU_encapsulatedAC);
-}
 
 
 static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
@@ -398,22 +383,6 @@ dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb
   return offset;
 }
 
-
-static const ber_sequence_t MAP_ProtectedDialoguePDU_sequence[] = {
-  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_encapsulatedAC },
-  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_securityHeader },
-  { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_protectedPayload },
-  { 0, 0, 0, NULL }
-};
-
-static int
-dissect_MAP_DialoguePDU_MAP_ProtectedDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   MAP_ProtectedDialoguePDU_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProtectedDialoguePDU);
-
-  return offset;
-}
-
 /*--- PDUs ---*/
 
 static void dissect_MAP_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
@@ -507,18 +476,6 @@ void proto_register_MAP_DialoguePDU(void) {
       { "map-ProviderAbortReason", "MAP_DialoguePDU.map_ProviderAbortReason",
         FT_UINT32, BASE_DEC, VALS(MAP_DialoguePDU_MAP_ProviderAbortReason_vals), 0,
         "MAP_DialoguePDU.MAP_ProviderAbortReason", HFILL }},
-    { &hf_MAP_DialoguePDU_encapsulatedAC,
-      { "encapsulatedAC", "MAP_DialoguePDU.encapsulatedAC",
-        FT_OID, BASE_NONE, NULL, 0,
-        "MAP_DialoguePDU.OBJECT_IDENTIFIER", HFILL }},
-    { &hf_MAP_DialoguePDU_securityHeader,
-      { "securityHeader", "MAP_DialoguePDU.securityHeader",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "gsm_map.SecurityHeader", HFILL }},
-    { &hf_MAP_DialoguePDU_protectedPayload,
-      { "protectedPayload", "MAP_DialoguePDU.protectedPayload",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "gsm_map.ProtectedPayload", HFILL }},
 
 /*--- End of included file: packet-MAP_DialoguePDU-hfarr.c ---*/
 #line 60 "packet-MAP-DialoguePDU-template.c"
@@ -537,7 +494,6 @@ void proto_register_MAP_DialoguePDU(void) {
     &ett_MAP_DialoguePDU_MAP_UserAbortInfo,
     &ett_MAP_DialoguePDU_MAP_UserAbortChoice,
     &ett_MAP_DialoguePDU_MAP_ProviderAbortInfo,
-    &ett_MAP_DialoguePDU_MAP_ProtectedDialoguePDU,
 
 /*--- End of included file: packet-MAP_DialoguePDU-ettarr.c ---*/
 #line 65 "packet-MAP-DialoguePDU-template.c"
@@ -555,7 +511,12 @@ void proto_register_MAP_DialoguePDU(void) {
 
 /*--- proto_reg_handoff_MAP_DialoguePDU ---------------------------------------*/
 void proto_reg_handoff_MAP_DialoguePDU(void) {
-	register_ber_oid_dissector("0.4.0.0.1.1.1.1", dissect_MAP_DialoguePDU_PDU, proto_MAP_DialoguePDU, 
-	  "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) map-DialoguePDU(1) version1(1)");
 
+/*--- Included file: packet-MAP_DialoguePDU-dis-tab.c ---*/
+#line 1 "packet-MAP_DialoguePDU-dis-tab.c"
+  register_ber_oid_dissector("0.4.0.0.1.1.1.1", dissect_MAP_DialoguePDU_PDU, proto_MAP_DialoguePDU, "map-DialogueAS");
+
+
+/*--- End of included file: packet-MAP_DialoguePDU-dis-tab.c ---*/
+#line 80 "packet-MAP-DialoguePDU-template.c"
 }
diff --git a/epan/dissectors/packet-MAP_DialoguePDU.h b/epan/dissectors/packet-MAP_DialoguePDU.h
index 513303c835..d9aba6f601 100644
--- a/epan/dissectors/packet-MAP_DialoguePDU.h
+++ b/epan/dissectors/packet-MAP_DialoguePDU.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* .\packet-MAP_DialoguePDU.h                                                 */
-/* ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
+/* ../../tools/asn2wrs.py -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP-DialogueInformation.asn */
 
 /* Input file: packet-MAP-DialoguePDU-template.h */