diff options
| author | Artem Nosach <ANosach@luxoft.com> | 2015-08-10 10:54:13 +0300 |
|---|---|---|
| committer | Artem Nosach <ANosach@luxoft.com> | 2015-08-10 12:44:03 +0300 |
| commit | e222d33ab66e0b9cb02f6d5e0fd5357792bebf2c (patch) | |
| tree | 22f2bbbdcfdb491b1a080e443edb66cd209f724b /src/components/protocol_handler/src | |
| parent | 7c8acc873e1cc06b15fc155763704bdb26965154 (diff) | |
| download | sdl_core-e222d33ab66e0b9cb02f6d5e0fd5357792bebf2c.tar.gz | |
Post review fixes
Implements: APPLINK-14656
Diffstat (limited to 'src/components/protocol_handler/src')
| -rw-r--r-- | src/components/protocol_handler/src/protocol_handler_impl.cc | 11 | ||||
| -rw-r--r-- | src/components/protocol_handler/src/protocol_packet.cc | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index 2c7bad263d..3289c6b4d8 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -341,7 +341,6 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message, return; } - if (!session_observer_) { LOG4CXX_ERROR( logger_, @@ -361,15 +360,12 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message, #endif // TIME_TESTER const size_t max_frame_size = profile::Profile::instance()->maximum_payload_size(); - size_t frame_size = DEFAULT_FRAME_DATA_SIZE; + size_t frame_size = MAXIMUM_FRAME_DATA_V2_SIZE; switch (message->protocol_version()) { - case PROTOCOL_VERSION_1: - case PROTOCOL_VERSION_2: - break; case PROTOCOL_VERSION_3: case PROTOCOL_VERSION_4: - frame_size = max_frame_size > DEFAULT_FRAME_DATA_SIZE ? - max_frame_size : DEFAULT_FRAME_DATA_SIZE; + frame_size = max_frame_size > MAXIMUM_FRAME_DATA_V2_SIZE ? + max_frame_size : MAXIMUM_FRAME_DATA_V2_SIZE; break; default: break; @@ -389,7 +385,6 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message, } LOG4CXX_DEBUG(logger_, "Optimal packet size is " << frame_size); #endif // ENABLE_SECURITY - DCHECK(DEFAULT_FRAME_DATA_SIZE <= frame_size); if (message->data_size() <= frame_size) { RESULT_CODE result = SendSingleFrameMessage(connection_handle, sessionID, diff --git a/src/components/protocol_handler/src/protocol_packet.cc b/src/components/protocol_handler/src/protocol_packet.cc index e22d10e723..a31678ec6e 100644 --- a/src/components/protocol_handler/src/protocol_packet.cc +++ b/src/components/protocol_handler/src/protocol_packet.cc @@ -135,16 +135,16 @@ RESULT_CODE ProtocolPacket::ProtocolHeaderValidator::validate( const ProtocolHeader& header) const { // expected payload size will be calculated depending // on used protocol version - size_t payload_size = DEFAULT_FRAME_DATA_SIZE; - // Protocol version shall be from 1 to 3 + size_t payload_size = MAXIMUM_FRAME_DATA_V2_SIZE; + // Protocol version shall be from 1 to 4 switch (header.version) { case PROTOCOL_VERSION_1: case PROTOCOL_VERSION_2: break; case PROTOCOL_VERSION_3: case PROTOCOL_VERSION_4: - payload_size = max_payload_size_ > DEFAULT_FRAME_DATA_SIZE ? - max_payload_size_ : DEFAULT_FRAME_DATA_SIZE; + payload_size = max_payload_size_ > MAXIMUM_FRAME_DATA_V2_SIZE ? + max_payload_size_ : MAXIMUM_FRAME_DATA_V2_SIZE; break; default: return RESULT_FAIL; |