Bug fixed on Content-length (ede104d3) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

ccsrc/Protocols/Http/http_codec.cc

+627 −623

Original line number	Diff line number	Diff line
		@@ -142,11 +142,12 @@ int http_codec::encode_request(const LibItsHttp__TypesAndValues::Request& p_requ
		for (int i = 0; i < headers.size_of(); i++) {
		const LibItsHttp__TypesAndValues::HeaderLine& header = headers[i];
		loggers::get_instance().log_msg("http_codec::encode_request: Processing header ", header.header__name());
		p_encoding_buffer.put_cs(header.header__name());
		p_encoding_buffer.put_cs(": ");
		if (std::string(static_cast<const char*>(header.header__name())).compare("Content-length") == 0) { // Skip it, processed later
		loggers::get_instance().log("http_codec::encode_request: Skip it");
		continue;
		} else {
		p_encoding_buffer.put_cs(header.header__name());
		p_encoding_buffer.put_cs(": ");
		const OPTIONAL<LibItsHttp__TypesAndValues::charstring__list>& o = header.header__value();
		if (o.ispresent()) {
		const LibItsHttp__TypesAndValues::charstring__list& v = dynamic_cast<const OPTIONAL<LibItsHttp__TypesAndValues::charstring__list> &>(o);
		@@ -194,16 +195,18 @@ int http_codec::encode_request(const LibItsHttp__TypesAndValues::Request& p_requ
		}

		// Encode Content-length header
		p_encoding_buffer.put_cs("Content-length: ");
		if (_ec.length != 0) {
		p_encoding_buffer.put_cs(int2str(_ec.length + 2/Stand for the last CRLF/));
		loggers::get_instance().log("http_codec::encode_request: Content-length: %s", static_cast<const char>(int2str(_ec.length + 2/Stand for the last CRLF*/)));
		p_encoding_buffer.put_cs(static_cast<const char>(int2str(_ec.length + 2/Stand for the last CRLF*/)));
		_ec.is_content_length_present = 0x01;
		} else {
		p_encoding_buffer.put_cs("0");
		_ec.is_content_length_present = 0x00;
		}
		loggers::get_instance().log("http_codec::encode_request: Content-length: %d - %x", _ec.length, _ec.is_content_length_present);
		p_encoding_buffer.put_cs("\r\n");

		// Add message body
		p_encoding_buffer.put_cs("\r\n");
		if (_ec.is_content_length_present == 0x01) {
		loggers::get_instance().log_msg("http_codec::encode_request: Add body ", os);
		@@ -211,6 +214,7 @@ int http_codec::encode_request(const LibItsHttp__TypesAndValues::Request& p_requ
		p_encoding_buffer.put_cs("\r\n");
		}

		loggers::get_instance().log_to_hexa("<<< http_codec::encode_request: ", p_encoding_buffer);
		return 0;
		}

		@@ -388,16 +392,16 @@ int http_codec::encode_body(const LibItsHttp__MessageBodyTypes::HttpMessageBody&
		std::map<std::string, std::unique_ptr<codec<Record_Type, Record_Type> > >::const_iterator it;
		bool processed = false;
		if (p_content_type.find_first_of("x-its") != std::string::npos) {
		it = _codecs.find("etsi_ieee1609dot2");
		it = _codecs.find("http_its"); // TODO Use params
		if (it != _codecs.cend()) {
		loggers::get_instance().log("http_codec::encode_body: Call 'etsi_ts103097_data_codec'");
		_codecs["etsi_ieee1609dot2"]->encode((Record_Type&)binary_body, p_encoding_buffer);
		loggers::get_instance().log("http_codec::encode_body: Call 'http_etsi_ieee1609dot2_codec'");
		_codecs["http_its"]->encode((Record_Type&)binary_body, p_encoding_buffer); // TODO Use params
		processed = true;
		}
		} // TODO Add new HTTP message codec here
		if (!processed) {
		loggers::get_instance().warning("http_codec::encode_body: Unsupported HTTP codec, use raw field as default");
		p_encoding_buffer = OCTETSTRING(binary_body.raw().lengthof(), (unsigned char)static_cast<const unsigned char>(binary_body.raw()));
		p_encoding_buffer = OCTETSTRING(0, nullptr);
		}
		}
		} else if (p_message_body.ischosen(LibItsHttp__MessageBodyTypes::HttpMessageBody::ALT_html__body)) {
		@@ -412,23 +416,23 @@ int http_codec::encode_body(const LibItsHttp__MessageBodyTypes::HttpMessageBody&
		std::map<std::string, std::unique_ptr<codec<Record_Type, Record_Type> > >::const_iterator it;
		bool processed = false;
		if (p_content_type.find_first_of("held") != std::string::npos) {
		it = _codecs.find("held");
		it = _codecs.find("held"); // TODO Use params
		if (it != _codecs.cend()) {
		loggers::get_instance().log("http_codec::encode_body: Call 'held_codec'");
		_codecs["held"]->encode((Record_Type&)xml_body, p_encoding_buffer);
		_codecs["held"]->encode((Record_Type&)xml_body, p_encoding_buffer); // TODO Use params
		processed = true;
		}
		} else if (p_content_type.find_first_of("lost") != std::string::npos) {
		it = _codecs.find("lost");
		it = _codecs.find("lost"); // TODO Use params
		if (it != _codecs.cend()) {
		loggers::get_instance().log("http_codec::encode_body: Call 'lost_codec'");
		_codecs["lost"]->encode((Record_Type&)xml_body, p_encoding_buffer);
		_codecs["lost"]->encode((Record_Type&)xml_body, p_encoding_buffer); // TODO Use params
		processed = true;
		}
		} // TODO Add new HTTP message codec here
		if (!processed) {
		loggers::get_instance().warning("http_codec::encode_body: Unsupported HTTP codec, use raw field as default");
		p_encoding_buffer = OCTETSTRING(xml_body.raw().lengthof(), (unsigned char)static_cast<const char>(xml_body.raw()));
		p_encoding_buffer = OCTETSTRING(0, nullptr);
		}
		}
		} else {
		@@ -539,8 +543,8 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod
		}
		} else if (p["decode_str"].find("<html>") != std::string::npos) { // Try to identify HTML
		loggers::get_instance().log("http_codec::decode_body: Find html message");
		LibItsHttp__MessageBodyTypes::TextBody txt_body;
		loggers::get_instance().error("http_codec::decode_body: Not supported");
		LibItsHttp__MessageBodyTypes::HtmlBody html_body;
		message_body.html__body() = CHARSTRING(body.lengthof(), (char)static_cast<const unsigned char>(body));
		} else {
		loggers::get_instance().log("http_codec::decode_body: Use textBdy as default");
		LibItsHttp__MessageBodyTypes::TextBody text_body;

validation/TC_LIS_HTTP_GET_BV_01.log

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.

View file

validation/TC_LIS_HTTP_GET_BV_01.pcapng

100755 → 100644

(3.8 KiB)

File mode changed from 100755 to 100644.

View file