aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/disp/packet-disp-template.c
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2005-12-07 23:20:11 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2005-12-07 23:20:11 +0000
commit7d5f1ba0176b7b085754cb5715479e3d50bb066d (patch)
tree46169c3c7d610ad5d8c47911a9aa4c424f196c38 /asn1/disp/packet-disp-template.c
parent78f7b3dfbbd92861a7e59698898d7ba30ed51804 (diff)
From Grame Lunt:
updated X.500 dissectors to include DOP support. The "dop" dissector is the renamed "x501" dissector consequently the asn/x501 directory should be removed. The patch includes the changes to epan/dissectors/Makefile.common to reflect this. As the DOP dissection is not fully tested, I have disabled it by default for now (like DSP) but it can be enabled by the user. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16726 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/disp/packet-disp-template.c')
-rw-r--r--asn1/disp/packet-disp-template.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 079c2602b8..9087fa8181 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -45,7 +45,7 @@
#include "packet-x509sat.h"
#include "packet-crmf.h"
-#include "packet-x501.h"
+#include "packet-dop.h"
#include "packet-dap.h"
#include "packet-dsp.h"
#include "packet-disp.h"
@@ -221,7 +221,11 @@ void proto_register_disp(void) {
/* Register our configuration options for DISP, particularly our port */
+#ifdef PREFERENCE_GROUPING
+ disp_module = prefs_register_protocol_subtree("OSI/X.500", proto_disp, prefs_register_disp);
+#else
disp_module = prefs_register_protocol(proto_disp, prefs_register_disp);
+#endif
prefs_register_uint_preference(disp_module, "tcp.port", "DISP TCP Port",
"Set the port for DISP operations (if other"
@@ -235,7 +239,7 @@ void proto_register_disp(void) {
void proto_reg_handoff_disp(void) {
dissector_handle_t handle = NULL;
- /* #include "packet-disp-dis-tab.c" */
+ #include "packet-disp-dis-tab.c"
/* APPLICATION CONTEXT */
@@ -254,6 +258,9 @@ void proto_reg_handoff_disp(void) {
register_rtse_oid_dissector_handle("2.5.9.6", handle, 0, "id-as-directory-reliable-binding", FALSE);
}
+ /* OPERATIONAL BINDING */
+ register_ber_oid_name("2.5.1.0.5.1", "id-op-binding-shadow");
+
tpkt_handle = find_dissector("tpkt");
}