summaryrefslogtreecommitdiffstats
path: root/resources/protocols/radius/dictionary.wimax.alvarion
diff options
context:
space:
mode:
Diffstat (limited to 'resources/protocols/radius/dictionary.wimax.alvarion')
-rw-r--r--resources/protocols/radius/dictionary.wimax.alvarion434
1 files changed, 237 insertions, 197 deletions
diff --git a/resources/protocols/radius/dictionary.wimax.alvarion b/resources/protocols/radius/dictionary.wimax.alvarion
index 1f839bda..db2df07a 100644
--- a/resources/protocols/radius/dictionary.wimax.alvarion
+++ b/resources/protocols/radius/dictionary.wimax.alvarion
@@ -1,5 +1,7 @@
# -*- text -*-
-# Copyright (C) 2015 The FreeRADIUS Server project and contributors
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
+#
##############################################################################
#
# Alvarion has taken it on themselves to produce a WiMAX dictionary
@@ -12,7 +14,7 @@
#
# You CANNOT use both dictionaries at the same time.
#
-# $Id: 94960143a8b8d73eceada9f47862d7343364ef5a $
+# $Id: 10c273fb0ca4be7436cba82d683bf315554664b8 $
#
##############################################################################
@@ -21,10 +23,11 @@ VENDOR WiMAX 24757 format=1,1,c
BEGIN-VENDOR WiMAX
ATTRIBUTE WiMAX-Capability 1 tlv
-ATTRIBUTE WiMAX-Release 1.1 string
-ATTRIBUTE WiMAX-Accounting-Capabilities 1.2 byte
-ATTRIBUTE WiMAX-Hotlining-Capabilities 1.3 byte
-ATTRIBUTE WiMAX-Idle-Mode-Notification-Cap 1.4 byte
+BEGIN-TLV WiMAX-Capability
+ATTRIBUTE WiMAX-Release 1 string
+ATTRIBUTE WiMAX-Accounting-Capabilities 2 byte
+ATTRIBUTE WiMAX-Hotlining-Capabilities 3 byte
+ATTRIBUTE WiMAX-Idle-Mode-Notification-Cap 4 byte
# This is really a bitmap
VALUE WiMAX-Accounting-Capabilities No-Accounting 0
@@ -40,6 +43,7 @@ VALUE WiMAX-Hotlining-Capabilities IP-Redirection 8
VALUE WiMAX-Idle-Mode-Notification-Cap Not-Supported 0
VALUE WiMAX-Idle-Mode-Notification-Cap Supported 1
+END-TLV WiMAX-Capability
ATTRIBUTE WiMAX-Device-Authentication-Indicator 2 byte
ATTRIBUTE WiMAX-GMT-Timezone-offset 3 signed
@@ -104,107 +108,117 @@ ATTRIBUTE WiMAX-SDFID 27 short
# some aspects of v1 (26/28) and v2 (26/84)
# See their Radius Interoperability Spec documentation for additional details.
ATTRIBUTE WiMAX-Packet-Flow-Descriptor 28 tlv
-ATTRIBUTE WiMAX-Packet-Data-Flow-Id 28.1 short
-ATTRIBUTE WiMAX-Service-Data-Flow-Id 28.2 short
-ATTRIBUTE WiMAX-Service-Profile-Id 28.3 integer
-ATTRIBUTE WiMAX-Direction 28.4 byte
+BEGIN-TLV WiMAX-Packet-Flow-Descriptor
+ATTRIBUTE WiMAX-Packet-Data-Flow-Id 1 short
+ATTRIBUTE WiMAX-Service-Data-Flow-Id 2 short
+ATTRIBUTE WiMAX-Service-Profile-Id 3 integer
+ATTRIBUTE WiMAX-Direction 4 byte
VALUE WiMAX-Direction Reserved-0 0
VALUE WiMAX-Direction Uplink 1
VALUE WiMAX-Direction Downlink 2
VALUE WiMAX-Direction Bi-Directional 3
-ATTRIBUTE WiMAX-Activation-Trigger 28.5 byte # bitmap
-ATTRIBUTE WiMAX-Transport-Type 28.6 byte
+ATTRIBUTE WiMAX-Activation-Trigger 5 byte # bitmap
+ATTRIBUTE WiMAX-Transport-Type 6 byte
VALUE WiMAX-Transport-Type Reserved-0 0
VALUE WiMAX-Transport-Type IPv4-CS 1
VALUE WiMAX-Transport-Type IPv6-CS 2
VALUE WiMAX-Transport-Type Ethernet 3
-ATTRIBUTE WiMAX-Uplink-QOS-Id 28.7 byte
-ATTRIBUTE WiMAX-Downlink-QOS-Id 28.8 byte
+ATTRIBUTE WiMAX-Uplink-QOS-Id 7 byte
+ATTRIBUTE WiMAX-Downlink-QOS-Id 8 byte
# The following are not listed in Alvarion's Spec
-#ATTRIBUTE WiMAX-Uplink-Classifier 28.9 string
-#ATTRIBUTE WiMAX-Downlink-Classifier 28.10 string
+#ATTRIBUTE WiMAX-Uplink-Classifier 9 string
+#ATTRIBUTE WiMAX-Downlink-Classifier 10 string
# Added by Alvarion
-ATTRIBUTE WiMAX-Classifier 28.11 tlv
-
-ATTRIBUTE WiMAX-ClassifierID 28.11.1 byte
-ATTRIBUTE WiMAX-Classifier-Priority 28.11.2 byte
-ATTRIBUTE WiMAX-Classifier-Protocol 28.11.3 byte
-ATTRIBUTE WiMAX-Classifier-Direction 28.11.4 byte
-
-VALUE WiMAX-Classifier-Direction Reserved-0 0
-VALUE WiMAX-Classifier-Direction IN 1
-VALUE WiMAX-Classifier-Direction OUT 2
-VALUE WiMAX-Classifier-Direction Bi-Directional 3
-VALUE WiMAX-Classifier-Direction FF 4
-
-ATTRIBUTE WiMAX-Source-Specification 28.11.5 tlv
-
-ATTRIBUTE WiMAX-Source-IPAddress 28.11.5.1 combo-ip
-# 2 IPv4 or IPv6 addresses
-ATTRIBUTE WiMAX-Source-IPAddressRange 28.11.5.2 octets
-# IPv4/IPv6 subnet mask plus bit-width mask
-ATTRIBUTE WiMAX-Source-IPAddressMask 28.11.5.3 octets
-ATTRIBUTE WiMAX-Source-Port 28.11.5.4 short
-# 4 bytes: first two indicate beginning of range, second two indicate end
-ATTRIBUTE WiMAX-Source-Port-Range 28.11.5.5 octets
-ATTRIBUTE WiMAX-Source-Inverted 28.11.5.6 byte
-
-VALUE WiMAX-Source-Inverted False 0
-VALUE WiMAX-Source-Inverted True 1
-
-# 8 bit unsigned enum
-ATTRIBUTE WiMAX-Source-Assigned 28.11.5.7 byte
-
-VALUE WiMAX-Source-Assigned Src-Assigned 1
-VALUE WiMAX-Source-Assigned Dst-Assigned 2
-VALUE WiMAX-Source-Assigned Src-Dst-Assigned 3
-
-ATTRIBUTE WiMAX-Destination-Specification 28.11.6 tlv
-
-ATTRIBUTE WiMAX-Destination-IPAddress 28.11.6.1 combo-ip
-# 2 IPv4 or IPv6 addresses to indicate beginning/end of range
-ATTRIBUTE WiMAX-Destination-IPAddressRange 28.11.6.2 octets
-# IPv4/IPv6 subnet mask plus bit-width mask
-ATTRIBUTE WiMAX-Destination-IPAddressMask 28.11.6.3 octets
-ATTRIBUTE WiMAX-Destination-Port 28.11.6.4 short
-# 4 bytes: first two indicate beginning of range, second two indicate end
-ATTRIBUTE WiMAX-Destination-Port-Range 28.11.6.5 octets
-ATTRIBUTE WiMAX-Destination-Inverted 28.11.6.6 byte
-
-VALUE WiMAX-Destination-Inverted False 0
-VALUE WiMAX-Destination-Inverted True 1
-
-ATTRIBUTE WiMAX-Destination-Assigned 28.11.6.7 byte
-
-VALUE WiMAX-Destination-Assigned Src-Assigned 1
-VALUE WiMAX-Destination-Assigned Dst-Assigned 2
-VALUE WiMAX-Destination-Assigned Src-Dst-Assigned 3
-
-ATTRIBUTE WiMAX-IP-TOS-DSCP-Range-and-Mask 28.11.7 octets
-ATTRIBUTE WiMAX-VLAN-ID 28.11.9 short
-ATTRIBUTE WiMAX-8021p 28.11.10 byte
+ATTRIBUTE WiMAX-Classifier 11 tlv
+
+BEGIN-TLV WiMAX-Classifier
+ ATTRIBUTE WiMAX-ClassifierID 1 byte
+ ATTRIBUTE WiMAX-Classifier-Priority 2 byte
+ ATTRIBUTE WiMAX-Classifier-Protocol 3 byte
+ ATTRIBUTE WiMAX-Classifier-Direction 4 byte
+
+ VALUE WiMAX-Classifier-Direction Reserved-0 0
+ VALUE WiMAX-Classifier-Direction IN 1
+ VALUE WiMAX-Classifier-Direction OUT 2
+ VALUE WiMAX-Classifier-Direction Bi-Directional 3
+ VALUE WiMAX-Classifier-Direction FF 4
+
+ ATTRIBUTE WiMAX-Source-Specification 5 tlv
+
+ BEGIN-TLV WiMAX-Source-Specification
+ ATTRIBUTE WiMAX-Source-IPAddress 1 combo-ip
+ # 2 IPv4 or IPv6 addresses
+ ATTRIBUTE WiMAX-Source-IPAddressRange 2 octets
+ # IPv4/IPv6 subnet mask plus bit-width mask
+ ATTRIBUTE WiMAX-Source-IPAddressMask 3 octets
+ ATTRIBUTE WiMAX-Source-Port 4 short
+ # 4 bytes: first two indicate beginning of range, second two indicate end
+ ATTRIBUTE WiMAX-Source-Port-Range 5 octets
+ ATTRIBUTE WiMAX-Source-Inverted 6 byte
+
+ VALUE WiMAX-Source-Inverted False 0
+ VALUE WiMAX-Source-Inverted True 1
+
+ # 8 bit unsigned enum
+ ATTRIBUTE WiMAX-Source-Assigned 7 byte
+
+ VALUE WiMAX-Source-Assigned Src-Assigned 1
+ VALUE WiMAX-Source-Assigned Dst-Assigned 2
+ VALUE WiMAX-Source-Assigned Src-Dst-Assigned 3
+ END-TLV WiMAX-Source-Specification
+
+ ATTRIBUTE WiMAX-Destination-Specification 6 tlv
+
+ BEGIN-TLV WiMAX-Destination-Specification
+ ATTRIBUTE WiMAX-Destination-IPAddress 1 combo-ip
+ # 2 IPv4 or IPv6 addresses to indicate beginning/end of range
+ ATTRIBUTE WiMAX-Destination-IPAddressRange 2 octets
+ # IPv4/IPv6 subnet mask plus bit-width mask
+ ATTRIBUTE WiMAX-Destination-IPAddressMask 3 octets
+ ATTRIBUTE WiMAX-Destination-Port 4 short
+ # 4 bytes: first two indicate beginning of range, second two indicate end
+ ATTRIBUTE WiMAX-Destination-Port-Range 5 octets
+ ATTRIBUTE WiMAX-Destination-Inverted 6 byte
+
+ VALUE WiMAX-Destination-Inverted False 0
+ VALUE WiMAX-Destination-Inverted True 1
+
+ ATTRIBUTE WiMAX-Destination-Assigned 7 byte
+
+ VALUE WiMAX-Destination-Assigned Src-Assigned 1
+ VALUE WiMAX-Destination-Assigned Dst-Assigned 2
+ VALUE WiMAX-Destination-Assigned Src-Dst-Assigned 3
+ END-TLV WiMAX-Destination-Specification
+
+ ATTRIBUTE WiMAX-IP-TOS-DSCP-Range-and-Mask 7 octets
+ ATTRIBUTE WiMAX-VLAN-ID 9 short
+ ATTRIBUTE WiMAX-8021p 10 byte
+END-TLV WiMAX-Classifier
+END-TLV WiMAX-Packet-Flow-Descriptor
ATTRIBUTE WiMAX-QoS-Descriptor 29 tlv
-ATTRIBUTE WiMAX-QoS-Id 29.1 byte
-ATTRIBUTE WiMAX-Global-Service-Class-Name 29.2 string # 6 octets
-ATTRIBUTE WiMAX-Service-Class-Name 29.3 string
-ATTRIBUTE WiMAX-Schedule-Type 29.4 byte
-ATTRIBUTE WiMAX-Traffic-Priority 29.5 byte
-ATTRIBUTE WiMAX-Maximum-Sustained-Traffic-Rate 29.6 integer
-ATTRIBUTE WiMAX-Minimum-Reserved-Traffic-Rate 29.7 integer
-ATTRIBUTE WiMAX-Maximum-Traffic-Burst 29.8 integer
-ATTRIBUTE WiMAX-Tolerated-Jitter 29.9 integer
-ATTRIBUTE WiMAX-Maximum-Latency 29.10 integer
-ATTRIBUTE WiMAX-Reduced-Resources-Code 29.11 byte
-ATTRIBUTE WiMAX-Media-Flow-Type 29.12 byte
-ATTRIBUTE WiMAX-Unsolicited-Grant-Interval 29.13 short
-ATTRIBUTE WiMAX-SDU-Size 29.14 short
-ATTRIBUTE WiMAX-Unsolicited-Polling-Interval 29.15 short
-ATTRIBUTE WiMAX-Media-Flow-Description-SDP 29.16 string
+BEGIN-TLV WiMAX-QoS-Descriptor
+ATTRIBUTE WiMAX-QoS-Id 1 byte
+ATTRIBUTE WiMAX-Global-Service-Class-Name 2 string # 6 octets
+ATTRIBUTE WiMAX-Service-Class-Name 3 string
+ATTRIBUTE WiMAX-Schedule-Type 4 byte
+ATTRIBUTE WiMAX-Traffic-Priority 5 byte
+ATTRIBUTE WiMAX-Maximum-Sustained-Traffic-Rate 6 integer
+ATTRIBUTE WiMAX-Minimum-Reserved-Traffic-Rate 7 integer
+ATTRIBUTE WiMAX-Maximum-Traffic-Burst 8 integer
+ATTRIBUTE WiMAX-Tolerated-Jitter 9 integer
+ATTRIBUTE WiMAX-Maximum-Latency 10 integer
+ATTRIBUTE WiMAX-Reduced-Resources-Code 11 byte
+ATTRIBUTE WiMAX-Media-Flow-Type 12 byte
+ATTRIBUTE WiMAX-Unsolicited-Grant-Interval 13 short
+ATTRIBUTE WiMAX-SDU-Size 14 short
+ATTRIBUTE WiMAX-Unsolicited-Polling-Interval 15 short
+ATTRIBUTE WiMAX-Media-Flow-Description-SDP 16 string
+END-TLV WiMAX-QoS-Descriptor
VALUE WiMAX-Schedule-Type Best-Effort 2
VALUE WiMAX-Schedule-Type nrtPS 3
@@ -232,7 +246,8 @@ ATTRIBUTE WiMAX-Control-Octets-In 32 integer
ATTRIBUTE WiMAX-Control-Packets-Out 33 integer
ATTRIBUTE WiMAX-Control-Octets-Out 34 integer
ATTRIBUTE WiMAX-PPAC 35 tlv
-ATTRIBUTE WiMAX-Available-In-Client 35.1 integer
+BEGIN-TLV WiMAX-PPAC
+ATTRIBUTE WiMAX-Available-In-Client 1 integer
# Really a bitmap
VALUE WiMAX-Available-In-Client Volume-Metering 1
@@ -242,6 +257,7 @@ VALUE WiMAX-Available-In-Client Pools 8
VALUE WiMAX-Available-In-Client Rating-Groups 0x10
VALUE WiMAX-Available-In-Client Multi-Services 0x20
VALUE WiMAX-Available-In-Client Tariff-Switch 0x40
+END-TLV WiMAX-PPAC
ATTRIBUTE WiMAX-Session-Termination-Capability 36 integer
@@ -249,29 +265,30 @@ ATTRIBUTE WiMAX-Session-Termination-Capability 36 integer
VALUE WiMAX-Session-Termination-Capability Dynamic-Authorization 1
ATTRIBUTE WiMAX-PPAQ 37 tlv
-ATTRIBUTE WiMAX-PPAQ-Quota-Identifier 37.1 octets
-ATTRIBUTE WiMAX-Volume-Quota 37.2 integer #kb
-ATTRIBUTE WiMAX-Volume-Threshold 37.3 integer #kb
-ATTRIBUTE WiMAX-Duration-Quota 37.4 integer #s
-ATTRIBUTE WiMAX-Duration-Threshold 37.5 integer #s
-ATTRIBUTE WiMAX-Resource-Quota 37.6 integer
-ATTRIBUTE WiMAX-Resource-Threshold 37.7 integer
-ATTRIBUTE WiMAX-Update-Reason 37.8 integer
-ATTRIBUTE WiMAX-Prepaid-Server 37.9 combo-ip
-ATTRIBUTE WiMAX-Service-Id 37.10 string
-ATTRIBUTE WiMAX-Rating-Group-Id 37.11 integer
-ATTRIBUTE WiMAX-Termination-Action 37.12 byte
-ATTRIBUTE WiMAX-Pool-Id 37.13 integer
-ATTRIBUTE WiMAX-Pool-Multiplier 37.14 integer
-ATTRIBUTE WiMAX-Requested-Action 37.15 byte
-ATTRIBUTE WiMAX-Check-Balance-Result 37.16 byte
+BEGIN-TLV WiMAX-PPAQ
+ATTRIBUTE WiMAX-PPAQ-Quota-Identifier 1 octets
+ATTRIBUTE WiMAX-Volume-Quota 2 integer #kb
+ATTRIBUTE WiMAX-Volume-Threshold 3 integer #kb
+ATTRIBUTE WiMAX-Duration-Quota 4 integer #s
+ATTRIBUTE WiMAX-Duration-Threshold 5 integer #s
+ATTRIBUTE WiMAX-Resource-Quota 6 integer
+ATTRIBUTE WiMAX-Resource-Threshold 7 integer
+ATTRIBUTE WiMAX-Update-Reason 8 integer
+ATTRIBUTE WiMAX-Prepaid-Server 9 combo-ip
+ATTRIBUTE WiMAX-Service-Id 10 string
+ATTRIBUTE WiMAX-Rating-Group-Id 11 integer
+ATTRIBUTE WiMAX-Termination-Action 12 byte
+ATTRIBUTE WiMAX-Pool-Id 13 integer
+ATTRIBUTE WiMAX-Pool-Multiplier 14 integer
+ATTRIBUTE WiMAX-Requested-Action 15 byte
+ATTRIBUTE WiMAX-Check-Balance-Result 16 byte
#
# 4 octets - integer representing 1/10's of lowest currency (e.g. cents)
# 4 octets - currency code as in ISO-4217
# 1+ - UTF8 string containing text like "cost is $1 per minute"
#
-ATTRIBUTE WiMAX-Cost-Information-AVP 37.17 octets
+ATTRIBUTE WiMAX-Cost-Information-AVP 17 octets
VALUE WiMAX-Update-Reason Pre-Initialization 1
VALUE WiMAX-Update-Reason Initial-Request 2
@@ -290,12 +307,15 @@ VALUE WiMAX-Termination-Action Redirect-Or-Filter 3
VALUE WiMAX-Requested-Action Balance-Check 1
VALUE WiMAX-Requested-Action Price-Enquiry 2
+END-TLV WiMAX-PPAQ
ATTRIBUTE WiMAX-Prepaid-Tariff-Switching 38 tlv
-ATTRIBUTE WiMAX-Prepaid-Quota-Identifier 38.1 string
-ATTRIBUTE WiMAX-Volume-Used-After 38.2 integer #1k
-ATTRIBUTE WiMAX-Tariff-Switch-Interval 38.3 integer #s
-ATTRIBUTE WiMAX-Time-Interval-After 38.4 integer #s
+BEGIN-TLV WiMAX-Prepaid-Tariff-Switching
+ATTRIBUTE WiMAX-Prepaid-Quota-Identifier 1 string
+ATTRIBUTE WiMAX-Volume-Used-After 2 integer #1k
+ATTRIBUTE WiMAX-Tariff-Switch-Interval 3 integer #s
+ATTRIBUTE WiMAX-Time-Interval-After 4 integer #s
+END-TLV WiMAX-Prepaid-Tariff-Switching
ATTRIBUTE WiMAX-Active-Time-Duration 39 integer
ATTRIBUTE WiMAX-DHCP-RK 40 octets encrypt=2
@@ -389,100 +409,120 @@ VALUE WiMAX-MIP-Authorization-Status True 1
ATTRIBUTE WiMAX-Flow-Descriptor-v2 83 tlv
ATTRIBUTE WiMAX-Packet-Flow-Descriptor-v2 84 tlv
-ATTRIBUTE WiMAX-PFDv2-Packet-Data-Flow-Id 84.1 short
-ATTRIBUTE WiMAX-PFDv2-Service-Data-Flow-Id 84.2 short
-ATTRIBUTE WiMAX-PFDv2-Service-Profile-Id 84.3 integer
-ATTRIBUTE WiMAX-PFDv2-Direction 84.4 byte
-ATTRIBUTE WiMAX-PFDv2-Activation-Trigger 84.5 byte
-ATTRIBUTE WiMAX-PFDv2-Transport-Type 84.6 byte
-ATTRIBUTE WiMAX-PFDv2-Uplink-QoS-Id 84.7 byte
-ATTRIBUTE WiMAX-PFDv2-Downlink-QoS-Id 84.8 byte
+BEGIN-TLV WiMAX-Packet-Flow-Descriptor-v2
+ATTRIBUTE WiMAX-PFDv2-Packet-Data-Flow-Id 1 short
+ATTRIBUTE WiMAX-PFDv2-Service-Data-Flow-Id 2 short
+ATTRIBUTE WiMAX-PFDv2-Service-Profile-Id 3 integer
+ATTRIBUTE WiMAX-PFDv2-Direction 4 byte
+ATTRIBUTE WiMAX-PFDv2-Activation-Trigger 5 byte
+ATTRIBUTE WiMAX-PFDv2-Transport-Type 6 byte
+ATTRIBUTE WiMAX-PFDv2-Uplink-QoS-Id 7 byte
+ATTRIBUTE WiMAX-PFDv2-Downlink-QoS-Id 8 byte
#
# Classifiers
#
-ATTRIBUTE WiMAX-PFDv2-Classifier 84.9 tlv
-ATTRIBUTE WiMAX-PFDv2-Classifier-Id 84.9.1 byte
-ATTRIBUTE WiMAX-PFDv2-Classifier-Priority 84.9.2 byte
-ATTRIBUTE WiMAX-PFDv2-Classifier-Protocol 84.9.3 byte
-ATTRIBUTE WiMAX-PFDv2-Classifier-Direction 84.9.4 byte
-
-ATTRIBUTE WiMAX-PFDv2-Classifier-Source-Spec 84.9.5 tlv
-ATTRIBUTE WiMAX-PFDv2-Src-IP-Address 84.9.5.1 combo-ip
-# really two IPv4 OR IPv6 addresses
-ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Range 84.9.5.2 octets
-ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Mask 84.9.5.3 combo-ip
-ATTRIBUTE WiMAX-PFDv2-Src-Port 84.9.5.4 short
-# 2 shorts
-ATTRIBUTE WiMAX-PFDv2-Src-Port-Range 84.9.5.5 integer
-ATTRIBUTE WiMAX-PFDv2-Src-Inverted 84.9.5.6 byte
-ATTRIBUTE WiMAX-PFDv2-Src-Assigned 84.9.5.7 byte
-
-VALUE WiMAX-PFDv2-Src-Assigned Src-Assigned 1
-VALUE WiMAX-PFDv2-Src-Assigned Dst-Assigned 2
-VALUE WiMAX-PFDv2-Src-Assigned Src-Dst-Assigned 3
-
-ATTRIBUTE WiMAX-PFDv2-Src-MAC-Address 84.9.5.8 ether
-ATTRIBUTE WiMAX-PFDv2-Src-MAC-Mask 84.9.5.9 ether
-
-ATTRIBUTE WiMAX-PFDv2-Classifier-Dest-Spec 84.9.6 tlv
-ATTRIBUTE WiMAX-PFDv2-Classifier-IP-ToS-DSCP 84.9.7 byte
-ATTRIBUTE WiMAX-PFDv2-Classifier-Action 84.9.8 byte
-
-ATTRIBUTE WiMAX-PFDv2-Classifier-Eth-Option 84.9.9 tlv
-
-ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type 84.9.9.1 tlv
-ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-Ethertype 84.9.9.1.1 short
-ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-DSAP 84.9.9.1.2 byte
-
-ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id 84.9.9.2 tlv
-ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-S-VID 84.9.9.2.1 integer
-ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-C-VID 84.9.9.2.2 integer
-
-ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range 84.9.9.3 tlv
-ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-Low 84.9.9.3.1 byte
-ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-High 84.9.9.3.2 byte
-
-ATTRIBUTE WiMAX-XXX 84.9.9.4 byte
-
-ATTRIBUTE WiMAX-PFDv2-Paging-Preference 84.9.10 byte
-ATTRIBUTE WiMAX-PFDv2-VLAN-Tag-Rule-Id 84.9.11 short
-
-VALUE WiMAX-PFDv2-Direction Uplink 1
-VALUE WiMAX-PFDv2-Direction Downlink 2
-VALUE WiMAX-PFDv2-Direction Bi-Directional 3
-
-VALUE WiMAX-PFDv2-Activation-Trigger Provisioned 1
-VALUE WiMAX-PFDv2-Activation-Trigger Admit 2
-VALUE WiMAX-PFDv2-Activation-Trigger Activate 4
-VALUE WiMAX-PFDv2-Activation-Trigger Dynamic 8
-
-VALUE WiMAX-PFDv2-Transport-Type IPv4-CS 1
-VALUE WiMAX-PFDv2-Transport-Type IPv6-CS 2
-VALUE WiMAX-PFDv2-Transport-Type Ethernet 3
+ATTRIBUTE WiMAX-PFDv2-Classifier 9 tlv
+BEGIN-TLV WiMAX-PFDv2-Classifier
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Id 1 byte
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Priority 2 byte
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Protocol 3 byte
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Direction 4 byte
+
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Source-Spec 5 tlv
+ BEGIN-TLV WiMAX-PFDv2-Classifier-Source-Spec
+ ATTRIBUTE WiMAX-PFDv2-Src-IP-Address 1 combo-ip
+ # really two IPv4 OR IPv6 addresses
+ ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Range 2 octets
+ ATTRIBUTE WiMAX-PFDv2-Src-IP-Address-Mask 3 combo-ip
+ ATTRIBUTE WiMAX-PFDv2-Src-Port 4 short
+ # 2 shorts
+ ATTRIBUTE WiMAX-PFDv2-Src-Port-Range 5 integer
+ ATTRIBUTE WiMAX-PFDv2-Src-Inverted 6 byte
+ ATTRIBUTE WiMAX-PFDv2-Src-Assigned 7 byte
+
+ VALUE WiMAX-PFDv2-Src-Assigned Src-Assigned 1
+ VALUE WiMAX-PFDv2-Src-Assigned Dst-Assigned 2
+ VALUE WiMAX-PFDv2-Src-Assigned Src-Dst-Assigned 3
+
+ ATTRIBUTE WiMAX-PFDv2-Src-MAC-Address 8 ether
+ ATTRIBUTE WiMAX-PFDv2-Src-MAC-Mask 9 ether
+ END-TLV WiMAX-PFDv2-Classifier-Source-Spec
+
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Dest-Spec 6 tlv
+ ATTRIBUTE WiMAX-PFDv2-Classifier-IP-ToS-DSCP 7 byte
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Action 8 byte
+
+ ATTRIBUTE WiMAX-PFDv2-Classifier-Eth-Option 9 tlv
+
+ BEGIN-TLV WiMAX-PFDv2-Classifier-Eth-Option
+ ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type 1 tlv
+ BEGIN-TLV WiMAX-PFDv2-Eth-Proto-Type
+ ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-Ethertype 1 short
+ ATTRIBUTE WiMAX-PFDv2-Eth-Proto-Type-DSAP 2 byte
+ END-TLV WiMAX-PFDv2-Eth-Proto-Type
+
+ ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id 2 tlv
+ BEGIN-TLV WiMAX-PFDv2-Eth-VLAN-Id
+ ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-S-VID 1 integer
+ ATTRIBUTE WiMAX-PFDv2-Eth-VLAN-Id-C-VID 2 integer
+ END-TLV WiMAX-PFDv2-Eth-VLAN-Id
+
+ ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range 3 tlv
+ BEGIN-TLV WiMAX-PFDv2-Eth-Priority-Range
+ ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-Low 1 byte
+ ATTRIBUTE WiMAX-PFDv2-Eth-Priority-Range-High 2 byte
+ END-TLV WiMAX-PFDv2-Eth-Priority-Range
+
+ ATTRIBUTE WiMAX-XXX 4 byte
+ END-TLV WiMAX-PFDv2-Classifier-Eth-Option
+
+ ATTRIBUTE WiMAX-PFDv2-Paging-Preference 10 byte
+ ATTRIBUTE WiMAX-PFDv2-VLAN-Tag-Rule-Id 11 short
+
+ VALUE WiMAX-PFDv2-Direction Uplink 1
+ VALUE WiMAX-PFDv2-Direction Downlink 2
+ VALUE WiMAX-PFDv2-Direction Bi-Directional 3
+
+ VALUE WiMAX-PFDv2-Activation-Trigger Provisioned 1
+ VALUE WiMAX-PFDv2-Activation-Trigger Admit 2
+ VALUE WiMAX-PFDv2-Activation-Trigger Activate 4
+ VALUE WiMAX-PFDv2-Activation-Trigger Dynamic 8
+
+ VALUE WiMAX-PFDv2-Transport-Type IPv4-CS 1
+ VALUE WiMAX-PFDv2-Transport-Type IPv6-CS 2
+ VALUE WiMAX-PFDv2-Transport-Type Ethernet 3
+END-TLV WiMAX-PFDv2-Classifier
+END-TLV WiMAX-Packet-Flow-Descriptor-v2
ATTRIBUTE WiMAX-VLAN-Tag-Processing-Descriptor 85 tlv
-ATTRIBUTE WiMAX-VLAN-Tag-Rule-Id 85.1 short
-ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Priority 85.2 byte
-ATTRIBUTE WiMAX-VLAN-Tag-VLAN-Id-Assignment 85.3 short
-ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Id 85.4 short
-ATTRIBUTE WiMAX-VLAN-Tag-S-VLAN-Id 85.5 short
-ATTRIBUTE WiMAX-VLAN-Tag-C-S-VLAN-Id-Mapping 85.6 integer
-ATTRIBUTE WiMAX-VLAN-Tag-Local-Config-Info 85.7 octets
+BEGIN-TLV WiMAX-VLAN-Tag-Processing-Descriptor
+ATTRIBUTE WiMAX-VLAN-Tag-Rule-Id 1 short
+ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Priority 2 byte
+ATTRIBUTE WiMAX-VLAN-Tag-VLAN-Id-Assignment 3 short
+ATTRIBUTE WiMAX-VLAN-Tag-C-VLAN-Id 4 short
+ATTRIBUTE WiMAX-VLAN-Tag-S-VLAN-Id 5 short
+ATTRIBUTE WiMAX-VLAN-Tag-C-S-VLAN-Id-Mapping 6 integer
+ATTRIBUTE WiMAX-VLAN-Tag-Local-Config-Info 7 octets
+END-TLV WiMAX-VLAN-Tag-Processing-Descriptor
ATTRIBUTE WiMAX-hDHCP-Server-Parameters 86 tlv
-ATTRIBUTE WiMAX-hDHCP-DHCPv4-Address 86.1 ipaddr
-ATTRIBUTE WiMAX-hDHCP-DHCPv6-Address 86.2 ipv6addr
-ATTRIBUTE WiMAX-hDHCP-DHCP-RK 86.3 string encrypt=2
-ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Key-Id 86.4 integer
-ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Lifetime 86.5 integer
+BEGIN-TLV WiMAX-hDHCP-Server-Parameters
+ATTRIBUTE WiMAX-hDHCP-DHCPv4-Address 1 ipaddr
+ATTRIBUTE WiMAX-hDHCP-DHCPv6-Address 2 ipv6addr
+ATTRIBUTE WiMAX-hDHCP-DHCP-RK 3 string encrypt=2
+ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Key-Id 4 integer
+ATTRIBUTE WiMAX-hDHCP-DHCP-RK-Lifetime 5 integer
+END-TLV WiMAX-hDHCP-Server-Parameters
ATTRIBUTE WiMAX-vDHCP-Server-Parameters 87 tlv
-ATTRIBUTE WiMAX-vDHCP-DHCPv4-Address 87.1 ipaddr
-ATTRIBUTE WiMAX-vDHCP-DHCPv6-Address 87.2 ipv6addr
-ATTRIBUTE WiMAX-vDHCP-DHCP-RK 87.3 string encrypt=2
-ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Key-Id 87.4 integer
-ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Lifetime 87.5 integer
+BEGIN-TLV WiMAX-vDHCP-Server-Parameters
+ATTRIBUTE WiMAX-vDHCP-DHCPv4-Address 1 ipaddr
+ATTRIBUTE WiMAX-vDHCP-DHCPv6-Address 2 ipv6addr
+ATTRIBUTE WiMAX-vDHCP-DHCP-RK 3 string encrypt=2
+ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Key-Id 4 integer
+ATTRIBUTE WiMAX-vDHCP-DHCP-RK-Lifetime 5 integer
+END-TLV WiMAX-vDHCP-Server-Parameters
ATTRIBUTE WiMAX-BS-Location 88 octets
ATTRIBUTE WiMAX-Visited-IPv4-HoA-PMIP6 89 byte