Commit 051ef9a5 authored by rennoch's avatar rennoch
Browse files

update of IPFilterRule_Type

parent 956509ca

DiameterRx/ttcn/DiameterRx_Rx_TCFunctions.ttcn

+12 −12
Original line number Original line Diff line number Diff line
@@ -890,13 +890,13 @@ module DiameterRx_Rx_TCFunctions { 
												   (m_mediaSubComponentUND2SP

												   (m_mediaSubComponentUND2SP

													(0,AF_SIGNALLING_E,

													(0,AF_SIGNALLING_E,

													m_flowDescription("permit","out","ip",

													m_flowDescription("permit","out","ip",

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														"",""),

														""),

													m_flowDescription("permit","out","ip",

													m_flowDescription("permit","out","ip",

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														"",""),

														""),

													m_flowStatus(ENABLED_E),

													m_flowStatus(ENABLED_E),

													m_afSignallingProtocolSIP

													m_afSignallingProtocolSIP

													),

													),
@@ -932,13 +932,13 @@ module DiameterRx_Rx_TCFunctions { 
												   (m_mediaSubComponentUND2SP

												   (m_mediaSubComponentUND2SP

													(0,AF_SIGNALLING_E,

													(0,AF_SIGNALLING_E,

													m_flowDescription("permit","out","ip",

													m_flowDescription("permit","out","ip",

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														"",""),

														""),

													m_flowDescription("permit","out","ip",

													m_flowDescription("permit","out","ip",

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit},

														{ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

														"",""),

														""),

													m_flowStatus(ENABLED_E),

													m_flowStatus(ENABLED_E),

													m_afSignallingProtocolSIP

													m_afSignallingProtocolSIP

													),

													),

DiameterRx/ttcn/DiameterRx_Templates.ttcn

+6 −6
Original line number Original line Diff line number Diff line
@@ -177,13 +177,13 @@ module DiameterRx_Templates { 
        

        

    	   

    	   

	   template Flow_Description_AVP m_flowDescription (UTF8String p_action, UTF8String p_direction, UTF8String p_proto,

	   template Flow_Description_AVP m_flowDescription (UTF8String p_action, UTF8String p_direction, UTF8String p_proto,

	   			IP_AddressMask p_src, IP_AddressMask p_dst, UTF8String p_ports, UTF8String p_options) := {

	   			IP_AddressMask p_src, IP_AddressMask p_dst, /*UTF8String p_ports, */ UTF8String p_options) := {

           aVP_Header := m_aVP_HeaderVid(c_vendIdFlow_Description_AVP,

           aVP_Header := m_aVP_HeaderVid(c_vendIdFlow_Description_AVP,

           						lengthof(p_action)

           						lengthof(p_action)

           						+ lengthof(p_direction)

           						+ lengthof(p_direction)

           						+ lengthof(encvalue(p_src))

           						+ lengthof(encvalue(p_src))

           						+ lengthof(encvalue(p_dst))

           						+ lengthof(encvalue(p_dst))

           						+ lengthof(p_ports)

   //        						+ lengthof(p_ports)

           						+ lengthof(p_options),

           						+ lengthof(p_options),

           						omit),

           						omit),

		   aVP_Data := {

		   aVP_Data := {
@@ -192,7 +192,7 @@ module DiameterRx_Templates { 
			   proto := p_proto,

			   proto := p_proto,

			   src := p_src,

			   src := p_src,

			   dst := p_dst,

			   dst := p_dst,

			   ports := p_ports,

			   //ports := p_ports,

			   options := p_options

			   options := p_options

		   }

		   }

	   }

	   }
@@ -267,9 +267,9 @@ module DiameterRx_Templates { 
    			   action_ := "permit",

    			   action_ := "permit",

    			   direction := "out",

    			   direction := "out",

    			   proto := "ip",

    			   proto := "ip",

    			   src := {ipno := 4, addr := "1.2.3.4", mask := omit},

    			   src := {ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

    			   dst := {ipno := 4, addr := "1.2.3.4", mask := omit},

    			   dst := {ipno := 4, addr := "1.2.3.4", mask := omit, ports := omit},

    			   ports := "",

   // 			   ports := "",

    			   options := omit

    			   options := omit

    		   }

    		   }

    	   }

    	   }