osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent 

on the naming policy for X.400 protocols.

svn path=/trunk/; revision=36013
This commit is contained in:
Stig Bjørlykke 2011-02-20 17:03:29 +00:00
parent ba1138eb93
commit 5868c7d026
75 changed files with 18651 additions and 18651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asn1/Makefile.am
View File

@ -69,7 +69,10 @@ SUBDIRS = \
nbap \
ns_cert_exts \
ocsp \
p1 \
p22 \
p7 \
p772 \
pcap \
pkcs1 \
pkcs12 \
@ -92,7 +95,6 @@ SUBDIRS = \
rtse \
rua \
s1ap \
s4406 \
sabp \
smrse \
snmp \
@ -105,8 +107,6 @@ SUBDIRS = \
ulp \
wlancertextn \
x2ap \
x411 \
x420 \
x509af \
x509ce \
x509if \

6
asn1/Makefile.nmake
View File

@ -73,7 +73,10 @@ BER_LIST= \
mms \
ns_cert_exts \
ocsp \
p1 \
p22 \
p7 \
p772 \
pkcs1 \
pkcs12 \
pkinit \
@ -89,7 +92,6 @@ BER_LIST= \
qsig \
ros \
rtse \
s4406 \
smrse \
snmp \
spnego \
@ -97,8 +99,6 @@ BER_LIST= \
t125 \
tcap \
wlancertextn \
x411 \
x420 \
x509af \
x509ce \
x509if \

6
asn1/acp133/Makefile.common
View File

@ -46,13 +46,13 @@ SRC_FILES = \
A2W_FLAGS= -b
EXTRA_CNF= \
../x411/x411-exp.cnf \
../p1/p1-exp.cnf \
../x509af/x509af-exp.cnf \
../x509ce/x509ce-exp.cnf \
../x509if/x509if-exp.cnf
../x411/x411-exp.cnf:
(cd ../x411 && $(MAKE_CNF_EXPORT))
../p1/p1-exp.cnf:
(cd ../p1 && $(MAKE_CNF_EXPORT))
../x509af/x509af-exp.cnf:
(cd ../x509af && $(MAKE_CNF_EXPORT))

28
asn1/acp133/acp133.cnf
View File

@ -4,10 +4,10 @@
#.IMPORT ../x509ce/x509ce-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../p1/p1-exp.cnf
#.MODULE_IMPORT
MTSAbstractService x411
MTSAbstractService p1
#.PDU
ACPPreferredDelivery
@ -71,24 +71,24 @@ Kmid
# X.402
# ContentLength B "2.6.5.2.0" "id-at-mhs-maximum-content-length" - see x411.cnf
# ExtendedContentType B "2.6.5.2.1" "id-at-mhs-deliverable-content-types" - see x411.cnf
# ExtendedEncodedInformationType B "2.6.5.2.2" "id-at-mhs-exclusively-acceptable-eits" - see x411.cnf
# ORName B "2.6.5.2.3" "id-at-mhs-dl-members" - see x411.cnf
# ContentLength B "2.6.5.2.0" "id-at-mhs-maximum-content-length" - see p1.cnf
# ExtendedContentType B "2.6.5.2.1" "id-at-mhs-deliverable-content-types" - see p1.cnf
# ExtendedEncodedInformationType B "2.6.5.2.2" "id-at-mhs-exclusively-acceptable-eits" - see p1.cnf
# ORName B "2.6.5.2.3" "id-at-mhs-dl-members" - see p1.cnf
DLSubmitPermission B "2.6.5.2.4" "id-at-mhs-dl-submit-permissions"
# DistinguishedName B "2.6.5.2.5" "id-at-mhs-message-store-dn" - see x509if.cnf
# ORAddress B "2.6.5.2.6" "id-at-mhs-or-addresses" - see x411.cnf
# ORAddress B "2.6.5.2.6" "id-at-mhs-or-addresses" - see p1.cnf
# ObjectIdentifier B "2.6.5.2.8" "id-at-mhs-supported-automatic-actions" - see x509sat.cnf
# ExtendedContentType B "2.6.5.2.9" "id-at-mhs-supported-content-types" - see x411.cnf
# ExtendedContentType B "2.6.5.2.9" "id-at-mhs-supported-content-types" - see p1.cnf
# ObjectIdentifier B "2.6.5.2.10" "id-at-mhs-supported-attributes" - see x509sat.cnf
# ObjectIdentifier B "2.6.5.2.11" "id-at-mhs-supported-matching-rules" - see x509sat.cnf
# ORName B "2.6.5.2.12" "id-at-mhs-dl-archive-service" - see x411.cnf
# ORName B "2.6.5.2.12" "id-at-mhs-dl-archive-service" - see p1.cnf
DLPolicy B "2.6.5.2.13" "id-at-mhs-dl-policy"
# DistinguishedName B "2.6.5.2.14" "id-at-mhs-dl-related-lists" - see x509if.cnf
# ORName B "2.6.5.2.15" "id-at-mhs-dl-subscription-service" - see x411.cnf
# ORName B "2.6.5.2.15" "id-at-mhs-dl-subscription-service" - see p1.cnf
AddressCapabilities B "2.6.5.2.16" "id-at-mhs-or-addresses-with-capabilities"
# ExtendedEncodedInformationType B "2.6.5.2.17" "id-at-mhs-acceptable-eits" see x411.cnf
# ExtendedEncodedInformationType B "2.6.5.2.18" "id-at-mhs-unacceptable-eits" - see x411.cnf
# ExtendedEncodedInformationType B "2.6.5.2.17" "id-at-mhs-acceptable-eits" see p1.cnf
# ExtendedEncodedInformationType B "2.6.5.2.18" "id-at-mhs-unacceptable-eits" - see p1.cnf
Capability B "2.6.5.2.19" "id-at-mhs-deliverable-classes"
@ -106,7 +106,7 @@ MonthlyUKMs B "2.16.840.1.101.2.1.5.28" "id-at-sepUKMs"
MonthlyUKMs B "2.16.840.1.101.2.1.5.29" "id-at-octUKMs"
MonthlyUKMs B "2.16.840.1.101.2.1.5.30" "id-at-novUKMs"
MonthlyUKMs B "2.16.840.1.101.2.1.5.31" "id-at-decUKMs"
# ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor - see x411.cnf
# ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor - see p1.cnf
# ACP133
# DistinguishedName B "2.16.840.1.101.2.2.1.3" "id-at-alternateRecipient" - see x509if.cnf
@ -191,7 +191,7 @@ OnSupported B "2.16.840.1.101.2.2.1.123" "id-at-onSupported"
# DirectoryString B "2.16.840.1.101.2.2.1.129" "id-at-serviceNumber" - see x509sat.cnf
# DirectoryString B "2.16.840.1.101.2.2.1.133" "id-at-rank" - see x509sat.cnf
# B "2.16.840.1.101.2.2.1.134" "id-at-misc-collectives"
# ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" - see x411.cnf
# ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" - see p1.cnf
MLReceiptPolicy B "2.16.840.1.101.2.2.1.135" "id-at-aLReceiptPolicy"
# DistinguishedName B "2.16.840.1.101.2.2.1.138" "id-at-plasServed" - see x509if.cnf
#DistinguishedName B "2.16.840.1.101.2.2.1.139" "id-at-deployed" - see x509if.cnf

2
asn1/acp133/packet-acp133-template.c
View File

@ -37,7 +37,7 @@
#include "packet-x509af.h"
#include "packet-x509if.h"
#include "packet-x509ce.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include "packet-acp133.h"

2
asn1/cdt/cdt.cnf
View File

@ -103,7 +103,7 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt"
dissect_unknown_ber (actx->pinfo, next_tvb, 0, top_tree);
break;
case CDT_P1:
dissect_x411_mts_apdu (next_tvb, actx->pinfo, top_tree);
dissect_p1_mts_apdu (next_tvb, actx->pinfo, top_tree);
break;
default:
call_dissector (data_handle, next_tvb, actx->pinfo, top_tree);

2
asn1/cdt/packet-cdt-template.c
View File

@ -37,7 +37,7 @@
#include <epan/asn1.h>
#include "packet-ber.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include "packet-cdt.h"

0
asn1/x411/MHSProtocolObjectIdentifiers.asn → asn1/p1/MHSProtocolObjectIdentifiers.asn
View File

0
asn1/x411/MTAAbstractService.asn → asn1/p1/MTAAbstractService.asn
View File

0
asn1/x411/MTSAbstractService.asn → asn1/p1/MTSAbstractService.asn
View File

0
asn1/x411/MTSAccessProtocol.asn → asn1/p1/MTSAccessProtocol.asn
View File

0
asn1/x411/MTSUpperBounds.asn → asn1/p1/MTSUpperBounds.asn
View File

0
asn1/s4406/Makefile.am → asn1/p1/Makefile.am
View File

2
asn1/x411/Makefile.common → asn1/p1/Makefile.common
View File

@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
PROTOCOL_NAME=x411
PROTOCOL_NAME=p1
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
packet-$(PROTOCOL_NAME).h

0
asn1/s4406/Makefile.nmake → asn1/p1/Makefile.nmake
View File

220
asn1/x411/x411.cnf → asn1/p1/p1.cnf
View File

@ -1,9 +1,9 @@
# x411.cnf
# p1.cnf
# X.411 (MTA Access and Transfer) conformance file
# $Id$
#.TYPE_ATTR
CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_CountryName_U_vals) BITMASK = 0
CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(p1_CountryName_U_vals) BITMASK = 0
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.IMPORT ../x509ce/x509ce-exp.cnf
@ -341,101 +341,101 @@ OPERATION.&ResultType
#.REGISTER
RecipientReassignmentProhibited N x411.extension 1
OriginatorRequestedAlternateRecipient N x411.extension 2
DLExpansionProhibited N x411.extension 3
ConversionWithLossProhibited N x411.extension 4
LatestDeliveryTime N x411.extension 5
RequestedDeliveryMethod N x411.extension 6
PhysicalForwardingProhibited N x411.extension 7
PhysicalForwardingAddressRequest N x411.extension 8
PhysicalDeliveryModes N x411.extension 9
RegisteredMailType N x411.extension 10
RecipientNumberForAdvice N x411.extension 11
PhysicalRenditionAttributes N x411.extension 12
OriginatorReturnAddress N x411.extension 13
PhysicalDeliveryReportRequest N x411.extension 14
OriginatorCertificate N x411.extension 15
MessageToken N x411.extension 16
ContentConfidentialityAlgorithmIdentifier N x411.extension 17
ContentIntegrityCheck N x411.extension 18
MessageOriginAuthenticationCheck N x411.extension 19
MessageSecurityLabel N x411.extension 20
ProofOfSubmissionRequest N x411.extension 21
ProofOfDeliveryRequest N x411.extension 22
ContentCorrelator N x411.extension 23
ProbeOriginAuthenticationCheck N x411.extension 24
RedirectionHistory N x411.extension 25
DLExpansionHistory N x411.extension 26
PhysicalForwardingAddress N x411.extension 27
RecipientCertificate N x411.extension 28
ProofOfDelivery N x411.extension 29
OriginatorAndDLExpansionHistory N x411.extension 30
ReportingDLName N x411.extension 31
ReportingMTACertificate N x411.extension 32
ReportOriginAuthenticationCheck N x411.extension 33
ProofOfSubmission N x411.extension 35
RecipientReassignmentProhibited N p1.extension 1
OriginatorRequestedAlternateRecipient N p1.extension 2
DLExpansionProhibited N p1.extension 3
ConversionWithLossProhibited N p1.extension 4
LatestDeliveryTime N p1.extension 5
RequestedDeliveryMethod N p1.extension 6
PhysicalForwardingProhibited N p1.extension 7
PhysicalForwardingAddressRequest N p1.extension 8
PhysicalDeliveryModes N p1.extension 9
RegisteredMailType N p1.extension 10
RecipientNumberForAdvice N p1.extension 11
PhysicalRenditionAttributes N p1.extension 12
OriginatorReturnAddress N p1.extension 13
PhysicalDeliveryReportRequest N p1.extension 14
OriginatorCertificate N p1.extension 15
MessageToken N p1.extension 16
ContentConfidentialityAlgorithmIdentifier N p1.extension 17
ContentIntegrityCheck N p1.extension 18
MessageOriginAuthenticationCheck N p1.extension 19
MessageSecurityLabel N p1.extension 20
ProofOfSubmissionRequest N p1.extension 21
ProofOfDeliveryRequest N p1.extension 22
ContentCorrelator N p1.extension 23
ProbeOriginAuthenticationCheck N p1.extension 24
RedirectionHistory N p1.extension 25
DLExpansionHistory N p1.extension 26
PhysicalForwardingAddress N p1.extension 27
RecipientCertificate N p1.extension 28
ProofOfDelivery N p1.extension 29
OriginatorAndDLExpansionHistory N p1.extension 30
ReportingDLName N p1.extension 31
ReportingMTACertificate N p1.extension 32
ReportOriginAuthenticationCheck N p1.extension 33
ProofOfSubmission N p1.extension 35
TraceInformation N x411.extension 37
InternalTraceInformation N x411.extension 38
ReportingMTAName N x411.extension 39
ExtendedCertificates N x411.extension 40
TraceInformation N p1.extension 37
InternalTraceInformation N p1.extension 38
ReportingMTAName N p1.extension 39
ExtendedCertificates N p1.extension 40
DLExemptedRecipients N x411.extension 42
DLExemptedRecipients N p1.extension 42
CertificateSelectors N x411.extension 45
CertificateSelectors N p1.extension 45
CommonName N x411.extension-attribute 1
TeletexCommonName N x411.extension-attribute 2
TeletexOrganizationName N x411.extension-attribute 3
TeletexPersonalName N x411.extension-attribute 4
TeletexOrganizationalUnitNames N x411.extension-attribute 5
TeletexDomainDefinedAttributes N x411.extension-attribute 6
PDSName N x411.extension-attribute 7
PhysicalDeliveryCountryName N x411.extension-attribute 8
PostalCode N x411.extension-attribute 9
PhysicalDeliveryOfficeName N x411.extension-attribute 10
PhysicalDeliveryOfficeNumber N x411.extension-attribute 11
ExtensionORAddressComponents N x411.extension-attribute 12
PhysicalDeliveryPersonalName N x411.extension-attribute 13
PhysicalDeliveryOrganizationName N x411.extension-attribute 14
ExtensionPhysicalDeliveryAddressComponents N x411.extension-attribute 15
UnformattedPostalAddress N x411.extension-attribute 16
StreetAddress N x411.extension-attribute 17
PostOfficeBoxAddress N x411.extension-attribute 18
PosteRestanteAddress N x411.extension-attribute 19
UniquePostalName N x411.extension-attribute 20
LocalPostalAttributes N x411.extension-attribute 21
ExtendedNetworkAddress N x411.extension-attribute 22
TerminalType N x411.extension-attribute 23
UniversalCommonName N x411.extension-attribute 24
UniversalOrganizationName N x411.extension-attribute 25
UniversalPersonalName N x411.extension-attribute 26
UniversalOrganizationalUnitNames N x411.extension-attribute 27
UniversalDomainDefinedAttributes N x411.extension-attribute 28
UniversalPhysicalDeliveryOfficeName N x411.extension-attribute 29
UniversalPhysicalDeliveryOfficeNumber N x411.extension-attribute 30
UniversalExtensionORAddressComponents N x411.extension-attribute 31
UniversalPhysicalDeliveryPersonalName N x411.extension-attribute 32
UniversalPhysicalDeliveryOrganizationName N x411.extension-attribute 33
UniversalExtensionPhysicalDeliveryAddressComponents N x411.extension-attribute 34
UniversalUnformattedPostalAddress N x411.extension-attribute 35
UniversalStreetAddress N x411.extension-attribute 36
UniversalPostOfficeBoxAddress N x411.extension-attribute 37
UniversalPosteRestanteAddress N x411.extension-attribute 38
UniversalUniquePostalName N x411.extension-attribute 39
UniversalLocalPostalAttributes N x411.extension-attribute 40
CommonName N p1.extension-attribute 1
TeletexCommonName N p1.extension-attribute 2
TeletexOrganizationName N p1.extension-attribute 3
TeletexPersonalName N p1.extension-attribute 4
TeletexOrganizationalUnitNames N p1.extension-attribute 5
TeletexDomainDefinedAttributes N p1.extension-attribute 6
PDSName N p1.extension-attribute 7
PhysicalDeliveryCountryName N p1.extension-attribute 8
PostalCode N p1.extension-attribute 9
PhysicalDeliveryOfficeName N p1.extension-attribute 10
PhysicalDeliveryOfficeNumber N p1.extension-attribute 11
ExtensionORAddressComponents N p1.extension-attribute 12
PhysicalDeliveryPersonalName N p1.extension-attribute 13
PhysicalDeliveryOrganizationName N p1.extension-attribute 14
ExtensionPhysicalDeliveryAddressComponents N p1.extension-attribute 15
UnformattedPostalAddress N p1.extension-attribute 16
StreetAddress N p1.extension-attribute 17
PostOfficeBoxAddress N p1.extension-attribute 18
PosteRestanteAddress N p1.extension-attribute 19
UniquePostalName N p1.extension-attribute 20
LocalPostalAttributes N p1.extension-attribute 21
ExtendedNetworkAddress N p1.extension-attribute 22
TerminalType N p1.extension-attribute 23
UniversalCommonName N p1.extension-attribute 24
UniversalOrganizationName N p1.extension-attribute 25
UniversalPersonalName N p1.extension-attribute 26
UniversalOrganizationalUnitNames N p1.extension-attribute 27
UniversalDomainDefinedAttributes N p1.extension-attribute 28
UniversalPhysicalDeliveryOfficeName N p1.extension-attribute 29
UniversalPhysicalDeliveryOfficeNumber N p1.extension-attribute 30
UniversalExtensionORAddressComponents N p1.extension-attribute 31
UniversalPhysicalDeliveryPersonalName N p1.extension-attribute 32
UniversalPhysicalDeliveryOrganizationName N p1.extension-attribute 33
UniversalExtensionPhysicalDeliveryAddressComponents N p1.extension-attribute 34
UniversalUnformattedPostalAddress N p1.extension-attribute 35
UniversalStreetAddress N p1.extension-attribute 36
UniversalPostOfficeBoxAddress N p1.extension-attribute 37
UniversalPosteRestanteAddress N p1.extension-attribute 38
UniversalUniquePostalName N p1.extension-attribute 39
UniversalLocalPostalAttributes N p1.extension-attribute 40
#ReportDeliveryArgument B "2.6.1.4.14" "id-et-report"
AsymmetricToken B "2.6.3.6.0" "id-tok-asymmetricToken"
MTANameAndOptionalGDI B "2.6.5.6.0" "id-on-mtaName"
BindTokenSignedData N x411.tokendata 1
MessageTokenSignedData N x411.tokendata 2
BindTokenSignedData N p1.tokendata 1
MessageTokenSignedData N p1.tokendata 2
# the next two are unlikely to ever be seen (unless in a bad encoding)
MessageTokenEncryptedData N x411.tokendata 3
BindTokenEncryptedData N x411.tokendata 4
MessageTokenEncryptedData N p1.tokendata 3
BindTokenEncryptedData N p1.tokendata 4
# X402 - see master list in acp133.cnf
@ -509,7 +509,7 @@ SubjectSubmissionIdentifier B "2.6.4.3.40" "id-att-subject-submission-identifi
ORName B "2.6.4.3.41" "id-att-this-recipient-name"
TraceInformationElement B "2.6.4.3.75" "id-att-trace-information"
# IPMSMessageStoreAttributes - see master list in x420.cnf
# IPMSMessageStoreAttributes - see master list in p22.cnf
MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
#.FN_BODY AdditionalInformation
@ -522,7 +522,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
(void) dissect_ber_length(actx->pinfo, tree, tvb, loffset, &len, NULL);
item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE);
tree = proto_item_add_subtree(item, ett_x411_additional_information);
tree = proto_item_add_subtree(item, ett_p1_additional_information);
proto_item_append_text(tree, " (The use of this field is \"strongly deprecated\".)");
offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree);
@ -534,8 +534,8 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
const char *name;
if(extension_id != -1) {
proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_StandardExtension_vals, "standard-extension %%d"));
if (dissector_try_uint(x411_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, p1_StandardExtension_vals, "standard-extension %%d"));
if (dissector_try_uint(p1_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
offset = tvb_length(tvb);
} else {
proto_item *item = NULL;
@ -543,7 +543,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset),
"Dissector for standard-extension %%d not implemented. Contact Wireshark developers if you want this supported", extension_id);
next_tree = proto_item_add_subtree(item, ett_x411_unknown_standard_extension);
next_tree = proto_item_add_subtree(item, ett_p1_unknown_standard_extension);
offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree);
expert_add_info_format(actx->pinfo, item, PI_UNDECODED, PI_WARN, "Unknown standard-extension");
}
@ -573,8 +573,8 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
#.FN_BODY ExtensionAttribute/extension-attribute-value
proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_ExtensionAttributeType_vals, "extension-attribute-type %%d"));
if (dissector_try_uint(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, p1_ExtensionAttributeType_vals, "extension-attribute-type %%d"));
if (dissector_try_uint(p1_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
offset =tvb_length(tvb);
} else {
proto_item *item = NULL;
@ -582,7 +582,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset),
"Dissector for extension-attribute-type %%d not implemented. Contact Wireshark developers if you want this supported", extension_id);
next_tree = proto_item_add_subtree(item, ett_x411_unknown_extension_attribute_type);
next_tree = proto_item_add_subtree(item, ett_p1_unknown_extension_attribute_type);
offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree);
expert_add_info_format(actx->pinfo, item, PI_UNDECODED, PI_WARN, "Unknown extension-attribute-type");
}
@ -663,10 +663,10 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
proto_item *item = NULL;
proto_tree *next_tree = NULL;
item = proto_tree_add_text(top_tree ? top_tree : tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "X.411 Unknown Content (unknown built-in content-type)");
item = proto_tree_add_text(top_tree ? top_tree : tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "P1 Unknown Content (unknown built-in content-type)");
expert_add_info_format(actx->pinfo, item, PI_UNDECODED, PI_WARN, "Unknown built-in content-type");
if (item) {
next_tree=proto_item_add_subtree(item, ett_x411_content_unknown);
next_tree=proto_item_add_subtree(item, ett_p1_content_unknown);
}
dissect_unknown_ber(actx->pinfo, next_tvb, 0, next_tree);
}
@ -1116,14 +1116,14 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
doing_address = TRUE;
if(hf_index == hf_x411_subject_identifier)
if(hf_index == hf_p1_subject_identifier)
doing_subjectid = TRUE;
%(DEFAULT_BODY)s
doing_address = FALSE;
if(hf_index == hf_x411_subject_identifier)
if(hf_index == hf_p1_subject_identifier)
doing_subjectid = FALSE;
@ -1195,7 +1195,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
%(DEFAULT_BODY)s
proto_item_append_text(address_item, " %%s", val_to_str(action, x411_RoutingAction_vals, "action(%%d)"));
proto_item_append_text(address_item, " %%s", val_to_str(action, p1_RoutingAction_vals, "action(%%d)"));
#.FN_PARS MTABindError
VAL_PTR=&error
@ -1204,7 +1204,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
int error = -1;
%(DEFAULT_BODY)s
if((error != -1) && check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(error, x411_MTABindError_vals, "error(%%d)"));
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(error, p1_MTABindError_vals, "error(%%d)"));
#.FN_PARS TokenTypeIdentifier
FN_VARIANT = _str VAL_PTR = &object_identifier_id
@ -1222,9 +1222,9 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
%(DEFAULT_BODY)s
if( (credentials!=-1) && x411_Credentials_vals[credentials].strptr ){
if( (credentials!=-1) && p1_Credentials_vals[credentials].strptr ){
if (check_col(actx->pinfo->cinfo, COL_INFO)) {
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", x411_Credentials_vals[credentials].strptr);
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_Credentials_vals[credentials].strptr);
}
}
@ -1233,8 +1233,8 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
#.FN_BODY TokenData/value
proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_TokenDataType_vals, "tokendata-type %%d"));
if (dissector_try_uint(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, p1_TokenDataType_vals, "tokendata-type %%d"));
if (dissector_try_uint(p1_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
offset = tvb_length(tvb);
} else {
proto_item *item = NULL;
@ -1242,7 +1242,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset),
"Dissector for tokendata-type %%d not implemented. Contact Wireshark developers if you want this supported", extension_id);
next_tree = proto_item_add_subtree(item, ett_x411_unknown_tokendata_type);
next_tree = proto_item_add_subtree(item, ett_p1_unknown_tokendata_type);
offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree);
expert_add_info_format(actx->pinfo, item, PI_UNDECODED, PI_WARN, "Unknown tokendata-type");
}
@ -1258,7 +1258,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
/* create some structure so we can tell what this unknown ASN.1 represents */
item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE);
tree = proto_item_add_subtree(item, ett_x411_bilateral_information);
tree = proto_item_add_subtree(item, ett_p1_bilateral_information);
offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree);
@ -1270,9 +1270,9 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
%(DEFAULT_BODY)s
if( (apdu!=-1) && x411_MTS_APDU_vals[apdu].strptr ){
if( (apdu!=-1) && p1_MTS_APDU_vals[apdu].strptr ){
if(check_col(actx->pinfo->cinfo, COL_INFO) && (apdu != 0)) { /* we don't show "message" - sub-dissectors have better idea */
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", x411_MTS_APDU_vals[apdu].strptr);
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_MTS_APDU_vals[apdu].strptr);
}
}
@ -1284,9 +1284,9 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
%(DEFAULT_BODY)s
if( (report!=-1) && x411_ReportType_vals[report].strptr ){
if( (report!=-1) && p1_ReportType_vals[report].strptr ){
if(check_col(actx->pinfo->cinfo, COL_INFO)) {
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", x411_ReportType_vals[report].strptr);
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_ReportType_vals[report].strptr);
}
}

212
asn1/x411/packet-x411-template.c → asn1/p1/packet-p1-template.c
View File

@ -1,4 +1,4 @@
/* packet-x411.c
/* packet-p1.c
* Routines for X.411 (X.400 Message Transfer) packet dissection
* Graeme Lunt 2005
*
@ -44,19 +44,19 @@
#include "packet-x509if.h"
#include "packet-x509sat.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include <epan/strutil.h>
#define PNAME "X.411 Message Transfer Service"
#define PSNAME "X411"
#define PFNAME "x411"
#define PSNAME "P1"
#define PFNAME "p1"
static guint global_x411_tcp_port = 102;
static guint global_p1_tcp_port = 102;
static dissector_handle_t tpkt_handle;
static void prefs_register_x411(void); /* forward declaration for use in preferences registration */
static void prefs_register_p1(void); /* forward declaration for use in preferences registration */
/* Initialize the protocol and registered fields */
static int proto_x411 = -1;
static int proto_p1 = -1;
static int proto_p3 = -1;
static struct SESSION_DATA_STRUCTURE* session = NULL;
@ -73,35 +73,35 @@ static proto_item *address_item = NULL;
static proto_tree *top_tree=NULL;
static int hf_x411_MTS_APDU_PDU = -1;
static int hf_x411_MTABindArgument_PDU = -1;
static int hf_x411_MTABindResult_PDU = -1;
static int hf_x411_MTABindError_PDU = -1;
static int hf_p1_MTS_APDU_PDU = -1;
static int hf_p1_MTABindArgument_PDU = -1;
static int hf_p1_MTABindResult_PDU = -1;
static int hf_p1_MTABindError_PDU = -1;
#include "packet-x411-hf.c"
#include "packet-p1-hf.c"
/* Initialize the subtree pointers */
static gint ett_x411 = -1;
static gint ett_p1 = -1;
static gint ett_p3 = -1;
static gint ett_x411_content_unknown = -1;
static gint ett_x411_bilateral_information = -1;
static gint ett_x411_additional_information = -1;
static gint ett_x411_unknown_standard_extension = -1;
static gint ett_x411_unknown_extension_attribute_type = -1;
static gint ett_x411_unknown_tokendata_type = -1;
#include "packet-x411-ett.c"
static gint ett_p1_content_unknown = -1;
static gint ett_p1_bilateral_information = -1;
static gint ett_p1_additional_information = -1;
static gint ett_p1_unknown_standard_extension = -1;
static gint ett_p1_unknown_extension_attribute_type = -1;
static gint ett_p1_unknown_tokendata_type = -1;
#include "packet-p1-ett.c"
/* Dissector tables */
static dissector_table_t x411_extension_dissector_table;
static dissector_table_t x411_extension_attribute_dissector_table;
static dissector_table_t x411_tokendata_dissector_table;
static dissector_table_t p1_extension_dissector_table;
static dissector_table_t p1_extension_attribute_dissector_table;
static dissector_table_t p1_tokendata_dissector_table;
#include "packet-x411-table.c" /* operation and error codes */
#include "packet-p1-table.c" /* operation and error codes */
#include "packet-x411-fn.c"
#include "packet-p1-fn.c"
#include "packet-x411-table11.c" /* operation argument/result dissectors */
#include "packet-x411-table21.c" /* error dissector */
#include "packet-p1-table11.c" /* operation argument/result dissectors */
#include "packet-p1-table21.c" /* error dissector */
static const ros_info_t p3_ros_info = {
"P3",
@ -114,13 +114,13 @@ static const ros_info_t p3_ros_info = {
};
char* x411_get_last_oraddress() { return oraddress; }
char* p1_get_last_oraddress() { return oraddress; }
/*
* Dissect X411 MTS APDU
* Dissect P1 MTS APDU
*/
void
dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
proto_item *item=NULL;
proto_tree *tree=NULL;
@ -131,29 +131,29 @@ dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre
top_tree=parent_tree;
if(parent_tree){
item = proto_tree_add_item(parent_tree, proto_x411, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_x411);
item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_p1);
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1");
col_set_str(pinfo->cinfo, COL_INFO, "Transfer");
dissect_x411_MTS_APDU (FALSE, tvb, 0, &asn1_ctx, tree, hf_x411_MTS_APDU_PDU);
dissect_p1_MTS_APDU (FALSE, tvb, 0, &asn1_ctx, tree, hf_p1_MTS_APDU_PDU);
}
/*
* Dissect X411 PDUs inside a PPDU.
* Dissect P1 PDUs inside a PPDU.
*/
static void
dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
dissect_p1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
int offset = 0;
int old_offset;
proto_item *item=NULL;
proto_tree *tree=NULL;
int (*x411_dissector)(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) = NULL;
char *x411_op_name;
int hf_x411_index = -1;
int (*p1_dissector)(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) = NULL;
char *p1_op_name;
int hf_p1_index = -1;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
@ -172,46 +172,46 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
if(parent_tree){
item = proto_tree_add_item(parent_tree, proto_x411, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_x411);
item = proto_tree_add_item(parent_tree, proto_p1, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_p1);
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1");
col_clear(pinfo->cinfo, COL_INFO);
switch(session->ros_op & ROS_OP_MASK) {
case (ROS_OP_BIND | ROS_OP_ARGUMENT): /* BindInvoke */
x411_dissector = dissect_x411_MTABindArgument;
x411_op_name = "Bind-Argument";
hf_x411_index = hf_x411_MTABindArgument_PDU;
p1_dissector = dissect_p1_MTABindArgument;
p1_op_name = "Bind-Argument";
hf_p1_index = hf_p1_MTABindArgument_PDU;
break;
case (ROS_OP_BIND | ROS_OP_RESULT): /* BindResult */
x411_dissector = dissect_x411_MTABindResult;
x411_op_name = "Bind-Result";
hf_x411_index = hf_x411_MTABindResult_PDU;
p1_dissector = dissect_p1_MTABindResult;
p1_op_name = "Bind-Result";
hf_p1_index = hf_p1_MTABindResult_PDU;
break;
case (ROS_OP_BIND | ROS_OP_ERROR): /* BindError */
x411_dissector = dissect_x411_MTABindError;
x411_op_name = "Bind-Error";
hf_x411_index = hf_x411_MTABindError_PDU;
p1_dissector = dissect_p1_MTABindError;
p1_op_name = "Bind-Error";
hf_p1_index = hf_p1_MTABindError_PDU;
break;
case (ROS_OP_INVOKE | ROS_OP_ARGUMENT): /* Invoke Argument */
x411_dissector = dissect_x411_MTS_APDU;
x411_op_name = "Transfer";
hf_x411_index = hf_x411_MTS_APDU_PDU;
p1_dissector = dissect_p1_MTS_APDU;
p1_op_name = "Transfer";
hf_p1_index = hf_p1_MTS_APDU_PDU;
break;
default:
proto_tree_add_text(tree, tvb, offset, -1,"Unsupported X411 PDU");
proto_tree_add_text(tree, tvb, offset, -1,"Unsupported P1 PDU");
return;
}
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, x411_op_name);
col_set_str(pinfo->cinfo, COL_INFO, p1_op_name);
while (tvb_reported_length_remaining(tvb, offset) > 0){
old_offset=offset;
offset=(*x411_dissector)(FALSE, tvb, offset, &asn1_ctx , tree, hf_x411_index);
offset=(*p1_dissector)(FALSE, tvb, offset, &asn1_ctx , tree, hf_p1_index);
if(offset == old_offset){
proto_tree_add_text(tree, tvb, offset, -1,"Internal error, zero-byte X411 PDU");
proto_tree_add_text(tree, tvb, offset, -1,"Internal error, zero-byte P1 PDU");
offset = tvb_length(tvb);
break;
}
@ -219,80 +219,80 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
/*--- proto_register_x411 -------------------------------------------*/
void proto_register_x411(void) {
/*--- proto_register_p1 -------------------------------------------*/
void proto_register_p1(void) {
/* List of fields */
static hf_register_info hf[] =
{
/* "Created by defining PDU in .cnf */
{ &hf_x411_MTABindArgument_PDU,
{ "MTABindArgument", "x411.MTABindArgument",
FT_UINT32, BASE_DEC, VALS(x411_MTABindArgument_vals), 0,
"x411.MTABindArgument", HFILL }},
{ &hf_x411_MTABindResult_PDU,
{ "MTABindResult", "x411.MTABindResult",
FT_UINT32, BASE_DEC, VALS(x411_MTABindResult_vals), 0,
"x411.MTABindResult", HFILL }},
{ &hf_x411_MTABindError_PDU,
{ "MTABindError", "x411.MTABindError",
FT_UINT32, BASE_DEC, VALS(x411_MTABindError_vals), 0,
"x411.MTABindError", HFILL }},
{ &hf_x411_MTS_APDU_PDU,
{ "MTS-APDU", "x411.MTS_APDU",
FT_UINT32, BASE_DEC, VALS(x411_MTS_APDU_vals), 0,
"x411.MTS_APDU", HFILL }},
{ &hf_p1_MTABindArgument_PDU,
{ "MTABindArgument", "p1.MTABindArgument",
FT_UINT32, BASE_DEC, VALS(p1_MTABindArgument_vals), 0,
"p1.MTABindArgument", HFILL }},
{ &hf_p1_MTABindResult_PDU,
{ "MTABindResult", "p1.MTABindResult",
FT_UINT32, BASE_DEC, VALS(p1_MTABindResult_vals), 0,
"p1.MTABindResult", HFILL }},
{ &hf_p1_MTABindError_PDU,
{ "MTABindError", "p1.MTABindError",
FT_UINT32, BASE_DEC, VALS(p1_MTABindError_vals), 0,
"p1.MTABindError", HFILL }},
{ &hf_p1_MTS_APDU_PDU,
{ "MTS-APDU", "p1.MTS_APDU",
FT_UINT32, BASE_DEC, VALS(p1_MTS_APDU_vals), 0,
"p1.MTS_APDU", HFILL }},
#include "packet-x411-hfarr.c"
#include "packet-p1-hfarr.c"
};
/* List of subtrees */
static gint *ett[] = {
&ett_x411,
&ett_p1,
&ett_p3,
&ett_x411_content_unknown,
&ett_x411_bilateral_information,
&ett_x411_additional_information,
&ett_x411_unknown_standard_extension,
&ett_x411_unknown_extension_attribute_type,
&ett_x411_unknown_tokendata_type,
#include "packet-x411-ettarr.c"
&ett_p1_content_unknown,
&ett_p1_bilateral_information,
&ett_p1_additional_information,
&ett_p1_unknown_standard_extension,
&ett_p1_unknown_extension_attribute_type,
&ett_p1_unknown_tokendata_type,
#include "packet-p1-ettarr.c"
};
module_t *x411_module;
module_t *p1_module;
/* Register protocol */
proto_x411 = proto_register_protocol(PNAME, PSNAME, PFNAME);
register_dissector("x411", dissect_x411, proto_x411);
proto_p1 = proto_register_protocol(PNAME, PSNAME, PFNAME);
register_dissector("p1", dissect_p1, proto_p1);
proto_p3 = proto_register_protocol("X.411 Message Access Service", "P3", "p3");
/* Register fields and subtrees */
proto_register_field_array(proto_x411, hf, array_length(hf));
proto_register_field_array(proto_p1, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
x411_extension_dissector_table = register_dissector_table("x411.extension", "X411-EXTENSION", FT_UINT32, BASE_DEC);
x411_extension_attribute_dissector_table = register_dissector_table("x411.extension-attribute", "X411-EXTENSION-ATTRIBUTE", FT_UINT32, BASE_DEC);
x411_tokendata_dissector_table = register_dissector_table("x411.tokendata", "X411-TOKENDATA", FT_UINT32, BASE_DEC);
p1_extension_dissector_table = register_dissector_table("p1.extension", "P1-EXTENSION", FT_UINT32, BASE_DEC);
p1_extension_attribute_dissector_table = register_dissector_table("p1.extension-attribute", "P1-EXTENSION-ATTRIBUTE", FT_UINT32, BASE_DEC);
p1_tokendata_dissector_table = register_dissector_table("p1.tokendata", "P1-TOKENDATA", FT_UINT32, BASE_DEC);
/* Register our configuration options for X411, particularly our port */
/* Register our configuration options for P1, particularly our port */
x411_module = prefs_register_protocol_subtree("OSI/X.400", proto_x411, prefs_register_x411);
p1_module = prefs_register_protocol_subtree("OSI/X.400", proto_p1, prefs_register_p1);
prefs_register_uint_preference(x411_module, "tcp.port", "X.411 TCP Port",
prefs_register_uint_preference(p1_module, "tcp.port", "P1 TCP Port",
"Set the port for P1 operations (if other"
" than the default of 102)",
10, &global_x411_tcp_port);
10, &global_p1_tcp_port);
register_ber_syntax_dissector("X.411 Message", proto_x411, dissect_x411_mts_apdu);
register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu);
}
/*--- proto_reg_handoff_x411 --- */
void proto_reg_handoff_x411(void) {
dissector_handle_t x411_handle;
/*--- proto_reg_handoff_p1 --- */
void proto_reg_handoff_p1(void) {
dissector_handle_t p1_handle;
#include "packet-x411-dis-tab.c"
#include "packet-p1-dis-tab.c"
/* APPLICATION CONTEXT */
@ -300,12 +300,12 @@ void proto_reg_handoff_x411(void) {
/* ABSTRACT SYNTAXES */
x411_handle = find_dissector("x411");
register_rtse_oid_dissector_handle("2.6.0.2.12", x411_handle, 0, "id-as-mta-rtse", TRUE);
register_rtse_oid_dissector_handle("2.6.0.2.7", x411_handle, 0, "id-as-mtse", FALSE);
p1_handle = find_dissector("p1");
register_rtse_oid_dissector_handle("2.6.0.2.12", p1_handle, 0, "id-as-mta-rtse", TRUE);
register_rtse_oid_dissector_handle("2.6.0.2.7", p1_handle, 0, "id-as-mtse", FALSE);
register_rtse_oid_dissector_handle("applicationProtocol.1", x411_handle, 0, "mts-transfer-protocol-1984", FALSE);
register_rtse_oid_dissector_handle("applicationProtocol.12", x411_handle, 0, "mta-transfer-protocol", FALSE);
register_rtse_oid_dissector_handle("applicationProtocol.1", p1_handle, 0, "mts-transfer-protocol-1984", FALSE);
register_rtse_oid_dissector_handle("applicationProtocol.12", p1_handle, 0, "mta-transfer-protocol", FALSE);
/* remember the tpkt handler for change in preferences */
tpkt_handle = find_dissector("tpkt");
@ -332,7 +332,7 @@ void proto_reg_handoff_x411(void) {
}
static void
prefs_register_x411(void)
prefs_register_p1(void)
{
static guint tcp_port = 0;
@ -342,7 +342,7 @@ prefs_register_x411(void)
dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
/* Set our port number for future use */
tcp_port = global_x411_tcp_port;
tcp_port = global_p1_tcp_port;
if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
dissector_add_uint("tcp.port", tcp_port, tpkt_handle);

22
asn1/x411/packet-x411-template.h → asn1/p1/packet-p1-template.h
View File

@ -1,5 +1,5 @@
/* packet-x411.h
* Routines forX.411 (X.400 Message Transfer) packet dissection
/* packet-p3.h
* Routines for X.411 (X.400 Message Transfer) packet dissection
* Graeme Lunt 2005
*
* $Id$
@ -23,16 +23,16 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef PACKET_X411_H
#define PACKET_X411_H
#ifndef PACKET_P1_H
#define PACKET_P1_H
#include "packet-x411-val.h"
#include "packet-p1-val.h"
char* x411_get_last_oraddress(void);
void dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
#include "packet-x411-exp.h"
char* p1_get_last_oraddress(void);
void dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
#include "packet-p1-exp.h"
void proto_reg_handoff_x411(void);
void proto_register_x411(void);
void proto_reg_handoff_p1(void);
void proto_register_p1(void);
#endif /* PACKET_X411_H */
#endif /* PACKET_P1_H */

0
asn1/x420/IPMSExtendedBodyPartTypes2.asn → asn1/p22/IPMSExtendedBodyPartTypes2.asn
View File

0
asn1/x420/IPMSExtendedVoiceBodyPartType.asn → asn1/p22/IPMSExtendedVoiceBodyPartType.asn
View File

0
asn1/x420/IPMSFileTransferBodyPartType.asn → asn1/p22/IPMSFileTransferBodyPartType.asn
View File

0
asn1/x420/IPMSForwardedContentBodyPartType.asn → asn1/p22/IPMSForwardedContentBodyPartType.asn
View File

0
asn1/x420/IPMSHeadingExtensions.asn → asn1/p22/IPMSHeadingExtensions.asn
View File

0
asn1/x420/IPMSInformationObjects.asn → asn1/p22/IPMSInformationObjects.asn
View File

0
asn1/x420/IPMSMessageStoreAttributes.asn → asn1/p22/IPMSMessageStoreAttributes.asn
View File

0
asn1/x420/IPMSObjectIdentifiers.asn → asn1/p22/IPMSObjectIdentifiers.asn
View File

0
asn1/x420/IPMSSecurityExtensions.asn → asn1/p22/IPMSSecurityExtensions.asn
View File

0
asn1/x420/IPMSUpperBounds.asn → asn1/p22/IPMSUpperBounds.asn
View File

0
asn1/x411/Makefile.am → asn1/p22/Makefile.am
View File

8
asn1/x420/Makefile.common → asn1/p22/Makefile.common
View File

@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
PROTOCOL_NAME=x420
PROTOCOL_NAME=p22
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
packet-$(PROTOCOL_NAME).h
@ -61,7 +61,7 @@ EXTRA_CNF= \
../acse/acse-exp.cnf \
../ftam/ftam-exp.cnf \
../p7/p7-exp.cnf \
../x411/x411-exp.cnf \
../p1/p1-exp.cnf \
../x509af/x509af-exp.cnf \
../x509ce/x509ce-exp.cnf
@ -74,8 +74,8 @@ EXTRA_CNF= \
../p7/p7-exp.cnf:
(cd ../p7 && $(MAKE_CNF_EXPORT))
../x411/x411-exp.cnf:
(cd ../x411 && $(MAKE_CNF_EXPORT))
../p1/p1-exp.cnf:
(cd ../p1 && $(MAKE_CNF_EXPORT))
../x509af/x509af-exp.cnf:
(cd ../x509af && $(MAKE_CNF_EXPORT))

0
asn1/x411/Makefile.nmake → asn1/p22/Makefile.nmake
View File

8
asn1/x420/x420.cnf → asn1/p22/p22.cnf
View File

@ -1,4 +1,4 @@
# x411.cnf
# p22.cnf
# X.420 (InterPersonal Messaging) conformance file
# $Id$
@ -10,7 +10,7 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
Permitted-Actions-Attribute TYPE = FT_BYTES DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
#.IMPORT ../ftam/ftam-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../p1/p1-exp.cnf
#.IMPORT ../p7/p7-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
@ -124,7 +124,7 @@ GeneralTextData B "2.6.1.4.11" "id-et-general-text"
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
# ForwardedReportBodyPart {id-et 14} defined in p1.cnf
MessageParameters B "2.6.1.11.15" "id-ep-notification"
IPN B "2.6.1.4.15" "id-et-notification"
VoiceParameters B "2.6.1.11.16" "id-ep-voice"
@ -183,7 +183,7 @@ ManualHandlingInstruction B "2.6.1.7.32" "id-hat-manual-handling-instructions"
OriginatorsReference B "2.6.1.7.33" "id-hat-originators-reference"
PrecedencePolicyIdentifier B "2.6.1.7.34" "id-hat-precedence-policy-id"
ForwardedContentToken B "2.6.1.7.35" "id-hat-forwarded-content-token"
#MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" - see x411.cnf
#MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" - see p1.cnf
Precedence B "2.6.1.7.37" "id-hat-precedence"
BodyPartSignatureVerification B "2.6.1.7.38" "id-hat-body-part-signature-verification-status"

58
asn1/x420/packet-x420-template.c → asn1/p22/packet-p22-template.c
View File

@ -1,4 +1,4 @@
/* packet-x420.c
/* packet-p22.c
* Routines for X.420 (X.400 Message Transfer) packet dissection
* Graeme Lunt 2005
*
@ -39,17 +39,17 @@
#include "packet-x509af.h"
#include "packet-x509ce.h"
#include "packet-ftam.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include "packet-p7.h"
#include "packet-x420.h"
#include "packet-p22.h"
#define PNAME "X.420 Information Object"
#define PSNAME "X420"
#define PFNAME "x420"
#define PSNAME "P22"
#define PFNAME "p22"
/* Initialize the protocol and registered fields */
static int proto_x420 = -1;
static int proto_p22 = -1;
static const char *object_identifier_id; /* content type identifier */
@ -82,21 +82,21 @@ static const value_string charsetreg_vals [] = {
{ 0, NULL}
};
#include "packet-x420-val.h"
#include "packet-p22-val.h"
#include "packet-x420-hf.c"
#include "packet-p22-hf.c"
/* Initialize the subtree pointers */
static gint ett_x420 = -1;
#include "packet-x420-ett.c"
static gint ett_p22 = -1;
#include "packet-p22-ett.c"
#include "packet-x420-fn.c"
#include "packet-p22-fn.c"
/*
* Dissect X420 PDUs inside a PPDU.
* Dissect P22 PDUs inside a PPDU.
*/
static void
dissect_x420(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
int offset = 0;
proto_item *item=NULL;
@ -105,49 +105,49 @@ dissect_x420(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
if(parent_tree){
item = proto_tree_add_item(parent_tree, proto_x420, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_x420);
item = proto_tree_add_item(parent_tree, proto_p22, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_p22);
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22");
col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal");
dissect_x420_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
dissect_p22_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
}
/*--- proto_register_x420 -------------------------------------------*/
void proto_register_x420(void) {
/*--- proto_register_p22 -------------------------------------------*/
void proto_register_p22(void) {
/* List of fields */
static hf_register_info hf[] =
{
#include "packet-x420-hfarr.c"
#include "packet-p22-hfarr.c"
};
/* List of subtrees */
static gint *ett[] = {
&ett_x420,
#include "packet-x420-ettarr.c"
&ett_p22,
#include "packet-p22-ettarr.c"
};
/* Register protocol */
proto_x420 = proto_register_protocol(PNAME, PSNAME, PFNAME);
register_dissector("x420", dissect_x420, proto_x420);
proto_p22 = proto_register_protocol(PNAME, PSNAME, PFNAME);
register_dissector("p22", dissect_p22, proto_p22);
/* Register fields and subtrees */
proto_register_field_array(proto_x420, hf, array_length(hf));
proto_register_field_array(proto_p22, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
/*--- proto_reg_handoff_x420 --- */
void proto_reg_handoff_x420(void) {
/*--- proto_reg_handoff_p22 --- */
void proto_reg_handoff_p22(void) {
#include "packet-x420-dis-tab.c"
#include "packet-p22-dis-tab.c"
register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)");
register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)");
register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)");
register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)");
}

14
asn1/x420/packet-x420-template.h → asn1/p22/packet-p22-template.h
View File

@ -1,4 +1,4 @@
/* packet-x420.h
/* packet-p22.h
* Routines for X.420 (X.400 Message Transfer) packet dissection
* Graeme Lunt 2005
*
@ -23,12 +23,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef PACKET_X420_H
#define PACKET_X420_H
#ifndef PACKET_P22_H
#define PACKET_P22_H
#include "packet-x420-exp.h"
#include "packet-p22-exp.h"
void proto_reg_handoff_x420(void);
void proto_register_x420(void);
void proto_reg_handoff_p22(void);
void proto_register_p22(void);
#endif /* PACKET_X420_H */
#endif /* PACKET_P22_H */

6
asn1/p7/Makefile.common
View File

@ -53,12 +53,12 @@ SRC_FILES = \
A2W_FLAGS= -b -e -L -C
EXTRA_CNF= \
../x411/x411-exp.cnf \
../p1/p1-exp.cnf \
../ros/ros-exp.cnf \
../rtse/rtse.cnf
../x411/x411-exp.cnf:
(cd ../x411 && $(MAKE_CNF_EXPORT))
../p1/p1-exp.cnf:
(cd ../p1 && $(MAKE_CNF_EXPORT))
../ros/ros-exp.cnf:
(cd ../ros && $(MAKE_CNF_EXPORT))

102
asn1/p7/p7.cnf
View File

@ -2,7 +2,7 @@
# $Id$
#
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../p1/p1-exp.cnf
#.IMPORT ../ros/ros-exp.cnf
#.IMPORT ../rtse/rtse-exp.cnf
@ -220,80 +220,80 @@ AutoActionError B "2.6.4.3.46" "id-att-auto-action-error"
#Integer B "2.6.4.3.47" "id-att-auto-action-registration-identifier" - see XXX
SequenceNumber B "2.6.4.3.48" "id-att-auto-action-subject-entry"
AutoActionType B "2.6.4.3.49" "id-att-auto-action-type"
#CertificateSelectors B "2.6.4.3.80" "id-att-certificate-selectors" - see x411.cnf
#CertificateSelectors B "2.6.4.3.80" "id-att-certificate-selectors" - see p1.cnf
SequenceNumber B "2.6.4.3.0" "id-att-child-sequence-numbers"
#Content B "2.6.4.3.1" "id-att-content" - see XXX
#AlgorithmIdentifier B "2.6.4.3.2" "id-att-content-confidentiality-algorithm-identifier" - see XXX
#ContentCorrelator B "2.6.4.3.3" "id-att-content-correlator" - see x411.cnf
#ContentIdentifier B "2.6.4.3.4" "id-att-content-identifier" - see x411.cnf
#ContentIntegrityCheck B "2.6.4.3.5" "id-att-content-inetgrity-check" - see x411.cnf
#ContentLength B "2.6.4.3.6" "id-att-content-length" - see x411.cnf
#ContentCorrelator B "2.6.4.3.3" "id-att-content-correlator" - see p1.cnf
#ContentIdentifier B "2.6.4.3.4" "id-att-content-identifier" - see p1.cnf
#ContentIntegrityCheck B "2.6.4.3.5" "id-att-content-inetgrity-check" - see p1.cnf
#ContentLength B "2.6.4.3.6" "id-att-content-length" - see p1.cnf
#Boolean B "2.6.4.3.7" "id-att-content-returned" - see XXX
#ExtendedContentType B "2.6.4.3.8" "id-att-content-type" - see x411.cnf
#ConversionWithLossProhibited B "2.6.4.3.9" "id-att-conversion-with-loss-prohibited" - see x411.cnf
#ExtendedContentType B "2.6.4.3.8" "id-att-content-type" - see p1.cnf
#ConversionWithLossProhibited B "2.6.4.3.9" "id-att-conversion-with-loss-prohibited" - see p1.cnf
MS-EIT B "2.6.4.3.10" "id-att-converted-EITs"
CreationTime B "2.6.4.3.11" "id-att-creation-time"
DeferredDeliveryCancellationTime B "2.6.4.3.50" "id-att-deferred-delivery-cancellation-time"
#DeferredDeliveryTime B "2.6.4.3.51" "id-att-deferred-delivery-time" - see x411.cnf
#DeferredDeliveryTime B "2.6.4.3.51" "id-att-deferred-delivery-time" - see p1.cnf
DeletionTime B "2.6.4.3.52" "id-att-deletion-time"
MS-EIT B "2.6.4.3.12" "id-att-delivered-EITs"
#DeliveryFlags B "2.6.4.3.13" "id-att-delivery-flags" - see x411.cnf
#ORName B "2.6.4.3.78" "id-att-dl-exempted-recipients" - see x411.cnf
#DLExpansion B "2.6.4.3.14" "id-att-dl-expansion-history" - see x411.cnf
#DLExpansionProhibited B "2.6.4.3.53" "id-att-dl-expansion-prohibited" - see x411.cnf
#DeliveryFlags B "2.6.4.3.13" "id-att-delivery-flags" - see p1.cnf
#ORName B "2.6.4.3.78" "id-att-dl-exempted-recipients" - see p1.cnf
#DLExpansion B "2.6.4.3.14" "id-att-dl-expansion-history" - see p1.cnf
#DLExpansionProhibited B "2.6.4.3.53" "id-att-dl-expansion-prohibited" - see p1.cnf
EntryType B "2.6.4.3.16" "id-att-entry-type"
#InternalTraceInformationElement B "2.6.4.3.54" "id-att-internal-trace-information" - see x411.cnf
#LatestDeliveryTime B "2.6.4.3.55" "id-att-latest-delivery-time" - see x411.cnf
#InternalTraceInformationElement B "2.6.4.3.54" "id-att-internal-trace-information" - see p1.cnf
#LatestDeliveryTime B "2.6.4.3.55" "id-att-latest-delivery-time" - see p1.cnf
#NULL B "2.6.4.3.77" "id-att-locally-originated - see XXX
#NULL B "2.6.4.3.56" "id-att-marked-for-deletion" - see XXX
#MessageDeliveryEnvelope B "2.6.4.3.18" "id-att-message-delivery-envelope" - see x411.cnf
#MessageDeliveryTime B "2.6.4.3.20" "id-att-message-delivery-time" - see x411.cnf
#MessageDeliveryEnvelope B "2.6.4.3.18" "id-att-message-delivery-envelope" - see p1.cnf
#MessageDeliveryTime B "2.6.4.3.20" "id-att-message-delivery-time" - see p1.cnf
MessageGroupName B "2.6.4.3.57" "id-att-message-group-name"
#MTSIdentifier B "2.6.4.3.19" "id-att-message-identifier" - see x411.cnf
#MTSIdentifier B "2.6.4.3.19" "id-att-message-identifier" - see p1.cnf
#GeneralString B "2.6.4.3.58" "id-att-message-notes" - see XXX
#MessageOriginAuthenticationCheck B "2.6.4.3.21" "id-at-message-orgin-authentication-check" - see x411.cnf
#MessageSecurityLabel B "2.6.4.3.22" "id-att-message-security-label" - see x411.cnf
#MessageSubmissionEnvelope B "2.6.4.3.59" "id-att-message-submission-envelope" - see x411.cnf
#MessageOriginAuthenticationCheck B "2.6.4.3.21" "id-at-message-orgin-authentication-check" - see p1.cnf
#MessageSecurityLabel B "2.6.4.3.22" "id-att-message-security-label" - see p1.cnf
#MessageSubmissionEnvelope B "2.6.4.3.59" "id-att-message-submission-envelope" - see p1.cnf
#MessageSubmissionTime B "2.6.4.3.23" "id-att-message-submission-time"
#MessageToken B "2.6.4.3.24" "id-att-message-token"
#NULL B "2.6.4.3.60" "id-att-ms-originated"
SubmissionError B "2.6.4.3.61" "id-att-ms-submission-error"
#ExtendedCertificates B "2.6.4.3.81" "id-att-multiple-originator-certificates" - see x411.cnf
#ExtendedCertificates B "2.6.4.3.81" "id-att-multiple-originator-certificates" - see p1.cnf
MS-EIT B "2.6.4.3.25" "id-att-original-EITs"
#ORName B "2.6.4.3.17" "id-att-originally-intended-recipient-name" - see x411.cnf
#OriginatingMTACertificate B "2.6.4.3.62" "id-att-originating-MTA-certificate" - see x411.cnf
#OriginatorCertificate B "2.6.4.3.26" "id-att-originator-certificate" - see x411.cnf
#ORName B "2.6.4.3.27" "id-att-originator-name" - see x411.cnf
#OriginatorReportRequest B "2.6.4.3.63" "id-att-originator-report-request" - see x411.cnf
#OriginatorReturnAddress B "2.6.4.3.64" "id-att-originator-return-address" - see x411.cnf
#ORName B "2.6.4.3.28" "id-att-other-recipient-names" - see x411.cnf
#ORName B "2.6.4.3.17" "id-att-originally-intended-recipient-name" - see p1.cnf
#OriginatingMTACertificate B "2.6.4.3.62" "id-att-originating-MTA-certificate" - see p1.cnf
#OriginatorCertificate B "2.6.4.3.26" "id-att-originator-certificate" - see p1.cnf
#ORName B "2.6.4.3.27" "id-att-originator-name" - see p1.cnf
#OriginatorReportRequest B "2.6.4.3.63" "id-att-originator-report-request" - see p1.cnf
#OriginatorReturnAddress B "2.6.4.3.64" "id-att-originator-return-address" - see p1.cnf
#ORName B "2.6.4.3.28" "id-att-other-recipient-names" - see p1.cnf
SequenceNumber B "2.6.4.3.29" "id-att-parent-sequence-number"
#PerMessageIndicators B "2.6.4.3.65" "id-att-per-message-indicators" - see x411.cnf
#PerRecipientMessageSubmissionFields B "2.6.4.3.66" "id-att-per-recipient-message-submission-fields" - see x411.cnf
#PerRecipientProbeSubmissionFields B "2.6.4.3.67" "id-att-per-recipient-probe-submission-fields" - see x411.cnf
#PerRecipientReportDeliveryFields B "2.6.4.3.30" "id-att-per-recipient-report-delivery-fields" - see x411.cnf
#Priority B "2.6.4.3.31" "id-att-priority" - see x411.cnf
#ProbeOriginAuthenticationCheck B "2.6.4.3.68" "id-att-probe-origin-authentication-check" - see x411.cnf
#ProbeSubmissionEnvelope B "2.6.4.3.69" "id-att-probe-submission-envelope" - see x411.cnf
#ProofOfDeliveryRequest B "2.6.4.3.32" "id-att-proof-of-delivery-request" - see x411.cnf
#ProofOfSubmission B "2.6.4.3.70" "id-att-proof-of-submission" - see x411.cnf
#ExtendedCertificates B "2.6.4.3.82" "id-att-recipient-certificate" - see x411.cnf
#ORName B "2.6.4.3.71" "id-att-recipient-names" - see x411.cnf
#RecipientReassignmentProhibited B "2.6.4.3.72" "id-att-recipient-reassignment-prohibited" - see x411.cnf
#Redirection B "2.6.4.3.33" "id-at-redirection-history" - see x411.cnf
#ReportDeliveryEnvelope B "2.6.4.3.34" "id-att-report-delivery-envelope" - see x411.cnf
#ReportingDLName B "2.6.4.3.35" "id-att-reporting-DL-name" - see x411.cnf
#ReportingMTACertificate B "2.6.4.3.36" "id-att-reporting-MTA-certificate" - see x411.cnf
#ReportOriginAuthenticationCheck B "2.6.4.3.37" "id-att-report-origin-authentication-check" - see x411.cnf
#PerMessageIndicators B "2.6.4.3.65" "id-att-per-message-indicators" - see p1.cnf
#PerRecipientMessageSubmissionFields B "2.6.4.3.66" "id-att-per-recipient-message-submission-fields" - see p1.cnf
#PerRecipientProbeSubmissionFields B "2.6.4.3.67" "id-att-per-recipient-probe-submission-fields" - see p1.cnf
#PerRecipientReportDeliveryFields B "2.6.4.3.30" "id-att-per-recipient-report-delivery-fields" - see p1.cnf
#Priority B "2.6.4.3.31" "id-att-priority" - see p1.cnf
#ProbeOriginAuthenticationCheck B "2.6.4.3.68" "id-att-probe-origin-authentication-check" - see p1.cnf
#ProbeSubmissionEnvelope B "2.6.4.3.69" "id-att-probe-submission-envelope" - see p1.cnf
#ProofOfDeliveryRequest B "2.6.4.3.32" "id-att-proof-of-delivery-request" - see p1.cnf
#ProofOfSubmission B "2.6.4.3.70" "id-att-proof-of-submission" - see p1.cnf
#ExtendedCertificates B "2.6.4.3.82" "id-att-recipient-certificate" - see p1.cnf
#ORName B "2.6.4.3.71" "id-att-recipient-names" - see p1.cnf
#RecipientReassignmentProhibited B "2.6.4.3.72" "id-att-recipient-reassignment-prohibited" - see p1.cnf
#Redirection B "2.6.4.3.33" "id-at-redirection-history" - see p1.cnf
#ReportDeliveryEnvelope B "2.6.4.3.34" "id-att-report-delivery-envelope" - see p1.cnf
#ReportingDLName B "2.6.4.3.35" "id-att-reporting-DL-name" - see p1.cnf
#ReportingMTACertificate B "2.6.4.3.36" "id-att-reporting-MTA-certificate" - see p1.cnf
#ReportOriginAuthenticationCheck B "2.6.4.3.37" "id-att-report-origin-authentication-check" - see p1.cnf
RetrievalStatus B "2.6.4.3.15" "id-att-retrieval-status"
#SecurityClassification B "2.6.4.3.38" "id-att-security-classification" - see x411.cnf
#SecurityClassification B "2.6.4.3.38" "id-att-security-classification" - see p1.cnf
SequenceNumber B "2.6.4.3.39" "id-att-sequence-number"
SignatureVerificationStatus B "2.6.4.3.79" "id-att-signature-verification-status"
StoragePeriod B "2.6.4.3.73" "id-att-storage-period"
StorageTime B "2.6.4.3.74" "id-att-storage-time"
#SubjectSubmissionIdentifier B "2.6.4.3.40" "id-att-subject-submission-identifier" - see x411.cnf
#ORName B "2.6.4.3.41" "id-att-this-recipient-name" - see x411.cnf
#TraceInformationElement B "2.6.4.3.75" "id-att-trace-information" - see x411.cnf
#SubjectSubmissionIdentifier B "2.6.4.3.40" "id-att-subject-submission-identifier" - see p1.cnf
#ORName B "2.6.4.3.41" "id-att-this-recipient-name" - see p1.cnf
#TraceInformationElement B "2.6.4.3.75" "id-att-trace-information" - see p1.cnf
#MSExtensions
ChangeCredentialsAlgorithms B "2.6.4.9.5" "id-ext-protected-change-credentials-capability"
@ -370,7 +370,7 @@ RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse"
%(DEFAULT_BODY)s
if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = x411_get_last_oraddress())) {
if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = p1_get_last_oraddress())) {
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (initiator=%%s)", ora);
}

2
asn1/p7/packet-p7-template.c
View File

@ -38,7 +38,7 @@
#include "packet-ros.h"
#include "packet-rtse.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include <epan/strutil.h>
#define PNAME "X.413 Message Store Service"

0
asn1/s4406/MMSAbstractService.asn → asn1/p772/MMSAbstractService.asn
View File

0
asn1/s4406/MMSExtendedBodyPartTypes.asn → asn1/p772/MMSExtendedBodyPartTypes.asn
View File

0
asn1/s4406/MMSHeadingExtensions.asn → asn1/p772/MMSHeadingExtensions.asn
View File

0
asn1/s4406/MMSInformationObjects.asn → asn1/p772/MMSInformationObjects.asn
View File

0
asn1/s4406/MMSObjectIdentifiers.asn → asn1/p772/MMSObjectIdentifiers.asn
View File

0
asn1/s4406/MMSOtherNotificationTypeExtensions.asn → asn1/p772/MMSOtherNotificationTypeExtensions.asn
View File

0
asn1/s4406/MMSPerRecipientSpecifierExtensions.asn → asn1/p772/MMSPerRecipientSpecifierExtensions.asn
View File

0
asn1/s4406/MMSUpperBounds.asn → asn1/p772/MMSUpperBounds.asn
View File

0
asn1/x420/Makefile.am → asn1/p772/Makefile.am
View File

14
asn1/s4406/Makefile.common → asn1/p772/Makefile.common
View File

@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
PROTOCOL_NAME=s4406
PROTOCOL_NAME=p772
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
packet-$(PROTOCOL_NAME).h
@ -50,12 +50,12 @@ SRC_FILES = \
A2W_FLAGS= -b -e -C
EXTRA_CNF= \
../x411/x411-exp.cnf \
../x420/x420-exp.cnf
../p1/p1-exp.cnf \
../p22/p22-exp.cnf
../x411/x411-exp.cnf:
(cd ../x411 && $(MAKE_CNF_EXPORT))
../p1/p1-exp.cnf:
(cd ../p1 && $(MAKE_CNF_EXPORT))
../x420/x420-exp.cnf:
(cd ../x420 && $(MAKE_CNF_EXPORT))
../p22/p22-exp.cnf:
(cd ../p22 && $(MAKE_CNF_EXPORT))

0
asn1/x420/Makefile.nmake → asn1/p772/Makefile.nmake
View File

12
asn1/s4406/s4406.cnf → asn1/p772/p772.cnf
View File

@ -1,10 +1,10 @@
# s4406.cnf
# s4406 conformation file
# p772.cnf
# p772 conformation file
# $Id$
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../x420/x420-exp.cnf
#.IMPORT ../p1/p1-exp.cnf
#.IMPORT ../p22/p22-exp.cnf
#.OMIT_ASSIGNMENT
ID
@ -105,7 +105,7 @@ InformationObject B "2.6.1.4.17.1.3.26.0.4406.0.4.1" "id-et-content-p772"
int precedence = -1;
%(DEFAULT_BODY)s
if((precedence != -1) && check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (primary=%%s)", val_to_str(precedence, s4406_PrimaryPrecedence_vals, "precedence(%%d)"));
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (primary=%%s)", val_to_str(precedence, p772_PrimaryPrecedence_vals, "precedence(%%d)"));
#.FN_PARS CopyPrecedence
VAL_PTR=&precedence
@ -113,4 +113,4 @@ InformationObject B "2.6.1.4.17.1.3.26.0.4406.0.4.1" "id-et-content-p772"
int precedence = -1;
%(DEFAULT_BODY)s
if((precedence != -1) && check_col(actx->pinfo->cinfo, COL_INFO))
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (copy=%%s)", val_to_str(precedence, s4406_CopyPrecedence_vals, "precedence(%%d)"));
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (copy=%%s)", val_to_str(precedence, p772_CopyPrecedence_vals, "precedence(%%d)"));

58
asn1/s4406/packet-s4406-template.c → asn1/p772/packet-p772-template.c
View File

@ -1,4 +1,4 @@
/* packet-s4406.c
/* packet-p772.c
* Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection
* Graeme Lunt 2005
*
@ -35,33 +35,33 @@
#include "packet-x509if.h"
#include "packet-s4406.h"
#include "packet-x411.h"
#include "packet-x420.h"
#include "packet-p772.h"
#include "packet-p1.h"
#include "packet-p22.h"
#define PNAME "STANAG 4406 Message"
#define PSNAME "STANAG 4406"
#define PFNAME "s4406"
#define PSNAME "P772"
#define PFNAME "p772"
/* Initialize the protocol and registered fields */
static int proto_s4406 = -1;
static int proto_p772 = -1;
#include "packet-s4406-val.h"
#include "packet-p772-val.h"
#include "packet-s4406-hf.c"
#include "packet-p772-hf.c"
/* Initialize the subtree pointers */
static gint ett_s4406 = -1;
#include "packet-s4406-ett.c"
static gint ett_p772 = -1;
#include "packet-p772-ett.c"
#include "packet-s4406-fn.c"
#include "packet-p772-fn.c"
/*
* Dissect STANAG 4406 PDUs inside a PPDU.
*/
static void
dissect_s4406(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
dissect_p772(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
int offset = 0;
proto_item *item=NULL;
@ -70,48 +70,48 @@ dissect_s4406(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
if(parent_tree){
item = proto_tree_add_item(parent_tree, proto_s4406, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_s4406);
item = proto_tree_add_item(parent_tree, proto_p772, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_p772);
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406");
col_set_str(pinfo->cinfo, COL_PROTOCOL, "P772");
col_set_str(pinfo->cinfo, COL_INFO, "Military");
dissect_s4406_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
dissect_p772_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
}
/*--- proto_register_s4406 -------------------------------------------*/
void proto_register_s4406(void) {
/*--- proto_register_p772 -------------------------------------------*/
void proto_register_p772(void) {
/* List of fields */
static hf_register_info hf[] =
{
#include "packet-s4406-hfarr.c"
#include "packet-p772-hfarr.c"
};
/* List of subtrees */
static gint *ett[] = {
&ett_s4406,
#include "packet-s4406-ettarr.c"
&ett_p772,
#include "packet-p772-ettarr.c"
};
/* Register protocol */
proto_s4406 = proto_register_protocol(PNAME, PSNAME, PFNAME);
proto_p772 = proto_register_protocol(PNAME, PSNAME, PFNAME);
/* Register fields and subtrees */
proto_register_field_array(proto_s4406, hf, array_length(hf));
proto_register_field_array(proto_p772, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_ber_syntax_dissector("STANAG 4406", proto_s4406, dissect_s4406);
register_ber_syntax_dissector("STANAG 4406", proto_p772, dissect_p772);
register_ber_oid_syntax(".p772", NULL, "STANAG 4406");
}
/*--- proto_reg_handoff_s4406 --- */
void proto_reg_handoff_s4406(void) {
#include "packet-s4406-dis-tab.c"
/*--- proto_reg_handoff_p772 --- */
void proto_reg_handoff_p772(void) {
#include "packet-p772-dis-tab.c"
register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_s4406, proto_s4406, "STANAG 4406");
register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_p772, proto_p772, "STANAG 4406");
}

12
asn1/s4406/packet-s4406-template.h → asn1/p772/packet-p772-template.h
View File

@ -1,5 +1,5 @@
/* packet-s4406.h
* Routines for X.411 (X.400 Message Transfer) packet dissection
/* packet-p772.h
* Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection
* Graeme Lunt 2005
*
* $Id$
@ -23,9 +23,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef PACKET_S4406_H
#define PACKET_S4406_H
#ifndef PACKET_P772_H
#define PACKET_P772_H
/* #include "packet-s4406-exp.h" */
/* #include "packet-p772-exp.h" */
#endif /* PACKET_S4406_H */
#endif /* PACKET_P772_H */

6
asn1/x509ce/Makefile.common
View File

@ -48,13 +48,13 @@ SRC_FILES = \
A2W_FLAGS= -b -e
EXTRA_CNF= \
../x411/x411-exp.cnf \
../p1/p1-exp.cnf \
../x509af/x509af-exp.cnf \
../x509if/x509if-exp.cnf \
../x509sat/x509sat-exp.cnf
../x411/x411-exp.cnf:
(cd ../x411 && $(MAKE_CNF_EXPORT))
../p1/p1-exp.cnf:
(cd ../p1 && $(MAKE_CNF_EXPORT))
../x509af/x509af-exp.cnf:
(cd ../x509af && $(MAKE_CNF_EXPORT))

2
asn1/x509ce/packet-x509ce-template.c
View File

@ -36,7 +36,7 @@
#include "packet-x509af.h"
#include "packet-x509if.h"
#include "packet-x509sat.h"
#include "packet-x411.h"
#include "packet-p1.h"
#define PNAME "X.509 Certificate Extensions"
#define PSNAME "X509CE"

2
asn1/x509ce/x509ce.cnf
View File

@ -6,7 +6,7 @@
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../p1/p1-exp.cnf
# Forward declaration
#.CLASS CERT-POLICY-QUALIFIER

6
asn1/x509sat/Makefile.common
View File

@ -50,11 +50,11 @@ A2W_FLAGS= -b -e -r Syntax
EXTRA_CNF= \
../x509if/x509if-exp.cnf \
../x411/x411-exp.cnf
../p1/p1-exp.cnf
../x509if/x509if-exp.cnf:
(cd ../x509if && $(MAKE_CNF_EXPORT))
../x411/x411-exp.cnf:
(cd ../x411 && $(MAKE_CNF_EXPORT))
../p1/p1-exp.cnf:
(cd ../p1 && $(MAKE_CNF_EXPORT))

2
asn1/x509sat/packet-x509sat-template.c
View File

@ -33,7 +33,7 @@
#include <epan/asn1.h>
#include "packet-ber.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include "packet-x509sat.h"
#include "packet-x509if.h"

4
asn1/x509sat/x509sat.cnf
View File

@ -7,7 +7,7 @@
GUID TYPE = FT_GUID DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../p1/p1-exp.cnf
#.CLASS CONTEXT
&Type
@ -320,7 +320,7 @@ Integer B "1.2.826.0.1063.7.0.0.0" "unknown-UK-organisation-defined-extension"
# NEXOR Originating UA
SyntaxIA5String B "1.2.826.0.1004.10.1.1" "nexor-originating-ua"
# X.420 Message Store Attributes - see x420.cnf
# X.420 Message Store Attributes - see p22.cnf
Boolean B "2.6.1.6.3" "id-sat-ipm-auto-discarded"
# RFC 4530

6
configure.in
View File

@ -1870,7 +1870,10 @@ AC_OUTPUT(
asn1/nbap/Makefile
asn1/ns_cert_exts/Makefile
asn1/ocsp/Makefile
asn1/p1/Makefile
asn1/p22/Makefile
asn1/p7/Makefile
asn1/p772/Makefile
asn1/pcap/Makefile
asn1/pkcs1/Makefile
asn1/pkcs12/Makefile
@ -1893,7 +1896,6 @@ AC_OUTPUT(
asn1/rtse/Makefile
asn1/rua/Makefile
asn1/s1ap/Makefile
asn1/s4406/Makefile
asn1/sabp/Makefile
asn1/smrse/Makefile
asn1/snmp/Makefile
@ -1906,8 +1908,6 @@ AC_OUTPUT(
asn1/ulp/Makefile
asn1/wlancertextn/Makefile
asn1/x2ap/Makefile
asn1/x411/Makefile
asn1/x420/Makefile
asn1/x509af/Makefile
asn1/x509ce/Makefile
asn1/x509if/Makefile

6
epan/CMakeLists.txt
View File

@ -223,6 +223,7 @@ set(ASN1_DISSECTOR_SRC
dissectors/packet-ocsp.c
dissectors/packet-opsi.c
dissectors/packet-p7.c
dissectors/packet-p772.c
dissectors/packet-pkcs1.c
dissectors/packet-pkinit.c
dissectors/packet-pkix1explicit.c
@ -239,7 +240,6 @@ set(ASN1_DISSECTOR_SRC
dissectors/packet-rtse.c
dissectors/packet-rua.c
dissectors/packet-s1ap.c
dissectors/packet-s4406.c
dissectors/packet-sabp.c
dissectors/packet-smrse.c
dissectors/packet-spnego.c
@ -265,6 +265,8 @@ set(DIRTY_ASN1_DISSECTOR_SRC
dissectors/packet-ldap.c
dissectors/packet-lte-rrc.c
dissectors/packet-nbap.c
dissectors/packet-p1.c
dissectors/packet-p22.c
dissectors/packet-pcap.c
dissectors/packet-pkcs12.c
dissectors/packet-pres.c
@ -275,8 +277,6 @@ set(DIRTY_ASN1_DISSECTOR_SRC
dissectors/packet-t125.c
dissectors/packet-tcap.c
dissectors/packet-tetra.c
dissectors/packet-x411.c
dissectors/packet-x420.c
)
set(DISSECTOR_SRC

14
epan/dissectors/Makefile.common
View File

@ -130,6 +130,7 @@ ASN1_DISSECTOR_SRC = \
packet-ocsp.c \
packet-opsi.c \
packet-p7.c \
packet-p772.c \
packet-pkcs1.c \
packet-pkinit.c \
packet-pkix1explicit.c \
@ -146,7 +147,6 @@ ASN1_DISSECTOR_SRC = \
packet-rtse.c \
packet-rua.c \
packet-s1ap.c \
packet-s4406.c \
packet-sabp.c \
packet-smrse.c \
packet-spnego.c \
@ -175,6 +175,8 @@ DIRTY_ASN1_DISSECTOR_SRC = \
packet-ldap.c \
packet-lte-rrc.c \
packet-nbap.c \
packet-p1.c \
packet-p22.c \
packet-pcap.c \
packet-pkcs12.c \
packet-pres.c \
@ -184,9 +186,7 @@ DIRTY_ASN1_DISSECTOR_SRC = \
packet-snmp.c \
packet-t125.c \
packet-tcap.c \
packet-tetra.c \
packet-x411.c \
packet-x420.c
packet-tetra.c
#
# Dissectors without warnings.
@ -1206,7 +1206,10 @@ DISSECTOR_INCLUDES = \
packet-ocsp.h \
packet-osi.h \
packet-osi-options.h \
packet-p1.h \
packet-p22.h \
packet-p7.h \
packet-p772.h \
packet-pcnfsd.h \
packet-pdcp-lte.h \
packet-per.h \
@ -1264,7 +1267,6 @@ DISSECTOR_INCLUDES = \
packet-rwall.h \
packet-rx.h \
packet-s1ap.h \
packet-s4406.h \
packet-sccp.h \
packet-scsi.h \
packet-scsi-mmc.h \
@ -1330,8 +1332,6 @@ DISSECTOR_INCLUDES = \
x11-extension-errors.h \
x11-glx-render-enum.h \
x11-enum.h \
packet-x411.h \
packet-x420.h \
packet-x509af.h \
packet-x509ce.h \
packet-x509if.h \

20
epan/dissectors/packet-acp133.c
View File

@ -45,7 +45,7 @@
#include "packet-x509af.h"
#include "packet-x509if.h"
#include "packet-x509ce.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include "packet-acp133.h"
@ -566,7 +566,7 @@ dissect_acp133_MLReceiptPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_acp133_ORNamePattern(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_x411_ORName(implicit_tag, tvb, offset, actx, tree, hf_index);
offset = dissect_p1_ORName(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
@ -581,8 +581,8 @@ static const value_string acp133_DLSubmitPermission_vals[] = {
};
static const ber_choice_t DLSubmitPermission_choice[] = {
{ 0, &hf_acp133_individual , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_ORName },
{ 1, &hf_acp133_member_of_dl , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x411_ORName },
{ 0, &hf_acp133_individual , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_p1_ORName },
{ 1, &hf_acp133_member_of_dl , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_p1_ORName },
{ 2, &hf_acp133_pattern_match, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_acp133_ORNamePattern },
{ 3, &hf_acp133_member_of_group, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_x509if_Name },
{ 0, NULL, 0, 0, 0, NULL }
@ -781,7 +781,7 @@ static const value_string acp133_T_requested_delivery_method_vals[] = {
static const ber_choice_t T_requested_delivery_method_choice[] = {
{ 0, &hf_acp133_unchanged , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_acp133_NULL },
{ 1, &hf_acp133_removed , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_acp133_NULL },
{ 2, &hf_acp133_replaced , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x411_RequestedDeliveryMethod },
{ 2, &hf_acp133_replaced , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_p1_RequestedDeliveryMethod },
{ 0, NULL, 0, 0, 0, NULL }
};
@ -864,7 +864,7 @@ dissect_acp133_GeneralString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static const ber_sequence_t SET_OF_ExtendedContentType_set_of[1] = {
{ &hf_acp133_content_types_item, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_x411_ExtendedContentType },
{ &hf_acp133_content_types_item, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_p1_ExtendedContentType },
};
static int
@ -878,9 +878,9 @@ dissect_acp133_SET_OF_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *t
static const ber_sequence_t Capability_set[] = {
{ &hf_acp133_content_types, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_acp133_SET_OF_ExtendedContentType },
{ &hf_acp133_maximum_content_length, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_ContentLength },
{ &hf_acp133_encoded_information_types_constraints, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_EncodedInformationTypesConstraints },
{ &hf_acp133_security_labels, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SecurityContext },
{ &hf_acp133_maximum_content_length, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_p1_ContentLength },
{ &hf_acp133_encoded_information_types_constraints, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_p1_EncodedInformationTypesConstraints },
{ &hf_acp133_security_labels, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_p1_SecurityContext },
{ NULL, 0, 0, 0, NULL }
};
@ -908,7 +908,7 @@ dissect_acp133_SET_OF_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
static const ber_sequence_t AddressCapabilities_sequence[] = {
{ &hf_acp133_description , BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acp133_GeneralString },
{ &hf_acp133_address , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x411_ORAddress },
{ &hf_acp133_address , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_p1_ORAddress },
{ &hf_acp133_capabilities , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_acp133_SET_OF_Capability },
{ NULL, 0, 0, 0, NULL }
};

4
epan/dissectors/packet-cdt.c
View File

@ -45,7 +45,7 @@
#include <epan/asn1.h>
#include "packet-ber.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include "packet-cdt.h"
@ -281,7 +281,7 @@ dissect_cdt_CompressedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
dissect_unknown_ber (actx->pinfo, next_tvb, 0, top_tree);
break;
case CDT_P1:
dissect_x411_mts_apdu (next_tvb, actx->pinfo, top_tree);
dissect_p1_mts_apdu (next_tvb, actx->pinfo, top_tree);
break;
default:
call_dissector (data_handle, next_tvb, actx->pinfo, top_tree);

54
epan/dissectors/packet-dmp.c
View File

@ -50,8 +50,8 @@
#include <epan/crc16.h>
#include <epan/asn1.h>
#include "packet-x411.h"
#include "packet-x420.h"
#include "packet-p1.h"
#include "packet-p22.h"
#define PNAME "Direct Message Profile"
#define PSNAME "DMP"
@ -556,13 +556,13 @@ static const value_string addr_type_str [] = {
static const value_string addr_form [] = {
{ 0x0, "P1 Direct" },
{ 0x1, "P22/P722 Direct" },
{ 0x1, "P22/P772 Direct" },
{ 0x2, "P1 Extended" },
{ 0x3, "P22/P722 Extended" },
{ 0x4, "P1 and P22/P722 Direct" },
{ 0x5, "P1 Direct and P22/P722 Extended" },
{ 0x6, "P1 Extended and P22/P722 Direct" },
{ 0x7, "P1 and P22/P722 Extended" },
{ 0x3, "P22/P772 Extended" },
{ 0x4, "P1 and P22/P772 Direct" },
{ 0x5, "P1 Direct and P22/P772 Extended" },
{ 0x6, "P1 Extended and P22/P772 Direct" },
{ 0x7, "P1 and P22/P772 Extended" },
{ 0, NULL } };
static const value_string addr_form_orig [] = {
@ -880,8 +880,8 @@ static const gchar *msg_type_to_str (void)
static const gchar *non_del_reason_str (guint32 value)
{
if (value < 0x3D) {
/* Standard values according to X.411 */
return val_to_str (value, x411_NonDeliveryReasonCode_vals, "Unknown");
/* Standard values according to P1 */
return val_to_str (value, p1_NonDeliveryReasonCode_vals, "Unknown");
} else {
return val_to_str (value, non_del_reason, "Unknown");
}
@ -890,8 +890,8 @@ static const gchar *non_del_reason_str (guint32 value)
static const gchar *non_del_diagn_str (guint32 value)
{
if (value < 0x7C) {
/* Standard values according to X.411 */
return val_to_str (value, x411_NonDeliveryDiagnosticCode_vals, "Unknown");
/* Standard values according to P1 */
return val_to_str (value, p1_NonDeliveryDiagnosticCode_vals, "Unknown");
} else {
return val_to_str (value, non_del_diagn, "Unknown");
}
@ -899,15 +899,15 @@ static const gchar *non_del_diagn_str (guint32 value)
static const gchar *nrn_reason_str (guint32 value)
{
/* Standard values according to X.420 */
return val_to_str (value, x420_NonReceiptReasonField_vals, "Reserved");
/* Standard values according to P22 */
return val_to_str (value, p22_NonReceiptReasonField_vals, "Reserved");
}
static const gchar *discard_reason_str (guint32 value)
{
if (value < 0xFE) {
/* Standard values according to X.420 */
return val_to_str (value, x420_DiscardReasonField_vals, "Reserved");
/* Standard values according to P22 */
return val_to_str (value, p22_DiscardReasonField_vals, "Reserved");
} else {
return val_to_str (value, discard_reason, "Unknown");
}
@ -1826,7 +1826,7 @@ static gint dissect_dmp_ext_addr (tvbuff_t *tvb, packet_info *pinfo,
if (type == ASN1_BER) {
tvbuff_t *next_tvb = tvb_new_subset(tvb, offset, length, length);
dissect_x411_ORName (FALSE, next_tvb, 0, &asn1_ctx, ext_tree,
dissect_p1_ORName (FALSE, next_tvb, 0, &asn1_ctx, ext_tree,
hf_addr_ext_asn1_ber);
} else if (type == ASN1_PER) {
proto_tree_add_item (ext_tree, hf_addr_ext_asn1_per, tvb, offset,
@ -2875,7 +2875,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo,
tf = proto_tree_add_uint_format (report_tree, hf_report_reason,
tvb, offset, 1, report,
"Reason%s: %s (%d)",
((report & 0x3F) < 0x3D) ? " (X.411)":"",
((report & 0x3F) < 0x3D) ? " (P1)":"",
non_del_reason_str (report & 0x3F),
report & 0x3F);
field_tree = proto_item_add_subtree (tf, ett_report_reason);
@ -2898,7 +2898,7 @@ static gint dissect_dmp_report (tvbuff_t *tvb, packet_info *pinfo,
tf = proto_tree_add_uint_format (report_tree, hf_report_diagn,
tvb, offset, 1, report,
"Diagnostic%s: %s (%d)",
((report & 0x7F) < 0x7C) ? " (X.411)":"",
((report & 0x7F) < 0x7C) ? " (P1)":"",
non_del_diagn_str (report & 0x7F),
report & 0x7F);
field_tree = proto_item_add_subtree (tf, ett_report_diagn);
@ -3024,7 +3024,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree_add_uint_format (notif_tree, hf_notif_non_rec_reason,
tvb, offset, 1, notif,
"Non-Receipt Reason%s: %s (%d)",
(notif < 0x10) ? " (X.420)" : "",
(notif < 0x10) ? " (P22)" : "",
nrn_reason_str (notif), notif);
offset += 1;
@ -3033,7 +3033,7 @@ static gint dissect_dmp_notification (tvbuff_t *tvb, packet_info *pinfo _U_,
proto_tree_add_uint_format (notif_tree, hf_notif_discard_reason,
tvb, offset, 1, notif,
"Discard Reason%s: %s (%d)",
(notif < 0x10) ? " (X.420)" : "",
(notif < 0x10) ? " (P22)" : "",
discard_reason_str (notif), notif);
offset += 1;
}
@ -4026,15 +4026,15 @@ void proto_register_dmp (void)
{ "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
TFS (&addr_enc), 0x40, NULL, HFILL } },
{ &hf_report_reason,
{ "Reason (X.411)", "dmp.report_reason", FT_UINT8, BASE_DEC,
VALS (x411_NonDeliveryReasonCode_vals), 0x3F,
{ "Reason (P1)", "dmp.report_reason", FT_UINT8, BASE_DEC,
VALS (p1_NonDeliveryReasonCode_vals), 0x3F,
"Reason", HFILL } },
{ &hf_report_info_present_ndr,
{ "Info Present", "dmp.info_present", FT_BOOLEAN, 8,
TFS (&tfs_present_absent), 0x80, NULL, HFILL } },
{ &hf_report_diagn,
{ "Diagnostic (X.411)", "dmp.report_diagnostic", FT_UINT8, BASE_DEC,
VALS (x411_NonDeliveryDiagnosticCode_vals), 0x7F,
{ "Diagnostic (P1)", "dmp.report_diagnostic", FT_UINT8, BASE_DEC,
VALS (p1_NonDeliveryDiagnosticCode_vals), 0x7F,
"Diagnostic", HFILL } },
{ &hf_report_suppl_info_len,
{ "Supplementary Information", "dmp.suppl_info_len", FT_UINT8,
@ -4075,11 +4075,11 @@ void proto_register_dmp (void)
HFILL } },
{ &hf_notif_non_rec_reason,
{ "Non-Receipt Reason", "dmp.notif_non_rec_reason",
FT_UINT8, BASE_DEC, VALS (x420_NonReceiptReasonField_vals), 0x0,
FT_UINT8, BASE_DEC, VALS (p22_NonReceiptReasonField_vals), 0x0,
NULL, HFILL } },
{ &hf_notif_discard_reason,
{ "Discard Reason", "dmp.notif_discard_reason", FT_UINT8,
BASE_DEC, VALS (x420_DiscardReasonField_vals), 0x0,
BASE_DEC, VALS (p22_DiscardReasonField_vals), 0x0,
NULL, HFILL } },
{ &hf_notif_on_type,
{ "ON Type", "dmp.notif_on_type", FT_UINT8, BASE_DEC,

11118
epan/dissectors/packet-p1.c Normal file
View File

File diff suppressed because it is too large Load Diff

142
epan/dissectors/packet-x411.h → epan/dissectors/packet-p1.h
View File

@ -1,13 +1,13 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-x411.h */
/* ../../tools/asn2wrs.py -b -e -C -p x411 -c ./x411.cnf -s ./packet-x411-template -D . MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn MTSUpperBounds.asn */
/* packet-p1.h */
/* ../../tools/asn2wrs.py -b -e -C -p p1 -c ./p1.cnf -s ./packet-p1-template -D . MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn MTSUpperBounds.asn */
/* Input file: packet-x411-template.h */
/* Input file: packet-p1-template.h */
#line 1 "packet-x411-template.h"
/* packet-x411.h
* Routines forX.411 (X.400 Message Transfer) packet dissection
#line 1 "packet-p1-template.h"
/* packet-p3.h
* Routines for X.411 (X.400 Message Transfer) packet dissection
* Graeme Lunt 2005
*
* $Id$
@ -31,12 +31,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef PACKET_X411_H
#define PACKET_X411_H
#ifndef PACKET_P1_H
#define PACKET_P1_H
/*--- Included file: packet-x411-val.h ---*/
#line 1 "packet-x411-val.h"
/*--- Included file: packet-p1-val.h ---*/
#line 1 "packet-p1-val.h"
#define op_message_submission 3
#define op_probe_submission 4
#define op_cancel_deferred_delivery 7
@ -171,69 +171,69 @@
#define ub_universal_surname_length 64
#define ub_x121_address_length 16
/*--- End of included file: packet-x411-val.h ---*/
#line 30 "packet-x411-template.h"
/*--- End of included file: packet-p1-val.h ---*/
#line 30 "packet-p1-template.h"
char* x411_get_last_oraddress(void);
void dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
char* p1_get_last_oraddress(void);
void dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
/*--- Included file: packet-x411-exp.h ---*/
#line 1 "packet-x411-exp.h"
extern const value_string x411_Credentials_vals[];
extern const value_string x411_SecurityProblem_vals[];
extern const value_string x411_ContentType_vals[];
extern const value_string x411_NonDeliveryReasonCode_vals[];
extern const value_string x411_NonDeliveryDiagnosticCode_vals[];
int dissect_x411_InitiatorCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ResponderCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_SecurityContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ImproperlySpecifiedRecipients(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageSubmissionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageSubmissionTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ProbeSubmissionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ProbeSubmissionTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_EncodedInformationTypesConstraints(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageSubmissionEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ProbeSubmissionEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_PerRecipientProbeSubmissionFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_OtherMessageDeliveryFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_OriginatorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_OriginalEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_PerMessageIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ContentLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageDeliveryIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageDeliveryTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_NonDeliveryReasonCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_NonDeliveryDiagnosticCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_SupplementaryInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_RequestedDeliveryMethod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ContentIntegrityCheck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageOriginAuthenticationCheck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_MessageSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_OriginatingMTACertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ProofOfSubmission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ExtendedCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_Content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ORAddressAndOrDirectoryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_UniversalOrBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_EncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_G3FacsimileNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_TeletexNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x411_SecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- Included file: packet-p1-exp.h ---*/
#line 1 "packet-p1-exp.h"
extern const value_string p1_Credentials_vals[];
extern const value_string p1_SecurityProblem_vals[];
extern const value_string p1_ContentType_vals[];
extern const value_string p1_NonDeliveryReasonCode_vals[];
extern const value_string p1_NonDeliveryDiagnosticCode_vals[];
int dissect_p1_InitiatorCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ResponderCredentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_SecurityContext(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ImproperlySpecifiedRecipients(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageSubmissionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageSubmissionTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ProbeSubmissionIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ProbeSubmissionTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_EncodedInformationTypesConstraints(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageSubmissionEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ProbeSubmissionEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_PerRecipientProbeSubmissionFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_OtherMessageDeliveryFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_OriginatorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_OriginalEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_PerMessageIndicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ContentLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageDeliveryIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageDeliveryTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_NonDeliveryReasonCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_NonDeliveryDiagnosticCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_SupplementaryInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_RequestedDeliveryMethod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ContentIntegrityCheck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageOriginAuthenticationCheck(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_MessageSecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_OriginatingMTACertificate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ProofOfSubmission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ExtendedCertificates(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_Content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ORAddressAndOrDirectoryName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_UniversalOrBMPString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_EncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_G3FacsimileNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_TeletexNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p1_SecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- End of included file: packet-x411-exp.h ---*/
#line 34 "packet-x411-template.h"
/*--- End of included file: packet-p1-exp.h ---*/
#line 34 "packet-p1-template.h"
void proto_reg_handoff_x411(void);
void proto_register_x411(void);
void proto_reg_handoff_p1(void);
void proto_register_p1(void);
#endif /* PACKET_X411_H */
#endif /* PACKET_P1_H */

6321
epan/dissectors/packet-p22.c Normal file
View File

File diff suppressed because it is too large Load Diff

59
epan/dissectors/packet-p22.h Normal file
View File

@ -0,0 +1,59 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-p22.h */
/* ../../tools/asn2wrs.py -b -e -C -p p22 -c ./p22.cnf -s ./packet-p22-template -D . IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn IPMSUpperBounds.asn */
/* Input file: packet-p22-template.h */
#line 1 "packet-p22-template.h"
/* packet-p22.h
* Routines for X.420 (X.400 Message Transfer) packet dissection
* Graeme Lunt 2005
*
* $Id$
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef PACKET_P22_H
#define PACKET_P22_H
/*--- Included file: packet-p22-exp.h ---*/
#line 1 "packet-p22-exp.h"
extern const value_string p22_InformationObject_vals[];
extern const value_string p22_NonReceiptReasonField_vals[];
extern const value_string p22_DiscardReasonField_vals[];
int dissect_p22_InformationObject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_IPM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_ORDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_ExtensionsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_MessageParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_NonReceiptReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_DiscardReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_p22_ReceiptTimeField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- End of included file: packet-p22-exp.h ---*/
#line 30 "packet-p22-template.h"
void proto_reg_handoff_p22(void);
void proto_register_p22(void);
#endif /* PACKET_P22_H */

72
epan/dissectors/packet-p7.c
View File

@ -46,7 +46,7 @@
#include "packet-ros.h"
#include "packet-rtse.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include <epan/strutil.h>
#define PNAME "X.413 Message Store Service"
@ -946,10 +946,10 @@ static int
dissect_p7_T_initiator_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
char *ora = NULL;
offset = dissect_x411_ORAddressAndOrDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);
offset = dissect_p1_ORAddressAndOrDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);
if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = x411_get_last_oraddress())) {
if (check_col(actx->pinfo->cinfo, COL_INFO) && (ora = p1_get_last_oraddress())) {
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (initiator=%s)", ora);
}
@ -1050,8 +1050,8 @@ dissect_p7_RegistrationIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static const ber_sequence_t MSBindArgument_set[] = {
{ &hf_p7_initiator_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_p7_T_initiator_name },
{ &hf_p7_initiator_credentials, BER_CLASS_CON, 2, 0, dissect_x411_InitiatorCredentials },
{ &hf_p7_security_context , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SecurityContext },
{ &hf_p7_initiator_credentials, BER_CLASS_CON, 2, 0, dissect_p1_InitiatorCredentials },
{ &hf_p7_security_context , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_p1_SecurityContext },
{ &hf_p7_fetch_restrictions, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_Restrictions },
{ &hf_p7_ms_configuration_request, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_p7_BOOLEAN },
{ &hf_p7_ua_registration_identifier, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_p7_RegistrationIdentifier },
@ -1199,7 +1199,7 @@ dissect_p7_GeneralString_SIZE_1_ub_service_information_length(gboolean implicit_
static const ber_sequence_t MSBindResult_set[] = {
{ &hf_p7_responder_credentials, BER_CLASS_CON, 2, 0, dissect_x411_ResponderCredentials },
{ &hf_p7_responder_credentials, BER_CLASS_CON, 2, 0, dissect_p1_ResponderCredentials },
{ &hf_p7_available_auto_actions, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_p7_SET_SIZE_1_ub_auto_actions_OF_AutoActionType },
{ &hf_p7_available_attribute_types, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_SET_SIZE_1_ub_attributes_supported_OF_AttributeType },
{ &hf_p7_alert_indication , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_p7_BOOLEAN },
@ -1802,7 +1802,7 @@ dissect_p7_MSSubmissionOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_p7_OriginatorToken(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_x411_MessageToken(implicit_tag, tvb, offset, actx, tree, hf_index);
offset = dissect_p1_MessageToken(implicit_tag, tvb, offset, actx, tree, hf_index);
return offset;
}
@ -2231,8 +2231,8 @@ dissect_p7_SET_SIZE_0_ub_default_registrations_OF_AttributeType(gboolean implici
static const ber_sequence_t T_change_credentials_sequence[] = {
{ &hf_p7_register_old_credentials, BER_CLASS_CON, 0, 0, dissect_x411_Credentials },
{ &hf_p7_new_credentials , BER_CLASS_CON, 1, 0, dissect_x411_Credentials },
{ &hf_p7_register_old_credentials, BER_CLASS_CON, 0, 0, dissect_p1_Credentials },
{ &hf_p7_new_credentials , BER_CLASS_CON, 1, 0, dissect_p1_Credentials },
{ NULL, 0, 0, 0, NULL }
};
@ -2246,7 +2246,7 @@ dissect_p7_T_change_credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static const ber_sequence_t SET_SIZE_1_ub_labels_and_redirections_OF_SecurityLabel_set_of[1] = {
{ &hf_p7_user_security_labels_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_SecurityLabel },
{ &hf_p7_user_security_labels_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_p1_SecurityLabel },
};
static int
@ -2465,7 +2465,7 @@ dissect_p7_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
static const ber_sequence_t ProtectedChangeCredentials_sequence[] = {
{ &hf_p7_algorithm_identifier, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_p7_OBJECT_IDENTIFIER },
{ &hf_p7_old_credentials , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_x411_InitiatorCredentials },
{ &hf_p7_old_credentials , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_p1_InitiatorCredentials },
{ &hf_p7_password_delta , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_p7_BIT_STRING },
{ NULL, 0, 0, 0, NULL }
};
@ -2744,8 +2744,8 @@ dissect_p7_ModifyResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static const ber_sequence_t MSMessageSubmissionArgument_sequence[] = {
{ &hf_p7_envelope , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_MessageSubmissionEnvelope },
{ &hf_p7_content , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_x411_Content },
{ &hf_p7_envelope , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_p1_MessageSubmissionEnvelope },
{ &hf_p7_content , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_p1_Content },
{ &hf_p7_submission_options, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_MSSubmissionOptions },
{ NULL, 0, 0, 0, NULL }
};
@ -2760,7 +2760,7 @@ dissect_p7_MSMessageSubmissionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb
static const ber_sequence_t SET_OF_ExtensionField_set_of[1] = {
{ &hf_p7_extensions_item , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x411_ExtensionField },
{ &hf_p7_extensions_item , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_p1_ExtensionField },
};
static int
@ -2773,9 +2773,9 @@ dissect_p7_SET_OF_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
static const ber_sequence_t T_mts_result_set[] = {
{ &hf_p7_message_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_MessageSubmissionIdentifier },
{ &hf_p7_message_submission_time, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_MessageSubmissionTime },
{ &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier },
{ &hf_p7_message_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_p1_MessageSubmissionIdentifier },
{ &hf_p7_message_submission_time, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_p1_MessageSubmissionTime },
{ &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_ContentIdentifier },
{ &hf_p7_extensions , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_p7_SET_OF_ExtensionField },
{ &hf_p7_ms_message_result, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_CommonSubmissionResults },
{ NULL, 0, 0, 0, NULL }
@ -2813,7 +2813,7 @@ dissect_p7_MSMessageSubmissionResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U
static const ber_sequence_t SEQUENCE_OF_PerRecipientProbeSubmissionFields_sequence_of[1] = {
{ &hf_p7_per_recipient_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_PerRecipientProbeSubmissionFields },
{ &hf_p7_per_recipient_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_p1_PerRecipientProbeSubmissionFields },
};
static int
@ -2826,12 +2826,12 @@ dissect_p7_SEQUENCE_OF_PerRecipientProbeSubmissionFields(gboolean implicit_tag _
static const ber_sequence_t MSProbeSubmissionArgument_set[] = {
{ &hf_p7_originator_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_OriginatorName },
{ &hf_p7_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes },
{ &hf_p7_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_x411_ContentType },
{ &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier },
{ &hf_p7_content_length , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_x411_ContentLength },
{ &hf_p7_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PerMessageIndicators },
{ &hf_p7_originator_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_p1_OriginatorName },
{ &hf_p7_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_OriginalEncodedInformationTypes },
{ &hf_p7_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_p1_ContentType },
{ &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_ContentIdentifier },
{ &hf_p7_content_length , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_p1_ContentLength },
{ &hf_p7_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_PerMessageIndicators },
{ &hf_p7_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_p7_SET_OF_ExtensionField },
{ &hf_p7_per_recipient_fields, BER_CLASS_CON, 3, 0, dissect_p7_SEQUENCE_OF_PerRecipientProbeSubmissionFields },
{ &hf_p7_submission_options, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_MSSubmissionOptions },
@ -2848,9 +2848,9 @@ dissect_p7_MSProbeSubmissionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U
static const ber_sequence_t MSProbeSubmissionResult_set[] = {
{ &hf_p7_probe_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_ProbeSubmissionIdentifier },
{ &hf_p7_probe_submission_time, BER_CLASS_CON, 0, 0, dissect_x411_ProbeSubmissionTime },
{ &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier },
{ &hf_p7_probe_submission_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_p1_ProbeSubmissionIdentifier },
{ &hf_p7_probe_submission_time, BER_CLASS_CON, 0, 0, dissect_p1_ProbeSubmissionTime },
{ &hf_p7_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_ContentIdentifier },
{ &hf_p7_extensions , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_p7_SET_OF_ExtensionField },
{ &hf_p7_ms_probe_result , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_p7_CommonSubmissionResults },
{ NULL, 0, 0, 0, NULL }
@ -3549,10 +3549,10 @@ static const value_string p7_SubmissionError_vals[] = {
static const ber_choice_t SubmissionError_choice[] = {
{ 1, &hf_p7_submission_control_violated, BER_CLASS_CON, 1, 0, dissect_p7_NULL },
{ 2, &hf_p7_originator_invalid, BER_CLASS_CON, 2, 0, dissect_p7_NULL },
{ 3, &hf_p7_recipient_improperly_specified, BER_CLASS_CON, 3, 0, dissect_x411_ImproperlySpecifiedRecipients },
{ 3, &hf_p7_recipient_improperly_specified, BER_CLASS_CON, 3, 0, dissect_p1_ImproperlySpecifiedRecipients },
{ 4, &hf_p7_element_of_service_not_subscribed, BER_CLASS_CON, 4, 0, dissect_p7_NULL },
{ 11, &hf_p7_inconsistent_request, BER_CLASS_CON, 11, 0, dissect_p7_NULL },
{ 12, &hf_p7_security_error , BER_CLASS_CON, 12, 0, dissect_x411_SecurityProblem },
{ 12, &hf_p7_security_error , BER_CLASS_CON, 12, 0, dissect_p1_SecurityProblem },
{ 13, &hf_p7_unsupported_critical_function, BER_CLASS_CON, 13, 0, dissect_p7_NULL },
{ 15, &hf_p7_remote_bind_error, BER_CLASS_CON, 15, 0, dissect_p7_NULL },
{ 27, &hf_p7_service_error , BER_CLASS_CON, 27, 0, dissect_p7_ServiceErrorParameter },
@ -4437,7 +4437,7 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_initiator_credentials,
{ "initiator-credentials", "p7.initiator_credentials",
FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"InitiatorCredentials", HFILL }},
{ &hf_p7_security_context,
{ "security-context", "p7.security_context",
@ -4481,7 +4481,7 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_responder_credentials,
{ "responder-credentials", "p7.responder_credentials",
FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"ResponderCredentials", HFILL }},
{ &hf_p7_available_auto_actions,
{ "available-auto-actions", "p7.available_auto_actions",
@ -4985,11 +4985,11 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_register_old_credentials,
{ "old-credentials", "p7.old_credentials",
FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"Credentials", HFILL }},
{ &hf_p7_new_credentials,
{ "new-credentials", "p7.new_credentials",
FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"Credentials", HFILL }},
{ &hf_p7_user_security_labels,
{ "user-security-labels", "p7.user_security_labels",
@ -5105,7 +5105,7 @@ void proto_register_p7(void) {
"OBJECT_IDENTIFIER", HFILL }},
{ &hf_p7_old_credentials,
{ "old-credentials", "p7.old_credentials",
FT_UINT32, BASE_DEC, VALS(x411_Credentials_vals), 0,
FT_UINT32, BASE_DEC, VALS(p1_Credentials_vals), 0,
"InitiatorCredentials", HFILL }},
{ &hf_p7_password_delta,
{ "password-delta", "p7.password_delta",
@ -5285,7 +5285,7 @@ void proto_register_p7(void) {
"OriginalEncodedInformationTypes", HFILL }},
{ &hf_p7_content_type,
{ "content-type", "p7.content_type",
FT_UINT32, BASE_DEC, VALS(x411_ContentType_vals), 0,
FT_UINT32, BASE_DEC, VALS(p1_ContentType_vals), 0,
"ContentType", HFILL }},
{ &hf_p7_content_length,
{ "content-length", "p7.content_length",
@ -5493,7 +5493,7 @@ void proto_register_p7(void) {
NULL, HFILL }},
{ &hf_p7_security_error,
{ "security-error", "p7.security_error",
FT_UINT32, BASE_DEC, VALS(x411_SecurityProblem_vals), 0,
FT_UINT32, BASE_DEC, VALS(p1_SecurityProblem_vals), 0,
"SecurityProblem", HFILL }},
{ &hf_p7_unsupported_critical_function,
{ "unsupported-critical-function", "p7.unsupported_critical_function",

1136
epan/dissectors/packet-s4406.c → epan/dissectors/packet-p772.c
View File

File diff suppressed because it is too large Load Diff

20
epan/dissectors/packet-s4406.h → epan/dissectors/packet-p772.h
View File

@ -1,13 +1,13 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-s4406.h */
/* ../../tools/asn2wrs.py -b -e -C -p s4406 -c ./s4406.cnf -s ./packet-s4406-template -D . MMSAbstractService.asn MMSInformationObjects.asn MMSOtherNotificationTypeExtensions.asn MMSObjectIdentifiers.asn MMSHeadingExtensions.asn MMSUpperBounds.asn MMSExtendedBodyPartTypes.asn MMSPerRecipientSpecifierExtensions.asn */
/* packet-p772.h */
/* ../../tools/asn2wrs.py -b -e -C -p p772 -c ./p772.cnf -s ./packet-p772-template -D . MMSAbstractService.asn MMSInformationObjects.asn MMSOtherNotificationTypeExtensions.asn MMSObjectIdentifiers.asn MMSHeadingExtensions.asn MMSUpperBounds.asn MMSExtendedBodyPartTypes.asn MMSPerRecipientSpecifierExtensions.asn */
/* Input file: packet-s4406-template.h */
/* Input file: packet-p772-template.h */
#line 1 "packet-s4406-template.h"
/* packet-s4406.h
* Routines for X.411 (X.400 Message Transfer) packet dissection
#line 1 "packet-p772-template.h"
/* packet-p772.h
* Routines for STANAG 4406 (X.400 Military Message Extensions) packet dissection
* Graeme Lunt 2005
*
* $Id$
@ -31,9 +31,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef PACKET_S4406_H
#define PACKET_S4406_H
#ifndef PACKET_P772_H
#define PACKET_P772_H
/* #include "packet-s4406-exp.h" */
/* #include "packet-p772-exp.h" */
#endif /* PACKET_S4406_H */
#endif /* PACKET_P772_H */

11118
epan/dissectors/packet-x411.c
View File

File diff suppressed because it is too large Load Diff

6321
epan/dissectors/packet-x420.c
View File

File diff suppressed because it is too large Load Diff

59
epan/dissectors/packet-x420.h
View File

@ -1,59 +0,0 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-x420.h */
/* ../../tools/asn2wrs.py -b -e -C -p x420 -c ./x420.cnf -s ./packet-x420-template -D . IPMSInformationObjects.asn IPMSHeadingExtensions.asn IPMSExtendedBodyPartTypes2.asn IPMSFileTransferBodyPartType.asn IPMSExtendedVoiceBodyPartType.asn IPMSForwardedContentBodyPartType.asn IPMSMessageStoreAttributes.asn IPMSSecurityExtensions.asn IPMSObjectIdentifiers.asn IPMSUpperBounds.asn */
/* Input file: packet-x420-template.h */
#line 1 "packet-x420-template.h"
/* packet-x420.h
* Routines for X.420 (X.400 Message Transfer) packet dissection
* Graeme Lunt 2005
*
* $Id$
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef PACKET_X420_H
#define PACKET_X420_H
/*--- Included file: packet-x420-exp.h ---*/
#line 1 "packet-x420-exp.h"
extern const value_string x420_InformationObject_vals[];
extern const value_string x420_NonReceiptReasonField_vals[];
extern const value_string x420_DiscardReasonField_vals[];
int dissect_x420_InformationObject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_IPM(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_ORDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_ExtensionsField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_MessageParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_IPN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_NonReceiptReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_DiscardReasonField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_x420_ReceiptTimeField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- End of included file: packet-x420-exp.h ---*/
#line 30 "packet-x420-template.h"
void proto_reg_handoff_x420(void);
void proto_register_x420(void);
#endif /* PACKET_X420_H */

4
epan/dissectors/packet-x509ce.c
View File

@ -44,7 +44,7 @@
#include "packet-x509af.h"
#include "packet-x509if.h"
#include "packet-x509sat.h"
#include "packet-x411.h"
#include "packet-p1.h"
#define PNAME "X.509 Certificate Extensions"
#define PSNAME "X509CE"
@ -455,7 +455,7 @@ static const ber_choice_t GeneralName_choice[] = {
{ 0, &hf_x509ce_otherName , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x509ce_OtherName },
{ 1, &hf_x509ce_rfc822Name , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x509ce_IA5String },
{ 2, &hf_x509ce_dNSName , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x509ce_IA5String },
{ 3, &hf_x509ce_x400Address , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_x411_ORAddress },
{ 3, &hf_x509ce_x400Address , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_p1_ORAddress },
{ 4, &hf_x509ce_directoryName, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_x509if_Name },
{ 5, &hf_x509ce_ediPartyName , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_x509ce_EDIPartyName },
{ 6, &hf_x509ce_uniformResourceIdentifier, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_x509ce_T_uniformResourceIdentifier },

4
epan/dissectors/packet-x509sat.c
View File

@ -41,7 +41,7 @@
#include <epan/asn1.h>
#include "packet-ber.h"
#include "packet-x411.h"
#include "packet-p1.h"
#include "packet-x509sat.h"
#include "packet-x509if.h"
@ -560,7 +560,7 @@ dissect_x509sat_TelexNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = {
{ &hf_x509sat_telephoneNumber, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_x509sat_TelephoneNumber },
{ &hf_x509sat_parameters , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_G3FacsimileNonBasicParameters },
{ &hf_x509sat_parameters , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_p1_G3FacsimileNonBasicParameters },
{ NULL, 0, 0, 0, NULL }
};