[L] Change in osmo-ttcn3-hacks[master]: DIAMETER_Types: generate types for RFC4004 - gerrit-log

6 Mar 2024

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36167?usp=email )
Change subject: DIAMETER_Types: generate types for RFC4004
......................................................................
DIAMETER_Types: generate types for RFC4004
RFC 4004 contains MIP-Home-Agent-Address AVP, which is part of
MIP6-Agent-Info AVP in RFC 5447.
Change-Id: I66cae565d332d88f24c4ee94459770f9d24c16af
---
M library/DIAMETER_Types.ttcn
M library/regen-DIAMETER_Types_ttcn.sh
2 files changed, 410 insertions(+), 97 deletions(-)
Approvals:
  laforge: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved

diff --git a/library/DIAMETER_Types.ttcn b/library/DIAMETER_Types.ttcn
index 3d4a895..a714be2 100644
--- a/library/DIAMETER_Types.ttcn
+++ b/library/DIAMETER_Types.ttcn
@@ -4,7 +4,7 @@
 //                                               //
 ///////////////////////////////////////////////////
 // Generated with command:
-// AVP.sh Base_IETF_RFC3588.ddf BaseTypes_IETF_RFC3588.ddf NetworkAccessServer_IETF_RFC4005.ddf CreditControl_IETF_RFC4006.ddf MobileIPv6_NAS_IETF_RFC5447.ddf MobileIPv6_HA_IETF_RFC5778.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf CxDxInterface_3GPP_TS29229_c30.ddf GiSGiInterface_3GPP_TS29061_d70.ddf ChargingApplications_3GPP_TS32299_d90.ddf AAAInterface_3GPP_TS29273_f00.ddf
+// AVP.sh Base_IETF_RFC3588.ddf BaseTypes_IETF_RFC3588.ddf MobileIPv4_Application_IETF_RFC4004.ddf NetworkAccessServer_IETF_RFC4005.ddf CreditControl_IETF_RFC4006.ddf MobileIPv6_NAS_IETF_RFC5447.ddf MobileIPv6_HA_IETF_RFC5778.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf CxDxInterface_3GPP_TS29229_c30.ddf GiSGiInterface_3GPP_TS29061_d70.ddf ChargingApplications_3GPP_TS32299_d90.ddf AAAInterface_3GPP_TS29273_f00.ddf
 module DIAMETER_Types {
 /******************************************************************************
 * Copyright (c) 2000-2019 Ericsson Telecom AB
@@ -669,6 +669,208 @@
 *   Zsolt Szalai
 ******************************************************************************/
 //
+//  File:               MobileIPv4_Application_IETF_RFC4004.ddf
+//  Description:        DDF for Mobile IPv4 Application
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+//  Reference:          IETF RFC 4004
+//
+//
+
+// APPLICATION-NAME: MIPv4
+// APPLICATION-REVISION: RFC4004
+
+// RFC 4004 7.1
+// AVP: MIP-Reg-Request (320)
+type AVP_OctetString MIPv4_NONE_MIP_Reg_Request
+
+// RFC 4004 7.2
+// AVP: MIP-Reg-Reply (321)
+type AVP_OctetString MIPv4_NONE_MIP_Reg_Reply
+
+// RFC 4004 7.3
+// AVP: MIP-Mobile-Node-Address (333)
+type AVP_Address MIPv4_NONE_MIP_Mobile_Node_Address
+
+// RFC 4004 7.4
+// AVP: MIP-Home-Agent-Address (334)
+type AVP_Address MIPv4_NONE_MIP_Home_Agent_Address
+
+// RFC 4004 7.5
+// AVP: MIP-Feature-Vector (337)
+type AVP_Unsigned32 MIPv4_NONE_MIP_Feature_Vector
+
+// RFC 4004 7.6
+// AVP: MIP-MN-AAA-Auth (322)
+type AVP_Grouped MIPv4_NONE_MIP_MN_AAA_Auth
+
+// RFC 4004 7.6.1
+// AVP: MIP-MN-AAA-SPI (341)
+type AVP_Unsigned32 MIPv4_NONE_MIP_MN_AAA_SPI
+
+// RFC 4004 7.6.2
+// AVP: MIP-Auth-Input-Data-Length (338)
+type AVP_Unsigned32 MIPv4_NONE_MIP_Auth_Input_Data_Length
+
+
+// RFC 4004 7.6.3
+// AVP: MIP-Authenticator-Length (339)
+type AVP_Unsigned32 MIPv4_NONE_MIP_Authenticator_Length
+
+// RFC 4004 7.6.4
+// AVP: MIP-Authenticator-Offset (340)
+type AVP_Unsigned32 MIPv4_NONE_MIP_Authenticator_Offset
+
+// RFC 4004 7.7
+// AVP: MIP-FA-Challenge (344)
+type AVP_OctetString MIPv4_NONE_MIP_FA_Challenge
+
+// RFC 4004 7.8
+// AVP: MIP-Filter-Rule (342)
+type AVP_IPFilterRule MIPv4_NONE_MIP_Filter_Rule
+
+// RFC 4004 7.9
+// AVP: MIP-Candidate-Home-Agent-Host (336)
+type AVP_DiameterIdentity MIPv4_NONE_MIP_Candidate_Home_Agent_Host
+
+// RFC 4004 7.10
+// AVP: MIP-Originating-Foreign-AAA (347)
+type AVP_Grouped MIPv4_NONE_MIP_Originating_Foreign_AAA
+
+// RFC 4004 7.11
+// AVP: MIP-Home-Agent-Host (348)
+type AVP_Grouped MIPv4_NONE_MIP_Home_Agent_Host
+
+// RFC 4004 9.1
+// AVP: MIP-FA-to-MN-MSA (326)
+type AVP_Grouped MIPv4_NONE_MIP_FA_to_MN_MSA
+
+// RFC 4004 9.2
+// AVP: MIP-FA-to-HA-MSA (328)
+type AVP_Grouped MIPv4_NONE_MIP_FA_to_HA_MSA
+
+// RFC 4004 9.3
+// AVP: MIP-HA-to-FA-MSA (329)
+type AVP_Grouped MIPv4_NONE_MIP_HA_to_FA_MSA
+
+// RFC 4004 9.4
+// AVP: MIP-HA-to-MN-MSA (332)
+type AVP_Grouped MIPv4_NONE_MIP_HA_to_MN_MSA
+
+// RFC 4004 9.5
+// AVP: MIP-MN-to-FA-MSA (325)
+type AVP_Grouped MIPv4_NONE_MIP_MN_to_FA_MSA
+
+// RFC 4004 9.6
+// AVP: MIP-MN-to-HA-MSA (331)
+type AVP_Grouped MIPv4_NONE_MIP_MN_to_HA_MSA
+
+// RFC 4004 9.7
+// AVP: MIP-Session-Key (343)
+type AVP_OctetString MIPv4_NONE_MIP_Session_Key
+
+// RFC 4004 9.8
+// AVP: MIP-Algorithm-Type (345)
+type enumerated MIPv4_NONE_MIP_Algorithm_Type  {
+ HMAC_SHA_1 (2)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4004 9.9
+// AVP: MIP-Replay-Mode (346)
+type enumerated MIPv4_NONE_MIP_Replay_Mode  {
+ None (1),
+ Timestamps (2),
+ Nonces (3)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4004 9.10
+// AVP: MIP-FA-to-MN-SPI (319)
+type AVP_Unsigned32 MIPv4_NONE_MIP_FA_to_MN_SPI
+
+// RFC 4004 9.11
+// AVP: MIP-FA-to-HA-SPI (318)
+type AVP_Unsigned32 MIPv4_NONE_MIP_FA_to_HA_SPI
+
+// RFC 4004 9.12
+// AVP: MIP-Nonce (335)
+type AVP_OctetString MIPv4_NONE_MIP_Nonce
+
+// RFC 4004 9.13
+// AVP: MIP-MSA-Lifetime (367)
+type AVP_Unsigned32 MIPv4_NONE_MIP_MSA_Lifetime
+
+// RFC 4004 9.14
+// AVP: MIP-HA-to-FA-SPI (323)
+type AVP_Unsigned32 MIPv4_NONE_MIP_HA_to_FA_SPI
+
+// RFC 4004 10.1
+// AVP: Accounting-Input-Octets (363)
+type AVP_Unsigned64 MIPv4_NONE_Accounting_Input_Octets
+
+// RFC 4004 10.2
+// AVP: Accounting-Output-Octets (364)
+type AVP_Unsigned64 MIPv4_NONE_Accounting_Output_Octets
+
+// RFC 4004 10.3
+// AVP: Acct-Session-Time (46)
+type AVP_Unsigned32 MIPv4_NONE_Acct_Session_Time
+
+// RFC 4004 10.4
+// AVP: Accounting-Input-Packets (365)
+type AVP_Unsigned64 MIPv4_NONE_Accounting_Input_Packets
+
+// RFC 4004 10.5
+// AVP: Accounting-Output-Packets (366)
+type AVP_Unsigned64 MIPv4_NONE_Accounting_Output_Packets
+
+// RFC 4004 10.6
+// AVP: Event-Timestamp (55)
+// WARNING: Duplicated AVP definition removed by gawk script!
+/******************************************************************************
+* Copyright (c) 2000-2019 Ericsson Telecom AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v2.0
+* which accompanies this distribution, and is available at
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+*
+* Contributors:
+*   Roland Gecse - initial implementation and initial documentation
+*   Akos Pernek
+*   Antal Wuh.Hen.Chang
+*   Attila Fulop
+*   Balazs Barcsik
+*   Bence Molnar
+*   Csaba Koppany
+*   David Juhasz
+*   Eduard Czimbalmos
+*   Elemer Lelik
+*   Endre Kiss
+*   Endre Kulcsar
+*   Gabor Szalai
+*   Gabor Tatarka
+*   Gergely Futo
+*   Istvan Sandor
+*   Krisztian Pandi
+*   Kulcsár Endre
+*   Laszlo Tamas Zeke
+*   Norbert Pinter
+*   Roland Gecse
+*   Tibor Bende
+*   Tibor Szabo
+*   Timea Moder
+*   Zoltan Medve
+*   Zsolt Nandor Torok
+*   Zsolt Szalai
+******************************************************************************/
+//
 //  File:               NetworkAccessServer_IETF_RFC4005.ddf
 //  Description:        DDF for NAS according to RFC 4005
 //  Rev:                R55A
@@ -1094,27 +1296,27 @@
 // RFC 4005
 // AVP: Accounting-Input-Octets (363)
 // 8.1
-type AVP_Unsigned64 DNAS_NONE_Accounting_Input_Octets 
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 4005
 // AVP: Accounting-Output-Octets (364)
 // 8.2
-type AVP_Unsigned64 DNAS_NONE_Accounting_Output_Octets 
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 4005
 // AVP: Accounting-Input-Packets (365)
 // 8.3
-type AVP_Unsigned64 DNAS_NONE_Accounting_Input_Packets 
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 4005
 // AVP: Accounting-Output-Packets (366)
 // 8.4
-type AVP_Unsigned64 DNAS_NONE_Accounting_Output_Packets 
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 4005
 // AVP: Acct-Session-Time (46)
 // 8.5
-type AVP_Unsigned32 DNAS_NONE_Acct_Session_Time 
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 4005
 // AVP: Acct-Authentic (45)
@@ -1675,11 +1877,11 @@
// RFC 5447 4.2.2
 // AVP: MIP6-Home-Agent-Address (334)
-type AVP_Address MIPv6_NONE_MIP6_Home_Agent_Address
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5447 4.2.3
 // AVP: MIP6-Home-Agent-Host (348)
-type AVP_Grouped MIPv6_NONE_MIP6_Home_Agent_Host
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5447 4.2.4
 // AVP: MIP6-Home-Link-Prefix (125)
@@ -1740,7 +1942,7 @@
// RFC 5778 6.3
 // AVP: MIP-MN-AAA-SPI (341)
-type AVP_Unsigned32 MIPv6_NONE_MIP_MN_AAA_SPI
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5778 6.4
 // AVP: MIP-MN-HA-SPI (491)
@@ -1748,7 +1950,7 @@
// RFC 5778 6.5
 // AVP: MIP-Mobile-Node-Address (333)
-type AVP_Address MIPv6_NONE_MIP_Mobile_Node_Address
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5778 6.7
 // AVP: MIP-Careof-Address (487)
@@ -1764,11 +1966,11 @@
// RFC 5778 6.10
 // AVP: MIP-Session-Key (343)
-type AVP_OctetString MIPv6_NONE_MIP_Session_Key
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5778 6.11
 // AVP: MIP-MSA-Lifetime (367)
-type AVP_Unsigned32 MIPv6_NONE_MIP_MSA_Lifetime
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5778 6.12
 // AVP: MIP-MN-HA-MSA (492)
@@ -1776,18 +1978,11 @@
// RFC 5778 6.13
 // AVP: MIP-Algorithm-Type (345)
-type AVP_Unsigned32 MIPv6_NONE_MIP_Algorithm_Type
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5778 6.14
 // AVP: MIP-Replay-Mode (346)
-type enumerated MIPv6_NONE_MIP_Replay_Mode {
- None (1),
- Timestamp (2)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
+// WARNING: Duplicated AVP definition removed by gawk script!
// RFC 5778 6.16
 // AVP: MIP-Timestamp (490)
@@ -8588,9 +8783,9 @@
 type AVP_Unsigned32 AAA_3GPP_ERP_Authorization
-// STATISTICS: 1166 AVP descriptors found
-// STATISTICS: 1166 AVP type definitions matching AVP descriptors found
-// STATISTICS:  duplicate AVP definitions deleted
+// STATISTICS: 1201 AVP descriptors found
+// STATISTICS: 1187 AVP type definitions matching AVP descriptors found
+// STATISTICS: 14 duplicate AVP definitions deleted
 type enumerated Command_Code {
  Abort_Session (274), Accounting (271), Capabilities_Exchange (257), Device_Watchdog (280), Disconnect_Peer (282), Re_Auth (258), Session_Termination (275), Experimental1 (16777214), Experimental2 (16777215) , Authorize_Authenticate (265), Credit_Control (272), Update_Location (316), Cancel_Location (317), Authentication_Information (318), Insert_Subscriber_Data (319), Delete_Subscriber_Data (320), Purge_UE (321), Reset (322), Notify (323), ME_Identity_Check (324), Update_VCSG_Location (8388638), Cancel_VCSG_Location (8388642), TDF_Session (8388637), Subscriber_Information (8388641), Configuration_Information (8388718), Reporting_Information (8388719), NIDD_Information (8388726), User_Authorization (300), Server_Assignment (301), Location_Info (302), Multimedia_Auth (303), Registration_Termination (304), Push_Profile (305)
 } with {
@@ -8618,33 +8813,38 @@
    avp_code_DNAS_NONE_Login_LAT_Service (34),
    avp_code_DCC_NONE_Direct_Debiting_Failure_Handling (428),
    avp_code_MIPv6_NONE_MIP_Careof_Address (487),
+	avp_code_MIPv4_NONE_MIP_HA_to_FA_MSA (329),
    avp_code_BASE_NONE_Session_Id (263),
    avp_code_DCC_NONE_Requested_Service_Unit (437),
    avp_code_DNAS_NONE_Framed_Pool (88),
    avp_code_DCC_NONE_CC_Time (420),
    avp_code_DCC_NONE_Used_Service_Unit (446),
+	avp_code_MIPv4_NONE_MIP_Reg_Reply (321),
    avp_code_BASE_NONE_Auth_Application_Id (258),
    avp_code_DNAS_NONE_Framed_Appletalk_Network (38),
    avp_code_DNAS_NONE_Framed_IPv6_Prefix (97),
    avp_code_BASE_NONE_Firmware_Revision (267),
    avp_code_BASE_NONE_Auth_Grace_Period (276),
+	avp_code_MIPv4_NONE_MIP_MN_to_FA_MSA (325),
    avp_code_BASE_NONE_Re_Auth_Request_Type (285),
    avp_code_DCC_NONE_Redirect_Address_Type (433),
    avp_code_MIPv6_NONE_MIP_MN_HA_MSA (492),
    avp_code_DNAS_NONE_Tunnel_Medium_Type (65),
    avp_code_DCC_NONE_User_Equipment_Info_Type (459),
-	avp_code_MIPv6_NONE_MIP6_Home_Agent_Address (334),
+	avp_code_MIPv4_NONE_MIP_Home_Agent_Address (334),
    avp_code_MIPv6_NONE_QoS_Resources (508),
    avp_code_DCC_NONE_Service_Parameter_Value (442),
-	avp_code_MIPv6_NONE_MIP_Session_Key (343),
+	avp_code_MIPv4_NONE_MIP_Session_Key (343),
    avp_code_DCC_NONE_Tariff_Time_Change (451),
    avp_code_DNAS_NONE_Tunnel_Password (69),
    avp_code_DNAS_NONE_Tunneling (401),
    avp_code_DCC_NONE_User_Equipment_Info_Value (460),
+	avp_code_MIPv4_NONE_MIP_Auth_Input_Data_Length (338),
    avp_code_BASE_NONE_Multi_Round_Time_Out (272),
    avp_code_BASE_NONE_Experimental_Result_Code (298),
    avp_code_DNAS_NONE_Callback_Number (19),
    avp_code_DNAS_NONE_Configuration_Token (78),
+	avp_code_MIPv4_NONE_MIP_Originating_Foreign_AAA (347),
    avp_code_BASE_NONE_Error_Message (281),
    avp_code_DNAS_NONE_NAS_Port_Type (61),
    avp_code_DCC_NONE_Multiple_Services_Indicator (455),
@@ -8652,7 +8852,7 @@
    avp_code_DNAS_NONE_Filter_Id (11),
    avp_code_DNAS_NONE_ARAP_Password (70),
    avp_code_DNAS_NONE_CHAP_Response (405),
-	avp_code_DNAS_NONE_Accounting_Input_Packets (365),
+	avp_code_MIPv4_NONE_Accounting_Input_Packets (365),
    avp_code_DNAS_NONE_Callback_Id (20),
    avp_code_DCC_NONE_CC_Output_Octets (414),
    avp_code_DCC_NONE_Cost_Information (423),
@@ -8662,6 +8862,7 @@
    avp_code_DNAS_NONE_State (24),
    avp_code_DNAS_NONE_Tunnel_Preference (83),
    avp_code_DCC_NONE_CC_Session_Failover (418),
+	avp_code_MIPv4_NONE_MIP_FA_to_MN_SPI (319),
    avp_code_BASE_NONE_Proxy_State (33),
    avp_code_DCC_NONE_Credit_Control_Failure_Handling (427),
    avp_code_MIPv6_NONE_MIP6_Agent_Info (486),
@@ -8670,30 +8871,34 @@
    avp_code_DNAS_NONE_Idle_Timeout (28),
    avp_code_DNAS_NONE_NAS_Port_Id (87),
    avp_code_BASE_NONE_Host_IP_Address (257),
+	avp_code_MIPv4_NONE_MIP_Reg_Request (320),
    avp_code_DNAS_NONE_Framed_Appletalk_Link (37),
    avp_code_DNAS_NONE_Framed_Interface_Id (96),
    avp_code_BASE_NONE_Vendor_Id (266),
-	avp_code_DNAS_NONE_Acct_Session_Time (46),
+	avp_code_MIPv4_NONE_Acct_Session_Time (46),
    avp_code_BASE_NONE_Event_Timestamp (55),
    avp_code_DCC_NONE_Final_Unit_Action (449),
    avp_code_DNAS_NONE_Framed_IPv6_Pool (100),
    avp_code_DCC_NONE_Rating_Group (432),
    avp_code_MIPv6_NONE_MIP_MN_HA_SPI (491),
    avp_code_DCC_NONE_User_Equipment_Info (458),
-	avp_code_MIPv6_NONE_MIP_Mobile_Node_Address (333),
+	avp_code_MIPv4_NONE_MIP_Mobile_Node_Address (333),
    avp_code_DCC_NONE_Service_Parameter_Type (441),
+	avp_code_MIPv4_NONE_MIP_Filter_Rule (342),
    avp_code_BASE_NONE_Failed_AVP (279),
    avp_code_DCC_NONE_Subscription_Id_Type (450),
+	avp_code_MIPv4_NONE_MIP_FA_to_HA_MSA (328),
    avp_code_DNAS_NONE_User_Password (2),
    avp_code_DNAS_NONE_Acct_Tunnel_Connection (68),
    avp_code_DNAS_NONE_NAS_Filter_Rule (400),
+	avp_code_MIPv4_NONE_MIP_Feature_Vector (337),
    avp_code_BASE_NONE_Session_Server_Failover (271),
    avp_code_BASE_NONE_Experimental_Result (297),
    avp_code_DNAS_NONE_Acct_Link_Count (51),
    avp_code_DCC_NONE_Unit_Value (445),
    avp_code_DNAS_NONE_Reply_Message (18),
    avp_code_DNAS_NONE_Connect_Info (77),
-	avp_code_MIPv6_NONE_MIP_Replay_Mode (346),
+	avp_code_MIPv4_NONE_MIP_Replay_Mode (346),
    avp_code_BASE_NONE_Proxy_Host (280),
    avp_code_DNAS_NONE_CHAP_Challenge (60),
    avp_code_DCC_NONE_CC_Unit_Type (454),
@@ -8711,6 +8916,7 @@
    avp_code_DNAS_NONE_Framed_IPX_Network (23),
    avp_code_DNAS_NONE_Tunnel_Assignment_Id (82),
    avp_code_DCC_NONE_CC_Service_Specific_Units (417),
+	avp_code_MIPv4_NONE_MIP_FA_to_HA_SPI (318),
    avp_code_DNAS_NONE_NAS_Identifier (32),
    avp_code_DNAS_NONE_Tunnel_Server_Auth_Id (91),
    avp_code_DCC_NONE_Credit_Control (426),
@@ -8723,16 +8929,18 @@
    avp_code_DNAS_NONE_Login_LAT_Group (36),
    avp_code_DNAS_NONE_NAS_IPv6_Address (95),
    avp_code_MIPv6_NONE_MIP_MAC_Mobility_Data (489),
-	avp_code_DNAS_NONE_Accounting_Output_Octets (364),
+	avp_code_MIPv4_NONE_Accounting_Output_Octets (364),
    avp_code_BASE_NONE_Supported_Vendor_Id (265),
    avp_code_DNAS_NONE_Acct_Authentic (45),
    avp_code_DCC_NONE_Service_Identifier (439),
    avp_code_BASE_NONE_Auth_Request_Type (274),
    avp_code_DCC_NONE_Validity_Time (448),
+	avp_code_MIPv4_NONE_MIP_HA_to_FA_SPI (323),
    avp_code_DNAS_NONE_Framed_IPv6_Route (99),
    avp_code_DCC_NONE_Granted_Service_Unit (431),
    avp_code_MIPv6_NONE_MIP_Timestamp (490),
    avp_code_BASE_NONE_Product_Name (269),
+	avp_code_MIPv4_NONE_MIP_HA_to_MN_MSA (332),
    avp_code_DNAS_NONE_Framed_IP_Netmask (9),
    avp_code_DCC_NONE_Service_Parameter_Info (440),
    avp_code_BASE_NONE_Origin_State_Id (278),
@@ -8740,10 +8948,11 @@
    avp_code_BASE_NONE_Accounting_Sub_Session_Id (287),
    avp_code_DNAS_NONE_Acct_Delay_Time (41),
    avp_code_DNAS_NONE_Tunnel_Server_Endpoint (67),
+	avp_code_MIPv4_NONE_MIP_Candidate_Home_Agent_Host (336),
    avp_code_BASE_NONE_Session_Binding (270),
    avp_code_BASE_NONE_Acct_Multi_Session_Id (50),
    avp_code_DCC_NONE_Subscription_Id_Data (444),
-	avp_code_MIPv6_NONE_MIP_Algorithm_Type (345),
+	avp_code_MIPv4_NONE_MIP_Algorithm_Type (345),
    avp_code_MIPv6_NONE_QoS_Capability (578),
    avp_code_DCC_NONE_G_S_U_Pool_Identifier (453),
    avp_code_DNAS_NONE_NAS_Port (5),
@@ -8758,8 +8967,8 @@
    avp_code_DNAS_NONE_Framed_Compression (13),
    avp_code_DNAS_NONE_ARAP_Zone_Access (72),
    avp_code_DNAS_NONE_QoS_Filter_Rule (407),
-	avp_code_MIPv6_NONE_MIP_MN_AAA_SPI (341),
-	avp_code_MIPv6_NONE_MIP_MSA_Lifetime (367),
+	avp_code_MIPv4_NONE_MIP_MN_AAA_SPI (341),
+	avp_code_MIPv4_NONE_MIP_MSA_Lifetime (367),
    avp_code_DNAS_NONE_Framed_Route (22),
    avp_code_DNAS_NONE_Tunnel_Private_Group_Id (81),
    avp_code_DCC_NONE_CC_Request_Type (416),
@@ -8775,7 +8984,7 @@
    avp_code_DNAS_NONE_Originating_Line_Info (94),
    avp_code_DCC_NONE_Exponent (429),
    avp_code_MIPv6_NONE_MIP_Authenticator (488),
-	avp_code_DNAS_NONE_Accounting_Input_Octets (363),
+	avp_code_MIPv4_NONE_Accounting_Input_Octets (363),
    avp_code_BASE_NONE_Origin_Host (264),
    avp_code_BASE_NONE_Accounting_Session_Id (44),
    avp_code_DCC_NONE_Restriction_Filter_Rule (438),
@@ -8783,24 +8992,30 @@
    avp_code_DCC_NONE_CC_Total_Octets (421),
    avp_code_BASE_NONE_Accounting_Record_Type (480),
    avp_code_DCC_NONE_Value_Digits (447),
+	avp_code_MIPv4_NONE_MIP_MN_AAA_Auth (322),
    avp_code_BASE_NONE_Acct_Application_Id (259),
    avp_code_DNAS_NONE_Framed_Appletalk_Zone (39),
    avp_code_DNAS_NONE_Login_IPv6_Host (98),
    avp_code_DCC_NONE_Final_Unit_Indication (430),
+	avp_code_MIPv4_NONE_MIP_MN_to_HA_MSA (331),
    avp_code_BASE_NONE_Result_Code (268),
    avp_code_DNAS_NONE_Framed_IP_Address (8),
    avp_code_BASE_NONE_Auth_Session_State (277),
+	avp_code_MIPv4_NONE_MIP_FA_to_MN_MSA (326),
    avp_code_BASE_NONE_Vendor_Specific_Application_Id (260),
    avp_code_MIPv6_NONE_Service_Selection (493),
    avp_code_DNAS_NONE_Tunnel_Client_Endpoint (66),
+	avp_code_MIPv4_NONE_MIP_Nonce (335),
    avp_code_DCC_NONE_Subscription_Id (443),
+	avp_code_MIPv4_NONE_MIP_FA_Challenge (344),
    avp_code_DCC_NONE_Tariff_Change_Usage (452),
    avp_code_DNAS_NONE_NAS_IP_Address (4),
    avp_code_DNAS_NONE_CHAP_Auth (402),
    avp_code_DCC_NONE_Service_Context_Id (461),
+	avp_code_MIPv4_NONE_MIP_Authenticator_Length (339),
    avp_code_BASE_NONE_Inband_Security_Id (299),
    avp_code_DCC_NONE_CC_Correlation_Id (411),
-	avp_code_MIPv6_NONE_MIP6_Home_Agent_Host (348),
+	avp_code_MIPv4_NONE_MIP_Home_Agent_Host (348),
    avp_code_BASE_NONE_Route_Record (282),
    avp_code_DNAS_NONE_Port_Limit (62),
    avp_code_MIPv6_NONE_MIP6_Feature_Vector (124),
@@ -8809,7 +9024,8 @@
    avp_code_DNAS_NONE_ARAP_Features (71),
    avp_code_DNAS_NONE_Framed_MTU (12),
    avp_code_DNAS_NONE_Accounting_Auth_Method (406),
-	avp_code_DNAS_NONE_Accounting_Output_Packets (366),
+	avp_code_MIPv4_NONE_MIP_Authenticator_Offset (340),
+	avp_code_MIPv4_NONE_Accounting_Output_Packets (366),
    avp_code_DCC_NONE_CC_Request_Number (415),
    avp_code_DNAS_NONE_Called_Station_Id (30),
    avp_code_DCC_NONE_Cost_Unit (424),
@@ -9829,6 +10045,7 @@
    PCC_3GPP_Bearer_Identifier avp_PCC_3GPP_Bearer_Identifier,
    RX_3GPP_Content_Version avp_RX_3GPP_Content_Version,
    DCA_3GPP_Applic_ID avp_DCA_3GPP_Applic_ID,
+	MIPv4_NONE_MIP_HA_to_FA_MSA avp_MIPv4_NONE_MIP_HA_to_FA_MSA,
    BASE_NONE_Session_Id avp_BASE_NONE_Session_Id,
    DCA_3GPP_Route_Header_Transmitted avp_DCA_3GPP_Route_Header_Transmitted,
    DCA_3GPP_Reporting_Reason avp_DCA_3GPP_Reporting_Reason,
@@ -9860,6 +10077,7 @@
    AAA_3GPP_Last_UE_Activity_Time avp_AAA_3GPP_Last_UE_Activity_Time,
    AAA_3GPP_Context_Identifier avp_AAA_3GPP_Context_Identifier,
    DCC_NONE_Used_Service_Unit avp_DCC_NONE_Used_Service_Unit,
+	MIPv4_NONE_MIP_Reg_Reply avp_MIPv4_NONE_MIP_Reg_Reply,
    BASE_NONE_Auth_Application_Id avp_BASE_NONE_Auth_Application_Id,
    AAA_3GPP_Trace_Reference avp_AAA_3GPP_Trace_Reference,
    AAA_3GPP_TWAN_Access_Info avp_AAA_3GPP_TWAN_Access_Info,
@@ -9903,6 +10121,7 @@
    DCA_3GPP_IP_Realm_Default_Indication avp_DCA_3GPP_IP_Realm_Default_Indication,
    AAA_3GPP_RAND avp_AAA_3GPP_RAND,
    AAA_3GPP_Trace_Depth avp_AAA_3GPP_Trace_Depth,
+	MIPv4_NONE_MIP_MN_to_FA_MSA avp_MIPv4_NONE_MIP_MN_to_FA_MSA,
    AAA_3GPP_SGSN_User_State avp_AAA_3GPP_SGSN_User_State,
    AAA_3GPP_APN_OI_Replacement avp_AAA_3GPP_APN_OI_Replacement,
    DCA_3GPP_Alternate_Charged_Party_Address avp_DCA_3GPP_Alternate_Charged_Party_Address,
@@ -9921,7 +10140,7 @@
    DCA_3GPP_Originator avp_DCA_3GPP_Originator,
    DCC_NONE_User_Equipment_Info_Type avp_DCC_NONE_User_Equipment_Info_Type,
    RX_3GPP_Flow_Number avp_RX_3GPP_Flow_Number,
-	MIPv6_NONE_MIP6_Home_Agent_Address avp_MIPv6_NONE_MIP6_Home_Agent_Address,
+	MIPv4_NONE_MIP_Home_Agent_Address avp_MIPv4_NONE_MIP_Home_Agent_Address,
    PCC_3GPP_Resource_Allocation_Notification avp_PCC_3GPP_Resource_Allocation_Notification,
    DCA_3GPP_Basic_Service_Code avp_DCA_3GPP_Basic_Service_Code,
    S6_3GPP_Monitoring_Type avp_S6_3GPP_Monitoring_Type,
@@ -9943,7 +10162,7 @@
    DCA_3GPP_IMS_Emergency_Indicator avp_DCA_3GPP_IMS_Emergency_Indicator,
    DCA_3GPP_Change_Time avp_DCA_3GPP_Change_Time,
    AAA_3GPP_KASME avp_AAA_3GPP_KASME,
-	MIPv6_NONE_MIP_Session_Key avp_MIPv6_NONE_MIP_Session_Key,
+	MIPv4_NONE_MIP_Session_Key avp_MIPv4_NONE_MIP_Session_Key,
    DCA_3GPP_AoC_Cost_Information avp_DCA_3GPP_AoC_Cost_Information,
    GI_3GPP_3GPP_User_Location_Info_Time avp_GI_3GPP_3GPP_User_Location_Info_Time,
    AAA_3GPP_Teleservice_List avp_AAA_3GPP_Teleservice_List,
@@ -9975,6 +10194,7 @@
    RX_3GPP_Service_Authorization_Info avp_RX_3GPP_Service_Authorization_Info,
    DNAS_NONE_Tunneling avp_DNAS_NONE_Tunneling,
    DCC_NONE_User_Equipment_Info_Value avp_DCC_NONE_User_Equipment_Info_Value,
+	MIPv4_NONE_MIP_Auth_Input_Data_Length avp_MIPv4_NONE_MIP_Auth_Input_Data_Length,
    AAA_3GPP_eDRX_Cycle_Length avp_AAA_3GPP_eDRX_Cycle_Length,
    BASE_NONE_Multi_Round_Time_Out avp_BASE_NONE_Multi_Round_Time_Out,
    S6_3GPP_Group_Monitoring_Event_Report_Item avp_S6_3GPP_Group_Monitoring_Event_Report_Item,
@@ -9996,6 +10216,7 @@
    DNAS_NONE_Callback_Number avp_DNAS_NONE_Callback_Number,
    DNAS_NONE_Configuration_Token avp_DNAS_NONE_Configuration_Token,
    DCA_3GPP_Interface_Type avp_DCA_3GPP_Interface_Type,
+	MIPv4_NONE_MIP_Originating_Foreign_AAA avp_MIPv4_NONE_MIP_Originating_Foreign_AAA,
    AAA_3GPP_Expiration_Date avp_AAA_3GPP_Expiration_Date,
    BASE_NONE_Error_Message avp_BASE_NONE_Error_Message,
    AAA_3GPP_SRES avp_AAA_3GPP_SRES,
@@ -10033,7 +10254,7 @@
    AAA_3GPP_MBSFN_Area_ID avp_AAA_3GPP_MBSFN_Area_ID,
    CxDx_3GPP_Server_Capabilities avp_CxDx_3GPP_Server_Capabilities,
    AAA_3GPP_Area_Scope avp_AAA_3GPP_Area_Scope,
-	DNAS_NONE_Accounting_Input_Packets avp_DNAS_NONE_Accounting_Input_Packets,
+	MIPv4_NONE_Accounting_Input_Packets avp_MIPv4_NONE_Accounting_Input_Packets,
    DCA_3GPP_SGW_Change avp_DCA_3GPP_SGW_Change,
    CxDx_3GPP_SCSCF_Restoration_Info avp_CxDx_3GPP_SCSCF_Restoration_Info,
    CxDx_3GPP_Initial_CSeq_Sequence_Number avp_CxDx_3GPP_Initial_CSeq_Sequence_Number,
@@ -10094,6 +10315,7 @@
    DCA_3GPP_Message_Class avp_DCA_3GPP_Message_Class,
    GI_3GPP_3GPP_Negotiated_DSCP avp_GI_3GPP_3GPP_Negotiated_DSCP,
    AAA_3GPP_TWAN_S2a_Failure_Cause avp_AAA_3GPP_TWAN_S2a_Failure_Cause,
+	MIPv4_NONE_MIP_FA_to_MN_SPI avp_MIPv4_NONE_MIP_FA_to_MN_SPI,
    DCA_3GPP_Trigger avp_DCA_3GPP_Trigger,
    DCA_3GPP_Called_Identity_Change avp_DCA_3GPP_Called_Identity_Change,
    DCA_3GPP_ProSe_Request_Timestamp avp_DCA_3GPP_ProSe_Request_Timestamp,
@@ -10145,6 +10367,7 @@
    DCA_3GPP_Monitoring_Event_Report_Data avp_DCA_3GPP_Monitoring_Event_Report_Data,
    DCA_3GPP_Adaptations avp_DCA_3GPP_Adaptations,
    BASE_NONE_Host_IP_Address avp_BASE_NONE_Host_IP_Address,
+	MIPv4_NONE_MIP_Reg_Request avp_MIPv4_NONE_MIP_Reg_Request,
    DCA_3GPP_Quota_Holding_Time avp_DCA_3GPP_Quota_Holding_Time,
    AAA_3GPP_Maximum_Wait_Time avp_AAA_3GPP_Maximum_Wait_Time,
    RX_3GPP_Max_Requested_Bandwidth_UL avp_RX_3GPP_Max_Requested_Bandwidth_UL,
@@ -10170,7 +10393,7 @@
    AAA_3GPP_PDN_Connection_Continuity avp_AAA_3GPP_PDN_Connection_Continuity,
    DCA_3GPP_Tariff_Information avp_DCA_3GPP_Tariff_Information,
    CxDx_3GPP_Wildcarded_Public_Identity avp_CxDx_3GPP_Wildcarded_Public_Identity,
-	DNAS_NONE_Acct_Session_Time avp_DNAS_NONE_Acct_Session_Time,
+	MIPv4_NONE_Acct_Session_Time avp_MIPv4_NONE_Acct_Session_Time,
    AAA_3GPP_DSA_Flags avp_AAA_3GPP_DSA_Flags,
    DCA_3GPP_PoC_Event_Type avp_DCA_3GPP_PoC_Event_Type,
    AAA_3GPP_Trace_Data avp_AAA_3GPP_Trace_Data,
@@ -10206,7 +10429,7 @@
    CxDx_3GPP_Secondary_Charging_Collection_Function_Name avp_CxDx_3GPP_Secondary_Charging_Collection_Function_Name,
    DCC_NONE_User_Equipment_Info avp_DCC_NONE_User_Equipment_Info,
    AAA_3GPP_A_MSISDN avp_AAA_3GPP_A_MSISDN,
-	MIPv6_NONE_MIP_Mobile_Node_Address avp_MIPv6_NONE_MIP_Mobile_Node_Address,
+	MIPv4_NONE_MIP_Mobile_Node_Address avp_MIPv4_NONE_MIP_Mobile_Node_Address,
    PCC_3GPP_Routing_Rule_Report avp_PCC_3GPP_Routing_Rule_Report,
    AAA_3GPP_Number_Of_Requested_Vectors avp_AAA_3GPP_Number_Of_Requested_Vectors,
    AAA_3GPP_AIR_Flags avp_AAA_3GPP_AIR_Flags,
@@ -10221,6 +10444,7 @@
    AAA_3GPP_Access_Restriction_Data avp_AAA_3GPP_Access_Restriction_Data,
    DCA_3GPP_SM_Service_Type avp_DCA_3GPP_SM_Service_Type,
    DCA_3GPP_UNI_PDU_CP_Only_Flag avp_DCA_3GPP_UNI_PDU_CP_Only_Flag,
+	MIPv4_NONE_MIP_Filter_Rule avp_MIPv4_NONE_MIP_Filter_Rule,
    BASE_NONE_Failed_AVP avp_BASE_NONE_Failed_AVP,
    GI_3GPP_3GPP_RAT_Type avp_GI_3GPP_3GPP_RAT_Type,
    AAA_3GPP_SS_Status avp_AAA_3GPP_SS_Status,
@@ -10231,6 +10455,7 @@
    S6_3GPP_NIDD_Authorization_Update avp_S6_3GPP_NIDD_Authorization_Update,
    DCA_3GPP_Service_Specific_Data avp_DCA_3GPP_Service_Specific_Data,
    DCC_NONE_Subscription_Id_Type avp_DCC_NONE_Subscription_Id_Type,
+	MIPv4_NONE_MIP_FA_to_HA_MSA avp_MIPv4_NONE_MIP_FA_to_HA_MSA,
    AAA_3GPP_Connectivity_Flags avp_AAA_3GPP_Connectivity_Flags,
    PCC_3GPP_Packet_Filter_Operation avp_PCC_3GPP_Packet_Filter_Operation,
    DCA_3GPP_VCS_Information avp_DCA_3GPP_VCS_Information,
@@ -10257,6 +10482,7 @@
    AAA_3GPP_Non_IP_Data_Delivery_Mechanism avp_AAA_3GPP_Non_IP_Data_Delivery_Mechanism,
    DCA_3GPP_Initial_IMS_Charging_Identifier avp_DCA_3GPP_Initial_IMS_Charging_Identifier,
    DNAS_NONE_NAS_Filter_Rule avp_DNAS_NONE_NAS_Filter_Rule,
+	MIPv4_NONE_MIP_Feature_Vector avp_MIPv4_NONE_MIP_Feature_Vector,
    BASE_NONE_Session_Server_Failover avp_BASE_NONE_Session_Server_Failover,
    DCA_3GPP_Accumulated_Cost avp_DCA_3GPP_Accumulated_Cost,
    CxDx_3GPP_Integrity_Key avp_CxDx_3GPP_Integrity_Key,
@@ -10271,7 +10497,7 @@
    GI_3GPP_3GPP_PDP_Type avp_GI_3GPP_3GPP_PDP_Type,
    DNAS_NONE_Reply_Message avp_DNAS_NONE_Reply_Message,
    DNAS_NONE_Connect_Info avp_DNAS_NONE_Connect_Info,
-	MIPv6_NONE_MIP_Replay_Mode avp_MIPv6_NONE_MIP_Replay_Mode,
+	MIPv4_NONE_MIP_Replay_Mode avp_MIPv4_NONE_MIP_Replay_Mode,
    BASE_NONE_Proxy_Host avp_BASE_NONE_Proxy_Host,
    DCA_3GPP_Number_Of_Talk_Bursts avp_DCA_3GPP_Number_Of_Talk_Bursts,
    AAA_3GPP_Short_Network_Name avp_AAA_3GPP_Short_Network_Name,
@@ -10371,6 +10597,7 @@
    RX_3GPP_Access_Network_Charging_Identifier_Value avp_RX_3GPP_Access_Network_Charging_Identifier_Value,
    DCA_3GPP_Announcing_UE_HPLMN_Identifier avp_DCA_3GPP_Announcing_UE_HPLMN_Identifier,
    S6_3GPP_AESE_Error_Report avp_S6_3GPP_AESE_Error_Report,
+	MIPv4_NONE_MIP_FA_to_HA_SPI avp_MIPv4_NONE_MIP_FA_to_HA_SPI,
    DCA_3GPP_Event_Type avp_DCA_3GPP_Event_Type,
    RX_3GPP_Sharing_Key_DL avp_RX_3GPP_Sharing_Key_DL,
    PCC_3GPP_ADC_Rule_Remove avp_PCC_3GPP_ADC_Rule_Remove,
@@ -10440,7 +10667,7 @@
    DNAS_NONE_Login_LAT_Group avp_DNAS_NONE_Login_LAT_Group,
    DNAS_NONE_NAS_IPv6_Address avp_DNAS_NONE_NAS_IPv6_Address,
    MIPv6_NONE_MIP_MAC_Mobility_Data avp_MIPv6_NONE_MIP_MAC_Mobility_Data,
-	DNAS_NONE_Accounting_Output_Octets avp_DNAS_NONE_Accounting_Output_Octets,
+	MIPv4_NONE_Accounting_Output_Octets avp_MIPv4_NONE_Accounting_Output_Octets,
    CxDx_3GPP_To_SIP_Header avp_CxDx_3GPP_To_SIP_Header,
    AAA_3GPP_Coupled_Node_Diameter_ID avp_AAA_3GPP_Coupled_Node_Diameter_ID,
    DCA_3GPP_Real_Time_Tariff_Information avp_DCA_3GPP_Real_Time_Tariff_Information,
@@ -10472,6 +10699,7 @@
    S6_3GPP_Event_Handling avp_S6_3GPP_Event_Handling,
    PCC_3GPP_ToS_Traffic_Class avp_PCC_3GPP_ToS_Traffic_Class,
    AAA_3GPP_Tracking_Area_Identity avp_AAA_3GPP_Tracking_Area_Identity,
+	MIPv4_NONE_MIP_HA_to_FA_SPI avp_MIPv4_NONE_MIP_HA_to_FA_SPI,
    RX_3GPP_Min_Desired_Bandwidth_UL avp_RX_3GPP_Min_Desired_Bandwidth_UL,
    AAA_3GPP_UVR_Flags avp_AAA_3GPP_UVR_Flags,
    DCA_3GPP_PS_Free_Format_Data avp_DCA_3GPP_PS_Free_Format_Data,
@@ -10489,6 +10717,7 @@
    AAA_3GPP_Terminal_Information avp_AAA_3GPP_Terminal_Information,
    CxDx_3GPP_Restoration_Info avp_CxDx_3GPP_Restoration_Info,
    BASE_NONE_Product_Name avp_BASE_NONE_Product_Name,
+	MIPv4_NONE_MIP_HA_to_MN_MSA avp_MIPv4_NONE_MIP_HA_to_MN_MSA,
    DCA_3GPP_Account_Expiration avp_DCA_3GPP_Account_Expiration,
    AAA_3GPP_CSG_Id avp_AAA_3GPP_CSG_Id,
    DNAS_NONE_Framed_IP_Netmask avp_DNAS_NONE_Framed_IP_Netmask,
@@ -10537,6 +10766,7 @@
    AAA_3GPP_Operator_Determined_Barring avp_AAA_3GPP_Operator_Determined_Barring,
    DCA_3GPP_Recipient_Received_Address avp_DCA_3GPP_Recipient_Received_Address,
    DNAS_NONE_Tunnel_Server_Endpoint avp_DNAS_NONE_Tunnel_Server_Endpoint,
+	MIPv4_NONE_MIP_Candidate_Home_Agent_Host avp_MIPv4_NONE_MIP_Candidate_Home_Agent_Host,
    BASE_NONE_Session_Binding avp_BASE_NONE_Session_Binding,
    GI_3GPP_3GPP_IMEISV avp_GI_3GPP_3GPP_IMEISV,
    AAA_3GPP_SS_Code avp_AAA_3GPP_SS_Code,
@@ -10551,7 +10781,7 @@
    DCA_3GPP_Participant_Access_Priority avp_DCA_3GPP_Participant_Access_Priority,
    RX_3GPP_RS_Bandwidth avp_RX_3GPP_RS_Bandwidth,
    S6_3GPP_Reachability_Information avp_S6_3GPP_Reachability_Information,
-	MIPv6_NONE_MIP_Algorithm_Type avp_MIPv6_NONE_MIP_Algorithm_Type,
+	MIPv4_NONE_MIP_Algorithm_Type avp_MIPv4_NONE_MIP_Algorithm_Type,
    DCA_3GPP_SDP_Session_Description avp_DCA_3GPP_SDP_Session_Description,
    RX_3GPP_Extended_Min_Desired_BW_DL avp_RX_3GPP_Extended_Min_Desired_BW_DL,
    DCA_3GPP_Location_Info avp_DCA_3GPP_Location_Info,
@@ -10567,8 +10797,8 @@
    RX_3GPP_GCS_Identifier avp_RX_3GPP_GCS_Identifier,
    MIPv6_NONE_QoS_Capability avp_MIPv6_NONE_QoS_Capability,
    PCC_3GPP_ADC_Rule_Install avp_PCC_3GPP_ADC_Rule_Install,
-	DCC_NONE_G_S_U_Pool_Identifier avp_DCC_NONE_G_S_U_Pool_Identifier,
    AAA_3GPP_Non_IP_PDN_Type_Indicator avp_AAA_3GPP_Non_IP_PDN_Type_Indicator,
+	DCC_NONE_G_S_U_Pool_Identifier avp_DCC_NONE_G_S_U_Pool_Identifier,
    DCA_3GPP_Outgoing_Session_Id avp_DCA_3GPP_Outgoing_Session_Id,
    DCA_3GPP_PoC_Controlling_Address avp_DCA_3GPP_PoC_Controlling_Address,
    DCA_3GPP_Dynamic_Address_Flag avp_DCA_3GPP_Dynamic_Address_Flag,
@@ -10631,13 +10861,13 @@
    GI_3GPP_3GPP_Selection_Mode avp_GI_3GPP_3GPP_Selection_Mode,
    DNAS_NONE_QoS_Filter_Rule avp_DNAS_NONE_QoS_Filter_Rule,
    AAA_3GPP_Complete_Data_List_Included_Indicator avp_AAA_3GPP_Complete_Data_List_Included_Indicator,
-	MIPv6_NONE_MIP_MN_AAA_SPI avp_MIPv6_NONE_MIP_MN_AAA_SPI,
+	MIPv4_NONE_MIP_MN_AAA_SPI avp_MIPv4_NONE_MIP_MN_AAA_SPI,
    DCA_3GPP_LCS_Client_Name avp_DCA_3GPP_LCS_Client_Name,
    GI_3GPP_3GPP_SGSN_Address avp_GI_3GPP_3GPP_SGSN_Address,
    DCA_3GPP_Related_IMS_Charging_Identifier avp_DCA_3GPP_Related_IMS_Charging_Identifier,
    DCA_3GPP_Called_Asserted_Identity avp_DCA_3GPP_Called_Asserted_Identity,
    DCA_3GPP_TWAG_Address avp_DCA_3GPP_TWAG_Address,
-	MIPv6_NONE_MIP_MSA_Lifetime avp_MIPv6_NONE_MIP_MSA_Lifetime,
+	MIPv4_NONE_MIP_MSA_Lifetime avp_MIPv4_NONE_MIP_MSA_Lifetime,
    DCA_3GPP_Talk_Burst_Time avp_DCA_3GPP_Talk_Burst_Time,
    DCA_3GPP_Token_Text avp_DCA_3GPP_Token_Text,
    DCA_3GPP_Rate_Control_Time_Unit avp_DCA_3GPP_Rate_Control_Time_Unit,
@@ -10722,7 +10952,7 @@
    DCC_NONE_Exponent avp_DCC_NONE_Exponent,
    MIPv6_NONE_MIP_Authenticator avp_MIPv6_NONE_MIP_Authenticator,
    AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info avp_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info,
-	DNAS_NONE_Accounting_Input_Octets avp_DNAS_NONE_Accounting_Input_Octets,
+	MIPv4_NONE_Accounting_Input_Octets avp_MIPv4_NONE_Accounting_Input_Octets,
    AAA_3GPP_EPS_User_State avp_AAA_3GPP_EPS_User_State,
    BASE_NONE_Origin_Host avp_BASE_NONE_Origin_Host,
    AAA_3GPP_Access_Authorization_Flags avp_AAA_3GPP_Access_Authorization_Flags,
@@ -10759,6 +10989,7 @@
    DCA_3GPP_CUG_Information avp_DCA_3GPP_CUG_Information,
    AAA_3GPP_VPLMN_Dynamic_Address_Allowed avp_AAA_3GPP_VPLMN_Dynamic_Address_Allowed,
    DCC_NONE_Value_Digits avp_DCC_NONE_Value_Digits,
+	MIPv4_NONE_MIP_MN_AAA_Auth avp_MIPv4_NONE_MIP_MN_AAA_Auth,
    BASE_NONE_Acct_Application_Id avp_BASE_NONE_Acct_Application_Id,
    DCA_3GPP_Associated_Party_Address avp_DCA_3GPP_Associated_Party_Address,
    CxDx_3GPP_SIP_Authenticate avp_CxDx_3GPP_SIP_Authenticate,
@@ -10772,6 +11003,7 @@
    DCA_3GPP_Deferred_Location_Event_Type avp_DCA_3GPP_Deferred_Location_Event_Type,
    GI_3GPP_3GPP_IMSI avp_GI_3GPP_3GPP_IMSI,
    AAA_3GPP_User_State avp_AAA_3GPP_User_State,
+	MIPv4_NONE_MIP_MN_to_HA_MSA avp_MIPv4_NONE_MIP_MN_to_HA_MSA,
    BASE_NONE_Result_Code avp_BASE_NONE_Result_Code,
    DCA_3GPP_Envelope avp_DCA_3GPP_Envelope,
    DCA_3GPP_Monitoring_Event_Configuration_Activity avp_DCA_3GPP_Monitoring_Event_Configuration_Activity,
@@ -10801,10 +11033,11 @@
    AAA_3GPP_LIPA_Permission avp_AAA_3GPP_LIPA_Permission,
    CxDx_3GPP_SIP_Auth_Data_Item avp_CxDx_3GPP_SIP_Auth_Data_Item,
    AAA_3GPP_3GPP2_MEID avp_AAA_3GPP_3GPP2_MEID,
+	MIPv4_NONE_MIP_FA_to_MN_MSA avp_MIPv4_NONE_MIP_FA_to_MN_MSA,
    AAA_3GPP_Subscription_Data avp_AAA_3GPP_Subscription_Data,
    CxDx_3GPP_Multiple_Registration_Indication avp_CxDx_3GPP_Multiple_Registration_Indication,
-	BASE_NONE_Vendor_Specific_Application_Id avp_BASE_NONE_Vendor_Specific_Application_Id,
    AAA_3GPP_WLAN_offloadability_UTRAN avp_AAA_3GPP_WLAN_offloadability_UTRAN,
+	BASE_NONE_Vendor_Specific_Application_Id avp_BASE_NONE_Vendor_Specific_Application_Id,
    DCA_3GPP_IMSI_Unauthenticated_Flag avp_DCA_3GPP_IMSI_Unauthenticated_Flag,
    DCA_3GPP_Interface_Id avp_DCA_3GPP_Interface_Id,
    AAA_3GPP_CSG_Subscription_Data avp_AAA_3GPP_CSG_Subscription_Data,
@@ -10815,6 +11048,7 @@
    AAA_3GPP_AN_Trusted avp_AAA_3GPP_AN_Trusted,
    DCA_3GPP_Monitoring_Event_Funtionality avp_DCA_3GPP_Monitoring_Event_Funtionality,
    DCA_3GPP_Aux_Applic_Info avp_DCA_3GPP_Aux_Applic_Info,
+	MIPv4_NONE_MIP_Nonce avp_MIPv4_NONE_MIP_Nonce,
    S6_3GPP_IP_SM_GW_Number avp_S6_3GPP_IP_SM_GW_Number,
    AAA_3GPP_AAR_Flags avp_AAA_3GPP_AAR_Flags,
    DCA_3GPP_LCS_Client_External_ID avp_DCA_3GPP_LCS_Client_External_ID,
@@ -10835,6 +11069,7 @@
    AAA_3GPP_Location_Area_Identity avp_AAA_3GPP_Location_Area_Identity,
    RX_3GPP_Media_Component_Status avp_RX_3GPP_Media_Component_Status,
    AAA_3GPP_eDRX_Cycle_Length_Value avp_AAA_3GPP_eDRX_Cycle_Length_Value,
+	MIPv4_NONE_MIP_FA_Challenge avp_MIPv4_NONE_MIP_FA_Challenge,
    CxDx_3GPP_Visited_Network_Identifier avp_CxDx_3GPP_Visited_Network_Identifier,
    S6_3GPP_RIR_Flags avp_S6_3GPP_RIR_Flags,
    DCA_3GPP_Volume_Quota_Threshold avp_DCA_3GPP_Volume_Quota_Threshold,
@@ -10856,6 +11091,7 @@
    RX_3GPP_RR_Bandwidth avp_RX_3GPP_RR_Bandwidth,
    DNAS_NONE_CHAP_Auth avp_DNAS_NONE_CHAP_Auth,
    DCC_NONE_Service_Context_Id avp_DCC_NONE_Service_Context_Id,
+	MIPv4_NONE_MIP_Authenticator_Length avp_MIPv4_NONE_MIP_Authenticator_Length,
    DCA_3GPP_SDP_TimeStamps avp_DCA_3GPP_SDP_TimeStamps,
    DCA_3GPP_IMS_Charging_Identifier avp_DCA_3GPP_IMS_Charging_Identifier,
    AAA_3GPP_MIP_FA_RK_SPI avp_AAA_3GPP_MIP_FA_RK_SPI,
@@ -10879,7 +11115,7 @@
    AAA_3GPP_MME_Number_for_MT_SMS avp_AAA_3GPP_MME_Number_for_MT_SMS,
    PCC_3GPP_Traffic_Steering_Policy_Identifier_UL avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL,
    DCC_NONE_CC_Correlation_Id avp_DCC_NONE_CC_Correlation_Id,
-	MIPv6_NONE_MIP6_Home_Agent_Host avp_MIPv6_NONE_MIP6_Home_Agent_Host,
+	MIPv4_NONE_MIP_Home_Agent_Host avp_MIPv4_NONE_MIP_Home_Agent_Host,
    BASE_NONE_Route_Record avp_BASE_NONE_Route_Record,
    DCA_3GPP_SM_User_Data_Header avp_DCA_3GPP_SM_User_Data_Header,
    AAA_3GPP_Carrier_Frequency avp_AAA_3GPP_Carrier_Frequency,
@@ -10905,12 +11141,13 @@
    DNAS_NONE_Framed_MTU avp_DNAS_NONE_Framed_MTU,
    DCA_3GPP_Unit_Quota_Threshold avp_DCA_3GPP_Unit_Quota_Threshold,
    DNAS_NONE_Accounting_Auth_Method avp_DNAS_NONE_Accounting_Auth_Method,
+	MIPv4_NONE_MIP_Authenticator_Offset avp_MIPv4_NONE_MIP_Authenticator_Offset,
    DCA_3GPP_MBMS_Information avp_DCA_3GPP_MBMS_Information,
    DCA_3GPP_Bearer_Capability avp_DCA_3GPP_Bearer_Capability,
    RX_3GPP_Service_URN avp_RX_3GPP_Service_URN,
    S6_3GPP_Supported_Services avp_S6_3GPP_Supported_Services,
    DCA_3GPP_SDP_Media_Description avp_DCA_3GPP_SDP_Media_Description,
-	DNAS_NONE_Accounting_Output_Packets avp_DNAS_NONE_Accounting_Output_Packets,
+	MIPv4_NONE_Accounting_Output_Packets avp_MIPv4_NONE_Accounting_Output_Packets,
    DCA_3GPP_Radio_Parameter_Set_Info avp_DCA_3GPP_Radio_Parameter_Set_Info,
    PCC_3GPP_Rule_DeActivation_Time avp_PCC_3GPP_Rule_DeActivation_Time,
    AAA_3GPP_Relay_Node_Indicator avp_AAA_3GPP_Relay_Node_Indicator,
@@ -11026,6 +11263,7 @@
    	avp_PCC_3GPP_Bearer_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Bearer_Identifier;
    	avp_RX_3GPP_Content_Version, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Content_Version;
    	avp_DCA_3GPP_Applic_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Applic_ID;
+		avp_MIPv4_NONE_MIP_HA_to_FA_MSA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_HA_to_FA_MSA;
    	avp_BASE_NONE_Session_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Id;
    	avp_DCA_3GPP_Route_Header_Transmitted, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Route_Header_Transmitted;
    	avp_DCA_3GPP_Reporting_Reason, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Reporting_Reason;
@@ -11057,6 +11295,7 @@
    	avp_AAA_3GPP_Last_UE_Activity_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Last_UE_Activity_Time;
    	avp_AAA_3GPP_Context_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Context_Identifier;
    	avp_DCC_NONE_Used_Service_Unit, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Used_Service_Unit;
+		avp_MIPv4_NONE_MIP_Reg_Reply, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Reg_Reply;
    	avp_BASE_NONE_Auth_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Auth_Application_Id;
    	avp_AAA_3GPP_Trace_Reference, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Reference;
    	avp_AAA_3GPP_TWAN_Access_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_Access_Info;
@@ -11100,6 +11339,7 @@
    	avp_DCA_3GPP_IP_Realm_Default_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IP_Realm_Default_Indication;
    	avp_AAA_3GPP_RAND, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_RAND;
    	avp_AAA_3GPP_Trace_Depth, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Depth;
+		avp_MIPv4_NONE_MIP_MN_to_FA_MSA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_MN_to_FA_MSA;
    	avp_AAA_3GPP_SGSN_User_State, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SGSN_User_State;
    	avp_AAA_3GPP_APN_OI_Replacement, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_APN_OI_Replacement;
    	avp_DCA_3GPP_Alternate_Charged_Party_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Alternate_Charged_Party_Address;
@@ -11118,7 +11358,7 @@
    	avp_DCA_3GPP_Originator, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Originator;
    	avp_DCC_NONE_User_Equipment_Info_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info_Type;
    	avp_RX_3GPP_Flow_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flow_Number;
-		avp_MIPv6_NONE_MIP6_Home_Agent_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Home_Agent_Address;
+		avp_MIPv4_NONE_MIP_Home_Agent_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Home_Agent_Address;
    	avp_PCC_3GPP_Resource_Allocation_Notification, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Resource_Allocation_Notification;
    	avp_DCA_3GPP_Basic_Service_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Basic_Service_Code;
    	avp_S6_3GPP_Monitoring_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Monitoring_Type;
@@ -11140,7 +11380,7 @@
    	avp_DCA_3GPP_IMS_Emergency_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Emergency_Indicator;
    	avp_DCA_3GPP_Change_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Change_Time;
    	avp_AAA_3GPP_KASME, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_KASME;
-		avp_MIPv6_NONE_MIP_Session_Key, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Session_Key;
+		avp_MIPv4_NONE_MIP_Session_Key, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Session_Key;
    	avp_DCA_3GPP_AoC_Cost_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_AoC_Cost_Information;
    	avp_GI_3GPP_3GPP_User_Location_Info_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_User_Location_Info_Time;
    	avp_AAA_3GPP_Teleservice_List, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Teleservice_List;
@@ -11172,6 +11412,7 @@
    	avp_RX_3GPP_Service_Authorization_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Service_Authorization_Info;
    	avp_DNAS_NONE_Tunneling, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunneling;
    	avp_DCC_NONE_User_Equipment_Info_Value, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info_Value;
+		avp_MIPv4_NONE_MIP_Auth_Input_Data_Length, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Auth_Input_Data_Length;
    	avp_AAA_3GPP_eDRX_Cycle_Length, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_eDRX_Cycle_Length;
    	avp_BASE_NONE_Multi_Round_Time_Out, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Multi_Round_Time_Out;
    	avp_S6_3GPP_Group_Monitoring_Event_Report_Item, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Group_Monitoring_Event_Report_Item;
@@ -11193,6 +11434,7 @@
    	avp_DNAS_NONE_Callback_Number, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Callback_Number;
    	avp_DNAS_NONE_Configuration_Token, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Configuration_Token;
    	avp_DCA_3GPP_Interface_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Interface_Type;
+		avp_MIPv4_NONE_MIP_Originating_Foreign_AAA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Originating_Foreign_AAA;
    	avp_AAA_3GPP_Expiration_Date, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Expiration_Date;
    	avp_BASE_NONE_Error_Message, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Error_Message;
    	avp_AAA_3GPP_SRES, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SRES;
@@ -11230,7 +11472,7 @@
    	avp_AAA_3GPP_MBSFN_Area_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MBSFN_Area_ID;
    	avp_CxDx_3GPP_Server_Capabilities, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Server_Capabilities;
    	avp_AAA_3GPP_Area_Scope, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Area_Scope;
-		avp_DNAS_NONE_Accounting_Input_Packets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Input_Packets;
+		avp_MIPv4_NONE_Accounting_Input_Packets, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_Accounting_Input_Packets;
    	avp_DCA_3GPP_SGW_Change, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SGW_Change;
    	avp_CxDx_3GPP_SCSCF_Restoration_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SCSCF_Restoration_Info;
    	avp_CxDx_3GPP_Initial_CSeq_Sequence_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Initial_CSeq_Sequence_Number;
@@ -11291,6 +11533,7 @@
    	avp_DCA_3GPP_Message_Class, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Message_Class;
    	avp_GI_3GPP_3GPP_Negotiated_DSCP, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Negotiated_DSCP;
    	avp_AAA_3GPP_TWAN_S2a_Failure_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_S2a_Failure_Cause;
+		avp_MIPv4_NONE_MIP_FA_to_MN_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_FA_to_MN_SPI;
    	avp_DCA_3GPP_Trigger, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Trigger;
    	avp_DCA_3GPP_Called_Identity_Change, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Called_Identity_Change;
    	avp_DCA_3GPP_ProSe_Request_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Request_Timestamp;
@@ -11342,6 +11585,7 @@
    	avp_DCA_3GPP_Monitoring_Event_Report_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Report_Data;
    	avp_DCA_3GPP_Adaptations, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Adaptations;
    	avp_BASE_NONE_Host_IP_Address, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Host_IP_Address;
+		avp_MIPv4_NONE_MIP_Reg_Request, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Reg_Request;
    	avp_DCA_3GPP_Quota_Holding_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Quota_Holding_Time;
    	avp_AAA_3GPP_Maximum_Wait_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Maximum_Wait_Time;
    	avp_RX_3GPP_Max_Requested_Bandwidth_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Max_Requested_Bandwidth_UL;
@@ -11367,7 +11611,7 @@
    	avp_AAA_3GPP_PDN_Connection_Continuity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PDN_Connection_Continuity;
    	avp_DCA_3GPP_Tariff_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Tariff_Information;
    	avp_CxDx_3GPP_Wildcarded_Public_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Wildcarded_Public_Identity;
-		avp_DNAS_NONE_Acct_Session_Time, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Session_Time;
+		avp_MIPv4_NONE_Acct_Session_Time, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_Acct_Session_Time;
    	avp_AAA_3GPP_DSA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DSA_Flags;
    	avp_DCA_3GPP_PoC_Event_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Event_Type;
    	avp_AAA_3GPP_Trace_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Data;
@@ -11403,7 +11647,7 @@
    	avp_CxDx_3GPP_Secondary_Charging_Collection_Function_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Secondary_Charging_Collection_Function_Name;
    	avp_DCC_NONE_User_Equipment_Info, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info;
    	avp_AAA_3GPP_A_MSISDN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_A_MSISDN;
-		avp_MIPv6_NONE_MIP_Mobile_Node_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Mobile_Node_Address;
+		avp_MIPv4_NONE_MIP_Mobile_Node_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Mobile_Node_Address;
    	avp_PCC_3GPP_Routing_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_Rule_Report;
    	avp_AAA_3GPP_Number_Of_Requested_Vectors, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Number_Of_Requested_Vectors;
    	avp_AAA_3GPP_AIR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AIR_Flags;
@@ -11418,6 +11662,7 @@
    	avp_AAA_3GPP_Access_Restriction_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Access_Restriction_Data;
    	avp_DCA_3GPP_SM_Service_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SM_Service_Type;
    	avp_DCA_3GPP_UNI_PDU_CP_Only_Flag, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_UNI_PDU_CP_Only_Flag;
+		avp_MIPv4_NONE_MIP_Filter_Rule, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Filter_Rule;
    	avp_BASE_NONE_Failed_AVP, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Failed_AVP;
    	avp_GI_3GPP_3GPP_RAT_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_RAT_Type;
    	avp_AAA_3GPP_SS_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SS_Status;
@@ -11428,6 +11673,7 @@
    	avp_S6_3GPP_NIDD_Authorization_Update, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_NIDD_Authorization_Update;
    	avp_DCA_3GPP_Service_Specific_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Service_Specific_Data;
    	avp_DCC_NONE_Subscription_Id_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Subscription_Id_Type;
+		avp_MIPv4_NONE_MIP_FA_to_HA_MSA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_FA_to_HA_MSA;
    	avp_AAA_3GPP_Connectivity_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Connectivity_Flags;
    	avp_PCC_3GPP_Packet_Filter_Operation, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Operation;
    	avp_DCA_3GPP_VCS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_VCS_Information;
@@ -11454,6 +11700,7 @@
    	avp_AAA_3GPP_Non_IP_Data_Delivery_Mechanism, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Non_IP_Data_Delivery_Mechanism;
    	avp_DCA_3GPP_Initial_IMS_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Initial_IMS_Charging_Identifier;
    	avp_DNAS_NONE_NAS_Filter_Rule, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Filter_Rule;
+		avp_MIPv4_NONE_MIP_Feature_Vector, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Feature_Vector;
    	avp_BASE_NONE_Session_Server_Failover, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Server_Failover;
    	avp_DCA_3GPP_Accumulated_Cost, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Accumulated_Cost;
    	avp_CxDx_3GPP_Integrity_Key, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Integrity_Key;
@@ -11468,7 +11715,7 @@
    	avp_GI_3GPP_3GPP_PDP_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_PDP_Type;
    	avp_DNAS_NONE_Reply_Message, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Reply_Message;
    	avp_DNAS_NONE_Connect_Info, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Connect_Info;
-		avp_MIPv6_NONE_MIP_Replay_Mode, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Replay_Mode;
+		avp_MIPv4_NONE_MIP_Replay_Mode, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Replay_Mode;
    	avp_BASE_NONE_Proxy_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Proxy_Host;
    	avp_DCA_3GPP_Number_Of_Talk_Bursts, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Number_Of_Talk_Bursts;
    	avp_AAA_3GPP_Short_Network_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Short_Network_Name;
@@ -11568,6 +11815,7 @@
    	avp_RX_3GPP_Access_Network_Charging_Identifier_Value, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Access_Network_Charging_Identifier_Value;
    	avp_DCA_3GPP_Announcing_UE_HPLMN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Announcing_UE_HPLMN_Identifier;
    	avp_S6_3GPP_AESE_Error_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_AESE_Error_Report;
+		avp_MIPv4_NONE_MIP_FA_to_HA_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_FA_to_HA_SPI;
    	avp_DCA_3GPP_Event_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Event_Type;
    	avp_RX_3GPP_Sharing_Key_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Sharing_Key_DL;
    	avp_PCC_3GPP_ADC_Rule_Remove, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Remove;
@@ -11637,7 +11885,7 @@
    	avp_DNAS_NONE_Login_LAT_Group, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_LAT_Group;
    	avp_DNAS_NONE_NAS_IPv6_Address, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_IPv6_Address;
    	avp_MIPv6_NONE_MIP_MAC_Mobility_Data, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MAC_Mobility_Data;
-		avp_DNAS_NONE_Accounting_Output_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Output_Octets;
+		avp_MIPv4_NONE_Accounting_Output_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_Accounting_Output_Octets;
    	avp_CxDx_3GPP_To_SIP_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_To_SIP_Header;
    	avp_AAA_3GPP_Coupled_Node_Diameter_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Coupled_Node_Diameter_ID;
    	avp_DCA_3GPP_Real_Time_Tariff_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Real_Time_Tariff_Information;
@@ -11669,6 +11917,7 @@
    	avp_S6_3GPP_Event_Handling, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Event_Handling;
    	avp_PCC_3GPP_ToS_Traffic_Class, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ToS_Traffic_Class;
    	avp_AAA_3GPP_Tracking_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Tracking_Area_Identity;
+		avp_MIPv4_NONE_MIP_HA_to_FA_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_HA_to_FA_SPI;
    	avp_RX_3GPP_Min_Desired_Bandwidth_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Min_Desired_Bandwidth_UL;
    	avp_AAA_3GPP_UVR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UVR_Flags;
    	avp_DCA_3GPP_PS_Free_Format_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PS_Free_Format_Data;
@@ -11686,6 +11935,7 @@
    	avp_AAA_3GPP_Terminal_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Terminal_Information;
    	avp_CxDx_3GPP_Restoration_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Restoration_Info;
    	avp_BASE_NONE_Product_Name, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Product_Name;
+		avp_MIPv4_NONE_MIP_HA_to_MN_MSA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_HA_to_MN_MSA;
    	avp_DCA_3GPP_Account_Expiration, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Account_Expiration;
    	avp_AAA_3GPP_CSG_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_CSG_Id;
    	avp_DNAS_NONE_Framed_IP_Netmask, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IP_Netmask;
@@ -11734,6 +11984,7 @@
    	avp_AAA_3GPP_Operator_Determined_Barring, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Operator_Determined_Barring;
    	avp_DCA_3GPP_Recipient_Received_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Recipient_Received_Address;
    	avp_DNAS_NONE_Tunnel_Server_Endpoint, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Server_Endpoint;
+		avp_MIPv4_NONE_MIP_Candidate_Home_Agent_Host, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Candidate_Home_Agent_Host;
    	avp_BASE_NONE_Session_Binding, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Binding;
    	avp_GI_3GPP_3GPP_IMEISV, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_IMEISV;
    	avp_AAA_3GPP_SS_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SS_Code;
@@ -11748,7 +11999,7 @@
    	avp_DCA_3GPP_Participant_Access_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Participant_Access_Priority;
    	avp_RX_3GPP_RS_Bandwidth, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_RS_Bandwidth;
    	avp_S6_3GPP_Reachability_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Reachability_Information;
-		avp_MIPv6_NONE_MIP_Algorithm_Type, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Algorithm_Type;
+		avp_MIPv4_NONE_MIP_Algorithm_Type, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Algorithm_Type;
    	avp_DCA_3GPP_SDP_Session_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_Session_Description;
    	avp_RX_3GPP_Extended_Min_Desired_BW_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Min_Desired_BW_DL;
    	avp_DCA_3GPP_Location_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Location_Info;
@@ -11764,8 +12015,8 @@
    	avp_RX_3GPP_GCS_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_GCS_Identifier;
    	avp_MIPv6_NONE_QoS_Capability, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_QoS_Capability;
    	avp_PCC_3GPP_ADC_Rule_Install, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Install;
-		avp_DCC_NONE_G_S_U_Pool_Identifier, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_G_S_U_Pool_Identifier;
    	avp_AAA_3GPP_Non_IP_PDN_Type_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Non_IP_PDN_Type_Indicator;
+		avp_DCC_NONE_G_S_U_Pool_Identifier, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_G_S_U_Pool_Identifier;
    	avp_DCA_3GPP_Outgoing_Session_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Outgoing_Session_Id;
    	avp_DCA_3GPP_PoC_Controlling_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Controlling_Address;
    	avp_DCA_3GPP_Dynamic_Address_Flag, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Dynamic_Address_Flag;
@@ -11828,13 +12079,13 @@
    	avp_GI_3GPP_3GPP_Selection_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Selection_Mode;
    	avp_DNAS_NONE_QoS_Filter_Rule, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_QoS_Filter_Rule;
    	avp_AAA_3GPP_Complete_Data_List_Included_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Complete_Data_List_Included_Indicator;
-		avp_MIPv6_NONE_MIP_MN_AAA_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MN_AAA_SPI;
+		avp_MIPv4_NONE_MIP_MN_AAA_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_MN_AAA_SPI;
    	avp_DCA_3GPP_LCS_Client_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_Client_Name;
    	avp_GI_3GPP_3GPP_SGSN_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_SGSN_Address;
    	avp_DCA_3GPP_Related_IMS_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Related_IMS_Charging_Identifier;
    	avp_DCA_3GPP_Called_Asserted_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Called_Asserted_Identity;
    	avp_DCA_3GPP_TWAG_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_TWAG_Address;
-		avp_MIPv6_NONE_MIP_MSA_Lifetime, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MSA_Lifetime;
+		avp_MIPv4_NONE_MIP_MSA_Lifetime, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_MSA_Lifetime;
    	avp_DCA_3GPP_Talk_Burst_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Talk_Burst_Time;
    	avp_DCA_3GPP_Token_Text, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Token_Text;
    	avp_DCA_3GPP_Rate_Control_Time_Unit, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Rate_Control_Time_Unit;
@@ -11919,7 +12170,7 @@
    	avp_DCC_NONE_Exponent, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Exponent;
    	avp_MIPv6_NONE_MIP_Authenticator, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Authenticator;
    	avp_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info;
-		avp_DNAS_NONE_Accounting_Input_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Input_Octets;
+		avp_MIPv4_NONE_Accounting_Input_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_Accounting_Input_Octets;
    	avp_AAA_3GPP_EPS_User_State, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_EPS_User_State;
    	avp_BASE_NONE_Origin_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Origin_Host;
    	avp_AAA_3GPP_Access_Authorization_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Access_Authorization_Flags;
@@ -11956,6 +12207,7 @@
    	avp_DCA_3GPP_CUG_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_CUG_Information;
    	avp_AAA_3GPP_VPLMN_Dynamic_Address_Allowed, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_VPLMN_Dynamic_Address_Allowed;
    	avp_DCC_NONE_Value_Digits, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Value_Digits;
+		avp_MIPv4_NONE_MIP_MN_AAA_Auth, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_MN_AAA_Auth;
    	avp_BASE_NONE_Acct_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Acct_Application_Id;
    	avp_DCA_3GPP_Associated_Party_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Associated_Party_Address;
    	avp_CxDx_3GPP_SIP_Authenticate, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Authenticate;
@@ -11969,6 +12221,7 @@
    	avp_DCA_3GPP_Deferred_Location_Event_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Deferred_Location_Event_Type;
    	avp_GI_3GPP_3GPP_IMSI, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_IMSI;
    	avp_AAA_3GPP_User_State, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_User_State;
+		avp_MIPv4_NONE_MIP_MN_to_HA_MSA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_MN_to_HA_MSA;
    	avp_BASE_NONE_Result_Code, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Result_Code;
    	avp_DCA_3GPP_Envelope, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Envelope;
    	avp_DCA_3GPP_Monitoring_Event_Configuration_Activity, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Configuration_Activity;
@@ -11998,10 +12251,11 @@
    	avp_AAA_3GPP_LIPA_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_LIPA_Permission;
    	avp_CxDx_3GPP_SIP_Auth_Data_Item, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Auth_Data_Item;
    	avp_AAA_3GPP_3GPP2_MEID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_3GPP2_MEID;
+		avp_MIPv4_NONE_MIP_FA_to_MN_MSA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_FA_to_MN_MSA;
    	avp_AAA_3GPP_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscription_Data;
    	avp_CxDx_3GPP_Multiple_Registration_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Multiple_Registration_Indication;
-		avp_BASE_NONE_Vendor_Specific_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Vendor_Specific_Application_Id;
    	avp_AAA_3GPP_WLAN_offloadability_UTRAN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLAN_offloadability_UTRAN;
+		avp_BASE_NONE_Vendor_Specific_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Vendor_Specific_Application_Id;
    	avp_DCA_3GPP_IMSI_Unauthenticated_Flag, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMSI_Unauthenticated_Flag;
    	avp_DCA_3GPP_Interface_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Interface_Id;
    	avp_AAA_3GPP_CSG_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_CSG_Subscription_Data;
@@ -12012,6 +12266,7 @@
    	avp_AAA_3GPP_AN_Trusted, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AN_Trusted;
    	avp_DCA_3GPP_Monitoring_Event_Funtionality, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Funtionality;
    	avp_DCA_3GPP_Aux_Applic_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Aux_Applic_Info;
+		avp_MIPv4_NONE_MIP_Nonce, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Nonce;
    	avp_S6_3GPP_IP_SM_GW_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Number;
    	avp_AAA_3GPP_AAR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AAR_Flags;
    	avp_DCA_3GPP_LCS_Client_External_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_Client_External_ID;
@@ -12032,6 +12287,7 @@
    	avp_AAA_3GPP_Location_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Location_Area_Identity;
    	avp_RX_3GPP_Media_Component_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Media_Component_Status;
    	avp_AAA_3GPP_eDRX_Cycle_Length_Value, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_eDRX_Cycle_Length_Value;
+		avp_MIPv4_NONE_MIP_FA_Challenge, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_FA_Challenge;
    	avp_CxDx_3GPP_Visited_Network_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Visited_Network_Identifier;
    	avp_S6_3GPP_RIR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_RIR_Flags;
    	avp_DCA_3GPP_Volume_Quota_Threshold, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Volume_Quota_Threshold;
@@ -12053,6 +12309,7 @@
    	avp_RX_3GPP_RR_Bandwidth, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_RR_Bandwidth;
    	avp_DNAS_NONE_CHAP_Auth, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_CHAP_Auth;
    	avp_DCC_NONE_Service_Context_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Context_Id;
+		avp_MIPv4_NONE_MIP_Authenticator_Length, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Authenticator_Length;
    	avp_DCA_3GPP_SDP_TimeStamps, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_TimeStamps;
    	avp_DCA_3GPP_IMS_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Charging_Identifier;
    	avp_AAA_3GPP_MIP_FA_RK_SPI, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MIP_FA_RK_SPI;
@@ -12076,7 +12333,7 @@
    	avp_AAA_3GPP_MME_Number_for_MT_SMS, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MME_Number_for_MT_SMS;
    	avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL;
    	avp_DCC_NONE_CC_Correlation_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Correlation_Id;
-		avp_MIPv6_NONE_MIP6_Home_Agent_Host, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Home_Agent_Host;
+		avp_MIPv4_NONE_MIP_Home_Agent_Host, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Home_Agent_Host;
    	avp_BASE_NONE_Route_Record, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Route_Record;
    	avp_DCA_3GPP_SM_User_Data_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SM_User_Data_Header;
    	avp_AAA_3GPP_Carrier_Frequency, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Carrier_Frequency;
@@ -12102,12 +12359,13 @@
    	avp_DNAS_NONE_Framed_MTU, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_MTU;
    	avp_DCA_3GPP_Unit_Quota_Threshold, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Unit_Quota_Threshold;
    	avp_DNAS_NONE_Accounting_Auth_Method, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Auth_Method;
+		avp_MIPv4_NONE_MIP_Authenticator_Offset, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_MIP_Authenticator_Offset;
    	avp_DCA_3GPP_MBMS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MBMS_Information;
    	avp_DCA_3GPP_Bearer_Capability, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Bearer_Capability;
    	avp_RX_3GPP_Service_URN, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Service_URN;
    	avp_S6_3GPP_Supported_Services, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Supported_Services;
    	avp_DCA_3GPP_SDP_Media_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_Media_Description;
-		avp_DNAS_NONE_Accounting_Output_Packets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Output_Packets;
+		avp_MIPv4_NONE_Accounting_Output_Packets, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv4_NONE_Accounting_Output_Packets;
    	avp_DCA_3GPP_Radio_Parameter_Set_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Radio_Parameter_Set_Info;
    	avp_PCC_3GPP_Rule_DeActivation_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Rule_DeActivation_Time;
    	avp_AAA_3GPP_Relay_Node_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Relay_Node_Indicator;
@@ -12210,6 +12468,8 @@
    vendor_id_3GPP := avp_code_RX_3GPP_Content_Version };
 const AVP_Code c_AVP_Code_DCA_3GPP_Applic_ID := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Applic_ID };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_HA_to_FA_MSA := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_HA_to_FA_MSA };
 const AVP_Code c_AVP_Code_BASE_NONE_Session_Id := {
    vendor_id_NONE := avp_code_BASE_NONE_Session_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_Route_Header_Transmitted := {
@@ -12272,6 +12532,8 @@
    vendor_id_3GPP := avp_code_AAA_3GPP_Context_Identifier };
 const AVP_Code c_AVP_Code_DCC_NONE_Used_Service_Unit := {
    vendor_id_NONE := avp_code_DCC_NONE_Used_Service_Unit };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Reg_Reply := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Reg_Reply };
 const AVP_Code c_AVP_Code_BASE_NONE_Auth_Application_Id := {
    vendor_id_NONE := avp_code_BASE_NONE_Auth_Application_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Reference := {
@@ -12358,6 +12620,8 @@
    vendor_id_3GPP := avp_code_AAA_3GPP_RAND };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Depth := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Trace_Depth };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_MN_to_FA_MSA := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_MN_to_FA_MSA };
 const AVP_Code c_AVP_Code_AAA_3GPP_SGSN_User_State := {
    vendor_id_3GPP := avp_code_AAA_3GPP_SGSN_User_State };
 const AVP_Code c_AVP_Code_AAA_3GPP_APN_OI_Replacement := {
@@ -12394,8 +12658,8 @@
    vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_Flow_Number := {
    vendor_id_3GPP := avp_code_RX_3GPP_Flow_Number };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Home_Agent_Address := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Home_Agent_Address };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Home_Agent_Address := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Home_Agent_Address };
 const AVP_Code c_AVP_Code_PCC_3GPP_Resource_Allocation_Notification := {
    vendor_id_3GPP := avp_code_PCC_3GPP_Resource_Allocation_Notification };
 const AVP_Code c_AVP_Code_DCA_3GPP_Basic_Service_Code := {
@@ -12438,8 +12702,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Change_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_KASME := {
    vendor_id_3GPP := avp_code_AAA_3GPP_KASME };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Session_Key := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Session_Key };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Session_Key := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Session_Key };
 const AVP_Code c_AVP_Code_DCA_3GPP_AoC_Cost_Information := {
    vendor_id_3GPP := avp_code_DCA_3GPP_AoC_Cost_Information };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_User_Location_Info_Time := {
@@ -12502,6 +12766,8 @@
    vendor_id_NONE := avp_code_DNAS_NONE_Tunneling };
 const AVP_Code c_AVP_Code_DCC_NONE_User_Equipment_Info_Value := {
    vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info_Value };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Auth_Input_Data_Length := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Auth_Input_Data_Length };
 const AVP_Code c_AVP_Code_AAA_3GPP_eDRX_Cycle_Length := {
    vendor_id_3GPP := avp_code_AAA_3GPP_eDRX_Cycle_Length };
 const AVP_Code c_AVP_Code_BASE_NONE_Multi_Round_Time_Out := {
@@ -12544,6 +12810,8 @@
    vendor_id_NONE := avp_code_DNAS_NONE_Configuration_Token };
 const AVP_Code c_AVP_Code_DCA_3GPP_Interface_Type := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Interface_Type };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Originating_Foreign_AAA := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Originating_Foreign_AAA };
 const AVP_Code c_AVP_Code_AAA_3GPP_Expiration_Date := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Expiration_Date };
 const AVP_Code c_AVP_Code_BASE_NONE_Error_Message := {
@@ -12618,8 +12886,8 @@
    vendor_id_3GPP := avp_code_CxDx_3GPP_Server_Capabilities };
 const AVP_Code c_AVP_Code_AAA_3GPP_Area_Scope := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Area_Scope };
-const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Input_Packets := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Input_Packets };
+const AVP_Code c_AVP_Code_MIPv4_NONE_Accounting_Input_Packets := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_Accounting_Input_Packets };
 const AVP_Code c_AVP_Code_DCA_3GPP_SGW_Change := {
    vendor_id_3GPP := avp_code_DCA_3GPP_SGW_Change };
 const AVP_Code c_AVP_Code_CxDx_3GPP_SCSCF_Restoration_Info := {
@@ -12740,6 +13008,8 @@
    vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Negotiated_DSCP };
 const AVP_Code c_AVP_Code_AAA_3GPP_TWAN_S2a_Failure_Cause := {
    vendor_id_3GPP := avp_code_AAA_3GPP_TWAN_S2a_Failure_Cause };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_FA_to_MN_SPI := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_FA_to_MN_SPI };
 const AVP_Code c_AVP_Code_DCA_3GPP_Trigger := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Trigger };
 const AVP_Code c_AVP_Code_DCA_3GPP_Called_Identity_Change := {
@@ -12842,6 +13112,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Adaptations };
 const AVP_Code c_AVP_Code_BASE_NONE_Host_IP_Address := {
    vendor_id_NONE := avp_code_BASE_NONE_Host_IP_Address };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Reg_Request := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Reg_Request };
 const AVP_Code c_AVP_Code_DCA_3GPP_Quota_Holding_Time := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Quota_Holding_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_Maximum_Wait_Time := {
@@ -12892,8 +13164,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Tariff_Information };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Wildcarded_Public_Identity := {
    vendor_id_3GPP := avp_code_CxDx_3GPP_Wildcarded_Public_Identity };
-const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Session_Time := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Session_Time };
+const AVP_Code c_AVP_Code_MIPv4_NONE_Acct_Session_Time := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_Acct_Session_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_DSA_Flags := {
    vendor_id_3GPP := avp_code_AAA_3GPP_DSA_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Event_Type := {
@@ -12964,8 +13236,8 @@
    vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_A_MSISDN := {
    vendor_id_3GPP := avp_code_AAA_3GPP_A_MSISDN };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Mobile_Node_Address := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Mobile_Node_Address };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Mobile_Node_Address := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Mobile_Node_Address };
 const AVP_Code c_AVP_Code_PCC_3GPP_Routing_Rule_Report := {
    vendor_id_3GPP := avp_code_PCC_3GPP_Routing_Rule_Report };
 const AVP_Code c_AVP_Code_AAA_3GPP_Number_Of_Requested_Vectors := {
@@ -12994,6 +13266,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_SM_Service_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_UNI_PDU_CP_Only_Flag := {
    vendor_id_3GPP := avp_code_DCA_3GPP_UNI_PDU_CP_Only_Flag };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Filter_Rule := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Filter_Rule };
 const AVP_Code c_AVP_Code_BASE_NONE_Failed_AVP := {
    vendor_id_NONE := avp_code_BASE_NONE_Failed_AVP };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_RAT_Type := {
@@ -13014,6 +13288,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Service_Specific_Data };
 const AVP_Code c_AVP_Code_DCC_NONE_Subscription_Id_Type := {
    vendor_id_NONE := avp_code_DCC_NONE_Subscription_Id_Type };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_FA_to_HA_MSA := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_FA_to_HA_MSA };
 const AVP_Code c_AVP_Code_AAA_3GPP_Connectivity_Flags := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Connectivity_Flags };
 const AVP_Code c_AVP_Code_PCC_3GPP_Packet_Filter_Operation := {
@@ -13066,6 +13342,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Initial_IMS_Charging_Identifier };
 const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Filter_Rule := {
    vendor_id_NONE := avp_code_DNAS_NONE_NAS_Filter_Rule };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Feature_Vector := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Feature_Vector };
 const AVP_Code c_AVP_Code_BASE_NONE_Session_Server_Failover := {
    vendor_id_NONE := avp_code_BASE_NONE_Session_Server_Failover };
 const AVP_Code c_AVP_Code_DCA_3GPP_Accumulated_Cost := {
@@ -13094,8 +13372,8 @@
    vendor_id_NONE := avp_code_DNAS_NONE_Reply_Message };
 const AVP_Code c_AVP_Code_DNAS_NONE_Connect_Info := {
    vendor_id_NONE := avp_code_DNAS_NONE_Connect_Info };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Replay_Mode := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Replay_Mode };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Replay_Mode := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Replay_Mode };
 const AVP_Code c_AVP_Code_BASE_NONE_Proxy_Host := {
    vendor_id_NONE := avp_code_BASE_NONE_Proxy_Host };
 const AVP_Code c_AVP_Code_DCA_3GPP_Number_Of_Talk_Bursts := {
@@ -13294,6 +13572,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Announcing_UE_HPLMN_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_AESE_Error_Report := {
    vendor_id_3GPP := avp_code_S6_3GPP_AESE_Error_Report };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_FA_to_HA_SPI := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_FA_to_HA_SPI };
 const AVP_Code c_AVP_Code_DCA_3GPP_Event_Type := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Event_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_Sharing_Key_DL := {
@@ -13432,8 +13712,8 @@
    vendor_id_NONE := avp_code_DNAS_NONE_NAS_IPv6_Address };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MAC_Mobility_Data := {
    vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MAC_Mobility_Data };
-const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Output_Octets := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Output_Octets };
+const AVP_Code c_AVP_Code_MIPv4_NONE_Accounting_Output_Octets := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_Accounting_Output_Octets };
 const AVP_Code c_AVP_Code_CxDx_3GPP_To_SIP_Header := {
    vendor_id_3GPP := avp_code_CxDx_3GPP_To_SIP_Header };
 const AVP_Code c_AVP_Code_AAA_3GPP_Coupled_Node_Diameter_ID := {
@@ -13496,6 +13776,8 @@
    vendor_id_3GPP := avp_code_PCC_3GPP_ToS_Traffic_Class };
 const AVP_Code c_AVP_Code_AAA_3GPP_Tracking_Area_Identity := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Tracking_Area_Identity };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_HA_to_FA_SPI := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_HA_to_FA_SPI };
 const AVP_Code c_AVP_Code_RX_3GPP_Min_Desired_Bandwidth_UL := {
    vendor_id_3GPP := avp_code_RX_3GPP_Min_Desired_Bandwidth_UL };
 const AVP_Code c_AVP_Code_AAA_3GPP_UVR_Flags := {
@@ -13530,6 +13812,8 @@
    vendor_id_3GPP := avp_code_CxDx_3GPP_Restoration_Info };
 const AVP_Code c_AVP_Code_BASE_NONE_Product_Name := {
    vendor_id_NONE := avp_code_BASE_NONE_Product_Name };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_HA_to_MN_MSA := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_HA_to_MN_MSA };
 const AVP_Code c_AVP_Code_DCA_3GPP_Account_Expiration := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Account_Expiration };
 const AVP_Code c_AVP_Code_AAA_3GPP_CSG_Id := {
@@ -13626,6 +13910,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Recipient_Received_Address };
 const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Server_Endpoint := {
    vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Server_Endpoint };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Candidate_Home_Agent_Host := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Candidate_Home_Agent_Host };
 const AVP_Code c_AVP_Code_BASE_NONE_Session_Binding := {
    vendor_id_NONE := avp_code_BASE_NONE_Session_Binding };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_IMEISV := {
@@ -13654,8 +13940,8 @@
    vendor_id_3GPP := avp_code_RX_3GPP_RS_Bandwidth };
 const AVP_Code c_AVP_Code_S6_3GPP_Reachability_Information := {
    vendor_id_3GPP := avp_code_S6_3GPP_Reachability_Information };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Algorithm_Type := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Algorithm_Type };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Algorithm_Type := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Algorithm_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_Session_Description := {
    vendor_id_3GPP := avp_code_DCA_3GPP_SDP_Session_Description };
 const AVP_Code c_AVP_Code_RX_3GPP_Extended_Min_Desired_BW_DL := {
@@ -13686,10 +13972,10 @@
    vendor_id_NONE := avp_code_MIPv6_NONE_QoS_Capability };
 const AVP_Code c_AVP_Code_PCC_3GPP_ADC_Rule_Install := {
    vendor_id_3GPP := avp_code_PCC_3GPP_ADC_Rule_Install };
-const AVP_Code c_AVP_Code_DCC_NONE_G_S_U_Pool_Identifier := {
-	vendor_id_NONE := avp_code_DCC_NONE_G_S_U_Pool_Identifier };
 const AVP_Code c_AVP_Code_AAA_3GPP_Non_IP_PDN_Type_Indicator := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Non_IP_PDN_Type_Indicator };
+const AVP_Code c_AVP_Code_DCC_NONE_G_S_U_Pool_Identifier := {
+	vendor_id_NONE := avp_code_DCC_NONE_G_S_U_Pool_Identifier };
 const AVP_Code c_AVP_Code_DCA_3GPP_Outgoing_Session_Id := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Outgoing_Session_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Controlling_Address := {
@@ -13814,8 +14100,8 @@
    vendor_id_NONE := avp_code_DNAS_NONE_QoS_Filter_Rule };
 const AVP_Code c_AVP_Code_AAA_3GPP_Complete_Data_List_Included_Indicator := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Complete_Data_List_Included_Indicator };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MN_AAA_SPI := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MN_AAA_SPI };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_MN_AAA_SPI := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_MN_AAA_SPI };
 const AVP_Code c_AVP_Code_DCA_3GPP_LCS_Client_Name := {
    vendor_id_3GPP := avp_code_DCA_3GPP_LCS_Client_Name };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_SGSN_Address := {
@@ -13826,8 +14112,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Called_Asserted_Identity };
 const AVP_Code c_AVP_Code_DCA_3GPP_TWAG_Address := {
    vendor_id_3GPP := avp_code_DCA_3GPP_TWAG_Address };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MSA_Lifetime := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MSA_Lifetime };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_MSA_Lifetime := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_MSA_Lifetime };
 const AVP_Code c_AVP_Code_DCA_3GPP_Talk_Burst_Time := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Talk_Burst_Time };
 const AVP_Code c_AVP_Code_DCA_3GPP_Token_Text := {
@@ -13996,8 +14282,8 @@
    vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Authenticator };
 const AVP_Code c_AVP_Code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info };
-const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Input_Octets := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Input_Octets };
+const AVP_Code c_AVP_Code_MIPv4_NONE_Accounting_Input_Octets := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_Accounting_Input_Octets };
 const AVP_Code c_AVP_Code_AAA_3GPP_EPS_User_State := {
    vendor_id_3GPP := avp_code_AAA_3GPP_EPS_User_State };
 const AVP_Code c_AVP_Code_BASE_NONE_Origin_Host := {
@@ -14070,6 +14356,8 @@
    vendor_id_3GPP := avp_code_AAA_3GPP_VPLMN_Dynamic_Address_Allowed };
 const AVP_Code c_AVP_Code_DCC_NONE_Value_Digits := {
    vendor_id_NONE := avp_code_DCC_NONE_Value_Digits };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_MN_AAA_Auth := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_MN_AAA_Auth };
 const AVP_Code c_AVP_Code_BASE_NONE_Acct_Application_Id := {
    vendor_id_NONE := avp_code_BASE_NONE_Acct_Application_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_Associated_Party_Address := {
@@ -14096,6 +14384,8 @@
    vendor_id_3GPP := avp_code_GI_3GPP_3GPP_IMSI };
 const AVP_Code c_AVP_Code_AAA_3GPP_User_State := {
    vendor_id_3GPP := avp_code_AAA_3GPP_User_State };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_MN_to_HA_MSA := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_MN_to_HA_MSA };
 const AVP_Code c_AVP_Code_BASE_NONE_Result_Code := {
    vendor_id_NONE := avp_code_BASE_NONE_Result_Code };
 const AVP_Code c_AVP_Code_DCA_3GPP_Envelope := {
@@ -14154,14 +14444,16 @@
    vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Auth_Data_Item };
 const AVP_Code c_AVP_Code_AAA_3GPP_3GPP2_MEID := {
    vendor_id_3GPP := avp_code_AAA_3GPP_3GPP2_MEID };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_FA_to_MN_MSA := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_FA_to_MN_MSA };
 const AVP_Code c_AVP_Code_AAA_3GPP_Subscription_Data := {
    vendor_id_3GPP := avp_code_AAA_3GPP_Subscription_Data };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Multiple_Registration_Indication := {
    vendor_id_3GPP := avp_code_CxDx_3GPP_Multiple_Registration_Indication };
-const AVP_Code c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id := {
-	vendor_id_NONE := avp_code_BASE_NONE_Vendor_Specific_Application_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_WLAN_offloadability_UTRAN := {
    vendor_id_3GPP := avp_code_AAA_3GPP_WLAN_offloadability_UTRAN };
+const AVP_Code c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id := {
+	vendor_id_NONE := avp_code_BASE_NONE_Vendor_Specific_Application_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_IMSI_Unauthenticated_Flag := {
    vendor_id_3GPP := avp_code_DCA_3GPP_IMSI_Unauthenticated_Flag };
 const AVP_Code c_AVP_Code_DCA_3GPP_Interface_Id := {
@@ -14182,6 +14474,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_Event_Funtionality };
 const AVP_Code c_AVP_Code_DCA_3GPP_Aux_Applic_Info := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Aux_Applic_Info };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Nonce := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Nonce };
 const AVP_Code c_AVP_Code_S6_3GPP_IP_SM_GW_Number := {
    vendor_id_3GPP := avp_code_S6_3GPP_IP_SM_GW_Number };
 const AVP_Code c_AVP_Code_AAA_3GPP_AAR_Flags := {
@@ -14222,6 +14516,8 @@
    vendor_id_3GPP := avp_code_RX_3GPP_Media_Component_Status };
 const AVP_Code c_AVP_Code_AAA_3GPP_eDRX_Cycle_Length_Value := {
    vendor_id_3GPP := avp_code_AAA_3GPP_eDRX_Cycle_Length_Value };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_FA_Challenge := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_FA_Challenge };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Visited_Network_Identifier := {
    vendor_id_3GPP := avp_code_CxDx_3GPP_Visited_Network_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_RIR_Flags := {
@@ -14264,6 +14560,8 @@
    vendor_id_NONE := avp_code_DNAS_NONE_CHAP_Auth };
 const AVP_Code c_AVP_Code_DCC_NONE_Service_Context_Id := {
    vendor_id_NONE := avp_code_DCC_NONE_Service_Context_Id };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Authenticator_Length := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Authenticator_Length };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_TimeStamps := {
    vendor_id_3GPP := avp_code_DCA_3GPP_SDP_TimeStamps };
 const AVP_Code c_AVP_Code_DCA_3GPP_IMS_Charging_Identifier := {
@@ -14310,8 +14608,8 @@
    vendor_id_3GPP := avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL };
 const AVP_Code c_AVP_Code_DCC_NONE_CC_Correlation_Id := {
    vendor_id_NONE := avp_code_DCC_NONE_CC_Correlation_Id };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Home_Agent_Host := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Home_Agent_Host };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Home_Agent_Host := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Home_Agent_Host };
 const AVP_Code c_AVP_Code_BASE_NONE_Route_Record := {
    vendor_id_NONE := avp_code_BASE_NONE_Route_Record };
 const AVP_Code c_AVP_Code_DCA_3GPP_SM_User_Data_Header := {
@@ -14362,6 +14660,8 @@
    vendor_id_3GPP := avp_code_DCA_3GPP_Unit_Quota_Threshold };
 const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Auth_Method := {
    vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Auth_Method };
+const AVP_Code c_AVP_Code_MIPv4_NONE_MIP_Authenticator_Offset := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_MIP_Authenticator_Offset };
 const AVP_Code c_AVP_Code_DCA_3GPP_MBMS_Information := {
    vendor_id_3GPP := avp_code_DCA_3GPP_MBMS_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_Bearer_Capability := {
@@ -14372,8 +14672,8 @@
    vendor_id_3GPP := avp_code_S6_3GPP_Supported_Services };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_Media_Description := {
    vendor_id_3GPP := avp_code_DCA_3GPP_SDP_Media_Description };
-const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Output_Packets := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Output_Packets };
+const AVP_Code c_AVP_Code_MIPv4_NONE_Accounting_Output_Packets := {
+	vendor_id_NONE := avp_code_MIPv4_NONE_Accounting_Output_Packets };
 const AVP_Code c_AVP_Code_DCA_3GPP_Radio_Parameter_Set_Info := {
    vendor_id_3GPP := avp_code_DCA_3GPP_Radio_Parameter_Set_Info };
 const AVP_Code c_AVP_Code_PCC_3GPP_Rule_DeActivation_Time := {
diff --git a/library/regen-DIAMETER_Types_ttcn.sh b/library/regen-DIAMETER_Types_ttcn.sh
index c5e6d0d..e64cc88 100755
--- a/library/regen-DIAMETER_Types_ttcn.sh
+++ b/library/regen-DIAMETER_Types_ttcn.sh
@@ -7,6 +7,7 @@
 $AVP_SH_PATH \
         Base_IETF_RFC3588.ddf \
         BaseTypes_IETF_RFC3588.ddf \
+        MobileIPv4_Application_IETF_RFC4004.ddf \
         NetworkAccessServer_IETF_RFC4005.ddf \
         CreditControl_IETF_RFC4006.ddf \
         MobileIPv6_NAS_IETF_RFC5447.ddf \
-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36167?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I66cae565d332d88f24c4ee94459770f9d24c16af
Gerrit-Change-Number: 36167
Gerrit-PatchSet: 1
Gerrit-Owner: pespin pespin@sysmocom.de
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria vyanitskiy@sysmocom.de
Gerrit-Reviewer: laforge laforge@osmocom.org
Gerrit-Reviewer: pespin pespin@sysmocom.de
Gerrit-MessageType: merged



    