Commit 8d349072 authored by schmitting's avatar schmitting
Browse files

KW12 changes

parent 1c3f7473

ttcn/LibDiameter_Interface.ttcn

+5 −5
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ module LibDiameter_Interface 
      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;

      var template Origin_Realm_AVP vc_originRealm;

      var template (value) Session_Id_AVP vc_sessionId;

      var template (value) Origin_Host_AVP vc_originHost;

      var template (value) Origin_Realm_AVP vc_originRealm;

      var Address vc_hostIPAddress;		//Address of CER for hostIPAddress AVP

      

      var template Destination_Host_AVP vc_destinationHost;

      var template Destination_Realm_AVP vc_destinationRealm;

      var template (value) Destination_Host_AVP vc_destinationHost;

      var template (value) Destination_Realm_AVP vc_destinationRealm;

      

      var template Termination_Cause_AVP vc_terminationCause;

      var template Result_Code_AVP vc_resultCode;

ttcn/LibDiameter_Templates.ttcn

+38 −15
Original line number Diff line number Diff line
@@ -494,10 +494,10 @@ module LibDiameter_Templates { 


        group SpecificAVPHeaders {

            

            template Auth_Application_Id_AVP m_authApplicationId := 

            template Auth_Application_Id_AVP m_authApplicationId(UInt32 p_avpData):= 

            {

                aVP_Header := m_aVP_Header(c_vendIdAuth_Application_Id_AVP, 4),

                aVP_Data := c_applIdRx

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

                aVP_Data := p_avpData

            }  

                  

            template Host_IP_Address_AVP m_hostIPAddress(Address p_avpData) := {
@@ -560,10 +560,10 @@ module LibDiameter_Templates { 
                aVP_Data := p_avpData

            }

            

            template Vendor_Specific_Appl_Id_AVP m_vendor_Specific_Appl_Id := {

            template Vendor_Specific_Appl_Id_AVP m_vendor_Specific_Appl_Id(UInt32 p_authApplicationId) := {

            	aVP_Header := m_aVP_HeaderVid(c_vendIdVendor_Specific_Appl_Id_AVP, 24, omit),

            	vendor_Id := {m_vendorId(c_vendId3gpp)},

            	auth_Application_Id := {m_authApplicationId},

            	auth_Application_Id := {m_authApplicationId(p_authApplicationId)},

            	acct_Application_Id := omit

            }
@@ -2160,10 +2160,7 @@ module LibDiameter_Templates { 
				origin_Realm := p_originRealm,

				host_IP_Address := {m_hostIPAddress(p_address)},

				vendor_Id := m_vendorId(c_vendId3gpp),

				product_Name := m_productName("ETSI"),

                supported_Vendor_Id := {m_supportedVendorId(c_vendId3gpp)},

                vendor_Specific_Application_Id := {m_vendor_Specific_Appl_Id},

                auth_Application_Id := {m_authApplicationId}

				product_Name := m_productName("ETSI")

			}



            template DWR_MSG m_DWR_basic(template (present) Origin_Host_AVP p_originHost,
@@ -2193,10 +2190,7 @@ module LibDiameter_Templates { 
                origin_Realm := p_originRealm,

                host_IP_Address := {m_hostIPAddress(p_address)},

                vendor_Id := m_vendorId(c_vendId3gpp),

                product_Name := m_productName("ETSI"),

                supported_Vendor_Id := {m_supportedVendorId(c_vendId3gpp)},

                vendor_Specific_Application_Id := {m_vendor_Specific_Appl_Id},

                auth_Application_Id := {m_authApplicationId}

                product_Name := m_productName("ETSI")

            }

            

            template DWA_MSG m_DWA_basic(template Origin_Host_AVP p_originHost,
@@ -2214,12 +2208,41 @@ module LibDiameter_Templates { 
      group modified_templates {

          

        group modified_request_templates_send {

            template CER_MSG m_CER_Rx_Gx(template Origin_Host_AVP p_originHost,

            							 template Origin_Realm_AVP p_originRealm,

            							 Address p_address,

            							 UInt32 p_authApplicationId) modifies m_CER_basic := {

				origin_Host := p_originHost,

				origin_Realm := p_originRealm,

				host_IP_Address := {m_hostIPAddress(p_address)},

				vendor_Id := m_vendorId(c_vendId3gpp),

				product_Name := m_productName("ETSI"),

                supported_Vendor_Id := {m_supportedVendorId(c_vendId3gpp)},

                vendor_Specific_Application_Id := {m_vendor_Specific_Appl_Id(p_authApplicationId)},

                auth_Application_Id := {m_authApplicationId(p_authApplicationId)}

			}



        } //end group modified_request_templates_send



		group modified_request_templates_receive {

		} //end group modified_request_templates_receive

		 

        group modified_answer_templates_send {

            template CEA_MSG m_CEA_Rx_Gx(template Origin_Host_AVP p_originHost,

                                         template Origin_Realm_AVP p_originRealm,

                                         Address p_address,

            							 UInt32 p_authApplicationId) modifies m_CEA_basic := {

                result_Code := m_resultCode(m_resultCode_diameterSuccess),                                           

                origin_Host := p_originHost,

                origin_Realm := p_originRealm,

                host_IP_Address := {m_hostIPAddress(p_address)},

                vendor_Id := m_vendorId(c_vendId3gpp),

                product_Name := m_productName("ETSI"),

                supported_Vendor_Id := {m_supportedVendorId(c_vendId3gpp)},

                vendor_Specific_Application_Id := {m_vendor_Specific_Appl_Id(p_authApplicationId)},

                auth_Application_Id := {m_authApplicationId(p_authApplicationId)}

            }

            

        } //end group modified_answer_templates_send

		  

        group modified_answer_templates_receive {

ttcn/LibDiameter_Steps.ttcn

+1 −1

File changed.

Contains only whitespace changes.