LLDP: Remove packet-lldp.h

Change-Id: If6d1fd1b7961f975447db43f616e016f70ca5cb8
Reviewed-on: https://code.wireshark.org/review/1473
Reviewed-by: Evan Huus <eapache@gmail.com>

3 files changed, 27 insertions, 62 deletions

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 6e564bd665..a31c943c1e 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -1505,7 +1505,6 @@ DISSECTOR_INCLUDES =	\
 	packet-lcsap.h	\
 	packet-ldp.h	\
 	packet-llc.h	\
-	packet-lldp.h	\
 	packet-logotypecertextn.h	\
 	packet-lpp.h		\
 	packet-lte-rrc.h	\
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:
diff --git a/epan/dissectors/packet-lldp.h b/epan/dissectors/packet-lldp.h
deleted file mode 100644
index 96a7c9c9a7..0000000000
--- a/epan/dissectors/packet-lldp.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* packet-lldp.h
- * Routines for LLDP dissection
- * By Juan Gonzalez <juan.gonzalez@pikatech.com>
- * Copyright 2005 MITEL
- *
- * July 2005
- * Modified by: Brian Bogora <brian_bogora@mitel.com>
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef PACKET_LLDP_H__
-#define PACKET_LLDP_H__
-
-#include "oui.h"
-
-/* 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)
-
-/* IEEE 802.1Qbg Subtypes */
-static const value_string ieee_802_1qbg_subtypes[] = {
-	{ 0x00,	"EVB" },
-	{ 0x01,	"CDCP" },
-	{ 0x02,	"VDP" },
-	{ 0, NULL }
-};
-
-gint32 dissect_lldp_end_of_lldpdu(tvbuff_t *, packet_info *, proto_tree *, guint32);
-
-#endif /* PACKET_LLDP_H__ */