Ethereal-dev: [Ethereal-dev] [PATCH] Fix for misaligned encap_table elements

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Daniele Orlandi <daniele@xxxxxxxxxxx>
Date: Wed, 28 Dec 2005 17:09:03 +0100
Hello,

This patch fixed misalignments in encap_table elements caused by two missing 
entries. It applies both to ethereal-0.10.13 and SVN's version.

Please check for correctness.

Bye,

diff -ur ethereal-0.10.13/wiretap/wtap.c ethereal-0.10.13-encap-table/wiretap/wtap.c
--- ethereal-0.10.13/wiretap/wtap.c	2005-10-10 15:23:12.000000000 +0200
+++ ethereal-0.10.13-encap-table/wiretap/wtap.c	2005-12-28 16:55:57.000000000 +0100
@@ -293,6 +293,9 @@
 	/* WTAP_ENCAP_NETTL_RAW_ICMPV6 */
 	{ "Raw ICMPv6 with nettl headers", "raw-icmpv6-nettl" },
 
+	/* UNUSED */
+	{ "", "" },
+
 	/* WTAP_ENCAP_GPRS_LLC */
 	{ "GPRS LLC", "gprs-llc" },
 
@@ -335,6 +338,9 @@
 	/* WTAP_ENCAP_NETTL_X25 */
 	{ "X25 with nettl headers", "x25-nettl" },
 
+	/* WTAP_ENCAP_K12 */
+	{ "K12 protocol analyzer", "k12" },
+
 	/* WTAP_ENCAP_JUNIPER_MLPPP */
 	{ "Juniper MLPPP", "juniper-mlppp" },