diff options
| author | Petr Sumbera <petr.sumbera@oracle.com> | 2016-03-23 02:02:34 -0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-04-01 10:05:41 +0000 |
| commit | 5ca557c31e3e799068c4531deaed78792845027d (patch) | |
| tree | 99df46bc7499b40e7c558b829bb813609475cab1 /wiretap | |
| parent | ac1bb6584c6a79d1762eaaeeee8975552a512d95 (diff) | |
support for IP-over-Infiniband - pcap encapsulation
Bug: 12279
Change-Id: Ib6c54f8b86d95c5546bc800749f124cd0dbb8ff0
Reviewed-on: https://code.wireshark.org/review/14585
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/snoop.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 9d6826b27d..297387af07 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -399,7 +399,7 @@ static const struct { /* netANALYZER pseudo-header in transparent mode */ { 241, WTAP_ENCAP_NETANALYZER_TRANSPARENT }, /* IP-over-Infiniband, as specified by RFC 4391 section 6 */ - { 242, WTAP_ENCAP_IP_OVER_IB }, + { 242, WTAP_ENCAP_IP_OVER_IB_PCAP }, /* ISO/IEC 13818-1 MPEG2-TS packets */ { 243, WTAP_ENCAP_MPEG_2_TS }, /* NFC LLCP */ diff --git a/wiretap/snoop.c b/wiretap/snoop.c index da88bb4c51..3a7cc9eca5 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -210,7 +210,7 @@ wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info) WTAP_ENCAP_UNKNOWN, /* 100VG-AnyLAN Token Ring */ WTAP_ENCAP_UNKNOWN, /* "ISO 8802/3 and Ethernet" */ WTAP_ENCAP_UNKNOWN, /* 100BaseT (but that's just Ethernet) */ - WTAP_ENCAP_IP_OVER_IB, /* Infiniband */ + WTAP_ENCAP_IP_OVER_IB_SNOOP, /* Infiniband */ }; #define NUM_SNOOP_ENCAPS (sizeof snoop_encap / sizeof snoop_encap[0]) #define SNOOP_PRIVATE_BIT 0x80000000 diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 169f26c779..3e10101947 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -224,7 +224,7 @@ extern "C" { #define WTAP_ENCAP_MIME 134 #define WTAP_ENCAP_NETANALYZER 135 #define WTAP_ENCAP_NETANALYZER_TRANSPARENT 136 -#define WTAP_ENCAP_IP_OVER_IB 137 +#define WTAP_ENCAP_IP_OVER_IB_SNOOP 137 #define WTAP_ENCAP_MPEG_2_TS 138 #define WTAP_ENCAP_PPP_ETHER 139 #define WTAP_ENCAP_NFC_LLCP 140 @@ -267,6 +267,7 @@ extern "C" { #define WTAP_ENCAP_ISO14443 177 #define WTAP_ENCAP_GFP_T 178 #define WTAP_ENCAP_GFP_F 179 +#define WTAP_ENCAP_IP_OVER_IB_PCAP 180 /* 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() |