summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorokozlovlux <okozlov@luxoft.com>2017-03-23 11:43:40 +0200
committerAlex Kutsan <akutsan@luxoft.com>2017-06-20 14:54:29 +0300
commitc1669c0d89363a1b973cc21d15c4e181ec3d62b1 (patch)
treebc7f47a524e99bb020f46d9920ec8536440a8bc0
parent22a014b3746b28d2b8a3a4049c60bb76db6a0861 (diff)
downloadsdl_core-c1669c0d89363a1b973cc21d15c4e181ec3d62b1.tar.gz
Fix incorrect behaviour of SDL during respose ACK whenr video and audio services starts
- added condition in SendStartSessionAck to avoid sending max supported protocol version when video or audio services start. SDL must send negotiated protocol_version from message from mobile app Related to Issue-1365
-rw-r--r--src/components/protocol_handler/src/protocol_handler_impl.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index aa2910722d..33df7a21c7 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -176,14 +176,17 @@ void set_hash_id(uint32_t hash_id, protocol_handler::ProtocolPacket& packet) {
void ProtocolHandlerImpl::SendStartSessionAck(ConnectionID connection_id,
uint8_t session_id,
- uint8_t,
+ uint8_t protocol_version,
uint32_t hash_id,
uint8_t service_type,
bool protection) {
LOG4CXX_AUTO_TRACE(logger_);
-
uint8_t protocolVersion = SupportedSDLProtocolVersion();
+ if (kRpc != service_type) {
+ protocolVersion = protocol_version;
+ }
+
ProtocolFramePtr ptr(
new protocol_handler::ProtocolPacket(connection_id,
protocolVersion,