Commit 7e0cf6d9 authored by juvancic's avatar juvancic
Browse files

No commit message 

No commit message
parent c2a3980e

ttcn/LibDiameter_Interface.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ module LibDiameter_Interface 
      var DIAMETER_MSG vc_recvDiamMsg ;

      

      //init of values at component started

      var integer vc_send_hopid:= hex2int('00000100'H);

      var integer vc_send_endid:= hex2int('01000000'H);

      var integer vc_recv_hopid:=0;

      var integer vc_recv_endid:=0; 

      var UInt32 vc_send_hopid:= hex2int('00000100'H);

      var UInt32 vc_send_endid:= hex2int('01000000'H);

      var UInt32 vc_recv_hopid:=0;

      var UInt32 vc_recv_endid:=0; 

            

      var template Session_Id_AVP vc_sessionId;

      var template Origin_Host_AVP vc_originHost;

ttcn/LibDiameter_Steps.ttcn

+4 −25
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ module LibDiameter_Steps 
	import from LibDiameter_Templates all;

	import from LibDiameter_Interface all;

	import from LibDiameter_PIXITS all;

    import from AtsCommon_PIXITS all;

    //import from AtsCommon_PIXITS all;



group CommonFunctions{
@@ -267,19 +267,6 @@ group SendMessage { 
    function f_send_AAR(template AAR_MSG p_AAR) runs on DiameterComponent

    {

		//set specific parameter for AAR if needed

        vc_sessionId := m_sessionId(PX_SessionID);

        p_AAR.session_Id := vc_sessionId;

        vc_originHost := m_originHost(PX_OriginHost);

        p_AAR.origin_Host := vc_originHost;

        vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

        p_AAR.origin_Realm := vc_originRealm;

        vc_destinationHost := m_destinationHost(PX_DestinationHost);

        p_AAR.destination_Host := vc_destinationHost;

        vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

        p_AAR.destination_Realm := vc_destinationRealm;

        vc_authApplicationId := m_authApplicationId(PX_AuthApplicationId); 

        p_AAR.auth_Application_Id := vc_authApplicationId;

        //TODO: setting of optional AVPs



        //insert length of message        

        p_AAR.header.msglen := lengthof(encvalue(p_AAR));
@@ -289,14 +276,6 @@ group SendMessage { 
    function f_send_AAA(template AAA_MSG p_AAA) runs on DiameterComponent

    {

        //set specific parameter for AAA if needed

        // sessionId used from AAR

        vc_originHost := m_originHost(PX_OriginHost);

        p_AAA.origin_Host := vc_originHost;

        vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

        p_AAA.origin_Realm := vc_originRealm;

        vc_authApplicationId := m_authApplicationId(PX_AuthApplicationId); 

        p_AAA.auth_Application_Id := vc_authApplicationId;

        //TODO: setting of optional AVPs

                

        //insert length of message        

        p_AAA.header.msglen := lengthof(encvalue(p_AAA));

ttcn/LibDiameter_TypesAndValues.ttcn

+8 −8
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ group BasicTypesAndConstants{ 
    

        const UInt8 c_versionId := 1;

      group ApplicationIdConstants {  

        const integer c_applIdCommonMsg :=  0;			//For DWR, DWA

        const integer c_applId3GPPCxDx := 16777216;		//For 3GPPCxDx messages 16777216 (Vendor specific applications = 16777216 - 4294967294(0x01000000-0xfffffffe))

        const integer c_applId3GPPSh := 16777217;		//For 3GPPSh messages

        const integer c_applIdRx := 16777236;			//For Rx messages

        const integer c_applIdGx := 16777238;			//For Gx messages

        const UInt32 c_applIdCommonMsg :=  0;			//For DWR, DWA

        const UInt32 c_applId3GPPCxDx := 16777216;		//For 3GPPCxDx messages 16777216 (Vendor specific applications = 16777216 - 4294967294(0x01000000-0xfffffffe))

        const UInt32 c_applId3GPPSh := 16777217;		//For 3GPPSh messages

        const UInt32 c_applIdRx := 16777236;			//For Rx messages

        const UInt32 c_applIdGx := 16777238;			//For Gx messages

      } //end group ApplicationIdConstants

      group VendorIdConstants {

        group VendorIdConstantsRFC3855{
@@ -280,9 +280,9 @@ group BasicTypesAndConstants{ 
    			UInt24              msglen,   //message length

    			Command_Flags  		cmdflags, //command flags

    			Command_Code 		cmdcode,  //command code

    			integer 			applid,   //application id

    		    integer	        	hopid optional, //hop_by_hop_id

    			integer 	        endid optional  //end_to_end_id

                UInt32  			applid,   //application id

                UInt32	        	hopid optional, //hop_by_hop_id

                UInt32   	        endid optional  //end_to_end_id

    	    }//end DiameterHeader

    	    

	    }//end group HeaderTypes