Commit 32158233 authored by wattelet's avatar wattelet
Browse files

S6a type and value new draft

parent 0b547ad7
Loading
Loading
Loading
Loading
+280 −130
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ group HeaderAndBodyTypes {
			}

			type record MEID_AVP {													//ref: 7.3.6
				AVP_Header				aVP_Header, //IMEI ::= <AVP header: 1471 10415>
				octetstring				aVP_Data	//(MEID)
				AVP_Header							aVP_Header, 					//MEID ::= <AVP header: 1471 10415>
				octetstring							aVP_Data
			}

			type record ULR_Flags_AVP {												//ref: 7.3.7
@@ -191,7 +191,7 @@ group HeaderAndBodyTypes {
			}

			type record ULA_Flags_AVP {												//ref: 7.3.8
				AVP_Header				aVP_Header, //ULR-Flags ::= <AVP header: 1406 10415>
				AVP_Header							aVP_Header, 					//ULA-Flags ::= <AVP header: 1406 10415>
                UInt32								aVP_Data
			}

@@ -382,6 +382,165 @@ group HeaderAndBodyTypes {
                UTF8String							aVP_Data
			}

			type record GMLC_Number_AVP {											//ref: 7.3.85
				AVP_Header							aVP_Header, 					//GMLC-Number ::= <AVP header: 1474 10415>
                octetstring							aVP_Data
			}

			type record SS_Code_AVP {												//ref: 7.3.87
				AVP_Header							aVP_Header, 					//SS-Code ::= <AVP header: 1476 10415>
                octetstring							aVP_Data
			}

			type record SS_Status_AVP {												//ref: 7.3.88
				AVP_Header							aVP_Header, 					//SS-Status ::= <AVP header: 1477 10415>
                octetstring							aVP_Data
			}

            type enumerated Notification_To_UE_User_Code {
				NOTIFY_LOCATION_ALLOWED_E								(0),
				NOTIFYANDVERIFY_LOCATION_ALLOWED_IF_NO_RESPONSE_E		(1),
				NOTIFYANDVERIFY_LOCATION_NOT_ALLOWED_IF_NO_RESPONSE_E	(2),
				LOCATION_NOT_ALLOWED_E									(3)
			}

			type record Notification_To_UE_User_AVP {								//ref: 7.3.89
				AVP_Header							aVP_Header, 					//Notification-To-UE-User ::= <AVP header: 1478 10415>
                Notification_To_UE_User_Code		notification_To_UE_User_Code
			}

			type record External_Client_AVP {										//ref: 7.3.90
				AVP_Header							aVP_Header, 					//External-Client ::= <AVP header: 1479 10415>>
                Client_Identity_AVP					client_Identity,
                GMLC_Restriction_AVP				gMLC_Restriction				optional,
                Notification_To_UE_User_AVP			notification_To_UE_User			optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record Client_Identity_AVP {										//ref: 7.3.91
				AVP_Header							aVP_Header, 					//Client-Identity ::= <AVP header: 1480 10415>
                octetstring							aVP_Data
			}

            type enumerated GMLC_Restriction_Code {
				GMLC_LIST_E		(0),
				HOME_COUNTRY_E	(1)
			}

			type record GMLC_Restriction_AVP {										//ref: 7.3.92
				AVP_Header							aVP_Header, 					//GMLC-Restriction ::= <AVP header: 1481 10415>
                GMLC_Restriction_Code				gMLC_Restriction_Code
			}

            type enumerated PLMN_Client_Code {
				GMLC_LIST_E		(0),
				HOME_COUNTRY_E	(1)
			}

			type record PLMN_Client_AVP {											//ref: 7.3.93
				AVP_Header							aVP_Header, 					//GMLC-Restriction ::= <AVP header: 1482 10415>
                PLMN_Client_Code					pLMN_Client_Code
			}

			type record ServiceTypeIdentity_AVP {									//ref: 7.3.95
				AVP_Header							aVP_Header, 					//ServiceTypeIdentity ::= <AVP header: 1484 10415>
                UInt32								aVP_Data
			}

			type record Service_Type_AVP {											//ref: 7.3.94
				AVP_Header							aVP_Header, 					//Service-Type ::= <AVP header: 1483 10415>
                ServiceTypeIdentity_AVP				serviceTypeIdentity,
                GMLC_Restriction_AVP				gMLC_Restriction				optional,
                Notification_To_UE_User_AVP			notification_To_UE_User			optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record LCS_PrivacyException_AVP {									//ref: 7.3.86
				AVP_Header							aVP_Header, 					//LCS-PrivacyException ::= <AVP header: 1475 10415>
                SS_Code_AVP							sS_Code							optional,
                SS_Status_AVP						sS_Status						optional,
                Notification_To_UE_User_AVP			notification_To_UE_User			optional,
                set of External_Client_AVP			external_Client					optional,
                set of PLMN_Client_AVP				pLMN_Client						optional,
                set of Service_Type_AVP				service_Type					optional,
                set of AVP_Type         			aVP_Type						optional
			}

			type record MO_LR_AVP {													//ref: 7.3.96
				AVP_Header							aVP_Header, 					//GMO-LR ::= <AVP header: 1485 10415>
                SS_Code_AVP							sS_Code							optional,
                SS_Status_AVP						sS_Status						optional,
                set of AVP_Type         			aVP_Type						optional
			}

			type record LCS_Info_AVP {												//ref: 7.3.32
                AVP_Header							aVP_Header, 					//LCS-Info ::= <AVP header: 1473 10415>
                set of GMLC_Number_AVP				gMLC_Number						optional,
                set of LCS_PrivacyException_AVP		lCS_PrivacyException			optional,
                set of MO_LR_AVP					mO_LR							optional,
				set of AVP_Type         			aVP_Type						optional
			}

			type record TS_Code_AVP {												//ref: 7.3.100
				AVP_Header							aVP_Header, 					//TS-Code ::= <AVP header: 1487 10415>
                octetstring							aVP_Data
			}

			type record Teleservice_List_AVP {										//ref: 7.3.99
                set of AVP_Header						aVP_Header, 				//Teleservice-List ::= <AVP header: 1486 10415>
                set length (1..infinity) of TS_Code_AVP	tS_Code,
				set of AVP_Type         				aVP_Type					optional
			}

			type record Call_Barring_Info_AVP {										//ref: 7.3.101
                AVP_Header							aVP_Header, 					//Call-Barring-Info ::= <AVP header: 1488 10415>
                SS_Code_AVP							sS_Code,
                SS_Status_AVP						sS_Status,
				set of AVP_Type         			aVP_Type						optional
			}

			type record Max_Requested_Bandwidth_DL_AVP {							//ref: TS 129 214 5.3.14
				AVP_Header							aVP_Header, 					//Max-Requested-Bandwidth-DL ::= <AVP header: 515 10415>
                UInt32								aVP_Data
			}

			type record Max_Requested_Bandwidth_UL_AVP {							//ref: TS 129 214 5.3.15
				AVP_Header							aVP_Header, 					//Max-Requested-Bandwidth-UL ::= <AVP header: 516 10415>
                UInt32								aVP_Data
			}

			type record AMBR_AVP {													//ref: 7.3.41
                AVP_Header							aVP_Header, 					//AMBR ::= <AVP header: 1435 10415>
                Max_Requested_Bandwidth_UL_AVP		max_Requested_Bandwidth_UL,
                Max_Requested_Bandwidth_DL_AVP		max_Requested_Bandwidth_DL,
				set of AVP_Type         			aVP_Type						optional
			}

			type record ThreeGPP_Charging_Char_AVP {								//ref: TS 129 601
				AVP_Header							aVP_Header, 					//3GPP-Charging-Characteristics ::= <AVP header: 13 10415>
                octetstring							aVP_Data
			}

            type enumerated All_APN_Conf_Included_Id_Code {
                All_APN_CONFIGURATIONS_INCLUDED_E			 	(0),
                MODIFIED_ADDED_APN_CONFIGURATIONS_INCLUDED_E	(1)
			}

			type record All_APN_Conf_Included_Id_AVP {								//ref: 7.3.33
				AVP_Header							aVP_Header, 					//All-APN-Configurations-Included-Indicator ::= <AVP header: 1428 10415>
                All_APN_Conf_Included_Id_Code		all_APN_Conf_Included_Indicator
			}

			type record APN_Configuration_Profile_AVP {								//ref: 7.3.34
                AVP_Header							aVP_Header, 					//APN-Configuration-Profile ::= <AVP header: 1429 10415>
                Context_Identifier_AVP				context_Identifier,
                All_APN_Conf_Included_Id_AVP		all_APN_Conf_Included_Id,
/*
1*{APN-Configuration}
*/
				set of AVP_Type         			aVP_Type						optional
			}

			type record Subscription_Data_AVP {										//ref: 7.3.2
				AVP_Header							aVP_Header,						//Subscription-Data ::= <AVP header: 1400 10415>
                Subscriber_Status_AVP				subscriber_Status				optional,
@@ -391,25 +550,16 @@ group HeaderAndBodyTypes {
                Network_Access_Mode_AVP				network_Access_Mode				optional,
                Operator_Determined_Barring_AVP		operator_Determined_Barring		optional,
                HPLMN_ODB_AVP						hPLMN_ODB						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code1						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code2						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code3						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code4						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code5						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code6						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code7						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code8						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code9						optional,
                Regional_Subscription_Zone_Code_AVP	zone_Code10						optional,
                set length (10) of Regional_Subscription_Zone_Code_AVP	zone_Code	optional,
                Access_Restriction_Data_AVP			access_Restriction_Data			optional,
                APN_OI_Replacement_AVP				aPN_OI_Replacement				optional,
                LCS_Info_AVP						lCS_Info						optional,
                Teleservice_List_AVP				teleservice_List				optional,
                set of Call_Barring_Info_AVP		call_Barring_Info				optional,
                ThreeGPP_Charging_Char_AVP			threeGPP_Charging_Char			optional,
				AMBR_AVP							aMBR							optional,
                APN_Configuration_Profile_AVP		aPN_Configuration_Profile		optional,
/*
[ LCS-Info ]
[ Teleservice-List ]
*[ Call-Barring-Info ]
[ 3GPP-Charging-Characteristics ] 
[ AMBR ]
[ APN-Configuration-Profile ]
[ RAT-Frequency-Selection-Priority-ID ]
[ Trace-Data]
[ GPRS-Subscription-Data ]