diff options
Diffstat (limited to 'src/components/protocol_handler')
| -rw-r--r-- | src/components/protocol_handler/src/protocol_handler_impl.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index 6ab63cbdda..5516af81c1 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -1425,17 +1425,11 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageStartSession( } #ifdef ENABLE_SECURITY + const uint8_t protocol_version = packet->protocol_version(); const bool protection = -<<<<<<< HEAD - // Protocol version 1 is not support protection - (packet->protocol_version() > PROTOCOL_VERSION_1) - ? packet->protection_flag() - : false; -======= // Protocol version 1 does not support protection (protocol_version > PROTOCOL_VERSION_1) ? packet->protection_flag() : false; ->>>>>>> Add handling of wrong force protection settings in ini file #else const bool protection = false; #endif // ENABLE_SECURITY |