corrections due to validation of STF346 from week 42 (46977eac) · Commits · TTCN-3 Libraries / LibSip

LibSip_Interface.ttcn

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ module LibSip_Interface language "TTCN-3:2005"//MRO
		var RecordRoute vc_recordRoute; // value of RecordRoute header
		var boolean vc_boo_recordRoute := false; // boolean indicates valid recordRoute
		var Route vc_route; // value of Route header
		var Route vc_route_REG; // value of Route header from registration ServiceRoute header for initial Requests
		var boolean vc_boo_route := false; // boolean indicates valid Route

		var Contact vc_contact; // value of Contact header

LibSip_SDPTypes.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -302,7 +302,7 @@ module LibSip_SDPTypes language "TTCN-3:2005"//MRO
		SDP_key key optional,
		SDP_attribute_list attributes optional,
		SDP_media_desc_list media_list optional
		}
		} with { encode "SDPCodec" }
		} // group MessageTypes
		} // group Types

LibSip_SIPTypesAndValues.ttcn

+33 −30

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		module LibSip_SIPTypesAndValues language "TTCN-3:2005"//MRO
		{
		// Lib Common
		import from LibCommon_TextStrings {const c_CRLF};
		// SipAts
		import from LibSip_SDPTypes all;
		import from LibSip_XMLTypes all;
		@@ -88,20 +90,21 @@ group SimpleConstants
		const charstring c_plainText := "text/plain";

		//text content of 1300 bytes for messages with message body
		const charstring c_longMessageContent_1300Bytes :=
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789";
		const charstring c_longMessageContent_1300Bytes :="Hello!";
		//"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		// "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		//"0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"&
		//c_CRLF;


		// Default SIP port number : 5060
		@@ -1605,7 +1608,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		// Note: the introduction of the following specific types is to enable better means for logging
		// on the other side the generic type is useful for functions dealing with multiple SIP message types
		@@ -1615,42 +1618,42 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		type record INVITE_Request {
		RequestLine requestLine,
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		type record OPTIONS_Request {
		RequestLine requestLine,
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		type record BYE_Request {
		RequestLine requestLine,
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		type record CANCEL_Request {
		RequestLine requestLine,
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		type record ACK_Request {
		RequestLine requestLine,
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		// [3262/7.1]
		type record PRACK_Request {
		@@ -1658,7 +1661,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		// [3265/7.1]
		type record NOTIFY_Request {
		@@ -1666,7 +1669,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		// [3265/7.1]
		type record SUBSCRIBE_Request {
		@@ -1674,7 +1677,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		// [3903/11.1]
		type record PUBLISH_Request {
		@@ -1682,7 +1685,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		// [3311/7]
		type record UPDATE_Request {
		@@ -1690,7 +1693,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		//
		type record REFER_Request {
		@@ -1698,7 +1701,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		//
		type record MESSAGE_Request {
		@@ -1706,7 +1709,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		//
		type record INFO_Request {
		@@ -1714,7 +1717,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }

		} //with { encode "SIPCodec" }// end group RequestTypes

		@@ -1736,7 +1739,7 @@ group SubTypes{// Subtypes
		MessageHeader msgHeader,
		MessageBody messageBody optional,
		Payload payload optional
		}
		} with { encode "SIPCodec" }
		} //with { encode "SIPCodec" }// end group ResponseTypes

		// This MSG type is defined for sending synctactic variations, ans syntactically

LibSip_Steps.ttcn

+309 −75

File changed.

Preview size limit exceeded, changes collapsed.

LibSip_Templates.ttcn

+12 −7

Original line number	Diff line number	Diff line
		@@ -299,6 +299,7 @@ module LibSip_Templates

		template StatusLine mw_statusLine1xx := {sipVersion := c_sipNameVersion, statusCode := (100..199), reasonPhrase := ?};
		template StatusLine mw_statusLine4xx := {sipVersion := c_sipNameVersion, statusCode := (400..499), reasonPhrase := ?};
		template StatusLine mw_statusLine5xx := {sipVersion := c_sipNameVersion, statusCode := (500..599), reasonPhrase := ?};
		template StatusLine mw_statusLineFinal := {sipVersion := c_sipNameVersion, statusCode := (200..699), reasonPhrase := ?};

		template NameAddr mw_NameAddr_DispName_User_Host(template charstring p_dn, template charstring p_user, template charstring p_host) :=
		@@ -1510,8 +1511,10 @@ group base_templates{
		cSeq := p_cSeq,
		fromField := p_from,
		toField := p_to,
		supported := {
		fieldName := SUPPORTED_E, optionsTags := {"path"}
		},
		via := p_via

		}
		}

		@@ -3226,7 +3229,7 @@ group TemplatePreparationFunctions {
		*/
		function f_TextPlainLength(MessageBody p_mb) return integer
		{
		var integer v_result:=2; //0d0a
		var integer v_result:=0;

		v_result:=v_result+lengthof(p_mb.textplain);

		@@ -3247,9 +3250,10 @@ group TemplatePreparationFunctions {

		function f_recordroute() runs on SipComponent return template RecordRoute
		{
		template RecordRoute v_recordRoute := omit;
		if (vc_boo_recordRoute)
		{return vc_recordRoute}
		else {return(omit)}
		else {return(v_recordRoute)}
		}

		/**
		@@ -3257,11 +3261,12 @@ group TemplatePreparationFunctions {
		* @desc Return component variable of Route header if vc_boo_route is true
		* @return component variable of recordRoute header
		*/
		function f_route() runs on SipComponent return template RecordRoute
		function f_route() runs on SipComponent return template Route
		{
		template Route v_route := omit;
		if (vc_boo_route)
		{return vc_route} //* TODO: Route header need to be in reverse order than RecordRoute, question of return value - RecordRoute
		else {return(omit)}
		else {return(v_route)}
		}

		} //* end group GiveHeaders