aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_a_common.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2012-12-29 17:10:04 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2012-12-29 17:10:04 +0000
commit0b20f855f0a51df67494b06c065d945cbccc19fb (patch)
treec686d8cd607c9d1f1c221d7012c78ec0f240fda2 /epan/dissectors/packet-gsm_a_common.c
parentf3e41f1b72a2390b203054f2da3dbaaf3cc1dba3 (diff)
Upgrade NAS disssectors to v11.5.0
svn path=/trunk/; revision=46842
Diffstat (limited to 'epan/dissectors/packet-gsm_a_common.c')
-rw-r--r--epan/dissectors/packet-gsm_a_common.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 5af4ce027a..93e22125a9 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -69,11 +69,11 @@ const value_string gsm_common_elem_strings[] = {
static const value_string gsm_a_skip_ind_vals[] = {
{ 0, "No indication of selected PLMN"},
- { 1, "First PLMN in the broadcast system information"},
- { 2, "Second PLMN in the broadcast system information"},
- { 3, "Third PLMN in the broadcast system information"},
- { 4, "Fourth PLMN in the broadcast sytem information"},
- { 5, "Fifth PLMN in the broadcast system information"},
+ { 1, "PLMN identity of the Common PLMN in the broadcast system information"},
+ { 2, "PLMN identity of the first Additional PLMN in the broadcast system information"},
+ { 3, "PLMN identity of the second Additional PLMN in the broadcast system information"},
+ { 4, "PLMN identity of the third Additional PLMN in the broadcast sytem information"},
+ { 5, "PLMN identity of the fourth Additional PLMN in the broadcast system information"},
{ 6, "Reserved"},
{ 7, "Reserved"},
{ 0, NULL }
@@ -209,12 +209,12 @@ static const true_false_string A5_2_algorithm_sup_vals = {
};
static const value_string mobile_identity_type_vals[] = {
+ { 0, "No Identity"},
{ 1, "IMSI"},
{ 2, "IMEI"},
{ 3, "IMEISV"},
- { 4, "TMSI/P-TMSI"},
+ { 4, "TMSI/P-TMSI/M-TMSI"},
{ 5, "TMGI and optional MBMS Session Identity"}, /* ETSI TS 124 008 V6.8.0 (2005-03) p326 */
- { 0, "No Identity"},
{ 0, NULL }
};
@@ -2229,7 +2229,7 @@ de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guin
curr_offset += len - (curr_offset - offset);
break;
- case 4: /* TMSI/P-TMSI */
+ case 4: /* TMSI/P-TMSI/M-TMSI */
other_decode_bitfield_value(a_bigbuf, oct, 0xf0, 8);
proto_tree_add_text(tree,
tvb, curr_offset, 1,