MSRP clashing type names renamed for t3devkit basd codec (4d827443) · Commits · INT - Core Network and Interoperability Testing / IMS / IMS_IOT

ttcn/LibMsrp/LibMsrp_Templates.ttcn3

+33 −10

Original line number	Diff line number	Diff line
		@@ -160,13 +160,13 @@ module LibMsrp_Templates {
		/**
		* @desc Generic receive template for SEND start request line
		*/
		template RequestLine mw_RequestLine_SEND_any := {
		template MsrpRequestLine mw_RequestLine_SEND_any := {
		tagMsrp := e_MSRP,
		transactionID := ?,
		method := SEND_E
		} // End of template mw_RequestLine_SEND_any

		template RequestLine mw_RequestLine_REPORT_any := {
		template MsrpRequestLine mw_RequestLine_REPORT_any := {
		tagMsrp := e_MSRP,
		transactionID := ?,
		method := REPORT_E
		@@ -175,14 +175,14 @@ module LibMsrp_Templates {
		/**
		* @desc Generic receive template for RECEIVE start response line
		*/
		template ResponseLine mw_ResponseLine_any := {
		template MsrpResponseLine mw_ResponseLine_any := {
		tagMsrp := e_MSRP,
		transactionID := ?,
		statusCode := ?,
		comment := *
		} // End of template mw_ResponseLine_any

		template ResponseLine mw_ResponseLine_success
		template MsrpResponseLine mw_ResponseLine_success
		modifies mw_ResponseLine_any := {
		statusCode := c_OKCode,
		comment := c_OKComment
		@@ -349,7 +349,7 @@ module LibMsrp_Templates {
		genParams := *
		} // End of template mw_mediaType_any

		template ContentType mw_contentType_any := {
		template MsrpContentType mw_contentType_any := {
		headerName := CONTENT_TYPE_E,
		mediaType := mw_mediaType_any
		} // End of template mw_contentType_any
		@@ -361,7 +361,7 @@ module LibMsrp_Templates {

		} // End of template mw_contentStuff_any

		template ContentType mw_contentType(
		template MsrpContentType mw_contentType(
		in charstring p_mediaType,
		in charstring p_subType
		) modifies mw_contentType_any := {
		@@ -422,8 +422,19 @@ module LibMsrp_Templates {
		m_msrpFromPath_Dummy
		},
		headers := {
		authenticationInfo := omit,
		authorization := omit,
		byteRange := m_msrpByteRange_Dummy,
		expires := omit,
		extHeaders := omit,
		failureReport := omit,
		maxExpires := omit,
		messageID := m_msrpMessageID_Dummy,
		byteRange := m_msrpByteRange_Dummy
		minExpires := omit,
		status := omit,
		successReport := omit,
		usePath := omit,
		wwwAuthenticate := omit
		}
		}, // End of 'headers' field
		contentStuff := m_msrpContentStuff_Dummy,
		@@ -484,7 +495,7 @@ module LibMsrp_Templates {
		template SEND_request mw_msrpSEND_toPath_fromPath_contentType(
		in template ToPath p_toPath,
		in template FromPath p_fromPath,
		in template ContentType p_contentType
		in template MsrpContentType p_contentType
		) modifies mw_msrpSEND_any := {
		headers := mw_Headers_toPath_FromPath(
		p_toPath,
		@@ -533,7 +544,19 @@ module LibMsrp_Templates {
		m_msrpFromPath_Dummy
		},
		headers := {
		messageID := m_msrpMessageID_Dummy
		authenticationInfo := omit,
		authorization := omit,
		byteRange := omit,
		expires := omit,
		extHeaders := omit,
		failureReport := omit,
		maxExpires := omit,
		messageID := m_msrpMessageID_Dummy,
		minExpires := omit,
		status := omit,
		successReport := omit,
		usePath := omit,
		wwwAuthenticate := omit
		}
		}, // End of 'headers' field
		endLine := {

ttcn/LibMsrp/LibMsrp_TypesAndValues.ttcn3

+525 −525

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ module LibMsrp_TypesAndValues {
		e_WILDCARD // "*"
		} // End of type MsrpKeywords

		type enumerated Method {
		type enumerated MsrpMethod {
		//RFC 4975
		SEND_E, // mSEND = %x53.45.4e.44 ; SEND in caps
		REPORT_E, // mREPORT = %x52.45.50.4f.52.54; REPORT in caps
		@@ -70,10 +70,10 @@ module LibMsrp_TypesAndValues {
		* @see RFC 4975 - Clause 7.1. Constructing Requests
		* @see RFC 4975 - Clause 9. Formal Syntax
		*/
		type record RequestLine {
		type record MsrpRequestLine {
		MsrpKeywords tagMsrp (e_MSRP), // MSRP keyword
		TransactionID transactionID, // The transaction identifier created by sender
		Method method // The method name
		MsrpMethod method // The method name
		} // End of type RequestLine

		/**
		@@ -81,7 +81,7 @@ module LibMsrp_TypesAndValues {
		* @see RFC 4975 - Clause 7.1. Constructing Requests
		* @see RFC 4975 - Clause 9. Formal Syntax
		*/
		type record ResponseLine {
		type record MsrpResponseLine {
		MsrpKeywords tagMsrp (e_MSRP), // MSRP keyword
		TransactionID transactionID, // The transaction identifier created by sender
		StatusCode statusCode, // The status code, e.g. 200
		@@ -152,7 +152,7 @@ module LibMsrp_TypesAndValues {
		* @member comment TODO
		* @see RFC 4975 - Clause 9. Formal Syntax
		*/
		type record Status {
		type record MsrpStatus {
		HeaderName headerName (STATUS_E),
		Namespace namespace,
		StatusCode statusCode,
		@@ -162,11 +162,11 @@ module LibMsrp_TypesAndValues {

		group RFC4976HeaderTypes {

		type record Expires {
		type record MsrpExpires {
		HeaderName headerName (STATUS_E)
		}

		type record MinExpires {
		type record MsrpMinExpires {
		HeaderName headerName (MIN_EXPIRES_E)
		}

		@@ -178,15 +178,15 @@ module LibMsrp_TypesAndValues {
		HeaderName headerName (USE_PATH_E)
		}

		type record WWWAuthenticate {
		type record MsrpWWWAuthenticate {
		HeaderName headerName (WWW_AUTHENTICATE_E)
		}

		type record Authorization {
		type record MsrpAuthorization {
		HeaderName headerName (AUTHORIZATION_E)
		}

		type record AuthenticationInfo {
		type record MsrpAuthenticationInfo {
		HeaderName headerName (AUTHENTICATION_INFO_E)
		}
		}
		@@ -217,15 +217,15 @@ module LibMsrp_TypesAndValues {
		SuccessReport successReport optional,
		FailureReport failureReport optional,
		ByteRange byteRange optional,
		Status status optional,
		MsrpStatus status optional,
		//RFC 4976
		Expires expires optional,
		MinExpires minExpires optional,
		MsrpExpires expires optional,
		MsrpMinExpires minExpires optional,
		MaxExpires maxExpires optional,
		UsePath usePath optional,
		WWWAuthenticate wwwAuthenticate optional,
		Authorization authorization optional,
		AuthenticationInfo authenticationInfo optional,
		MsrpWWWAuthenticate wwwAuthenticate optional,
		MsrpAuthorization authorization optional,
		MsrpAuthenticationInfo authenticationInfo optional,
		ExtHeaderList extHeaders optional
		} // End of type Header

		@@ -284,7 +284,7 @@ module LibMsrp_TypesAndValues {
		* @member paramID Identifier of the parameter
		* @member paramValue Value of the parameter
		*/
		type record GenericParam { // URI-parameter = token ["=" token]
		type record MsrpGenericParam { // URI-parameter = token ["=" token]
		Token paramID,
		Token paramValue optional
		} // End of type GenericParam
		@@ -293,7 +293,7 @@ module LibMsrp_TypesAndValues {
		* @desc Description of URI-parameter list, separated by a semicolon
		* @see RFC 4975 - Clause 9. Formal Syntax
		*/
		type set of GenericParam URIParams;
		type set of MsrpGenericParam URIParams;

		/**
		* @desc Authorized MSRP scheme
		@@ -379,7 +379,7 @@ module LibMsrp_TypesAndValues {
		/**
		* @see RFC 2183
		*/
		type charstring ContentDisposition;
		type charstring MsrpContentDisposition;

		/**
		* @see RFC 2045
		@@ -399,7 +399,7 @@ module LibMsrp_TypesAndValues {
		type union OtherMimeHeader {
		ContentID id,
		ContentDescription description,
		ContentDisposition disposition,
		MsrpContentDisposition disposition,
		MimeExtensionField extensionField
		} // End of type OtherMimeHeader

		@@ -444,7 +444,7 @@ module LibMsrp_TypesAndValues {
		* @member contentTypeID
		* @see RFC 4975 - Clause 9. Formal Syntax
		*/
		type record ContentType {
		type record MsrpContentType {
		HeaderName headerName (CONTENT_TYPE_E),
		MediaType mediaType
		} // End of type ContentType
		@@ -462,7 +462,7 @@ module LibMsrp_TypesAndValues {
		*/
		type record ContentStuff {
		MimeHeaders mimeHeaders optional,
		ContentType contentType,
		MsrpContentType contentType,
		Data data

		} // End of type ContentStuff
		@@ -485,7 +485,7 @@ module LibMsrp_TypesAndValues {
		* @see RFC 4975 - Clause 7.1.1. Sending SEND Requests
		*/
		type record SEND_request {
		RequestLine startLine,
		MsrpRequestLine startLine,
		Headers headers,
		ContentStuff contentStuff optional,
		EndLine endLine
		@@ -496,7 +496,7 @@ module LibMsrp_TypesAndValues {
		* @see RFC 4975 - Clause 7.1.2. Sending REPORT Requests
		*/
		type record REPORT_request {
		RequestLine startLine,
		MsrpRequestLine startLine,
		Headers headers,
		ContentStuff contentStuff optional,
		EndLine endLine
		@@ -507,7 +507,7 @@ module LibMsrp_TypesAndValues {
		* @see RFC 4976 - Clause 5.1. Connecting to Relays Acting on Your Behalf
		*/
		type record AUTH_request {
		RequestLine startLine,
		MsrpRequestLine startLine,
		Headers headers,
		ContentStuff contentStuff optional, // TODO not sure is body is allowed or not
		EndLine endLine
		@@ -523,7 +523,7 @@ module LibMsrp_TypesAndValues {
		* @see RFC 4975 - Clause 7.1.2. Sending REPORT Requests
		*/
		type record RECEIVE_response {
		ResponseLine startLine,
		MsrpResponseLine startLine,
		Headers headers,
		EndLine endLine
		} // End of type RECEIVE_response