Commit 1d7a7392 authored by pintar's avatar pintar
Browse files

preparation of preamble and postable and related templates 

-setting of vc_origin_Host and vc_origin_realm and all other global variables is solved
within init function when preamble is called
parent 906a7f9a

DiameterRx/ttcn/DiameterRx_Rx_TCFunctions.ttcn

+3 −46
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ module DiameterRx_Rx_TCFunctions { 
				

				f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); //     sync

				    

				 //sessionId used from AAR

                 vc_originHost := m_originHost(PX_OriginHost);

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

                    

                 //TODO: setting of optional AVPs

				f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));
@@ -71,10 +67,6 @@ module DiameterRx_Rx_TCFunctions { 
				

                    f_awaiting_AAR(mw_AAR_basic(?,?,?,?,?));

                   

					// sessionId used from AAR

                     vc_originHost := m_originHost(PX_OriginHost);

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

                   

                     //TODO: setting of optional AVPs

                    f_send_AAA(m_AAA_modified_ResultCode_ANCA(vc_sessionId,

															  vc_originHost,
@@ -108,10 +100,6 @@ module DiameterRx_Rx_TCFunctions { 
				

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); //     sync

                     

					//sessionId used from AAR

                     vc_originHost := m_originHost(PX_OriginHost);

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

                     

                     //TODO: setting of optional AVPs

                    f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));
@@ -199,10 +187,6 @@ module DiameterRx_Rx_TCFunctions { 
				

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); //     sync

                                       

 					//sessionId used from AAR

                     vc_originHost := m_originHost(PX_OriginHost);

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

                                       

                     //TODO: setting of optional AVPs

                    f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));
@@ -241,10 +225,6 @@ module DiameterRx_Rx_TCFunctions { 
				

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); //     sync

                   

					//sessionId used from AAR

                     vc_originHost := m_originHost(PX_OriginHost);

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

                   

                     //TODO: setting of optional AVPs

                    f_send_AAA(m_AAA_basic(vc_sessionId, vc_originHost, vc_originRealm));
@@ -301,20 +281,8 @@ module DiameterRx_Rx_TCFunctions { 
				

                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); //     sync

                     

                      vc_sessionId := m_sessionId(PX_SessionID);

                     

                      vc_originHost := m_originHost(PX_OriginHost);

                      

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

                     

                      vc_destinationHost := m_destinationHost(PX_DestinationHost);

                      

                      vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

                     

                    f_DiameterRx_init();

                      

                    //TODO: setting of optional AVPs  

                      

					f_send_AAR(m_AAR_FIP_Media1(vc_sessionId, vc_originHost,

												vc_originRealm,

                    							vc_destinationRealm,
@@ -378,18 +346,7 @@ module DiameterRx_Rx_TCFunctions { 
				

                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); //     sync

                      

                      vc_sessionId := m_sessionId(PX_SessionID);

                      

                      vc_originHost := m_originHost(PX_OriginHost);

                    

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

                     

                      vc_destinationHost := m_destinationHost(PX_DestinationHost);

                    

                      vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

              

                    //TODO: setting of optional AVPs  

                      

					f_send_AAR(m_AAR_FIP_SA_Media1(vc_sessionId, vc_originHost,

												   vc_originRealm,

												   vc_destinationRealm,

DiameterRx/ttcn/DiameterRx_Templates.ttcn

+9 −9
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ module DiameterRx_Templates { 
            aVP_Data := p_avpData

        }

            

        template Media_Component_Number_AVP mw_mediaComponentNr(template UInt32 p_avpData) := 

        template Media_Component_Number_AVP mw_mediaComponentNr(template (present) UInt32 p_avpData) := 

        {

            aVP_Header := ?,

            aVP_Data := p_avpData
@@ -72,7 +72,7 @@ module DiameterRx_Templates { 
    		aVP_Data := ?

    	}

    	

        template Flow_Usage_AVP mw_flowUsage(template Flow_Usage_Type p_avpData) := 

        template Flow_Usage_AVP mw_flowUsage(template (present) Flow_Usage_Type p_avpData) := 

        {

            aVP_Header := 

            {
@@ -87,7 +87,7 @@ module DiameterRx_Templates { 
            aVP_Data := p_avpData

        }

        

        template Flow_Number_AVP mw_flowNumber(template UInt32 p_avpData) := 

        template Flow_Number_AVP mw_flowNumber(template (present) UInt32 p_avpData) := 

        {

            aVP_Header := 

            {
@@ -175,7 +175,7 @@ module DiameterRx_Templates { 
     	    

     	    

    

            template Access_Network_Charging_Address_AVP m_accessNetworkChargingAddress(template Address p_avpData) := 

            template (value) Access_Network_Charging_Address_AVP m_accessNetworkChargingAddress(template (value) Address p_avpData) := 

            {

                aVP_Header := {

                    aVP_Code := c_vendIdAccess_Network_Charging_Address_AVP,
@@ -210,7 +210,7 @@ module DiameterRx_Templates { 
    			aVP_Data := p_avpData

    		} 

    

    		template Framed_IP_Address_AVP mw_framedIpAddress(template octetstring p_avpData) :=

    		template Framed_IP_Address_AVP mw_framedIpAddress(template (present) octetstring p_avpData) :=

    		{ 

    			aVP_Header := 

    			{
@@ -222,7 +222,7 @@ module DiameterRx_Templates { 
    			aVP_Data := p_avpData

    		}

    		

            template Framed_IPv6_Prefix_AVP mw_framedIp6Address(template octetstring p_avpData) :=

            template Framed_IPv6_Prefix_AVP mw_framedIp6Address(template (present) octetstring p_avpData) :=

            {

                aVP_Header := 

                {
@@ -234,19 +234,19 @@ module DiameterRx_Templates { 
                aVP_Data := p_avpData

            }

            

            template Framed_IP_Address_AVP m_framedIpAddress(template octetstring p_avpData) :=

            template Framed_IP_Address_AVP m_framedIpAddress(template (value) octetstring p_avpData) :=

            { 

                aVP_Header := m_aVP_HeaderVid(c_vendIdFramed_IP_Address_AVP, lengthof(p_avpData), omit),

                aVP_Data := p_avpData

            }

    		

            template Framed_IPv6_Prefix_AVP m_framedIp6Address(template octetstring p_avpData) :=

            template Framed_IPv6_Prefix_AVP m_framedIp6Address(template (value) octetstring p_avpData) :=

            {

                aVP_Header := m_aVP_HeaderVid(c_vendIdFramed_IPv6_Prefix_AVP, lengthof(p_avpData), omit),

                aVP_Data := p_avpData

            }

    

    		template Termination_Cause_AVP m_terminationCause(template Termination_Cause_Type p_terminationCauseData):= 

    		template Termination_Cause_AVP m_terminationCause(template (value) Termination_Cause_Type p_terminationCauseData):= 

    		{

                aVP_Header := m_aVP_HeaderVid(c_vendIdTermination_Cause_AVP, 4, omit),

    			aVP_Data := p_terminationCauseData //DIAMETER_LOGOUT_E