User input update with compilation issues of 2nd compiler (a1b7e665) · Commits · TTCN-3 Libraries / LibIms

ttcn/LibIms_Steps.ttcn

+10 −2

Original line number	Diff line number	Diff line
		@@ -569,7 +569,7 @@ module LibIms_Steps
		function f_SendPRACK_sdp(template MessageBody p_mb, CSeq p_rack_cseq) runs on SipComponent
		{
		var integer responseNum := 1;
		var PRACK_Request prackReq;
		var template(value) PRACK_Request prackReq;

		f_setHeadersGeneral(vc_cSeq, "PRACK"); // cseq, contact, branch, via
		if (ispresent(vc_response.msgHeader.rSeq.responseNum)){
		@@ -1184,7 +1184,15 @@ module LibIms_Steps
		);

		//Awaiting 2nd REGISTER with authorization header
		f_awaitingREGISTER(mw_REGISTER_authorizedRequest_IMS(m_Authorization_digest(mw_digestResponse((c_Integrity_protected_yes,c_Integrity_protected_ip_assoc_pending)))));
		f_awaitingREGISTER(
		mw_REGISTER_authorizedRequest_IMS(
		mw_Authorization_digest(
		mw_digestResponse(
		(c_Integrity_protected_yes, c_Integrity_protected_ip_assoc_pending)
		)
		)
		)
		);

		// 200OK to complete the request
		vc_contact := vc_request.msgHeader.contact;

ttcn/LibIms_Templates.ttcn

+23 −22

Original line number	Diff line number	Diff line
		@@ -563,7 +563,7 @@ group XMLTemplates {

		template XmlBody m_XmlBody_ACR_ICB(template Incoming_communication_barring p_icb) := {
		simservs := {
		attr := {},
		attr := omit,//TODO:CR
		absServiceGroup_list := {},
		extensions := {
		elem_list := valueof(p_icb.attr)
		@@ -573,7 +573,7 @@ group XMLTemplates {

		template XmlBody m_XmlBody_ACR_OCB(template Outgoing_communication_barring p_ocb) := {
		simservs := {
		attr := {},
		attr := omit,//TODO:CR
		absServiceGroup_list := {},
		extensions := {
		elem_list := valueof(p_ocb.attr)
		@@ -658,7 +658,7 @@ group ACR_CBTemplates {
		template Incoming_communication_barring m_ICB(template RuleType p_ruleType) :=
		{
		active := omit,
		attr := {},
		attr := omit,//TODO:CR
		ruleset := {
		{p_ruleType}
		}
		@@ -667,7 +667,7 @@ group ACR_CBTemplates {
		template Outgoing_communication_barring m_OCB(template(present) RuleType p_ruleType) :=
		{
		active := omit,
		attr := {},
		attr := omit,//TODO:CR
		ruleset := {
		{p_ruleType}
		}
		@@ -699,7 +699,7 @@ group CUGTemplates {
		template TwoBitType p_cci
		):= {
		active := omit,
		attr := {},
		attr := omit,//TODO:CR
		cugCallOperation := p_crt,
		networkIndicator := p_nit,
		cugInterlockBinaryCode := p_cibc,
		@@ -736,7 +736,7 @@ group CUGTemplates {
		group CWTemplates {

		template Ims_cw m_CW(template TEmptyType p_cwi) := {
		attr := {},
		attr := omit,//TODO:CR
		communication_waiting_indication := p_cwi,
		elem_list := {}
		}
		@@ -754,7 +754,7 @@ group CWTemplates {
		template TwoBitType p_cci
		):= {
		active := omit,
		attr := {},
		attr := omit,//TODO:CR
		cugCallOperation := p_crt,
		networkIndicator := p_nit,
		cugInterlockBinaryCode := p_cibc,
		@@ -1090,9 +1090,9 @@ group CDIVNTemplates {
		template Comm_div_info_type m_CDIVN_sub := {
		entity := "comm-div-info",
		comm_div_subs_info := {
		attr := {},
		attr := omit,//TODO:CR
		comm_div_selection_criteria := {
		attr := {},
		attr := omit,//TODO:CR
		originating_user_selection_criteria := omit,
		diverting_user_selection_criteria := omit,
		diverted_to_user_selection_criteria := omit,
		@@ -1123,7 +1123,7 @@ group ResourceListsTemplates {
		{
		list := {
		name := omit,
		attr := {},
		attr := omit,//TODO:CR
		display_name := omit,
		sequence_list := {
		{
		@@ -1148,7 +1148,7 @@ group ResourceListsTemplates {
		uri :=
		p_user.components.sip.userInfo.userOrTelephoneSubscriber & "@" &
		p_user.components.sip.hostPort.host,
		attr := {},
		attr := omit,//TODO:CR
		display_name := omit,
		elem_list := {}
		}
		@@ -1195,11 +1195,12 @@ group CONFTemplates {
		template XSD.Boolean boolXSD_true := true;
		template XSD.Boolean boolXSD_false := false;

		template XSD.AnyType.attr m_emptyAnyAttributes:={}
		//TODO: STF471 removed this
		//template XSD.AnyType.attr m_emptyAnyAttributes:={}

		template urn_ietf_params_xml_ns_conference_info.Media_type m_mediatype_status(template Media_status_type p_status):= {
		id:="1",
		attr := {},
		attr := omit,//TODO:CR
		display_text :=omit,
		type_ :=omit,
		label_ :=omit,
		@@ -1211,7 +1212,7 @@ group CONFTemplates {
		template Endpoint_type m_endpoint(template charstring p_Uri,template Endpoint_status_type p_epStatus,template Joining_type p_joinMethod, template Disconnection_type p_discMethod, template urn_ietf_params_xml_ns_conference_info.Media_type p_mediastatus):= {
		entity:=p_Uri,
		state:=full,
		attr := {},
		attr := omit,//TODO:CR
		display_text:=omit,
		referred:=omit,
		status:=p_epStatus,
		@@ -1227,7 +1228,7 @@ group CONFTemplates {
		template User_type m_1user (template charstring p_Uri,template Endpoint_type p_endpoint) := {
		entity:=p_Uri,
		state:=full,
		attr := {},
		attr := omit,//TODO:CR
		display_text:=omit,
		associated_aors:=omit,
		roles:=omit,
		@@ -1239,20 +1240,20 @@ group CONFTemplates {

		template Users_type m_users_1user_full(template User_type p_user):={
		state:=full,
		attr := {},
		attr := omit,//TODO:CR
		user_list:={p_user},
		elem_list:={}
		}

		template Users_type m_users_2user_full(template User_type p_user1,template User_type p_user2):={
		state:=full,
		attr := {},
		attr := omit,//TODO:CR
		user_list:={p_user1,p_user2},
		elem_list:={}
		}

		template Conference_state_type m_conference_state(template UnsignedInt p_nUsers, boolean p_active, boolean p_locked) := {
		attr := {},
		attr := omit,//TODO:CR
		user_count:=p_nUsers,
		active:=p_active,
		locked:=p_locked,
		@@ -1263,7 +1264,7 @@ group CONFTemplates {
		entity := p_cUri,
		state := full,
		version := 1,
		attr := {},
		attr := omit,//TODO:CR
		conference_description := omit,
		host_info := omit,
		conference_state := p_cState,
		@@ -1306,7 +1307,7 @@ group CONFTemplates {
		joining_info := *,
		disconnection_method := *,
		disconnection_info := *,
		media_list := *,
		media_list := ?,//TODO:CR
		call_info := *,
		elem_list := ?
		}
		@@ -2056,8 +2057,8 @@ group request_send {
		messageBody := p_mb
		}

		template PRACK_Request m_PRACK_Request_sdp (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,
		From p_from, To p_to, Via p_via, RAck p_RAck, template MessageBody p_mb)
		template(value) PRACK_Request m_PRACK_Request_sdp (SipUrl p_requestUri, CallId p_callId, CSeq p_cSeq,
		From p_from, To p_to, Via p_via, template(value) RAck p_RAck, template(omit) MessageBody p_mb)
		modifies m_PRACK_Request_Base :=
		{
		requestLine :=