diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-05-02 17:24:08 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-05-02 21:36:07 +0000 |
| commit | a394d448f476ce417ec0f92d625017086c43f694 (patch) | |
| tree | 029c034985350c4970d53c584ce4074ba776f759 /epan/dissectors/packet-lldp.c | |
| parent | 59a4a856a3ee4790a982f074150f63fc896a9858 (diff) | |
LLDP: Remove packet-lldp.h
Change-Id: If6d1fd1b7961f975447db43f616e016f70ca5cb8
Reviewed-on: https://code.wireshark.org/review/1473
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-lldp.c')
| -rw-r--r-- | epan/dissectors/packet-lldp.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 9d8a4e8a77..d17a829a14 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -34,7 +34,7 @@ #include <epan/oui.h> #include <epan/afn.h> #include <epan/addr_resolv.h> -#include "packet-lldp.h" +#include "oui.h" void proto_register_lldp(void); void proto_reg_handoff_lldp(void); @@ -333,6 +333,24 @@ static gint ett_media_capabilities = -1; static gint ett_profinet_period = -1; static gint ett_cisco_fourwire_tlv = -1; +/* TLV Types */ +#define END_OF_LLDPDU_TLV_TYPE 0x00 /* Mandatory */ +#define CHASSIS_ID_TLV_TYPE 0x01 /* Mandatory */ +#define PORT_ID_TLV_TYPE 0x02 /* Mandatory */ +#define TIME_TO_LIVE_TLV_TYPE 0x03 /* Mandatory */ +#define PORT_DESCRIPTION_TLV_TYPE 0x04 +#define SYSTEM_NAME_TLV_TYPE 0x05 +#define SYSTEM_DESCRIPTION_TLV_TYPE 0x06 +#define SYSTEM_CAPABILITIES_TLV_TYPE 0x07 +#define MANAGEMENT_ADDR_TLV_TYPE 0x08 +#define ORGANIZATION_SPECIFIC_TLV_TYPE 0x7F + +/* Masks */ +#define TLV_TYPE_MASK 0xFE00 +#define TLV_TYPE(value) (((value) & TLV_TYPE_MASK) >> 9) +#define TLV_INFO_LEN_MASK 0x01FF +#define TLV_INFO_LEN(value) ((value) & TLV_INFO_LEN_MASK) + static const value_string tlv_types[] = { { END_OF_LLDPDU_TLV_TYPE, "End of LLDPDU"}, { CHASSIS_ID_TLV_TYPE, "Chassis Id"}, @@ -767,6 +785,14 @@ static const value_string profinet_mrrt_port_status_vals[] = { { 0, NULL } }; +/* IEEE 802.1Qbg Subtypes */ +static const value_string ieee_802_1qbg_subtypes[] = { + { 0x00, "EVB" }, + { 0x01, "CDCP" }, + { 0x02, "VDP" }, + { 0, NULL } +}; + /* Calculate Latitude and Longitude string */ /* Parameters: |