diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-10-26 17:07:47 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-10-28 17:39:04 +0000 |
commit | d47551982b343664cafa3ddfa3b3bb960ed9f34a (patch) | |
tree | 8c88e54355d399d3b43a57098c3ad76276cd5112 /epan/dissectors/packet-ipx.c | |
parent | 01147f8369e76927d7a90cfa0b592457a1878839 (diff) |
Implement registration of capture dissectors by name
Mirror it after protocol dissector API.
Change-Id: I7985bcfa9e07654c7cf005efec94efc205d7a304
Reviewed-on: https://code.wireshark.org/review/18496
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ipx.c')
-rw-r--r-- | epan/dissectors/packet-ipx.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index b5419394ad..da8f9d837e 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -1584,6 +1584,8 @@ proto_register_ipx(void) ipx_tap=register_tap("ipx"); register_conversation_table(proto_ipx, TRUE, ipx_conversation_packet, ipx_hostlist_packet); + + register_capture_dissector("ipx", capture_ipx, proto_ipx); } void @@ -1592,6 +1594,7 @@ proto_reg_handoff_ipx(void) dissector_handle_t ipx_handle, spx_handle; dissector_handle_t ipxsap_handle, ipxrip_handle; dissector_handle_t serialization_handle, ipxmsg_handle; + capture_dissector_handle_t ipx_cap_handle; ipx_handle = find_dissector("ipx"); dissector_add_uint_with_preference("udp.port", UDP_PORT_IPX, ipx_handle); @@ -1624,11 +1627,12 @@ proto_reg_handoff_ipx(void) dissector_add_uint("ipx.socket", IPX_SOCKET_IPX_MESSAGE, ipxmsg_handle); dissector_add_uint("ipx.socket", IPX_SOCKET_IPX_MESSAGE1, ipxmsg_handle); - register_capture_dissector("ethertype", ETHERTYPE_IPX, capture_ipx, proto_ipx); - register_capture_dissector("ppp_hdlc", PPP_IPX, capture_ipx, proto_ipx); - register_capture_dissector("sll.ltype", LINUX_SLL_P_802_3, capture_ipx, proto_ipx); - register_capture_dissector("llc.dsap", SAP_NETWARE1, capture_ipx, proto_ipx); - register_capture_dissector("llc.dsap", SAP_NETWARE2, capture_ipx, proto_ipx); + ipx_cap_handle = find_capture_dissector("ipx"); + capture_dissector_add_uint("ethertype", ETHERTYPE_IPX, ipx_cap_handle); + capture_dissector_add_uint("ppp_hdlc", PPP_IPX, ipx_cap_handle); + capture_dissector_add_uint("sll.ltype", LINUX_SLL_P_802_3, ipx_cap_handle); + capture_dissector_add_uint("llc.dsap", SAP_NETWARE1, ipx_cap_handle); + capture_dissector_add_uint("llc.dsap", SAP_NETWARE2, ipx_cap_handle); } /* |