Commit 57cf3bf5 authored by poglitsch's avatar poglitsch
Browse files

corrections

parent 46977eac

LibSip_SIPTypesAndValues.ttcn

+19 −18
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ group HeaderFieldConstants { 
	const CSeq	c_empty_cSeq := {

		fieldName := CSEQ_E, 

		seqNumber:=0, 

		method:="" };

		method:="EMPTY" };

	

	const From	c_empty_From := { 

	  fieldName := FROM_E,
@@ -197,7 +197,7 @@ group HeaderFieldConstants { 
		  addrSpec := {

			scheme  := c_sipScheme,

			userInfo := omit ,

			hostPort := {host:="", portField:=c_defaultSipPort},

			hostPort := {host:="127.0.0.1", portField:=c_defaultSipPort},

			urlParameters := omit,

			headers := omit

		  }
@@ -212,7 +212,7 @@ group HeaderFieldConstants { 
	{

	  scheme  := c_sipScheme,

	  userInfo := omit ,

	  hostPort := {host:="", portField:=c_defaultSipPort},

	  hostPort := {host:="127.0.0.1", portField:=c_defaultSipPort},

	  urlParameters := omit,

	  headers := omit

	};
@@ -238,7 +238,7 @@ group HeaderFieldConstants { 
		  {

			scheme  := c_sipScheme,

			userInfo := omit ,

			hostPort := {host:="", portField:=c_defaultSipPort},

			hostPort := {host:="127.0.0.1", portField:=c_defaultSipPort},

			urlParameters := omit,

			headers := omit

		  }
@@ -255,7 +255,7 @@ group HeaderFieldConstants { 
			protocolVersion := c_sipVersion,

			transport := c_defaultSipProt

		  },

		  sentBy := {host:="", portField:=c_defaultSipPort},

		  sentBy := {host:="127.0.0.1", portField:=c_defaultSipPort},

		  viaParams:= omit

		}

	  }};
@@ -290,7 +290,7 @@ group StatusLines 
		const StatusLine c_statusLine380	:=	{c_sipNameVersion, 380, "Alternative Service"};



		const StatusLine c_statusLine400	:=	{c_sipNameVersion, 400, "Bad Request"};

		const StatusLine c_statusLine401	:=	{c_sipNameVersion, 401, "Unauthorised"};

		const StatusLine c_statusLine401	:=	{c_sipNameVersion, 401, "Unauthorized"};

		const StatusLine c_statusLine402	:=	{c_sipNameVersion, 402, "Payment Required"};

		const StatusLine c_statusLine403	:=	{c_sipNameVersion, 403, "Forbidden"};

		const StatusLine c_statusLine404	:=	{c_sipNameVersion, 404, "Not Found"};
@@ -749,7 +749,7 @@ group SubTypes{// Subtypes 
      {

        integer		warnCode,	// represented as an integer

        WarnAgent		warnAgent,

        charstring		WarnText

        charstring		warnText

      }

      

      // [20.43]
@@ -1719,6 +1719,7 @@ group SubTypes{// Subtypes 
		Payload 		payload optional

	  } with { encode "SIPCodec"}



	  

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

    

    group ResponseTypes

LibSip_Templates.ttcn

+8 −8
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ module LibSip_Templates 
		template SipUrl mw_SipUrl_Host(charstring p_host) :=  	//*  SIP-URL with a calling party number

		{

				scheme := c_sipScheme,  		//*  contains "sip"

				userInfo:= {userOrTelephoneSubscriber:=?, password:=*},

				userInfo:= *,

				hostPort := {host:=p_host, portField:=*},

				urlParameters := *,

				headers := *
@@ -549,7 +549,7 @@ module LibSip_Templates 


		template PAssertedIDValue mw_PAssertedIDValue(template SipUrl p_SipUrl) := 

		{

			addrSpecUnion := p_SipUrl

			nameAddr :={displayName := *, addrSpec:=p_SipUrl}

		};

		

		template PPreferredID m_PPreferredID(template Addr_Union p_pPreferredIDValue) :=
@@ -719,7 +719,7 @@ module LibSip_Templates 


		template From mw_From(template SipUrl p_sipUrl) := {

		  fieldName := FROM_E,

		  addressField := { addrSpecUnion := p_sipUrl},

		  addressField := { nameAddr := {displayName := *, addrSpec := p_sipUrl}},

		  fromParams:= *

		}
@@ -857,7 +857,7 @@ group dummy_templates { 
	template RequestLine m_requestLine_dummy(Method p_method) := 

	{

		method := p_method,

		requestUri := c_empty_RequestUri,

		requestUri := c_unavailableUri,

		sipVersion := c_sipNameVersion

	}
@@ -2813,10 +2813,10 @@ group TemplatePreparationFunctions { 
		    }; //*  end for

		  };

		  if (ispresent(p_mb.media_list[i].bandwidth)) {  //*  "b= "

				for (var integer j := 0; j<lengthof(p_mb.media_list[i].bandwidth); j:=j+1) {  //*  "b= "

			for (var integer j:=0; j<sizeof(p_mb.media_list[i].bandwidth); j:=j+1){	

				v_result := v_result + 2+c_CRlen + lengthof(p_mb.media_list[i].bandwidth[j].modifier)

				+ 1 + lengthof(int2str(p_mb.media_list[i].bandwidth[j].bandwidth));

				};

			}; //*  end for

		  };

		  if (ispresent(p_mb.media_list[i].key)) {   //*  "k= "

			v_result := v_result + 1 + lengthof(p_mb.media_list[i].key.method);