Cleaned up TODO-s (93626a09) · Commits · TTCN-3 Libraries / LibSip

branches/v3/ttcn/LibSip_Interface.ttcn

+1 −7

Original line number	Diff line number	Diff line
		@@ -111,7 +111,6 @@ module LibSip_Interface {
		// SIP message header fields (for building next message)
		var template(omit) CallId vc_callId := c_empty_CallId;
		var template(omit) CallId vc_callIdReg := c_empty_CallId;
		// TODO: STF471 added
		var template(omit) CallId vc_callIdSub := c_empty_CallId;
		var From vc_from := c_empty_From;
		var To vc_to := c_empty_To;
		@@ -199,14 +198,9 @@ module LibSip_Interface {
		var boolean vc_DeregDone := false; // true after first DeREGISTRATION trail (avoid loop)
		var boolean vc_interface_isc := false; // true if isc interface is in use
		var boolean vc_white_space := false; // MRO
		// TODO: TT change
		var boolean vc_subscribed := false;
		// ETS address
		var address vc_ets_label; /*STF471 removed assignment, should be performed in specific ATS
		:= {
		host := PX_SIP_TS1_IPADDR,
		portField := PX_SIP_TS1_PORT
		};*/
		var address vc_ets_label; //This value should be initialized in specific ATS

		// // used for communication with the operator
		// port OperatorPort_SIP opPort;

branches/v3/ttcn/LibSip_PIXITS.ttcn

+0 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,6 @@ module LibSip_PIXITS {

		} // group SIP_Timers

		// TODO STF471 addition
		group MimePart {
		/**
		* @desc charstring for delimiter value used in mime multipart message to separate message body parts

branches/v3/ttcn/LibSip_SIPTypesAndValues.ttcn

+0 −3

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ module LibSip_SIPTypesAndValues {
		const charstring c_xmlresourcelistApplication := "application/resource-lists+xml";

		// MIME name application
		// TODO TT change: added boundary delimiter
		const charstring c_mimeMultipart := "multipart/mixed;boundary=""" & PX_SIP_MIME_BOUNDARY & """";

		// IMS 3GPP name application
		@@ -1355,7 +1354,6 @@ module LibSip_SIPTypesAndValues {
		// [3455/5.6 ]
		type record PChargingVector {
		FieldName fieldName (P_CHARGING_VECTOR_E) ,
		// TODO STF471 change: icidValue is mandatory
		charstring icidValue,
		SemicolonParam_List chargeParams optional
		}
		@@ -1450,7 +1448,6 @@ module LibSip_SIPTypesAndValues {

		type record of HistoryInfoEntry HistoryInfo_List;

		// TODO STF471 change
		type record of integer IntegerList;

		type record HistoryInfoEntry {

branches/v3/ttcn/LibSip_Steps.ttcn

+116 −198

File changed.

Preview size limit exceeded, changes collapsed.

branches/v3/ttcn/LibSip_Templates.ttcn

+13 −45

Original line number	Diff line number	Diff line
		@@ -302,7 +302,6 @@ module LibSip_Templates {
		}
		}

		// TODO: this temlate is possibly incorrectly defined, or "p_urlParameters" parameter name is incorrect, since it is assigned to "headers"
		template(value) SipUrl m_SipUrl_NumberHostHeader(
		template(value) charstring p_number,
		template(value) charstring p_host,
		@@ -383,25 +382,17 @@ module LibSip_Templates {
		components := {
		sip := {
		userInfo := {
		userOrTelephoneSubscriber := "unavailable",
		password :=
		omit // TODO STF471: shall be omit or . If , remove them die to modifies mw_BasicSipUrl
		userOrTelephoneSubscriber := "unavailable"
		},
		hostPort := {
		host := "anonymous.invalid",
		portField := c_defaultSipPort
		}
		}
		},
		urlParameters := omit, // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		headers :=
		omit // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		}
		}
		template(present) SipUrl mw_TelSip_unavailableInvalidUri2 modifies mw_TelUrl := {
		components := {tel := {subscriber := "unavailable"}},
		urlParameters := omit, // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		headers :=
		omit // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		components := {tel := {subscriber := "unavailable"}}
		}

		template(present) SipUrl mw_TelSip_unavailableUri(
		@@ -409,10 +400,7 @@ module LibSip_Templates {
		) := (mw_TelSip_unavailableUri1, mw_TelSip_unavailableUri2(p_host));

		template(present) SipUrl mw_TelSip_unavailableUri1 modifies mw_TelUrl := {
		components := {tel := {subscriber := "unavailable"}},
		urlParameters := omit, // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		headers :=
		omit // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		components := {tel := {subscriber := "unavailable"}}
		}

		template(present) SipUrl mw_TelSip_unavailableUri2(
		@@ -421,19 +409,14 @@ module LibSip_Templates {
		components := {
		sip := {
		userInfo := {
		userOrTelephoneSubscriber := "unavailable",
		password :=
		omit // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		userOrTelephoneSubscriber := "unavailable"
		},
		hostPort := {
		host := p_host,
		portField := c_defaultSipPort
		}
		}
		},
		urlParameters := omit, // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		headers :=
		omit // TODO STF471: shall be . If , remove them die to modifies mw_BasicSipUrl
		}
		}

		template(present) SipUrl mw_SipUrl_Number(
		@@ -496,9 +479,7 @@ module LibSip_Templates {
		components := {
		sip := {
		userInfo := {
		userOrTelephoneSubscriber := pattern "[a,A][n,N][o,O][n,N][y,Y][m,M][o,O][u,U][s,s]", //* charstring
		password :=
		omit // TODO STF471: shall be omit or . If , remove them die to modifies mw_BasicSipUrl
		userOrTelephoneSubscriber := pattern "[a,A][n,N][o,O][n,N][y,Y][m,M][o,O][u,U][s,s]" //* charstring
		},
		hostPort := {
		host :=
		@@ -643,7 +624,6 @@ module LibSip_Templates {
		body := {p_credentials}
		}

		// TODO: CR
		template(value) Authorization m_Authorization_digest(
		template(value) CommaParam_List p_commaParam_List
		) := {
		@@ -665,11 +645,6 @@ module LibSip_Templates {
		fieldName := AUTHORIZATION_E,
		body := {{digestResponse := f_merge_CommaParam_List(p_auth.body[0].digestResponse, p_commaParam_List)}}
		}
		// TODO: STF471 this template contains matching symbol, but name suggests it is send template
		template(present) Authorization m_Authorization_other := {
		fieldName := AUTHORIZATION_E,
		body := {{otherResponse := ?}}
		}

		template(present) Authorization mw_Authorization_other := {
		fieldName := AUTHORIZATION_E,
		@@ -970,7 +945,6 @@ module LibSip_Templates {
		}
		}

		// TODO STF471 addition
		template(value) RecordRoute m_recordRoute_currIpAddr_params(
		template(value) SipUserProfile p_userprofile,
		template(value) SemicolonParam_List p_urlParameters
		@@ -1854,7 +1828,6 @@ module LibSip_Templates {
		}
		}

		// TODO STF471 added
		template(value) ACK_Request m_ACK_Request_withRecordRoute(
		template(value) SipUrl p_requestUri,
		template(omit) CallId p_callId := omit,
		@@ -2034,8 +2007,6 @@ module LibSip_Templates {
		messageBody := omit
		}

		// TODO: parameters "p_RAck" is not used, intentional or
		// bug?
		template(value) PUBLISH_Request m_PUBLISH_Request_Base(
		template(value) SipUrl p_requestUri,
		template(omit) CallId p_callId := omit,
		@@ -2070,7 +2041,7 @@ module LibSip_Templates {
		// method:=
		// "PUBLISH"},
		event := p_event,
		rAck := p_RAck, // TODO: added by STF471
		rAck := p_RAck,
		fromField := p_from,
		toField := p_to,
		via := p_via
		@@ -3601,8 +3572,7 @@ module LibSip_Templates {
		template(value) SDP_attribute m_attribute_PCMA_DPT(//"0 PCMA/8000"
		template(value) SDP_attribute_rtpmap p_attr_value := {"0", {"PCMA", "8000", omit}}
		) := m_attribute_base(p_attr_value);
		// TODO: STF471 template name suggests that this is a send
		// template, while it contains matching mechanisms

		template(present) SDP_attribute mw_attribute_T38 := {
		unknown := {
		name := ?,
		@@ -3771,7 +3741,6 @@ module LibSip_Templates {
		sipfrag := p_sipfrag
		}

		// TODO STF471 check fixed values vs. PIXITs
		template(value) MessageBody m_MBody_MIMESdpXml(
		template(value) SDP_Message p_sdp,
		template(value) XmlBody p_xmlBody
		@@ -4596,7 +4565,7 @@ module LibSip_Templates {
		}
		else {
		return (v_recordRoute);
		} //* TODO: RecordRoute is not OPTIONAL!!! Check IT!
		}
		}

		/**
		@@ -4608,12 +4577,11 @@ module LibSip_Templates {
		return template(omit) Route {
		var template(omit) Route v_route := omit;
		if (vc_boo_route) {
		return v_route;
		} //* TODO: Route header need to be in reverse order than
		//* RecordRoute, question of return value - RecordRoute
		return vc_route;
		}
		else {
		return (v_route);
		} //* TODO: Route is not OPTIONAL!!! Check IT!
		}
		}