Fix a couple (value) mistakes in value_strings. Found by Martin's patch on the ...

[obnox/wireshark/wip.git] / radius / dictionary.3gpp

diff --git a/radius/dictionary.3gpp b/radius/dictionary.3gpp
index 3e8e1478dec6b8046c1011633b290e28e2a5cb35..941139f42f6cdf2be77062af3049c7b08691c811 100644 (file)
--- a/radius/dictionary.3gpp
+++ b/radius/dictionary.3gpp
@@ -1,11 +1,16 @@
+# -*- text -*-
 #
 #      3GPP stuff.
 #
-#      ftp://ftp.3gpp.org/specs/2002-06/R1999/29_series/29061-3a0.zip
+#      http://pda.etsi.org/exchangefolder/ts_129061v080300p.pdf
+#      ETSI TS 129 061 V8.3.0 (2009-06)
+#
+#       [wireshark] 2009-07-07:  Updated FreeRadius 2.1.6 dictionary.3gpp
+#                                 based upon the above specification.
 #
 #      $Id$
 #
-VENDOR         3GPP            10415
+VENDOR         3GPP                            10415
 
 BEGIN-VENDOR   3GPP
 
@@ -13,27 +18,61 @@ BEGIN-VENDOR        3GPP
 #      Most of the 'string' attributes are UTF-8 encoded text.
 #      Maybe we want a UTF-8 'type' in the server...
 #
-ATTRIBUTE      3GPP-IMSI                       1               string  
-ATTRIBUTE      3GPP-Charging-ID                2               integer
-ATTRIBUTE      3GPP-PDP-Type                   3               integer
-ATTRIBUTE      3GPP-Charging-Gateway-Address   4               ipaddr
-ATTRIBUTE      3GPP-GPRS-Negotiated-QoS-profile 5              string
-ATTRIBUTE      3GPP-SGSN-Address               6               ipaddr
-ATTRIBUTE      3GPP-GGSN-Address               7               ipaddr
-ATTRIBUTE      3GPP-IMSI-MCC-MNC               8               string
-ATTRIBUTE      3GPP-GGSN-MCC-MNC               9               string
-ATTRIBUTE      3GPP-NSAPI                      10              string
-ATTRIBUTE      3GPP-Session-Stop-Indicator     11              octets
-ATTRIBUTE      3GPP-Selection-Mode             12              string
-ATTRIBUTE      3GPP-Charging-Characteristics   13              string
-ATTRIBUTE      3GPP-Charging-Gateway-IPv6-Address 14           ipv6addr
-ATTRIBUTE      3GPP-SGSN-IPv6-Address          15              ipv6addr
-ATTRIBUTE      3GPP-GGSN-IPv6-Address          16              ipv6addr
-
-#
-#      This attribute is really an array of IPv6 addresses.
-#      Why the heck couldn't they just send multiple attributes?
-#
-ATTRIBUTE      3GPP-IPv6-DNS-Servers           17              octets 
-
-END-VENDOR     3GPP
+ATTRIBUTE      3GPP-IMSI                               1       string
+ATTRIBUTE      3GPP-Charging-ID                        2       integer
+ATTRIBUTE      3GPP-PDP-Type                           3       integer
+ATTRIBUTE      3GPP-Charging-Gateway-Address           4       ipaddr
+ATTRIBUTE      3GPP-GPRS-Negotiated-QoS-profile        5       string
+ATTRIBUTE      3GPP-SGSN-Address                       6       ipaddr
+ATTRIBUTE      3GPP-GGSN-Address                       7       ipaddr
+ATTRIBUTE      3GPP-IMSI-MCC-MNC                       8       string
+ATTRIBUTE      3GPP-GGSN-MCC-MNC                       9       string
+ATTRIBUTE      3GPP-NSAPI                              10      string
+ATTRIBUTE      3GPP-Session-Stop-Indicator             11      octets
+ATTRIBUTE      3GPP-Selection-Mode                     12      string
+ATTRIBUTE      3GPP-Charging-Characteristics           13      string
+ATTRIBUTE      3GPP-Charging-Gateway-IPv6-Address      14      ipv6addr
+ATTRIBUTE      3GPP-SGSN-IPv6-Address                  15      ipv6addr
+ATTRIBUTE      3GPP-GGSN-IPv6-Address                  16      ipv6addr
+
+#
+#    This attribute is really an array of IPv6 addresses.
+#    Why the heck couldn't they just send multiple attributes?
+#
+ATTRIBUTE      3GPP-IPv6-DNS-Servers                   17      octets
+
+ATTRIBUTE      3GPP-SGSN-MCC-MNC                       18      string
+ATTRIBUTE      3GPP-Teardown-Indicator                 19      octets
+
+ATTRIBUTE      3GGP-IMEISV                             20      octets
+ATTRIBUTE      3GPP-RAT-Type                           21      integer
+ATTRIBUTE      3GPP-User-Location-Info                 22      octets
+ATTRIBUTE      3GPP-MS-TimeZone                        23      octets
+ATTRIBUTE      3GPP-Camel-Charging-Info                24      octets
+ATTRIBUTE      3GPP-Packet-Filter                      25      octets
+ATTRIBUTE      3GPP-Negotiated-DSCP                    26      integer
+ATTRIBUTE      3GPP-Allocate-IP-Type                   27      integer
+
+VALUE  3GPP-PDP-Type           IPv4            0
+VALUE  3GPP-PDP-Type           PPP             1
+VALUE  3GPP-PDP-Type           IPv6            2
+VALUE  3GPP-PDP-Type           IPv4v6          3
+
+VALUE  3GPP-RAT-Type           Reserved        0
+VALUE  3GPP-RAT-Type           UTRAN           1
+VALUE  3GPP-RAT-Type           GERAN           2
+VALUE  3GPP-RAT-Type           WLAN            3
+VALUE  3GPP-RAT-Type           GAN             4
+VALUE  3GPP-RAT-Type           HSPA-Evolution  5
+VALUE  3GPP-RAT-Type           IEEE-802-16e    101
+VALUE  3GPP-RAT-Type           3GPP2-eHRPD     102
+VALUE  3GPP-RAT-Type           3GPP2-HRPD      103
+VALUE  3GPP-RAT-Type           3GPP2-1xRTT     104
+VALUE  3GPP-RAT-Type           3GPP-EPS        105
+
+VALUE  3GPP-Allocate-IP-Type   Do-Not-Allocate-IPv4-IPv6       0
+VALUE  3GPP-Allocate-IP-Type   Allocate-IPv4                   1
+VALUE  3GPP-Allocate-IP-Type   Allocate-IPv6-Prefix            2
+VALUE  3GPP-Allocate-IP-Type   Allocate-IPv4-IPv6-Prefix       3
+
+END-VENDOR    3GPP