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, 80 insertions, 80 deletions

diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index 93f9709165..acb1d8fc32 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -246,91 +246,91 @@ const value_string gsm_a_dtap_msg_tp_strings[] = {
 const value_string gsm_dtap_elem_strings[] = {
 	/* Mobility Management Information Elements 10.5.3 */
 	{ 0x00,	"Authentication Parameter RAND" },
-	{ 0x00,	"Authentication Parameter AUTN (UMTS and EPS authentication challenge)" },
-	{ 0x00,	"Authentication Response Parameter" },
-	{ 0x00,	"Authentication Response Parameter (extension) (UMTS authentication challenge only)" },
-	{ 0x00,	"Authentication Failure Parameter (UMTS and EPS authentication challenge)" },
-	{ 0x00,	"CM Service Type" },
-	{ 0x00,	"Identity Type" },
-	{ 0x00,	"Location Updating Type" },
-	{ 0x00,	"Network Name" },
-	{ 0x00,	"Reject Cause" },
-	{ 0x00,	"Follow-on Proceed" },
-	{ 0x00,	"Time Zone" },
-	{ 0x00,	"Time Zone and Time" },
-	{ 0x00,	"CTS Permission" },
-	{ 0x00,	"LSA Identifier" },
-	{ 0x00,	"Daylight Saving Time" },
-	{ 0x00, "Emergency Number List" },
-	{ 0x00, "Additional update parameters" },
-	{ 0x00, "MM Timer" },
+	{ 0x01,	"Authentication Parameter AUTN (UMTS and EPS authentication challenge)" },
+	{ 0x02,	"Authentication Response Parameter" },
+	{ 0x03,	"Authentication Response Parameter (extension) (UMTS authentication challenge only)" },
+	{ 0x04,	"Authentication Failure Parameter (UMTS and EPS authentication challenge)" },
+	{ 0x05,	"CM Service Type" },
+	{ 0x06,	"Identity Type" },
+	{ 0x07,	"Location Updating Type" },
+	{ 0x08,	"Network Name" },
+	{ 0x09,	"Reject Cause" },
+	{ 0x0a,	"Follow-on Proceed" },
+	{ 0x0b,	"Time Zone" },
+	{ 0x0c,	"Time Zone and Time" },
+	{ 0x0d,	"CTS Permission" },
+	{ 0x0e,	"LSA Identifier" },
+	{ 0x0f,	"Daylight Saving Time" },
+	{ 0x10, "Emergency Number List" },
+	{ 0x11, "Additional update parameters" },
+	{ 0x12, "MM Timer" },
 	/* Call Control Information Elements 10.5.4 */
-	{ 0x00,	"Auxiliary States" },					/* 10.5.4.4 Auxiliary states */
-	{ 0x00,	"Bearer Capability" },					/* 10.5.4.4a Backup bearer capability */
-	{ 0x00,	"Call Control Capabilities" },
-	{ 0x00,	"Call State" },
-	{ 0x00,	"Called Party BCD Number" },
-	{ 0x00,	"Called Party Subaddress" },
-	{ 0x00,	"Calling Party BCD Number" },
-	{ 0x00,	"Calling Party Subaddress" },
-	{ 0x00,	"Cause" },
-	{ 0x00,	"CLIR Suppression" },
-	{ 0x00,	"CLIR Invocation" },
-	{ 0x00,	"Congestion Level" },
-	{ 0x00,	"Connected Number" },
-	{ 0x00,	"Connected Subaddress" },
-	{ 0x00,	"Facility" },
-	{ 0x00,	"High Layer Compatibility" },
-	{ 0x00,	"Keypad Facility" },
-	{ 0x00,	"Low Layer Compatibility" },
-	{ 0x00,	"More Data" },
-	{ 0x00,	"Notification Indicator" },
-	{ 0x00,	"Progress Indicator" },
-	{ 0x00,	"Recall type $(CCBS)$" },
-	{ 0x00,	"Redirecting Party BCD Number" },
-	{ 0x00,	"Redirecting Party Subaddress" },
-	{ 0x00,	"Repeat Indicator" },
-	{ 0x00,	"Reverse Call Setup Direction" },
-	{ 0x00,	"SETUP Container $(CCBS)$" },
-	{ 0x00,	"Signal" },
-	{ 0x00,	"SS Version Indicator" },
-	{ 0x00,	"User-user" },
-	{ 0x00,	"Alerting Pattern $(NIA)$" },				/* 10.5.4.26 Alerting Pattern $(NIA)$ */
-	{ 0x00,	"Allowed Actions $(CCBS)$" },
-	{ 0x00,	"Stream Identifier" },
-	{ 0x00,	"Network Call Control Capabilities" },
-	{ 0x00,	"Cause of No CLI" },						/* 10.5.4.30 Cause of No CLI */
+	{ 0x13,	"Auxiliary States" },					/* 10.5.4.4 Auxiliary states */
+	{ 0x14,	"Bearer Capability" },					/* 10.5.4.4a Backup bearer capability */
+	{ 0x15,	"Call Control Capabilities" },
+	{ 0x16,	"Call State" },
+	{ 0x17,	"Called Party BCD Number" },
+	{ 0x18,	"Called Party Subaddress" },
+	{ 0x19,	"Calling Party BCD Number" },
+	{ 0x1a,	"Calling Party Subaddress" },
+	{ 0x1b,	"Cause" },
+	{ 0x1c,	"CLIR Suppression" },
+	{ 0x1d,	"CLIR Invocation" },
+	{ 0x1e,	"Congestion Level" },
+	{ 0x1f,	"Connected Number" },
+	{ 0x20,	"Connected Subaddress" },
+	{ 0x21,	"Facility" },
+	{ 0x22,	"High Layer Compatibility" },
+	{ 0x23,	"Keypad Facility" },
+	{ 0x24,	"Low Layer Compatibility" },
+	{ 0x25,	"More Data" },
+	{ 0x26,	"Notification Indicator" },
+	{ 0x27,	"Progress Indicator" },
+	{ 0x28,	"Recall type $(CCBS)$" },
+	{ 0x29,	"Redirecting Party BCD Number" },
+	{ 0x2a,	"Redirecting Party Subaddress" },
+	{ 0x2b,	"Repeat Indicator" },
+	{ 0x2c,	"Reverse Call Setup Direction" },
+	{ 0x2d,	"SETUP Container $(CCBS)$" },
+	{ 0x2e,	"Signal" },
+	{ 0x2f,	"SS Version Indicator" },
+	{ 0x30,	"User-user" },
+	{ 0x31,	"Alerting Pattern $(NIA)$" },				/* 10.5.4.26 Alerting Pattern $(NIA)$ */
+	{ 0x32,	"Allowed Actions $(CCBS)$" },
+	{ 0x33,	"Stream Identifier" },
+	{ 0x34,	"Network Call Control Capabilities" },
+	{ 0x35,	"Cause of No CLI" },						/* 10.5.4.30 Cause of No CLI */
 	/* 10.5.4.31 Void */
-	{ 0x00,	"Supported Codec List" },				/* 10.5.4.32 Supported codec list */
-	{ 0x00,	"Service Category" },					/* 10.5.4.33 Service category */
-	{ 0x00,	"Redial" },						/* 10.5.4.34 Redial */
-	{ 0x00, "Network-initiated Service Upgrade indicator" },
+	{ 0x36,	"Supported Codec List" },				/* 10.5.4.32 Supported codec list */
+	{ 0x37,	"Service Category" },					/* 10.5.4.33 Service category */
+	{ 0x38,	"Redial" },						/* 10.5.4.34 Redial */
+	{ 0x39, "Network-initiated Service Upgrade indicator" },
 	/* 10.5.4.35 Network-initiated Service Upgrade indicator */
 	/* Short Message Service Information Elements [5] 8.1.4 */
-	{ 0x00,	"CP-User Data" },
-	{ 0x00,	"CP-Cause" },
+	{ 0x3a,	"CP-User Data" },
+	{ 0x3b,	"CP-Cause" },
 	/* Tests procedures information elements 3GPP TS 44.014 6.4.0, 3GPP TS 34.109 6.4.0 and 3GPP TS 36.509 9.1.0*/
-	{ 0x00, "Close TCH Loop Cmd Sub-channel"},
-	{ 0x00, "Open Loop Cmd Ack"},
-	{ 0x00, "Close Multi-slot Loop Cmd Loop type"},
-	{ 0x00, "Close Multi-slot Loop Ack Result"},
-	{ 0x00, "Test Interface Tested device"},
-	{ 0x00, "GPRS Test Mode Cmd PDU description"},
-	{ 0x00, "GPRS Test Mode Cmd Mode flag"},
-	{ 0x00, "EGPRS Start Radio Block Loopback Cmd Mode flag"},
-	{ 0x00, "MS Positioning Technology"},
-	{ 0x00, "Close UE Test Loop Mode"},
-	{ 0x00, "UE Positioning Technology"},
-	{ 0x00, "RLC SDU Counter Value"},
-	{ 0x00, "UE Test Loop Mode"},
-	{ 0x00, "UE Test Loop Mode A LB Setup"},
-	{ 0x00, "UE Test Loop Mode B LB Setup"},
-	{ 0x00, "UE Test Loop Mode C Setup"},
-	{ 0x00, "UE Positioning Technology"},
-	{ 0x00, "MBMS Packet Counter Value"},
-	{ 0x00, "Ellipsoid Point With Altitude"},
-	{ 0x00, "Horizontal Velocity"},
-	{ 0x00, "GNSS-TOD-msec"},
+	{ 0x3c, "Close TCH Loop Cmd Sub-channel"},
+	{ 0x3d, "Open Loop Cmd Ack"},
+	{ 0x3e, "Close Multi-slot Loop Cmd Loop type"},
+	{ 0x3f, "Close Multi-slot Loop Ack Result"},
+	{ 0x40, "Test Interface Tested device"},
+	{ 0x41, "GPRS Test Mode Cmd PDU description"},
+	{ 0x42, "GPRS Test Mode Cmd Mode flag"},
+	{ 0x43, "EGPRS Start Radio Block Loopback Cmd Mode flag"},
+	{ 0x44, "MS Positioning Technology"},
+	{ 0x45, "Close UE Test Loop Mode"},
+	{ 0x46, "UE Positioning Technology"},
+	{ 0x47, "RLC SDU Counter Value"},
+	{ 0x48, "UE Test Loop Mode"},
+	{ 0x49, "UE Test Loop Mode A LB Setup"},
+	{ 0x4a, "UE Test Loop Mode B LB Setup"},
+	{ 0x4b, "UE Test Loop Mode C Setup"},
+	{ 0x4c, "UE Positioning Technology"},
+	{ 0x4d, "MBMS Packet Counter Value"},
+	{ 0x4e, "Ellipsoid Point With Altitude"},
+	{ 0x4f, "Horizontal Velocity"},
+	{ 0x50, "GNSS-TOD-msec"},
 	{ 0, NULL }
 };