aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-04-27 16:24:54 +0200
committerAnders Broman <a.broman58@gmail.com>2017-10-04 14:07:34 +0000
commit8804ddbe2a35a9e8bc1340912e73479cb2f31390 (patch)
tree23e10b19ae5e1e01ecebd8a99ec3e79182df0983
parent1961297a55f0b7a2ff6acc1ab7909d50e4b80f70 (diff)
gsm_sim: fix conflicting entry in its value_string
Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 24384 is at indices 72 (DF.EIA/TIA-533) and 78 (DF.WLAN)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28421 is at indices 31 (EF.LP) and 80 (EF.LI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28472 is at indices 37 (EF.SST) and 89 (EF.USI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28481 is at indices 41 (EF.PUCT) and 96 (EF.PUCI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28489 is at indices 23 (EF.SDN) and 103 (EF.SIN)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28494 is at indices 28 (EF.EXT4) and 107 (EF.EXT5) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28495 is at indices 29 (EF.ECCP) and 108 (EF.CCP2)) Change-Id: I4bde0cc644131e9b088fca07837fa1b909f30f44 Reviewed-on: https://code.wireshark.org/review/21381 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-gsm_sim.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index c2873f69cf..85503591e0 100644
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -920,16 +920,12 @@ static const value_string adf_usim_dfs[] = {
#endif
{ 0x5f3a, "DF.PHONEBOOK" },
{ 0x5f3b, "DF.GSM-ACCESS" },
- { 0x5f3c, "DF.MExE" },
- { 0x5f40, "DF.WLAN" },
- { 0x5f70, "DF.SoLSA" },
#if 0
{ 0, NULL }
};
static const value_string adf_usim_efs[] = {
#endif
- { 0x6f05, "EF.LI" },
{ 0x6f06, "EF.ARR" },
{ 0x6f07, "EF.IMSI" },
{ 0x6f08, "EF.Keys" },
@@ -938,26 +934,21 @@ static const value_string adf_usim_efs[] = {
{ 0x6f31, "EF.HPPLMN" },
{ 0x6f32, "EF.CNL" },
{ 0x6f37, "EF.ACMax" },
- { 0x6f38, "EF.USI" },
{ 0x6f39, "EF.ACM" },
{ 0x6f3b, "EF.FDN" },
{ 0x6f3c, "EF.SMS" },
{ 0x6f3e, "EF.GID1" },
{ 0x6f3f, "EF.GID2" },
{ 0x6f40, "EF.MSISDN" },
- { 0x6f41, "EF.PUCI" },
{ 0x6f42, "EF.SMSP" },
{ 0x6f43, "EF.SMSS" },
{ 0x6f45, "EF.CBMI" },
{ 0x6f46, "EF.SPN" },
{ 0x6f47, "EF.SMSR" },
{ 0x6f48, "EF.CBMID" },
- { 0x6f49, "EF.SIN" },
{ 0x6f4b, "EF.EXT2" },
{ 0x6f4c, "EF.EXT3" },
{ 0x6f4d, "EF.BDN" },
- { 0x6f4e, "EF.EXT5" },
- { 0x6f4f, "EF.CCP2" },
{ 0x6f50, "EF.CBMIR" },
{ 0x6f55, "EF.EXT4" },
{ 0x6f56, "EF.EST" },