Give unique names to a bunch of reserved, experimental, etc., AVPs.

Also remove a bunch of AVPs that are unassigned/unallocated--there's no
real benefit to telling users that...

Change-Id: I1b18a11a1b65189d21520c74aae3dde77688e592
Reviewed-on: https://code.wireshark.org/review/15895
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 86 insertions, 411 deletions

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index b8bcaf2fd8..0a17455323 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -777,9 +777,7 @@
 		<avp name="Login-TCP-Port" code="16" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
 			<type type-name="Unsigned32"/>
 		</avp>
-		<avp name="Unassigned" code="17" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVP 17 unassigned -->
 		<avp name="Reply-Message" code="18" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
 			<type type-name="UTF8String"/>
 		</avp>
@@ -789,9 +787,7 @@
 		<avp name="Callback-Id" code="20" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
 			<type type-name="UTF8String"/>
 		</avp>
-		<avp name="Unassigned" code="21" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVP 21 unassigned -->
 		<avp name="Framed-Route" code="22" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
 			<type type-name="UTF8String"/>
 		</avp>
@@ -936,9 +932,7 @@
 		<avp name="Acct-Output-Gigawords" code="53" mandatory="may">
 			<type type-name="Integer32"/>
 		</avp>
-		<avp name="Unassigned" code="54" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVP 54 unassigned -->
 		<avp name="Event-Timestamp" code="55" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="mustnot">
 			<type type-name="Time"/>
 		</avp>
@@ -1125,9 +1119,7 @@
 		<avp name="NAS-Filter-Rule" code="92" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="mustnot">
 			<type type-name="UTF8String"/>
 		</avp>
-		<avp name="Unassigned" code="93" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVP 93 unassigned -->
 		<avp name="Originating-Line-Info" code="94" mandatory="may" may-encrypt="yes" protected="may" vendor-bit="mustnot">
 			<type type-name="OctetString"/>
 		</avp>
@@ -1308,355 +1300,210 @@
 		<avp name="PKM-Auth-Key" code="143" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Unassigned" code="144" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="145" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="146" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="147" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="148" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="149" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="150" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="151" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="152" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="153" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="154" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="155" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="156" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="157" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="158" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="159" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="160" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="161" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="162" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="163" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="164" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="165" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="166" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="167" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="168" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="169" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="170" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="171" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="172" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="173" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="174" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="175" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="176" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="177" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="178" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="179" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="180" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="181" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="182" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="183" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="184" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="185" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="186" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="187" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="188" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="189" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="190" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="191" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVPs 144-191 unassigned -->
 
 		<!-- 192-223   Experimental Use	[RFC3575] -->
-		<avp name="Experimental-Use" code="192" mandatory="may">
+		<avp name="Experimental-Use-192" code="192" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="193" mandatory="may">
+		<avp name="Experimental-Use-193" code="193" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="194" mandatory="may">
+		<avp name="Experimental-Use-194" code="194" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="195" mandatory="may">
+		<avp name="Experimental-Use-195" code="195" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="196" mandatory="may">
+		<avp name="Experimental-Use-196" code="196" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="197" mandatory="may">
+		<avp name="Experimental-Use-197" code="197" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="198" mandatory="may">
+		<avp name="Experimental-Use-198" code="198" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="199" mandatory="may">
+		<avp name="Experimental-Use-199" code="199" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="200" mandatory="may">
+		<avp name="Experimental-Use-200" code="200" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="201" mandatory="may">
+		<avp name="Experimental-Use-201" code="201" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="202" mandatory="may">
+		<avp name="Experimental-Use-202" code="202" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="203" mandatory="may">
+		<avp name="Experimental-Use-203" code="203" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="204" mandatory="may">
+		<avp name="Experimental-Use-204" code="204" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="205" mandatory="may">
+		<avp name="Experimental-Use-205" code="205" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="206" mandatory="may">
+		<avp name="Experimental-Use-206" code="206" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="207" mandatory="may">
+		<avp name="Experimental-Use-207" code="207" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="208" mandatory="may">
+		<avp name="Experimental-Use-208" code="208" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="209" mandatory="may">
+		<avp name="Experimental-Use-209" code="209" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="210" mandatory="may">
+		<avp name="Experimental-Use-210" code="210" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="211" mandatory="may">
+		<avp name="Experimental-Use-211" code="211" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="212" mandatory="may">
+		<avp name="Experimental-Use-212" code="212" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="213" mandatory="may">
+		<avp name="Experimental-Use-213" code="213" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="214" mandatory="may">
+		<avp name="Experimental-Use-214" code="214" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="215" mandatory="may">
+		<avp name="Experimental-Use-215" code="215" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="216" mandatory="may">
+		<avp name="Experimental-Use-216" code="216" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="217" mandatory="may">
+		<avp name="Experimental-Use-217" code="217" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="218" mandatory="may">
+		<avp name="Experimental-Use-218" code="218" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="219" mandatory="may">
+		<avp name="Experimental-Use-219" code="219" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="220" mandatory="may">
+		<avp name="Experimental-Use-220" code="220" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="221" mandatory="may">
+		<avp name="Experimental-Use-221" code="221" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="222" mandatory="may">
+		<avp name="Experimental-Use-222" code="222" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Experimental-Use" code="223" mandatory="may">
+		<avp name="Experimental-Use-223" code="223" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
 
 		<!-- 224-240   Implementation Specific	[RFC3575] -->
-		<avp name="Implementation-Specific" code="224" mandatory="may">
+		<avp name="Implementation-Specific-224" code="224" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="225" mandatory="may">
+		<avp name="Implementation-Specific-225" code="225" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="226" mandatory="may">
+		<avp name="Implementation-Specific-226" code="226" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="227" mandatory="may">
+		<avp name="Implementation-Specific-227" code="227" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="228" mandatory="may">
+		<avp name="Implementation-Specific-228" code="228" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="229" mandatory="may">
+		<avp name="Implementation-Specific-229" code="229" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="230" mandatory="may">
+		<avp name="Implementation-Specific-230" code="230" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="231" mandatory="may">
+		<avp name="Implementation-Specific-231" code="231" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="232" mandatory="may">
+		<avp name="Implementation-Specific-232" code="232" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="233" mandatory="may">
+		<avp name="Implementation-Specific-233" code="233" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="234" mandatory="may">
+		<avp name="Implementation-Specific-234" code="234" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="235" mandatory="may">
+		<avp name="Implementation-Specific-235" code="235" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="236" mandatory="may">
+		<avp name="Implementation-Specific-236" code="236" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="237" mandatory="may">
+		<avp name="Implementation-Specific-237" code="237" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="238" mandatory="may">
+		<avp name="Implementation-Specific-238" code="238" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="239" mandatory="may">
+		<avp name="Implementation-Specific-239" code="239" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Implementation-Specific" code="240" mandatory="may">
+		<avp name="Implementation-Specific-240" code="240" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
 
 		<!--241-255   Reserved	[RFC3575] -->
-		<avp name="Reserved" code="241" mandatory="may">
+		<avp name="Reserved-241" code="241" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="242" mandatory="may">
+		<avp name="Reserved-242" code="242" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="243" mandatory="may">
+		<avp name="Reserved-243" code="243" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="244" mandatory="may">
+		<avp name="Reserved-244" code="244" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="245" mandatory="may">
+		<avp name="Reserved-245" code="245" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="246" mandatory="may">
+		<avp name="Reserved-246" code="246" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="247" mandatory="may">
+		<avp name="Reserved-247" code="247" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="248" mandatory="may">
+		<avp name="Reserved-248" code="248" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="249" mandatory="may">
+		<avp name="Reserved-249" code="249" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="250" mandatory="may">
+		<avp name="Reserved-250" code="250" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="251" mandatory="may">
+		<avp name="Reserved-251" code="251" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="252" mandatory="may">
+		<avp name="Reserved-252" code="252" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="253" mandatory="may">
+		<avp name="Reserved-253" code="253" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="254" mandatory="may">
+		<avp name="Reserved-254" code="254" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="255" mandatory="may">
+		<avp name="Reserved-255" code="255" mandatory="may">
 			<type type-name="OctetString"/>
 		</avp>
 
 		<!-- ************************************************************************ -->
 		<!-- ******************* DIAMETER BASE PROTOCOL AVPS ************************ -->
 		<!-- ************************************************************************ -->
-		<avp name="Unassigned" code="256" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVP 256 unassigned -->
 		<avp name="Host-IP-Address" code="257" mandatory="must" protected="may" may-encrypt="no" vendor-bit="mustnot">
 			<type type-name="IPAddress"/>
 		</avp>
@@ -1863,22 +1710,11 @@
 			<enum name="AUTHORIZE_ONLY" code="0"/>
 			<enum name="AUTHORIZE_AUTHENTICATE" code="1"/>
 		</avp>
-		<avp name="Unassigned" code="286" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVP 286 unassigned -->
 		<avp name="Accounting-Sub-Session-Id" code="287" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="mustnot">
 			<type type-name="Unsigned64"/>
 		</avp>
 		<!-- 288-290    Unallocated http://www.iana.org/assignments/aaa-parameters  -->
-		<avp name="Unallocated" code="288" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="289" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="290" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
 		<avp name="Authorization-Lifetime" code="291" mandatory="must" may-encrypt="no" vendor-bit="mustnot">
 			<type type-name="Integer32"/>
 		</avp>
@@ -2107,57 +1943,6 @@
 			</grouped>
 		</avp>
 		<!-- 301-317    Unallocated -->
-		<avp name="Unallocated" code="301" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="302" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="303" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="304" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="305" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="306" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="307" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="308" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="309" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="310" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="311" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="312" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="313" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="314" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="315" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="316" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unallocated" code="317" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
 
 		<!-- AVPs 318 - 348 belong to Diameter Mobile IPv4 Application and are defined in mobileipv4.xml
 		318 MIP-FA-to-HA-SPI [RFC4004]
@@ -2192,48 +1977,7 @@
 		348 MIP-Home-Agent-Host [RFC4004]
 		-->
 
-		<avp name="Unassigned" code="349" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="350" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="351" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="352" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="353" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="354" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="355" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="356" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="357" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="358" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="359" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="360" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="361" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="362" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVPs 349-362 unassigned -->
 
 		<!-- AVPs 368 - 393 are in sip.xml
 		363 Accounting-Input-Octets [RFC4005][RFC4004]
@@ -2269,24 +2013,7 @@
 		393 SIP-Method [RFC4740]
 		-->
 
-		<avp name="Unassigned" code="394" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="395" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="396" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="397" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="398" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="399" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVPs 394-399 unassigned -->
 
 		<!-- AVPs 400 - 408 are defined in nasreq.xml
 		400 NAS-Filter-Rule [RFC4005]
@@ -2300,12 +2027,7 @@
 		408 Origin-AAA-Protocol [RFC4005]
 		-->
 
-		<avp name="Unassigned" code="409" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="410" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVPs 409-410 unassigned -->
 
 		<!-- AVPs 411 - 461 belong to Charge Control and are defined in chargecontrol.xml
 		411 CC-Correlation-Id [RFC4006]
@@ -2378,48 +2100,8 @@
 		465 Accounting-EAP-Auth-Method [RFC4072]
 		-->
 
-		<avp name="Unassigned" code="466" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="467" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="468" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="469" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="470" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="471" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="472" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="473" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="474" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="475" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="476" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="477" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="478" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="479" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVPs 466-479 unassigned -->
+
 		<avp name="Accounting-Record-Type" code="480" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
 			<type type-name="Enumerated"/>
 			<enum name="Event Record" code="1"/>
@@ -2428,12 +2110,7 @@
 			<enum name="Stop Record" code="4"/>
 		</avp>
 
-		<avp name="Unassigned" code="481" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
-		<avp name="Unassigned" code="482" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVPs 481-482 unassigned -->
 
 		<avp name="Accounting-Realtime-Required" code="483" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
 			<type type-name="Enumerated"/>
@@ -2442,9 +2119,7 @@
 			<enum name="GRANT_AND_STORE" code="2"/>
 			<enum name="GRANT_AND_LOSE" code="3"/>
 		</avp>
-		<avp name="Unassigned" code="484" mandatory="may">
-			<type type-name="OctetString"/>
-		</avp>
+		<!-- AVP 484 unassigned -->
 		<avp name="Accounting-Record-Number" code="485" mandatory="must" may-encrypt="yes" vendor-bit="mustnot">
 			<type type-name="Unsigned32"/>
 		</avp>
@@ -6066,7 +5741,7 @@
 
 		<!-- Note: The AVP codes from 2067 to 2099 are reserved for TS 32.299 -->
 
-		<avp name="Reserved" code="2100" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2100" code="2100" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
 		<avp name="Application-Server-ID" code="2101" vendor-bit="must" vendor-id="TGPP">
@@ -6087,19 +5762,19 @@
 		<avp name="Delivery-Status" code="2104" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="UTF8String"/>
 		</avp>
-		<avp name="Reserved" code="2105" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2105" code="2105" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="2106" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2106" code="2106" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="2107" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2107" code="2107" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="2108" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2108" code="2108" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
-		<avp name="Reserved" code="2109" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2109" code="2109" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
 		<avp name="IM-Information" code="2110" vendor-bit="must" vendor-id="TGPP">
@@ -6151,7 +5826,7 @@
 		Note: The AVP codes from 2200 to 2299 are reserved for TS 29.215 (TGPP.xml)
 		-->
 
-		<avp name="Reserved" code="2300" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2300" code="2300" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
 		<avp name="SIP-Request-Timestamp-Fraction" code="2301" vendor-bit="must" vendor-id="TGPP">
@@ -6440,7 +6115,7 @@
 		2600 reserved -
 		-->
 
-		<avp name="Reserved" code="2600" mandatory="must" vendor-bit="must" vendor-id="TGPP">
+		<avp name="Reserved-2600" code="2600" mandatory="must" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="OctetString"/>
 		</avp>
 		<avp name="IMS-Application-Reference-Identifier" code="2601" mandatory="must" vendor-bit="must" vendor-id="TGPP">