Get rid of some other uses of ethertype() for protocols that don't have

a trailer.

Clean up the NHRP dissector's handling of the protocol ID to fully
implement RFC 2332 (and mention that 2332 is the RFC for NHRP).  Don't
compute the checksum unless we have all the packet data, and don't use
the captured length as the actual packet length.  Check for an invalid
extension offset value.  Get rid of some unneeded
tvb_ensure_bytes_exist() calls.  Dissect - and set the columns -
regardless of whether we're building the protocol tree.  Mark the packet
in error reports as an error packet.

svn path=/trunk/; revision=28273

1 files changed, 19 insertions, 1 deletions

diff --git a/epan/dissectors/packet-llc.h b/epan/dissectors/packet-llc.h
index 976de2f8d3..b65e1bb581 100644
--- a/epan/dissectors/packet-llc.h
+++ b/epan/dissectors/packet-llc.h
@@ -25,6 +25,9 @@
 #define __PACKET_LLC_H__
 
 void capture_llc(const guchar *, int, int, packet_counts *);
+
+extern const value_string sap_vals[];
+
 void capture_snap(const guchar *, int, int, packet_counts *);
 
 void dissect_snap(tvbuff_t *, int, packet_info *, proto_tree *,
@@ -35,6 +38,21 @@ void dissect_snap(tvbuff_t *, int, packet_info *, proto_tree *,
  */
 void llc_add_oui(guint32, const char *, const char *, hf_register_info *);
 
-extern const value_string sap_vals[];
+/*
+ * SNAP information about the PID for a particular OUI:
+ *
+ *	the dissector table to use with the PID's value;
+ *	the field to use for the PID.
+ */
+typedef struct {
+	dissector_table_t table;
+	hf_register_info *field_info;
+} oui_info_t;
+
+/*
+ * Return the oui_info_t for the PID for a particular OUI value, or NULL
+ * if there isn't one.
+ */
+oui_info_t *get_snap_oui_info(guint32);
 
 #endif