diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-19 21:43:53 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-20 05:07:04 +0000 |
| commit | 7e0ec2c8eb3c88e70992dc40b130c76177b83a30 (patch) | |
| tree | 6444ee7bd13e3c29a4bdbff2243d9bd5289aa175 /epan/dissectors/packet-llc.c | |
| parent | f1e07c4d6072c8e0fc127de2488090cdffcde43d (diff) | |
Create capture dissector table for LLC non-snap dissectors.
Change-Id: I37602d0e2148150b55b2812855bccf2f181d31b8
Reviewed-on: https://code.wireshark.org/review/12737
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-llc.c')
| -rw-r--r-- | epan/dissectors/packet-llc.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index c2fa07813e..dfd2b17863 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -38,7 +38,6 @@ #include "packet-ip.h" #include "packet-ipx.h" #include "packet-netbios.h" -#include "packet-vines.h" #include "packet-sll.h" #include "packet-juniper.h" @@ -282,23 +281,7 @@ capture_llc(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo return capture_snap(pd, offset+llc_header_len, len, cpinfo, pseudo_header); /* non-SNAP */ - switch (pd[offset]) { - - case SAP_IP: - return capture_ip(pd, offset + llc_header_len, len, cpinfo, pseudo_header); - - case SAP_NETWARE1: - case SAP_NETWARE2: - return capture_ipx(pd, offset + llc_header_len, len, cpinfo, pseudo_header); - - case SAP_NETBIOS: - return capture_netbios(pd, offset + llc_header_len, len, cpinfo, pseudo_header); - - case SAP_VINES1: - case SAP_VINES2: - return capture_vines(pd, offset + llc_header_len, len, cpinfo, pseudo_header); - } - return FALSE; + return try_capture_dissector("llc.dsap", pd[offset], pd, offset + llc_header_len, len, cpinfo, pseudo_header); } gboolean @@ -838,6 +821,7 @@ proto_register_llc(void) "LLC SAP", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); xid_subdissector_table = register_dissector_table("llc.xid_dsap", "LLC XID SAP", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); + register_capture_dissector_table("llc.dsap", "LLC"); register_dissector("llc", dissect_llc, proto_llc); } |