import 3GPP DIAMETER related definitions from travelping/erggw_aaa

There are some dependencies of TS 29.272 which we can inherit from
https://github.com/travelping/ergw_aaa

The version used was from git commit a5d5a93e2ef87f4168c676ee9a6d8300beb729d8
diff --git a/dia/diameter_3gpp_base.dia b/dia/diameter_3gpp_base.dia
new file mode 100644
index 0000000..67e15af
--- /dev/null
+++ b/dia/diameter_3gpp_base.dia
@@ -0,0 +1,71 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+;;
+;; Edits:
+;;
+;; - Ipv6   -> IPv6
+;;
+
+@id     0
+@name   diameter_3gpp_base
+@prefix diameter_3gpp
+@vendor 10415 3GPP
+
+;; only attributes required by other applications are defined
+
+@avp_types
+
+   3GPP-IMSI                        1      UTF8String     V
+   3GPP-Charging-Id                 2     OctetString     V
+   3GPP-PDP-Type                    3      Enumerated     V
+   3GPP-CG-Address                  4     OctetString     V
+   3GPP-GPRS-Negotiated-QoS-Profile 5      UTF8String     V
+   3GPP-SGSN-Address                6     OctetString     V
+   3GPP-GGSN-Address                7     OctetString     V
+   3GPP-IMSI-MCC-MNC                8      UTF8String     V
+   3GPP-GGSN-MCC-MNC                9      UTF8String     V
+   3GPP-NSAPI                       10    OctetString     V
+   3GPP-Session-Stop-Indicator      11    OctetString     V
+   3GPP-Selection-Mode              12     UTF8String     V
+   3GPP-Charging-Characteristics    13     UTF8String     V
+   3GPP-CG-IPv6-Address             14    OctetString     V
+   3GPP-SGSN-IPv6-Address           15    OctetString     V
+   3GPP-GGSN-IPv6-Address           16    OctetString     V
+   3GPP-IPv6-DNS-Servers            17    OctetString     V
+   3GPP-SGSN-MCC-MNC                18     UTF8String     V
+   3GPP-IMEISV                      20    OctetString     V
+   3GPP-RAT-Type                    21    OctetString     V
+   3GPP-User-Location-Info          22    OctetString     V
+   3GPP-MS-TimeZone                 23    OctetString     V
+   3GPP-CAMEL-Charging-Info         24    OctetString     V
+   3GPP-Packet-Filter               25    OctetString     V
+   3GPP-Negotiated-DSCP             26    OctetString     V
+   3GPP-Allocate-IP-Type            27    OctetString     V
+   TWAN-Identifier                  29    OctetString     V
+   3GPP-User-Location-Info-Time     30    OctetString     V
+
+@enum 3GPP-PDP-Type
+
+   IPv4                                               0
+   PPP                                                1
+   IPv6                                               2
+   IPv4v6                                             3
+   Non-IP                                             4
diff --git a/dia/diameter_3gpp_ts29_061_gmb.dia b/dia/diameter_3gpp_ts29_061_gmb.dia
new file mode 100644
index 0000000..c1345d6
--- /dev/null
+++ b/dia/diameter_3gpp_ts29_061_gmb.dia
@@ -0,0 +1,61 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+;;
+;; Edits:
+;;
+;; - Ipv6   -> IPv6
+;;
+
+@id     16777223
+@name   diameter_3gpp_ts29_061_gmb
+@prefix diameter_gmb
+@vendor 10415 3GPP
+
+@inherits diameter_gen_base_rfc6733
+@inherits diameter_3gpp_base
+
+;; only attributes required by other applications are defined
+
+@avp_types
+
+   TMGI                              900   OctetString    MV
+   Required-MBMS-Bearer-Capabilities 901    UTF8String    MV
+   MBMS-StartStop-Indication         902    Enumerated    MV
+   MBMS-Service-Area                 903   OctetString    MV
+   MBMS-Session-Duration             904   OctetString    MV
+   Alternative-APN                   905    UTF8String    MV
+   MBMS-Service-Type                 906    Enumerated    MV
+   MBMS-2G-3G-Indicator              907    Enumerated    M
+   MBMS-Session-Identity             908   OctetString    MV
+   RAI                               909    UTF8String    M
+   Additional-MBMS-Trace-Info        910   OctetString    MV
+   MBMS-Time-To-Data-Transfer        911   OctetString    MV
+   MBMS-Session-Repetition-Number    912   OctetString    MV
+   MBMS-Required-QoS                 913    UTF8String    MV
+   MBMS-Counting-Information         914    Enumerated    MV
+   MBMS-User-Data-Mode-Indication    915    Enumerated    MV
+   MBMS-GGSN-Address                 916   OctetString    MV
+   MBMS-GGSN-IPv6-Address            917   OctetString    MV
+   MBMS-BMSC-SSM-IP-Address          918   OctetString    MV
+   MBMS-BMSC-SSM-IPv6-Address        919   OctetString    MV
+   MBMS-Flow-Identifier              920   OctetString    MV
+   CN-IP-Multicast-Distribution      921    Enumerated    MV
+   MBMS-HC-Indicator                 922    Enumerated    MV
diff --git a/dia/diameter_3gpp_ts29_212.dia b/dia/diameter_3gpp_ts29_212.dia
new file mode 100644
index 0000000..94c7379
--- /dev/null
+++ b/dia/diameter_3gpp_ts29_212.dia
@@ -0,0 +1,817 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+;;
+;; Edits:
+;;
+;; - Ipv6   -> IPv6
+;;
+
+@id     16777238
+@name   diameter_3gpp_ts29_212
+@prefix diameter_gx
+@vendor 10415 3GPP
+
+@inherits diameter_gen_base_rfc6733
+@inherits diameter_rfc4005_nasreq
+@inherits diameter_rfc4006_cc
+@inherits diameter_3gpp_base
+@inherits diameter_etsi_es283_034
+@inherits diameter_3gpp_ts29_061_gmb
+@inherits diameter_3gpp_ts29_214
+@inherits diameter_3gpp_ts29_229
+
+@avp_types
+
+   Access-Network-Charging-Identifier-Gx 1022           Grouped      MV
+   Allocation-Retention-Priority         1034           Grouped       V
+   AN-GW-Address                         1050           Address       V
+   AN-GW-Status                          2811        Enumerated       V
+   APN-Aggregate-Max-Bitrate-DL          1040        Unsigned32       V
+   APN-Aggregate-Max-Bitrate-UL          1041        Unsigned32       V
+   Application-Detection-Information     1098           Grouped       V
+   Bearer-Control-Mode                   1023        Enumerated      MV
+   Bearer-Identifier                     1020       OctetString      MV
+   Bearer-Operation                      1021        Enumerated      MV
+   Bearer-Usage                          1000        Enumerated      MV
+   Charging-Correlation-Indicator        1073        Enumerated       V
+   Charging-Rule-Base-Name               1004        UTF8String      MV
+   Charging-Rule-Definition              1003           Grouped      MV
+   Charging-Rule-Install                 1001           Grouped      MV
+   Charging-Rule-Name                    1005       OctetString      MV
+   Charging-Rule-Remove                  1002           Grouped      MV
+   Charging-Rule-Report                  1018           Grouped      MV
+   CoA-Information                       1039           Grouped       V
+   CoA-IP-Address                        1035           Address       V
+   Conditional-APN-Aggregate-Max-Bitrate 2818           Grouped       V
+   Credit-Management-Status              1082        Unsigned32       V
+   CSG-Information-Reporting             1071        Enumerated       V
+   Default-EPS-Bearer-QoS                1049           Grouped       V
+   Default-QoS-Information               2816           Grouped       V
+   Default-QoS-Name                      2817        UTF8String       V
+   Event-Report-Indication               1033           Grouped       V
+   Event-Trigger                         1006        Enumerated      MV
+   Flow-Direction                        1080        Enumerated       V
+   Flow-Information                      1058           Grouped       V
+   Flow-Label                            1057       OctetString       V
+   Fixed-User-Location-Info              2825           Grouped       V
+   Guaranteed-Bitrate-DL                 1025        Unsigned32      MV
+   Guaranteed-Bitrate-UL                 1026        Unsigned32      MV
+   HeNB-Local-IP-Address                 2804           Address       V
+   IP-CAN-Session-Charging-Scope         2827        Enumerated       V
+   IP-CAN-Type                           1027        Enumerated      MV
+   Metering-Method                       1007        Enumerated      MV
+   Monitoring-Key                        1066       OctetString       V
+   Mute-Notification                     2809        Enumerated       V
+   Monitoring-Time                       2810              Time       V
+   NetLoc-Access-Support                 2824        Unsigned32       V
+   Network-Request-Support               1024        Enumerated      MV
+   Offline                               1008        Enumerated      MV
+   Online                                1009        Enumerated      MV
+   Packet-Filter-Content                 1059      IPFilterRule       V
+   Packet-Filter-Identifier              1060       OctetString       V
+   Packet-Filter-Information             1061           Grouped       V
+   Packet-Filter-Operation               1062        Enumerated       V
+   Packet-Filter-Usage                   1072        Enumerated       V
+   PCC-Rule-Status                       1019        Enumerated      MV
+   PDN-Connection-ID                     1065       OctetString       V
+   Precedence                            1010        Unsigned32      MV
+   Pre-emption-Capability                1047        Enumerated       V
+   Pre-emption-Vulnerability             1048        Enumerated       V
+   Presence-Reporting-Area-Elements-List 2820       OctetString       V
+   Presence-Reporting-Area-Identifier    2821       OctetString       V
+   Presence-Reporting-Area-Information   2822           Grouped       V
+   Presence-Reporting-Area-Status        2823        Unsigned32       V
+   Priority-Level                        1046        Unsigned32       V
+   PS-to-CS-Session-Continuity           1099        Enumerated       V
+   QoS-Class-Identifier                  1028        Enumerated      MV
+   QoS-Information                       1016           Grouped      MV
+   QoS-Negotiation                       1029        Enumerated      MV
+   QoS-Upgrade                           1030        Enumerated      MV
+   RAN-NAS-Release-Cause                 2819       OctetString       V
+   RAT-Type                              1032        Enumerated       V
+   Redirect-Information                  1085           Grouped       V
+   Redirect-Support                      1086        Enumerated       V
+   Reporting-Level                       1011        Enumerated      MV
+   Resource-Allocation-Notification      1063        Enumerated       V
+   Revalidation-Time                     1042              Time      MV
+   Routing-Filter                        1078           Grouped       V
+   Routing-IP-Address                    1079           Address       V
+   Routing-Rule-Definition               1076           Grouped       V
+   Routing-Rule-Identifier               1077       OctetString       V
+   Routing-Rule-Install                  1081           Grouped       V
+   Routing-Rule-Remove                   1075           Grouped       V
+   Rule-Activation-Time                  1043              Time      MV
+   Rule-Deactivation-Time                1044              Time      MV
+   Rule-Failure-Code                     1031        Enumerated      MV
+   Security-Parameter-Index              1056       OctetString       V
+   Session-Release-Cause                 1045        Enumerated      MV
+   TDF-Information                       1087           Grouped       V
+   TDF-Application-Identifier            1088       OctetString       V
+   TDF-Application-Instance-Identifier   2802       OctetString       V
+   TDF-Destination-Host                  1089  DiameterIdentity       V
+   TDF-Destination-Realm                 1090  DiameterIdentity       V
+   TDF-IP-Address                        1091           Address       V
+   TFT-Filter                            1012      IPFilterRule      MV
+   TFT-Packet-Filter-Information         1013           Grouped      MV
+   ToS-Traffic-Class                     1014       OctetString      MV
+   Tunnel-Header-Filter                  1036      IPFilterRule       V
+   Tunnel-Header-Length                  1037        Unsigned32       V
+   Tunnel-Information                    1038           Grouped       V
+   UDP-Source-Port                       2806        Unsigned32       V
+   UE-Local-IP-Address                   2805           Address       V
+   Usage-Monitoring-Information          1067           Grouped       V
+   Usage-Monitoring-Level                1068        Enumerated       V
+   Usage-Monitoring-Report               1069        Enumerated       V
+   Usage-Monitoring-Support              1070        Enumerated       V
+   User-Location-Info-Time               2812              Time       V
+   PCSCF-Restoration-Indication          2826        Unsigned32       V
+
+@messages
+
+      CCR ::= < Diameter Header: 272, REQ, PXY >
+              < Session-Id >
+              { Auth-Application-Id }
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { CC-Request-Type }
+              { CC-Request-Number }
+              [ Credit-Management-Status ]
+              [ Destination-Host ]
+              [ Origin-State-Id ]
+            * [ Subscription-Id ]
+;;              [ OC-Supported-Features ]			;; IETF draft-ietf-dime-02
+            * [ Supported-Features ]				;; TS 29.229
+              [ TDF-Information ]
+              [ Network-Request-Support ]
+            * [ Packet-Filter-Information ]
+              [ Packet-Filter-Operation ]
+              [ Bearer-Identifier ]
+              [ Bearer-Operation ]
+;;              [ Dynamic-Address-Flag ]                        ;; TS 32.299
+;;              [ Dynamic-Address-Flag-Extension ]		;; TS 32.299
+;;              [ PDN-Connection-Charging-ID ]                  ;; TS 32.299
+              [ Framed-IP-Address ]				;; RFC-4005
+              [ Framed-IPv6-Prefix ]				;; RFC-4005
+              [ IP-CAN-Type ]
+              [ 3GPP-RAT-Type ]
+;;              [ AN-Trusted ]                                  ;; TS 29.273
+              [ RAT-Type ]
+              [ Termination-Cause ]
+              [ User-Equipment-Info ]
+              [ QoS-Information ]
+              [ QoS-Negotiation ]
+              [ QoS-Upgrade ]
+              [ Default-EPS-Bearer-QoS ]
+              [ Default-QoS-Information ]
+          0*2 [ AN-GW-Address ]
+              [ AN-GW-Status ]
+              [ 3GPP-SGSN-MCC-MNC ]
+              [ 3GPP-SGSN-Address ]
+              [ 3GPP-SGSN-IPv6-Address ]
+              [ 3GPP-GGSN-Address ]
+              [ 3GPP-GGSN-IPv6-Address ]
+              [ 3GPP-Selection-Mode ]
+              [ RAI ]
+              [ 3GPP-User-Location-Info]
+              [ User-Location-Info-Time ]
+;;              [ User-CSG-Information ]                        ;; TS 32.299
+              [ TWAN-Identifier ]
+              [ 3GPP-MS-TimeZone ]
+            * [ RAN-NAS-Release-Cause ]
+              [ 3GPP-Charging-Characteristics ]
+              [ Called-Station-Id ]				;; RFC-4005
+              [ PDN-Connection-ID ]
+              [ Bearer-Usage ]
+              [ Online ]
+              [ Offline ]
+            * [ TFT-Packet-Filter-Information ]
+            * [ Charging-Rule-Report ]
+            * [ Application-Detection-Information ]
+            * [ Event-Trigger ]
+              [ Event-Report-Indication ]
+              [ Access-Network-Charging-Address ]
+            * [ Access-Network-Charging-Identifier-Gx ]
+            * [ CoA-Information ]
+            * [ Usage-Monitoring-Information ]
+              [ Routing-Rule-Install ]
+              [ Routing-Rule-Remove ]
+              [ HeNB-Local-IP-Address ]
+              [ UE-Local-IP-Address ]
+              [ UDP-Source-Port ]
+              [ Presence-Reporting-Area-Information ]
+              [ Logical-Access-ID ]
+              [ Physical-Access-ID ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      CCA ::= < Diameter Header: 272, PXY >
+              < Session-Id >
+              { Auth-Application-Id }
+              { Origin-Host }
+              { Origin-Realm }
+              { CC-Request-Type }
+              { CC-Request-Number }
+              [ Result-Code ]
+              [ Experimental-Result ]
+;;              [ OC-Supported-Features ]                       ;; IETF draft-ietf-dime-02
+;;              [ OC-OLR ]                                      ;; IETF draft-ietf-dime-02
+            * [ Supported-Features ]				;; TS 29.229
+              [ Bearer-Control-Mode ]
+            * [ Event-Trigger ]
+              [ Event-Report-Indication ]
+              [ Origin-State-Id ]
+            * [ Redirect-Host ]
+              [ Redirect-Host-Usage ]
+              [ Redirect-Max-Cache-Time ]
+            * [ Charging-Rule-Remove ]
+            * [ Charging-Rule-Install ]
+              [ Charging-Information ]				;; TS 29.229
+              [ Online ]
+              [ Offline ]
+            * [ QoS-Information ]
+              [ Revalidation-Time ]
+              [ Default-EPS-Bearer-QoS ]
+              [ Default-QoS-Information ]
+              [ Bearer-Usage ]
+            * [ Usage-Monitoring-Information ]
+            * [ CSG-Information-Reporting ]
+;;              [ User-CSG-Information ]                        ;; TS 32.299
+              [ Presence-Reporting-Area-Information ]
+              [ Session-Release-Cause ]
+              [ Error-Message ]
+              [ Error-Reporting-Host ]
+            * [ Failed-AVP ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      RAR ::= < Diameter Header: 258, REQ, PXY >
+              < Session-Id >
+              { Auth-Application-Id }
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { Destination-Host }
+              { Re-Auth-Request-Type }
+              [ Session-Release-Cause ]
+              [ Origin-State-Id ]
+;;              [ OC-Supported-Features ]                       ;; IETF draft-ietf-dime-02
+            * [ Event-Trigger ]
+              [ Event-Report-Indication ]
+            * [ Charging-Rule-Remove ]
+            * [ Charging-Rule-Install ]
+              [ Default-EPS-Bearer-QoS ]
+            * [ QoS-Information ]
+              [ Default-QoS-Information ]
+              [ Revalidation-Time ]
+            * [ Usage-Monitoring-Information ]
+              [ PCSCF-Restoration-Indication ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      RAA ::= < Diameter Header: 258, PXY >
+              < Session-Id >
+              { Origin-Host }
+              { Origin-Realm }
+              [ Result-Code ]
+              [ Experimental-Result ]
+              [ Origin-State-Id ]
+;;              [ OC-Supported-Features ]                       ;; IETF draft-ietf-dime-02
+;;              [ OC-OLR ]                                      ;; IETF draft-ietf-dime-02
+              [ IP-CAN-Type ]
+              [ RAT-Type ]
+;;              [ AN-Trusted ]                                  ;; TS 29.273
+          0*2 [ AN-GW-Address ]
+              [ 3GPP-SGSN-MCC-MNC ]
+              [ 3GPP-SGSN-Address ]
+              [ 3GPP-SGSN-IPv6-Address ]
+              [ RAI ]
+              [ 3GPP-User-Location-Info ]
+              [ User-Location-Info-Time ]
+              [ NetLoc-Access-Support ]
+;;              [ User-CSG-Information ]                        ;; TS 32.299
+              [ 3GPP-MS-TimeZone ]
+              [ Default-QoS-Information ]
+            * [ Charging-Rule-Report]
+              [ Error-Message ]
+              [ Error-Reporting-Host ]
+            * [ Failed-AVP ]
+            * [ Proxy-Info ]
+            * [ AVP ]
+
+
+@enum AN-GW-Status
+
+   AN_GW_FAILED         0
+
+@enum Bearer-Control-Mode
+
+   UE_ONLY      0
+   RESERVED     1
+   UE_NW        2
+
+@enum Bearer-Operation
+
+   TERMINATION          0
+   ESTABLISHMENT        1
+   MODIFICATION         2
+
+@enum Bearer-Usage
+
+   GENERAL              0
+   IMS_SIGNALLING       1
+
+@enum Charging-Correlation-Indicator
+
+   CHARGING_IDENTIFIER_REQUIRED         0
+
+@enum CSG-Information-Reporting
+
+   CHANGE_CSG_CELL                      0
+   CHANGE_CSG_SUBSCRIBED_HYBRID_CELL    1
+   CHANGE_CSG_UNSUBSCRIBED_HYBRID_CELL  2
+
+@enum Event-Trigger
+
+   SGSN_CHANGE                                                  0
+   QOS_CHANGE                                                   1
+   RAT_CHANGE                                                   2
+   TFT_CHANGE                                                   3
+   PLMN_CHANGE                                                  4
+   LOSS_OF_BEARER                                               5
+   RECOVERY_OF_BEARER                                           6
+   IP-CAN_CHANGE                                                7
+   QOS_CHANGE_EXCEEDING_AUTHORIZATION                           11
+   RAI_CHANGE                                                   12
+   USER_LOCATION_CHANGE                                         13
+   NO_EVENT_TRIGGERS                                            14
+   OUT_OF_CREDIT                                                15
+   REALLOCATION_OF_CREDIT                                       16
+   REVALIDATION_TIMEOUT                                         17
+   UE_IP_ADDRESS_ALLOCATE                                       18
+   UE_IP_ADDRESS_RELEASE                                        19
+   DEFAULT_EPS_BEARER_QOS_CHANGE                                20
+   AN_GW_CHANGE                                                 21
+   SUCCESSFUL_RESOURCE_ALLOCATION                               22
+   RESOURCE_MODIFICATION_REQUEST                                23
+   PGW_TRACE_CONTROL                                            24
+   UE_TIME_ZONE_CHANGE                                          25
+   TAI_CHANGE                                                   26
+   ECGI_CHANGE                                                  27
+   CHARGING_CORRELATION_EXCHANGE                                28
+   APN-AMBR_MODIFICATION_FAILURE                                29
+   USER_CSG_INFORMATION_CHANGE                                  30
+   USAGE_REPORT                                                 33
+   DEFAULT-EPS-BEARER-QOS_MODIFICATION_FAILURE                  34
+   USER_CSG_HYBRID_SUBSCRIBED_INFORMATION_CHANGE                35
+   USER_CSG_HYBRID_UNSUBSCRIBED_INFORMATION_CHANGE              36
+   ROUTING_RULE_CHANGE                                          37
+   APPLICATION_START                                            39
+   APPLICATION_STOP                                             40
+   CS_TO_PS_HANDOVER                                            42
+   UE_LOCAL_IP_ADDRESS_CHANGE                                   43
+   HNB_LOCAL_IP_ADDRESS_CHANGE                                  44
+   ACCESS_NETWORK_INFO_REPORT                                   45
+   CREDIT_MANAGEMENT_SESSION_FAILURE                            46
+   DEFAULT_QOS_CHANGE                                           47
+   CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA_REPORT      48
+
+@enum Flow-Direction
+
+   UNSPECIFIED          0
+   DOWNLINK             1
+   UPLINK               2
+   BIDIRECTIONAL        3
+
+@enum IP-CAN-Session-Charging-Scope
+
+   IP-CAN_SESSION_SCOPE         0
+
+@enum IP-CAN-Type
+
+   3GPP-GPRS            0
+   DOCSIS               1
+   xDSL                 2
+   WiMAX                3
+   3GPP2                4
+   3GPP-EPS             5
+   Non-3GPP-EPS         6
+   FBA                  7
+
+@enum Metering-Method
+
+   DURATION             0
+   VOLUME               1
+   DURATION_VOLUME      2
+   EVENT                3
+
+@enum Mute-Notification
+
+   MUTE_REQUIRED        0
+
+@enum Network-Request-Support
+
+   NETWORK_REQUEST_NOT_SUPPORTED        0
+   NETWORK_REQUEST_SUPPORTED            1
+
+@enum Offline
+
+   DISABLE_OFFLINE      0
+   ENABLE_OFFLINE       1
+
+@enum Online
+
+   DISABLE_ONLINE       0
+   ENABLE_ONLINE        1
+
+@enum Packet-Filter-Operation
+
+   DELETION             0
+   ADDITION             1
+   MODIFICATION         2
+
+@enum Packet-Filter-Usage
+
+   SEND_TO_UE   1
+
+@enum PCC-Rule-Status
+
+   ACTIVE                       0
+   INACTIVE                     1
+   TEMPORARILY_INACTIVE         2
+
+@enum Pre-emption-Capability
+
+   PRE-EMPTION_CAPABILITY_ENABLED       0
+   PRE-EMPTION_CAPABILITY_DISABLED      1
+
+@enum Pre-emption-Vulnerability
+
+   PRE-EMPTION_VULNERABILITY_ENABLED    0
+   PRE-EMPTION_VULNERABILITY_DISABLED   1
+
+@enum PS-to-CS-Session-Continuity
+
+   VIDEO_PS2CS_CONT_CANDIDATE           0
+
+@enum QoS-Class-Identifier
+
+   QCI_1        1
+   QCI_2        2
+   QCI_3        3
+   QCI_4        4
+   QCI_5        5
+   QCI_6        6
+   QCI_7        7
+   QCI_8        8
+   QCI_9        9
+   QCI_65       65
+   QCI_66       66
+   QCI_69       69
+   QCI_70       70
+
+@enum QoS-Negotiation
+
+   NO_QoS_NEGOTIATION           0
+   QoS_NEGOTIATION_SUPPORTED    1
+
+@enum QoS-Upgrade
+
+   QoS_UPGRADE_NOT_SUPPORTED    0
+   QoS_UPGRADE_SUPPORTED        1
+
+@enum RAT-Type
+
+   WLAN                 0
+   VIRTUAL              1
+   UTRAN                1000
+   GERAN                1001
+   GAN                  1002
+   HSPA_EVOLUTION       1003
+   EUTRAN               1004
+   CDMA2000_1X          2000
+   HRPD                 2001
+   UMB                  2002
+   EHRPD                2003
+
+@enum Redirect-Support
+
+   REDIRECTION_DISABLED         0
+   REDIRECTION_ENABLED          1
+
+@enum Reporting-Level
+
+   SERVICE_IDENTIFIER_LEVEL             0
+   RATING_GROUP_LEVEL                   1
+   SPONSORED_CONNECTIVITY_LEVEL         2
+
+@enum Resource-Allocation-Notification
+
+   ENABLE_NOTIFICATION                  0
+
+@enum Rule-Failure-Code
+
+   UNKNOWN_RULE_NAME                    1
+   RATING_GROUP_ERROR                   2
+   SERVICE_IDENTIFIER_ERROR             3
+   GW_PCEF_MALFUNCTION                  4
+   RESOURCES_LIMITATION                 5
+   MAX_NR_BEARERS_REACHED               6
+   UNKNOWN_BEARER_ID                    7
+   MISSING_BEARER_ID                    8
+   MISSING_FLOW_INFORMATION             9
+   RESOURCE_ALLOCATION_FAILURE          10
+   UNSUCCESSFUL_QOS_VALIDATION          11
+   INCORRECT_FLOW_INFORMATION           12
+   PS_TO_CS_HANDOVER                    13
+   TDF_APPLICATION_IDENTIFIER_ERROR     14
+   NO_BEARER_BOUND                      15
+   FILTER_RESTRICTIONS                  16
+   AN_GW_FAILED                         17
+   MISSING_REDIRECT_SERVER_ADDRESS      18
+   CM_END_USER_SERVICE_DENIED           19
+   CM_CREDIT_CONTROL_NOT_APPLICABLE     20
+   CM_AUTHORIZATION_REJECTED            21
+   CM_USER_UNKNOWN                      22
+   CM_RATING_FAILED                     23
+
+@enum Session-Release-Cause
+
+   UNSPECIFIED_REASON                   0
+   UE_SUBSCRIPTION_REASON               1
+   INSUFFICIENT_SERVER_RESOURCES        2
+   IP_CAN_SESSION_TERMINATION           3
+   UE_IP_ADDRESS_RELEASE                4
+
+@enum Usage-Monitoring-Level
+
+   SESSION_LEVEL        0
+   PCC_RULE_LEVEL       1
+   ADC_RULE_LEVEL       2
+
+@enum Usage-Monitoring-Report
+
+   USAGE_MONITORING_REPORT_REQUIRED     0
+
+@enum Usage-Monitoring-Support
+
+   USAGE_MONITORING_DISABLED            0
+
+@define Presence-Reporting-Area-Status
+
+   IN_AREA      0
+   OUT_OF_AREA  1
+
+@define NetLoc-Access-Support
+
+   NETLOC_ACCESS_NOT_SUPPORTED  0
+
+@define PCSCF-Restoration-Indication
+
+   PCSCF_RESTORATION    0
+
+@grouped
+
+       Access-Network-Charging-Identifier-Gx ::= < AVP Header: 1022 >
+                                                 { Access-Network-Charging-Identifier-Value }
+                                               * [ Charging-Rule-Base-Name ]
+                                               * [ Charging-Rule-Name ]
+                                                 [ IP-CAN-Session-Charging-Scope ]
+                                               * [ AVP ]
+
+       Allocation-Retention-Priority ::= < AVP Header: 1034 >
+                                         { Priority-Level }
+                                         [ Pre-emption-Capability ]
+                                         [ Pre-emption-Vulnerability ]
+
+       Application-Detection-Information ::= < AVP Header: 1098 >
+                                             { TDF-Application-Identifier }
+                                             [ TDF-Application-Instance-Identifier ]
+                                           * [ Flow-Information ]
+                                           * [ AVP ]
+
+       Charging-Rule-Definition ::= < AVP Header: 1003 >
+                                    { Charging-Rule-Name }
+                                    [ Service-Identifier ]
+                                    [ Rating-Group ]
+                                  * [ Flow-Information ]
+                                    [ TDF-Application-Identifier ]
+                                    [ Flow-Status ]
+                                    [ QoS-Information ]
+                                    [ PS-to-CS-Session-Continuity ]
+                                    [ Reporting-Level ]
+                                    [ Online ]
+                                    [ Offline ]
+                                    [ Metering-Method ]
+                                    [ Precedence ]
+                                    [ AF-Charging-Identifier ]
+                                  * [ Flows ]
+                                    [ Monitoring-Key]
+                                    [ Redirect-Information ]
+                                    [ Mute-Notification ]
+                                    [ AF-Signalling-Protocol ]
+                                    [ Sponsor-Identity ]
+                                    [ Application-Service-Provider-Identity ]
+                                  * [ Required-Access-Info ]
+                                  * [ AVP ]
+
+       Charging-Rule-Install ::= < AVP Header: 1001 >
+                               * [ Charging-Rule-Definition ]
+                               * [ Charging-Rule-Name ]
+                               * [ Charging-Rule-Base-Name ]
+                                 [ Bearer-Identifier ]
+                                 [ Rule-Activation-Time ]
+                                 [ Rule-Deactivation-Time ]
+                                 [ Resource-Allocation-Notification ]
+                                 [ Charging-Correlation-Indicator ]
+                               * [ AVP ]
+
+       Charging-Rule-Remove ::= < AVP Header: 1002 >
+                              * [ Charging-Rule-Name ]
+                              * [ Charging-Rule-Base-Name ]
+                              * [ Required-Access-Info ]
+                              * [ AVP ]
+
+       Charging-Rule-Report ::= < AVP Header: 1018 >
+                              * [ Charging-Rule-Name ]
+                              * [ Charging-Rule-Base-Name ]
+                                [ Bearer-Identifier ]
+                                [ PCC-Rule-Status ]
+                                [ Rule-Failure-Code ]
+                                [ Final-Unit-Indication ]
+                              * [ RAN-NAS-Release-Cause ]
+                              * [ AVP ]
+
+       CoA-Information ::= < AVP Header: 1039>
+                           { Tunnel-Information }
+                           { CoA-IP-Address }
+                         * [ AVP ]
+
+       Conditional-APN-Aggregate-Max-Bitrate ::= < AVP Header: 2818 >
+                                                 [ APN-Aggregate-Max-Bitrate-UL ]
+                                                 [ APN-Aggregate-Max-Bitrate-DL ]
+                                               * [ IP-CAN-Type ]
+                                               * [ RAT-Type ]
+                                               * [ AVP ]
+
+       Default-EPS-Bearer-QoS::= < AVP Header: 1049 >
+                                 [ QoS-Class-Identifier ]
+                                 [ Allocation-Retention-Priority ]
+                               * [ AVP ]
+
+       Default-QoS-Information ::= < AVP Header: 2816 >
+                                   [ QoS-Class-Identifier ]
+                                   [ Max-Requested-Bandwidth-UL ]
+                                   [ Max-Requested-Bandwidth-DL ]
+                                   [ Default-QoS-Name ]
+                                 * [ AVP ]
+
+       Event-Report-Indication ::= < AVP Header: 1033 >
+;;                                   [ AN-Trusted ]                                  ;; TS 29.273
+                                 * [ Event-Trigger ]
+;;                                   [ User-CSG-Information ]                        ;; TS 32.299
+                                   [ IP-CAN-Type ]
+                               0*2 [ AN-GW-Address ]
+                                   [ 3GPP-SGSN-Address ]
+                                   [ 3GPP-SGSN-IPv6-Address ]
+                                   [ 3GPP-SGSN-MCC-MNC ]
+                                   [ Framed-IP-Address ]				;; RFC-4005
+                                   [ RAT-Type ]
+                                   [ RAI ]
+                                   [ 3GPP-User-Location-Info ]
+;;                                   [ Trace-Data ]                                  ;; TS 29.272
+;;                                   [ Trace-Reference ]                             ;; TS 29.272
+;;                                   [ 3GPP2-BSID ]                                  ;; 3GPP2 X.S0057-B (CDMA to EPC attachment)
+                                   [ 3GPP-MS-TimeZone ]
+                                   [ Routing-IP-Address ]
+                                   [ UE-Local-IP-Address ]
+                                   [ HeNB-Local-IP-Address ]
+                                   [ UDP-Source-Port ]
+                                   [ Presence-Reporting-Area-Information ]
+                                 * [ AVP ]
+
+       Fixed-User-Location-Info::=  < AVP Header: 2825 >
+;;                                    [ SSID ]                                       ;; TS 29.273
+;;                                    [ BSSID ]                                      ;; TS 32.299
+                                    [ Logical-Access-ID ]
+                                    [ Physical-Access-ID ]
+                                  * [ AVP ]
+
+       Flow-Information ::= < AVP Header: 1058 >
+                            [ Flow-Description ]
+                            [ Packet-Filter-Identifier ]
+                            [ Packet-Filter-Usage ]
+                            [ ToS-Traffic-Class ]
+                            [ Security-Parameter-Index ]
+                            [ Flow-Label ]
+                            [ Flow-Direction ]
+                          * [ AVP ]
+
+
+       Packet-Filter-Information ::= < AVP Header: 1061 >
+                                     [ Packet-Filter-Identifier ]
+                                     [ Precedence ]
+                                     [ Packet-Filter-Content ]
+                                     [ ToS-Traffic-Class ]
+                                     [ Security-Parameter-Index ]
+                                     [ Flow-Label ]
+                                     [ Flow-Direction ]
+                                   * [ AVP ]
+
+       Presence-Reporting-Area-Information ::= < AVP Header: 2822 >
+                                               [ Presence-Reporting-Area-Identifier ]
+                                               [ Presence-Reporting-Area-Status ]
+                                               [ Presence-Reporting-Area-Elements-List ]
+                                             * [ AVP ]
+
+       QoS-Information ::= < AVP Header: 1016 >
+                           [ QoS-Class-Identifier ]
+                           [ Max-Requested-Bandwidth-UL ]
+                           [ Max-Requested-Bandwidth-DL ]
+                           [ Guaranteed-Bitrate-UL ]
+                           [ Guaranteed-Bitrate-DL ]
+                           [ Bearer-Identifier ]
+                           [ Allocation-Retention-Priority ]
+                           [ APN-Aggregate-Max-Bitrate-UL ]
+                           [ APN-Aggregate-Max-Bitrate-DL ]
+                         * [ Conditional-APN-Aggregate-Max-Bitrate ]
+                         * [ AVP ]
+
+       Redirect-Information ::= < AVP Header: 1085 >
+                                [ Redirect-Support ]
+                                [ Redirect-Address-Type ]
+                                [ Redirect-Server-Address ]
+                              * [ AVP ]
+
+       Routing-Filter ::= < AVP Header: 1078 >
+                          { Flow-Description }
+                          { Flow-Direction }
+                          [ ToS-Traffic-Class ]
+                          [ Security-Parameter-Index ]
+                          [ Flow-Label ]
+                        * [ AVP ]
+
+       Routing-Rule-Definition ::= < AVP Header: 1076 >
+                                   { Routing-Rule-Identifier }
+                                 * [ Routing-Filter ]
+                                   [ Precedence ]
+                                   [ Routing-IP-Address ]
+                                 * [ AVP ]
+
+       Routing-Rule-Install ::= < AVP Header: 1081 >
+                              * [ Routing-Rule-Definition ]
+                              * [ AVP ]
+
+       Routing-Rule-Remove ::= < AVP Header: 1075 >
+                             * [ Routing-Rule-Identifier ]
+                             * [ AVP ]
+
+       TDF-Information::= < AVP Header: 1087 >
+                          [ TDF-Destination-Realm ]
+                          [ TDF-Destination-Host ]
+                          [ TDF-IP-Address ]
+
+       Tunnel-Information ::= < AVP Header: 1038 >
+                              [ Tunnel-Header-Length ]
+                          0*2 [ Tunnel-Header-Filter ]				;; either not present or two instances
+                            * [ AVP ]
+
+       TFT-Packet-Filter-Information ::= < AVP Header: 1013 >
+                                         [ Precedence ]
+                                         [ TFT-Filter ]
+                                         [ ToS-Traffic-Class ]
+                                         [ Security-Parameter-Index ]
+                                         [ Flow-Label ]
+                                         [ Flow-Direction ]
+                                       * [ AVP ]
+
+       Usage-Monitoring-Information::= < AVP Header: 1067 >
+                                       [ Monitoring-Key ]
+                                   0*2 [ Granted-Service-Unit ]
+                                   0*2 [ Used-Service-Unit ]
+;;                                       [ Quota-Consumption-Time ]                  ;; TS 32.299
+                                       [ Usage-Monitoring-Level ]
+                                       [ Usage-Monitoring-Report ]
+                                       [ Usage-Monitoring-Support ]
+                                     * [ AVP ]
diff --git a/dia/diameter_3gpp_ts29_214.dia b/dia/diameter_3gpp_ts29_214.dia
new file mode 100644
index 0000000..846f6ce
--- /dev/null
+++ b/dia/diameter_3gpp_ts29_214.dia
@@ -0,0 +1,76 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+@id     16777236
+@name   diameter_3gpp_ts29_214
+@prefix diameter_rx
+@vendor 10415 3GPP
+
+@inherits diameter_gen_base_rfc6733
+@inherits diameter_rfc4006_cc
+
+;; only attributes required by other applications are defined
+
+@avp_types
+
+   Abort-Cause                              500     Enumerated    MV
+   Access-Network-Charging-Address          501        Address    MV
+;; Access-Network-Charging-Identifier       502        Grouped    MV
+   Access-Network-Charging-Identifier-Value 503    OctetString    MV
+;; Acceptable-Service-Info                  526        Grouped    MV
+   AF-Application-Identifier                504    OctetString    MV
+   AF-Charging-Identifier                   505    OctetString    MV
+   Application-Service-Provider-Identity    532     UTF8String     V
+   Codec-Data                               524    OctetString    MV
+   Flow-Description                         507   IPFilterRule    MV
+   Flow-Number                              509     Unsigned32    MV
+   Flows                                    510        Grouped    MV
+   Flow-Status                              511     Enumerated    MV
+   Flow-Usage                               512     Enumerated    MV
+   GCS-Identifier                           538    OctetString     V
+   Service-URN                              525    OctetString    MV
+   Specific-Action                          513     Enumerated    MV
+   Max-Requested-Bandwidth-DL               515     Unsigned32    MV
+   Max-Requested-Bandwidth-UL               516     Unsigned32    MV
+;; Media-Component-Description              517        Grouped    MV
+   Media-Component-Number                   518     Unsigned32    MV
+;; Media-Sub-Component                      519        Grouped    MV
+   Media-Type                               520     Enumerated    MV
+   MPS-Identifier                           528    OctetString     V
+   Min-Requested-Bandwidth-DL               534     Unsigned32     V
+   Min-Requested-Bandwidth-UL               535     Unsigned32     V
+   RR-Bandwidth                             521     Unsigned32    MV
+   RS-Bandwidth                             522     Unsigned32    MV
+   Service-Info-Status                      527     Enumerated    MV
+   SIP-Forking-Indication                   523     Enumerated    MV
+   Sponsor-Identity                         531     UTF8String     V
+;; Sponsored-Connectivity-Data              530        Grouped     V
+   AF-Signalling-Protocol                   529     Enumerated     V
+   Required-Access-Info                     536     Enumerated     V
+   Rx-Request-Type                          533     Enumerated     V
+   IP-Domain-Id                             537    OctetString     V
+
+
+@grouped
+
+       Flows ::= < AVP Header: 510 >
+       	     	 { Media-Component-Number }
+ 	       * [ Flow-Number ]
+                 [ Final-Unit-Action ]
diff --git a/dia/diameter_3gpp_ts29_229.dia b/dia/diameter_3gpp_ts29_229.dia
new file mode 100644
index 0000000..82f088d
--- /dev/null
+++ b/dia/diameter_3gpp_ts29_229.dia
@@ -0,0 +1,106 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+@id     16777236
+@name   diameter_3gpp_ts29_229
+@prefix diameter_cx
+@vendor 10415 3GPP
+
+@inherits diameter_gen_base_rfc6733
+
+;; only attributes required by other applications are defined
+
+@avp_types
+
+   Visited-Network-Identifier                  600   OctetString    MV
+   Public-Identity                             601    UTF8String    MV
+   Server-Name                                 602    UTF8String    MV
+;; Server-Capabilities                         603       Grouped    MV
+   Mandatory-Capability                        604    Unsigned32    MV
+   Optional-Capability                         605    Unsigned32    MV
+   User-Data                                   606   OctetString    MV
+   SIP-Number-Auth-Items                       607    Unsigned32    MV
+   SIP-Authentication-Scheme                   608    UTF8String    MV
+   SIP-Authenticate                            609   OctetString    MV
+   SIP-Authorization                           610   OctetString    MV
+   SIP-Authentication-Context                  611   OctetString    MV
+;; SIP-Auth-Data-Item                          612       Grouped    MV
+   SIP-Item-Number                             613    Unsigned32    MV
+   Server-Assignment-Type                      614    Enumerated    MV
+;; Deregistration-Reason                       615       Grouped    MV
+   Reason-Code                                 616    Enumerated    MV
+   Reason-Info                                 617    UTF8String    MV
+   Charging-Information                        618       Grouped    MV
+   Primary-Event-Charging-Function-Name        619   DiameterURI    MV
+   Secondary-Event-Charging-Function-Name      620   DiameterURI    MV
+   Primary-Charging-Collection-Function-Name   621   DiameterURI    MV
+   Secondary-Charging-Collection-Function-Name 622   DiameterURI    MV
+   User-Authorization-Type                     623    Enumerated    MV
+   User-Data-Already-Available                 624    Enumerated    MV
+   Confidentiality-Key                         625   OctetString    MV
+   Integrity-Key                               626   OctetString    MV
+   Supported-Features                          628       Grouped     V
+   Feature-List-ID                             629    Unsigned32     V
+   Feature-List                                630    Unsigned32     V
+;; Supported-Applications                      631       Grouped     V
+;; Associated-Identities                       632       Grouped     V
+   Originating-Request                         633    Enumerated    MV
+   Wildcarded-Public-Identity                  634    UTF8String     V
+;; SIP-Digest-Authenticate                     635       Grouped     V
+   Digest-Realm                                104    UTF8String    M			;; RFC-4590
+   Digest-Algorithm                            111    UTF8String    M			;; RFC-4590
+   Digest-QoP                                  110    UTF8String    M			;; RFC-4590
+   Digest-HA1                                  121    UTF8String    M			;; RFC-4590
+   UAR-Flags                                   637    Unsigned32     V
+   Loose-Route-Indication                      638    Enumerated     V
+;; SCSCF-Restoration-Info                      639       Grouped     V
+   Path                                        640   OctetString     V
+   Contact                                     641   OctetString     V
+;; Subscription-Info                           642       Grouped     V
+   Call-ID-SIP-Header                          643   OctetString     V
+   From-SIP-Header                             644   OctetString     V
+   To-SIP-Header                               645   OctetString     V
+   Record-Route                                646   OctetString     V
+;; Associated-Registered-Identities            647       Grouped     V
+   Multiple-Registration-Indication            648    Enumerated     V
+;; Restoration-Info                            649       Grouped     V
+   Session-Priority                            650    Enumerated     V
+;; Identity-with-Emergency-Registration        651       Grouped     V
+   Priviledged-Sender-Indication               652    Enumerated     V
+   LIA-Flags                                   653    Unsigned32     V
+;; OC-Supported-Features                       TBD       Grouped     -			;; IETF draft-ietf-dime-02
+;; OC-OLR                                      TBD       Grouped     -			;; IETF draft-ietf-dime-02
+   Initial-CSeq-Sequence-Number                654    Unsigned32     V
+   SAR-Flags                                   655    Unsigned32     V
+
+@grouped
+
+       Charging-Information ::= < AVP Header : 618 >
+                                [ Primary-Event-Charging-Function-Name ]
+                                [ Secondary-Event-Charging-Function-Name ]
+                                [ Primary-Charging-Collection-Function-Name ]
+                                [ Secondary-Charging-Collection-Function-Name ]
+                              * [ AVP ]
+
+       Supported-Features ::= < AVP Header : 628 >
+                              { Vendor-Id }
+                              { Feature-List-ID }
+                              { Feature-List }
+                            * [ AVP ]
diff --git a/dia/diameter_3gpp_ts29_329.dia b/dia/diameter_3gpp_ts29_329.dia
new file mode 100644
index 0000000..f3ed483
--- /dev/null
+++ b/dia/diameter_3gpp_ts29_329.dia
@@ -0,0 +1,54 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+@name   diameter_3gpp_ts29_329
+@vendor 10415 3GPP
+
+@avp_types
+
+   MSISDN                                701      OctetString     MV
+   User-Data                             702      OctetString     MV
+   Data-Reference                        703       Enumerated     MV
+   Service-Indication                    704      OctetString     MV
+   Subs-Req-Type                         705       Enumerated     MV
+   Requested-Domain                      706       Enumerated     MV
+   Current-Location                      707       Enumerated     MV
+   Identity-Set                          708       Enumerated      V
+   Expiry-Time                           709             Time      V
+   Send-Data-Indication                  710       Enumerated      V
+   Server-Name                           602       UTF8String     MV
+;; Supported-Features                    628          Grouped      V
+   Feature-List-ID                       629       Unsigned32      V
+   Feature-List                          630       Unsigned32      V
+;; Supported-Applications                631          Grouped      V
+   Public-Identity                       601       UTF8String     MV
+   DSAI-Tag                              711      OctetString     MV
+   Wildcarded-Public-Identity            634       UTF8String      V
+   Wildcarded-IMPU                       636       UTF8String      V
+   Session-Priority                      650       Enumerated      V
+   One-Time-Notification                 712       Enumerated      V
+   Requested-Nodes                       713       Unsigned32      V
+   Serving-Node-Indication               714       Enumerated      V
+;; Repository-Data-ID                    715          Grouped      V
+   Sequence-Number                       716       Unsigned32      V
+
+;; ===========================================================================
+
+@grouped
diff --git a/dia/diameter_3gpp_ts32_299.dia b/dia/diameter_3gpp_ts32_299.dia
new file mode 100644
index 0000000..01cc8c1
--- /dev/null
+++ b/dia/diameter_3gpp_ts32_299.dia
@@ -0,0 +1,2001 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+@id     0
+@name   diameter_3gpp_ts32_299
+@prefix diameter_3gpp_charging
+@vendor 10415 3GPP
+
+@inherits diameter_gen_base_rfc6733
+@inherits diameter_gen_acct_rfc6733
+@inherits diameter_rfc7155_nasreq
+@inherits diameter_rfc4006_cc
+@inherits diameter_etsi_es283_034
+@inherits diameter_3gpp_base
+@inherits diameter_3gpp_ts29_061_gmb
+@inherits diameter_3gpp_ts29_212
+@inherits diameter_3gpp_ts29_214
+@inherits diameter_3gpp_ts29_329
+
+;; ===========================================================================
+
+@avp_types
+
+   3GPP-PS-Data-Off-Status                                      4406       Enumerated     MV
+   Access-Network-Info-Change                                   4401          Grouped     MV
+   Access-Network-Information                                   1263      OctetString     MV
+   Access-Transfer-Information                                  2709          Grouped     MV
+   Access-Transfer-Type                                         2710       Enumerated     MV
+   Account-Expiration                                           2309             Time     MV
+   Accumulated-Cost                                             2052          Grouped     MV
+   Adaptations                                                  1217       Enumerated     MV
+   Additional-Content-Information                               1207          Grouped     MV
+   Additional-Exception-Reports                                 3936       Enumerated     MV
+   Additional-Type-Information                                  1205       UTF8String     MV
+   Address-Data                                                  897       UTF8String     MV
+   Address-Domain                                                898          Grouped     MV
+   Addressee-Type                                               1208       Enumerated     MV
+   Address-Type                                                  899       Enumerated     MV
+   AF-Correlation-Information                                   1276          Grouped     MV
+   Alternate-Charged-Party-Address                              1280       UTF8String     MV
+   Announcement-Identifier                                      3905       Unsigned32     MV
+   Announcement-Information                                     3904          Grouped     MV
+   Announcement-Order                                           3906       Unsigned32     MV
+   Announcing-PLMN-ID                                           4408       UTF8String     MV
+   Announcing-UE-HPLMN-Identifier                               3426       UTF8String     MV
+   Announcing-UE-VPLMN-Identifier                               3427       UTF8String     MV
+   AoC-Cost-Information                                         2053          Grouped     MV
+   AoC-Format                                                   2310       Enumerated     MV
+   AoC-Information                                              2054          Grouped     MV
+   AoC-Request-Type                                             2055       Enumerated     MV
+   AoC-Service                                                  2311          Grouped     MV
+   AoC-Service-Obligatory-Type                                  2312       Enumerated     MV
+   AoC-Service-Type                                             2313       Enumerated     MV
+   AoC-Subscription-Information                                 2314          Grouped     MV
+   APN-Rate-Control                                             3933          Grouped     MV
+   APN-Rate-Control-Downlink                                    3934          Grouped     MV
+   APN-Rate-Control-Uplink                                      3935          Grouped     MV
+   Applic-ID                                                    1218       UTF8String     MV
+   Application-Provided-Called-Party-Address                     837       UTF8String     MV
+   Application-Server                                            836       UTF8String     MV
+   Application-Server-Information                                850          Grouped     MV
+   Application-Specific-Data                                    3458      OctetString     MV
+   Associated-Party-Address                                     2035       UTF8String     MV
+   Associated-URI                                                856       UTF8String     MV
+   Authorised-QoS                                                849       UTF8String     MV
+   Aux-Applic-Info                                              1219       UTF8String     MV
+   Base-Time-Interval                                           1265       Unsigned32     MV
+   Basic-Service-Code                                           3411          Grouped     MV
+   Bearer-Capability                                            3412      OctetString     MV
+   Bearer-Service                                                854      OctetString     MV
+   BSSID                                                        2716       UTF8String     MV
+   Called-Asserted-Identity                                     1250       UTF8String     MV
+   Called-Identity                                              3916       UTF8String     MV
+   Called-Identity-Change                                       3917          Grouped     MV
+   Called-Party-Address                                          832       UTF8String     MV
+   Calling-Party-Address                                         831       UTF8String     MV
+   Carrier-Select-Routing-Information                           2023       UTF8String     MV
+   Cause-Code                                                    861        Integer32     MV
+   Cellular-Network-Information                                 3924      OctetString     MV
+   CG-Address                                                    846          Address     MV
+   Change-Condition                                             2037        Integer32     MV
+   Change-Time                                                  2038             Time     MV
+   Charge-Reason-Code                                           2118       Enumerated     MV
+   Charged-Party                                                 857       UTF8String     MV
+   Charging-Characteristics-Selection-Mode                      2066       Enumerated     MV
+   Charging-Per-IP-CAN-Session-Indicator                        4400       Enumerated     MV
+   Class-Identifier                                             1214       Enumerated     MV
+   Client-Address                                               2018          Address     MV
+   CN-Operator-Selection-Entity                                 3421       Enumerated     MV
+   Content-Class                                                1220       Enumerated     MV
+   Content-Disposition                                           828       UTF8String     MV
+   Content-Length                                                827       Unsigned32     MV
+   Content-Size                                                 1206       Unsigned32     MV
+   Content-Type                                                  826       UTF8String     MV
+   Coverage-Info                                                3459          Grouped     MV
+   Coverage-Status                                              3428       Enumerated     MV
+   CP-CIoT-EPS-Optimisation-Indicator                           3930       Enumerated     MV
+   CPDT-Information                                             3927          Grouped     MV
+   CSG-Access-Mode                                              2317       Enumerated     MV
+   CSG-Membership-Indication                                    2318       Enumerated     MV
+   CUG-Information                                              2304      OctetString     MV
+   Current-Tariff                                               2056          Grouped     MV
+   Data-Coding-Scheme                                           2001        Integer32     MV
+   Deferred-Location-Event-Type                                 1230       UTF8String     MV
+   Delivery-Report-Requested                                    1216       Enumerated     MV
+   Destination-Interface                                        2002          Grouped     MV
+   Diagnostics                                                  2039        Integer32     MV
+   Discoveree-UE-HPLMN-Identifier                               4402       UTF8String     MV
+   Discoveree-UE-VPLMN-Identifier                               4403       UTF8String     MV
+   Discoverer-UE-HPLMN-Identifier                               4404       UTF8String     MV
+   Discoverer-UE-VPLMN-Identifier                               4405       UTF8String     MV
+   Domain-Name                                                  1200       UTF8String     MV
+   DRM-Content                                                  1221       Enumerated     MV
+   Dynamic-Address-Flag                                         2051       Enumerated     MV
+   Dynamic-Address-Flag-Extension                               2068       Enumerated     MV
+   Early-Media-Description                                      1272          Grouped     MV
+   Enhanced-Diagnostics                                         3901          Grouped     MV
+   Envelope                                                     1266          Grouped     MV
+   Envelope-End-Time                                            1267             Time     MV
+   Envelope-Reporting                                           1268       Enumerated     MV
+   Envelope-Start-Time                                          1269             Time     MV
+   EPDG-Address                                                 3425          Address     MV
+   Event                                                         825       UTF8String     MV
+   Event-Charging-TimeStamp                                     1258             Time     MV
+   Event-Type                                                    823          Grouped     MV
+   Expires                                                       888       Unsigned32     MV
+   FE-Identifier-List                                           4413       UTF8String     MV
+   File-Repair-Supported                                        1224       Enumerated     MV
+   Forwarding-Pending                                           3415       Enumerated     MV
+   From-Address                                                 2708       UTF8String     MV
+   GGSN-Address                                                  847          Address     MV
+   IMS-Application-Reference-Identifier                         2601       UTF8String     MV
+   IMS-Charging-Identifier                                       841       UTF8String     MV
+   IMS-Communication-Service-Identifier                         1281       UTF8String     MV
+   IMS-Emergency-Indicator                                      2322       Enumerated     MV
+   IMS-Information                                               876          Grouped     MV
+   IMS-Visited-Network-Identifier                               2713       UTF8String     MV
+   IMSI-Unauthenticated-Flag                                    2308       Enumerated     MV
+   Incoming-Trunk-Group-Id                                       852       UTF8String     MV
+   Incremental-Cost                                             2062          Grouped     MV
+   Initial-IMS-Charging-Identifier                              2321       UTF8String     MV
+   Instance-Id                                                  3402       UTF8String     MV
+   Interface-Id                                                 2003       UTF8String     MV
+   Interface-Port                                               2004       UTF8String     MV
+   Interface-Text                                               2005       UTF8String     MV
+   Interface-Type                                               2006       Enumerated     MV
+   Inter-Operator-Identifier                                     838          Grouped     MV
+   Inter-UE-Transfer                                            3902       Enumerated     MV
+   IP-Realm-Default-Indication                                  2603       Enumerated     MV
+   ISUP-Cause                                                   3416          Grouped     MV
+   ISUP-Cause-Diagnostics                                       3422      OctetString     MV
+   ISUP-Cause-Location                                          3423       Unsigned32     MV
+   ISUP-Cause-Value                                             3424       Unsigned32     MV
+   ISUP-Location-Number                                         3414      OctetString     MV
+   Language                                                     3914       UTF8String     MV
+   Layer-2-Group-ID                                             3429      OctetString     MV
+   LCS-APN                                                      1231       UTF8String     MV
+   LCS-Client-Dialed-By-MS                                      1233       UTF8String     MV
+   LCS-Client-External-ID                                       1234       UTF8String     MV
+   LCS-Client-ID                                                1232          Grouped     MV
+   LCS-Client-Name                                              1235          Grouped     MV
+   LCS-Client-Type                                              1241       Enumerated     MV
+   LCS-Data-Coding-Scheme                                       1236       UTF8String     MV
+   LCS-Format-Indicator                                         1237       Enumerated     MV
+   LCS-Information                                               878          Grouped     MV
+   LCS-Name-String                                              1238       UTF8String     MV
+   LCS-Requestor-ID                                             1239          Grouped     MV
+   LCS-Requestor-ID-String                                      1240       UTF8String     MV
+   Local-GW-Inserted-Indication                                 2604       Enumerated     MV
+   Local-Sequence-Number                                        2063       Unsigned32     MV
+   Location-Estimate                                            1242      OctetString     MV
+   Location-Estimate-Type                                       1243       Enumerated     MV
+   Location-Info                                                3460          Grouped     MV
+   Location-Type                                                1244          Grouped     MV
+   Low-Balance-Indication                                       2020       Enumerated     MV
+   Low-Priority-Indicator                                       2602       Enumerated     MV
+   MBMS-Charged-Party                                           2323       Enumerated     MV
+   MBMS-GW-Address                                              2307          Address     MV
+   MBMS-Information                                              880          Grouped     MV
+   MBMS-User-Service-Type                                       1225       Enumerated     MV
+   Media-Initiator-Flag                                          882       Enumerated     MV
+   Media-Initiator-Party                                        1288       UTF8String     MV
+   Message-Body                                                  889          Grouped     MV
+   Message-Class                                                1213          Grouped     MV
+   Message-ID                                                   1210       UTF8String     MV
+   Message-Size                                                 1212       Unsigned32     MV
+   Message-Type                                                 1211       Enumerated     MV
+   MMBox-Storage-Requested                                      1248       Enumerated     MV
+   MM-Content-Type                                              1203          Grouped     MV
+   MMS-Information                                               877          Grouped     MV
+   MMTel-Information                                            2030          Grouped     MV
+   MMTel-SService-Type                                          2031       Unsigned32     MV
+   Monitored-PLMN-Identifier                                    3430       UTF8String     MV
+   Monitoring-Event-Configuration-Activity                      3919        Integer32     MV
+   Monitoring-Event-Functionality                               3922        Integer32     MV
+   Monitoring-Event-Information                                 3921          Grouped     MV
+   Monitoring-Event-Report-Data                                 3920          Grouped     MV
+   Monitoring-Event-Report-Number                               3923       Unsigned32     MV
+   Monitoring-UE-HPLMN-Identifier                               3431       UTF8String     MV
+   Monitoring-UE-Identifier                                     3432       UTF8String     MV
+   Monitoring-UE-VPLMN-Identifier                               3433       UTF8String     MV
+   MSC-Address                                                  3417      OctetString     MV
+   MTC-IWF-Address                                              3406          Address     MV
+   Neighbour-Node-Address                                       2705          Address     MV
+   Network-Call-Reference-Number                                3418      OctetString     MV
+   Next-Tariff                                                  2057          Grouped     VM
+   NIDD-Submission                                              3928          Grouped     VM
+   NNI-Information                                              2703          Grouped     MV
+   NNI-Type                                                     2704       Enumerated     MV
+   Node-Functionality                                            862       Enumerated     MV
+   Node-Id                                                      2064       UTF8String     MV
+   Number-Of-Diversions                                         2034       Unsigned32     MV
+   Number-Of-Messages-Sent                                      2019       Unsigned32     MV
+   Number-Of-Participants                                        885       Unsigned32     MV
+   Number-Of-Received-Talk-Bursts                               1282       Unsigned32     MV
+   Number-Of-Talk-Bursts                                        1283       Unsigned32     MV
+   Number-Portability-Routing-Information                       2024       UTF8String     MV
+   Offline-Charging                                             1278          Grouped     MV
+   Online-Charging-Flag                                         2303       Enumerated     MV
+   Originating-IOI                                               839       UTF8String     MV
+   Originator                                                    864       Enumerated     MV
+   Originator-Address                                            886          Grouped     MV
+   Originator-Interface                                         2009          Grouped     MV
+   Originator-Received-Address                                  2027          Grouped     MV
+   Originator-SCCP-Address                                      2008          Address     MV
+   Outgoing-Session-Id                                          2320       UTF8String     MV
+   Outgoing-Trunk-Group-Id                                       853       UTF8String     MV
+   Participant-Access-Priority                                  1259       Enumerated     MV
+   Participant-Action-Type                                      2049       Enumerated     MV
+   Participant-Group                                            1260          Grouped     MV
+   Participants-Involved                                         887       UTF8String     MV
+   PC3-Control-Protocol-Cause                                   3434        Integer32     MV
+   PC3-EPC-Control-Protocol-Cause                               3435        Integer32     MV
+   PC5-Radio-Technology                                         1300       Enumerated      V
+   PDN-Connection-Charging-ID                                   2050       Unsigned32     MV
+   PDP-Address                                                  1227          Address     MV
+   PDP-Address-Prefix-Length                                    2606       Unsigned32     MV
+   PDP-Context-Type                                             1247       Enumerated     MV
+   Play-Alternative                                             3913       Enumerated     MV
+   PoC-Change-Condition                                         1261       Enumerated     MV
+   PoC-Change-Time                                              1262             Time     MV
+   PoC-Controlling-Address                                       858       UTF8String     MV
+   PoC-Event-Type                                               2025       Enumerated     MV
+   PoC-Group-Name                                                859       UTF8String     MV
+   PoC-Information                                               879          Grouped     MV
+   PoC-Server-Role                                               883       Enumerated     MV
+   PoC-Session-Id                                               1229       UTF8String     MV
+   PoC-Session-Initiation-Type                                  1277       Enumerated     MV
+   PoC-Session-Type                                              884       Enumerated     MV
+   PoC-User-Role                                                1252          Grouped     MV
+   PoC-User-Role-IDs                                            1253       UTF8String     MV
+   PoC-User-Role-Info-Units                                     1254       Enumerated     MV
+   Positioning-Data                                             1245       UTF8String     MV
+   Preferred-AoC-Currency                                       2315       Unsigned32     MV
+   Priority                                                     1209       Enumerated     MV
+   Privacy-Indicator                                            3915       Enumerated     MV
+   ProSe-3rd-Party-Application-ID                               3440       UTF8String     MV
+   ProSe-Direct-Communication-Reception-Data-Container          3461          Grouped     MV
+   ProSe-Direct-Communication-Transmission-Data-Container      3441          Grouped     MV
+   ProSe-Direct-Discovery-Model                                 3442       Enumerated     MV
+   ProSe-Event-Type                                             3443       Enumerated     MV
+   ProSe-Function-IP-Address                                    3444          Address     MV
+   ProSe-Function-PLMN-Identifier                               3457       UTF8String     MV
+   ProSe-Functionality                                          3445       Enumerated     MV
+   ProSe-Group-IP-Multicast-Address                             3446          Address     MV
+   ProSe-Information                                            3447          Grouped     MV
+   ProSe-Range-Class                                            3448       Enumerated     MV
+   ProSe-Reason-For-Cancellation                                3449       Enumerated     MV
+   ProSe-Request-Timestamp                                      3450             Time     MV
+   ProSe-Role-Of-UE                                             3451       Enumerated     MV
+   ProSe-Source-IP-Address                                      3452          Address     MV
+   ProSe-Target-Layer-2-ID                                      4410      OctetString     MV
+   ProSe-UE-ID                                                  3453      OctetString     MV
+   ProSe-UE-to-Network-Relay-UE-ID                              4409      OctetString     MV
+   Proximity-Alert-Indication                                   3454       Enumerated     MV
+   Proximity-Alert-Timestamp                                    3455             Time     MV
+   Proximity-Cancellation-Timestamp                             3456             Time     MV
+   PS-Append-Free-Format-Data                                    867       Enumerated     MV
+   PS-Free-Format-Data                                           866      OctetString     MV
+   PS-Furnish-Charging-Information                               865          Grouped     MV
+   PS-Information                                                874          Grouped     MV
+   Quota-Consumption-Time                                        881       Unsigned32     MV
+   Quota-Holding-Time                                            871       Unsigned32     MV
+   Quota-Indicator                                              3912       Enumerated     MV
+   Radio-Frequency                                              3462      OctetString     MV
+   Radio-Parameter-Set-Info                                     3463          Grouped     MV
+   Radio-Parameter-Set-Values                                   3464      OctetString     MV
+   Radio-Resources-Indicator                                    3465        Integer32     MV
+   RAN-End-Time                                                 1301             Time      V
+   RAN-Secondary-RAT-Usage-Report                               1302          Grouped      V
+   RAN-Start-Time                                               1303             Time      V
+   Rate-Control-Max-Message-Size                                3937       Unsigned32     MV
+   Rate-Control-Max-Rate                                        3938       Unsigned32     MV
+   Rate-Control-Time-Unit                                       3939       Unsigned32     MV
+   Rate-Element                                                 2058          Grouped     MV
+   Read-Reply-Report-Requested                                  1222       Enumerated     MV
+   Real-Time-Tariff-Information                                 2305          Grouped     MV
+   Reason-Header                                                3401       UTF8String     MV
+   Received-Talk-Burst-Time                                     1284       Unsigned32     MV
+   Received-Talk-Burst-Volume                                   1285       Unsigned32     MV
+   Recipient-Address                                            1201          Grouped     MV
+   Recipient-Info                                               2026          Grouped     MV
+   Recipient-Received-Address                                   2028          Grouped     MV
+   Recipient-SCCP-Address                                       2010          Address     MV
+   Refund-Information                                           2022      OctetString     MV
+   Related-Change-Condition-Information                         3925          Grouped     MV
+   Related-Trigger                                              3926          Grouped     MV
+   Related-IMS-Charging-Identifier                              2711       UTF8String     MV
+   Related-IMS-Charging-Identifier-Node                         2712          Address     MV
+   Relationship-Mode                                            2706       Enumerated     MV
+   Relay-IP-address                                             4411          Address     MV
+   Remaining-Balance                                            2021          Grouped     MV
+   Reply-Applic-ID                                              1223       UTF8String     MV
+   Reply-Path-Requested                                         2011       Enumerated     MV
+   Reporting-Reason                                              872       Enumerated     MV
+   Requested-Party-Address                                      1251       UTF8String     MV
+   Requested-PLMN-Identifier                                    3436       UTF8String     MV
+   Requestor-PLMN-Identifier                                    3437       UTF8String     MV
+   Role-Of-Node                                                  829       Enumerated     MV
+   Role-Of-ProSe-Function                                       3438       Enumerated     MV
+   Route-Header-Received                                        3403       UTF8String     MV
+   Route-Header-Transmitted                                     3404       UTF8String     MV
+   Scale-Factor                                                 2059          Grouped     MV
+   SCS-Address                                                  3941          Address     MV
+   SCS-AS-Address                                               3940          Grouped     MV
+   SCS-Realm                                                    3942 DiameterIdentity     MV
+   SDP-Answer-Timestamp                                         1275             Time     MV
+   SDP-Media-Component                                           843          Grouped     MV
+   SDP-Media-Description                                         845       UTF8String     MV
+   SDP-Media-Name                                                844       UTF8String     MV
+   SDP-Offer-Timestamp                                          1274             Time     MV
+   SDP-Session-Description                                       842       UTF8String     MV
+   SDP-TimeStamps                                               1273          Grouped     MV
+   SDP-Type                                                     2036       Enumerated     MV
+   Secondary-RAT-Type                                           1304      OctetString      V
+   Serving-Node-Identity                                        3929 DiameterIdentity     MV
+   Served-Party-IP-Address                                       848          Address     MV
+   Service-Data-Container                                       2040          Grouped     MV
+   Service-Id                                                    855       UTF8String     MV
+   Service-Information                                           873          Grouped     MV
+   Service-Mode                                                 2032       Unsigned32     MV
+   Service-Specific-Data                                         863       UTF8String     MV
+   Service-Specific-Info                                        1249          Grouped     MV
+   Service-Specific-Type                                        1257       Unsigned32     MV
+   Serving-Node-Type                                            2047       Enumerated     MV
+   Session-Direction                                            2707       Enumerated     MV
+   SGi-PtP-Tunnelling-Method                                    3931       Enumerated     MV
+   SGSN-Address                                                 1228          Address     MV
+   SGW-Address                                                  2067          Address     MV
+   SGW-Change                                                   2065       Enumerated     MV
+   SIP-Method                                                    824       UTF8String     MV
+   SIP-Request-Timestamp                                         834             Time     MV
+   SIP-Request-Timestamp-Fraction                               2301       Unsigned32     MV
+   SIP-Response-Timestamp                                        835             Time     MV
+   SIP-Response-Timestamp-Fraction                              2302       Unsigned32     MV
+   SM-Device-Trigger-Indicator                                  3407       Enumerated     MV
+   SM-Device-Trigger-Information                                3405          Grouped     MV
+   SM-Discharge-Time                                            2012             Time     MV
+   SM-Message-Type                                              2007       Enumerated     MV
+   SM-Protocol-ID                                               2013      OctetString     MV
+   SM-Sequence-Number                                           3408       Unsigned32     MV
+   SM-Service-Type                                              2029       Enumerated     MV
+   SM-Status                                                    2014     OctetString      MV
+   SM-User-Data-Header                                          2015      OctetString     MV
+   SMS-Information                                              2000          Grouped     MV
+   SMS-Node                                                     2016       Enumerated     MV
+   SMS-Result                                                   3409       Unsigned32     MV
+   SMSC-Address                                                 2017          Address     MV
+   Start-of-Charging                                            3419             Time     MV
+   Start-Time                                                   2041             Time     MV
+   Status-AS-Code                                              2702       Enumerated     MV
+   Stop-Time                                                    2042             Time     MV
+   Submission-Time                                              1202             Time     MV
+   Subscriber-Role                                              2033       Enumerated     MV
+   Supplementary-Service                                        2048          Grouped     MV
+   TAD-Identifier                                               2717       Enumerated     MV
+   Talk-Burst-Exchange                                          1255          Grouped     MV
+   Talk-Burst-Time                                              1286       Unsigned32     MV
+   Talk-Burst-Volume                                            1287       Unsigned32     MV
+   Target-IP-Address                                            4412          Address     MV
+   Tariff-Information                                           2060          Grouped     MV
+   Tariff-XML                                                   2306       UTF8String     MV
+   Teleservice                                                  3413      OctetString     MV
+   Terminating-IOI                                               840       UTF8String     MV
+   Time-First-Reception                                         3466             Time     MV
+   Time-First-Transmission                                      3467             Time     MV
+   Time-First-Usage                                             2043             Time     MV
+   Time-Indicator                                               3911       Unsigned32     MV
+   Time-Last-Usage                                              2044             Time     MV
+   Time-Quota-Mechanism                                         1270          Grouped     MV
+   Time-Quota-Threshold                                          868       Unsigned32     MV
+   Time-Quota-Type                                              1271       Enumerated     MV
+   Time-Stamps                                                   833          Grouped     MV
+   Time-Usage                                                   2045       Unsigned32     MV
+   Token-Text                                                   1215       UTF8String     MV
+   Traffic-Data-Volumes                                         2046          Grouped     MV
+   Transcoder-Inserted-Indication                               2605       Enumerated     MV
+   Transit-IOI-List                                             2701       UTF8String     MV
+   Transmitter-Info                                             3468          Grouped     MV
+   Trigger                                                      1264          Grouped     MV
+   Trigger-Type                                                  870       Enumerated     MV
+   Trunk-Group-Id                                                851          Grouped     MV
+   TWAG-Address                                                 3903          Address     MV
+   TWAN-User-Location-Info                                      2714          Grouped     MV
+   Type-Number                                                  1204       Enumerated     MV
+   UNI-PDU-CP-Only-Flag                                         3932       Enumerated     MV
+   Unit-Cost                                                    2061          Grouped     MV
+   Unit-Quota-Threshold                                         1226       Unsigned32     MV
+   Unused-Quota-Timer                                           4407       Unsigned32     MV
+   Usage-Information-Report-Sequence-Number                     3439        Integer32     MV
+   User-CSG-Information                                         2319          Grouped     MV
+   User-Participating-Type                                      1279       Enumerated     MV
+   User-Session-Id                                               830       UTF8String     MV
+   UWAN-User-Location-Info                                      3918          Grouped     MV
+   Variable-Part                                                3907          Grouped     MV
+   Variable-Part-Order                                          3908       Unsigned32     MV
+   Variable-Part-Type                                           3909       Enumerated     MV
+   Variable-Part-Value                                          3910       UTF8String     MV
+   VCS-Information                                              3410          Grouped     MV
+   VLR-Number                                                   3420      OctetString     MV
+   Volume-Quota-Threshold                                        869       Unsigned32     MV
+
+;; ===========================================================================
+
+@grouped
+
+   Access-Network-Info-Change ::=  < AVP Header: 4401>
+
+         * [ Access-Network-Information ]
+           [ Cellular-Network-Information ]
+           [ Change-Time ]
+
+   Access-Transfer-Information ::=  < AVP Header: 2709>
+
+           [ Access-Transfer-Type ]
+         * [ Access-Network-Information ]
+           [ Cellular-Network-Information ]
+           [ Inter-UE-Transfer ]
+           [ User-Equipment-Info ]
+           [ Instance-Id ]
+           [ Related-IMS-Charging-Identifier ]
+           [ Related-IMS-Charging-Identifier-Node ]
+           [ Change-Time ]
+
+   Accumulated-Cost ::= < AVP Header: 2052 >
+
+           { Value-Digits }
+           [ Exponent ]
+
+   Additional-Content-Information ::= < AVP Header: 1207 >
+
+           [ Type-Number ]
+           [ Additional-Type-Information ]
+           [ Content-Size ]
+
+   Address-Domain ::=  < AVP Header: 898 >
+
+           [ Domain-Name ]
+           [ 3GPP-IMSI-MCC-MNC ]
+
+   AF-Correlation-Information ::=  < AVP Header: 1276 >
+
+           { AF-Charging-Identifier }
+         * [ Flows ]
+
+   Announcement-Information ::=  < AVP Header: 3904 >
+
+           { Announcement-Identifier }
+         * [ Variable-Part ]
+           [ Time-Indicator ]
+           [ Quota-Indicator ]
+           [ Announcement-Order ]
+           [ Play-Alternative ]
+           [ Privacy-Indicator ]
+           [ Language ]
+
+
+   AoC-Cost-Information ::= < AVP Header: 2053 >
+
+           [ Accumulated-Cost ]
+         * [ Incremental-Cost ]
+           [ Currency-Code ]
+
+   AoC-Information ::= < AVP Header: 2054 >
+
+           [ AoC-Cost-Information ]
+           [ Tariff-Information ]
+           [ AoC-Subscription-Information ]
+
+   AoC-Service ::= < AVP Header: 2311 >
+
+           [ AoC-Service-Obligatory-Type ]
+           [ AoC-Service-Type ]
+
+
+   AoC-Subscription-Information ::= < AVP Header: 2314 >
+
+         * [ AoC-Service ]
+           [ AoC-Format ]
+           [ Preferred-AoC-Currency ]
+
+   APN-Rate-Control ::= < AVP Header: 3933 >
+
+           [ APN-Rate-Control-Uplink ]
+           [ APN-Rate-Control-Downlink]
+
+   APN-Rate-Control-Downlink ::= < AVP Header: 3934 >
+
+           [ Rate-Control-Time-Unit ]
+           [ Rate-Control-Max-Rate ]
+           [ Rate-Control-Max-Message-Size ]
+
+   APN-Rate-Control-Uplink ::= < AVP Header: 3935>
+
+           [ Additional-Exception-Reports ]
+           [ Rate-Control-Time-Unit ]
+           [ Rate-Control-Max-Rate ]
+
+   Application-Server-Information ::= < AVP Header: 850 >
+
+           [ Application-Server ]
+         * [ Application-Provided-Called-Party-Address ]
+           [ Status-AS-Code ]
+
+   Basic-Service-Code ::= < AVP Header: 3411 >
+
+           [ Bearer-Service ]
+           [ Teleservice ]
+
+   Called-Identity-Change ::= < AVP Header: 3917>
+           [ Called-Identity ]
+           [ Change-Time ]
+
+   Coverage-Info ::= < AVP Header: 3459>
+
+           [ Coverage-Status ]
+           [ Change-Time ]
+         * [ Location-Info ]
+
+   CPDT-Information ::= < AVP Header: 3927>
+
+;;         [ External-Identifier ]
+;;         [ SCEF-ID ]
+           [ Serving-Node-Identity ]
+           [ SGW-Change ]
+           [ NIDD-Submission ]
+
+   Current-Tariff ::= < AVP Header: 2056 >
+
+           [ Currency-Code ]
+           [ Scale-Factor ]
+         * [ Rate-Element ]
+
+   Destination-Interface ::= < AVP Header: 2002 >
+
+           [ Interface-Id ]
+           [ Interface-Text ]
+           [ Interface-Port ]
+           [ Interface-Type ]
+
+   Early-Media-Description ::= <AVP Header: 1272>
+
+           [ SDP-TimeStamps ]
+         * [ SDP-Media-Component ]
+         * [ SDP-Session-Description ]
+
+   Enhanced-Diagnostics ::= < AVP Header: 3901>
+
+         * [ RAN-NAS-Release-Cause ]
+
+   Envelope ::= < AVP Header: 1266>
+
+           { Envelope-Start-Time }
+           [ Envelope-End-Time ]
+           [ CC-Total-Octets ]
+           [ CC-Input-Octets ]
+           [ CC-Output-Octets ]
+           [ CC-Service-Specific-Units ]
+
+   Event-Type ::= <AVP Header: 823 >
+           [ SIP-Method ]
+           [ Event ]
+           [ Expires ]
+
+   Incremental-Cost ::= < AVP Header: 2062 >
+
+           { Value-Digits }
+           [ Exponent ]
+
+   IMS-Information ::= < AVP Header: 876>
+
+           { Node-Functionality }
+           [ Event-Type ]
+           [ Role-Of-Node ]
+           [ User-Session-Id ]
+           [ Outgoing-Session-Id ]
+           [ Session-Priority ]
+         * [ Calling-Party-Address ]
+           [ Called-Party-Address ]
+         * [ Called-Asserted-Identity ]
+           [ Called-Identity-Change ]
+           [ Number-Portability-Routing-Information ]
+           [ Carrier-Select-Routing-Information ]
+           [ Alternate-Charged-Party-Address ]
+         * [ Requested-Party-Address ]
+         * [ Associated-URI ]
+           [ Time-Stamps ]
+         * [ Application-Server-Information ]
+         * [ Inter-Operator-Identifier ]
+         * [ Transit-IOI-List ]
+           [ IMS-Charging-Identifier ]
+         * [ SDP-Session-Description ]
+         * [ SDP-Media-Component ]
+           [ Served-Party-IP-Address ]
+;;         [ Server-Capabilities ]
+           [ Trunk-Group-Id ]
+           [ Bearer-Service ]
+           [ Service-Id ]
+         * [ Service-Specific-Info ]
+         * [ Message-Body ]
+           [ Cause-Code ]
+         * [ Reason-Header ]
+         * [ Access-Network-Information ]
+           [ Cellular-Network-Information ]
+         * [ Early-Media-Description ]
+           [ IMS-Communication-Service-Identifier ]
+           [ IMS-Application-Reference-Identifier ]
+           [ Online-Charging-Flag ]
+           [ Real-Time-Tariff-Information ]
+           [ Account-Expiration ]
+           [ Initial-IMS-Charging-Identifier ]
+         * [ NNI-Information ]
+           [ From-Address ]
+           [ IMS-Emergency-Indicator ]
+           [ IMS-Visited-Network-Identifier ]
+         * [ Access-Network-Info-Change ]
+         * [ Access-Transfer-Information ]
+           [ Related-IMS-Charging-Identifier ]
+           [ Related-IMS-Charging-Identifier-Node ]
+           [ Route-Header-Received ]
+           [ Route-Header-Transmitted ]
+           [ Instance-Id ]
+           [ TAD-Identifier ]
+           [ FE-Identifier-List ]
+
+   Inter-Operator-Identifier ::= < AVP Header: 838 >
+
+           [ Originating-IOI ]
+           [ Terminating-IOI ]
+
+   ISUP-Cause ::= <AVP Header: 3416>
+
+           [ ISUP-Cause-Location ]
+           [ ISUP-Cause-Value ]
+           [ ISUP-Cause-Diagnostics ]
+
+   LCS-Client-ID ::= < AVP Header: 1232 >
+
+           [ LCS-Client-Type ]
+           [ LCS-Client-External-ID ]
+           [ LCS-Client-Dialed-By-MS ]
+           [ LCS-Client-Name ]
+           [ LCS-APN ]
+           [ LCS-Requestor-ID ]
+
+   LCS-Client-Name ::= < AVP Header: 1235>
+
+           [ LCS-Data-Coding-Scheme ]
+           [ LCS-Name-String ]
+           [ LCS-Format-Indicator ]
+
+   LCS-Information ::= < AVP Header: 878>
+
+           [ LCS-Client-ID ]
+           [ Location-Type ]
+           [ Location-Estimate ]
+           [ Positioning-Data ]
+           [ 3GPP-IMSI ]
+           [ MSISDN ]
+
+   LCS-Requestor-ID ::= < AVP Header: 1239 >
+
+           [ LCS-Data-Coding-Scheme ]
+           [ LCS-Requestor-ID-String ]
+
+   Location-Info ::= < AVP Header: 3460>
+
+           [ 3GPP-User-Location-Info ]
+           [ Change-Time ]
+
+   Location-Type ::= < AVP Header: 1244>
+
+           [ Location-Estimate-Type ]
+           [ Deferred-Location-Event-Type ]
+
+
+   MBMS-Information ::= < AVP Header: 880>
+
+           [ TMGI ]
+;;         [ MBMS-Service-Type ]                            ;; 3GPP TS 29.061
+           [ MBMS-User-Service-Type ]
+           [ File-Repair-Supported ]
+;;         [ Required-MBMS-Bearer-Capabilities ]
+           [ MBMS-2G-3G-Indicator ]
+;;         [ RAI ]
+         * [ MBMS-Service-Area ]
+           [ MBMS-Session-Identity ]
+           [ CN-IP-Multicast-Distribution ]
+           [ MBMS-GW-Address ]
+           [ MBMS-Charged-Party ]
+         * [ MSISDN ]
+;;         [ MBMS-Data-Transfer-Start ]
+;;         [ MBMS-Data-Transfer-Stop ]
+
+   Message-Body ::= < AVP Header: 889 >
+
+           { Content-Type }
+           { Content-Length }
+           [ Content-Disposition ]
+           [ Originator ]
+
+   Message-Class ::= < AVP Header: 1213 >
+
+           [ Class-Identifier ]
+           [ Token-Text ]
+
+   MM-Content-Type ::= < AVP Header: 1203 >
+
+           [ Type-Number ]
+           [ Additional-Type-Information ]
+           [ Content-Size ]
+         * [ Additional-Content-Information ]
+
+   MMS-Information ::= < AVP Header: 877>
+
+           [ Originator-Address ]
+         * [ Recipient-Address ]
+           [ Submission-Time ]
+           [ MM-Content-Type ]
+           [ Priority ]
+           [ Message-ID ]
+           [ Message-Type ]
+           [ Message-Size ]
+           [ Message-Class ]
+           [ Delivery-Report-Requested ]
+           [ Read-Reply-Report-Requested ]
+           [ MMBox-Storage-Requested ]
+           [ Applic-ID ]
+           [ Reply-Applic-ID ]
+           [ Aux-Applic-Info ]
+           [ Content-Class ]
+           [ DRM-Content ]
+           [ Adaptations ]
+;;         [ VASP-Id ]                                      ;; 3GPP TS 29.140
+;;         [ VAS-Id ]
+
+   MMTel-Information ::= < AVP Header: 2030>
+
+         * [ Supplementary-Service ]
+
+   Monitoring-Event-Information ::= < AVP Header: 3921>
+
+           [ Monitoring-Event-Functionality ]
+           [ Event-Timestamp ]
+           [ Monitoring-Event-Configuration-Activity ]
+;;         [ SCEF-Reference-ID ]
+;;         [ SCEF-ID ]
+;;         [ Monitoring-Type ]
+;;         [ Maximum-Number-of-Reports ]
+;;         [ Monitoring-Duration ]
+           [ Charged-Party ]
+;;         [ Maximum-Detection-Time]
+;;         [ UE-Reachability-Configuration ]
+;;         [ MONTE-Location-Type ]
+;;         [ Accuracy ]
+;;       * [ Number-Of-UE-Per-Location-Configuration ]
+         * [ Monitoring-Event-Report-Data ]
+
+   Monitoring-Event-Report-Data ::= < AVP Header: 3920>
+           [ Event-Timestamp ]
+;;         [ SCEF-Reference-ID ]
+;;         [ SCEF-ID ]
+           [ Monitoring-Event-Report-Number ]
+           [ Charged-Party ]
+           [ Subscription-Id ]
+;;         [ Monitoring-Type ]
+;;         [ Reachability-Information ]
+;;         [ EPS-Location-Information ]
+;;         [ Communication-Failure-Information ]            ;; 3GPP TS 29.128
+;;       * [ Number-Of-UE-Per-Location-Report ]
+
+   Next-Tariff ::= < AVP Header: 2057 >
+
+           [ Currency-Code ]
+           [ Scale-Factor ]
+         * [ Rate-Element ]
+
+
+   NIDD-Submission  ::= < AVP Header: 3928>
+
+           [ Submission-Time ]
+           [ Event-Timestamp ]
+           [ Accounting-Input-Octets ]
+           [ Accounting-Output-Octets ]
+           [ Change-Condition ]
+
+   NNI-Information ::= < AVP Header: 2703>
+
+           [ Session-Direction ]
+           [ NNI-Type ]
+           [ Relationship-Mode ]
+           [ Neighbour-Node-Address ]
+
+   Offline-Charging ::= < AVP Header:1278 >
+
+           [ Quota-Consumption-Time ]
+           [ Time-Quota-Mechanism ]
+           [ Envelope-Reporting ]
+         * [ Multiple-Services-Credit-Control ]
+         * [ AVP ]
+
+   Originator-Address ::= < AVP Header: 886 >
+
+           [ Address-Type ]
+           [ Address-Data ]
+           [ Address-Domain ]
+
+   Originator-Interface ::= < AVP Header: 2009 >
+
+           [ Interface-Id ]
+           [ Interface-Text ]
+           [ Interface-Port ]
+           [ Interface-Type ]
+
+   Originator-Received-Address ::= < AVP Header: 2027>
+
+           [ Address-Type ]
+           [ Address-Data ]
+           [ Address-Domain ]
+
+   Participant-Group ::= < AVP Header: 1260>
+
+           [ Called-Party-Address ]
+           [ Participant-Access-Priority ]
+           [ User-Participating-Type ]
+
+   PoC-Information ::= < AVP Header: 879>
+
+           [ PoC-Server-Role ]
+           [ PoC-Session-Type ]
+           [ PoC-User-Role ]
+           [ PoC-Session-Initiation-Type ]
+           [ PoC-Event-Type ]
+           [ Number-Of-Participants ]
+         * [ Participants-Involved ]
+         * [ Participant-Group ]
+         * [ Talk-Burst-Exchange ]
+           [ PoC-Controlling-Address ]
+           [ PoC-Group-Name ]
+           [ PoC-Session-Id ]
+           [ Charged-Party ]
+
+   PoC-User-Role ::= <AVP Header: 1252>
+
+           [ PoC-User-Role-IDs ]
+           [ PoC-User-Role-Info-Units ]
+
+   ProSe-Direct-Communication-Reception-Data-Container ::= < AVP Header: 3461>
+
+           [ Local-Sequence-Number ]
+           [ Coverage-Status ]
+           [ 3GPP-User-Location-Info ]
+           [ Accounting-Input-Octets ]
+           [ Change-Time ]
+           [ Change-Condition ]
+;;           [ Visited-PLMN-Id ]
+           [ Usage-Information-Report-Sequence-Number ]
+           [ Radio-Resources-Indicator]
+           [ Radio-Frequency ]
+
+   ProSe-Direct-Communication-Transmission-Data-Container ::= < AVP Header: 3441>
+
+           [ Local-Sequence-Number ]
+           [ Coverage-Status ]
+           [ 3GPP-User-Location-Info ]
+           [ Accounting-Output-Octets ]
+           [ Change-Time ]
+           [ Change-Condition ]
+;;           [ Visited-PLMN-Id ]
+           [ Usage-Information-Report-Sequence-Number ]
+           [ Radio-Resources-Indicator ]
+           [ Radio-Frequency ]
+
+   ProSe-Information ::= < AVP Header: 3447>
+
+           [ Announcing-UE-HPLMN-Identifier ]
+           [ Announcing-UE-VPLMN-Identifier ]
+           [ Monitoring-UE-HPLMN-Identifier ]
+           [ Monitoring-UE-VPLMN-Identifier ]
+;;         [ Monitored-HPLMN-Identifier ]
+           [ Role-Of-ProSe-Function ]
+;;         [ ProSe-App-Id ]
+           [ ProSe-3rd-Party-Application-ID ]
+           [ Application-Specific-Data ]
+           [ ProSe-Event-Type ]
+           [ ProSe-Direct-Discovery-Model ]
+           [ ProSe-Function-IP-Address ]
+;;         [ ProSe-Function-ID ]
+;;           [ ProSe-Validity-Timer ]
+           [ ProSe-Role-Of-UE ]
+           [ ProSe-Request-Timestamp ] [ PC3-Control-Protocol-Cause ]
+           [ Monitoring-UE-Identifier ]
+;;         [ Prose-Function-PLMN-Identifier ]
+           [ Requestor-PLMN-Identifier ]
+;;         [ Origin-App-Layer-User-Id ]
+;;         [ WLAN-Link-Layer-Id ]
+;;         [ Requesting-EPUID ]
+;;         [ Target-App-Layer-User-Id ]
+           [ Requested-PLMN-Identifier ]
+;;         [ Time-Window ]
+           [ ProSe-Range-Class ]
+           [ Proximity-Alert-Indication ]
+           [ Proximity-Alert-Timestamp ]
+           [ Proximity-Cancellation-Timestamp ]
+           [ ProSe-Reason-For-Cancellation ]
+           [ PC3-EPC-Control-Protocol-Cause ]
+           [ ProSe-UE-ID ]
+           [ ProSe-Source-IP-Address ]
+           [ Layer-2-Group-ID ]
+           [ ProSe-Group-IP-Multicast-Address ]
+         * [ Coverage-Info ]
+         * [ Radio-Parameter-Set-Info ]
+         * [ Transmitter-Info ]
+           [ Time-First-Transmission ]
+           [ Time-First-Reception ]
+         * [ ProSe-Direct-Communication-Transmission-Data-Container ]
+         * [ ProSe-Direct-Communication-Reception-Data-Container ]
+           [ Announcing-PLMN-ID]
+           [ ProSe-Target-Layer-2-ID ]
+           [ Relay-IP-address ]
+           [ ProSe-UE-to-Network-Relay-UE-ID ]
+           [ Target-IP-Address ]
+           [ PC5-Radio-Technology ]
+
+   PS-Furnish-Charging-Information ::= < AVP Header: 865>
+
+           { 3GPP-Charging-Id }
+           { PS-Free-Format-Data }
+           [ PS-Append-Free-Format-Data ]
+
+   PS-Information ::= < AVP Header: 874>
+
+           [ 3GPP-Charging-Id ]
+           [ PDN-Connection-Charging-ID ]
+           [ Node-Id ]
+           [ 3GPP-PDP-Type ]
+         * [ PDP-Address ]
+           [ PDP-Address-Prefix-Length ]
+           [ Dynamic-Address-Flag ]
+           [ Dynamic-Address-Flag-Extension ]
+           [ QoS-Information ]
+         * [ SGSN-Address ]
+         * [ GGSN-Address ]
+         * [ TDF-IP-Address ]
+         * [ SGW-Address ]
+;;       * [ ePDG-Address ]
+         * [ TWAG-Address ]
+           [ CG-Address ]
+           [ Serving-Node-Type ]
+           [ SGW-Change ]
+           [ 3GPP-IMSI-MCC-MNC ]
+           [ IMSI-Unauthenticated-Flag ]
+           [ 3GPP-GGSN-MCC-MNC ]
+           [ 3GPP-NSAPI ]
+           [ Called-Station-Id ]
+           [ 3GPP-Session-Stop-Indicator ]
+           [ 3GPP-Selection-Mode ]
+           [ 3GPP-Charging-Characteristics ]
+           [ Charging-Characteristics-Selection-Mode ]
+           [ 3GPP-SGSN-MCC-MNC ]
+           [ 3GPP-MS-TimeZone ]
+           [ Charging-Rule-Base-Name ]
+;;         [ ADC-Rule-Base-Name ]
+           [ 3GPP-User-Location-Info ]
+           [ User-Location-Info-Time ]
+           [ User-CSG-Information ]
+         * [ Presence-Reporting-Area-Information ]
+;;         [ 3GPP2-BSID ]
+           [ TWAN-User-Location-Info ]
+           [ UWAN-User-Location-Info ]
+           [ 3GPP-RAT-Type ]
+           [ PS-Furnish-Charging-Information ]
+           [ PDP-Context-Type ]
+           [ Offline-Charging ]
+         * [ Traffic-Data-Volumes ]
+         * [ Service-Data-Container ]
+           [ User-Equipment-Info ]
+;;         [ Terminal-Information ]
+           [ Start-Time ]
+           [ Stop-Time ]
+           [ Change-Condition ]
+           [ Diagnostics ]
+           [ Low-Priority-Indicator ]
+;;         [ NBIFOM-Mode ]
+;;         [ NBIFOM-Support ]
+;;         [ MME-Number-for-MT-SMS ]
+;;         [ MME-Name ]
+;;         [ MME-Realm ]
+           [ Logical-Access-ID ]
+           [ Physical-Access-ID ]
+           [ Fixed-User-Location-Info ]
+           [ CN-Operator-Selection-Entity ]
+           [ Enhanced-Diagnostics ]
+           [ SGi-PtP-Tunnelling-Method ]
+           [ CP-CIoT-EPS-Optimisation-Indicator ]
+           [ UNI-PDU-CP-Only-Flag ]
+;;         [ Serving-PLMN-Rate-Control ]
+           [ APN-Rate-Control ]
+           [ Charging-Per-IP-CAN-Session-Indicator ]
+;;         [ RRC-Cause-Counter ]
+           [ 3GPP-PS-Data-Off-Status ]
+           [ SCS-AS-Address ]
+           [ Unused-Quota-Timer ]
+         * [ RAN-Secondary-RAT-Usage-Report ]
+         * [ AVP ]
+
+   Radio-Parameter-Set-Info ::= < AVP Header: 3463>
+
+           [ Radio-Parameter-Set-Values ]
+           [ Change-Time ]
+
+   RAN-Secondary-RAT-Usage-Report ::= < AVP Header: 1302>
+
+           [ Secondary-RAT-Type ]
+;;         [ RAN-Start-Timestamp ]
+;;         [ RAN-End-Timestamp ]
+           [ Accounting-Input-Octets ]
+           [ Accounting-Output-Octets ]
+
+   Rate-Element ::= < AVP Header: 2058 >
+
+           { CC-Unit-Type }
+           [ Charge-Reason-Code ]
+           [ Unit-Value ]
+           [ Unit-Cost ]
+           [ Unit-Quota-Threshold ]
+
+   Real-Time-Tariff-Information ::= < AVP Header: 2305 >
+
+           [ Tariff-Information ]
+           [ Tariff-XML ]
+
+   Recipient-Address ::= < AVP Header: 1201 >
+
+           [ Address-Type ]
+           [ Address-Data ]
+           [ Address-Domain ]
+           [ Addressee-Type ]
+
+   Recipient-Info ::= < AVP Header: 2026 >
+
+           [ Destination-Interface ]
+         * [ Recipient-Address ]
+         * [ Recipient-Received-Address ]
+           [ Recipient-SCCP-Address ]
+           [ SM-Protocol-ID ]
+
+   Recipient-Received-Address ::= < AVP Header: 2028>
+
+           [ Address-Type ]
+           [ Address-Data ]
+           [ Address-Domain ]
+
+   Related-Change-Condition-Information ::= < AVP Header: 3925>
+
+           [ SGSN-Address ]
+         * [ Change-Condition]
+           [ 3GPP-User-Location-Info ]
+;;         [ 3GPP2-BSID ]
+           [ UWAN-User-Location-Info ]
+           [ Presence-Reporting-Area-Status ]
+           [ User-CSG-Information ]
+           [ 3GPP-RAT-Type ]
+
+   Related-Trigger  ::= < AVP Header: 3926 >
+
+         * [ Trigger-Type ]
+
+   Remaining-Balance ::= < AVP Header: 2021 >
+
+           { Unit-Value }
+           { Currency-Code }
+
+   Scale-Factor ::= < AVP Header: 2059 >
+
+           { Value-Digits }
+           [ Exponent ]
+
+   SCS-AS-Address ::= < AVP Header: 3940>
+
+           [ SCS-Realm ]
+           [ SCS-Address ]
+
+   SDP-Media-Component ::= < AVP Header: 843 >
+
+           [ SDP-Media-Name ]
+         * [ SDP-Media-Description ]
+           [ Local-GW-Inserted-Indication ]
+           [ IP-Realm-Default-Indication ]
+           [ Transcoder-Inserted-Indication ]
+           [ Media-Initiator-Flag ]
+           [ Media-Initiator-Party ]
+           [ 3GPP-Charging-Id ]
+           [ Access-Network-Charging-Identifier-Value ]
+           [ SDP-Type ]
+
+   SDP-TimeStamps ::= < AVP Header: 1273 >
+
+           [ SDP-Offer-Timestamp ]
+           [ SDP-Answer-Timestamp ]
+
+   Service-Data-Container ::= < AVP Header: 2040>
+
+           [ AF-Correlation-Information ]
+           [ Charging-Rule-Base-Name ]
+           [ Accounting-Input-Octets ]
+           [ Accounting-Output-Octets ]
+           [ Local-Sequence-Number ]
+           [ QoS-Information ]
+           [ Rating-Group ]
+           [ Change-Time ]
+           [ Service-Identifier ]
+           [ Service-Specific-Info ]
+;;         [ ADC-Rule-Base-Name ]
+           [ SGSN-Address ]
+           [ Time-First-Usage ]
+           [ Time-Last-Usage ]
+           [ Time-Usage ]
+         * [ Change-Condition]
+           [ 3GPP-User-Location-Info ]
+;;         [ 3GPP2-BSID ]
+           [ UWAN-User-Location-Info ]
+           [ Sponsor-Identity ]
+           [ Application-Service-Provider-Identity ]
+         * [ Presence-Reporting-Area-Information]
+           [ Presence-Reporting-Area-Status ]
+           [ User-CSG-Information ]
+           [ 3GPP-RAT-Type ]
+           [ Related-Change-Condition-Information ]
+;;         [ Serving-PLMN-Rate-Control ]
+           [ APN-Rate-Control ]
+           [ 3GPP-PS-Data-Off-Status ]
+;;         [ Traffic-Steering-Policy-Identifier-DL ]
+;;         [ Traffic-Steering-Policy-Identifier-UL ]
+
+   Service-Information ::= < AVP Header: 873>
+
+         * [ Subscription-Id ]
+           [ AoC-Information ]
+           [ PS-Information ]
+           [ IMS-Information ]
+           [ MMS-Information ]
+           [ LCS-Information ]
+           [ PoC-Information ]
+           [ MBMS-Information ]
+           [ SMS-Information ]
+           [ VCS-Information ]
+           [ MMTel-Information ]
+           [ ProSe-Information ]
+;;         [ Service-Generic-Information ]
+;;         [ IM-Information ]
+;;         [ DCD-Information ]
+;;         [ M2M-Information ]
+           [ CPDT-Information ]
+
+   Service-Specific-Info  ::= < AVP Header: 1249 >
+
+           [ Service-Specific-Data ]
+           [ Service-Specific-Type ]
+
+   SM-Device-Trigger-Information ::= < AVP Header: 3405>
+
+           [ MTC-IWF-Address ]
+;;         [ Reference-Number ]                             ;; 3GPP TS 29.337
+;;         [ Serving-Node ]
+           [ Validity-Time ]
+;;         [ Priority-Indication ]
+;;         [ Application-Port-Identifier ]
+
+   SMS-Information ::= < AVP Header: 2000>
+
+           [ SMS-Node ]
+           [ Client-Address ]
+           [ Originator-SCCP-Address ]
+           [ SMSC-Address ]
+           [ Data-Coding-Scheme ]
+           [ SM-Discharge-Time ]
+           [ SM-Message-Type ]
+           [ Originator-Interface ]
+           [ SM-Protocol-ID ]
+           [ Reply-Path-Requested ]
+           [ SM-Status ]
+           [ SM-User-Data-Header ]
+           [ Number-Of-Messages-Sent ]
+           [ SM-Sequence-Number ]
+         * [ Recipient-Info ]
+           [ Originator-Received-Address ]
+           [ SM-Service-Type ]
+           [ SMS-Result ]
+           [ SM-Device-Trigger-Indicator ]
+           [ SM-Device-Trigger-Information ]
+           [ MTC-IWF-Address ]
+;;         [ Application-Port-Identifier ]
+;;         [ External-Identifier ]
+
+   Supplementary-Service ::= < AVP Header: 2048>
+
+           [ MMTel-SService-Type ]
+           [ Service-Mode ]
+           [ Number-Of-Diversions ]
+           [ Associated-Party-Address ]
+           [ Service-Id ]
+           [ Change-Time ]
+           [ Number-Of-Participants ]
+           [ Participant-Action-Type ]
+           [ CUG-Information ]
+           [ AoC-Information ]
+
+   Talk-Burst-Exchange ::= < AVP Header: 1255 >
+
+           { PoC-Change-Time }
+           [ Number-Of-Talk-Bursts ]
+           [ Talk-Burst-Volume ]
+           [ Talk-Burst-Time ]
+           [ Number-Of-Received-Talk-Bursts ]
+           [ Received-Talk-Burst-Volume ]
+           [ Received-Talk-Burst-Time ]
+           [ Number-Of-Participants ]
+           [ PoC-Change-Condition ]
+
+   Tariff-Information ::= < AVP Header: 2060 >
+
+           { Current-Tariff }
+           [ Tariff-Time-Change ]
+           [ Next-Tariff ]
+
+   Time-Quota-Mechanism ::= < AVP Header: 1270>
+
+           { Time-Quota-Type }
+           { Base-Time-Interval }
+
+   Time-Stamps ::= < AVP Header: 833 >
+
+           [ SIP-Request-Timestamp ]
+           [ SIP-Response-Timestamp ]
+           [ SIP-Request-Timestamp-Fraction ]
+           [ SIP-Response-Timestamp-Fraction ]
+
+   Traffic-Data-Volumes ::= < AVP Header: 2046>
+
+           [ QoS-Information ]
+           [ Accounting-Input-Octets ]
+           [ Accounting-Output-Octets ]
+           [ Change-Condition ]
+           [ Change-Time ]
+           [ 3GPP-User-Location-Info ]
+           [ UWAN-User-Location-Info ]
+           [ 3GPP-Charging-Id ]
+           [ Presence-Reporting-Area-Status ]
+           [ User-CSG-Information ]
+           [ 3GPP-RAT-Type ]
+;;         [ Access-Availability-Change-Reason ]
+           [ Related-Change-Condition-Information ]
+           [ Diagnostics ]
+           [ Enhanced-Diagnostics ]
+           [ CP-CIoT-EPS-Optimisation-Indicator ]
+;;         [ Serving-PLMN-Rate-Control ]
+
+   Transmitter-Info ::= < AVP Header: 3468>
+
+           [ ProSe-Source-IP-Address ]
+           [ ProSe-UE-ID ]
+
+   Trigger  ::= < AVP Header: 1264 >
+
+         * [ Trigger-Type ]
+
+   Trunk-Group-Id ::= <AVP Header: 851>
+
+           [ Incoming-Trunk-Group-Id ]
+           [ Outgoing-Trunk-Group-Id ]
+
+   TWAN-User-Location-Info ::= < AVP Header: 2714>
+
+;;         { SSID }
+           [ BSSID ]
+
+   Unit-Cost ::= < AVP Header: 2061 >
+
+           { Value-Digits }
+           [ Exponent ]
+
+   User-CSG-Information ::= < AVP Header: 2319>
+
+;;           { CSG-Id }
+           { CSG-Access-Mode }
+           [ CSG-Membership-Indication ]
+
+   UWAN-User-Location-Info ::= < AVP Header: 3918>
+
+           { UE-Local-IP-Address }
+           [ UDP-Source-Port ]
+;;         [ SSID ]
+           [ BSSID ]
+
+
+   Variable-Part ::= < AVP Header: 3907 >
+
+           { Variable-Part-Type }
+           { Variable-Part-Value }
+           [ Variable-Part-Order ]
+
+   VCS-Information ::= < AVP Header: 3410>
+
+           [ Bearer-Capability ]
+           [ Network-Call-Reference-Number ]
+           [ MSC-Address ]
+           [ Basic-Service-Code ]
+           [ ISUP-Location-Number ]
+           [ VLR-Number ]
+           [ Forwarding-Pending ]
+           [ ISUP-Cause ]
+           [ Start-Time ]
+           [ Start-of-Charging ]
+           [ Stop-Time ]
+           [ PS-Free-Format-Data ]
+
+;; ===========================================================================
+
+@enum 3GPP-PS-Data-Off-Status
+
+   Active                                                       0
+   Inactive                                                     1
+
+@enum Access-Transfer-Type
+
+   PS-to-CS-Transfer                                            0
+   CS-to-PS-Transfer                                            1
+   PS-to-PS-Transfer                                            2
+   CS-to-CS-Transfer                                            3
+
+@enum Adaptations
+
+   Yes                                                          0
+   No                                                           1
+
+@enum Additional-Exception-Reports
+
+   Not-allowed                                                  0
+   Allowed                                                      1
+
+@enum Address-Type
+
+   e-mail-address                                               0
+   MSISDN                                                       1
+   IPv4-Address                                                 2
+   IPv6-Address                                                 3
+   Numeric-Shortcode                                            4
+   Alphanumeric-Shortcode                                       5
+   Other                                                        6
+   IMSI                                                         7
+
+@enum Addressee-Type
+
+   TO                                                           0
+   CC                                                           1
+   BCC                                                          2
+
+@enum AoC-Format
+
+   MONETARY                                                     0
+   NON_MONETARY                                                 1
+   CAI                                                          2
+
+@enum AoC-Request-Type
+
+   AoC_NOT_REQUESTED                                            0
+   AoC_FULL                                                     1
+   AoC_COST_ONLY                                                2
+   AoC_TARIFF_ONLY                                              3
+
+@enum AoC-Service-Obligatory-Type
+
+   NON_BINDING                                                  0
+   BINDING                                                      1
+
+@enum AoC-Service-Type
+
+   NONE                                                         0
+   AOC-S                                                        1
+   AOC-D                                                        2
+   AOC-E                                                        3
+
+@enum Charge-Reason-Code
+
+   UNKNOWN                                                      0
+   USAGE                                                        1
+   COMMUNICATION-ATTEMPT-CHARGE                                 2
+   SETUP-CHARGE                                                 3
+   ADD-ON-CHARGE                                                4
+
+@enum Charging-Characteristics-Selection-Mode
+
+   Serving-Node-Supplied                                        0
+   Subscription-specific                                        1
+   APN-specific                                                 2
+   Home-Default                                                 3
+   Roaming-Default                                              4
+   Visiting-Default                                             5
+
+@enum Charging-Per-IP-CAN-Session-Indicator
+
+   Inactive                                                     0
+   Active                                                       1
+
+@enum Class-Identifier
+
+   Personal                                                     0
+   Advertisement                                                1
+   Informational                                                2
+   Auto                                                         3
+
+@enum CN-Operator-Selection-Entity
+
+   The-Serving-Network-has-been-selected-by-the-UE              0
+   The-Serving-Network-has-been-selected-by-the-network         1
+
+@enum Content-Class
+
+   text                                                         0
+   image-basic                                                  1
+   image-rich                                                   2
+   video-basic                                                  3
+   video-rich                                                   4
+   megapixel                                                    5
+   content-basic                                                6
+   content-rich                                                 7
+
+@enum Coverage-Status
+
+   Out-of-coverage                                              0
+   In-coverage                                                  1
+
+@enum CP-CIoT-EPS-Optimisation-Indicator
+
+   Not-Apply                                                    0
+   Apply                                                        1
+
+@enum CSG-Access-Mode
+
+   Closed-mode                                                  0
+   Hybrid-Mode                                                  1
+
+@enum CSG-Membership-Indication
+
+   Not-CSG-member                                               0
+   CSG-Member                                                   1
+
+@enum Delivery-Report-Requested
+
+   No                                                           0
+   Yes                                                          1
+
+@enum DRM-Content
+
+   No                                                           0
+   Yes                                                          1
+
+@enum Dynamic-Address-Flag
+
+   Static                                                       0
+   Dynamic                                                      1
+
+@enum Dynamic-Address-Flag-Extension
+
+   Static                                                       0
+   Dynamic                                                      1
+
+@enum Envelope-Reporting
+
+   DO_NOT_REPORT_ENVELOPES                                      0
+   REPORT_ENVELOPES                                             1
+   REPORT_ENVELOPES_WITH_VOLUME                                 2
+   REPORT_ENVELOPES_WITH_EVENTS                                 3
+   REPORT_ENVELOPES_WITH_VOLUME_AND_EVENTS                      4
+
+@enum File-Repair-Supported
+
+   SUPPORTED                                                    1
+   NOT_SUPPORTED                                                2
+
+@enum Forwarding-Pending
+
+   Forwarding-not-pending                                       0
+   Forwarding-pending                                           1
+
+@enum Interface-Type
+
+   Unknown                                                      0
+   MOBILE_ORIGINATING                                           1
+   MOBILE_TERMINATING                                           2
+   APPLICATION_ORIGINATING                                      3
+   APPLICATION_TERMINATION                                      4
+
+@enum Inter-UE-Transfer
+
+   Intra-UE-transfer                                            0
+   Inter-UE-transfer                                            1
+
+@enum IMS-Emergency-Indicator
+
+   Non-Emergency                                                0
+   Emergency                                                    1
+
+@enum IMSI-Unauthenticated-Flag
+
+   Authenticated                                                0
+   Unauthenticated                                              1
+
+@enum IP-Realm-Default-Indication
+
+   Default-IP-Realm-Not-used                                    0
+   Default-IP-realm-used                                        1
+
+@enum LCS-Client-Type
+
+   EMERGENCY_SERVICES                                           0
+   VALUE_ADDED_SERVICES                                         1
+   PLMN_OPERATOR_SERVICES                                       2
+   LAWFUL_INTERCEPT_SERVICES                                    3
+
+@enum LCS-Format-Indicator
+
+   LOGICAL_NAME                                                 0
+   EMAIL_ADDRESS                                                1
+   MSISDN                                                       2
+   URL                                                          3
+   SIP_URL                                                      4
+
+@enum Local-GW-Inserted-Indication
+
+   Local-GW-Not-Inserted                                        0
+   Local-GW-Inserted                                            1
+
+@enum Location-Estimate-Type
+
+   CURRENT_LOCATION                                             0
+   CURRENT_LAST_KNOWN_LOCATION                                  1
+   INITIAL_LOCATION                                             2
+   ACTIVATE_DEFERRED_LOCATION                                   3
+   CANCEL_DEFERRED_LOCATION                                     4
+
+
+@enum Low-Balance-Indication
+
+   NOT-APPLICABLE                                               0
+   YES                                                          1
+
+@enum Low-Priority-Indicator
+
+   NO                                                           0
+   YES                                                          1
+@enum MBMS-Charged-Party
+
+   Content-Provider                                             0
+   Subscriber                                                   1
+
+@enum MBMS-User-Service-Type
+
+   DOWNLOAD                                                     1
+   STREAMING                                                    2
+
+@enum Media-Initiator-Flag
+
+   called-party                                                 0
+   calling-party                                                1
+   unknown                                                      2
+
+@enum Message-Type
+
+   m-send-req                                                   1
+   m-send-conf                                                  2
+   m-notification-ind                                           3
+   m-notifyresp-ind                                             4
+   m-retrieve-conf                                              5
+   m-acknowledge-ind                                            6
+   m-delivery-ind                                               7
+   m-read-rec-ind                                               8
+   m-read-orig-ind                                              9
+   m-forward-req                                               10
+   m-forward-conf                                              11
+   m-mbox-store-conf                                           12
+   m-mbox-view-conf                                            13
+   m-mbox-upload-conf                                          14
+   m-mbox-delete-conf                                          15
+
+@enum MMBox-Storage-Requested
+
+   No                                                           0
+   Yes                                                          1
+
+@enum NNI-Type
+
+   non-roaming                                                  0
+   roaming-without-loopback                                     1
+   roaming-with-loopback                                        2
+
+@enum Node-Functionality
+
+   S-CSCF                                                       0
+   P-CSCF                                                       1
+   I-CSCF                                                       2
+   MRFC                                                         3
+   MGCF                                                         4
+   BGCF                                                         5
+   AS                                                           6
+   IBCF                                                         7
+   S-GW                                                         8
+   P-GW                                                         9
+   HSGW                                                        10
+   E-CSCF                                                      11
+   MME                                                         12
+   TRF                                                         13
+   TF                                                          14
+   ATCF                                                        15
+   Proxy-Function                                              16
+   ePDG                                                        17
+   TDF                                                         18
+   TWAG                                                        19
+   SCEF                                                        20
+   IWK-SCEF                                                    21
+
+@enum Online-Charging-Flag
+
+   ECF-address-not-provided                                     0
+   ECF-address-provided                                         1
+
+@enum Originator
+
+   Calling-Party                                                0
+   Called-Party                                                 1
+
+@enum Participant-Access-Priority
+
+   Pre-emptive-priority                                         1
+   High-priority                                                2
+   Normal-priority                                              3
+   Low-priority                                                 4
+
+@enum Participant-Action-Type
+
+   CREATE_CONF                                                  0
+   JOIN_CONF                                                    1
+   INVITE_INTO_CONF                                             2
+   QUIT_CONF                                                    3
+
+@enum PC5-Radio-Technology
+
+   EUTRA                                                        0
+   WLAN                                                         1
+   Both-EUTRA-and-WLAN                                          2
+
+@enum PDP-Context-Type
+
+   Primary                                                      0
+   Secondary                                                    1
+
+@enum Play-Alternative
+
+   served-party                                                 0
+   remote-party                                                 1
+
+@enum PoC-Change-Condition
+
+   ServiceChange                                                0
+   VolumeLimit                                                  1
+   TimeLimit                                                    2
+   NumberofTalkBurstLimit                                       3
+   NumberofActiveParticipants                                   4
+   TariffTime                                                   5
+
+@enum PoC-Event-Type
+
+   Normal                                                       0
+   Instant-Personal-Alert-event                                 1
+   PoC-Group-Advertisement-event                                2
+   Early-Ssession-Setting-up-event                              3
+   PoC-Talk-Burst                                               4
+
+@enum PoC-Server-Role
+
+   Participating-PoC-Server                                     0
+   Controlling-PoC-Server                                       1
+   Interworking-function                                        2
+   Interworking-selection-function                              3
+
+@enum PoC-Session-Initiation-Type
+
+   Pre-established                                              0
+   On-demand                                                    1
+
+@enum PoC-Session-Type
+
+   1-to-1-PoC-session                                           0
+   Chat-PoC-group-session                                       1
+   Pre-arranged-PoC-group-session                               2
+   Ad-hoc-PoC-group-session                                     3
+
+@enum PoC-User-Role-Info-Units
+
+   Moderator                                                    1
+   Dispatcher                                                   2
+   Session-Owner                                                3
+   Session-Participant                                          4
+
+@enum Priority
+
+   Low                                                          0
+   Normal                                                       1
+   High                                                         2
+
+@enum Privacy-Indicator
+
+   NOT_PRIVATE                                                  0
+   PRIVATE                                                      1
+
+@enum ProSe-Direct-Discovery-Model
+
+   Model-A                                                      0
+   Model-B                                                      1
+
+@enum ProSe-Event-Type
+
+   Annoucing                                                    0
+   Monitoring                                                   1
+   Match-Report                                                 2
+
+@enum ProSe-Functionality
+
+   Direct-discovery                                             0
+   EPC-level-discovery                                          1
+   Direct-communication                                         2
+
+@enum ProSe-Range-Class
+
+   Reserved                                                     0
+   50m                                                          1
+   100m                                                         2
+   200m                                                         3
+   500m                                                         4
+   1000m                                                        5
+
+@enum ProSe-Reason-For-Cancellation
+
+   Proximity-Alert-sent                                         0
+   Time-expired-with-no-renewal                                 1
+   Requestor-cancellation                                       2
+
+@enum ProSe-Role-Of-UE
+
+   Announcing-UE                                                0
+   Monitoring-UE                                                1
+   Requestor-UE                                                 2
+   Requested-UE                                                 3
+
+@enum Proximity-Alert-Indication
+
+   Alert                                                        0
+   No-Alert                                                     1
+
+@enum PS-Append-Free-Format-Data
+
+   Append                                                       0
+   Overwrite                                                    1
+
+@enum Quota-Indicator
+
+   QUOTA_IS_NOT_USED_DURING_PLAYBACK                            0
+   QUOTA_IS_USED_DURING_PLAYBACK                                1
+
+@enum Read-Reply-Report-Requested
+
+   No                                                           0
+   Yes                                                          1
+
+@enum Relationship-Mode
+
+   trusted                                                      0
+   non-trusted                                                  1
+
+@enum Reply-Path-Requested
+
+   No-Reply-Path-Set                                            0
+   Reply-path-Set                                               1
+
+@enum Reporting-Reason
+
+   THRESHOLD                                                    0
+   QHT                                                          1
+   FINAL                                                        2
+   QUOTA_EXHAUSTED                                              3
+   VALIDITY_TIME                                                4
+   OTHER_QUOTA_TYPE                                             5
+   RATING_CONDITION_CHANGE                                      6
+   FORCED_REAUTHORISATION                                       7
+   POOL_EXHAUSTED                                               8
+   UNUSED_QUOTA_TIMER                                           9
+
+@enum Role-Of-Node
+
+   ORIGINATING_ROLE                                             0
+   TERMINATING_ROLE                                             1
+   FORWARDING_ROLE                                              2
+
+@enum Role-Of-ProSe-Function
+
+   HPLMN                                                        0
+   VPLMN                                                        1
+   Local-PLMN                                                   2
+
+@enum SDP-Type
+
+   SDP-Offer                                                    0
+   SDP-Answer                                                   1
+
+@enum Session-Direction
+
+   inbound                                                      0
+   outbound                                                     1
+
+@enum Serving-Node-Type
+
+   SGSN                                                         0
+   PMIPSGW                                                      1
+   GTPSGW                                                       2
+   ePDG                                                         3
+   hSGW                                                         4
+   MME                                                          5
+   TWAN                                                         6
+
+@enum SGi-PtP-Tunnelling-Method
+
+   UDP_IP_based                                                 0
+   Others                                                       1
+
+@enum SGW-Change
+
+   ACR_Start_NOT_due_to_SGW_Change                              0
+   ACR_Start_due_to_SGW_Change                                  1
+
+@enum SM-Device-Trigger-Indicator
+
+   Not-DeviceTrigger                                            0
+   Device-Trigger-request                                       1
+   Device-Trigger-replace                                       2
+   Device-Trigger-recall                                        3
+
+@enum SM-Message-Type
+
+   SUBMISSION                                                   0
+   DELIVERY_REPORT                                              1
+   SM-Service-Request                                           2
+   T4-Device-Trigger                                            3
+   SM-Device-Trigger                                            4
+   MO-SMS-T4-submission                                         5
+
+@enum SMS-Node
+
+   SMS-Router                                                   0
+   IP-SM-GW                                                     1
+   SMS-Router-and-IP-SM-GW                                      2
+   SMS-SC                                                       3
+
+@enum SM-Service-Type
+
+   VAS4SMS-Short-Message-content-processing                     0
+   VAS4SMS-Short-Message-forwarding                             1
+   VAS4SMS-Short-Message-Forwarding-multiple-subscriptions      2
+   VAS4SMS-Short-Message-filtering                              3
+   VAS4SMS-Short-Message-receipt                                4
+   VAS4SMS-Short-Message-Network-Storage                        5
+   VAS4SMS-Short-Message-to-multiple-destinations               6
+   VAS4SMS-Short-Message-Virtual-Private-Network                7
+   VAS4SMS-Short-Message-Auto-Reply                             8
+   VAS4SMS-Short-Message-Personal-Signature                     9
+   VAS4SMS-Short-Message-Deferred-Delivery                     10
+
+@enum Status-AS-Code
+
+   4xx                                                          0
+   5xx                                                          1
+   Timeout                                                      2
+
+@enum Subscriber-Role
+
+   Originating                                                  0
+   Terminating                                                  1
+
+@enum TAD-Identifier
+
+   CS                                                           0
+   PS                                                           1
+
+@enum Time-Quota-Type
+
+   DISCRETE_TIME_PERIOD                                         0
+   CONTINUOUS_TIME_PERIOD                                       1
+
+@enum Transcoder-Inserted-Indication
+
+   Transcoder-Not-Inserted                                      0
+   Transcoder-Inserted                                          1
+
+@enum Trigger-Type
+
+   CHANGE_IN_SGSN_IP_ADDRESS                                    1
+   CHANGE_IN_QOS                                                2
+   CHANGE_IN_LOCATION                                           3
+   CHANGE_IN_RAT                                                4
+   CHANGE_IN_UE_TIMEZONE                                        5
+   CHANGEINQOS_TRAFFIC_CLASS                                   10
+   CHANGEINQOS_RELIABILITY_CLASS                               11
+   CHANGEINQOS_DELAY_CLASS                                     12
+   CHANGEINQOS_PEAK_THROUGHPUT                                 13
+   CHANGEINQOS_PRECEDENCE_CLASS                                14
+   CHANGEINQOS_MEAN_THROUGHPUT                                 15
+   CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_UPLINK                     16
+   CHANGEINQOS_MAXIMUM_BIT_RATE_FOR_DOWNLINK                   17
+   CHANGEINQOS_RESIDUAL_BER                                    18
+   CHANGEINQOS_SDU_ERROR_RATIO                                 19
+   CHANGEINQOS_TRANSFER_DELAY                                  20
+   CHANGEINQOS_TRAFFIC_HANDLING_PRIORITY                       21
+   CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_UPLINK                  22
+   CHANGEINQOS_GUARANTEED_BIT_RATE_FOR_DOWNLINK                23
+   CHANGEINQOS_APN_AGGREGATE_MAXIMUM_BIT_RATE                  24
+   CHANGEINLOCATION_MCC                                        30
+   CHANGEINLOCATION_MNC                                        31
+   CHANGEINLOCATION_RAC                                        32
+   CHANGEINLOCATION_LAC                                        33
+   CHANGEINLOCATION_CellId                                     34
+   CHANGEINLOCATION_TAC                                        35
+   CHANGEINLOCATION_ECGI                                       36
+   CHANGE_IN_MEDIA_COMPOSITION                                 40
+   CHANGE_IN_PARTICIPANTS_NMB                                  50
+   CHANGE_IN_THRSHLD_OF_PARTICIPANTS_NMB                       51
+   CHANGE_IN_USER_PARTICIPATING_TYPE                           52
+   CHANGE_IN_SERVICE_CONDITION                                 60
+   CHANGE_IN_SERVING_NODE                                      61
+   CHANGE_IN_ACCESS_FOR_A_SERVICE_DATA_FLOW                    62
+   CHANGE_IN_USER_CSG_INFORMATION                              70
+   CHANGE_IN_HYBRID_SUBSCRIBED_USER_CSG_INFORMATION            71
+   CHANGE_IN_HYBRID_UNSUBSCRIBED_USER_CSG_INFORMATION          72
+   CHANGE_OF_UE_PRESENCE_IN_PRESENCE_REPORTING_AREA            73
+   CHANGE_IN_APN_RATE_CONTROL                                  75
+   CHANGE_IN_3GPP_PS_DATA_OFF                                  76
+
+@enum UNI-PDU-CP-Only-Flag
+
+   UNI-PDU-both-UP-CP                                           0
+   UNI-PDU-CP-Only                                              1
+
+@enum User-Participating-Type
+
+   Normal                                                       0
+   NW-PoC-Box                                                   1
+   UE-PoC-Box                                                   2
+
+@enum Variable-Part-Type
+
+   Integer                                                      0
+   Number                                                       1
+   Time                                                         2
+   Date                                                         3
+   Currency                                                     4
diff --git a/dia/diameter_etsi_es283_034.dia b/dia/diameter_etsi_es283_034.dia
new file mode 100644
index 0000000..55cc1db
--- /dev/null
+++ b/dia/diameter_etsi_es283_034.dia
@@ -0,0 +1,46 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Travelping GmbH 2015. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+@id     16777231
+@name   diameter_etsi_es283_034
+@prefix diameter_e4
+@vendor 13019 ETSI
+
+@inherits diameter_gen_base_rfc6733
+
+;; only attributes required by other applications are defined
+
+@avp_types
+
+;; Globally-Unique-Address          300       Grouped    MV
+   Address-Realm                    301   OctetString    MV
+   Logical-Access-ID                302   OctetString     V
+;; Initial-Gate-Setting-Description 303       Grouped     V
+;; QoS-Profile-Description          304       Grouped     V
+   IP-Connectivity-Status           305    Enumerated     V
+;; Access-Network-Type              306       Grouped     V
+   Aggregation-Network-Type         307    Enumerated     V
+   Maximum-Allowed-Bandwidth-UL     308    Unsigned32     V
+   Maximum-Allowed-Bandwidth-DL     309    Unsigned32     V
+   Transport-Class                  311    Unsigned32     V
+   Application-Class-ID             312    UTF8String     V
+   Physical-Access-ID               313    UTF8String     V
+   Initial-Gate-Setting-ID          314    Unsigned32     V
+   QoS-Profile-ID                   315    Unsigned32     V
diff --git a/dia/diameter_rfc4005_nasreq.dia b/dia/diameter_rfc4005_nasreq.dia
new file mode 100644
index 0000000..e476853
--- /dev/null
+++ b/dia/diameter_rfc4005_nasreq.dia
@@ -0,0 +1,741 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+;;
+;; RFC 4005, Diameter Network Access Server Application
+;;
+;; Edits:
+;;
+;; - Acounting-Auth-Method      -> Accounting-Auth-Method
+;; - Connection-Info            -> ConnectInfo
+;; - Framed-Appletalk-Link      -> Framed-AppleTalk-Link
+;; - Framed-Appletalk-Network   -> Framed-AppleTalk-Network
+;; - Framed-Appletalk-Zone      -> Framed-AppleTalk-Zone
+;; - Qos-Filter-Rule            -> QoS-Filter-Rule
+;; - Redirect-Host-Usase        -> Redirect-Host-Usage
+;; - Redirected-Host            -> Redirect-Host
+;; - Redirected-Host-Usage      -> Redirect-Host-Usage
+;; - Redirected-Host-Cache-Time -> Redirect-Max-Cache-Time
+;; - Redirected-Max-Cache-Time  -> Redirect-Max-Cache-Time
+;;
+
+@id 1
+
+@inherits diameter_gen_base_rfc6733
+
+;; ===========================================================================
+
+@avp_types
+
+   ;; 4.  NAS Session AVPs
+
+   NAS-Port                           5    Unsigned32    M
+   NAS-Port-Id                       87    UTF8String    M
+   NAS-Port-Type                     61    Enumerated    M
+   Called-Station-Id                 30    UTF8String    M
+   Calling-Station-Id                31    UTF8String    M
+   Connect-Info                      77    UTF8String    M
+   Originating-Line-Info             94   OctetString    -
+   Reply-Message                     18    UTF8String    M
+
+   ;; 5.  NAS Authentication AVPs
+
+   User-Password                      2   OctetString    M
+   Password-Retry                    75    Unsigned32    M
+   Prompt                            76    Enumerated    M
+   CHAP-Auth                        402       Grouped    M
+   CHAP-Algorithm                   403    Enumerated    M
+   CHAP-Ident                       404   OctetString    M
+   CHAP-Response                    405   OctetString    M
+   CHAP-Challenge                    60   OctetString    M
+   ARAP-Password                     70   OctetString    M
+   ARAP-Challenge-Response           84   OctetString    M
+   ARAP-Security                     73    Unsigned32    M
+   ARAP-Security-Data                74   OctetString    M
+
+   ;; 6.  NAS Authorization AVPs
+
+   Service-Type                       6    Enumerated    M
+   Callback-Number                   19    UTF8String    M
+   Callback-Id                       20    UTF8String    M
+   Idle-Timeout                      28    Unsigned32    M
+   Port-Limit                        62    Unsigned32    M
+   NAS-Filter-Rule                  400  IPFilterRule    M
+   Filter-Id                         11    UTF8String    M
+   Configuration-Token               78   OctetString    M
+   QoS-Filter-Rule                  407 QoSFilterRule    -
+   Framed-Protocol                    7    Enumerated    M
+   Framed-Routing                    10    Enumerated    M
+   Framed-MTU                        12    Unsigned32    M
+   Framed-Compression                13    Enumerated    M
+   Framed-IP-Address                  8   OctetString    M
+   Framed-IP-Netmask                  9   OctetString    M
+   Framed-Route                      22    UTF8String    M
+   Framed-Pool                       88   OctetString    M
+   Framed-Interface-Id               96    Unsigned64    M
+   Framed-IPv6-Prefix                97   OctetString    M
+   Framed-IPv6-Route                 99    UTF8String    M
+   Framed-IPv6-Pool                 100   OctetString    M
+   Framed-IPX-Network                23    UTF8String    M
+   Framed-AppleTalk-Link             37    Unsigned32    M
+   Framed-AppleTalk-Network          38    Unsigned32    M
+   Framed-AppleTalk-Zone             39   OctetString    M
+   ARAP-Features                     71   OctetString    M
+   ARAP-Zone-Access                  72    Enumerated    M
+   Login-IP-Host                     14   OctetString    M
+   Login-IPv6-Host                   98   OctetString    M
+   Login-Service                     15    Enumerated    M
+   Login-TCP-Port                    16    Unsigned32    M
+   Login-LAT-Service                 34   OctetString    M
+   Login-LAT-Node                    35   OctetString    M
+   Login-LAT-Group                   36   OctetString    M
+   Login-LAT-Port                    63   OctetString    M
+
+   ;; 7.  NAS Tunneling
+
+   Tunneling                        401       Grouped    M
+   Tunnel-Type                       64    Enumerated    M
+   Tunnel-Medium-Type                65    Enumerated    M
+   Tunnel-Client-Endpoint            66    UTF8String    M
+   Tunnel-Server-Endpoint            67    UTF8String    M
+   Tunnel-Password                   69   OctetString    M
+   Tunnel-Private-Group-Id           81   OctetString    M
+   Tunnel-Assignment-Id              82   OctetString    M
+   Tunnel-Preference                 83    Unsigned32    M
+   Tunnel-Client-Auth-Id             90    UTF8String    M
+   Tunnel-Server-Auth-Id             91    UTF8String    M
+
+   ;; 8.  NAS Accounting
+
+   Accounting-Input-Octets          363    Unsigned64    M
+   Accounting-Output-Octets         364    Unsigned64    M
+   Accounting-Input-Packets         365    Unsigned64    M
+   Accounting-Output-Packets        366    Unsigned64    M
+   Acct-Session-Time                 46    Unsigned32    M
+   Acct-Authentic                    45    Enumerated    M
+   Accounting-Auth-Method           406    Enumerated    M
+   Acct-Delay-Time                   41    Unsigned32    M
+   Acct-Link-Count                   51    Unsigned32    M
+   Acct-Tunnel-Connection            68   OctetString    M
+   Acct-Tunnel-Packets-Lost          86    Unsigned32    M
+
+   ;; 9.3.  AVPs Used Only for Compatibility
+
+   NAS-Identifier                    32    UTF8String    M
+   NAS-IP-Address                     4   OctetString    M
+   NAS-IPv6-Address                  95   OctetString    M
+   State                             24   OctetString    M
+ ;;Termination-Cause                295    Enumerated    M
+   Origin-AAA-Protocol              408    Enumerated    M
+
+;; ===========================================================================
+
+@messages
+
+   AAR ::= < Diameter Header: 265, REQ, PXY >
+
+           < Session-Id >
+           { Auth-Application-Id }
+           { Origin-Host }
+           { Origin-Realm }
+           { Destination-Realm }
+           { Auth-Request-Type }
+           [ Destination-Host ]
+           [ NAS-Identifier ]
+           [ NAS-IP-Address ]
+           [ NAS-IPv6-Address ]
+           [ NAS-Port ]
+           [ NAS-Port-Id ]
+           [ NAS-Port-Type ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+           [ Port-Limit ]
+           [ User-Name ]
+           [ User-Password ]
+           [ Service-Type ]
+           [ State ]
+           [ Authorization-Lifetime ]
+           [ Auth-Grace-Period ]
+           [ Auth-Session-State ]
+           [ Callback-Number ]
+           [ Called-Station-Id ]
+           [ Calling-Station-Id ]
+           [ Originating-Line-Info ]
+           [ Connect-Info ]
+           [ CHAP-Auth ]
+           [ CHAP-Challenge ]
+         * [ Framed-Compression ]
+           [ Framed-Interface-Id ]
+           [ Framed-IP-Address ]
+         * [ Framed-IPv6-Prefix ]
+           [ Framed-IP-Netmask ]
+           [ Framed-MTU ]
+           [ Framed-Protocol ]
+           [ ARAP-Password ]
+           [ ARAP-Security ]
+         * [ ARAP-Security-Data ]
+         * [ Login-IP-Host ]
+         * [ Login-IPv6-Host ]
+           [ Login-LAT-Group ]
+           [ Login-LAT-Node ]
+           [ Login-LAT-Port ]
+           [ Login-LAT-Service ]
+         * [ Tunneling ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+   AAA ::= < Diameter Header: 265, PXY >
+
+           < Session-Id >
+           { Auth-Application-Id }
+           { Auth-Request-Type }
+           { Result-Code }
+           { Origin-Host }
+           { Origin-Realm }
+           [ User-Name ]
+           [ Service-Type ]
+         * [ Class ]
+         * [ Configuration-Token ]
+           [ Acct-Interim-Interval ]
+           [ Error-Message ]
+           [ Error-Reporting-Host ]
+         * [ Failed-AVP ]
+           [ Idle-Timeout ]
+           [ Authorization-Lifetime ]
+           [ Auth-Grace-Period ]
+           [ Auth-Session-State ]
+           [ Re-Auth-Request-Type ]
+           [ Multi-Round-Time-Out ]
+           [ Session-Timeout ]
+           [ State ]
+         * [ Reply-Message ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+         * [ Filter-Id ]
+           [ Password-Retry ]
+           [ Port-Limit ]
+           [ Prompt ]
+           [ ARAP-Challenge-Response ]
+           [ ARAP-Features ]
+           [ ARAP-Security ]
+         * [ ARAP-Security-Data ]
+           [ ARAP-Zone-Access ]
+           [ Callback-Id ]
+           [ Callback-Number ]
+           [ Framed-AppleTalk-Link ]
+         * [ Framed-AppleTalk-Network ]
+           [ Framed-AppleTalk-Zone ]
+         * [ Framed-Compression ]
+           [ Framed-Interface-Id ]
+           [ Framed-IP-Address ]
+         * [ Framed-IPv6-Prefix ]
+           [ Framed-IPv6-Pool ]
+         * [ Framed-IPv6-Route ]
+           [ Framed-IP-Netmask ]
+         * [ Framed-Route ]
+           [ Framed-Pool ]
+           [ Framed-IPX-Network ]
+           [ Framed-MTU ]
+           [ Framed-Protocol ]
+           [ Framed-Routing ]
+         * [ Login-IP-Host ]
+         * [ Login-IPv6-Host ]
+           [ Login-LAT-Group ]
+           [ Login-LAT-Node ]
+           [ Login-LAT-Port ]
+           [ Login-LAT-Service ]
+           [ Login-Service ]
+           [ Login-TCP-Port ]
+         * [ NAS-Filter-Rule ]
+         * [ QoS-Filter-Rule ]
+         * [ Tunneling ]
+         * [ Redirect-Host ]
+           [ Redirect-Host-Usage ]
+           [ Redirect-Max-Cache-Time ]
+         * [ Proxy-Info ]
+         * [ AVP ]
+
+   RAR ::= < Diameter Header: 258, REQ, PXY >
+
+           < Session-Id >
+           { Origin-Host }
+           { Origin-Realm }
+           { Destination-Realm }
+           { Destination-Host }
+           { Auth-Application-Id }
+           { Re-Auth-Request-Type }
+           [ User-Name ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+           [ NAS-Identifier ]
+           [ NAS-IP-Address ]
+           [ NAS-IPv6-Address ]
+           [ NAS-Port ]
+           [ NAS-Port-Id ]
+           [ NAS-Port-Type ]
+           [ Service-Type ]
+           [ Framed-IP-Address ]
+           [ Framed-IPv6-Prefix ]
+           [ Framed-Interface-Id ]
+           [ Called-Station-Id ]
+           [ Calling-Station-Id ]
+           [ Originating-Line-Info ]
+           [ Acct-Session-Id ]
+           [ Acct-Multi-Session-Id ]
+           [ State ]
+         * [ Class ]
+           [ Reply-Message ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+   RAA ::= < Diameter Header: 258, PXY >
+
+           < Session-Id >
+           { Result-Code }
+           { Origin-Host }
+           { Origin-Realm }
+           [ User-Name ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+           [ Error-Message ]
+           [ Error-Reporting-Host ]
+         * [ Failed-AVP ]
+         * [ Redirect-Host ]
+           [ Redirect-Host-Usage ]
+           [ Redirect-Max-Cache-Time ]
+           [ Service-Type ]
+         * [ Configuration-Token ]
+           [ Idle-Timeout ]
+           [ Authorization-Lifetime ]
+           [ Auth-Grace-Period ]
+           [ Re-Auth-Request-Type ]
+           [ State ]
+         * [ Class ]
+         * [ Reply-Message ]
+           [ Prompt ]
+         * [ Proxy-Info ]
+         * [ AVP ]
+
+   STR ::= < Diameter Header: 275, REQ, PXY >
+
+           < Session-Id >
+           { Origin-Host }
+           { Origin-Realm }
+           { Destination-Realm }
+           { Auth-Application-Id }
+           { Termination-Cause }
+           [ User-Name ]
+           [ Destination-Host ]
+         * [ Class ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+   STA ::= < Diameter Header: 275, PXY >
+
+           < Session-Id >
+           { Result-Code }
+           { Origin-Host }
+           { Origin-Realm }
+           [ User-Name ]
+         * [ Class ]
+           [ Error-Message ]
+           [ Error-Reporting-Host ]
+         * [ Failed-AVP ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+         * [ Redirect-Host ]
+           [ Redirect-Host-Usage ]
+           [ Redirect-Max-Cache-Time ]
+         * [ Proxy-Info ]
+         * [ AVP ]
+
+   ASR ::= < Diameter Header: 274, REQ, PXY >
+
+           < Session-Id >
+           { Origin-Host }
+           { Origin-Realm }
+           { Destination-Realm }
+           { Destination-Host }
+           { Auth-Application-Id }
+           [ User-Name ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+           [ NAS-Identifier ]
+           [ NAS-IP-Address ]
+           [ NAS-IPv6-Address ]
+           [ NAS-Port ]
+           [ NAS-Port-Id ]
+           [ NAS-Port-Type ]
+           [ Service-Type ]
+           [ Framed-IP-Address ]
+           [ Framed-IPv6-Prefix ]
+           [ Framed-Interface-Id ]
+           [ Called-Station-Id ]
+           [ Calling-Station-Id ]
+           [ Originating-Line-Info ]
+           [ Acct-Session-Id ]
+           [ Acct-Multi-Session-Id ]
+           [ State ]
+         * [ Class ]
+         * [ Reply-Message ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+   ASA ::= < Diameter Header: 274, PXY >
+
+           < Session-Id >
+           { Result-Code }
+           { Origin-Host }
+           { Origin-Realm }
+           [ User-Name ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+           [ State]
+           [ Error-Message ]
+           [ Error-Reporting-Host ]
+         * [ Failed-AVP ]
+         * [ Redirect-Host ]
+           [ Redirect-Host-Usage ]
+           [ Redirect-Max-Cache-Time ]
+         * [ Proxy-Info ]
+         * [ AVP ]
+
+   ACR ::= < Diameter Header: 271, REQ, PXY >
+
+           < Session-Id >
+           { Origin-Host }
+           { Origin-Realm }
+           { Destination-Realm }
+           { Accounting-Record-Type }
+           { Accounting-Record-Number }
+           [ Acct-Application-Id ]
+           [ Vendor-Specific-Application-Id ]
+           [ User-Name ]
+           [ Accounting-Sub-Session-Id ]
+           [ Acct-Session-Id ]
+           [ Acct-Multi-Session-Id ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+           [ Destination-Host ]
+           [ Event-Timestamp ]
+           [ Acct-Delay-Time ]
+           [ NAS-Identifier ]
+           [ NAS-IP-Address ]
+           [ NAS-IPv6-Address ]
+           [ NAS-Port ]
+           [ NAS-Port-Id ]
+           [ NAS-Port-Type ]
+         * [ Class ]
+           [ Service-Type ]
+           [ Termination-Cause ]
+           [ Accounting-Input-Octets ]
+           [ Accounting-Input-Packets ]
+           [ Accounting-Output-Octets ]
+           [ Accounting-Output-Packets ]
+           [ Acct-Authentic ]
+           [ Accounting-Auth-Method ]
+           [ Acct-Link-Count ]
+           [ Acct-Session-Time ]
+           [ Acct-Tunnel-Connection ]
+           [ Acct-Tunnel-Packets-Lost ]
+           [ Callback-Id ]
+           [ Callback-Number ]
+           [ Called-Station-Id ]
+           [ Calling-Station-Id ]
+         * [ Connect-Info ]
+           [ Originating-Line-Info ]
+           [ Authorization-Lifetime ]
+           [ Session-Timeout ]
+           [ Idle-Timeout ]
+           [ Port-Limit ]
+           [ Accounting-Realtime-Required ]
+           [ Acct-Interim-Interval ]
+         * [ Filter-Id ]
+         * [ NAS-Filter-Rule ]
+         * [ QoS-Filter-Rule ]
+           [ Framed-AppleTalk-Link ]
+           [ Framed-AppleTalk-Network ]
+           [ Framed-AppleTalk-Zone ]
+           [ Framed-Compression ]
+           [ Framed-Interface-Id ]
+           [ Framed-IP-Address ]
+           [ Framed-IP-Netmask ]
+         * [ Framed-IPv6-Prefix ]
+           [ Framed-IPv6-Pool ]
+         * [ Framed-IPv6-Route ]
+           [ Framed-IPX-Network ]
+           [ Framed-MTU ]
+           [ Framed-Pool ]
+           [ Framed-Protocol ]
+         * [ Framed-Route ]
+           [ Framed-Routing ]
+         * [ Login-IP-Host ]
+         * [ Login-IPv6-Host ]
+           [ Login-LAT-Group ]
+           [ Login-LAT-Node ]
+           [ Login-LAT-Port ]
+           [ Login-LAT-Service ]
+           [ Login-Service ]
+           [ Login-TCP-Port ]
+         * [ Tunneling ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+   ACA ::= < Diameter Header: 271, PXY >
+
+           < Session-Id >
+           { Result-Code }
+           { Origin-Host }
+           { Origin-Realm }
+           { Accounting-Record-Type }
+           { Accounting-Record-Number }
+           [ Acct-Application-Id ]
+           [ Vendor-Specific-Application-Id ]
+           [ User-Name ]
+           [ Accounting-Sub-Session-Id ]
+           [ Acct-Session-Id ]
+           [ Acct-Multi-Session-Id ]
+           [ Event-Timestamp ]
+           [ Error-Message ]
+           [ Error-Reporting-Host ]
+         * [ Failed-AVP ]
+           [ Origin-AAA-Protocol ]
+           [ Origin-State-Id ]
+           [ NAS-Identifier ]
+           [ NAS-IP-Address ]
+           [ NAS-IPv6-Address ]
+           [ NAS-Port ]
+           [ NAS-Port-Id ]
+           [ NAS-Port-Type ]
+           [ Service-Type ]
+           [ Termination-Cause ]
+           [ Accounting-Realtime-Required ]
+           [ Acct-Interim-Interval ]
+         * [ Class ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+;; ===========================================================================
+
+@grouped
+
+   CHAP-Auth ::= < AVP Header: 402 >
+
+           { CHAP-Algorithm }
+           { CHAP-Ident }
+           [ CHAP-Response ]
+         * [ AVP ]
+
+   Tunneling ::= < AVP Header: 401 >
+
+           { Tunnel-Type }
+           { Tunnel-Medium-Type }
+           { Tunnel-Client-Endpoint }
+           { Tunnel-Server-Endpoint }
+           [ Tunnel-Preference ]
+           [ Tunnel-Client-Auth-Id ]
+           [ Tunnel-Server-Auth-Id ]
+           [ Tunnel-Assignment-Id ]
+           [ Tunnel-Password ]
+           [ Tunnel-Private-Group-Id ]
+
+;; ===========================================================================
+
+@enum NAS-Port-Type
+
+   ASYNC                          0
+   SYNC                           1
+   ISDN_SYNC                      2
+   ISDN_ASYNC_V120                3
+   ISDN_ASYNC_V110                4
+   VIRTUAL                        5
+   PIAFS                          6
+   HDLC_CLEAR_CHANNEL             7
+   X25                            8
+   X75                            9
+   G3FAX                         10
+   SDSL                          11
+   ADSL-CAP                      12
+   ADSL-DMT                      13
+   IDSL                          14
+   ETHERNET                      15
+   XDSL                          16
+   CABLE                         17
+   WIRELESS_OTHER                18
+  'WIRELESS_802.11'              19
+   TOKEN-RING                    20
+   FDDI                          21
+   WIRELESS_CDMA2000             22
+   WIRELESS_UMTS                 23
+   WIRELESS_1X-EV                24
+   IAPP                          25
+
+@enum Prompt
+
+   NO_ECHO                        0
+   ECHO                           1
+
+@enum CHAP-Algorithm
+
+   WITH_MD5                       5
+
+@enum Service-Type
+
+   LOGIN                          1
+   FRAMED                         2
+   CALLBACK_LOGIN                 3
+   CALLBACK_FRAMED                4
+   OUTBOUND                       5
+   ADMINISTRATIVE                 6
+   NAS_PROMPT                     7
+   AUTHENTICATE_ONLY              8
+   CALLBACK_NAS_PROMPT            9
+   CALL_CHECK                    10
+   CALLBACK_ADMINISTRATIVE       11
+   VOICE                         12
+   FAX                           13
+   MODEM_RELAY                   14
+   IAPP-REGISTER                 15
+   IAPP-AP-CHECK                 16
+   AUTHORIZE_ONLY                17
+
+@enum Framed-Protocol
+
+   PPP                            1
+   SLIP                           2
+   ARAP                           3
+   GANDALF                        4
+   XYLOGICS                       5
+   X75                            6
+
+@enum Framed-Routing
+
+   NONE                           0
+   SEND                           1
+   LISTEN                         2
+   SEND_AND_LISTEN                3
+
+@enum Framed-Compression
+
+   NONE                           0
+   VJ                             1
+   IPX                            2
+   STAC-LZS                       3
+
+@enum ARAP-Zone-Access
+
+   DEFAULT                        1
+   FILTER_INCLUSIVELY             2
+   FILTER_EXCLUSIVELY             4
+
+@enum Login-Service
+
+   TELNET                         0
+   RLOGIN                         1
+   TCP_CLEAR                      2
+   PORTMASTER                     3
+   LAT                            4
+   X25-PAD                        5
+   X25-T3POS                      6
+   TCP_CLEAR_QUIET                8
+
+@enum Tunnel-Type
+
+   PPTP                           1
+   L2F                            2
+   L2TP                           3
+   ATMP                           4
+   VTP                            5
+   AH                             6
+   IP-IP                          7
+   MIN-IP-IP                      8
+   ESP                            9
+   GRE                           10
+   DVS                           11
+   IP-IN-IP                      12
+   VLAN                          13
+
+@enum Tunnel-Medium-Type
+
+   IPV4                           1
+   IPV6                           2
+   NSAP                           3
+   HDLC                           4
+   BBN_1822                       5
+  '802'                           6
+   E163                           7
+   E164                           8
+   F69                            9
+   X121                          10
+   IPX                           11
+   APPLETALK                     12
+   DECNET_IV                     13
+   BANYAN_VINES                  14
+   E164_NSAP                     15
+
+
+@enum Acct-Authentic
+
+   RADIUS                         1
+   LOCAL                          2
+   REMOTE                         3
+   DIAMETER                       4
+
+@enum Accounting-Auth-Method
+
+   PAP                            1
+   CHAP                           2
+   MS-CHAP-1                      3
+   MS-CHAP-2                      4
+   EAP                            5
+   NONE                           7
+
+@enum Termination-Cause
+
+   USER_REQUEST                  11
+   LOST_CARRIER                  12
+   LOST_SERVICE                  13
+   IDLE_TIMEOUT                  14
+   SESSION_TIMEOUT               15
+   ADMIN_RESET                   16
+   ADMIN_REBOOT                  17
+   PORT_ERROR                    18
+   NAS_ERROR                     19
+   NAS_REQUEST                   20
+   NAS_REBOOT                    21
+   PORT_UNNEEDED                 22
+   PORT_PREEMPTED                23
+   PORT_SUSPENDED                24
+   SERVICE_UNAVAILABLE           25
+   CALLBACK                      26
+   USER_ERROR                    27
+   HOST_REQUEST                  28
+   SUPPLICANT_RESTART            29
+   REAUTHORIZATION_FAILURE       30
+   PORT_REINIT                   31
+   PORT_DISABLED                 32
diff --git a/dia/diameter_rfc4006_cc.dia b/dia/diameter_rfc4006_cc.dia
new file mode 100644
index 0000000..5a22c47
--- /dev/null
+++ b/dia/diameter_rfc4006_cc.dia
@@ -0,0 +1,350 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;;
+;; %CopyrightEnd%
+;;
+
+;;
+;; RFC 4006, Diameter Credit-Control Application
+;;
+
+@id 4
+
+@inherits diameter_gen_base_rfc6733
+@inherits diameter_rfc4005_nasreq  Filter-Id
+
+;; ===========================================================================
+
+@avp_types
+
+   CC-Correlation-Id                 411    OctetString   -
+   CC-Input-Octets                   412    Unsigned64    M
+   CC-Money                          413    Grouped       M
+   CC-Output-Octets                  414    Unsigned64    M
+   CC-Request-Number                 415    Unsigned32    M
+   CC-Request-Type                   416    Enumerated    M
+   CC-Service-Specific-Units         417    Unsigned64    M
+   CC-Session-Failover               418    Enumerated    M
+   CC-Sub-Session-Id                 419    Unsigned64    M
+   CC-Time                           420    Unsigned32    M
+   CC-Total-Octets                   421    Unsigned64    M
+   CC-Unit-Type                      454    Enumerated    M
+   Check-Balance-Result              422    Enumerated    M
+   Cost-Information                  423    Grouped       M
+   Cost-Unit                         424    UTF8String    M
+   Credit-Control                    426    Enumerated    M
+   Credit-Control-Failure-Handling   427    Enumerated    M
+   Currency-Code                     425    Unsigned32    M
+   Direct-Debiting-Failure-Handling  428    Enumerated    M
+   Exponent                          429    Integer32     M
+   Final-Unit-Action                 449    Enumerated    M
+   Final-Unit-Indication             430    Grouped       M
+   Granted-Service-Unit              431    Grouped       M
+   G-S-U-Pool-Identifier             453    Unsigned32    M
+   G-S-U-Pool-Reference              457    Grouped       M
+   Multiple-Services-Credit-Control  456    Grouped       M
+   Multiple-Services-Indicator       455    Enumerated    M
+   Rating-Group                      432    Unsigned32    M
+   Redirect-Address-Type             433    Enumerated    M
+   Redirect-Server                   434    Grouped       M
+   Redirect-Server-Address           435    UTF8String    M
+   Requested-Action                  436    Enumerated    M
+   Requested-Service-Unit            437    Grouped       M
+   Restriction-Filter-Rule           438    IPFilterRule  M
+   Service-Context-Id                461    UTF8String    M
+   Service-Identifier                439    Unsigned32    M
+   Service-Parameter-Info            440    Grouped       -
+   Service-Parameter-Type            441    Unsigned32    -
+   Service-Parameter-Value           442    OctetString   -
+   Subscription-Id                   443    Grouped       M
+   Subscription-Id-Data              444    UTF8String    M
+   Subscription-Id-Type              450    Enumerated    M
+   Tariff-Change-Usage               452    Enumerated    M
+   Tariff-Time-Change                451    Time          M
+   Unit-Value                        445    Grouped       M
+   Used-Service-Unit                 446    Grouped       M
+   User-Equipment-Info               458    Grouped       -
+   User-Equipment-Info-Type          459    Enumerated    -
+   User-Equipment-Info-Value         460    OctetString   -
+   Value-Digits                      447    Integer64     M
+   Validity-Time                     448    Unsigned32    M
+
+;; ===========================================================================
+
+@messages
+
+   CCR ::= < Diameter Header: 272, REQ, PXY >
+
+           < Session-Id >
+           { Origin-Host }
+           { Origin-Realm }
+           { Destination-Realm }
+           { Auth-Application-Id }
+           { Service-Context-Id }
+           { CC-Request-Type }
+           { CC-Request-Number }
+           [ Destination-Host ]
+           [ User-Name ]
+           [ CC-Sub-Session-Id ]
+           [ Acct-Multi-Session-Id ]
+           [ Origin-State-Id ]
+           [ Event-Timestamp ]
+         * [ Subscription-Id ]
+           [ Service-Identifier ]
+           [ Termination-Cause ]
+           [ Requested-Service-Unit ]
+           [ Requested-Action ]
+         * [ Used-Service-Unit ]
+           [ Multiple-Services-Indicator ]
+         * [ Multiple-Services-Credit-Control ]
+         * [ Service-Parameter-Info ]
+           [ CC-Correlation-Id ]
+           [ User-Equipment-Info ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ AVP ]
+
+   CCA ::= < Diameter Header: 272, PXY >
+
+           < Session-Id >
+           { Result-Code }
+           { Origin-Host }
+           { Origin-Realm }
+           { Auth-Application-Id }
+           { CC-Request-Type }
+           { CC-Request-Number }
+           [ User-Name ]
+           [ CC-Session-Failover ]
+           [ CC-Sub-Session-Id ]
+           [ Acct-Multi-Session-Id ]
+           [ Origin-State-Id ]
+           [ Event-Timestamp ]
+           [ Granted-Service-Unit ]
+         * [ Multiple-Services-Credit-Control ]
+           [ Cost-Information]
+           [ Final-Unit-Indication ]
+           [ Check-Balance-Result ]
+           [ Credit-Control-Failure-Handling ]
+           [ Direct-Debiting-Failure-Handling ]
+           [ Validity-Time]
+         * [ Redirect-Host]
+           [ Redirect-Host-Usage ]
+           [ Redirect-Max-Cache-Time ]
+         * [ Proxy-Info ]
+         * [ Route-Record ]
+         * [ Failed-AVP ]
+         * [ AVP ]
+
+;; ===========================================================================
+
+@grouped
+
+   Cost-Information ::= < AVP Header: 423 >
+
+           { Unit-Value }
+           { Currency-Code }
+           [ Cost-Unit ]
+
+   Unit-Value ::= < AVP Header: 445 >
+
+           { Value-Digits }
+           [ Exponent ]
+
+   Multiple-Services-Credit-Control ::= < AVP Header: 456 >
+
+           [ Granted-Service-Unit ]
+           [ Requested-Service-Unit ]
+         * [ Used-Service-Unit ]
+           [ Tariff-Change-Usage ]
+         * [ Service-Identifier ]
+           [ Rating-Group ]
+         * [ G-S-U-Pool-Reference ]
+           [ Validity-Time ]
+           [ Result-Code ]
+           [ Final-Unit-Indication ]
+         * [ AVP ]
+
+   Granted-Service-Unit ::= < AVP Header: 431 >
+
+           [ Tariff-Time-Change ]
+           [ CC-Time ]
+           [ CC-Money ]
+           [ CC-Total-Octets ]
+           [ CC-Input-Octets ]
+           [ CC-Output-Octets ]
+           [ CC-Service-Specific-Units ]
+         * [ AVP ]
+
+   Requested-Service-Unit ::= < AVP Header: 437 >
+
+           [ CC-Time ]
+           [ CC-Money ]
+           [ CC-Total-Octets ]
+           [ CC-Input-Octets ]
+           [ CC-Output-Octets ]
+           [ CC-Service-Specific-Units ]
+         * [ AVP ]
+
+   Used-Service-Unit ::= < AVP Header: 446 >
+
+           [ Tariff-Change-Usage ]
+           [ CC-Time ]
+           [ CC-Money ]
+           [ CC-Total-Octets ]
+           [ CC-Input-Octets ]
+           [ CC-Output-Octets ]
+           [ CC-Service-Specific-Units ]
+         * [ AVP ]
+
+   CC-Money ::= < AVP Header: 413 >
+
+           { Unit-Value }
+           [ Currency-Code ]
+
+   G-S-U-Pool-Reference ::= < AVP Header: 457 >
+
+           { G-S-U-Pool-Identifier }
+           { CC-Unit-Type }
+           { Unit-Value }
+
+   Final-Unit-Indication ::= < AVP Header: 430 >
+
+           { Final-Unit-Action }
+         * [ Restriction-Filter-Rule ]
+         * [ Filter-Id ]
+           [ Redirect-Server ]
+
+   Redirect-Server ::= < AVP Header: 434 >
+
+           { Redirect-Address-Type }
+           { Redirect-Server-Address }
+
+   Service-Parameter-Info ::= < AVP Header: 440 >
+
+           { Service-Parameter-Type }
+           { Service-Parameter-Value }
+
+   Subscription-Id ::= < AVP Header: 443 >
+
+           { Subscription-Id-Type }
+           { Subscription-Id-Data }
+
+   User-Equipment-Info ::= < AVP Header: 458 >
+
+           { User-Equipment-Info-Type }
+           { User-Equipment-Info-Value }
+
+;; ===========================================================================
+
+@enum CC-Request-Type
+
+   INITIAL_REQUEST                 1
+   UPDATE_REQUEST                  2
+   TERMINATION_REQUEST             3
+   EVENT_REQUEST                   4
+
+@enum CC-Session-Failover
+
+   NOT_SUPPORTED                   0
+   SUPPORTED                       1
+
+@enum Check-Balance-Result
+
+   ENOUGH_CREDIT                   0
+   NO_CREDIT                       1
+
+@enum Credit-Control
+
+   AUTHORIZATION                   0
+   RE_AUTHORIZATION                1
+
+@enum Credit-Control-Failure-Handling
+
+   TERMINATE                       0
+   CONTINUE                        1
+   RETRY_AND_TERMINATE             2
+
+@enum Direct-Debiting-Failure-Handling
+
+   TERMINATE_OR_BUFFER             0
+   CONTINUE                        1
+
+@enum Tariff-Change-Usage
+
+   UNIT_BEFORE_TARIFF_CHANGE       0
+   UNIT_AFTER_TARIFF_CHANGE        1
+   UNIT_INDETERMINATE              2
+
+@enum CC-Unit-Type
+
+   TIME                            0
+   MONEY                           1
+   TOTAL-OCTETS                    2
+   INPUT-OCTETS                    3
+   OUTPUT-OCTETS                   4
+   SERVICE-SPECIFIC-UNITS          5
+
+@enum Final-Unit-Action
+
+   TERMINATE                       0
+   REDIRECT                        1
+   RESTRICT_ACCESS                 2
+
+@enum Redirect-Address-Type
+
+   IPV4                            0
+   IPV6                            1
+   URL                             2
+   SIP_URI                         3
+
+@enum Multiple-Services-Indicator
+
+   NOT_SUPPORTED                   0
+   SUPPORTED                       1
+
+@enum Requested-Action
+
+   DIRECT_DEBITING                 0
+   REFUND_ACCOUNT                  1
+   CHECK_BALANCE                   2
+   PRICE_ENQUIRY                   3
+
+@enum Subscription-Id-Type
+
+   END_USER_E164                   0
+   END_USER_IMSI                   1
+   END_USER_SIP_URI                2
+   END_USER_NAI                    3
+   END_USER_PRIVATE                4
+
+@enum User-Equipment-Info-Type
+
+   IMEISV                          0
+   MAC                             1
+   EUI64                           2
+   MODIFIED_EUI64                  3
+
+;; ===========================================================================
+
+@define Result-Code
+
+   END_USER_SERVICE_DENIED         4010
+   CREDIT_CONTROL_NOT_APPLICABLE   4011
+   CREDIT_LIMIT_REACHED            4012
+
+   USER_UNKNOWN                    5030
+   RATING_FAILED                   5031
diff --git a/dia/diameter_rfc7155_nasreq.dia b/dia/diameter_rfc7155_nasreq.dia
new file mode 100644
index 0000000..ddeccae
--- /dev/null
+++ b/dia/diameter_rfc7155_nasreq.dia
@@ -0,0 +1,377 @@
+;; Copyright 2017, Travelping GmbH <info@travelping.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version
+;; 2 of the License, or (at your option) any later version.
+
+;;
+;; RFC 7155, Diameter Network Access Server Application
+;;
+;;
+;; Edits:
+;;
+;; - Framed-Appletalk-Link      -> Framed-AppleTalk-Link
+;; - Framed-Appletalk-Network   -> Framed-AppleTalk-Network
+;; - Framed-Appletalk-Zone      -> Framed-AppleTalk-Zone
+;;
+
+@id 1
+@name   diameter_rfc7155_nasreq
+@prefix diameter_nasreq
+@vendor 0 IETF
+
+@inherits diameter_gen_base_rfc6733
+
+@avp_types
+
+   Accounting-Auth-Method       406    Enumerated       M
+   Accounting-Input-Octets      363    Unsigned64       M
+   Accounting-Input-Packets     365    Unsigned64       M
+   Accounting-Output-Octets     364    Unsigned64       M
+   Accounting-Output-Packets    366    Unsigned64       M
+   Acct-Authentic               45     Enumerated       M
+   Acct-Delay-Time              41     Unsigned32       M
+   Acct-Link-Count              51     Unsigned32       M
+   Acct-Session-Time            46     Unsigned32       M
+   Acct-Tunnel-Connection       68     OctetString      M
+   Acct-Tunnel-Packets-Lost     86     Unsigned32       M
+   Callback-Id                  20     UTF8String       M
+   Callback-Number              19     UTF8String       M
+   Called-Station-Id            30     UTF8String       M
+   Calling-Station-Id           31     UTF8String       M
+   Connect-Info                 77     UTF8String       M
+   Filter-Id                    11     UTF8String       M
+   Framed-AppleTalk-Link        37     Unsigned32       M
+   Framed-AppleTalk-Network     38     Unsigned32       M
+   Framed-AppleTalk-Zone        39     OctetString      M
+   Framed-Compression           13     Enumerated       M
+   Framed-IP-Address            8      OctetString      M
+   Framed-IP-Netmask            9      OctetString      M
+   Framed-IPX-Network           23     Unsigned32       M
+   Framed-IPv6-Pool             100    OctetString      M
+   Framed-IPv6-Prefix           97     OctetString      M
+   Framed-IPv6-Route            99     UTF8String       M
+   Framed-Interface-Id          96     Unsigned64       M
+   Framed-MTU                   12     Unsigned32       M
+   Framed-Pool                  88     OctetString      M
+   Framed-Protocol              7      Enumerated       M
+   Framed-Route                 22     UTF8String       M
+   Framed-Routing               10     Enumerated       M
+   Idle-Timeout                 28     Unsigned32       M
+   Login-IP-Host                14     OctetString      M
+   Login-IPv6-Host              98     OctetString      M
+   Login-LAT-Group              36     OctetString      M
+   Login-LAT-Node               35     OctetString      M
+   Login-LAT-Port               63     OctetString      M
+   Login-LAT-Service            34     OctetString      M
+   Login-Service                15     Enumerated       M
+   Login-TCP-Port               16     Unsigned32       M
+   NAS-Filter-Rule              400    IPFilterRule     M
+   NAS-IP-Address               4      OctetString      M
+   NAS-IPv6-Address             95     OctetString      M
+   NAS-Identifier               32     UTF8String       M
+   NAS-Port                     5      Unsigned32       M
+   NAS-Port-Id                  87     UTF8String       M
+   NAS-Port-Type                61     Enumerated       M
+   Origin-AAA-Protocol          408    Enumerated       M
+   Originating-Line-Info        94     OctetString      M
+   Port-Limit                   62     Unsigned32       M
+   QoS-Filter-Rule              407    QoSFilterRule    M
+   Service-Type                 6      Enumerated       M
+   Tunnel-Assignment-Id         82     OctetString      M
+   Tunnel-Client-Auth-Id        90     UTF8String       M
+   Tunnel-Client-Endpoint       66     UTF8String       M
+   Tunnel-Medium-Type           65     Enumerated       M
+   Tunnel-Password              69     OctetString      M
+   Tunnel-Preference            83     Unsigned32       M
+   Tunnel-Private-Group-Id      81     OctetString      M
+   Tunnel-Server-Auth-Id        91     UTF8String       M
+   Tunnel-Server-Endpoint       67     UTF8String       M
+   Tunnel-Type                  64     Enumerated       M
+   Tunneling                    401    Grouped          M
+
+@messages
+
+      ACR ::= <Diameter Header: 271, REQ, PXY>
+              < Session-Id >
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { Accounting-Record-Type }
+              { Accounting-Record-Number }
+              { Acct-Application-Id }
+              [ User-Name ]
+              [ Accounting-Sub-Session-Id ]
+              [ Acct-Session-Id ]
+              [ Acct-Multi-Session-Id ]
+              [ Origin-AAA-Protocol ]
+              [ Origin-State-Id ]
+              [ Destination-Host ]
+              [ Event-Timestamp ]
+              [ Acct-Delay-Time ]
+              [ NAS-Identifier ]
+              [ NAS-IP-Address ]
+              [ NAS-IPv6-Address ]
+              [ NAS-Port ]
+              [ NAS-Port-Id ]
+              [ NAS-Port-Type ]
+            * [ Class ]
+              [ Service-Type ]
+              [ Termination-Cause ]
+              [ Accounting-Input-Octets ]
+              [ Accounting-Input-Packets ]
+              [ Accounting-Output-Octets ]
+              [ Accounting-Output-Packets ]
+              [ Acct-Authentic ]
+              [ Accounting-Auth-Method ]
+              [ Acct-Link-Count ]
+              [ Acct-Session-Time ]
+              [ Acct-Tunnel-Connection ]
+              [ Acct-Tunnel-Packets-Lost ]
+              [ Callback-Id ]
+              [ Callback-Number ]
+              [ Called-Station-Id ]
+              [ Calling-Station-Id ]
+            * [ Connect-Info ]
+              [ Originating-Line-Info ]
+              [ Authorization-Lifetime ]
+              [ Session-Timeout ]
+              [ Idle-Timeout ]
+              [ Port-Limit ]
+              [ Accounting-Realtime-Required ]
+              [ Acct-Interim-Interval ]
+            * [ Filter-Id ]
+            * [ NAS-Filter-Rule ]
+            * [ QoS-Filter-Rule ]
+              [ Framed-AppleTalk-Link ]
+              [ Framed-AppleTalk-Network ]
+              [ Framed-AppleTalk-Zone ]
+              [ Framed-Compression ]
+              [ Framed-Interface-Id ]
+              [ Framed-IP-Address ]
+              [ Framed-IP-Netmask ]
+            * [ Framed-IPv6-Prefix ]
+              [ Framed-IPv6-Pool ]
+            * [ Framed-IPv6-Route ]
+              [ Framed-IPX-Network ]
+              [ Framed-MTU ]
+              [ Framed-Pool ]
+              [ Framed-Protocol ]
+            * [ Framed-Route ]
+              [ Framed-Routing ]
+            * [ Login-IP-Host ]
+            * [ Login-IPv6-Host ]
+              [ Login-LAT-Group ]
+              [ Login-LAT-Node ]
+              [ Login-LAT-Port ]
+              [ Login-LAT-Service ]
+              [ Login-Service ]
+              [ Login-TCP-Port ]
+            * [ Tunneling ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      ACA ::= <Diameter Header: 271, PXY>
+              < Session-Id >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              { Accounting-Record-Type }
+              { Accounting-Record-Number }
+              { Acct-Application-Id }
+              [ User-Name ]
+              [ Accounting-Sub-Session-Id ]
+              [ Acct-Session-Id ]
+              [ Acct-Multi-Session-Id ]
+              [ Event-Timestamp ]
+              [ Error-Message ]
+              [ Error-Reporting-Host ]
+            * [ Failed-AVP ]
+              [ Origin-AAA-Protocol ]
+              [ Origin-State-Id ]
+              [ NAS-Identifier ]
+              [ NAS-IP-Address ]
+              [ NAS-IPv6-Address ]
+              [ NAS-Port ]
+              [ NAS-Port-Id ]
+              [ NAS-Port-Type ]
+              [ Service-Type ]
+              [ Termination-Cause ]
+              [ Accounting-Realtime-Required ]
+              [ Acct-Interim-Interval ]
+            * [ Class ]
+            * [ Proxy-Info ]
+            * [ AVP ]
+
+@enum Service-Type
+
+   UNKNOWN                                            0
+   LOGIN                                              1
+   FRAMED                                             2
+   CALLBACK_LOGIN                                     3
+   CALLBACK_FRAMED                                    4
+   OUTBOUND                                           5
+   ADMINISTRATIVE                                     6
+   NAS_PROMPT                                         7
+   AUTHENTICATE_ONLY                                  8
+   CALLBACK_NAS_PROMPT                                9
+   CALL_CHECK                                         10
+   CALLBACK_ADMINISTRATIVE                            11
+   VOICE                                              12
+   FAX                                                13
+   MODEM_RELAY                                        14
+   IAPP_REGISTER                                      15
+   IAPP_AP_CHECK                                      16
+   AUTHORIZE_ONLY                                     17
+   FRAMED_MANAGEMENT                                  18
+
+@enum Framed-Protocol
+
+   PPP                                                1
+   SLIP                                               2
+   ARAP                                               3
+   GANDALF                                            4
+   XYLOGICS                                           5
+   X_75                                               6
+   GPRS_PDP_CONTEXT                                   7
+   ASCEND_ARA                                         255
+   MPP                                                256
+   EURAW                                              257
+   EUUI                                               258
+   X25                                                259
+   COMB                                               260
+   FR                                                 261
+
+@enum Framed-Routing
+
+   NONE                                               0
+   SEND_ROUTING_PACKETS                               1
+   LISTEN_FOR_ROUTING_PACKETS                         2
+   SEND_AND_LISTEN                                    3
+
+@enum Framed-Compression
+
+   NONE                                               0
+   IPX_HEADER_COMPRESSION                             2
+   STAC_LZS_COMPRESSION                               3
+
+@enum Login-Service
+
+   TELNET                                             0
+   RLOGIN                                             1
+   TCP_CLEAR                                          2
+   PORTMASTER                                         3
+   LAT                                                4
+   X25_PAD                                            5
+   X25_T3POS                                          6
+   UNASSIGNED                                         7
+
+@enum Acct-Authentic
+
+   NONE                                               0
+   RADIUS                                             1
+   LOCAL                                              2
+   REMOTE                                             3
+   DIAMETER                                           4
+
+@enum NAS-Port-Type
+
+   ASYNC                                              0
+   SYNC                                               1
+   ISDN_SYNC                                          2
+   ISDN_ASYNC_V120                                    3
+   ISDN_ASYNC_V110                                    4
+   VIRTUAL                                            5
+   PIAFS                                              6
+   HDLC_CLEAR_CHANNEL                                 7
+   X25                                                8
+   X75                                                9
+   G_3_FAX                                            10
+   SDSL_SYMMETRIC_DSL                                 11
+   IDSL_ISDN_DIGITAL_SUBSCRIBER_LINE                  14
+   ETHERNET                                           15
+   XDSL_DIGITAL_SUBSCRIBER_LINE_OF_UNKNOWN_TYPE       16
+   CABLE                                              17
+   WIRELESS_OTHER                                     18
+   WIRELESS_IEEE_802_11                               19
+   TOKEN_RING                                         20
+   FDDI                                               21
+   WIRELESS_CDMA2000                                  22
+   WIRELESS_UMTS                                      23
+   WIRELESS_1X_EV                                     24
+   IAPP                                               25
+   FTTP_FIBER_TO_THE_PREMISES                         26
+   WIRELESS_IEEE_802_16                               27
+   WIRELESS_IEEE_802_20                               28
+   WIRELESS_IEEE_802_22                               29
+   PPPOA_PPP_OVER_ATM                                 30
+   PPPOEOA_PPP_OVER_ETHERNET_OVER_ATM                 31
+   PPPOEOE_PPP_OVER_ETHERNET_OVER_ETHERNET            32
+   PPPOEOVLAN_PPP_OVER_ETHERNET_OVER_VLAN             33
+   PPPOEOQINQ_PPP_OVER_ETHERNET_OVER_IEEE_802_1QINQ   34
+   XPON_PASSIVE_OPTICAL_NETWORK                       35
+   WIRELESS_XGP                                       36
+
+@enum Tunnel-Type
+
+   PPTP                                               1
+   L2F                                                2
+   L2TP                                               3
+   ATMP                                               4
+   VTP                                                5
+   AH                                                 6
+   IP_IP_ENCAP                                        7
+   MIN_IP_IP                                          8
+   ESP                                                9
+   GRE                                                10
+   DVS                                                11
+   IP_IN_IP_TUNNELING                                 12
+   VLAN                                               13
+
+@enum Tunnel-Medium-Type
+
+   IPV4                                               1
+   IPV6                                               2
+   NSAP                                               3
+   HDLC                                               4
+   BBN                                                5
+   IEEE_802                                           6
+   E_163                                              7
+   E_164                                              8
+   F_69                                               9
+   X_121                                              10
+   IPX                                                11
+   APPLETALK_802                                      12
+   DECNET4                                            13
+   VINES                                              14
+   E_164_NSAP                                         15
+
+@enum Accounting-Auth-Method
+
+   PAP                                                1
+   CHAP                                               2
+   MS_CHAP_1                                          3
+   MS_CHAP_2                                          4
+   EAP                                                5
+   UNDEFINED                                          6
+   NONE                                               7
+
+@enum Origin-AAA-Protocol
+
+   RADIUS                                             1
+
+@grouped
+
+      Tunneling ::= <AVP Header: 401>
+                    { Tunnel-Type }
+                    { Tunnel-Medium-Type }
+                    { Tunnel-Client-Endpoint }
+                    { Tunnel-Server-Endpoint }
+                    [ Tunnel-Preference ]
+                    [ Tunnel-Client-Auth-Id ]
+                    [ Tunnel-Server-Auth-Id ]
+                    [ Tunnel-Assignment-Id ]
+                    [ Tunnel-Password ]
+                    [ Tunnel-Private-Group-Id ]