diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-07-16 10:45:14 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-07-16 10:45:14 +0000 |
| commit | e9066532cf49cb79d5e48394adc3a3148036687f (patch) | |
| tree | a719fd079678dcab10ffccfc1872ab347e435d1f /wiretap | |
| parent | 67d6f5976eccff974b5649236566c945fad38552 (diff) | |
From Kahou via bug 3739:
New DLT value is added for Fibre Channel FC2.
svn path=/trunk/; revision=29115
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 0c8be9c57b..3d62004833 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -349,6 +349,8 @@ static const struct { { 215, WTAP_ENCAP_IEEE802_15_4_NONASK_PHY }, /* USB packets with padded Linux-specified header */ { 220, WTAP_ENCAP_USB_LINUX_MMAPPED }, + /* Fibre Channel FC-2 frame */ + { 224, WTAP_ENCAP_FIBRE_CHANNEL_FC2 }, /* * To repeat: diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 49449000d9..ca46f58ca7 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -447,6 +447,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_NSTRACE_2_0 */ { "NetScaler Encapsulation 2.0 of Ethernet", "nstrace20" }, + /* WTAP_ENCAP_FIBRE_CHANNEL_FC2 */ + { "Fibre Channel FC-2", "fc2" }, + }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); diff --git a/wiretap/wtap.h b/wiretap/wtap.h index e920c9fa37..d786d23f76 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -211,6 +211,7 @@ extern "C" { #define WTAP_ENCAP_PACKETLOGGER 118 #define WTAP_ENCAP_NSTRACE_1_0 119 #define WTAP_ENCAP_NSTRACE_2_0 120 +#define WTAP_ENCAP_FIBRE_CHANNEL_FC2 121 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |