Commit 2d01cae1 authored by wattelet's avatar wattelet
Browse files

S6a typing new version

parent abbe0e1e
Loading
Loading
Loading
Loading
+97 −46
Original line number Diff line number Diff line
@@ -1149,12 +1149,22 @@ group HeaderAndBodyTypes {
				set of AVP_Type         			aVP_Type						optional
			}

			type record SRES_AVP {													//ref: 7.3.60
				AVP_Header							aVP_Header, 					//SRES ::= <AVP header: 1454 10415>
                octetstring							aVP_Data
			}

			type record Kc_AVP {													//ref: 7.3.59
				AVP_Header							aVP_Header, 					//Kc ::= <AVP header: 1453 10415>
                octetstring							aVP_Data
			}

			type record GERAN_Vector_AVP {											//ref: 7.3.20
				AVP_Header							aVP_Header, 					//GERAN-Vector ::= <AVP header: 1416 10415>
                Item_Number_AVP						item_Number						optional,
                RAND_AVP							rAND,
//                SRES_AVP							sRES,
//                Kc_AVP								kc,
                SRES_AVP							sRES,
                Kc_AVP								kc,
				set of AVP_Type         			aVP_Type						optional
			}

@@ -1165,6 +1175,49 @@ group HeaderAndBodyTypes {
                set of 	GERAN_Vector_AVP			gERAN_Vector					optional,
				set of AVP_Type         			aVP_Type						optional
			}

            type enumerated Cancellation_Type_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 Cancellation_Type_AVP {										//ref: 7.3.24
				AVP_Header							aVP_Header, 					//Cancellation-Type ::= <AVP header: 1420 10415>
                Cancellation_Type_Code				cancellation_Type
			}

			type record CLR_Flags_AVP {												//ref: 7.3.152
				AVP_Header							aVP_Header, 					//CLR-Flags ::= <AVP header: 1638 10415>
                UInt32								aVP_Data
			}

			type record IDR_Flags_AVP {												//ref: 7.3.103
				AVP_Header							aVP_Header, 					//IDR-Flags ::= <AVP header: 1490 10415>
                UInt32								aVP_Data
			}

			type record DSR_Flags_AVP {												//ref: 7.3.25
				AVP_Header							aVP_Header, 					//DSR-Flags ::= <AVP header: 1421 10415>
                UInt32								aVP_Data
			}

			type record DSA_Flags_AVP {												//ref: 7.3.26
				AVP_Header							aVP_Header, 					//DSA-Flags ::= <AVP header: 1422 10415>
                UInt32								aVP_Data
			}

			type record PUR_Flags_AVP {												//ref: 7.3.149
				AVP_Header							aVP_Header, 					//PUR-Flags ::= <AVP header: 1635 10415>
                UInt32								aVP_Data
			}

			type record PUA_Flags_AVP {												//ref: 7.3.48
				AVP_Header							aVP_Header, 					//PUA-Flags ::= <AVP header: 1442 10415>
                UInt32								aVP_Data
			}
		}//end of group TS129_272_AVPs
	}//end group AVPs

@@ -1267,10 +1320,8 @@ group HeaderAndBodyTypes {
				Destination_Realm_AVP               destination_Realm,
				User_Name_AVP                       user_Name,
				set of Supported_Features_AVP       supported_Features				optional,
/*
{ Cancellation-Type }
[ CLR-Flags ]
*/
                Cancellation_Type_AVP				cancellation_Type,
                CLR_Flags_AVP						cLR_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
@@ -1306,9 +1357,7 @@ group HeaderAndBodyTypes {
				User_Name_AVP                       user_Name,
				set of Supported_Features_AVP       supported_Features				optional,
                Subscription_Data_AVP				subscription_Data,
/*
[IDR- Flags ]
*/
                IDR_Flags_AVP						iDR_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
@@ -1325,7 +1374,7 @@ 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 ]
@@ -1351,9 +1400,7 @@ group HeaderAndBodyTypes {
				Destination_Realm_AVP               destination_Realm,
				User_Name_AVP                       user_Name,
				set of Supported_Features_AVP       supported_Features				optional,
/*
{ DSR-Flags }
*/
                DSR_Flags_AVP						dSR_Flags,
				set of Context_Identifier_AVP		context_Identifier				optional,
                Trace_Reference_AVP					trace_Reference					optional,
                set of TS_Code_AVP					tS_Code							optional,
@@ -1375,45 +1422,49 @@ group HeaderAndBodyTypes {
				Auth_Session_State_AVP             	auth_Session_State,
				Origin_Host_AVP                     origin_Host,
				Origin_Realm_AVP                    origin_Realm,
/*
[ DSA-Flags ]
*/				
                DSA_Flags_AVP						dSA_Flags						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
			}
/*
< Purge-UE-Request> ::=	< Diameter Header: 321, REQ, PXY, 16777251 >
< Session-Id >
	[ Vendor-Specific-Application-Id ]
{ Auth-Session-State }
{ Origin-Host }
{ Origin-Realm }
[ Destination-Host ]
{ Destination-Realm }
{ User-Name }
[ PUR-Flags ]
*[ Supported-Features ]
*[ AVP ]
*[ Proxy-Info ]
*[ Route-Record ]

< Purge-UE-Answer> ::=	< Diameter Header: 321, PXY, 16777251 >
< Session-Id >
	[ Vendor-Specific-Application-Id ]
*[ Supported-Features ]
[ Result-Code ]
[ Experimental-Result ] 
{ Auth-Session-State }
{ Origin-Host }
{ Origin-Realm }
[ PUA-Flags ]
*[ AVP ]
*[ Failed-AVP ]
*[ Proxy-Info ]
*[ Route-Record ]
			// Purge-UE-Request (PUR) Command - Ref: TS 129 272 7.2.13
			type record  PUR_MSG {
				DiameterHeader                      header,							//<PUR>  ::= < Diameter Header: 321, 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,
                PUR_Flags_AVP						pUR_Flags						optional,
				set of Supported_Features_AVP       supported_Features				optional,
				set of AVP_Type                     aVP_Type						optional,
				set of Proxy_Info_AVP               proxy_Info						optional,
				set of Route_Record_AVP             route_Record					optional
			}

			// Purge-UE-Answer (PUA) Command - Ref: TS 129 272 7.2.14
			type record  PUA_MSG {
				DiameterHeader                      header,							//<DSA> ::=	< Diameter Header: 321, 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,
                PUA_Flags_AVP						pUA_Flags						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
			}
/* TODO
< Reset-Request> ::=		< Diameter Header: 322, REQ, PXY, 16777251 >
< Session-Id >
	[ Vendor-Specific-Application-Id ]