summaryrefslogtreecommitdiff
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2008-04-23 21:35:36 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2008-04-23 21:35:36 +0000
commit632a3b791cac3fb0d06d4813f791a9f24bebc672 (patch)
tree1a5c770afa4eebb84bf3a5e65c035ba54b43749b /wiretap/wtap.c
parent2462cc82c3d366e690d38b102ec4dfe1d9bc5f64 (diff)
downloadwireshark-632a3b791cac3fb0d06d4813f791a9f24bebc672.tar.gz
The constants are there, now they need real names.
svn path=/trunk/; revision=25159
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 358ca3480a..1a350f8eab 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -403,7 +403,28 @@ static struct encap_type_info encap_table_base[] = {
{ "Intelligent Platform Management Bus", "ipmb" },
/* WTAP_ENCAP_IEEE802_15_4 */
- { "IEEE 802.15.4 Wireless PAN", "wpan" }
+ { "IEEE 802.15.4 Wireless PAN", "wpan" },
+
+ /* WTAP_ENCAP_X2E_XORAYA */
+ { "X2E XORAYA", "x2e-xoraya" },
+
+ /* WTAP_ENCAP_FLEXRAY */
+ { "FlexRay", "flexray" },
+
+ /* WTAP_ENCAP_LIN */
+ { "LIN", "lin" },
+
+ /* WTAP_ENCAP_MOST */
+ { "MOST", "most" },
+
+ /* WTAP_ENCAP_CAN20B */
+ { "CAN 2.0B", "can20b" },
+
+ /* WTAP_ENCAP_LAYER1_EVENT */
+ { "Layer 1 event", "layer1-event" },
+
+ /* WTAP_ENCAP_X2E_SERIAL */
+ { "X2E SERIAL", "x2e-serial" }
};
gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);