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 | |
parent | 82ed90401724a0c7ba63c299b782ad604949180a (diff) |
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')
-rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
-rw-r--r-- | wiretap/wtap.c | 5 | ||||
-rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 16e3589b8c..bab864de86 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -326,6 +326,8 @@ static const struct { { 181, WTAP_ENCAP_JUNIPER_CHDLC }, /* VOIP Frames prepended with meta-information */ { 183, WTAP_ENCAP_JUNIPER_VP }, + /* Virtual Network Frames prepended with meta-information */ + { 184, WTAP_ENCAP_JUNIPER_VN }, /* USB packets from FreeBSD's USB BPF tap */ { 186, WTAP_ENCAP_USB_FREEBSD }, /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */ 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 diff --git a/wiretap/wtap.h b/wiretap/wtap.h index acffcb3d0a..b89701f24c 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -268,6 +268,7 @@ extern "C" { #define WTAP_ENCAP_GFP_T 178 #define WTAP_ENCAP_GFP_F 179 #define WTAP_ENCAP_IP_OVER_IB_PCAP 180 +#define WTAP_ENCAP_JUNIPER_VN 181 /* After adding new item here, please also add new item to encap_table_base array */ #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |