diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-08-23 19:16:35 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-08-23 19:16:35 +0000 |
| commit | 58dedc38728be4dbe797b47de7cbe950fd72054e (patch) | |
| tree | e93d7365632dd03db540fcd08de97a2dcbf1b8ea /wiretap | |
| parent | 60a30e223e6aeb8da051ff70c1ef4a9b9857e0aa (diff) | |
| download | wireshark-58dedc38728be4dbe797b47de7cbe950fd72054e.tar.gz wireshark-58dedc38728be4dbe797b47de7cbe950fd72054e.tar.bz2 wireshark-58dedc38728be4dbe797b47de7cbe950fd72054e.zip | |
From kahou:
Add Fibre Channel Delimiter Dissector for Fibre Channel FC2.
svn path=/trunk/; revision=29531
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 7 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 3d62004833..e872745b44 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -351,6 +351,8 @@ static const struct { { 220, WTAP_ENCAP_USB_LINUX_MMAPPED }, /* Fibre Channel FC-2 frame */ { 224, WTAP_ENCAP_FIBRE_CHANNEL_FC2 }, + /* Fibre Channel FC-2 frame with Delimiter */ + { 225, WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS }, /* * To repeat: diff --git a/wiretap/wtap.c b/wiretap/wtap.c index ca46f58ca7..f968c5c3cf 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -447,8 +447,11 @@ 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" }, + /* WTAP_ENCAP_FIBRE_CHANNEL_FC2 */ + { "Fibre Channel FC-2", "fc2" }, + + /* WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS */ + { "Fibre Channel FC-2 With Frame Delimiter", "fc2sof"} }; diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 8c110ae3b8..452a6bd4f4 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -212,6 +212,7 @@ extern "C" { #define WTAP_ENCAP_NSTRACE_1_0 119 #define WTAP_ENCAP_NSTRACE_2_0 120 #define WTAP_ENCAP_FIBRE_CHANNEL_FC2 121 +#define WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS 122 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |