Fix encap_table_base[] array.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53738 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 712a11b7da663325be945454d841f0fbc1b232ec..617faaebe2f80a3580363ad908a742a712b8c80a 100644 (file)
--- 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 1a89bfd7f51c55f87b937393dec3ca6ea506fcf4..b35163c46806c97f53ff787052ba04d425d450a5 100644 (file)
--- 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()