Merge branch 'master' of https://forge.etsi.org/gitlab/emergency-communications/NG111 (a3d95dc4) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

ccsrc/Protocols/Sip/sip_codec_request.cc

+47 −6

Original line number	Diff line number	Diff line
		@@ -138,32 +138,64 @@ int sip_codec_request::encode_request_headers(const LibSip__SIPTypesAndValues::M
		const LibSip__SIPTypesAndValues::From from = p_msg_header.fromField();
		osip_from_t* from_header = nullptr;
		if (encode_from_header(p_msg_header.fromField(), from_header) == -1) {
		loggers::get_instance().warning("sip_codec_request::encode_request_headers: Faile to encode From header");
		return -1;
		}
		char* hvalue;
		::osip_from_to_str(from_header, &hvalue);
		loggers::get_instance().log("sip_codec_request::encode_request_headers: From:%s", hvalue);
		::osip_message_set_from(p_sip_message, hvalue);
		::osip_from_free(from_header);
		// ::osip_from_free(from_header);

		// To
		const LibSip__SIPTypesAndValues::To to = p_msg_header.toField();
		osip_to_t* to_header = nullptr;
		if (encode_to_header(p_msg_header.toField(), to_header) == -1) {
		loggers::get_instance().warning("sip_codec_request::encode_request_headers: Faile to encode To header");
		return -1;
		}
		::osip_to_to_str(to_header, &hvalue);
		loggers::get_instance().log("sip_codec_request::encode_request_headers: To:%s", hvalue);
		::osip_message_set_to(p_sip_message, hvalue);
		::osip_to_free(to_header);
		// ::osip_to_free(to_header);

		// Via
		const LibSip__SIPTypesAndValues::Via via = p_msg_header.via();
		osip_via_t* via_header = nullptr;
		if (encode_via_header(p_msg_header.via(), via_header) == -1) {
		loggers::get_instance().warning("sip_codec_request::encode_request_headers: Faile to encode Via header");
		return -1;
		}
		::osip_via_to_str(via_header, &hvalue);
		loggers::get_instance().log("sip_codec_request::encode_request_headers: Via:%s", hvalue);
		::osip_message_set_via(p_sip_message, hvalue);
		::osip_via_free(via_header);
		// ::osip_via_free(via_header);






		char* buffer = nullptr;
		size_t length = 0;
		int result = ::osip_message_to_str(p_sip_message, &buffer, &length);
		if (result != 0) {
		loggers::get_instance().warning("sip_codec_request::encode_request_headers: Failed to encode data structures");
		} else {
		loggers::get_instance().log("sip_codec_request::encode_request_headers: Message:%s", buffer);
		}













		return 0;
		} // End of method encode_request_headers
		@@ -211,12 +243,12 @@ int sip_codec_request::encode_sip_url(const LibSip__SIPTypesAndValues::SipUrl& p
		}
		} else if (components.ischosen(LibSip__SIPTypesAndValues::UriComponents::ALT_tel)) {
		const LibSip__SIPTypesAndValues::TelUriComponents& t = p_sip_uri.components().tel();
		loggers::get_instance().error("sip_codec_request::encode_request_line: Unsupported LibSip__SIPTypesAndValues::UriComponents::ALT_tel");
		loggers::get_instance().error("sip_codec_request::encode_sip_uri: Unsupported LibSip__SIPTypesAndValues::UriComponents::ALT_tel");
		} else if (components.ischosen(LibSip__SIPTypesAndValues::UriComponents::ALT_urn)) {
		const LibSip__SIPTypesAndValues::UrnUriComponents& u = p_sip_uri.components().urn();
		loggers::get_instance().error("sip_codec_request::encode_request_line: Unsupported LibSip__SIPTypesAndValues::UriComponents::ALT_urn");
		loggers::get_instance().error("sip_codec_request::encode_sip_uri: Unsupported LibSip__SIPTypesAndValues::UriComponents::ALT_urn");
		} else if (components.ischosen(LibSip__SIPTypesAndValues::UriComponents::ALT_other)) {
		loggers::get_instance().error("sip_codec_request::encode_request_line: Unsupported LibSip__SIPTypesAndValues::UriComponents::ALT_other");
		loggers::get_instance().error("sip_codec_request::encode_sip_uri: Unsupported LibSip__SIPTypesAndValues::UriComponents::ALT_other");
		} // else, noting to do

		if (uri != nullptr) {
		@@ -225,6 +257,15 @@ int sip_codec_request::encode_sip_url(const LibSip__SIPTypesAndValues::SipUrl& p
		*p_uri = nullptr;
		}

		char* buffer = nullptr;
		size_t length = 0;
		int result = ::osip_uri_to_str(*p_uri, &buffer);
		if (result != 0) {
		loggers::get_instance().warning("sip_codec_request::encode_sip_uri: Failed to encode data structures");
		} else {
		loggers::get_instance().log("sip_codec_request::encode_sip_uri: URI:%s", buffer);
		}

		return 0;
		} // End of method encode_sip_url

etc/TestCodec/TestCodec.cfg

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,12 +54,12 @@ system.httpPort.params := "HTTP(codecs=held:held_codec;html:html_codec;json:json
		[EXECUTE]
		# In this section you can specify what parts of your test suite you want to execute.
		#TestCodec_Register.tc_register_request_1
		#TestCodec_Register.tc_register_request_2
		TestCodec_Register.tc_register_request_2
		#TestCodec_Register.tc_invite_request_2
		#TestCodec_Register.tc_invite_request_2
		#TestCodec_HttpRequest.tc_http_get_1
		#TestCodec_HttpResponse.tc_http_200_ok_1
		TestCodec_HttpPort.tc_http_map_1
		#TestCodec_HttpPort.tc_http_map_1

		[GROUPS]
		# In this section you can specify groups of hosts. These groups can be used inside the

ttcn/LibEmcom/LibNg112/xsd/urn_ietf_params_xml_ns_lost1.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -360,13 +360,13 @@ type record Mapping
		AppUniqueString source,
		XSD.Token sourceId,
		record of DisplayName displayName_list,
		Service service optional,
		union {
		ServiceBoundary_1 serviceBoundary,
		ServiceBoundaryReference serviceBoundaryReference
		} choice optional,
		record of Uri uri_list,
		ServiceNumber serviceNumber optional,
		Service service optional,
		record of NotLost notLost_list
		}
		with {

ttcn/patch_sip_titan/LibSip_Templates.ttcn

+14 −0

Original line number	Diff line number	Diff line
		@@ -1378,6 +1378,7 @@ module LibSip_Templates {
		geolocation := omit,
		geolocationRouting := omit,
		historyInfo := omit, //* RFC4244
		infoPackage := omit,
		inReplyTo := omit,
		maxForwards := c_maxForwards70,
		mimeVersion := omit,
		@@ -1406,6 +1407,7 @@ module LibSip_Templates {
		rSeq := omit,
		reason := omit,
		recordRoute := omit,
		recvInfo := omit,
		requestDisposition := omit,
		referredBy := omit, //* RFC3892 - REFER method
		referTo := omit, //* RFC3515 - REFER method
		@@ -1435,6 +1437,11 @@ module LibSip_Templates {
		via := c_empty_Via,
		warning := omit,
		wwwAuthenticate := omit,
		resourcePriority := omit,
		answerMode := omit,
		privAnswerMode := omit,
		targetDialog := omit,
		pAnswerState := omit,
		undefinedHeader_List := omit
		}

		@@ -1479,6 +1486,7 @@ module LibSip_Templates {
		geolocation := *,
		geolocationRouting := *,
		historyInfo := , // RFC4244
		infoPackage := *,
		inReplyTo := *,
		maxForwards := *,
		mimeVersion := *,
		@@ -1507,6 +1515,7 @@ module LibSip_Templates {
		rSeq := *,
		reason := *,
		recordRoute := *,
		recvInfo := *,
		requestDisposition := *,
		referredBy := , // RFC3892 - REFER method
		referTo := , // RFC3515 - REFER method
		@@ -1536,6 +1545,11 @@ module LibSip_Templates {
		via := ?,
		warning := *,
		wwwAuthenticate := *,
		resourcePriority := *,
		answerMode := *,
		privAnswerMode := *,
		targetDialog := *,
		pAnswerState := *,
		undefinedHeader_List := *
		}