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

Changes to avoid some warnings

parent 9ca3fcb9
Loading
Loading
Loading
Loading
+30 −10
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ module LibDiameter_Templates {
                reserved_bits := ?
            }
            
            template DiameterHeader m_diameterHeaderReq_dummy(Command_Code p_cmdcode, integer p_applid) := {
            template DiameterHeader m_diameterHeaderReq_dummy(Command_Code p_cmdcode, UInt32 p_applid) := {
                version := c_versionId,
                msglen := 0,					//Message lenght with AVPs has to be calculated
                cmdflags := m_cmdFlagsReq,		//RPETrrrr 
@@ -192,7 +192,7 @@ module LibDiameter_Templates {
                endid := omit
            }
            
            template DiameterHeader mw_diameterHeaderReq_dummy(Command_Code p_cmdcode, template integer p_applid) := {
            template DiameterHeader mw_diameterHeaderReq_dummy(Command_Code p_cmdcode, template (present) UInt32 p_applid) := {
                version := c_versionId,
                msglen := ?,					//Message lenght with AVPs has to be calculated
                cmdflags := mw_cmdFlags,			//RPETrrrr 
@@ -202,7 +202,7 @@ module LibDiameter_Templates {
                endid := *
            }
            
            template DiameterHeader m_diameterHeaderAns_dummy(Command_Code p_cmdcode, integer p_applid) := {
            template 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 
@@ -212,7 +212,7 @@ module LibDiameter_Templates {
                endid := omit
            }
            
            template DiameterHeader mw_diameterHeaderAns_dummy(Command_Code p_cmdcode, template integer p_applid) := {
            template DiameterHeader mw_diameterHeaderAns_dummy(Command_Code p_cmdcode, template (present) UInt32 p_applid) := {
                version := c_versionId,
                msglen := ?,					//Message lenght with AVPs has to be calculated
                cmdflags := mw_cmdFlags,		//RPETrrrr 
@@ -229,6 +229,20 @@ module LibDiameter_Templates {
                reserved_bits := '00000'B
            }
            
            template AVP_Flags mw_avpFlags_any := {
                v_bit := ?,
                m_bit := ?,
                p_bit := ?,
                reserved_bits := '00000'B
            }

            template AVP_Header mw_aVP_Header_any := {
                aVP_Code :=?,
                aVP_flags := mw_avpFlags_any,
                aVP_len := ?,
                aVP_vid := *
        	}

            template AVP_Header m_aVP_Header(AVP_Code p_avpCode) := {
                aVP_Code := p_avpCode,
                aVP_flags := m_avpFlags,
@@ -249,10 +263,16 @@ module LibDiameter_Templates {
                    m_bit := '1'B,
                    p_bit := '0'B,
                    reserved_bits := '00000'B},
                aVP_len := 8 + p_avpDataLen + f_lengthVid(p_avpVid), // add length of avpData and optional 4 (if Vid is present)
                aVP_len :=f_aVP_len(8, p_avpDataLen, p_avpVid), // add length of avpData and optional 4 (if Vid is present)
                aVP_vid := p_avpVid
            }
            
            function f_aVP_len(AVP_Length p_length8, AVP_Length p_avpDataLen, template AVP_Vendor_ID p_avpVid)return AVP_Length  {
            	var AVP_Length v_sum;
            	v_sum := p_length8 + p_avpDataLen + f_lengthVid(p_avpVid);
            	return v_sum
            } 
            
            function f_lengthVid(template AVP_Vendor_ID p_avpVid) return AVP_Length {
                if(isvalue(p_avpVid)){return 4} else{return 0}
            }
@@ -2086,14 +2106,14 @@ module LibDiameter_Templates {
				product_Name := m_productName("ETSI")
			}

            template DWR_MSG m_DWR_basic(template Origin_Host_AVP p_originHost,
    									 template Origin_Realm_AVP p_originRealm) modifies m_DWR_dummy := {
            template DWR_MSG m_DWR_basic(template (present) Origin_Host_AVP p_originHost,
    									 template (present) Origin_Realm_AVP p_originRealm) modifies m_DWR_dummy := {
            	origin_Host := p_originHost,
            	origin_Realm := p_originRealm
            }
              
            template DPR_MSG m_DPR_basic(template Origin_Host_AVP p_originHost,
    									 template Origin_Realm_AVP p_originRealm) modifies m_DPR_dummy := {
            template DPR_MSG m_DPR_basic(template (present) Origin_Host_AVP p_originHost,
    									 template (present) Origin_Realm_AVP p_originRealm) modifies m_DPR_dummy := {
            	origin_Host := p_originHost,
            	origin_Realm := p_originRealm,
            	disconnect_Cause := m_disconnectCause(REBOOTING_E)