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

1 files changed, 64 insertions, 64 deletions

diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index 29cb3b109b..3cf2bf8172 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -152,72 +152,72 @@ const value_string gsm_a_dtap_msg_sm_strings[] = {
 const value_string gsm_gm_elem_strings[] = {
 	/* GPRS Mobility Management Information Elements 10.5.5 */
 	{ 0x00,	"Additional Update Type" },
-	{ 0x00,	"Attach Result" },
-	{ 0x00,	"Attach Type" },
-	{ 0x00,	"Cipher Algorithm" },
-	{ 0x00,	"TMSI Status" },
-	{ 0x00,	"Detach Type" },
-	{ 0x00,	"DRX Parameter" },
-	{ 0x00,	"Force to Standby" },
-	{ 0x00, "Force to Standby" },
-	{ 0x00,	"P-TMSI Signature" },
-	{ 0x00,	"P-TMSI Signature 2" },
-	{ 0x00,	"Identity Type 2" },
-	{ 0x00,	"IMEISV Request" },
-	{ 0x00,	"Receive N-PDU Numbers List" },
-	{ 0x00,	"MS Network Capability" },
-	{ 0x00,	"MS Radio Access Capability" },
-	{ 0x00,	"GMM Cause" },
-	{ 0x00,	"Routing Area Identification" },
-	{ 0x00,	"Routing Area Identification 2" },
-	{ 0x00,	"Update Result" },
-	{ 0x00, "Update Type" },
-	{ 0x00,	"A&C Reference Number" },
-	{ 0x00, "A&C Reference Number" },
-	{ 0x00,	"Service Type" },
-	{ 0x00,	"Cell Notification" },
-	{ 0x00, "PS LCS Capability" },
-	{ 0x00,	"Network Feature Support" },
-	{ 0x00,	"Additional Network Feature Support" },
-	{ 0x00, "Inter RAT information container" },
-	{ 0x00, "Requested MS information" },
-	{ 0x00, "UE network capability" },
-	{ 0x00, "E-UTRAN inter RAT information container" },
-	{ 0x00, "Voice domain preference and UE's usage setting" },
-	{ 0x00, "P-TMSI type" },
-	{ 0x00, "Location Area Identification 2" },
-	{ 0x00, "Network resource identifier container" },
+	{ 0x01,	"Attach Result" },
+	{ 0x02,	"Attach Type" },
+	{ 0x03,	"Cipher Algorithm" },
+	{ 0x04,	"TMSI Status" },
+	{ 0x05,	"Detach Type" },
+	{ 0x06,	"DRX Parameter" },
+	{ 0x07,	"Force to Standby" },
+	{ 0x08, "Force to Standby" },
+	{ 0x09,	"P-TMSI Signature" },
+	{ 0x0a,	"P-TMSI Signature 2" },
+	{ 0x0b,	"Identity Type 2" },
+	{ 0x0c,	"IMEISV Request" },
+	{ 0x0d,	"Receive N-PDU Numbers List" },
+	{ 0x0e,	"MS Network Capability" },
+	{ 0x0f,	"MS Radio Access Capability" },
+	{ 0x10,	"GMM Cause" },
+	{ 0x11,	"Routing Area Identification" },
+	{ 0x12,	"Routing Area Identification 2" },
+	{ 0x13,	"Update Result" },
+	{ 0x14, "Update Type" },
+	{ 0x15,	"A&C Reference Number" },
+	{ 0x16, "A&C Reference Number" },
+	{ 0x17,	"Service Type" },
+	{ 0x18,	"Cell Notification" },
+	{ 0x19, "PS LCS Capability" },
+	{ 0x1a,	"Network Feature Support" },
+	{ 0x1b,	"Additional Network Feature Support" },
+	{ 0x1c, "Inter RAT information container" },
+	{ 0x1d, "Requested MS information" },
+	{ 0x1e, "UE network capability" },
+	{ 0x1f, "E-UTRAN inter RAT information container" },
+	{ 0x20, "Voice domain preference and UE's usage setting" },
+	{ 0x21, "P-TMSI type" },
+	{ 0x22, "Location Area Identification 2" },
+	{ 0x23, "Network resource identifier container" },
 	/* Session Management Information Elements 10.5.6 */
-	{ 0x00,	"Access Point Name" },
-	{ 0x00,	"Network Service Access Point Identifier" },
-	{ 0x00,	"Protocol Configuration Options" },
-	{ 0x00,	"Packet Data Protocol Address" },
-	{ 0x00,	"Quality Of Service" },
-	{ 0x00,	"SM Cause" },
-	{ 0x00, "SM Cause 2" },
-	{ 0x00,	"Linked TI" },
-	{ 0x00,	"LLC Service Access Point Identifier" },
-	{ 0x00,	"Tear Down Indicator" },
-	{ 0x00,	"Packet Flow Identifier" },
-	{ 0x00,	"Traffic Flow Template" },
-	{ 0x00, "Temporary Mobile Group Identity (TMGI)" },
-	{ 0x00, "MBMS bearer capabilities" },
-	{ 0x00, "MBMS protocol configuration options" },
-	{ 0x00, "Enhanced network service access point identifier" },
-	{ 0x00, "Request type" },
-	{ 0x00, "Notification indicator" },
-	{ 0x00, "Connectivity type" },
+	{ 0x24,	"Access Point Name" },
+	{ 0x25,	"Network Service Access Point Identifier" },
+	{ 0x26,	"Protocol Configuration Options" },
+	{ 0x27,	"Packet Data Protocol Address" },
+	{ 0x28,	"Quality Of Service" },
+	{ 0x29,	"SM Cause" },
+	{ 0x2a, "SM Cause 2" },
+	{ 0x2b,	"Linked TI" },
+	{ 0x2c,	"LLC Service Access Point Identifier" },
+	{ 0x2d,	"Tear Down Indicator" },
+	{ 0x2e,	"Packet Flow Identifier" },
+	{ 0x2f,	"Traffic Flow Template" },
+	{ 0x30, "Temporary Mobile Group Identity (TMGI)" },
+	{ 0x31, "MBMS bearer capabilities" },
+	{ 0x32, "MBMS protocol configuration options" },
+	{ 0x33, "Enhanced network service access point identifier" },
+	{ 0x34, "Request type" },
+	{ 0x35, "Notification indicator" },
+	{ 0x36, "Connectivity type" },
 	/* GPRS Common Information Elements 10.5.7 */
-	{ 0x00,	"PDP Context Status" },
-	{ 0x00,	"Radio Priority" },
-	{ 0x00,	"GPRS Timer" },
-	{ 0x00,	"GPRS Timer 2" },
-	{ 0x00,	"GPRS Timer 3" },
-	{ 0x00, "Radio Priority 2"},
-	{ 0x00,	"MBMS context status"},
-	{ 0x00,	"Uplink data status"},
-	{ 0x00,	"Device properties"},
-	{ 0x00, "Spare Nibble"},
+	{ 0x37,	"PDP Context Status" },
+	{ 0x38,	"Radio Priority" },
+	{ 0x39,	"GPRS Timer" },
+	{ 0x3a,	"GPRS Timer 2" },
+	{ 0x3b,	"GPRS Timer 3" },
+	{ 0x3c, "Radio Priority 2"},
+	{ 0x3d,	"MBMS context status"},
+	{ 0x3e,	"Uplink data status"},
+	{ 0x3f,	"Device properties"},
+	{ 0x40, "Spare Nibble"},
 	{ 0, NULL }
 };