Add support for PPI (the Per-Packet Information header), described at

http://www.cacetech.com/documents/PPI_Header_format_1.0.pdf .

svn path=/trunk/; revision=22094

epan/dissectors/Makefile.common

@@ -572,6 +572,7 @@ CLEAN_DISSECTOR_SRC = \
 	packet-pop.c		\
 	packet-portmap.c	\
 	packet-pgsql.c		\
+	packet-ppi.c		\
 	packet-ppp.c		\
 	packet-pppoe.c		\
 	packet-pptp.c		\

epan/dissectors/packet-frame.c

@@ -79,7 +79,7 @@ static const value_string p2p_dirs[] = {
 	{ 0, NULL }
 };
 
-static dissector_table_t wtap_encap_dissector_table;
+dissector_table_t wtap_encap_dissector_table;
 
 static GSList *frame_end_routines = NULL;
 

epan/dissectors/packet-frame.h

@@ -50,6 +50,11 @@ register_frame_end_routine(void (*func)(void));
  */
 extern int proto_malformed;
 
+/*
+ * The frame dissector and the PPI dissector both use this
+ */
+extern dissector_table_t wtap_encap_dissector_table;
+
 /* following variables are exported from libwireshark.dll.
  * Thus we need a special declaration.
  */

wiretap/libpcap.c

@@ -427,6 +427,8 @@ static const struct {
 	{ 188,		WTAP_ENCAP_IEEE802_16_MAC_CPS },
 	/* USB packets with Linux-specified header */
 	{ 189, 		WTAP_ENCAP_USB_LINUX },
+        /* Per-Packet Information header */
+        { 192,          WTAP_ENCAP_PPI },
 
 	/*
 	 * To repeat:

wiretap/wtap.c

@@ -377,6 +377,9 @@ static struct encap_type_info encap_table_base[] = {
 
 	/* WTAP_ENCAP_MPEG */
 	{ "MPEG", "mpeg" },
+
+	/* WTAP_ENCAP_PPI */
+	{ "Per-Packet Information header", "ppi" },
 };
 
 gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);

wiretap/wtap.h

@@ -191,6 +191,7 @@ extern "C" {
 #define WTAP_ENCAP_NETTL_RAW_TELNET		94
 #define WTAP_ENCAP_USB_LINUX                    95
 #define WTAP_ENCAP_MPEG                         96
+#define WTAP_ENCAP_PPI                          97
 
 #define WTAP_NUM_ENCAP_TYPES			wtap_get_num_encap_types()