Directly call the FDDI and "raw IP" dissectors from the nettl dissector.

Just get handles for the dissectors, don't go through the wtap_encap
dissector table.

Change-Id: I459249b98741cc069495c84ad4c47c0aa6768096
Reviewed-on: https://code.wireshark.org/review/13383
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index 4c3f048784..9a3d20a1d7 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -38,6 +38,7 @@ static gint ett_raw = -1;
 
 static const char zeroes[10] = {0,0,0,0,0,0,0,0,0,0};
 
+static dissector_handle_t raw_handle;
 static dissector_handle_t ip_handle;
 static dissector_handle_t ipv6_handle;
 static dissector_handle_t data_handle;
@@ -172,13 +173,13 @@ proto_register_raw(void)
 
   proto_raw = proto_register_protocol("Raw packet data", "Raw", "raw");
   proto_register_subtree_array(ett, array_length(ett));
+
+  raw_handle = register_dissector("raw_ip", dissect_raw, proto_raw);
 }
 
 void
 proto_reg_handoff_raw(void)
 {
-  dissector_handle_t raw_handle;
-
   /*
    * Get handles for the IP, IPv6, undissected-data, and
    * PPP-in-HDLC-like-framing dissectors.
@@ -187,7 +188,6 @@ proto_reg_handoff_raw(void)
   ipv6_handle = find_dissector("ipv6");
   data_handle = find_dissector("data");
   ppp_hdlc_handle = find_dissector("ppp_hdlc");
-  raw_handle = create_dissector_handle(dissect_raw, proto_raw);
   dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IP, raw_handle);
   register_capture_dissector("wtap_encap", WTAP_ENCAP_RAW_IP, capture_raw, proto_raw);
 }