From: Arran Cudbard-Bell Date: Thu, 22 Nov 2018 15:16:49 +0000 (+0000) Subject: As per TS129061 version 150400P X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbc2963d5963ca1d14f1898fc9a9bca8dcedceff;p=thirdparty%2Ffreeradius-server.git As per TS129061 version 150400P https://www.etsi.org/deliver/etsi_ts/129000_129099/129061/15.04.00_60/ts_129061v150400p.pdf There were complaints that our names didn't match the standard... --- diff --git a/share/dictionary.3gpp b/share/dictionary.3gpp index 7c79aa89bd8..1bab92543e3 100644 --- a/share/dictionary.3gpp +++ b/share/dictionary.3gpp @@ -18,7 +18,7 @@ BEGIN-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-CG-Address 4 ipaddr ATTRIBUTE 3GPP-GPRS-Negotiated-QoS-profile 5 string ATTRIBUTE 3GPP-SGSN-Address 6 ipaddr ATTRIBUTE 3GPP-GGSN-Address 7 ipaddr @@ -28,7 +28,7 @@ ATTRIBUTE 3GPP-NSAPI 10 string ATTRIBUTE 3GPP-Session-Stop-Indicator 11 byte ATTRIBUTE 3GPP-Selection-Mode 12 string ATTRIBUTE 3GPP-Charging-Characteristics 13 string -ATTRIBUTE 3GPP-Charging-Gateway-IPv6-Address 14 ipv6addr +ATTRIBUTE 3GPP-CG-IPv6-Address 14 ipv6addr ATTRIBUTE 3GPP-SGSN-IPv6-Address 15 ipv6addr ATTRIBUTE 3GPP-GGSN-IPv6-Address 16 ipv6addr @@ -42,9 +42,9 @@ ATTRIBUTE 3GPP-SGSN-MCC-MNC 18 string ATTRIBUTE 3GPP-Teardown-Indicator 19 byte ATTRIBUTE 3GPP-IMEISV 20 string ATTRIBUTE 3GPP-RAT-Type 21 byte -ATTRIBUTE 3GPP-Location-Info 22 octets -ATTRIBUTE 3GPP-MS-Time-Zone 23 octets[2] -ATTRIBUTE 3GPP-Camel-Charging-Info 24 octets +ATTRIBUTE 3GPP-User-Location-Info 22 octets +ATTRIBUTE 3GPP-MS-TimeZone 23 octets[2] +ATTRIBUTE 3GPP-CAMEL-Charging-Info 24 octets ATTRIBUTE 3GPP-Packet-Filter 25 octets ATTRIBUTE 3GPP-Negotiated-DSCP 26 byte ATTRIBUTE 3GPP-Allocate-IP-Type 27 byte @@ -66,4 +66,8 @@ VALUE 3GPP-Allocate-IP-Type Allocate-IPv4-Address 1 VALUE 3GPP-Allocate-IP-Type Allocate-IPv6-Prefix 2 VALUE 3GPP-Allocate-IP-Type Allocate-IPv4-and-IPv6 3 +ATTRIBUTE TWAN-Identifier 29 octets +ATTRIBUTE 3GPP-User-Location-Info-Time 30 octets +ATTRIBUTE 3GPP-Secondary-RAT-Usage 31 octets + END-VENDOR 3GPP