Commit 9b266eb8 authored by nikolajev's avatar nikolajev
Browse files

Latest DIAMETER codec source update

parent 290f5782
Loading
Loading
Loading
Loading
+563 −162

File changed.

Preview size limit exceeded, changes collapsed.

+103 −2
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ T3DEVLIB_BASIC_DEFINITION (LibDiameter_TypesAndValues, UTF8String, Charstring);
		double mValue;
		double mValue;
	};
	};


#define SIP_AOR_Type DiameterURI
#define SIP_AOR_Type DiameterURI//TODO: test if this is working???


//type record length (4) of UInt8  IPv4Addr;
//type record length (4) of UInt8  IPv4Addr;
//RECORDOF_COMMON_DEFINITIONS(LibDiameter_TypesAndValues, IPv4Addr);
//RECORDOF_COMMON_DEFINITIONS(LibDiameter_TypesAndValues, IPv4Addr);
@@ -927,7 +927,7 @@ AVP_ENUM_U32_DEFINITION(LibDiameter_TypesAndValues, ASP_type)
	private:	\
	private:	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_set_of_Specific_Action_AVP() \
#define DEFINITIONS_Setof_Specific_Action_AVP() \
	public :	\
	public :	\
		void SetOffsets(std::vector<unsigned int> &lAVP_Codes, std::vector<unsigned int> &lOffsets);	\
		void SetOffsets(std::vector<unsigned int> &lAVP_Codes, std::vector<unsigned int> &lOffsets);	\
	private:	\
	private:	\
@@ -1263,114 +1263,215 @@ AVP_ENUM_U32_DEFINITION(LibDiameter_TypesAndValues, ASP_type)
//GROUPED as set type
//GROUPED as set type
#define DEFINITIONS_G_S_U_Pool_Reference_AVP()	\
#define DEFINITIONS_G_S_U_Pool_Reference_AVP()	\
	private: \
	private: \
		bool m_bg_S_U_Pool_Identifier;\
		bool m_bcC_Unit_Type;\
		bool m_bunit_Value;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_CC_Money_AVP()	\
#define DEFINITIONS_CC_Money_AVP()	\
	private: \
	private: \
		bool m_bunit_Value;\
		bool m_bcurrency_Code;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Requested_Service_Unit_AVP()	\
#define DEFINITIONS_Requested_Service_Unit_AVP()	\
	private: \
	private: \
		bool m_bcC_Time;\
		bool m_bcC_Money;\
		bool m_bcC_Total_Octets;\
		bool m_bcC_Input_Octets;\
		bool m_bcC_Output_Octets;\
		bool m_bcC_Service_Specific_Units;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Granted_Service_Unit_AVP()	\
#define DEFINITIONS_Granted_Service_Unit_AVP()	\
	private: \
	private: \
		bool m_btariff_Time_Change;\
		bool m_bcC_Time;\
		bool m_bcC_Money;\
		bool m_bcC_Total_Octets;\
		bool m_bcC_Input_Octets;\
		bool m_bcC_Output_Octets;\
		bool m_bcC_Service_Specific_Units;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Used_Service_Unit_AVP()	\
#define DEFINITIONS_Used_Service_Unit_AVP()	\
	private: \
	private: \
		bool m_btariff_Change_Usage;\
		bool m_bcC_Time;\
		bool m_bcC_Money;\
		bool m_bcC_Total_Octets;\
		bool m_bcC_Input_Octets;\
		bool m_bcC_Output_Octets;\
		bool m_bcC_Service_Specific_Units;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Proxy_Info_AVP()	\
#define DEFINITIONS_Proxy_Info_AVP()	\
	private: \
	private: \
		bool m_bproxy_Host;\
		bool m_bproxy_State;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_SIP_User_Data_AVP()	\
#define DEFINITIONS_SIP_User_Data_AVP()	\
	private: \
	private: \
		bool m_bsIP_User_Data_Type;\
		bool m_bsIP_User_Data_Contents;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_SIP_Auth_Data_Item_AVP()	\
#define DEFINITIONS_SIP_Auth_Data_Item_AVP()	\
	private: \
	private: \
		bool m_bsIP_Authentication_Scheme;\
		bool m_bsIP_Item_Number;\
		bool m_bsIP_Authenticate;\
		bool m_bsIP_Authorization;\
		bool m_bsIP_Authentication_Info;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_SIP_Deregistration_Reason_AVP()	\
#define DEFINITIONS_SIP_Deregistration_Reason_AVP()	\
	private: \
	private: \
		bool m_bsIP_Reason_Code_AVP;\
		bool m_bsIP_Reason_Info_AVP;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_User_Identity_AVP()	\
#define DEFINITIONS_User_Identity_AVP()	\
	private: \
	private: \
		bool m_bpublic_Identity_AVP;\
		bool m_bmSISDN_AVP;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Service_Parameter_Info_AVP()	\
#define DEFINITIONS_Service_Parameter_Info_AVP()	\
	private: \
	private: \
		bool m_bservice_Parameter_Type;\
		bool m_bservice_Parameter_Value;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_User_Equipment_Info_AVP()	\
#define DEFINITIONS_User_Equipment_Info_AVP()	\
	private: \
	private: \
		bool m_buser_Equipment_Info_Type;\
		bool m_buser_Equipment_Info_Value;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Cost_Information_AVP()	\
#define DEFINITIONS_Cost_Information_AVP()	\
	private: \
	private: \
		bool m_bunit_Value;\
		bool m_bcurrency_Code;\
		bool m_bcost_Unit;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Multiple_Services_Credit_Control_AVP()	\
#define DEFINITIONS_Multiple_Services_Credit_Control_AVP()	\
	private: \
	private: \
		bool m_bgranted_Service_Unit;\
		bool m_brequested_Service_Unit;\
		bool m_bused_Service_Unit;\
		bool m_btariff_Change_Usage;\
		bool m_bservice_Identifier;\
		bool m_brating_Group;\
		bool m_bg_S_U_Pool_Reference;\
		bool m_bvalidity_Time;\
		bool m_bresult_Codeoptional;\
		bool m_bfinal_Unit_Indication;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_Final_Unit_Indication_AVP()	\
#define DEFINITIONS_Final_Unit_Indication_AVP()	\
	private: \
	private: \
		bool m_bfinal_Unit_Action;\
		bool m_brestriction_Filter_Rule;\
		bool m_bfilter_Id;\
		bool m_bredirect_Server;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_SIP_Accounting_Information_AVP()	\
#define DEFINITIONS_SIP_Accounting_Information_AVP()	\
	private: \
	private: \
		bool m_bsIP_Accounting_Server_URI;\
		bool m_bsIP_Credit_Control_Server_URI;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_SIP_Authenticate_AVP()	\
#define DEFINITIONS_SIP_Authenticate_AVP()	\
	private: \
	private: \
		bool m_bdigest_Realm;\
		bool m_bdigest_Nonce;\
		bool m_bdigest_Domain;\
		bool m_bdigest_Opaque;\
		bool m_bdigest_Stale;\
		bool m_bdigest_Algorithm;\
		bool m_bdigest_QoP;\
		bool m_bdigest_HA1;\
		bool m_bdigest_Auth_Param;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_SIP_Authorization_AVP()	\
#define DEFINITIONS_SIP_Authorization_AVP()	\
	private: \
	private: \
		bool m_bdigest_Username;\
		bool m_bdigest_Realm;\
		bool m_bdigest_Nonce;\
		bool m_bdigest_URI;\
		bool m_bdigest_Response;\
		bool m_bdigest_Algorithm;\
		bool m_bdigest_CNonce;\
		bool m_bdigest_Opaque;\
		bool m_bdigest_QoP;\
		bool m_bdigest_Nonce_Count;\
		bool m_bdigest_Method;\
		bool m_bdigest_Entity_Body_Hash;\
		bool m_bdigest_Auth_Param;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;


#define DEFINITIONS_SIP_Authentication_Info_AVP()	\
#define DEFINITIONS_SIP_Authentication_Info_AVP()	\
	private: \
	private: \
		bool m_bdigest_Nextnonce;\
		bool m_bdigest_QoP;\
		bool m_bdigest_Response_Auth;\
		bool m_bdigest_CNonce;\
		bool m_bdigest_Nonce_Count;\
		bool m_baVP_Type;\
		int m_nStartingPosition;	\
		int m_nStartingPosition;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Codes;	\
		std::vector<unsigned int> m_lAVP_Offsets;
		std::vector<unsigned int> m_lAVP_Offsets;