diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-01-22 23:25:44 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-01-22 23:25:44 +0000 |
| commit | ae61fe0158bd3afc2cfc034e81199cc7a39c2585 (patch) | |
| tree | ce35fff927c36939e98b12adf1ab81e1d05c54a2 /epan/dissectors/packet-gsm_a_rr.c | |
| parent | 6e1c54c8fd2ffad18de05a839cebcf07613c5e5b (diff) | |
Try to fix dissection of GSM protocol family broken by r47209.
Using val_to_str seemed to be a good idea, but most value_string arrays were not properly filled or were using hacks.
(I hope I got everything right...)
svn path=/trunk/; revision=47218
Diffstat (limited to 'epan/dissectors/packet-gsm_a_rr.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_a_rr.c | 162 |
1 files changed, 81 insertions, 81 deletions
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 9e9b003534..de34de3918 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -175,91 +175,91 @@ const value_string gsm_a_dtap_msg_rr_strings[] = { const value_string gsm_rr_elem_strings[] = { /* Radio Resource Management Information Elements 10.5.2, most are from 10.5.1 */ { 0x00, "BA Range" }, /* [3] 10.5.2.1a BA Range */ - { 0x00, "Cell Channel Description" }, /* [3] 10.5.2.1b */ - { 0x00, "BA List Pref" }, /* [3] 10.5.2.1c BA List Pref */ - { 0x00, "UTRAN Frequency List" }, /* [3] 10.5.2.1d UTRAN Frequency List */ - { 0x00, "Cell Selection Indicator after Release of all TCH and SDCCH" }, /* [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE */ - { 0x00, "Cell Description" }, /* 10.5.2.2 */ - { 0x00, "Cell Options (BCCH)" }, /* [3] 10.5.2.3 Cell Options (BCCH) */ - { 0x00, "Cell Options (SACCH)" }, /* [3] 10.5.2.3a Cell Options (SACCH) */ - { 0x00, "Cell Selection Parameters" }, /* [3] 10.5.2.4 Cell Selection Parameters */ + { 0x01, "Cell Channel Description" }, /* [3] 10.5.2.1b */ + { 0x02, "BA List Pref" }, /* [3] 10.5.2.1c BA List Pref */ + { 0x03, "UTRAN Frequency List" }, /* [3] 10.5.2.1d UTRAN Frequency List */ + { 0x04, "Cell Selection Indicator after Release of all TCH and SDCCH" }, /* [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE */ + { 0x05, "Cell Description" }, /* 10.5.2.2 */ + { 0x06, "Cell Options (BCCH)" }, /* [3] 10.5.2.3 Cell Options (BCCH) */ + { 0x07, "Cell Options (SACCH)" }, /* [3] 10.5.2.3a Cell Options (SACCH) */ + { 0x08, "Cell Selection Parameters" }, /* [3] 10.5.2.4 Cell Selection Parameters */ /* [3] 10.5.2.4a (void) */ - { 0x00, "Channel Description" }, /* 10.5.2.5 */ - { 0x00, "Channel Description 2" }, /* 10.5.2.5a */ - { 0x00, "Channel Description 3" }, /* 10.5.2.5c */ - { 0x00, "Channel Mode" }, /* [3] 10.5.2.6 */ - { 0x00, "Channel Mode 2" }, /* [3] 10.5.2.7 */ - { 0x00, "UTRAN Classmark" }, /* [3] 10.5.2.7a */ + { 0x09, "Channel Description" }, /* 10.5.2.5 */ + { 0x0a, "Channel Description 2" }, /* 10.5.2.5a */ + { 0x0b, "Channel Description 3" }, /* 10.5.2.5c */ + { 0x0c, "Channel Mode" }, /* [3] 10.5.2.6 */ + { 0x0d, "Channel Mode 2" }, /* [3] 10.5.2.7 */ + { 0x0e, "UTRAN Classmark" }, /* [3] 10.5.2.7a */ /* [3] 10.5.2.7b (void) */ - { 0x00, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ + { 0x0f, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ /* [3] 10.5.2.7d GERAN Iu Mode Classmark information element */ - { 0x00, "Channel Needed"}, /* [3] 10.5.2.8 */ + { 0x10, "Channel Needed"}, /* [3] 10.5.2.8 */ /* [3] 10.5.2.8a (void) */ - { 0x00, "Channel Request Description 2"}, /* [3] 10.5.2.8b Channel Request Description 2 */ + { 0x11, "Channel Request Description 2"}, /* [3] 10.5.2.8b Channel Request Description 2 */ /* Pos 20 */ - { 0x00, "Cipher Mode Setting" }, /* [3] 10.5.2.9 */ - { 0x00, "Cipher Mode Response" }, /* [3] 10.5.2.10 */ - { 0x00, "Control Channel Description" }, /* [3] 10.5.2.11 Control Channel Description */ - { 0x00, "DTM Information Details" }, /* [3] 10.5.2.11a DTM Information Details */ - { 0x00, "Dynamic ARFCN Mapping" }, /* [3] 10.5.2.11b */ - { 0x00, "Frequency Channel Sequence" }, /* [3] 10.5.2.12 */ - { 0x00, "Frequency List" }, /* 10.5.2.13 */ - { 0x00, "Frequency Short List" }, /* 10.5.2.14 */ - { 0x00, "Frequency Short List2" }, /* 10.5.2.14a */ + { 0x12, "Cipher Mode Setting" }, /* [3] 10.5.2.9 */ + { 0x13, "Cipher Mode Response" }, /* [3] 10.5.2.10 */ + { 0x14, "Control Channel Description" }, /* [3] 10.5.2.11 Control Channel Description */ + { 0x15, "DTM Information Details" }, /* [3] 10.5.2.11a DTM Information Details */ + { 0x16, "Dynamic ARFCN Mapping" }, /* [3] 10.5.2.11b */ + { 0x17, "Frequency Channel Sequence" }, /* [3] 10.5.2.12 */ + { 0x18, "Frequency List" }, /* 10.5.2.13 */ + { 0x19, "Frequency Short List" }, /* 10.5.2.14 */ + { 0x1a, "Frequency Short List2" }, /* 10.5.2.14a */ /* [3] 10.5.2.14b Group Channel Description */ - { 0x00, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ - { 0x00, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ + { 0x1b, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ + { 0x1c, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ /* [3] 10.5.2.14e Enhanced DTM CS Release Indication */ - { 0x00, "Handover Reference" }, /* 10.5.2.15 */ - { 0x00, "IA Rest Octets" }, /* [3] 10.5.2.16 */ - { 0x00, "IAR Rest Octets" }, /* [3] 10.5.2.17 IAR Rest Octets */ - { 0x00, "IAX Rest Octets" }, /* [3] 10.5.2.18 IAX Rest Octets */ - { 0x00, "L2 Pseudo Length" }, /* [3] 10.5.2.19 */ - { 0x00, "Measurement Results" }, /* [3] 10.5.2.20 Measurement Results */ + { 0x1d, "Handover Reference" }, /* 10.5.2.15 */ + { 0x1e, "IA Rest Octets" }, /* [3] 10.5.2.16 */ + { 0x1f, "IAR Rest Octets" }, /* [3] 10.5.2.17 IAR Rest Octets */ + { 0x20, "IAX Rest Octets" }, /* [3] 10.5.2.18 IAX Rest Octets */ + { 0x21, "L2 Pseudo Length" }, /* [3] 10.5.2.19 */ + { 0x22, "Measurement Results" }, /* [3] 10.5.2.20 Measurement Results */ /* * [3] 10.5.2.20a GPRS Measurement Results */ - { 0x00, "Mobile Allocation" }, /* [3] 10.5.2.21 */ - { 0x00, "Mobile Time Difference" }, /* [3] 10.5.2.21a */ - { 0x00, "MultiRate configuration" }, /* [3] 10.5.2.21aa */ + { 0x23, "Mobile Allocation" }, /* [3] 10.5.2.21 */ + { 0x24, "Mobile Time Difference" }, /* [3] 10.5.2.21a */ + { 0x25, "MultiRate configuration" }, /* [3] 10.5.2.21aa */ /* Pos 30 */ - { 0x00, "Multislot Allocation" }, /* [3] 10.5.2.21b */ + { 0x26, "Multislot Allocation" }, /* [3] 10.5.2.21b */ /* * [3] 10.5.2.21c NC mode */ - { 0x00, "Neighbour Cell Description" }, /* [3] 10.5.2.22 Neighbour Cell Description */ - { 0x00, "Neighbour Cell Description 2" }, /* [3] 10.5.2.22a Neighbour Cell Description 2 */ + { 0x27, "Neighbour Cell Description" }, /* [3] 10.5.2.22 Neighbour Cell Description */ + { 0x28, "Neighbour Cell Description 2" }, /* [3] 10.5.2.22a Neighbour Cell Description 2 */ /* * [3] 10.5.2.22b (void) * [3] 10.5.2.22c NT/N Rest Octets */ - { 0x00, "P1 Rest Octets" }, /* [3] 10.5.2.23 P1 Rest Octets */ - { 0x00, "P2 Rest Octets" }, /* [3] 10.5.2.24 P2 Rest Octets */ - { 0x00, "P3 Rest Octets" }, /* [3] 10.5.2.25 P3 Rest Octets */ - { 0x00, "Packet Channel Description" }, /* [3] 10.5.2.25a */ - { 0x00, "Dedicated mode or TBF" }, /* [3] 10.5.2.25b */ - { 0x00, "Packet Uplink Assignment" }, /* [3] 10.5.2.25c RR Packet Uplink Assignment */ - { 0x00, "Packet Downlink Assignment" }, /* [3] 10.5.2.25d RR Packet Downlink Assignment */ - { 0x00, "Packet Downlink Assignment Type 2" }, /* [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 */ - { 0x00, "Page Mode" }, /* [3] 10.5.2.26 */ - { 0x00, "NCC Permitted" }, /* [3] 10.5.2.27 NCC Permitted */ - { 0x00, "Power Command" }, /* 10.5.2.28 */ - { 0x00, "Power Command and access type" }, /* 10.5.2.28a */ - { 0x00, "RACH Control Parameters" }, /* [3] 10.5.2.29 RACH Control Parameters */ - { 0x00, "Request Reference" }, /* [3] 10.5.2.30 Request Reference */ - { 0x00, "RR Cause" }, /* 10.5.2.31 */ - { 0x00, "Synchronization Indication" }, /* 10.5.2.39 */ - { 0x00, "SI 1 Rest Octets" }, /* [3] 10.5.2.32 */ + { 0x29, "P1 Rest Octets" }, /* [3] 10.5.2.23 P1 Rest Octets */ + { 0x2a, "P2 Rest Octets" }, /* [3] 10.5.2.24 P2 Rest Octets */ + { 0x2b, "P3 Rest Octets" }, /* [3] 10.5.2.25 P3 Rest Octets */ + { 0x2c, "Packet Channel Description" }, /* [3] 10.5.2.25a */ + { 0x2d, "Dedicated mode or TBF" }, /* [3] 10.5.2.25b */ + { 0x2e, "Packet Uplink Assignment" }, /* [3] 10.5.2.25c RR Packet Uplink Assignment */ + { 0x2f, "Packet Downlink Assignment" }, /* [3] 10.5.2.25d RR Packet Downlink Assignment */ + { 0x30, "Packet Downlink Assignment Type 2" }, /* [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 */ + { 0x31, "Page Mode" }, /* [3] 10.5.2.26 */ + { 0x32, "NCC Permitted" }, /* [3] 10.5.2.27 NCC Permitted */ + { 0x33, "Power Command" }, /* 10.5.2.28 */ + { 0x34, "Power Command and access type" }, /* 10.5.2.28a */ + { 0x35, "RACH Control Parameters" }, /* [3] 10.5.2.29 RACH Control Parameters */ + { 0x36, "Request Reference" }, /* [3] 10.5.2.30 Request Reference */ + { 0x37, "RR Cause" }, /* 10.5.2.31 */ + { 0x38, "Synchronization Indication" }, /* 10.5.2.39 */ + { 0x39, "SI 1 Rest Octets" }, /* [3] 10.5.2.32 */ /* [3] 10.5.2.33 SI 2bis Rest Octets */ - { 0x00, "SI 2ter Rest Octets" }, /* [3] 10.5.2.33a */ - { 0x00, "SI 2quater Rest Octets" }, /* [3] 10.5.2.33b */ - { 0x00, "SI 3 Rest Octets" }, /* [3] 10.5.2.34 */ - { 0x00, "SI 4 Rest Octets" }, /* [3] 10.5.2.35 */ - { 0x00, "SI 6 Rest Octets" }, /* [3] 10.5.2.35a */ + { 0x3a, "SI 2ter Rest Octets" }, /* [3] 10.5.2.33a */ + { 0x3b, "SI 2quater Rest Octets" }, /* [3] 10.5.2.33b */ + { 0x3c, "SI 3 Rest Octets" }, /* [3] 10.5.2.34 */ + { 0x3d, "SI 4 Rest Octets" }, /* [3] 10.5.2.35 */ + { 0x3e, "SI 6 Rest Octets" }, /* [3] 10.5.2.35a */ /* [3] 10.5.2.36 SI 7 Rest Octets * [3] 10.5.2.37 SI 8 Rest Octets * [3] 10.5.2.37a SI 9 Rest Octets */ - { 0x00, "SI 13 Rest Octets" }, /* [3] 10.5.2.37b */ + { 0x3f, "SI 13 Rest Octets" }, /* [3] 10.5.2.37b */ /* [3] 10.5.2.37c (void) * [3] 10.5.2.37d (void) * [3] 10.5.2.37e SI 16 Rest Octets @@ -267,31 +267,31 @@ const value_string gsm_rr_elem_strings[] = { * [3] 10.5.2.37g SI 19 Rest Octets * [3] 10.5.2.37h SI 18 Rest Octets * [3] 10.5.2.37i SI 20 Rest Octets */ - { 0x00, "Starting Time" }, /* [3] 10.5.2.38 Starting Time */ - { 0x00, "Timing Advance" }, /* [3] 10.5.2.40 Timing Advance */ - { 0x00, "Time Difference" }, /* [3] 10.5.2.41 Time Difference */ - { 0x00, "TLLI" }, /* [3] 10.5.2.41a TLLI */ - { 0x00, "TMSI/P-TMSI" }, /* [3] 10.5.2.42 TMSI/P-TMSI */ - { 0x00, "VGCS target mode Indication" }, /* [3] 10.5.2.42a */ + { 0x40, "Starting Time" }, /* [3] 10.5.2.38 Starting Time */ + { 0x41, "Timing Advance" }, /* [3] 10.5.2.40 Timing Advance */ + { 0x42, "Time Difference" }, /* [3] 10.5.2.41 Time Difference */ + { 0x43, "TLLI" }, /* [3] 10.5.2.41a TLLI */ + { 0x44, "TMSI/P-TMSI" }, /* [3] 10.5.2.42 TMSI/P-TMSI */ + { 0x45, "VGCS target mode Indication" }, /* [3] 10.5.2.42a */ /* Pos 40 */ - { 0x00, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ - { 0x00, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ + { 0x46, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ + { 0x47, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ /* [3] 10.5.2.44 SI10 rest octets $(ASCI)$ */ - { 0x00, "Extended Measurement Results" }, /* [3] 10.5.2.45 Extended Measurement Results */ - { 0x00, "Extended Measurement Frequency List" }, /* [3] 10.5.2.46 Extended Measurement Frequency List */ - { 0x00, "Suspension Cause" }, /* [3] 10.5.2.47 */ - { 0x00, "APDU ID" }, /* [3] 10.5.2.48 APDU ID */ - { 0x00, "APDU Flags" }, /* [3] 10.5.2.49 APDU Flags */ - { 0x00, "APDU Data" }, /* [3] 10.5.2.50 APDU Data */ - { 0x00, "Handover to UTRAN Command" }, /* [3] 10.5.2.51 Handover To UTRAN Command */ + { 0x48, "Extended Measurement Results" }, /* [3] 10.5.2.45 Extended Measurement Results */ + { 0x49, "Extended Measurement Frequency List" }, /* [3] 10.5.2.46 Extended Measurement Frequency List */ + { 0x4a, "Suspension Cause" }, /* [3] 10.5.2.47 */ + { 0x4b, "APDU ID" }, /* [3] 10.5.2.48 APDU ID */ + { 0x4c, "APDU Flags" }, /* [3] 10.5.2.49 APDU Flags */ + { 0x4d, "APDU Data" }, /* [3] 10.5.2.50 APDU Data */ + { 0x4e, "Handover to UTRAN Command" }, /* [3] 10.5.2.51 Handover To UTRAN Command */ /* [3] 10.5.2.52 Handover To cdma2000 Command * [3] 10.5.2.53 (void) * [3] 10.5.2.54 (void) * [3] 10.5.2.55 (void) * [3] 10.5.2.56 3G Target Cell */ - { 0x00, "Service Support" }, /* [3] 10.5.2.57 */ + { 0x4f, "Service Support" }, /* [3] 10.5.2.57 */ /* 10.5.2.58 MBMS p-t-m Channel Description */ - { 0x00, "Dedicated Service Information" }, /* [3] 10.5.2.59 */ + { 0x50, "Dedicated Service Information" }, /* [3] 10.5.2.59 */ /* * 10.5.2.60 MPRACH Description * 10.5.2.61 Restriction Timer @@ -303,7 +303,7 @@ const value_string gsm_rr_elem_strings[] = { * 10.5.2.67 PS Cause * 10.5.2.68 VGCS AMR Configuration */ - { 0x00, "Carrier Indication" }, /* 10.5.2.69 Carrier Indication */ + { 0x51, "Carrier Indication" }, /* 10.5.2.69 Carrier Indication */ { 0, NULL } }; |