From 9aeb1dac1770c29b74b0278eda284701a2e8f731 Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss@ulticom.com>
Date: Wed, 17 Nov 2010 03:16:30 +0000
Subject: From David Katz via
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5166 :

Add a configuration parameter of the NWG version for WiMAX ASN CP dissector.
The format and meaning of TLVs, as well as function types  and messages changed
between the different NWG versions.
Added support for the version number of TLVs in the dictionary xml, its parser,
and of course in the packet itself.
Added support for the version number of function-types and message-types by
extending the value_string structure to contain also a "since" version number.

Successfully tested with a live capture and capture file, containing WiMAX ASN
packets (full Network entry).
Also fuzzed 500 passes successfully.

The XML doesn't contain all existing NWG versions, only selected ones. This is
a little tedious work to go over all TLVs of each version, so I'll add some
newer versions later on. can add a short how-to of adding a new version, for
others to use, if needed.


svn path=/trunk/; revision=34919
---
 wimaxasncp/dictionary.dtd |    1 +
 wimaxasncp/dictionary.xml | 1948 +++++++++++++++++++++++++++------------------
 2 files changed, 1194 insertions(+), 755 deletions(-)

(limited to 'wimaxasncp')

diff --git a/wimaxasncp/dictionary.dtd b/wimaxasncp/dictionary.dtd
index 97adff9c31..08dc3c7910 100644
--- a/wimaxasncp/dictionary.dtd
+++ b/wimaxasncp/dictionary.dtd
@@ -9,6 +9,7 @@
     name    CDATA #REQUIRED
     type    CDATA #REQUIRED
     decoder CDATA #IMPLIED
+    since CDATA #IMPLIED
 >
 
 <!ELEMENT enum EMPTY>
diff --git a/wimaxasncp/dictionary.xml b/wimaxasncp/dictionary.xml
index 2c5dbdb96d..3b1ec624b2 100644
--- a/wimaxasncp/dictionary.xml
+++ b/wimaxasncp/dictionary.xml
@@ -4,6 +4,12 @@
 
 <!DOCTYPE dictionary SYSTEM "dictionary.dtd">
 
+<!-- WiMax ASN R6 message disection specification. -->
+<!-- Supports following NWG versions: -->
+<!-- 0 - NWG R1.0 V1.0.0 -->
+<!-- 1 - NWG R1.0 V1.2.0 -->
+<!-- 2 - NWG R1.0 V1.2.1 -->
+
 <dictionary>
 
     <!-- ****************************************************************** -->
@@ -44,13 +50,16 @@
         <enum name="Resume traffic"
               code="0x0003"/>
 
-        <enum name="MS shall be put to Idle state"
+        <enum name="Reserved (was: MS terminate current normal operations with BS)"
               code="0x0004"/>
 
-        <enum name="Initial authentication Failure"
+        <enum name="MS shall be put into idle mode"
+              code="0x0005"/>
+
+        <enum name="Initial Authentication Failure"
               code="0xFFFE"/>
 
-        <enum name="MS shall be put to RES-CMD by BS"
+        <enum name="MS shall be sent the RES-CMD by the BS"
               code="0xFFFF"/>
     </tlv>
 
@@ -86,7 +95,13 @@
 
     <tlv name="AK Lifetime"
          type="8"
-         decoder="WIMAXASNCP_TLV_DEC32">
+         decoder="WIMAXASNCP_TLV_DEC16">
+    </tlv>
+
+    <tlv name="AK Lifetime"
+         type="8"
+         decoder="WIMAXASNCP_TLV_DEC32"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -130,10 +145,10 @@
          type="14"
          decoder="WIMAXASNCP_TLV_ENUM8">
 
-        <enum name="accept"
+        <enum name="Accept"
               code="0x00"/>
 
-        <enum name="refuse"
+        <enum name="Refuse"
               code="0x01"/>
     </tlv>
 
@@ -146,20 +161,26 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Anchor Authenticator ID"
+         type="16"
+         decoder="WIMAXASNCP_TLV_ID">
+    </tlv>
+
     <tlv name="FA Revoke Reason"
          type="16"
-         decoder="WIMAXASNCP_TLV_ENUM8">
-	 
-	 <enum name="DHCP Release"
+         decoder="WIMAXASNCP_TLV_ENUM8"
+	 since="1">
+
+        <enum name="DHCP Release"
               code="0x00"/>
 
-        <enum name="DHCP Expiary"
-		code="0x01"/>
-	
-        <enum name="FA Initiated Release"
+        <enum name="DHCP expiry"
+              code="0x01"/>
+
+        <enum name="FA initiated release"
               code="0x02"/>
 
-        <enum name="HA Initiated Release"
+        <enum name="HA initiated release"
               code="0x03"/>
     </tlv>
 
@@ -192,40 +213,76 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name=" Auth-IND"
+         type="20"
+         decoder="WIMAXASNCP_TLV_DEC8">
+    </tlv>
+
     <tlv name="RRQ"
          type="20"
-         decoder="WIMAXASNCP_TLV_BYTES">
+         decoder="WIMAXASNCP_TLV_BYTES"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
 
     <tlv name="Authorization Policy"
          type="21"
-         decoder="WIMAXASNCP_TLV_BITFLAGS8">
+         decoder="WIMAXASNCP_TLV_BITFLAGS16">
 
         <enum name="RSA authorization"
-              code="WIMAXASNCP_BIT8(7)"/>
+              code="WIMAXASNCP_BIT16(15)"/>
 
         <enum name="EAP authorization"
-              code="WIMAXASNCP_BIT8(6)"/>
+              code="WIMAXASNCP_BIT16(14)"/>
 
         <enum name="Authenticated-EAP authorization"
-              code="WIMAXASNCP_BIT8(5)"/>
+              code="WIMAXASNCP_BIT16(13)"/>
 
         <enum name="HMAC supported"
+              code="WIMAXASNCP_BIT16(12)"/>
+
+        <enum name="CMAC supported"
+              code="WIMAXASNCP_BIT16(11)"/>
+
+        <enum name="64-bit Short-HMAC"
+              code="WIMAXASNCP_BIT16(10)"/>
+
+        <enum name="80-bit Short-HMAC"
+              code="WIMAXASNCP_BIT16(9)"/>
+
+        <enum name="96-bit Short-HMAC"
+              code="WIMAXASNCP_BIT16(8)"/>
+    </tlv>
+
+    <tlv name="Authorization Policy"
+         type="21"
+         decoder="WIMAXASNCP_TLV_BITFLAGS8"
+	 since="1">
+
+        <enum name="RSA-based authorization at the initial network entry"
+              code="WIMAXASNCP_BIT8(7)"/>
+
+        <enum name="EAP-based authorization at the initial network entry"
+              code="WIMAXASNCP_BIT8(6)"/>
+
+        <enum name="Authenticated EAP-based authorization at the initial network entry"
+              code="WIMAXASNCP_BIT8(5)"/>
+
+        <enum name="Reserved (was: HMAC supported)"
               code="WIMAXASNCP_BIT8(4)"/>
 
-        <enum name="RSA Authentication at Re-entry"
+        <enum name="RSA-based authorization at reentry"
               code="WIMAXASNCP_BIT8(3)"/>
 
-        <enum name="EAP Authentication at Re-entry"
+        <enum name="EAP-based authorization at reentry"
               code="WIMAXASNCP_BIT8(2)"/>
 
         <enum name="Authenticated EAP-based authorization at reentry"
               code="WIMAXASNCP_BIT8(1)"/>
-	      
+
         <enum name="Reserved"
-              code="WIMAXASNCP_BIT8(0)"/>	
+              code="WIMAXASNCP_BIT8(0)"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -286,36 +343,84 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Classification Rule"
+         type="30"
+         decoder="WIMAXASNCP_TLV_COMPOUND">
+    </tlv>
+
     <tlv name="Classification Rule Index"
          type="30"
-         decoder="WIMAXASNCP_TLV_DEC16">
+         decoder="WIMAXASNCP_TLV_DEC16"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Classifier Action"
+    <tlv name="Classification Rule Action"
          type="31"
          decoder="WIMAXASNCP_TLV_ENUM8">
 
-        <enum name="Add Classifier"
+        <enum name="Add Classification Rule"
               code="0"/>
 
-        <enum name="Replace Classifier"
+        <enum name="Replace Classification Rule"
               code="1"/>
 
-        <enum name="Delete Classifier"
+        <enum name="Delete Classification Rule"
               code="2"/>
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Classifier Rule Priority"
+    <tlv name="Classification Rule Priority"
          type="32"
          decoder="WIMAXASNCP_TLV_DEC8">
     </tlv>
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Classifier Type"
+         type="33"
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="IP TOS/DSCP Range and Mask"
+              code="1"/>
+        <enum name="Protocol"
+              code="2"/>
+        <enum name="IP Source Address and Mask"
+              code="3"/>
+        <enum name="IP Destination Address and Mask"
+              code="4"/>
+        <enum name="Protocol Source Port Range"
+              code="5"/>
+        <enum name="Protocol Destination Port Range"
+              code="6"/>
+        <enum name="IEEE 802.3/Ethernet Destination MAC address"
+              code="7"/>
+        <enum name="IEEE 802.3/Ethernet Source MAC address"
+              code="8"/>
+        <enum name="Ethertype/IEEE 802.2 SAP"
+              code="9"/>
+        <enum name="IEEE 802.1D User_Priority"
+              code="10"/>
+        <enum name="IEEE 802.1Q VLAN_ID"
+              code="11"/>
+    </tlv>
+
+    <tlv name="Authentication Indication"
+         type="33"
+         decoder="WIMAXASNCP_TLV_ENUM8"
+	 since="1">
+
+        <enum name="No Authentication Information"
+              code="0x00"/>
+
+        <enum name="Authentication Information present"
+              code="0x01"/>
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="CMAC_KEY_COUNT"
          type="34"
          decoder="WIMAXASNCP_TLV_DEC16">
@@ -338,49 +443,52 @@
 
     <tlv name="Context Purpose Indicator"
          type="36"
-         decoder="WIMAXASNCP_TLV_ENUM32">
+         decoder="WIMAXASNCP_TLV_BITFLAGS32">
 
         <enum name="MS AK Context"
               code="WIMAXASNCP_BIT32(0)"/>
 
-        <enum name="MS MAC Context"
+        <enum name="Reserved (was: MS Network Context)"
               code="WIMAXASNCP_BIT32(1)"/>
 
-        <enum name="MS Authorization Context"
+        <enum name="MS MAC Context"
               code="WIMAXASNCP_BIT32(2)"/>
 
-        <enum name="Anchor MM Context"
+        <enum name="MS Authorization Context"
               code="WIMAXASNCP_BIT32(3)"/>
 
-        <enum name="Accounting context"
+        <enum name="Anchor MM Context"
               code="WIMAXASNCP_BIT32(4)"/>
 
-        <enum name="MS Security History"
+        <enum name="Accounting context"
               code="WIMAXASNCP_BIT32(5)"/>
 
-        <enum name="SA Context"
+        <enum name="MS Security History"
               code="WIMAXASNCP_BIT32(6)"/>
 
-        <enum name="MN-FA key context"
+        <enum name="SA Context"
               code="WIMAXASNCP_BIT32(7)"/>
 
-        <enum name="FA-HA key context"
+        <enum name="MN-FA key context"
               code="WIMAXASNCP_BIT32(8)"/>
 
-        <enum name="DHCP-Relay-Info"
+        <enum name="FA-HA key context"
               code="WIMAXASNCP_BIT32(9)"/>
 
-        <enum name="Security Context Delivery"
+        <enum name="DHCP-Relay-Info"
               code="WIMAXASNCP_BIT32(10)"/>
 
-        <enum name="MIP6 handover successful"
+        <enum name="Security Context Delivery"
               code="WIMAXASNCP_BIT32(11)"/>
 
-        <enum name="Online Accounting context"
+        <enum name="MIP6 handover successful"
               code="WIMAXASNCP_BIT32(12)"/>
 
-        <enum name="Offline Accounting context"
+        <enum name="Online Accounting context"
               code="WIMAXASNCP_BIT32(13)"/>
+
+        <enum name="Offline Accounting context"
+              code="WIMAXASNCP_BIT32(14)"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -430,7 +538,7 @@
          type="39"
          decoder="WIMAXASNCP_TLV_ENUM8">
 
-        <enum name="All CS types"
+        <enum name="All CS Types"
               code="0x00"/>
 
         <enum name="Packet, IPv4"
@@ -470,6 +578,13 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Data Integrity Info"
+         type="41"
+         decoder="WIMAXASNCP_TLV_TBD">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Data Path Encapsulation Type"
          type="42"
          decoder="WIMAXASNCP_TLV_ENUM8">
@@ -535,21 +650,49 @@
 
     <tlv name="DCD/UCD Configuration Change Count"
          type="48"
-         decoder="WIMAXASNCP_TLV_TBD">
+         decoder="WIMAXASNCP_TLV_BITFLAGS8">
     </tlv>
 
     <!-- ****************************************************************** -->
 
     <tlv name="DCD Setting"
          type="49"
-         decoder="WIMAXASNCP_TLV_TBD">
+         decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Device Authentication Indicator"
+         type="50"
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="Reserved"
+              code="0"/>
+        <enum name="Certificate-based device authentication has been successfully performed (MS MAC address is verified)"
+              code="1"/>
+        <enum name="Device authentication has been successfully performed"
+              code="2"/>
+    </tlv>
+
     <tlv name="OFDMA Parameter Set"
          type="50"
-         decoder="WIMAXASNCP_TLV_HEX8">
+         decoder="WIMAXASNCP_TLV_BITFLAGS8"
+        since="1">
+
+        <enum name="support OFDMA PHY parameter set A"
+              code="0"/>
+
+        <enum name="support OFDMA PHY parameter set B"
+              code="1"/>
+
+        <enum name="HARQ parameters set"
+              code="2"/>
+
+        <enum name="support OFDMA MAC parameters set A"
+              code="5"/>
+
+        <enum name="support OFDMA MAC parameters set B"
+              code="6"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -584,7 +727,7 @@
 
     <tlv name="DHCP Relay Address"
          type="55"
-         decoder="WIMAXASNCP_TLV_ID">
+         decoder="WIMAXASNCP_TLV_IP_ADDRESS">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -598,7 +741,7 @@
 
     <tlv name="DHCP Server Address"
          type="57"
-         decoder="WIMAXASNCP_TLV_ID">
+         decoder="WIMAXASNCP_TLV_IP_ADDRESS">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -644,6 +787,13 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="EIK"
+         type="63"
+         decoder="WIMAXASNCP_TLV_BYTES">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="ERT-VR Data Delivery Service"
          type="64"
          decoder="WIMAXASNCP_TLV_COMPOUND">
@@ -651,9 +801,20 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Exit IDLE Mode Operation Indication"
+         type="65"
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="No"
+              code="0"/>
+        <enum name="Yes"
+              code="1"/>
+    </tlv>
+
     <tlv name="PPAC"
          type="65"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+         decoder="WIMAXASNCP_TLV_COMPOUND"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -686,10 +847,10 @@
         <enum name="Unspecified Error"
               code="0"/>
 
-        <enum name="Protocol Version not understood"
+        <enum name="Incompatible Version Number"
               code="1"/>
 
-        <enum name="Unrecognised Function Type"
+        <enum name="Invalid Function Type"
               code="2"/>
 
         <enum name="Invalid Message Type"
@@ -710,27 +871,6 @@
         <enum name="Invalid Message Header"
               code="8"/>
 
-        <enum name="Invalid OP ID"
-              code="9"/>
-
-        <enum name="Destination Identifier missing or erroneous"
-              code="10"/>
-
-        <enum name="Source Identifier TLV missing or erroneous"
-              code="11"/>
-
-        <enum name="Message type unknown or inopportune"
-              code="12"/>
-
-        <enum name="Unresolved error"
-              code="13"/>
-
-        <enum name="Unspecific Message Header Failure"
-              code="14"/>
-
-        <enum name="Unspecific Message Header Failure"
-              code="15"/>
-
         <enum name="Invalid message format"
               code="16"/>
 
@@ -743,90 +883,9 @@
         <enum name="Unsupported Options"
               code="19"/>
 
-        <enum name="TLV Unknown"
-              code="20"/>
-
-        <enum name="TLV Unexpected"
-              code="21"/>
-
-        <enum name="TLV parsing error"
-              code="22"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="23"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="24"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="25"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="26"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="27"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="28"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="29"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="30"/>
-
-        <enum name="Unspecific General Message Body Failure"
-              code="31"/>
-
         <enum name="Timer expired without response"
               code="32"/>
 
-        <enum name="BSID out of service"
-              code="33"/>
-
-        <enum name="Unknown BSID"
-              code="34"/>
-
-        <enum name="BSID Unreachable"
-              code="35"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="36"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="37"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="38"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="39"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="40"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="41"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="42"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="43"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="44"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="45"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="46"/>
-
-        <enum name="Unspecific Message Generic Failure"
-              code="47"/>
-
         <enum name="Requested Context Unavailable"
               code="48"/>
 
@@ -844,36 +903,11 @@
 
         <enum name="Authenticator relocated"
               code="53"/>
-
-        <enum name="Does not support periodic reporting of RRM messages"
-              code="54"/>
-
-        <enum name="Location Update Failure"
-              code="55"/>
-
-        <enum name="Idle Mode Authorization Failure"
-              code="56"/>
-
-        <enum name="Target BS doesnt support this HO Type"
-              code="57"/>
-
-        <enum name="Insufficient Target BS airlink resource"
-              code="58"/>
-
-        <enum name="Target BS CPU overload"
-              code="59"/>
-
-        <enum name="Unspecific Message-specific Failure"
-              code="60"/>
-
-        <enum name="Unspecific Message-specific Failure"
-              code="61"/>
-		  
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Target FA IP Address"
+    <tlv name="FA IP Address"
          type="70"
          decoder="WIMAXASNCP_TLV_ID">
     </tlv>
@@ -895,14 +929,14 @@
 
     <tlv name="Full DCD Setting"
          type="72"
-         decoder="WIMAXASNCP_TLV_TBD">
+         decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
 
     <!-- ****************************************************************** -->
 
     <tlv name="Full UCD Setting"
          type="73"
-         decoder="WIMAXASNCP_TLV_TBD">
+         decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -958,14 +992,14 @@
          type="79"
          decoder="WIMAXASNCP_TLV_ENUM32">
 
-        <enum name="HHO"
-              code="0"/>
+        <enum name="Hard Handoff (HHO)"
+              code="0x00000000"/>
 
-        <enum name="FBSS"
-              code="1"/>
+        <enum name="Fast Base Station Switching (FBSS)"
+              code="0x00000001"/>
 
-        <enum name="MDHO"
-              code="2"/>
+        <enum name="Macro Diversity Handoff (MDHO)"
+              code="0x00000002"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -979,7 +1013,30 @@
 
     <tlv name="IDLE Mode Retain Info"
          type="81"
-         decoder="WIMAXASNCP_TLV_HEX8">
+         decoder="WIMAXASNCP_TLV_BITFLAGS8">
+        <enum name="Retain MS service and operational information associated with SBC-REQ/RSP messages."
+              code="WIMAXASNCP_BIT8(0)"/>
+
+        <enum name="Retain MS service and operational information associated with PKM-REQ/RSP messages."
+              code="WIMAXASNCP_BIT8(1)"/>
+
+        <enum name="Retain MS service and operational information associated with REG-REQ/RSP messages."
+              code="WIMAXASNCP_BIT8(2)"/>
+
+        <enum name="Retain MS service and operational information associated with Network Address."
+              code="WIMAXASNCP_BIT8(3)"/>
+
+        <enum name="Retain MS service and operational information associated with Time of Day."
+              code="WIMAXASNCP_BIT8(4)"/>
+
+        <enum name="Retain MS service and operational information associated with TFTP messages."
+              code="WIMAXASNCP_BIT8(5)"/>
+
+        <enum name="Retain MS service and operation information associated with Full service."
+              code="WIMAXASNCP_BIT8(6)"/>
+
+        <enum name="Consider Paging Preference of each Service Flow in resource retention."
+              code="WIMAXASNCP_BIT8(7)"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1007,7 +1064,7 @@
 
     <tlv name="IP TOS/DSCP Range and Mask"
          type="85"
-         decoder="WIMAXASNCP_TLV_TBD">
+         decoder="WIMAXASNCP_TLV_BYTES">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1038,37 +1095,51 @@
 
         <enum name="Accept"
               code="0"/>
+
+        <enum name="Refuse"
+              code="1"/>
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Available Client"
+    <tlv name="Location Update Success/Failure Indication"
          type="89"
-         decoder="WIMAXASNCP_TLV_ENUM32">
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="Success"
+              code="0"/>
+        <enum name="Failure"
+              code="1"/>
+    </tlv>
+
+    <tlv name="Available In Client"
+         type="89"
+         decoder="WIMAXASNCP_TLV_ENUM32"
+	 since="1">
 
         <enum name="Reserved"
               code="0"/>
 
         <enum name="Volume metering supported"
-              code="1"/>
+              code="0x00000001"/>
 
         <enum name="Duration metering supported"
-              code="2"/>
+              code="0x00000002"/>
 
         <enum name="Resource metering supported"
-              code="4"/>
+              code="0x00000004"/>
 
         <enum name="Pools supported"
-              code="8"/>
+              code="0x00000008"/>
 
         <enum name="Rating groups supported"
-              code="16"/>
+              code="0x00000010"/>
 
         <enum name="Multi-Services supported"
-              code="32"/>
+              code="0x00000020"/>
 
         <enum name="Tariff Switch supported"
-              code="64"/>
+              code="0x00000040"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1167,9 +1238,15 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="MIP4 Security Info"
+         type="97"
+         decoder="WIMAXASNCP_TLV_COMPOUND">
+    </tlv>
+
     <tlv name="RRP"
          type="97"
-         decoder="WIMAXASNCP_TLV_BYTES">
+         decoder="WIMAXASNCP_TLV_BYTES"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1195,9 +1272,9 @@
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Target Care-of Address"
+    <tlv name="MS FA Context"
          type="101"
-         decoder="WIMAXASNCP_TLV_IP_ADDRESS">
+         decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1239,6 +1316,26 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="MS Networking Context"
+         type="106"
+         decoder="WIMAXASNCP_TLV_COMPOUND">
+    </tlv>
+
+    <tlv name="Obsolete"
+         type="106"
+         decoder="WIMAXASNCP_TLV_UNKNOWN"
+         since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="MS Security Context"
+         type="107"
+         decoder="WIMAXASNCP_TLV_COMPOUND">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="MS Security History"
          type="108"
          decoder="WIMAXASNCP_TLV_COMPOUND">
@@ -1280,7 +1377,7 @@
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Old Anchor PCID"
+    <tlv name="Old Anchor PC ID"
          type="113"
          decoder="WIMAXASNCP_TLV_ID">
     </tlv>
@@ -1324,7 +1421,7 @@
 
     <tlv name="Paging Cycle"
          type="118"
-         decoder="WIMAXASNCP_TLV_TBD">
+         decoder="WIMAXASNCP_TLV_DEC16">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1345,7 +1442,13 @@
 
     <tlv name="Paging Start/Stop"
          type="121"
-         decoder="WIMAXASNCP_TLV_HEX8">
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="Stop"
+              code="0"/>
+
+        <enum name="Start"
+              code="1"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1357,7 +1460,7 @@
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Paging Group ID"
+    <tlv name="PGID - Paging Group ID"
          type="123"
          decoder="WIMAXASNCP_TLV_HEX16">
     </tlv>
@@ -1431,9 +1534,25 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="PKM Context"
+         type="131"
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="PKM Capabilities defined in the MTG Profile"
+              code="0"/>
+        </tlv>
+
     <tlv name="PPAQ"
          type="131"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+         decoder="WIMAXASNCP_TLV_COMPOUND"
+	 since="1">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="PMIP4 Client Location"
+         type="132"
+         decoder="WIMAXASNCP_TLV_IPV4_ADDRESS">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1450,20 +1569,33 @@
          decoder="WIMAXASNCP_TLV_ENUM8">
 
         <enum name="EAP Transfer"
-              code="12"/>
-
+              code="18"/>
         <enum name="Authenticated EAP Transfer"
               code="19"/>
-
         <enum name="EAP Complete"
               code="29"/>
     </tlv>
 
+    <tlv name="PKM2 Message Code"
+         type="134"
+         decoder="WIMAXASNCP_TLV_ENUM8"
+	 since="1">
+
+        <enum name="EAP Transfer"
+              code="18"/>
+    </tlv>
+
     <!-- ****************************************************************** -->
 
+    <tlv name="PMK2 SN"
+         type="135"
+         decoder="WIMAXASNCP_TLV_DEC8">
+    </tlv>
+
     <tlv name="Paging Interval Length"
          type="135"
-         decoder="WIMAXASNCP_TLV_Dec16">
+         decoder="WIMAXASNCP_TLV_DEC16"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1517,9 +1649,40 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Reduced Resources Code"
+         type="143"
+         decoder="WIMAXASNCP_TLV_DEC8">
+    </tlv>
+
+    <tlv name="MTG Profile"
+         type="143"
+         decoder="WIMAXASNCP_TLV_ENUM8"
+         since="1">
+
+        <enum name="REG handshake related capabilities defined in the MTG Profile"
+              code="0"/>
+    </tlv>
+
+    <tlv name="Obsolete"
+         type="143"
+         decoder="WIMAXASNCP_TLV_UNKNOWN"
+         since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="REG Context"
          type="144"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="REG handshake related capabilities defined in the MTG Profile"
+              code="0"/>
+    </tlv>
+
+    <tlv name="REG Context"
+         type="144"
+         decoder="WIMAXASNCP_TLV_COMPOUND"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1531,7 +1694,7 @@
         <enum name="Initial Network Entry"
               code="0"/>
 
-        <enum name="HO"
+        <enum name="Handoff"
               code="1"/>
 
         <enum name="In-Service Data Path Establishment"
@@ -1545,9 +1708,6 @@
 
         <enum name="Idle Mode Exit"
               code="5"/>
-
-        <enum name="Anchor DPF Relocation"
-              code="6"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1559,23 +1719,41 @@
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Registeration Lifetime"
+    <tlv name="Relocation Destination ID"
          type="147"
-         decoder="WIMAXASNCP_TLV_DEC16">
+         decoder="WIMAXASNCP_TLV_ID">
+    </tlv>
+
+    <tlv name="Registration Lifetime"
+         type="147"
+         decoder="WIMAXASNCP_TLV_DEC16"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
 
+    <tlv name="Relocation Response"
+         type="148"
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="Accept"
+              code="0"/>
+
+        <enum name="Refuse"
+              code="1"/>
+    </tlv>
+
     <tlv name="Quota Identifier"
          type="148"
-         decoder="WIMAXASNCP_TLV_HEX32">
+         decoder="WIMAXASNCP_TLV_BYTES"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Relocation Success Indication"
+    <tlv name="Relocation Success Indicator"
          type="149"
-         decoder="WIMAXASNCP_TLV_TBD">
+         decoder="WIMAXASNCP_TLV_ENUM8">
 
         <enum name="Accept"
               code="0"/>
@@ -1666,10 +1844,10 @@
          decoder="WIMAXASNCP_TLV_ENUM8">
 
         <enum name="not allowed - Paging Reference is zero"
-              code="1"/>
+              code="0x00"/>
 
         <enum name="not allowed - no such SF"
-              code="2"/>
+              code="0x01"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1681,10 +1859,10 @@
         <enum name="Success"
               code="0"/>
 
-        <enum name="Failure No resources"
+        <enum name="Failure - No resources"
               code="1"/>
 
-        <enum name="Failure Not supported"
+        <enum name="Failure - Not supported"
               code="2"/>
 
         <enum name="Partial Response"
@@ -1798,23 +1976,57 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="R3 Operation Status"
+         type="167"
+         decoder="WIMAXASNCP_TLV_ENUM16">
+
+        <enum name="Success"
+              code="0x0"/>
+
+        <enum name="Failure"
+              code="0x1"/>
+
+        <enum name="Pending"
+              code="0x2"/>
+
+        <enum name="Reserved"
+              code="0x3"/>
+
+    </tlv>
+
     <tlv name="Volume Quota"
          type="167"
-         decoder="WIMAXASNCP_TLV_DEC32">
+         decoder="WIMAXASNCP_TLV_DEC32"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
 
+    <tlv name="R3 Release Reason"
+         type="168"
+        decoder="WIMAXASNCP_TLV_ENUM8">
+
+       <enum name="MS power down"
+             code="0x0"/>
+    </tlv>
+
     <tlv name="Volume Threshold"
          type="168"
-         decoder="WIMAXASNCP_TLV_DEC32">
+         decoder="WIMAXASNCP_TLV_DEC32"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
 
     <tlv name="SAID"
          type="169"
-         decoder="WIMAXASNCP_TLV_HEX16">
+         decoder="WIMAXASNCP_TLV_HEX32">
+    </tlv>
+
+    <tlv name="SAID"
+         type="169"
+         decoder="WIMAXASNCP_TLV_HEX16"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1826,6 +2038,13 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="SA Index"
+         type="171"
+         decoder="WIMAXASNCP_TLV_HEX32">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="SA Service Type"
          type="172"
          decoder="WIMAXASNCP_TLV_ENUM8">
@@ -1860,7 +2079,13 @@
 
     <tlv name="SBC Context"
          type="174"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+         decoder="WIMAXASNCP_TLV_HEX8">
+    </tlv>
+
+    <tlv name="SBC Context"
+         type="174"
+         decoder="WIMAXASNCP_TLV_COMPOUND"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1881,7 +2106,13 @@
 
     <tlv name="SDU Size"
          type="177"
-         decoder="WIMAXASNCP_TLV_DEC16">
+         decoder="WIMAXASNCP_TLV_DEC8">
+    </tlv>
+
+    <tlv name="SDU Size"
+         type="177"
+         decoder="WIMAXASNCP_TLV_DEC16"
+	 since="1">
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -1911,10 +2142,10 @@
          type="181"
          decoder="WIMAXASNCP_TLV_ENUM8">
 
-        <enum name="Service authorized"
+        <enum name="service authorized"
               code="0"/>
 
-        <enum name="Service not authorized"
+        <enum name="service not authorized"
               code="1"/>
     </tlv>
 
@@ -1933,6 +2164,41 @@
 
     <!-- ****************************************************************** -->
 
+    <tlv name="SF Classification"
+         type="183"
+        decoder="WIMAXASNCP_TLV_ENUM8">
+
+       <enum name="SF classification not supported"
+             code="0"/>
+       <enum name="SF classification supported"
+             code="1"/>
+    </tlv>
+
+    <tlv name="SBC Capability Profile"
+         type="183"
+        decoder="WIMAXASNCP_TLV_BITFLAGS8"
+        since="1">
+
+       <enum name="Support OFDMA PHY parameter set A"
+             code="WIMAXASNCP_BIT8(7)"/>
+       <enum name="Support OFDMA PHY parameter set B"
+             code="WIMAXASNCP_BIT8(6)"/>
+       <enum name="HARQ set"
+             code="WIMAXASNCP_BIT8(5)"/>
+       <enum name="HARQ set"
+             code="WIMAXASNCP_BIT8(4)"/>
+       <enum name="HARQ set"
+           code="WIMAXASNCP_BIT8(3)"/>
+    </tlv>
+
+    <tlv name="Obsolete"
+         type="183"
+        decoder="WIMAXASNCP_TLV_UNKNOWN"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="SFID"
          type="184"
          decoder="WIMAXASNCP_TLV_HEX32">
@@ -2063,27 +2329,27 @@
          type="202"
          decoder="WIMAXASNCP_TLV_ASCII_STRING">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
 
     <tlv name="BS HO RSP Code"
          type="203"
          decoder="WIMAXASNCP_TLV_ENUM8">
-	 
-        <enum name="Void"
-              code="0x00"/>
-			  
-        <enum name="Target BS doesnot support this HO Type"
-              code="0x01"/>
-			  
-        <enum name="Target BS air link resource is not enough"
-              code="0x02"/>
-			  
-        <enum name="Target BS CPU overload"
-              code="0x03"/>	
-			  
+
+        <enum name="success"
+              code="0"/>
+
+        <enum name="Target BS doesn't support this HO Type"
+              code="1"/>
+
+        <enum name="Target BS's air link resource is not enough"
+              code="2"/>
+
+        <enum name="Target BS's CPU overload"
+              code="3"/>
+
         <enum name="Target BS rejects for other reasons"
-              code="0x04"/>					  
+              code="4"/>
     </tlv>
 
     <!-- ****************************************************************** -->
@@ -2092,204 +2358,364 @@
          type="204"
          decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
 
     <tlv name="HO ID"
          type="205"
          decoder="WIMAXASNCP_TLV_HEX8">
     </tlv>
-	
+
     <!-- ****************************************************************** -->
 
     <tlv name="Combined Resource Indicator"
          type="206"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+         decoder="WIMAXASNCP_TLV_BYTES">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
 
     <tlv name="Media Flow Description in SDP Format"
          type="228"
          decoder="WIMAXASNCP_TLV_BYTES">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Service Class Name"
+         type="229"
+         decoder="WIMAXASNCP_TLV_STRING">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Traffic Priority/QoS Priority"
+         type="231"
+         decoder="WIMAXASNCP_TLV_DEC8">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Maximum Sustained Traffic Rate"
+         type="232"
+         decoder="WIMAXASNCP_TLV_DEC32">
+    </tlv>
+
+    <tlv name="Obsolete"
+         type="232"
+         decoder="WIMAXASNCP_TLV_UNKNOWN"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Minimum Reserved Traffic Rate"
+         type="233"
+         decoder="WIMAXASNCP_TLV_DEC32">
+    </tlv>
+
+    <tlv name="Obsolete"
+         type="233"
+         decoder="WIMAXASNCP_TLV_UNKNOWN"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Maximum Traffic Burst"
+         type="234"
+         decoder="WIMAXASNCP_TLV_DEC32">
+    </tlv>
+
+    <tlv name="Obsolete"
+         type="234"
+         decoder="WIMAXASNCP_TLV_UNKNOWN"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Tolerated Jitter"
+         type="235"
+         decoder="WIMAXASNCP_TLV_DEC32">
+    </tlv>
+
+    <tlv name="Obsolete"
+         type="235"
+         decoder="WIMAXASNCP_TLV_UNKNOWN"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="R3 Maximum Latency"
+         type="236"
+         decoder="WIMAXASNCP_TLV_DEC32">
+    </tlv>
+
+    <!-- ****************************************************************** -->
 
     <tlv name="Reduced Resources Code"
          type="237"
          decoder="WIMAXASNCP_TLV_FLAG0">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Unsolicited Grant Interval"
+         type="239"
+         decoder="WIMAXASNCP_TLV_DEC16">
+    </tlv>
+
+    <!-- ****************************************************************** -->
 
     <tlv name="Accounting Session/Flow Volume Counts"
          type="244"
          decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
 
     <tlv name="Accounting Number of Bulk Sessions/Flows"
          type="245"
          decoder="WIMAXASNCP_TLV_DEC8">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
 
     <tlv name="Accounting Bulk Session/Flow"
          type="246"
          decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Interim Update Interval"
+         type="248"
+         decoder="WIMAXASNCP_TLV_DEC16">
+    </tlv>
+
+    <!-- ****************************************************************** -->
 
     <tlv name="Cumulative Uplink Octets"
          type="249"
          decoder="WIMAXASNCP_TLV_BYTES">
     </tlv>
-	
-	<!-- ****************************************************************** -->
-	
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Cumulative Downlink Octets"
          type="250"
          decoder="WIMAXASNCP_TLV_BYTES">
     </tlv>
-	
+
     <!-- ****************************************************************** -->
-	
+
     <tlv name="Cumulative Uplink Packets"
          type="251"
          decoder="WIMAXASNCP_TLV_BYTES">
     </tlv>
-	
-	<!-- ****************************************************************** -->
-	
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Cumulative Downlink Packets"
          type="252"
          decoder="WIMAXASNCP_TLV_BYTES">
     </tlv>
-	
-	<!-- ****************************************************************** -->
-	
-    <tlv name="Uplink Octets at Tariff Switch"
-         type="257"
-         decoder="WIMAXASNCP_TLV_BYTES">
-   </tlv>
-   
-	<!-- ****************************************************************** -->
-	
-    <tlv name="Downlink Octets at Tariff Switch"
-         type="258"
-         decoder="WIMAXASNCP_TLV_BYTES">
-   </tlv>
-   
-	<!-- ****************************************************************** -->
-	
-    <tlv name="Uplink Packets at Tariff Switch"
-         type="259"
-         decoder="WIMAXASNCP_TLV_BYTES">
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Time of Day Tariff Switch"
+         type="253"
+         decoder="WIMAXASNCP_TLV_COMPOUND">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Time of Day Tariff Switch Time"
+         type="254"
+         decoder="WIMAXASNCP_TLV_HEX16">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Time of Day Tariff Switch Offset"
+         type="255"
+         decoder="WIMAXASNCP_TLV_DEC32">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Uplink Octets at Tariff Switch"
+         type="257"
+         decoder="WIMAXASNCP_TLV_BYTES">
+   </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Downlink Octets at Tariff Switch"
+         type="258"
+         decoder="WIMAXASNCP_TLV_BYTES">
    </tlv>
-   
-	<!-- ****************************************************************** -->
-	
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Uplink Packets at Tariff Switch"
+         type="259"
+         decoder="WIMAXASNCP_TLV_BYTES">
+   </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Downlink Packets at Tariff Switch"
          type="260"
          decoder="WIMAXASNCP_TLV_BYTES">
    </tlv>
-   
-	<!-- ****************************************************************** -->
-	
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Vendor Specific TLV"
+         type="261"
+         decoder="WIMAXASNCP_TLV_VENDOR_SPECIFIC">
+   </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Paging Preference"
          type="262"
          decoder="WIMAXASNCP_TLV_HEX8">
    </tlv>
-   
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Idle Mode Authorization Indication"
+         type="263"
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="Success"
+              code="0"/>
+
+        <enum name="Failure"
+              code="1"/>
+    </tlv>
+
     <!-- ****************************************************************** -->
 
     <tlv name="Accounting IP Address"
          type="264"
          decoder="WIMAXASNCP_TLV_IP_ADDRESS">
     </tlv>
-	
-	<!-- ****************************************************************** -->
+
+    <!-- ****************************************************************** -->
 
     <tlv name="Data Delivery Trigger"
          type="265"
          decoder="WIMAXASNCP_TLV_ENUM8">
-	 
+
         <enum name="No trigger"
               code="0x00"/>
-			  
+
         <enum name="Triggers immediate delivery of data for the specified Service Flow"
-              code="0x01"/>				  
+              code="0x01"/>
     </tlv>
-	
+
     <!-- ****************************************************************** -->
 
     <tlv name="MIP4 Security Info"
          type="266"
          decoder="WIMAXASNCP_TLV_COMPOUND">
     </tlv>
-	
+
     <!-- ****************************************************************** -->
 
     <tlv name="MN-FA Key Lifetime"
          type="267"
          decoder="WIMAXASNCP_TLV_DEC32">
     </tlv>
-	
+
     <!-- ****************************************************************** -->
 
     <tlv name="Idle Mode Timeout"
          type="268"
          decoder="WIMAXASNCP_TLV_DEC16">
     </tlv>
-	
+
     <!-- ****************************************************************** -->
 
     <tlv name="Classification Result"
          type="269"
          decoder="WIMAXASNCP_TLV_ENUM8">
-	 
+
         <enum name="None"
               code="0x00"/>
         <enum name="Discard packet"
-              code="0x01"/>	
+              code="0x01"/>
     </tlv>
-	
+
     <!-- ****************************************************************** -->
 
     <tlv name="Network assisted HO Supported"
          type="270"
          decoder="WIMAXASNCP_TLV_ENUM8">
-	 
+
         <enum name="Network Assisted HO not supported"
               code="0x00"/>
         <enum name="Network Assisted HO supported"
-              code="0x01"/>	
+              code="0x01"/>
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Destination Identifier"
+         type="271"
+         decoder="WIMAXASNCP_TLV_ID">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Source Identifier"
+         type="272"
+         decoder="WIMAXASNCP_TLV_ID">
     </tlv>
- 
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Ungraceful Network Exit Indication"
+         type="274"
+         decoder="WIMAXASNCP_TLV_ENUM8">
+
+        <enum name="Ungraceful Network Exit No Reason"
+              code="0x00"/>
+        <enum name="AAA initiated Ungraceful Network Exit"
+              code="0x01"/>
+        <enum name="Authenticator initiated Ungraceful Network Exit"
+              code="0x02"/>
+        <enum name="Ungraceful Network Exit by MIP session termination"
+              code="0x03"/>
+        <enum name="PC initiated Ungraceful Network Exit"
+              code="0x04"/>
+   </tlv>
+
     <!-- ****************************************************************** -->
 
     <tlv name="Duration Quota"
          type="275"
          decoder="WIMAXASNCP_TLV_DEC32">
    </tlv>
- 
+
    <!-- ****************************************************************** -->
 
     <tlv name="Duration Threshold"
          type="276"
          decoder="WIMAXASNCP_TLV_DEC32">
-	</tlv>	 
-		 	 
+    </tlv>
+
     <!-- ****************************************************************** -->
 
     <tlv name="Resource Quota"
          type="277"
          decoder="WIMAXASNCP_TLV_DEC32">
-   </tlv>	
+   </tlv>
 
     <!-- ****************************************************************** -->
 
@@ -2297,18 +2723,18 @@
          type="278"
          decoder="WIMAXASNCP_TLV_DEC32">
    </tlv>
-   
+
     <!-- ****************************************************************** -->
- 
+
     <tlv name="Update Reason"
          type="279"
          decoder="WIMAXASNCP_TLV_ENUM8">
-   		 
-	 
+
+
         <enum name="Pre-initialization"
               code="0x01"/>
         <enum name="Initial-Request"
-              code="0x02"/>	
+              code="0x02"/>
         <enum name="Threshold Reached"
               code="0x03"/>
         <enum name="Quota Reached"
@@ -2316,672 +2742,684 @@
         <enum name="TITSU Approaching"
               code="0x05"/>
         <enum name="Remote Forced Disconnect"
-              code="0x06"/>	
+              code="0x06"/>
         <enum name="Client Service Termination"
               code="0x07"/>
         <enum name="Access Service Terminatedt"
-              code="0x08"/>	
+              code="0x08"/>
         <enum name="Service not established"
               code="0x09"/>
         <enum name="One-time Charging"
-              code="0x0A"/>	
+              code="0x0A"/>
    </tlv>
-   
-	<!-- ****************************************************************** -->
-	
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Service-ID"
          type="280"
          decoder="WIMAXASNCP_TLV_BYTES">
-   </tlv>	
-   
-	<!-- ****************************************************************** -->
-	
+   </tlv>
+
+    <tlv name="Service-ID / R3 Media Flow Description in SDP format"
+         type="280"
+         decoder="WIMAXASNCP_TLV_BYTES"
+         since="2">
+   </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Rating-Group-ID"
          type="281"
          decoder="WIMAXASNCP_TLV_DEC32">
-   </tlv>	
-   
-    <!-- ****************************************************************** -->
- 
+   </tlv>
+
+    <tlv name="Rating-Group-ID / VolumeUsed"
+        type="281"
+        decoder="WIMAXASNCP_TLV_DEC32"
+        since="2">
+    </tlv>
+
+ <!-- ****************************************************************** -->
+
     <tlv name="Termination Action"
          type="282"
          decoder="WIMAXASNCP_TLV_ENUM8">
-	 
+
         <enum name="Terminate"
               code="0x01"/>
         <enum name="Request more quota"
-              code="0x02"/>	
+              code="0x02"/>
         <enum name="Redirect/Filter"
               code="0x03"/>
-   </tlv>	
-   
-	<!-- ****************************************************************** -->
-	
+   </tlv>
+
+    <tlv name="Termination Action / Time Stamp"
+         type="282"
+         decoder="WIMAXASNCP_TLV_DEC32"
+         since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Pool-ID"
          type="283"
          decoder="WIMAXASNCP_TLV_DEC32">
-   </tlv>	
-   
-	<!-- ****************************************************************** -->
-	
+   </tlv>
+
+    <tlv name="Pool-ID /  State /  Accounting Bulk Session/Flow Volume Counts"
+         type="283"
+         decoder="WIMAXASNCP_TLV_DEC32"
+        since="2">
+   </tlv>
+
+    <!-- ****************************************************************** -->
+
     <tlv name="Pool-Multiplier"
          type="284"
          decoder="WIMAXASNCP_TLV_DEC32">
    </tlv>
-   
+
+    <tlv name="Pool-Multiplier /  Offline Accounting Context"
+         type="284"
+         decoder="WIMAXASNCP_TLV_DEC32"
+        since="2">
+   </tlv>
+
     <!-- ****************************************************************** -->
 
     <tlv name="Prepaid Server"
          type="285"
          decoder="WIMAXASNCP_TLV_IP_ADDRESS">
     </tlv>
-	
-	<!-- ****************************************************************** -->
-  
-    <tlv name="Number of UL Transport CIDs Support" 
-		 type="288" 
-		 decoder="WIMAXASNCP_TLV_DEC16">
-	</tlv>
-  
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Number of DL Transport CIDs Support" 
-        type="289" 
-		decoder="WIMAXASNCP_TLV_DEC16">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
+
+    <tlv name="Prepaid Server /  R3 Acct Session Time"
+         type="285"
+         decoder="WIMAXASNCP_TLV_IP_ADDRESS"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="R3 Active Time"
+        type="286"
+        decoder="WIMAXASNCP_TLV_DEC32"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Interim Update Interval Remaining"
+        type="287"
+        decoder="WIMAXASNCP_TLV_DEC32"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Number of UL Transport CIDs Support"
+         type="288"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Number of DL Transport CIDs Support"
+        type="289"
+        decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
      <tlv name="Classification/PHS Options and SDU Encapsulation Support Type"
-		  type="290" 
-		  decoder="WIMAXASNCP_TLV_BYTES">
-	</tlv>
-	
+          type="290"
+          decoder="WIMAXASNCP_TLV_BYTES"
+          since="2">
+    </tlv>
+
     <!-- ****************************************************************** -->
-  
+
     <tlv name="Maximum Number of Classifier"
-		 type="291" 
-	     decoder="WIMAXASNCP_TLV_DEC16">
-	</tlv>
-	
+         type="291"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
     <!-- ****************************************************************** -->
-	
-    <tlv name="PHS Support" 
-		 type="292" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
+
+    <tlv name="PHS Support"
+         type="292"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
-	
+
     <!-- ****************************************************************** -->
-  
-    <tlv name="ARQ Support" 
-	     type="293" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
+
+    <tlv name="ARQ Support"
+         type="293"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
-	
+
    <!-- ****************************************************************** -->
-   
-    <tlv name="DSx Flow Control" 
-	     type="294" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
+
+    <tlv name="DSx Flow Control"
+         type="294"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
-	
-   <!-- ****************************************************************** -->
-   
-    <tlv name="Total Number of Provisioned Service Flows" 
-	     type="295" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-    </tlv>
-	
-    <!-- ****************************************************************** -->
-    
-	<tlv name="Maximum MAC Data per Frame Support" 
-         type="296" 
-	    decoder="WIMAXASNCP_TLV_COMPOUND">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Maximum amount of MAC Level Data per DL Frame" 
-	     type="297" 
-		 decoder="WIMAXASNCP_TLV_DEC16">
-    </tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Maximum amount of MAC Level Data per UL Frame" 
-	     type="298" 
-		 decoder="WIMAXASNCP_TLV_DEC16">
-    </tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Packing Support" 
-	     type="299" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-    <tlv name="MAC ertPS Support" 
-	     type="300" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Maximum Number of Bursts Transmitted Concurrently to the MS" 
-	     type="301" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-    </tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="HO Supported" 
-	     type="302" 
-		 decoder="WIMAXASNCP_TLV_HEX8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="HO Process Optimization MS Timer" 
-	     type="303" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Mobility Features Supported" 
-	     type="304" 
-		 decoder="WIMAXASNCP_TLV_HEX8">
-    </tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Sleep Mode Recovery Time" 
-	     type="305" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="ARQ Ack Type" 
-	     type="307" 
-		 decoder="WIMAXASNCP_TLV_HEX8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="MS HO Connections Parameters Proc Time" 
-	     type="308" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="MS HO TEK Proc Time" 
-	     type="309" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="MAC Header and Extended Sub-Header Support" 
-	     type="310" 
-		 decoder="WIMAXASNCP_TLV_BYTES">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="System Resource Retain Timer" 
-	     type="311" 
-		 decoder="WIMAXASNCP_TLV_DEC16">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-    <tlv name="MS Handover Retransmission Timer" 
-	     type="312" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Handover Indication Readiness Timer" 
-	     type="313" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="BS Switching Timer" 
-	     type="314" 
-		 decoder="WIMAXASNCP_TLV_HEX8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Power Saving Class Capability" 
-	     type="315" 
-		 decoder="WIMAXASNCP_TLV_HEX16">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Subscriber Transition Gaps" 
-	     type="316" 
-		 decoder="WIMAXASNCP_TLV_HEX16">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Maximum Transmit Power" 
-	     type="317" 
-		 decoder="WIMAXASNCP_TLV_HEX32">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Capabilities for Construction and Transmission of MAC PDUs" 
-	     type="318" 
-		 decoder="WIMAXASNCP_TLV_HEX8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="PKM Flow Control" 
-	     type="319" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Maximum Number of Supported Security Associations" 
-	     type="320" 
-		 decoder="WIMAXASNCP_TLV_DEC8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Security Negotiation Parameters" 
-	     type="321" 
-		 decoder="WIMAXASNCP_TLV_COMPOUND">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="MAC Mode" 
-	     type="323" 
-		 decoder="WIMAXASNCP_TLV_HEX8">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="PN Window Size" 
-	     type="324" 
-		 decoder="WIMAXASNCP_TLV_DEC16">
-	</tlv>
-	
-    <!-- ****************************************************************** -->
-	
-    <tlv name="Extended Subheader Capability" 
-	     type="325" 
-		 decoder="WIMAXASNCP_TLV_HEX8">
-	</tlv>
 
    <!-- ****************************************************************** -->
 
-    <tlv name="HO Trigger Metric Support"
-         type="326"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="Total Number of Provisioned Service Flows"
+         type="295"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Current Transmit Power"
-         type="327"
-         decoder="WIMAXASNCP_TLV_DEC8">
+    <tlv name="Maximum MAC Data per Frame Support"
+         type="296"
+        decoder="WIMAXASNCP_TLV_COMPOUND"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS FFT Sizes"
-         type="328"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="Maximum amount of MAC Level Data per DL Frame"
+         type="297"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS demodulator"
-         type="329"
-         decoder="WIMAXASNCP_TLV_BYTES">
+    <tlv name="Maximum amount of MAC Level Data per UL Frame"
+         type="298"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS modulator"
-         type="330"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="Packing Support"
+         type="299"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
+    <tlv name="MAC ertPS Support"
+         type="300"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
+    </tlv>
 
-    <tlv name="The number of UL HARQ Channel"
-         type="331"
-         decoder="WIMAXASNCP_TLV_DEC8">
+    <!-- ****************************************************************** -->
+
+    <tlv name="Maximum Number of Bursts Transmitted Concurrently to the MS"
+         type="301"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS Permutation support"
-         type="332"
-         decoder="WIMAXASNCP_TLV_DEC8">
+    <tlv name="HO Supported"
+         type="302"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS CINR Measurement Capability"
-         type="333"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="HO Process Optimization MS Timer"
+         type="303"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="The number of DL HARQ Channels"
-         type="334"
-         decoder="WIMAXASNCP_TLV_DEC8">
+    <tlv name="Mobility Features Supported"
+         type="304"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="HARQ Chase Combining and CC-IR Buffer Capability"
-         type="335"
-         decoder="WIMAXASNCP_TLV_HEX16">
+    <tlv name="Sleep Mode Recovery Time"
+         type="305"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS Uplink Power Control Support"
-         type="336"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="ARQ Ack Type"
+         type="307"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS Uplink Power Control Scheme Switching Delay"
-         type="337"
-         decoder="WIMAXASNCP_TLV_DEC8">
+    <tlv name="MS HO Connections Parameters Proc Time"
+         type="308"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA MAP Capability"
-         type="338"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="MS HO TEK Proc Time"
+         type="309"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Uplink Control Channel Support"
-         type="339"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="MAC Header and Extended Sub-Header Support"
+         type="310"
+         decoder="WIMAXASNCP_TLV_BYTES"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA MS CSIT Capability"
-         type="340"
-         decoder="WIMAXASNCP_TLV_HEX16">
+    <tlv name="System Resource Retain Timer"
+         type="311"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+    <tlv name="MS Handover Retransmission Timer"
+         type="312"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Maximum Number of Burst per Frame Capability in HARQ"
-         type="341"
-         decoder="WIMAXASNCP_TLV_DEC8">
+    <tlv name="Handover Indication Readiness Timer"
+         type="313"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS demodulator for MIMO Support"
-         type="342"
-         decoder="WIMAXASNCP_TLV_BYTES">
+    <tlv name="BS Switching Timer"
+         type="314"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="OFDMA SS modulator for MIMO Support"
-         type="343"
-         decoder="WIMAXASNCP_TLV_HEX16">
+    <tlv name="Power Saving Class Capability"
+         type="315"
+         decoder="WIMAXASNCP_TLV_HEX16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ Context"
-         type="344"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+    <tlv name="Subscriber Transition Gaps"
+         type="316"
+         decoder="WIMAXASNCP_TLV_HEX16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ Enable"
-         type="345"
-	 decoder="WIMAXASNCP_TLV_ENUM8">
-	 
-        <enum name="ARQ Not Requested/Accepted"
-              code="0"/>
+    <tlv name="Maximum Transmit Power"
+         type="317"
+         decoder="WIMAXASNCP_TLV_HEX32"
+        since="2">
+    </tlv>
 
-        <enum name="ARQ Requested/Accepted"
-              code="1"/>
+    <!-- ****************************************************************** -->
+
+    <tlv name="Capabilities for Construction and Transmission of MAC PDUs"
+         type="318"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ WINDOW SIZE"
-         type="346"
-         decoder="WIMAXASNCP_TLV_DEC16">
+    <tlv name="PKM Flow Control"
+         type="319"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ_RETRY_TIMEOUT-Transmitter Delay"
-         type="347"
-         decoder="WIMAXASNCP_TLV_DEC16">
+    <tlv name="Maximum Number of Supported Security Associations"
+         type="320"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ_RETRY_TIMEOUT-Receiver Delay"
-         type="348"
-         decoder="WIMAXASNCP_TLV_DEC16">
+    <tlv name="Security Negotiation Parameters"
+         type="321"
+         decoder="WIMAXASNCP_TLV_COMPOUND"
+        since="2">
     </tlv>
 
+    <!-- ****************************************************************** -->
+
+    <tlv name="Authorization Policy"
+         type="322"
+         decoder="WIMAXASNCP_TLV_BITFLAGS8"
+        since="2">
+
+        <enum name="RSA-based authorization at the initial network entry"
+              code="WIMAXASNCP_BIT8(7)"/>
+
+        <enum name="EAP-based authorization at the initial network entry"
+              code="WIMAXASNCP_BIT8(6)"/>
+
+        <enum name="Authenticated EAP-based authorization at the initial network entry"
+              code="WIMAXASNCP_BIT8(5)"/>
+
+        <enum name="Reserved (was: HMAC supported)"
+              code="WIMAXASNCP_BIT8(4)"/>
+
+        <enum name="RSA-based authorization at reentry"
+              code="WIMAXASNCP_BIT8(3)"/>
+
+        <enum name="EAP-based authorization at reentry"
+              code="WIMAXASNCP_BIT8(2)"/>
+
+        <enum name="Authenticated EAP-based authorization at reentry"
+              code="WIMAXASNCP_BIT8(1)"/>
+
+        <enum name="Reserved"
+              code="WIMAXASNCP_BIT8(0)"/>
+
+    </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ_BLOCK_LIFETIME"
-         type="349"
-         decoder="WIMAXASNCP_TLV_DEC16">
+    <tlv name="MAC Mode"
+         type="323"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
+    <!-- ****************************************************************** -->
+
+    <tlv name="PN Window Size"
+         type="324"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ_SYNC_LOSS_TIMEOUT"
-         type="350"
-         decoder="WIMAXASNCP_TLV_DEC16">
+    <tlv name="Extended Subheader Capability"
+         type="325"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
+    </tlv>
+
+   <!-- ****************************************************************** -->
+
+    <tlv name="HO Trigger Metric Support"
+         type="326"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ_DELIVER_IN_ORDER"
-         type="351"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="Current Transmit Power"
+         type="327"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ_RX_PURGE_TIMEOUT"
-         type="352"
-         decoder="WIMAXASNCP_TLV_DEC16">
+    <tlv name="OFDMA SS FFT Sizes"
+         type="328"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="ARQ_BLOCK_SIZE"
-         type="353"
-         decoder="WIMAXASNCP_TLV_DEC16">
+    <tlv name="OFDMA SS demodulator"
+         type="329"
+         decoder="WIMAXASNCP_TLV_BYTES"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="RECEIVER_ARQ_ACK_PROCESSING TIME"
-         type="354"
-         decoder="WIMAXASNCP_TLV_HEX8">
+    <tlv name="OFDMA SS modulator"
+         type="330"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="State"
-         type="355"
-         decoder="WIMAXASNCP_TLV_BYTES">
+    <tlv name="The number of UL HARQ Channel"
+         type="331"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="R3 Media Flow Description in SDP format"
-         type="356"
-         decoder="WIMAXASNCP_TLV_BYTES">
+    <tlv name="OFDMA SS Permutation support"
+         type="332"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="VolumeUsed"
-         type="357"
-         decoder="WIMAXASNCP_TLV_DEC32">
+    <tlv name="OFDMA SS CINR Measurement Capability"
+         type="333"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Time Stamp"
-         type="358"
-         decoder="WIMAXASNCP_TLV_DEC32">
+    <tlv name="The number of DL HARQ Channels"
+         type="334"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Accounting Bulk Session Flow Volume Counts"
-         type="359"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+    <tlv name="HARQ Chase Combining and CC-IR Buffer Capability"
+         type="335"
+         decoder="WIMAXASNCP_TLV_HEX16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Offline Accounting Context"
-         type="360"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+    <tlv name="OFDMA SS Uplink Power Control Support"
+         type="336"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="HO Authorization policy support"
-         type="367"
-	 decoder="WIMAXASNCP_TLV_ENUM8">
-	 	 	 
-        <enum name="RSA authorization"
-              code="0x00"/>
+    <tlv name="OFDMA SS Uplink Power Control Scheme Switching Delay"
+         type="337"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
+    </tlv>
 
-        <enum name="EAP authorization"
-              code="0x01"/>
-	 	 
-        <enum name="HMAC supported"
-              code="0x08"/>
+    <!-- ****************************************************************** -->
 
-        <enum name="CMAC supported"
-              code="0x10"/>
-	 	 
-        <enum name="64-bit Short-HMAC"
-              code="0x20"/>
+    <tlv name="OFDMA MAP Capability"
+         type="338"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
+    </tlv>
 
-        <enum name="MS in Idle Mode"
-              code="1"/>
-	 	 
-        <enum name="80-bit Short-HMAC"
-              code="0x40"/>
+    <!-- ****************************************************************** -->
 
-        <enum name="96-bit Short-HMAC"
-              code="0x80"/>
+    <tlv name="Uplink Control Channel Support"
+         type="339"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
+    </tlv>
 
+    <!-- ****************************************************************** -->
+
+    <tlv name="OFDMA MS CSIT Capability"
+         type="340"
+         decoder="WIMAXASNCP_TLV_HEX16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="NSP ID"
-         type="368"
-         decoder="WIMAXASNCP_TLV_BYTES">
+    <tlv name="Maximum Number of Burst per Frame Capability in HARQ"
+         type="341"
+         decoder="WIMAXASNCP_TLV_DEC8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Idle Mode Exit Indicator"
-         type="369"
-	 decoder="WIMAXASNCP_TLV_ENUM8">
-	 	 
-        <enum name="Idle Mode Exit"
-              code="0"/>
+    <tlv name="OFDMA SS demodulator for MIMO Support"
+         type="342"
+         decoder="WIMAXASNCP_TLV_BYTES"
+        since="2">
+    </tlv>
 
-        <enum name="MS in Idle Mode"
-              code="1"/>
+    <!-- ****************************************************************** -->
+
+    <tlv name="OFDMA SS modulator for MIMO Support"
+         type="343"
+         decoder="WIMAXASNCP_TLV_HEX16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="FA Security Infop"
-         type="372"
-         decoder="WIMAXASNCP_TLV_COMPOUND">
+    <tlv name="ARQ Context"
+         type="344"
+         decoder="WIMAXASNCP_TLV_COMPOUND"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Control Plane Indicator"
-         type="1136"
-         decoder="WIMAXASNCP_TLV_ENUM8">
+    <tlv name="ARQ Enable"
+         type="345"
+         decoder="WIMAXASNCP_TLV_ENUM8"
+        since="2">
 
-        <enum name="Success"
+        <enum name="ARQ Not Requested/Accepted"
               code="0"/>
 
-        <enum name="Failure"
+        <enum name="ARQ Requested/Accepted"
               code="1"/>
+
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="IM Auth Indication"
-         type="1228"
-         decoder="WIMAXASNCP_TLV_ENUM8">
+    <tlv name="ARQ WINDOW SIZE"
+         type="346"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
 
-        <enum name="Success"
-              code="0"/>
+    <!-- ****************************************************************** -->
 
-        <enum name="Failure"
-              code="1"/>
+    <tlv name="ARQ_RETRY_TIMEOUT-Transmitter Delay"
+         type="347"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Source Identifier"
-         type="0xff01"
-         decoder="WIMAXASNCP_TLV_ID">
+    <tlv name="ARQ_RETRY_TIMEOUT-Receiver Delay"
+         type="348"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
     </tlv>
 
+
     <!-- ****************************************************************** -->
 
-    <tlv name="Destination Identifier"
-         type="0xff02"
-         decoder="WIMAXASNCP_TLV_ID">
+    <tlv name="ARQ_BLOCK_LIFETIME"
+         type="349"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="ARQ_SYNC_LOSS_TIMEOUT"
+         type="350"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="ARQ_DELIVER_IN_ORDER"
+         type="351"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
     </tlv>
 
     <!-- ****************************************************************** -->
 
-    <tlv name="Vendor Specific"
+    <tlv name="ARQ_RX_PURGE_TIMEOUT"
+         type="352"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="ARQ_BLOCK_SIZE"
+         type="353"
+         decoder="WIMAXASNCP_TLV_DEC16"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="RECEIVER_ARQ_ACK_PROCESSING TIME"
+         type="354"
+         decoder="WIMAXASNCP_TLV_HEX8"
+        since="2">
+    </tlv>
+
+    <!-- ****************************************************************** -->
+
+    <tlv name="Vendor Specific Information Field"
          type="0xffff"
          decoder="WIMAXASNCP_TLV_VENDOR_SPECIFIC">
     </tlv>
+
 </dictionary>
+
-- 
cgit v1.2.3