STF471: Unifies templates (step1) (64533d2a) · Commits · TTCN-3 Libraries / LibSip

ttcn/LibSip_Templates.ttcn

+46 −53

Original line number	Diff line number	Diff line
		/*
		/**
		* @author STF 346, STF366, STF368, STF369, STF450, STF471
		* @version $Id$
		* @desc This module defines SIP Templates for message, header, and
		@@ -637,57 +637,53 @@ module LibSip_Templates
		fromParams := omit
		};

		template(value) Event m_Event_refer :=
		template(value) Event m_Event_base :=
		{
		fieldName := EVENT_E,
		eventType := "refer",
		eventType := "",
		eventParams := omit
		};

		template(value) Event m_Event_conference :=
		template(value) Event m_Event_refer modifies m_Event_base :=
		{
		fieldName := EVENT_E,
		eventType := "conference",
		eventParams := omit
		eventType := "refer"
		};

		template(value) Event m_Event_presence :=
		template(value) Event m_Event_conference modifies m_Event_base :=
		{
		fieldName := EVENT_E,
		eventType := "presence",
		eventParams := omit
		eventType := "conference"
		};

		template(value) Event m_Event_reg :=
		template(value) Event m_Event_presence modifies m_Event_base :=
		{
		fieldName := EVENT_E,
		eventType := "reg",
		eventParams := omit
		eventType := "presence"
		};

		template(value) Event m_Event_cdiv :=
		template(value) Event m_Event_reg modifies m_Event_base :=
		{
		fieldName := EVENT_E,
		eventType := "comm-div-info",
		eventParams := omit
		eventType := "reg"
		};

		template(value) Event m_Event_mcid :=
		template(value) Event m_Event_cdiv modifies m_Event_base :=
		{
		fieldName := EVENT_E,
		eventType := "comm-div-info",
		eventParams := omit
		eventType := "comm-div-info"
		};

		template(value) Expires m_Expires_600000 :=
		template(value) Event m_Event_mcid := m_Event_cdiv;

		template(value) Expires m_Expires_base :=
		{
		fieldName := EXPIRES_E,
		deltaSec := ""
		};

		template(value) Expires m_Expires_600000 modifies m_Expires_base :=
		{
		deltaSec := "600000"
		};

		template(value) Expires m_Expires (charstring p_deltaSec):=
		template(value) Expires m_Expires (charstring p_deltaSec) modifies m_Expires_base:=
		{
		fieldName := EXPIRES_E,
		deltaSec := p_deltaSec
		};

		@@ -859,28 +855,25 @@ module LibSip_Templates
		}
		}

		template(value) Require m_Require_replaces :=
		template(value) Require m_Require_empty :=
		{
		fieldName := REQUIRE_E,
		optionsTags := {c_replaces}
		optionsTags := {""}
		};


		template(value) Require m_Require_empty :=
		template(value) Require m_Require_replaces modifies m_Require_empty :=
		{
		fieldName := REQUIRE_E,
		optionsTags := {""}
		optionsTags := {c_replaces}
		};

		template(value) Require m_Require_100rel :=

		template(value) Require m_Require_100rel modifies m_Require_empty :=
		{
		fieldName := REQUIRE_E,
		optionsTags := {c_tag100rel}
		};

		template(value) Require m_Require_prec :=
		template(value) Require m_Require_prec modifies m_Require_empty :=
		{
		fieldName := REQUIRE_E,
		optionsTags := {c_tagPrecond}
		}

		@@ -891,32 +884,35 @@ module LibSip_Templates
		substateParams := {{id:="expires",paramValue:="60000"}}
		}

		template(value) Supported m_Supported_fromChange :=
		template(value) Supported m_Supported_empty :=
		{
		fieldName:=SUPPORTED_E,
		optionsTags:={""}
		}

		template(value) Supported m_Supported_fromChange modifies m_Supported_empty :=
		{
		optionsTags:={c_tagFromChange}
		}

		template(value) Supported m_Supported_prec :=
		template(value) Supported m_Supported_prec modifies m_Supported_empty :=
		{
		fieldName:=SUPPORTED_E,
		optionsTags:={c_tagPrecond}
		}

		template(value) Supported m_Supported_100rel :=
		template(value) Supported m_Supported_100rel modifies m_Supported_empty :=
		{
		fieldName:=SUPPORTED_E,
		optionsTags:={c_tag100rel}
		}

		template(value) Supported m_Supported_100rel_prec :=
		template(value) Supported m_Supported_100rel_prec modifies m_Supported_empty :=
		{
		fieldName:=SUPPORTED_E,
		optionsTags:={c_tag100rel, c_tagPrecond}
		}

		template(value) GenericParam m_Text (template charstring p_text):=
		{id:="text", paramValue:=p_text}

		template(present) GenericParam mw_Text (template charstring p_text):=
		{id:="text", paramValue:=p_text}

		@@ -950,15 +946,12 @@ module LibSip_Templates
		toParams := omit
		};

		template(value) To m_To_SipUrl(SipUrl p_sipUrl) :=
		template(value) To m_To_SipUrl(SipUrl p_sipUrl) modifies m_To :=
		{
		fieldName := TO_E,
		addressField :=
		{nameAddr := {
		displayName := omit, //* optional charstring
		addrSpec := p_sipUrl //* SipUrl
		}},//* end addressField
		toParams := omit
		displayName := omit //* optional charstring
		}}//* end addressField
		};

		template(present) To mw_To_NameAddr_SipUrl(template charstring p_dn, template charstring p_user, template charstring p_host) :=
		@@ -3789,7 +3782,7 @@ group TemplatePreparationFunctions {
		{
		template(omit) 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
		{return v_route} //* TODO: Route header need to be in reverse order than RecordRoute, question of return value - RecordRoute
		else {return(v_route)} //* TODO: Route is not OPTIONAL!!! Check IT!
		}