diff options
| author | Rudra Rugge <rrugge@juniper.net> | 2016-06-15 11:32:57 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-21 01:40:22 +0000 |
| commit | fa20f5cb5e16d5eb3466b3d802e0480549d8ebe5 (patch) | |
| tree | f973a046e3ba9bc8e8da4680a7fab137110e0652 /wiretap/wtap.c | |
| parent | 82ed90401724a0c7ba63c299b782ad604949180a (diff) | |
| download | wireshark-fa20f5cb5e16d5eb3466b3d802e0480549d8ebe5.tar.gz | |
Add support for Opencontrail virtual network
Change-Id: Ia6012e0f6425be069e222538eafb1191b398ec83
Reviewed-on: https://code.wireshark.org/review/15930
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 84815b40f3..0d1acc3657 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -936,7 +936,10 @@ static struct encap_type_info encap_table_base[] = { { "ITU-T G.7041/Y.1303 Generic Framing Procedure Frame-mapped mode", "gfp-f" }, /* WTAP_ENCAP_IP_OVER_IB_PCAP */ - { "IP over IB", "ip-ib" } + { "IP over IB", "ip-ib" }, + + /* WTAP_ENCAP_JUNIPER_VN */ + { "Juniper VN", "juniper-vn" }, }; WS_DLL_LOCAL |