diff options
| author | Jakub Zawadzki <darkjames@darkjames.pl> | 2014-06-17 00:01:00 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-17 00:08:49 +0000 |
| commit | 923cf412f1362ff9a65d4cd35436257a37f0fd05 (patch) | |
| tree | 92848abb4b77cb0eb29c111eaa3d776007290eb3 /epan | |
| parent | e047e3a00722ae82bf9263f040668dd1e2b897c2 (diff) | |
Fix copy/paste errors in value_string.
Also make repetition_coding_indications[] standard terminated.
Change-Id: Ice20e1f27f5ab4d111f893608a230b83899efc9f
Reviewed-on: https://code.wireshark.org/review/2288
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-9p.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-capwap.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ptpip.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-wps.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 75d6890922..c95ffe1e24 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -470,7 +470,7 @@ static const value_string ninep_lock_flag[] = { {_9P_LOCK_FLAGS_NONE, "No flag"}, {_9P_LOCK_FLAGS_BLOCK, "Block"}, - {_9P_LOCK_BLOCKED, "Reclaim"}, + {_9P_LOCK_FLAGS_RECLAIM,"Reclaim"}, { 0, NULL}, }; static value_string_ext ninep_lock_flag_ext = VALUE_STRING_EXT_INIT(ninep_lock_flag); diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 43575b331d..b1a8806df1 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -795,7 +795,7 @@ static const value_string ieee80211_add_wlan_mac_mode_vals[] = { static const value_string ieee80211_add_wlan_tunnel_mode_vals[] = { { 0, "Local Bridging" }, { 1, "802.3 Tunnel" }, - { 1, "802.11 Tunnel" }, + { 2, "802.11 Tunnel" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ptpip.h b/epan/dissectors/packet-ptpip.h index 65c9393d8f..5de710b5cd 100644 --- a/epan/dissectors/packet-ptpip.h +++ b/epan/dissectors/packet-ptpip.h @@ -223,7 +223,7 @@ typedef enum { PTP_OC_CANON_EOS_TransferCompleteDT = 0x9120, PTP_OC_CANON_EOS_CancelTransferDT = 0x9121, PTP_OC_CANON_EOS_SetWftProfile = 0x9122, - PTP_OC_CANON_EOS_GetWftProfile = 0x9122, + PTP_OC_CANON_EOS_GetWftProfile = 0x9123, PTP_OC_CANON_EOS_SetProfileToWft = 0x9124, PTP_OC_CANON_EOS_BulbStart = 0x9125, PTP_OC_CANON_EOS_BulbEnd = 0x9126, diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 92921fbbc8..a5484c1e1d 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -541,7 +541,7 @@ static const value_string eapwps_tlv_association_state_vals[] = { static const value_string eapwps_tlv_authentication_type_vals[] = { { EAPWPS_AUTHTYPE_OPEN, "Open" }, - { EAPWPS_AUTHTYPE_WPA2PSK, "WPA PSK" }, + { EAPWPS_AUTHTYPE_WPAPSK, "WPA PSK" }, { EAPWPS_AUTHTYPE_SHARED, "Shared" }, { EAPWPS_AUTHTYPE_WPA, "WPA" }, { EAPWPS_AUTHTYPE_WPA2, "WPA2" }, |