aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-07-18 22:14:56 +0000
committerGuy Harris <guy@alum.mit.edu>2010-07-18 22:14:56 +0000
commit8c19a3441f7a48df6db0eabe53c1109763235b09 (patch)
tree3517919df6f1c0fe881662c92df880e6b87d46c1 /wiretap
parent9903a7853cce6413e1ffb12906ea23a16eb31131 (diff)
Add an entry in encap_table_base for SocketCAN.
svn path=/trunk/; revision=33578
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/wtap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 70f49fe2ba..00e74e21a5 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -467,8 +467,10 @@ static struct encap_type_info encap_table_base[] = {
{ "JPEG/JFIF", "jfif" },
/* WTAP_ENCAP_IPNET */
- { "Solaris IPNET", "ipnet" }
+ { "Solaris IPNET", "ipnet" },
+ /* WTAP_ENCAP_SOCKETCAN */
+ { "SocketCAN", "socketcan" }
};
gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);