Commit 8858556e authored by wattelet's avatar wattelet
Browse files

Type S6a new version

parent 2d01cae1
Loading
Loading
Loading
Loading
+250 −74
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ group HeaderAndBodyTypes {
			type record Terminal_Information_AVP {									//ref: 7.3.3
				AVP_Header            				aVP_Header, 					//Terminal Information ::= <AVP header: 1401 10415>
				IMEI_AVP             				imei							optional,
				MEID_AVP							meid							optional,
                ThreeGPP2_MEID_AVP					meid							optional,
				Sofware_Version_AVP					sofware_Version					optional,
				set of AVP_Type         			aVP_Type						optional
			}
@@ -180,7 +180,7 @@ group HeaderAndBodyTypes {
				UTF8String							aVP_Data						//2-digit Software Version Number (SVN)
			}

			type record MEID_AVP {													//ref: 7.3.6
			type record ThreeGPP2_MEID_AVP {													//ref: 7.3.6
				AVP_Header							aVP_Header, 					//MEID ::= <AVP header: 1471 10415>
				octetstring							aVP_Data
			}
@@ -230,7 +230,7 @@ group HeaderAndBodyTypes {
            }

            type record SGSN_Number_AVP {											//ref: 7.3.102
                AVP_Header							aVP_Header, 					//UE-SRVCC-Capability ::= <AVP header: 1489 10415>
                AVP_Header							aVP_Header, 					//SGSN-Number ::= <AVP header: 1489 10415>
                octetstring							aVP_Data
            }

@@ -1218,6 +1218,171 @@ group HeaderAndBodyTypes {
				AVP_Header							aVP_Header, 					//PUA-Flags ::= <AVP header: 1442 10415>
                UInt32								aVP_Data
			}

			type record IDA_Flags_AVP {												//ref: 7.3.47
				AVP_Header							aVP_Header, 					//IDA-Flags ::= <AVP header: 1441 10415>
                UInt32								aVP_Data
			}

			type record NOR_Flags_AVP {												//ref: 7.3.49
				AVP_Header							aVP_Header, 					//NOR-Flags ::= <AVP header: 1443 10415>
                UInt32								aVP_Data
			}

            type enumerated IMS_Voice_PS_Sessions_Support_Code {
				NOT_SUPPORTED_E	(0),
				SUPPORTED_E		(1)
			}

			type record IMS_Voice_PS_Sessions_Support_AVP {							//ref: 7.3.106
				AVP_Header							aVP_Header, 					//IMS-Voice-Over-PS-Sessions-Supported ::= <AVP header: 1492 10415>
                IMS_Voice_PS_Sessions_Support_Code	iMS_Voice_Over_PS_Sessions_Supported
			}

			type record Last_UE_Activity_Time_AVP {									//ref: 7.3.108
				AVP_Header							aVP_Header, 					//Last-UE-Activity-Time ::= <AVP header: 1494 10415>
                Time								aVP_Data
			}

			type record EPS_User_State_AVP {										//ref: 7.3.110
				AVP_Header							aVP_Header, 					//EPS-User-State ::= <AVP header: 1495 10415>
                MME_User_State_AVP					mME_User_State					optional,
                SGSN_User_State_AVP					sGSN_User_State					optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record EPS_Location_Information_AVP {								//ref: 7.3.111
				AVP_Header							aVP_Header, 					//EPS-Location-Information ::= <AVP header: 1496 10415>
                MME_Location_Information_AVP		mME_Location_Information		optional,
                SGSN_Location_Information_AVP		sGSN_Location_Information		optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record Service_Area_Identity_AVP {									//ref: 7.3.122
				AVP_Header							aVP_Header, 					//Service-Area-Identity ::= <AVP header: 1607 10415>
                octetstring							aVP_Data
			}

			type record Geographical_Information_AVP {								//ref: 7.3.123
				AVP_Header							aVP_Header, 					//Geographical-Information ::= <AVP header: 1608 10415>
                octetstring							aVP_Data
			}

			type record Geodetic_Information_AVP {									//ref: 7.3.124
				AVP_Header							aVP_Header, 					//Geodetic-Information ::= <AVP header: 1609 10415>
                octetstring							aVP_Data
			}

            type enumerated Current_Location_Retrieved_Code {
                ACTIVE_LOCATION_RETRIEVAL_E (0)
			}

			type record Current_Location_Retrieved_AVP {							//ref: 7.3.125
				AVP_Header							aVP_Header, 					//Current-Location-Retrieved ::= <AVP header: 1610 10415>
                Current_Location_Retrieved_Code		current_Location_Retrieved
			}

			type record Age_Of_Location_Informations_AVP {							//ref: 7.3.126
				AVP_Header							aVP_Header, 					//Age-Of-Location-Information ::= <AVP header: 1443 10415>
                UInt32								aVP_Data
			}

            type enumerated CSG_Access_Mode_Code {
				CLOSED_MODE_E	(0),
				HYBRID_MODE_E	(1)
			}

			type record CSG_Access_Mode_AVP {										//ref: TS 132 299 7.2.46A
				AVP_Header							aVP_Header, 					//CSG-Access-Mode ::= <AVP header: 2317 10415>
                CSG_Access_Mode_Code				cSG_Access_Mode
			}

            type enumerated CSG_Membership_Indication_Code {
				NOT_CSG_MEMBER_E	(0),
                CSG_MEMBER_E		(1)
			}

			type record CSG_Membership_Indication_AVP {								//ref: TS 132 299 7.2.46B
				AVP_Header							aVP_Header, 					//CSG-Membership-Indication ::= <AVP header: 2318 10415>
                CSG_Membership_Indication_Code		cSG_Membership_Indication
			}

			type record User_CSG_Information_AVP {									//ref: TS 132 299 7.2.240A
				AVP_Header							aVP_Header, 					//User-CSG-Information ::= <AVP header: 2319 10415>
                CSG_Id_AVP							cSG_Id,
                CSG_Access_Mode_AVP					cSG_Access_Mode,
                CSG_Membership_Indication_AVP		cSG_Membership_Indication		optional
			}

			type record MME_Location_Information_AVP {								//ref: 7.3.115
				AVP_Header							aVP_Header, 					//MME-Location-Information ::= <AVP header: 1600 10415>
                E_UTRAN_Cell_Gl_Identity_AVP		e_UTRAN_Cell_Gl_Identity		optional,
                Tracking_Area_Identity_AVP			tracking_Area_Identity			optional,
                Geographical_Information_AVP		geographical_Information		optional,
                Geodetic_Information_AVP			geodetic_Information			optional,
                Current_Location_Retrieved_AVP		current_Location_Retrieved		optional,
                Age_Of_Location_Informations_AVP	age_Of_Location_Informations	optional,
                User_CSG_Information_AVP			user_CSG_Information			optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record SGSN_Location_Information_AVP {								//ref: 7.3.116
				AVP_Header							aVP_Header, 					//SGSN-Location-Information ::= <AVP header: 1601 10415>
                Cell_Global_Identity_AVP			cell_Global_Identity			optional,
                Location_Area_Identity_AVP			location_Area_Identity			optional,
                Service_Area_Identity_AVP			service_Area_Identity			optional,
				Routing_Area_Identity_AVP			routing_Area_Identity			optional,
                Geographical_Information_AVP		geographical_Information		optional,
                Geodetic_Information_AVP			geodetic_Information			optional,
                Current_Location_Retrieved_AVP		current_Location_Retrieved		optional,
                Age_Of_Location_Informations_AVP	age_Of_Location_Informations	optional,
                User_CSG_Information_AVP			user_CSG_Information			optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record MME_User_State_AVP {										//ref: 7.3.112
				AVP_Header							aVP_Header, 					//MME-User-State ::= <AVP header: 1497 10415>
                User_State_AVP						user_State						optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record SGSN_User_State_AVP {										//ref: 7.3.113
				AVP_Header							aVP_Header, 					//SGSN-User-State ::= <AVP header: 1498 10415>
                User_State_AVP						user_State						optional,
				set of AVP_Type         			aVP_Type						optional
			}

            type enumerated User_State_Code {
				DETACHED_E								(0),
				ATTACHED_NOT_REACHABLE_FOR_PAGING_E		(1),
				ATTACHED_REACHABLE_FOR_PAGING_E			(2),
				CONNECTED_NOT_REACHABLE_FOR_PAGING_E	(3),
				CONNECTED_REACHABLE_FOR_PAGING_E		(4),
				NETWORK_DETERMINED_NOT_REACHABLE_E		(5)
			}

			type record User_State_AVP {											//ref: 7.3.114
				AVP_Header							aVP_Header, 					//User-State ::= <AVP header: 1499 10415>
                User_State_Code						user_State
			}

			type record User_Id_AVP {												//ref: 7.3.50
				AVP_Header							aVP_Header, 					//User-Id ::= <AVP header: 1444 10415>
                UTF8String							aVP_Data
			}

            type enumerated Alert_Reason_Code {
				MME_UPDATE_PROCEDURE_E		(0),
				SGSN_UPDATE_PROCEDURE_E		(1),
				SUBSCRIPTION_WITHDRAWAL_E	(2),
				UPDATE_PROCEDURE_IWF_E		(3),
				INITIAL_ATTACH_PROCEDURE_E	(4)
			}

			type record Alert_Reason_AVP {											//ref: 7.3.83
				AVP_Header							aVP_Header, 					//Alert-Reason  ::= <AVP header: 1434 10415>
                Alert_Reason_Code					alert_Reason
			}
		}//end of group TS129_272_AVPs
	}//end group AVPs

@@ -1374,14 +1539,12 @@ group HeaderAndBodyTypes {
				Auth_Session_State_AVP             	auth_Session_State,
				Origin_Host_AVP                     origin_Host,
				Origin_Realm_AVP                    origin_Realm,
/* TODO
[ IMS-Voice-Over-PS-Sessions-Supported ]
[ Last-UE-Activity-Time ]
[ RAT-Type ]
[ IDA-Flags ] 
[ EPS-User-State ]
[ EPS-Location-Information ]
*/
                IMS_Voice_PS_Sessions_Support_AVP	iMS_Voice_PS_Sessions_Support	optional,
                Last_UE_Activity_Time_AVP			last_UE_Activity_Time_AVP		optional,
                RAT_Type_AVP						rAT_Type						optional,
                IDA_Flags_AVP						iDA_Flags						optional,
                EPS_User_State_AVP					ePS_User_State					optional,
                EPS_Location_Information_AVP		ePS_Location_Information		optional,
				set of AVP_Type                     aVP_Type						optional,
				set of Failed_AVP					failed_AVP						optional,
				set of Proxy_Info_AVP               proxy_Info						optional,
@@ -1464,69 +1627,82 @@ group HeaderAndBodyTypes {
				set of Proxy_Info_AVP               proxy_Info						optional,
				set of Route_Record_AVP             route_Record					optional
			}
/* TODO
< Reset-Request> ::=		< Diameter Header: 322, REQ, PXY, 16777251 >
< Session-Id >
	[ Vendor-Specific-Application-Id ]
{ Auth-Session-State }
{ Origin-Host }
{ Origin-Realm }
{ Destination-Host }
{ Destination-Realm }
*[ Supported-Features ]
*[ User-Id ]
*[ AVP ]
*[ Proxy-Info ]
*[ Route-Record ]
< Reset-Answer> ::=		< Diameter Header: 322, PXY, 16777251 >
< Session-Id >
	[ Vendor-Specific-Application-Id ]
*[ Supported-Features ]
[ Result-Code ]
[ Experimental-Result ] 
{ Auth-Session-State }
{ Origin-Host }
{ Origin-Realm }
*[ AVP ]
*[ Failed-AVP ]
*[ Proxy-Info ]
*[ Route-Record ]

< Notify-Request> ::=	< Diameter Header: 323, REQ, PXY, 16777251 >
< Session-Id >
	[ Vendor-Specific-Application-Id ]
{ Auth-Session-State }
{ Origin-Host }
{ Origin-Realm }
[ Destination-Host ]
{ Destination-Realm }
{ User-Name }
* [ Supported-Features ]
[ Terminal-Information ]
[ MIP6-Agent-Info ] 
[ Visited-Network-Identifier ]
[ Context-Identifier ]
[Service-Selection]
[ Alert-Reason ]
[ UE-SRVCC-Capability ]
[ NOR-Flags ]
*[ AVP ]
*[ Proxy-Info ]
*[ Route-Record ]
< Notify-Answer> ::=	< Diameter Header: 323, PXY, 16777251 >
< Session-Id >
	[ Vendor-Specific-Application-Id ]
[ Result-Code ]
[ Experimental-Result ] 
{ Auth-Session-State }
{ Origin-Host }
{ Origin-Realm }
*[ Supported-Features ]
*[ AVP ]
*[ Failed-AVP ]
*[ Proxy-Info ]
**/

			// Reset-Request (RSR) Command - Ref: TS 129 272 7.2.15
			type record  RSR_MSG {
				DiameterHeader                      header,							//<RSR> ::= < Diameter Header: 322, REQ, PXY, 16777251 >
				Session_Id_AVP						session_Id,						//
				Vendor_Specific_Appl_Id_AVP			vendor_Specific_Application_Id	optional,
				Auth_Session_State_AVP             	auth_Session_State,
				Origin_Host_AVP                     origin_Host,
				Origin_Realm_AVP                    origin_Realm,
				Destination_Host_AVP                destination_Host,
				Destination_Realm_AVP               destination_Realm,
				set of Supported_Features_AVP       supported_Features				optional,
                set of User_Id_AVP					user_Id							optional,
				set of AVP_Type                     aVP_Type						optional,
				set of Proxy_Info_AVP               proxy_Info						optional,
				set of Route_Record_AVP             route_Record					optional
			}

			// Reset-Answer (RSA) Command - Ref: TS 129 272 7.2.16
			type record  RSA_MSG {
				DiameterHeader                      header,							//<RSA> ::=	< Diameter Header: 322, PXY, 16777251 >
				Session_Id_AVP						session_Id,						//
				Vendor_Specific_Appl_Id_AVP			vendor_Specific_Application_Id	optional,
				set of Supported_Features_AVP       supported_Features				optional,
				Result_Code_AVP						result_Code						optional,
				Experimental_Result_AVP				experimental_Result				optional,
				Auth_Session_State_AVP             	auth_Session_State,
				Origin_Host_AVP                     origin_Host,
				Origin_Realm_AVP                    origin_Realm,
				set of AVP_Type                     aVP_Type						optional,
				set of Failed_AVP					failed_AVP						optional,
				set of Proxy_Info_AVP               proxy_Info						optional,
				set of Route_Record_AVP             route_Record					optional
			}

			// Notify-Request (NOR) Command - Ref: TS 129 272 7.2.17
			type record  NOR_MSG {
				DiameterHeader                      header,							//<NOR> ::= < Diameter Header: 323, REQ, PXY, 16777251 >
				Session_Id_AVP						session_Id,						//
				Vendor_Specific_Appl_Id_AVP			vendor_Specific_Application_Id	optional,
				Auth_Session_State_AVP             	auth_Session_State,
				Origin_Host_AVP                     origin_Host,
				Origin_Realm_AVP                    origin_Realm,
				Destination_Host_AVP                destination_Host				optional,
				Destination_Realm_AVP               destination_Realm,
				User_Name_AVP                       user_Name,
				set of Supported_Features_AVP       supported_Features				optional,
                Terminal_Information_AVP			ierminal_Information			optional,
				MIP6_Agent_Info_AVP					mIP6_Agent_Info					optional,
                Visited_Network_Identifier_AVP		visited_Network_Identifier		optional,
                Context_Identifier_AVP				context_Identifier				optional,
                Service_Selection_AVP				service_Selection				optional,
                Alert_Reason_AVP					alert_Reason					optional,
				UE_SRVCC_Capability_AVP				uE_SRVCC_Capability				optional,
                NOR_Flags_AVP						nOR_Flags						optional,
				set of AVP_Type                     aVP_Type						optional,
				set of Proxy_Info_AVP               proxy_Info						optional,
				set of Route_Record_AVP             route_Record					optional
			}

			// Notify-Answer (NOA) Command - Ref: TS 129 272 7.2.18
			type record  NOA_MSG {
				DiameterHeader                      header,							//<NOA> ::=	< Diameter Header: 323, PXY, 16777251 >
				Session_Id_AVP						session_Id,						//
				Vendor_Specific_Appl_Id_AVP			vendor_Specific_Application_Id	optional,
				Result_Code_AVP						result_Code						optional,
				Experimental_Result_AVP				experimental_Result				optional,
				Auth_Session_State_AVP             	auth_Session_State,
				Origin_Host_AVP                     origin_Host,
				Origin_Realm_AVP                    origin_Realm,
				set of Supported_Features_AVP       supported_Features				optional,
				set of AVP_Type                     aVP_Type						optional,
				set of Failed_AVP					failed_AVP						optional,
				set of Proxy_Info_AVP               proxy_Info						optional,
				set of Route_Record_AVP             route_Record					optional
			}
		}//end group S6a
	}//end group MessageTypes
}//End group HeaderAndBodyTypes