fix for bug 0005747: TTworkbench 11 compatibility (2ddeb0e2) · Commits · TTCN-3 Libraries / LibIms

ttcn/LibIms_Steps.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -995,9 +995,9 @@ module LibIms_Steps
	*/		*/
	function f_awaitingRegistration_IMS_gm(inout CSeq p_cSeq_s) runs on ImsComponent		function f_awaitingRegistration_IMS_gm(inout CSeq p_cSeq_s) runs on ImsComponent
	{		{
	vc_ignore_subscribe := true;//handle SUBSCRIBE during the call
	var SipUrl v_passociated_url;		var SipUrl v_passociated_url;
	var Authorization p_authorization;		var Authorization p_authorization;
			vc_ignore_subscribe := true;//handle SUBSCRIBE during the call
	//Awaiting 1st REGISTER		//Awaiting 1st REGISTER
	f_awaitingREGISTER(mw_REGISTER_unauthorizedRequest_IMS);		f_awaitingREGISTER(mw_REGISTER_unauthorizedRequest_IMS);

ttcn/LibIms_Templates.ttcn

+66 −52

Original line number	Original line	Diff line number	Diff line
	@@ -144,19 +144,27 @@ group HeaderFieldTemplates{
	}		}
	}		}

	template Path m_path_TS :=		template Path m_path_TS := {
	{
	fieldName := PATH_E,		fieldName := PATH_E,
	pathValues := {		pathValues := {
	{nameAddr := {		{
			nameAddr := {
	displayName := omit, // optional charstring		displayName := omit, // optional charstring
	addrSpec := {		addrSpec := {
	scheme := c_sipScheme,		scheme := c_sipScheme,
	userInfo := {userOrTelephoneSubscriber:="registrar"},		userInfo := {
	hostPort := {PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT},		userOrTelephoneSubscriber := "registrar",
			password := omit
			},
			hostPort := {
			PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT
			},
	urlParameters := omit,		urlParameters := omit,
	headers := omit}},		headers := omit
	rrParam := omit}		}
			},
			rrParam := omit
			}
	}		}
	}		}
	/*		/*
	@@ -484,7 +492,7 @@ group XMLTemplates {

	template XmlBody m_XmlBody_ConfInfo(template Conference_type p_confInfo) :=		template XmlBody m_XmlBody_ConfInfo(template Conference_type p_confInfo) :=
	{		{
	conferenceInfo := p_confInfo		conference_type := p_confInfo
	};		};

	template XmlBody m_XmlBody_CUG(template Cug p_cug) :=		template XmlBody m_XmlBody_CUG(template Cug p_cug) :=
	@@ -507,19 +515,16 @@ group XMLTemplates {
	simservs := p_simservs		simservs := p_simservs
	};		};

	template XmlBody m_XmlBody_ACR_ICB(template Incoming_communication_barring p_icb) :=		template XmlBody
	{		m_XmlBody_ACR_ICB(template (value) Incoming_communication_barring p_icb) := {
	simservs := {		simservs := {
	anyAttributes := omit,		anyAttributes := omit,
	choice := {		choice := {{incoming_communication_barring := p_icb}},
	{		extensions := omit
	incoming_communication_barring := p_icb
	}
	}		}
	}		}
	};

	template XmlBody m_XmlBody_ACR_OCB(template Outgoing_communication_barring p_ocb) :=		template XmlBody m_XmlBody_ACR_OCB(template (value) Outgoing_communication_barring p_ocb) :=
	{		{
	simservs := {		simservs := {
	anyAttributes := omit,		anyAttributes := omit,
	@@ -527,7 +532,8 @@ group XMLTemplates {
	{		{
	outgoing_communication_barring := p_ocb		outgoing_communication_barring := p_ocb
	}		}
	}		},
			extensions := omit
	}		}
	};		};

	@@ -582,6 +588,8 @@ group ACR_CBTemplates {

	template Incoming_communication_barring m_ICB(RuleType p_ruleType) :=		template Incoming_communication_barring m_ICB(RuleType p_ruleType) :=
	{		{
			active := omit,
			anyAttributes := omit,
	ruleset := {		ruleset := {
	rule:= {p_ruleType}		rule:= {p_ruleType}
	}		}
	@@ -589,6 +597,8 @@ group ACR_CBTemplates {

	template Outgoing_communication_barring m_OCB(RuleType p_ruleType) :=		template Outgoing_communication_barring m_OCB(RuleType p_ruleType) :=
	{		{
			active := omit,
			anyAttributes := omit,
	ruleset := {		ruleset := {
	rule:= {p_ruleType}		rule:= {p_ruleType}
	}		}
	@@ -624,11 +634,12 @@ group ACR_CBTemplates {

	group CUGTemplates {		group CUGTemplates {

	template Cug m_CUG (template CugRequestType p_crt,		template Cug m_CUG (
			template CugRequestType p_crt,
	template NetworkIdentityType p_nit,		template NetworkIdentityType p_nit,
	template SixteenbitType p_cibc,		template SixteenbitType p_cibc,
	template TwoBitType p_cci):=		template TwoBitType p_cci
	{		):= {
	active := omit,		active := omit,
	anyAttributes := omit,		anyAttributes := omit,
	cugCallOperation := p_crt,		cugCallOperation := p_crt,
	@@ -637,11 +648,14 @@ group CUGTemplates {
	cugCommunicationIndicator :=p_cci		cugCommunicationIndicator :=p_cci
	}		}

	template Cug mw_CUG (template CugRequestType p_crt,		template Cug mw_CUG (
			template CugRequestType p_crt,
	template NetworkIdentityType p_nit,		template NetworkIdentityType p_nit,
	template SixteenbitType p_cibc,		template SixteenbitType p_cibc,
	template TwoBitType p_cci):=		template TwoBitType p_cci
	{		):= {
			active := omit,
			anyAttributes := omit,
	cugCallOperation := p_crt,		cugCallOperation := p_crt,
	networkIndicator := p_nit,		networkIndicator := p_nit,
	cugInterlockBinaryCode := p_cibc,		cugInterlockBinaryCode := p_cibc,
	@@ -1004,8 +1018,8 @@ group Ims3gppTemplates {
	choice := {		choice := {
	alternative_service := {		alternative_service := {
	anyAttributes := *,		anyAttributes := *,
	type_ := *,		type_ := ?,
	reason := *,		reason := ?,
	elem := *		elem := *
	}		}
	},		},