diff --git a/radius/dictionary.3gpp b/radius/dictionary.3gpp index 1954763912..1e46897986 100644 --- a/radius/dictionary.3gpp +++ b/radius/dictionary.3gpp @@ -13,32 +13,32 @@ 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-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-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-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-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 -ATTRIBUTE 3GPP-IPv6-DNS-Servers 17 ipv6addr +ATTRIBUTE 3GPP-IPv6-DNS-Servers 17 ipv6addr ATTRIBUTE 3GPP-SGSN-MCC-MNC 18 string -ATTRIBUTE 3GPP-Teardown-Indicator 19 octets -ATTRIBUTE 3GGP-IMEISV 20 octets +ATTRIBUTE 3GPP-Teardown-Indicator 19 octets +ATTRIBUTE 3GGP-IMEISV 20 octets ATTRIBUTE 3GPP-RAT-Type 21 octets -ATTRIBUTE 3GPP-User-Location-Info 22 octets +ATTRIBUTE 3GPP-User-Location-Info 22 octets ATTRIBUTE 3GPP-MS-TimeZone 23 octets -ATTRIBUTE 3GPP-Camel-Charging-Info 24 octets +ATTRIBUTE 3GPP-Camel-Charging-Info 24 octets ATTRIBUTE 3GPP-Packet-Filter 25 octets -ATTRIBUTE 3GPP-Negotiated-DSCP 26 string +ATTRIBUTE 3GPP-Negotiated-DSCP 26 string # # This attribute is really an array of IPv6 addresses. diff --git a/radius/dictionary.3gpp2 b/radius/dictionary.3gpp2 index 890847ed91..a4b61d78d5 100644 --- a/radius/dictionary.3gpp2 +++ b/radius/dictionary.3gpp2 @@ -10,116 +10,131 @@ VENDOR 3GPP2 5535 BEGIN-VENDOR 3GPP2 -ATTRIBUTE 3GPP2-Ike-Preshared-Secret-Request 1 integer -ATTRIBUTE 3GPP2-Security-Level 2 integer -ATTRIBUTE 3GPP2-Pre-Shared-Secret 3 string # 18 octets -ATTRIBUTE 3GPP2-Reverse-Tunnel-Spec 4 integer -ATTRIBUTE 3GPP2-Diffserv-Class-Option 5 integer +ATTRIBUTE 3GPP2-Ike-Preshared-Secret-Request 1 integer +ATTRIBUTE 3GPP2-Security-Level 2 integer +ATTRIBUTE 3GPP2-Pre-Shared-Secret 3 string # 18 octets +ATTRIBUTE 3GPP2-Reverse-Tunnel-Spec 4 integer +ATTRIBUTE 3GPP2-Diffserv-Class-Option 5 integer # Contains embedded 3GPP2 accounting attributes. -ATTRIBUTE 3GPP2-Accounting-Container 6 octets -ATTRIBUTE 3GPP2-Home-Agent-IP-Address 7 ipaddr +ATTRIBUTE 3GPP2-Accounting-Container 6 octets +ATTRIBUTE 3GPP2-Home-Agent-IP-Address 7 ipaddr # A number formed from the concatenation of the home RADIUS IP address, # the FA IP address, and a 32-bit Unix timestamp, all encoded as 8 ASCII # hex characters. -ATTRIBUTE 3GPP2-KeyID 8 string # 22 octets +ATTRIBUTE 3GPP2-KeyID 8 string # 22 octets -ATTRIBUTE 3GPP2-PCF-IP-Address 9 ipaddr -ATTRIBUTE 3GPP2-BSID 10 string -ATTRIBUTE 3GPP2-User-Id 11 integer -ATTRIBUTE 3GPP2-Forward-FCH-Mux-Option 12 integer -ATTRIBUTE 3GPP2-Reverse-FCH-Mux-Option 13 integer +ATTRIBUTE 3GPP2-PCF-IP-Address 9 ipaddr +ATTRIBUTE 3GPP2-BSID 10 string +ATTRIBUTE 3GPP2-User-Id 11 integer +ATTRIBUTE 3GPP2-Forward-FCH-Mux-Option 12 integer +ATTRIBUTE 3GPP2-Reverse-FCH-Mux-Option 13 integer # # 14-15 ? # -ATTRIBUTE 3GPP2-Service-Option 16 integer -ATTRIBUTE 3GPP2-Forward-Traffic-Type 17 integer -ATTRIBUTE 3GPP2-Reverse-Traffic-Type 18 integer -ATTRIBUTE 3GPP2-FCH-Frame-Size 19 integer -ATTRIBUTE 3GPP2-Forward-FCH-RC 20 integer -ATTRIBUTE 3GPP2-Reverse-FCH-RC 21 integer -ATTRIBUTE 3GPP2-IP-Technology 22 integer -ATTRIBUTE 3GPP2-Compulsory-Tunnel-Indicator 23 integer -ATTRIBUTE 3GPP2-Release-Indicator 24 integer -ATTRIBUTE 3GPP2-Bad-PPP-Frame-Count 25 integer +ATTRIBUTE 3GPP2-Service-Option 16 integer +ATTRIBUTE 3GPP2-Forward-Traffic-Type 17 integer +ATTRIBUTE 3GPP2-Reverse-Traffic-Type 18 integer +ATTRIBUTE 3GPP2-FCH-Frame-Size 19 integer +ATTRIBUTE 3GPP2-Forward-FCH-RC 20 integer +ATTRIBUTE 3GPP2-Reverse-FCH-RC 21 integer +ATTRIBUTE 3GPP2-IP-Technology 22 integer +ATTRIBUTE 3GPP2-Compulsory-Tunnel-Indicator 23 integer +ATTRIBUTE 3GPP2-Release-Indicator 24 integer +ATTRIBUTE 3GPP2-Bad-PPP-Frame-Count 25 integer # # 26-29 ? # -ATTRIBUTE 3GPP2-Number-Active-Transitions 30 integer -ATTRIBUTE 3GPP2-Terminating-SDB-Octet-Count 31 integer -ATTRIBUTE 3GPP2-Originating-SDB-OCtet-Count 32 integer -ATTRIBUTE 3GPP2-Terminating-Number-SDBs 33 integer -ATTRIBUTE 3GPP2-Originating-Number-SDBs 34 integer +ATTRIBUTE 3GPP2-Number-Active-Transitions 30 integer +ATTRIBUTE 3GPP2-Terminating-SDB-Octet-Count 31 integer +ATTRIBUTE 3GPP2-Originating-SDB-OCtet-Count 32 integer +ATTRIBUTE 3GPP2-Terminating-Number-SDBs 33 integer +ATTRIBUTE 3GPP2-Originating-Number-SDBs 34 integer # 35 ? -ATTRIBUTE 3GPP2-IP-QoS 36 integer +ATTRIBUTE 3GPP2-IP-QoS 36 integer # 37-38 ? -ATTRIBUTE 3GPP2-Airlink-Priority 39 integer -ATTRIBUTE 3GPP2-Airlink-Record-Type 40 integer # ? -# 41 ? -ATTRIBUTE 3GPP2-Airlink-Sequence-Number 42 integer # ? -ATTRIBUTE 3GPP2-Received-HDLC-Octets 43 integer -ATTRIBUTE 3GPP2-Correlation-Id 44 string -ATTRIBUTE 3GPP2-Module-Orig-Term-Indicator 45 octets # ? -ATTRIBUTE 3GPP2-Inbound-Mobile-IP-Sig-Octets 46 integer +ATTRIBUTE 3GPP2-Airlink-Priority 39 integer +ATTRIBUTE 3GPP2-Airlink-Record-Type 40 integer # ? +ATTRIBUTE 3GPP2-A10-Connection-ID 41 integer +ATTRIBUTE 3GPP2-Airlink-Sequence-Number 42 integer # ? +ATTRIBUTE 3GPP2-Received-HDLC-Octets 43 integer +ATTRIBUTE 3GPP2-Correlation-Id 44 string +ATTRIBUTE 3GPP2-Module-Orig-Term-Indicator 45 octets # ? +ATTRIBUTE 3GPP2-Inbound-Mobile-IP-Sig-Octets 46 integer ATTRIBUTE 3GPP2-Outbound-Mobile-IP-Sig-Octets 47 integer -ATTRIBUTE 3GPP2-Session-Continue 48 integer -ATTRIBUTE 3GPP2-Active-Time 49 integer -ATTRIBUTE 3GPP2-DCCH-Frame-Size 50 integer -ATTRIBUTE 3GPP2-Begin-Session 51 integer -ATTRIBUTE 3GPP2-ESN 52 string +ATTRIBUTE 3GPP2-Session-Continue 48 integer +ATTRIBUTE 3GPP2-Active-Time 49 integer +ATTRIBUTE 3GPP2-DCCH-Frame-Size 50 integer +ATTRIBUTE 3GPP2-Begin-Session 51 integer +ATTRIBUTE 3GPP2-ESN 52 string # 53 ? -ATTRIBUTE 3GPP2-S-Key 54 octets -ATTRIBUTE 3GPP2-S-Request 55 integer -ATTRIBUTE 3GPP2-S-Lifetime 56 date -ATTRIBUTE 3GPP2-MN-HA-SPI 57 integer -ATTRIBUTE 3GPP2-MN-HA-Shared-Key 58 string encrypt=2 +ATTRIBUTE 3GPP2-S-Key 54 octets +ATTRIBUTE 3GPP2-S-Request 55 integer +ATTRIBUTE 3GPP2-S-Lifetime 56 date +ATTRIBUTE 3GPP2-MN-HA-SPI 57 integer +ATTRIBUTE 3GPP2-MN-HA-Shared-Key 58 string encrypt=2 # The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Remote-IP-Address 59 octets +ATTRIBUTE 3GPP2-Remote-IP-Address 59 octets # 60 - 69 are marked "reserved" -ATTRIBUTE 3GPP2-Remote-IPv6-Address 70 octets -ATTRIBUTE 3GPP2-Remote-Address-Table-Index 71 octets -ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count 72 octets -ATTRIBUTE 3GPP2-Allowed-Diffserv-Marking 73 octets -ATTRIBUTE 3GPP2-Service-Option-Profile 74 octets +ATTRIBUTE 3GPP2-Remote-IPv6-Address 70 octets +ATTRIBUTE 3GPP2-Remote-Address-Table-Index 71 octets +ATTRIBUTE 3GPP2-Remote-IPv4-Addr-Octet-Count 72 octets +ATTRIBUTE 3GPP2-Allowed-Diffserv-Marking 73 octets +ATTRIBUTE 3GPP2-Service-Option-Profile 74 octets # the following don't contain subtypes -ATTRIBUTE 3GPP2-DNS-Update-Required 75 integer +ATTRIBUTE 3GPP2-DNS-Update-Required 75 integer # Is this 76 or 78? Check... -#ATTRIBUTE 3GPP2-Always-On 76 integer +#ATTRIBUTE 3GPP2-Always-On 76 integer # 77 ? -#ATTRIBUTE 3GPP2-Always-On 78 integer -ATTRIBUTE 3GPP2-Foreign-Agent-Address 79 ipaddr -ATTRIBUTE 3GPP2-Last-User-Activity-Time 80 integer -ATTRIBUTE 3GPP2-MN-AAA-Removal-Indication 81 integer +#ATTRIBUTE 3GPP2-Always-On 78 integer +ATTRIBUTE 3GPP2-Foreign-Agent-Address 79 ipaddr +ATTRIBUTE 3GPP2-Last-User-Activity-Time 80 integer +ATTRIBUTE 3GPP2-MN-AAA-Removal-Indication 81 integer ATTRIBUTE 3GPP2-RN-Packet-Data-Inactivity-Timer 82 integer -ATTRIBUTE 3GPP2-Forward-PDCH-RC 83 integer -ATTRIBUTE 3GPP2-Forward-DCCH-Mux-Option 84 integer -ATTRIBUTE 3GPP2-Reverse-DCCH-Mux-Option 85 integer -ATTRIBUTE 3GPP2-Forward-DCCH-RC 86 integer -ATTRIBUTE 3GPP2-Reverse-DHHC-RC 87 integer +ATTRIBUTE 3GPP2-Forward-PDCH-RC 83 integer +ATTRIBUTE 3GPP2-Forward-DCCH-Mux-Option 84 integer +ATTRIBUTE 3GPP2-Reverse-DCCH-Mux-Option 85 integer +ATTRIBUTE 3GPP2-Forward-DCCH-RC 86 integer +ATTRIBUTE 3GPP2-Reverse-DCCH-RC 87 integer ATTRIBUTE 3GPP2-Session-Termination-Capability 88 integer -ATTRIBUTE 3GPP2-Allowed-Persistent-TFTs 89 integer +ATTRIBUTE 3GPP2-Allowed-Persistent-TFTs 89 integer # The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Prepaid-Acct-Quota 90 octets -ATTRIBUTE 3GPP2-Prepaid-acct-Capability 91 octets -ATTRIBUTE 3GPP2-MIP-Lifetime 92 octets +ATTRIBUTE 3GPP2-Prepaid-Acct-Quota 90 octets +ATTRIBUTE 3GPP2-Prepaid-acct-Capability 91 octets +ATTRIBUTE 3GPP2-MIP-Lifetime 92 octets -ATTRIBUTE 3GPP2-Acct-Stop-Trigger 93 integer +ATTRIBUTE 3GPP2-Acct-Stop-Trigger 93 integer # contains subtypes -ATTRIBUTE 3GPP2-Service-Reference-Id 94 octets +ATTRIBUTE 3GPP2-Service-Reference-Id 94 octets -ATTRIBUTE 3GPP2-DNS-Update-Capability 95 integer -ATTRIBUTE 3GPP2-Disconnect-Reason 96 integer +ATTRIBUTE 3GPP2-DNS-Update-Capability 95 integer +ATTRIBUTE 3GPP2-Disconnect-Reason 96 integer # The next set of attributes contain sub-types -ATTRIBUTE 3GPP2-Remote-IPv6-Octet-Count 97 octets -ATTRIBUTE 3GPP2-PrePaid-Tariff-Switching 98 octets +ATTRIBUTE 3GPP2-Remote-IPv6-Octet-Count 97 octets +ATTRIBUTE 3GPP2-PrePaid-Tariff-Switching 98 octets +# +ATTRIBUTE 3GPP2-Subnet 108 string +# +ATTRIBUTE 3GPP2-Reverse-PDCH-RC 114 integer +# +ATTRIBUTE 3GPP2-MEID 116 string +# +ATTRIBUTE 3PP2-Granted-QoS-Parameters 132 integer +# +ATTRIBUTE 3PP2-Flow-ID-Parameter 144 integer +ATTRIBUTE 3PP2-Flow-Statusb 145 integer +VALUE 3GPP2-Airlink-Record-Type Session-Setup 1 +VALUE 3GPP2-Airlink-Record-Type Active-Start 2 +VALUE 3GPP2-Airlink-Record-Type Active-Stop 3 +VALUE 3GPP2-Airlink-Record-Type Short-Data-Burst 4 END-VENDOR 3GPP2