Commit 376789db authored by pintar's avatar pintar
Browse files

New Type system for LibDiameter V2.0.0 and S9 modules adopted to LibDiameter V2.0.0

parent 10240396
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -8,14 +8,23 @@
module LibDiameter_Interface
{
    //LibCommon
    import from LibCommon_Sync all;
    import from LibCommon_AbstractData all;
    import from LibCommon_BasicTypesAndValues all;
    import from LibCommon_DataStrings all;
    import from LibCommon_Sync {type SyncPort; 
                                modulepar PX_TSYNC_TIME_LIMIT;};
    import from LibCommon_AbstractData {type StringStack;
                                        const c_initStringStack};
    import from LibCommon_BasicTypesAndValues {type UInt32;};

    //LibDiameter
    import from LibDiameter_Types_Base_AVPs all;
    import from LibDiameter_Types_Rx_AVPs {type Media_Component_Description_AVP;};
    import from LibDiameter_TypesAndValues all;
    import from LibDiameter_PIXITS all;
    
//    type component BaseSyncComp {
//              port  SyncPort syncPort;
//              timer tc_sync := PX_TSYNC_TIME_LIMIT;
//            }

    type port LowerLayerPPort message {
          inout Lower_Layer_Primitive}; //LLP

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@

module LibDiameter_PIXITS
{
	//  LibCommon
    import from LibCommon_BasicTypesAndValues all;
    import from LibCommon_DataStrings all;

    group Diameter_PIXITparameters{

+6 −3
Original line number Diff line number Diff line
@@ -7,10 +7,13 @@
module LibDiameter_Steps
{
    //LibCommon
    import from LibCommon_Sync all ;
    import from LibCommon_VerdictControl all ;
    import from LibCommon_BasicTypesAndValues all;
    import from LibCommon_Sync {template m_syncClientStop,m_syncServerStop; 
                                function f_selfOrClientSyncAndVerdict;};
    import from LibCommon_VerdictControl {type FncRetCode;
                                          function f_setVerdict;};
    import from LibCommon_BasicTypesAndValues {type UInt32;};
    //LibDiameter
    import from LibDiameter_Types_Base_AVPs all;
    import from LibDiameter_TypesAndValues all;
    import from LibDiameter_Templates all;
    import from LibDiameter_Interface all;
+39 −8
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ module LibDiameter_Templates {
    import from LibCommon_BasicTypesAndValues {type UInt8, UInt32;};

    //LibDiameter
    import from LibDiameter_Types_Base_AVPs all;
    import from LibDiameter_Types_Gx_AVPs {type QoS_Information_AVP;};
    import from LibDiameter_TypesAndValues all;
    import from LibDiameter_PIXITS all;

@@ -158,7 +160,7 @@ module LibDiameter_Templates {

    group HeaderFieldTemplates{
        group DiameterHeaderGroup{
            template Command_Flags m_cmdFlagsAns := {
            template (value) Command_Flags m_cmdFlagsAns := {
                r_bit := '0'B,
                p_bit := '0'B,
                e_bit := '0'B,
@@ -166,7 +168,7 @@ module LibDiameter_Templates {
                reserved_bits := '0000'B
            }

            template Command_Flags m_cmdFlagsAnsProx modifies m_cmdFlagsAns:= {
            template (value) Command_Flags m_cmdFlagsAnsProx modifies m_cmdFlagsAns:= {
                p_bit := '1'B
            }

@@ -202,7 +204,7 @@ module LibDiameter_Templates {
                endid := ?
            }

            template DiameterHeader m_diameterHeaderAns_dummy(Command_Code p_cmdcode, UInt32 p_applid) := {
            template (value) DiameterHeader m_diameterHeaderAns_dummy(Command_Code p_cmdcode, UInt32 p_applid) := {
                version := c_versionId,
                msglen := 0,               //Message lenght with AVPs has to be calculated
                cmdflags := m_cmdFlagsAns, //RPETrrrr
@@ -229,14 +231,14 @@ module LibDiameter_Templates {
                reserved_bits := '00000'B
            }

            template AVP_Flags m_avpFlags_Mbit0 := {
            template (value) AVP_Flags m_avpFlags_Mbit0 := {
                v_bit := '0'B,
                m_bit := '0'B,
                p_bit := '0'B,
                reserved_bits := '00000'B
            }

            template AVP_Flags m_avpFlags_VMbit1 := {
            template (value) AVP_Flags m_avpFlags_VMbit1 := {
                v_bit := '1'B,
                m_bit := '1'B,
                p_bit := '0'B,
@@ -299,7 +301,7 @@ module LibDiameter_Templates {
                aVP_vid := omit
            }

            template AVP_Header m_aVP_Header_Mbit0(AVP_Code p_avpCode, AVP_Length p_dataLen:=0) := {
            template (value) AVP_Header m_aVP_Header_Mbit0(AVP_Code p_avpCode, AVP_Length p_dataLen:=0) := {
                aVP_Code := p_avpCode,
                aVP_flags := m_avpFlags_Mbit0,
                aVP_len := 8 + p_dataLen,
@@ -312,7 +314,7 @@ module LibDiameter_Templates {
             * @param p_avpDataLen additional length caused if AVP data field is present
             * @param p_avpVid vendor id if needed
             */
               template AVP_Header m_aVP_HeaderVid_Mbit0(AVP_Code p_avpCode, AVP_Length p_avpDataLen, template AVP_Vendor_ID p_avpVid) := {
               template (value) AVP_Header m_aVP_HeaderVid_Mbit0(AVP_Code p_avpCode, AVP_Length p_avpDataLen, template AVP_Vendor_ID p_avpVid) := {
                   aVP_Code := p_avpCode,
                   aVP_flags := {v_bit := f_aVPvBit(p_avpVid),
                       m_bit := '0'B,
@@ -802,6 +804,11 @@ module LibDiameter_Templates {
                maximum_Bandwidth := omit,
                logical_Access_ID := omit,
                physical_Access_ID := omit,
                qoS_Rule_Report := omit,
                subsesion_Enforcement_Info := omit,
                threeGPP2_BSID := omit,
                multiple_BBERF_Action := omit,
                user_CSG_Information := omit,
                user_Equipment_Info := omit,
                proxy_Info := omit,
                route_Record := omit,
@@ -1274,6 +1281,11 @@ module LibDiameter_Templates {
                maximum_Bandwidth := *,
                logical_Access_ID := *,
                physical_Access_ID := *,
                qoS_Rule_Report := *,
                subsesion_Enforcement_Info := *,
                threeGPP2_BSID := *,
                multiple_BBERF_Action := *,
                user_CSG_Information := *,
                user_Equipment_Info := *,
                proxy_Info := *,
                route_Record := *,
@@ -1457,6 +1469,10 @@ module LibDiameter_Templates {
                qoS_Information := *,
                revalidation_Time := *,
                usage_Monitoring_Information := *,
                qoS_Rule_Install := *,
                qoS_Rule_Remove := *,
                subsession_Decision_Info := *,
                aN_GW_Address := *,
                proxy_Info := *,
                route_Record := *,
                aVP_Type := *
@@ -1722,6 +1738,10 @@ module LibDiameter_Templates {
                user_CSG_Information := omit,
                error_Message := omit,
                error_Reporting_Host := omit,
                qoS_Rule_Install := omit,
                qoS_Rule_Remove := omit,
                subsession_Decision_Info := omit,
                aN_GW_Address := omit,
                proxy_Info := omit,
                route_Record := omit,
                failed := omit,
@@ -2138,7 +2158,7 @@ module LibDiameter_Templates {
            
            template CCA_Body_AVP mw_CCA_Body_dummy :=
            {
                result_Code := ?,
                result_Code := *,
                origin_Host := ?,
                origin_Realm := ?,
                auth_Application_Id := ?,
@@ -2180,6 +2200,10 @@ module LibDiameter_Templates {
                user_CSG_Information := *,
                error_Message := *,
                error_Reporting_Host := *,
                qoS_Rule_Install := *,
                qoS_Rule_Remove := *,
                subsession_Decision_Info := *,
                aN_GW_Address := *,
                proxy_Info := *,
                route_Record := *,
                failed := *,
@@ -2371,6 +2395,13 @@ module LibDiameter_Templates {
                redirect_Host := *,
                redirect_Host_Usage := *,
                redirect_Max_Cache_Time := *,
                framed_IP_Address := *,
                framed_IPv6_Prefix := *,
                threeGPP2_BSID := *,
                qoS_Information := *,
                qoS_Rule_Report := *,
                subsesion_Enforcement_Info := *,
                user_CSG_Information := *,
                proxy_Info := *,
                aVP_Type := *
            }
+416 −4965

File changed.

Preview size limit exceeded, changes collapsed.

Loading