aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ndmp.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-08-07 04:39:32 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-08-07 04:39:32 +0000
commit4317fade8c5ea1baf0396b0dc53559f73de79aaa (patch)
tree1886af70ccb9c96ed90b5cf09794f09d3aecdffc /epan/dissectors/packet-ndmp.c
parent907e735f6097d72e79fb19cfbc101c2b3e844941 (diff)
From Michael Mann:
the heuristics of NDMP require 28 bytes to be present in order for it to be dissected as NDMP. NDMP is purely a heuristic dissector because TCPENCAP shares the same TCP port. Since NDMP officially registered port 10000 with IANA, allow it to use dissector_add_uint() instead of packet-ipsec-tcp.c, and by default have TCPENCAP only rely on its heuristics. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5462 svn path=/trunk/; revision=51180
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
-rw-r--r--epan/dissectors/packet-ndmp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 2653c88739..1b359e2889 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -4322,8 +4322,6 @@ void
proto_reg_handoff_ndmp(void)
{
ndmp_handle = new_create_dissector_handle(dissect_ndmp, proto_ndmp);
-#if 0 /* tcpencap needs to own this TCP port; See packet-ipsec-tcp.c */
dissector_add_uint("tcp.port",TCP_PORT_NDMP, ndmp_handle);
-#endif
heur_dissector_add("tcp", dissect_ndmp_heur, proto_ndmp);
}