Commit 67bcd2de authored by garciay's avatar garciay
Browse files

Validate MSRP torture tests

parent 713a18da

codec/c++/sip_codets.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ T3DEVLIB_BASIC_DEFINITION (LibSip_SIPTypesAndValues, EventType, Charstring); 
T3DEVLIB_BASIC_DEFINITION (LibSip_SIPTypesAndValues, SubState, Charstring);

T3DEVLIB_BASIC_DEFINITION (LibSip_SIPTypesAndValues, PMediaAuthValue, Charstring); //HEXDIG "0"-"9", "A"-"F"

T3DEVLIB_BASIC_DEFINITION (LibSip_SIPTypesAndValues, Raw, Charstring);

T3DEVLIB_BASIC_DEFINITION (LibSip_SIPTypesAndValues, Directive, Charstring);

T3DEVLIB_BASIC_DEFINITION (LibSip_SMSTypesAndValues, tsc_Fox, Charstring);



// subtypes of structured type

// we just handle them by defining an alias to the base class

codec/validation/LibSip_SIPTypesAndValues.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 *            change requests shall be made to http://t-ort.etsi.org

 */



module LibSip_SIPTypesAndValues language "TTCN-3:2005"//MRO

module LibSip_SIPTypesAndValues

{

	//	SipAts

	import from LibSip_SDPTypes all;

codec/validation/LibSip_Templates.ttcn

+12 −10
Original line number Diff line number Diff line
@@ -2688,12 +2688,13 @@ group TemplatePreparationFunctions { 
	  var charstring v_auxstring;

	  	

	  v_result := 2+c_CRlen + lengthof(int2str(p_mb.protocol_version)); //*  "v="

	  v_result := v_result + 2+c_CRlen + lengthof(p_mb.origin.user_name & " " & 

								  p_mb.origin.session_id & " " & 

								  p_mb.origin.session_version & " " & 

								  p_mb.origin.net_type & " " & 

								  p_mb.origin.addr_type & " " & 

								  p_mb.origin.addr           

	  v_result := v_result + 2+c_CRlen + lengthof(

								  valueof(p_mb.origin.user_name) & " " & 

								  valueof(p_mb.origin.session_id) & " " & 

								  valueof(p_mb.origin.session_version) & " " & 

								  valueof(p_mb.origin.net_type) & " " & 

								  valueof(p_mb.origin.addr_type) & " " & 

								  valueof(p_mb.origin.addr )          

								  ); //*  "o="

	  v_result := v_result + 2+c_CRlen + lengthof(p_mb.session_name); //*  "s="

	  if (ispresent(p_mb.information))
@@ -2726,14 +2727,15 @@ group TemplatePreparationFunctions { 
	  if (ispresent(p_mb.bandwidth))   

	  { 

		for (var integer i:=0; i<sizeof(p_mb.bandwidth); i:=i+1) { //*  "b= "

		  v_result := v_result + 2+c_CRlen + lengthof(p_mb.bandwidth[i].modifier & " ") + 

		  v_result := v_result + 2+c_CRlen + lengthof(valueof(p_mb.bandwidth[i].modifier) & " ") + 

		  lengthof(int2str(p_mb.bandwidth[i].bandwidth));

		}						

	  };

	

	  for (var integer i:=0; i<sizeof(p_mb.times); i:=i+1) {

		v_result := v_result + 2+c_CRlen + lengthof(p_mb.times[i].time_field.start_time & " "

					 & p_mb.times[i].time_field.stop_time);//*  "t="

		v_result := v_result + 2+c_CRlen + lengthof(

		    valueof(p_mb.times[i].time_field.start_time) & " " & 

		    valueof(p_mb.times[i].time_field.stop_time));//*  "t="

									  

		if (ispresent(p_mb.times[i].time_repeat))

		{

codec/validation/Sanity_Templates.ttcn

+2 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ module Sanity_Templates { 
												m_senderSipUri({m_tag("a-tag")}),

												m_receiverSipUri(omit),

												{m_viaBody(	m_hostPort("etsi.org", c_defaultSipPort), 

															{m_branch(c_brenchCookie)}

															{m_branch(c_branchCookie)}

															)}

												),

			messageBody := omit,
@@ -262,7 +262,7 @@ module Sanity_Templates { 
												m_senderSipUri({m_tag("a-tag")}),

												m_senderSipUri(omit),

												{m_viaBody(	m_hostPort("etsi.org", c_defaultSipPort), 

															{m_branch(c_brenchCookie)}

															{m_branch(c_branchCookie)}

															)}

												),

			messageBody := omit,
@@ -272,4 +272,3 @@ module Sanity_Templates { 
	} // end group requests

      

} // end module Sanity_Templates

codec/validation/Simple_Testcases.ttcn

+290 −290
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ module Simple_Testcases 
		connect (self:testPort, self:testPort);



		// Test Body

		testPort.send ("sip:user;par=u%40example.net@host:42");

		testPort.send ("sip:user;par=u@example.net@host:42");

	

		alt {

			[] testPort.receive (m_simpleUrl ("user;par=u%40example.net", "host", 42)) {

			[] testPort.receive (m_simpleUrl ("user;par=u@example.net", "host", 42)) {

				setverdict (pass);

			}

			[] testPort.receive (SipUrl: ?) {