aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/dap
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-09 14:17:51 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-09 14:17:51 +0000
commit1b1ee3ca3ee007f45f64188ed181d946c85dc5ea (patch)
tree91f60e6bce7c22f7fedac6c7fb5eddad0020bbfa /asn1/dap
parent9c0d7c63a8f8205c32927db49d1c741eb9934c7e (diff)
Support for X.519 (section 9) Internet Directly Mapped Protocol (IDMP).
IDMP provides a mapping of request-response service elements directly onto the Internet TCP/IP protocol, bypassing the ACSE, Presentation, Session and Transport layers of the OSI model. It also supports the use of TLS services. The DAP dissector has been updated to use the IDMP protocol. svn path=/trunk/; revision=33177
Diffstat (limited to 'asn1/dap')
-rw-r--r--asn1/dap/dap.cnf15
-rw-r--r--asn1/dap/packet-dap-template.c3
2 files changed, 15 insertions, 3 deletions
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf
index dcfe5e54d2..cae5576c19 100644
--- a/asn1/dap/dap.cnf
+++ b/asn1/dap/dap.cnf
@@ -1,3 +1,11 @@
+# $Id$
+
+
+#.TYPE_ATTR
+# X509AF also exports the type Time. This makes sure asn2wrs uses the locally defined version.
+Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(dap_Time_vals) BITMASK = 0
+#.END
+
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
@@ -12,7 +20,6 @@ DAP-InvokeIDSet
#.END
#.MODULE_IMPORT
-ServiceAdministration x509if
AttributeCertificateDefinitions x509af
BasicAccessControl crmf
@@ -172,8 +179,10 @@ PagedResultsRequest/queryReference pagedResultsQueryReference
EntryInformationSelection/extraAttributes/select extraSelect
-# This table creates the value_sting to name P7 operation codes and errors
-# in file packet-p7-table.c which is included in the template file
+SaslCredentials/credentials saslCredentials
+
+# This table creates the value_sting to name DAP operation codes and errors
+# in file packet-dap-table.c which is included in the template file
#
#.TABLE_HDR
/* DAP OPERATIONS */
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index b6dde63064..cd06bf8442 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.c
@@ -36,6 +36,7 @@
#include "packet-ber.h"
#include "packet-acse.h"
#include "packet-ros.h"
+#include "packet-idmp.h"
#include "packet-x509if.h"
#include "packet-x509af.h"
@@ -137,6 +138,8 @@ void proto_reg_handoff_dap(void) {
/* Register DAP with ROS (with no use of RTSE) */
register_ros_protocol_info("2.5.9.1", &dap_ros_info, 0, "id-as-directory-access", FALSE);
+ register_idmp_protocol_info("2.5.33.0", &dap_ros_info, 0, "dap-ip");
+
/* remember the tpkt handler for change in preferences */
tpkt_handle = find_dissector("tpkt");