Resolve merge conflicts (4e814d3f) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1763,7 +1763,7 @@ module LibItsGeoNetworking_Templates {
	}		}

	function f_getDelta15(Int32 p_value, integer p_delta) return template (present) Int15 {		function f_getDelta15(Int32 p_value, integer p_delta) return template (present) Int15 {
	log(">>> f_getDelta15: ", p_value, ", ", p_delta); // FIXME To be removed when issue https://forge.etsi.org/rep/ITS/ITS/issues/13 will be clause		log(">>> f_getDelta15: ", p_value, ", ", p_delta);

	if (p_value == c_int15Min) {		if (p_value == c_int15Min) {
	return (p_value .. p_value+p_delta);		return (p_value .. p_value+p_delta);

ttcn/Http/LibItsHttp_Functions.ttcn

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -66,8 +66,10 @@ module LibItsHttp_Functions {
	v_i := v_i + 1;		v_i := v_i + 1;
	p_headers[v_i] := { c_header_cache_control, { "no-cache" } };		p_headers[v_i] := { c_header_cache_control, { "no-cache" } };
	v_i := v_i + 1;		v_i := v_i + 1;
	p_headers[v_i] := { c_header_authorization, { "Basic YWxhZGRpbjpvcGVuc2VzYW1l" } };		if (PICS_USE_TOKEN_HEADER) {
	//v_i := v_i + 1;		p_headers[v_i] := { c_header_authorization, { PICS_TOKEN_HEADER } }; // aladdin:opensesame
			v_i := v_i + 1;
			}
	//p_headers[v_i] := { c_header_accept, { "application/x-its-response" } };		//p_headers[v_i] := { c_header_accept, { "application/x-its-response" } };
	} // End of function f_init_default_headers_list		} // End of function f_init_default_headers_list

ttcn/Http/LibItsHttp_Pics.ttcn

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,4 +20,15 @@ module LibItsHttp_Pics {
	*/		*/
	modulepar charstring PICS_HEADER_CONTENT_TYPE := "application/x-its-request";		modulepar charstring PICS_HEADER_CONTENT_TYPE := "application/x-its-request";

			/**
			* @desc Set to false in TOKEN header shall not be used
			*/
			modulepar boolean PICS_USE_TOKEN_HEADER := true;

			/**
			* @desc HTTP TOKEN value
			* "YWxhZGRpbjpvcGVuc2VzYW1l==" is the base64 encoding of the login:password "aladdin:opensesame"
			*/
			modulepar charstring PICS_TOKEN_HEADER := "Basic " & "YWxhZGRpbjpvcGVuc2VzYW1l==" ; // aladdin:opensesame

	} // End of module LibItsHttp_Pics		} // End of module LibItsHttp_Pics

ttcn/Http/LibItsHttp_Templates.ttcn

+34 −0

Original line number	Original line	Diff line number	Diff line
	@@ -150,6 +150,24 @@ module LibItsHttp_Templates {
	body := p_body		body := p_body
	} // End of template m_http_response_ok		} // End of template m_http_response_ok

			template (value) Response m_http_response_ok_no_body(
			in template (value) HeaderLines p_header
			) := {
			version_major := 1,
			version_minor := 1,
			statuscode := 200,
			statustext := "OK",
			header := p_header,
			body := omit
			} // End of template m_http_response_ok_no_body

			template (value) Response m_http_response_204_no_content(
			in template (value) HeaderLines p_header
			) modifies m_http_response_ok_no_body := {
			statuscode := 204,
			statustext := "No Content"
			} // End of template m_http_response_204_no_content

	template (present) Response mw_http_response_ok(		template (present) Response mw_http_response_ok(
	template (present) HttpMessageBody p_body := ?,		template (present) HttpMessageBody p_body := ?,
	template (present) HeaderLines p_header := ?		template (present) HeaderLines p_header := ?
	@@ -170,6 +188,14 @@ module LibItsHttp_Templates {
	statustext := "Created"		statustext := "Created"
	} // End of template mw_http_response_ok		} // End of template mw_http_response_ok

			template (present) Response mw_http_response_202_accepted(
			template (present) HttpMessageBody p_body := ?,
			template (present) HeaderLines p_header := ?
			) modifies mw_http_response_ok := {
			statuscode := 202,
			statustext := "Accepted"
			} // End of template mw_http_response_ok

	template (present) Response mw_http_response_204_no_content(		template (present) Response mw_http_response_204_no_content(
	template (present) HttpMessageBody p_body := ?,		template (present) HttpMessageBody p_body := ?,
	template (present) HeaderLines p_header := ?		template (present) HeaderLines p_header := ?
	@@ -225,6 +251,14 @@ module LibItsHttp_Templates {
	statustext := "Bad Request"		statustext := "Bad Request"
	} // End of template mw_http_response_400_bad_request		} // End of template mw_http_response_400_bad_request

			template Response mw_http_response_401_unauthorized(
			template HttpMessageBody p_body := *,
			template (present) HeaderLines p_header := ?
			) modifies mw_http_response_ko := {
			statuscode := 401,
			statustext := "Unauthorized"
			} // End of template mw_http_response_401_unauthorized

	template Response mw_http_response_403_forbidden(		template Response mw_http_response_403_forbidden(
	template HttpMessageBody p_body := *,		template HttpMessageBody p_body := *,
	template (present) HeaderLines p_header := ?		template (present) HeaderLines p_header := ?

ttcn/Pki/LibItsPki_Functions.ttcn

+512 −221

File changed.

Preview size limit exceeded, changes collapsed.