Show the SAP values in RPL packets symbolically if possible.

svn path=/trunk/; revision=6564
This commit is contained in:
Guy Harris 2002-11-05 22:50:42 +00:00
parent 3b71004a61
commit aef0d31da2
3 changed files with 8 additions and 5 deletions

View File

@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@alumni.rice.edu>
*
* $Id: packet-llc.c,v 1.100 2002/08/28 21:00:20 jmayer Exp $
* $Id: packet-llc.c,v 1.101 2002/11/05 22:50:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -102,7 +102,7 @@ static dissector_handle_t data_handle;
* IBM SNA Path Control, IBM Net Management), but, whilst 0xFE is
* the ISO Network Layer Protocol, 0xFF is the Global LSAP.
*/
static const value_string sap_vals[] = {
const value_string sap_vals[] = {
{ SAP_NULL, "NULL LSAP" },
{ SAP_LLC_SLMGMT, "LLC Sub-Layer Management" },
{ SAP_SNA_PATHCTRL, "SNA Path Control" },

View File

@ -1,6 +1,6 @@
/* packet-llc.h
*
* $Id: packet-llc.h,v 1.8 2002/08/28 21:00:20 jmayer Exp $
* $Id: packet-llc.h,v 1.9 2002/11/05 22:50:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -29,4 +29,6 @@ void capture_llc(const guchar *, int, int, packet_counts *);
void dissect_snap(tvbuff_t *, int, packet_info *, proto_tree *,
proto_tree *, int, int, int, int, int);
extern const value_string sap_vals[];
#endif

View File

@ -2,7 +2,7 @@
* Routines for RPL
* Jochen Friedrich <jochen@scram.de>
*
* $Id: packet-rpl.c,v 1.2 2002/11/03 20:11:32 guy Exp $
* $Id: packet-rpl.c,v 1.3 2002/11/05 22:50:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -31,6 +31,7 @@
#include <epan/packet.h>
#include "llcsaps.h"
#include "packet-llc.h"
static int proto_rpl = -1;
@ -316,7 +317,7 @@ proto_register_rpl(void)
"RPL Set MAC Address", HFILL }},
{ &hf_rpl_sap,
{ "SAP", "rpl.sap",
FT_UINT8, BASE_HEX, NULL, 0x0,
FT_UINT8, BASE_HEX, VALS(sap_vals), 0x0,
"RPL SAP", HFILL }},
{ &hf_rpl_equipment,
{ "Equipment", "rpl.equipment",