diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-02 22:38:00 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-02 22:38:00 +0000 |
| commit | a4c78939b2ab39abdda78a43875113f61ad041a5 (patch) | |
| tree | 0a4dd2f94c2cab81afa1fc2cb1b5cac5d919a60e /wiretap | |
| parent | 231e52a9eabb349802f49007114148c93248d247 (diff) | |
Fix encap_table_base[] array.
svn path=/trunk/; revision=53738
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/wtap.c | 9 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 712a11b7da..617faaebe2 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -618,9 +618,6 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_MUX27010 */ { "MUX27010", "mux27010"}, - /* WTAP_ENCAP_STANAG_5066_D_PDU */ - { "STANAG5066 Data Transfer Sublayer PDUs(D_PDU)", "s5066-dpdu"}, - /* WTAP_ENCAP_MIME */ { "MIME", "mime" }, @@ -689,6 +686,12 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_WIRESHARK_UPPER_PDU */ { "Wireshark Upper PDU export", "wireshark-upper-pdu" }, + + /* WTAP_ENCAP_STANAG_4607 */ + { "STANAG 4607", "s4607" }, + + /* WTAP_ENCAP_STANAG_5066_D_PDU */ + { "STANAG5066 Data Transfer Sublayer PDUs(D_PDU)", "s5066-dpdu"}, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 1a89bfd7f5..b35163c468 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -251,6 +251,7 @@ extern "C" { #define WTAP_ENCAP_WIRESHARK_UPPER_PDU 156 #define WTAP_ENCAP_STANAG_4607 157 #define WTAP_ENCAP_STANAG_5066_D_PDU 158 +/* 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() |