Add a value string for 3gpp2 Service option values.

svn path=/trunk/; revision=12696

1 files changed, 51 insertions, 1 deletions

diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index d5fe1b2f0d..738ae78179 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -3190,6 +3190,56 @@ static const value_string th3gpp2_always_on_vals[] = {
   {0, NULL}
 };
 
+/* http://www.3gpp2.org/Public_html/specs/C.R1001-C_v1.0.pdf */
+static const value_string th3gpp2_service_option_vals[] = {
+  {1,	"Basic Variable Rate Voice Service (8 kbps)"},
+  {2,	"Mobile Station Loopback (8 kbps)"},
+  {3,	"Enhanced Variable Rate Voice Service (8 kbps)"},
+  {4,	"Asynchronous Data Service (9.6 kbps)"},
+  {5,	"Group 3 Facsimile (9.6 kbps)"},
+  {6,	"Short Message Services (Rate Set 1)"},
+  {7,	"Packet Data Service: Internet or ISO Protocol Stack(9.6 kbps)"},
+  {8,	"Packet Data Service: CDPD Protocol Stack(9.6 kbps)"},
+  {9,	"Mobile Station Loopback (13 kbps)"},
+  {10,	"STU-III Transparent Service"},
+  {11,	"STU-III Non-Transparent Service"},
+  {12,	"Asynchronous Data Service (14.4 or 9.6 kbps)"},
+  {13,	"Group 3 Facsimile (14.4 or 9.6 kbps)"},
+  {14,	"Short Message Services (Rate Set 2)"},
+  {15,	"Packet Data Service: Internet or ISO Protocol Stack(14.4 kbps)"},
+  {16,	"Packet Data Service: CDPD Protocol Stack (14.4kbps)"},
+  {17,	"High Rate Voice Service (13 kbps)"},
+  {18,	"Over-the-Air Parameter Administration (Rate Set 1)"},
+  {19,	"Over-the-Air Parameter Administration (Rate Set 2)"},
+  {20,	"Group 3 Analog Facsimile (Rate Set 1)"},
+  {21,	"Group 3 Analog Facsimile (Rate Set 2)"},
+  {22,	"High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS1 reverse)"},
+  {23,	"High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS2 reverse)"},
+  {24,	"High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS1 reverse)"},
+  {25,	"High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS2 reverse)"},
+  {26,	"High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS1 reverse)"},
+  {27,	"High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS2 reverse)"},
+  {28,	"High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS1 reverse)"},
+  {29,	"High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS2 reverse)"},
+  {30,	"Supplemental Channel Loopback Test for Rate Set (Rate Set 1)"},
+  {31,	"Supplemental Channel Loopback Test for Rate Set (Rate Set 2)"},
+  {32,	"Test Data Service Option (TDSO)"},
+  {33,	"cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack"},
+  {34,	"cdma2000 High Speed Packet Data Service, CDPD Protocol Stack"},
+  {35,	"Location Services, Rate Set 1 (9.6 kbps)"},
+  {36,	"Location Services, Rate Set 2 (14.4 kbps)"},
+  {37,	"ISDN Interworking Service (64 kbps)"},
+  {38,	"GSM Voice"},
+  {39,	"GSM Circuit Data"},
+  {40,	"GSM Packet Data"},
+  {41,	"GSM Short Message Service"},
+/* 42 - 53 None Reserved for MC-MAP standard service options */
+  {54,	"GSM Short Message Service"},
+  {55,	"Loopback Service Option (LSO)"},
+  {56,	"Selectable Mode Vocoder"},
+  {0, NULL}
+};
+
 static const radius_attr_info radius_vendor_3gpp2_attrib[] =
 {
    /* According to 3GPP2 X.S0011-005-C 
@@ -3210,7 +3260,7 @@ static const radius_attr_info radius_vendor_3gpp2_attrib[] =
    {12,		RADIUS_INTEGER4,		"Forward FCH Mux Option", NULL, NULL},
    {13,		RADIUS_INTEGER4,		"Reverse FCH Mux Option", NULL, NULL},
    {14,		RADIUS_STRING,			"BSID", NULL, NULL},
-   {16,		RADIUS_INTEGER4,		"Service Option", NULL, NULL},
+   {16,		RADIUS_INTEGER4,		"Service Option", th3gpp2_service_option_vals, NULL},
    {17,		RADIUS_INTEGER4,		"Forward Traffic Type", NULL, NULL},
    {18,		RADIUS_INTEGER4,		"Reverse Traffic Type", NULL, NULL},
    {19,		RADIUS_INTEGER4,		"FCH Frame Size", NULL, NULL},