aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-09-08 11:50:41 -0400
committerAnders Broman <a.broman58@gmail.com>2014-09-08 17:53:08 +0000
commit412662afb3c404df5a1e5e19988b0df8d594267a (patch)
tree2d9b4d3ef0efbc3ab7dbc5e8180a4b464dda22af
parent00a244445d3102d0169342e92b74471e8635623a (diff)
Register the dicom dissector by name so it can be used with SSL.
Bug: 10450 Change-Id: I786de3de39c6d4829135b67a64936c28757d1ff4 Reviewed-on: https://code.wireshark.org/review/4038 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-dcm.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 4c79d825f4..d92a51836a 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -7227,11 +7227,6 @@ proto_register_dcm(void)
{ &hf_dcm_pdv_reassembled_length,
{ "Reassembled PDV length", "dicom.pdv.reassembled.length",
FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }
-
-/*
- { &hf_dcm_FIELDABBREV, { "FIELDNAME", "dicom.FIELDABBREV",
- FIELDTYPE, FIELDBASE, FIELDCONVERT, BITMASK, "FIELDDESCR", HFILL } },
- */
};
/* Setup protocol subtree array */
@@ -7288,6 +7283,9 @@ proto_register_dcm(void)
expert_dcm = expert_register_protocol(proto_dcm);
expert_register_field_array(expert_dcm, ei, array_length(ei));
+ /* Allow other dissectors to find this one by name. */
+ new_register_dissector("dicom", dissect_dcm_static, proto_dcm);
+
dcm_module = prefs_register_protocol(proto_dcm, dcm_apply_settings);
range_convert_str(&global_dcm_tcp_range, DICOM_DEFAULT_RANGE, 65535);