From Hannes Kälber:

new WTAP_ENCAP files(X2E Xoraya serial frame and X2E Xoraya frame )
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2418

svn path=/trunk/; revision=25154

1 files changed, 73 insertions, 72 deletions

diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 0856e716fa..f439bcba79 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -93,47 +93,47 @@ extern "C" {
  *	   what older versions of "libpcap" on Linux turn the Ethernet
  *	   header for loopback interfaces into (0.6.0 and later versions
  *	   leave the Ethernet header alone and make it DLT_EN10MB). */
-#define WTAP_ENCAP_PER_PACKET			-1
-#define WTAP_ENCAP_UNKNOWN			0
-#define WTAP_ENCAP_ETHERNET			1
-#define WTAP_ENCAP_TOKEN_RING			2
-#define WTAP_ENCAP_SLIP				3
-#define WTAP_ENCAP_PPP				4
-#define WTAP_ENCAP_FDDI				5
-#define WTAP_ENCAP_FDDI_BITSWAPPED		6
-#define WTAP_ENCAP_RAW_IP			7
-#define WTAP_ENCAP_ARCNET			8
-#define WTAP_ENCAP_ARCNET_LINUX			9
-#define WTAP_ENCAP_ATM_RFC1483			10
-#define WTAP_ENCAP_LINUX_ATM_CLIP		11
-#define WTAP_ENCAP_LAPB				12
-#define WTAP_ENCAP_ATM_PDUS			13
+#define WTAP_ENCAP_PER_PACKET				-1
+#define WTAP_ENCAP_UNKNOWN					0
+#define WTAP_ENCAP_ETHERNET					1
+#define WTAP_ENCAP_TOKEN_RING				2
+#define WTAP_ENCAP_SLIP						3
+#define WTAP_ENCAP_PPP						4
+#define WTAP_ENCAP_FDDI						5
+#define WTAP_ENCAP_FDDI_BITSWAPPED			6
+#define WTAP_ENCAP_RAW_IP					7
+#define WTAP_ENCAP_ARCNET					8
+#define WTAP_ENCAP_ARCNET_LINUX				9
+#define WTAP_ENCAP_ATM_RFC1483				10
+#define WTAP_ENCAP_LINUX_ATM_CLIP			11
+#define WTAP_ENCAP_LAPB						12
+#define WTAP_ENCAP_ATM_PDUS					13
 #define WTAP_ENCAP_ATM_PDUS_UNTRUNCATED		14
-#define WTAP_ENCAP_NULL				15
-#define WTAP_ENCAP_ASCEND			16
-#define WTAP_ENCAP_ISDN				17
-#define WTAP_ENCAP_IP_OVER_FC			18
-#define WTAP_ENCAP_PPP_WITH_PHDR		19
-#define WTAP_ENCAP_IEEE_802_11			20
-#define WTAP_ENCAP_PRISM_HEADER			21
-#define WTAP_ENCAP_IEEE_802_11_WITH_RADIO	22
+#define WTAP_ENCAP_NULL						15
+#define WTAP_ENCAP_ASCEND					16
+#define WTAP_ENCAP_ISDN						17
+#define WTAP_ENCAP_IP_OVER_FC				18
+#define WTAP_ENCAP_PPP_WITH_PHDR			19
+#define WTAP_ENCAP_IEEE_802_11				20
+#define WTAP_ENCAP_PRISM_HEADER					21
+#define WTAP_ENCAP_IEEE_802_11_WITH_RADIO		22
 #define WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP	23
-#define WTAP_ENCAP_IEEE_802_11_WLAN_AVS		24
-#define WTAP_ENCAP_SLL				25
-#define WTAP_ENCAP_FRELAY			26
-#define WTAP_ENCAP_FRELAY_WITH_PHDR		27
-#define WTAP_ENCAP_CHDLC			28
+#define WTAP_ENCAP_IEEE_802_11_WLAN_AVS			24
+#define WTAP_ENCAP_SLL							25
+#define WTAP_ENCAP_FRELAY						26
+#define WTAP_ENCAP_FRELAY_WITH_PHDR				27
+#define WTAP_ENCAP_CHDLC						28
 #define WTAP_ENCAP_CISCO_IOS			29
 #define WTAP_ENCAP_LOCALTALK			30
 #define WTAP_ENCAP_OLD_PFLOG			31
-#define WTAP_ENCAP_HHDLC			32
-#define WTAP_ENCAP_DOCSIS			33
-#define WTAP_ENCAP_COSINE			34
+#define WTAP_ENCAP_HHDLC				32
+#define WTAP_ENCAP_DOCSIS				33
+#define WTAP_ENCAP_COSINE				34
 #define WTAP_ENCAP_WFLEET_HDLC			35
-#define WTAP_ENCAP_SDLC				36
-#define WTAP_ENCAP_TZSP				37
-#define WTAP_ENCAP_ENC				38
-#define WTAP_ENCAP_PFLOG			39
+#define WTAP_ENCAP_SDLC					36
+#define WTAP_ENCAP_TZSP					37
+#define WTAP_ENCAP_ENC					38
+#define WTAP_ENCAP_PFLOG				39
 #define WTAP_ENCAP_CHDLC_WITH_PHDR		40
 #define WTAP_ENCAP_BLUETOOTH_H4			41
 #define WTAP_ENCAP_MTP2				42
@@ -155,38 +155,38 @@ extern "C" {
 #define WTAP_ENCAP_USER13			58
 #define WTAP_ENCAP_USER14			59
 #define WTAP_ENCAP_USER15			60
-#define WTAP_ENCAP_SYMANTEC			61
+#define WTAP_ENCAP_SYMANTEC					61
 #define WTAP_ENCAP_APPLE_IP_OVER_IEEE1394	62
-#define WTAP_ENCAP_BACNET_MS_TP			63
-#define WTAP_ENCAP_NETTL_RAW_ICMP		64
-#define WTAP_ENCAP_NETTL_RAW_ICMPV6		65
-#define WTAP_ENCAP_GPRS_LLC			66
-#define WTAP_ENCAP_JUNIPER_ATM1			67
-#define WTAP_ENCAP_JUNIPER_ATM2			68
-#define WTAP_ENCAP_REDBACK			69
-#define WTAP_ENCAP_NETTL_RAW_IP			70
-#define WTAP_ENCAP_NETTL_ETHERNET		71
-#define WTAP_ENCAP_NETTL_TOKEN_RING		72
-#define WTAP_ENCAP_NETTL_FDDI			73
-#define WTAP_ENCAP_NETTL_UNKNOWN		74
-#define WTAP_ENCAP_MTP2_WITH_PHDR		75
-#define WTAP_ENCAP_JUNIPER_PPPOE		76
-#define WTAP_GCOM_TIE1				77
-#define WTAP_GCOM_SERIAL			78
-#define WTAP_ENCAP_NETTL_X25			79
-#define WTAP_ENCAP_K12				80
-#define WTAP_ENCAP_JUNIPER_MLPPP		81
-#define WTAP_ENCAP_JUNIPER_MLFR			82
-#define WTAP_ENCAP_JUNIPER_ETHER		83
-#define WTAP_ENCAP_JUNIPER_PPP			84
-#define WTAP_ENCAP_JUNIPER_FRELAY		85
-#define WTAP_ENCAP_JUNIPER_CHDLC		86
-#define WTAP_ENCAP_JUNIPER_GGSN			87
-#define WTAP_ENCAP_LINUX_LAPD			88
-#define WTAP_ENCAP_CATAPULT_DCT2000		89
-#define WTAP_ENCAP_BER				90
-#define WTAP_ENCAP_JUNIPER_VP			91
-#define WTAP_ENCAP_USB				92
+#define WTAP_ENCAP_BACNET_MS_TP				63
+#define WTAP_ENCAP_NETTL_RAW_ICMP			64
+#define WTAP_ENCAP_NETTL_RAW_ICMPV6			65
+#define WTAP_ENCAP_GPRS_LLC					66
+#define WTAP_ENCAP_JUNIPER_ATM1				67
+#define WTAP_ENCAP_JUNIPER_ATM2				68
+#define WTAP_ENCAP_REDBACK					69
+#define WTAP_ENCAP_NETTL_RAW_IP				70
+#define WTAP_ENCAP_NETTL_ETHERNET			71
+#define WTAP_ENCAP_NETTL_TOKEN_RING			72
+#define WTAP_ENCAP_NETTL_FDDI				73
+#define WTAP_ENCAP_NETTL_UNKNOWN			74
+#define WTAP_ENCAP_MTP2_WITH_PHDR			75
+#define WTAP_ENCAP_JUNIPER_PPPOE			76
+#define WTAP_GCOM_TIE1						77
+#define WTAP_GCOM_SERIAL					78
+#define WTAP_ENCAP_NETTL_X25				79
+#define WTAP_ENCAP_K12						80
+#define WTAP_ENCAP_JUNIPER_MLPPP			81
+#define WTAP_ENCAP_JUNIPER_MLFR				82
+#define WTAP_ENCAP_JUNIPER_ETHER			83
+#define WTAP_ENCAP_JUNIPER_PPP				84
+#define WTAP_ENCAP_JUNIPER_FRELAY			85
+#define WTAP_ENCAP_JUNIPER_CHDLC			86
+#define WTAP_ENCAP_JUNIPER_GGSN				87
+#define WTAP_ENCAP_LINUX_LAPD				88
+#define WTAP_ENCAP_CATAPULT_DCT2000			89
+#define WTAP_ENCAP_BER						90
+#define WTAP_ENCAP_JUNIPER_VP				91
+#define WTAP_ENCAP_USB						92
 #define WTAP_ENCAP_IEEE802_16_MAC_CPS		93
 #define WTAP_ENCAP_NETTL_RAW_TELNET			94
 #define WTAP_ENCAP_USB_LINUX				95
@@ -199,12 +199,13 @@ extern "C" {
 #define WTAP_ENCAP_BLUETOOTH_HCI			102 /*raw packets without a transport layer header e.g. H4*/
 #define WTAP_ENCAP_IPMB						103
 #define WTAP_ENCAP_IEEE802_15_4				104
-#define WTAP_ENCAP_X2E_XORAYA			105
-#define WTAP_ENCAP_FLEXRAY			106
-#define WTAP_ENCAP_LIN				107
-#define WTAP_ENCAP_MOST				108
-#define WTAP_ENCAP_CAN20B			109
-#define WTAP_ENCAP_LAYER1_EVENT			110
+#define WTAP_ENCAP_X2E_XORAYA				105
+#define WTAP_ENCAP_FLEXRAY					106
+#define WTAP_ENCAP_LIN						107
+#define WTAP_ENCAP_MOST						108
+#define WTAP_ENCAP_CAN20B					109
+#define WTAP_ENCAP_LAYER1_EVENT				110
+#define WTAP_ENCAP_X2E_SERIAL				111
 
 #define WTAP_NUM_ENCAP_TYPES			wtap_get_num_encap_types()