summaryrefslogtreecommitdiff
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2011-12-02 22:23:07 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2011-12-02 22:23:07 +0000
commit016bf3b0cf4c92853846b881f2d03ea8e69e6f87 (patch)
tree94d002f697afa3a720901787aa617a2a4fdee529 /wiretap/wtap.c
parentf5447edd58c6bdc43038890987428315341ff260 (diff)
downloadwireshark-016bf3b0cf4c92853846b881f2d03ea8e69e6f87.tar.gz
from Petr Sumbera:
Solaris 11 snoop files with IP over Infiniband data are not recognized. Attached patch allows to view such data. svn path=/trunk/; revision=40072
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 70d743e981..464023103b 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -512,7 +512,10 @@ static struct encap_type_info encap_table_base[] = {
{ "netANALYZER", "netanalyzer" },
/* WTAP_ENCAP_NETANALYZER_TRANSPARENT */
- { "netANALYZER-Transparent", "netanalyzer-transparent" }
+ { "netANALYZER-Transparent", "netanalyzer-transparent" },
+
+ /* WTAP_ENCAP_IP_OVER_IB */
+ { "IP over Infiniband", "ip-over-ib" }
};
gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);