Commented out RPC version checking to prepare for 2.0 phone software library release

Force head unit to always respond with highest version of protocol supported (per protocol spec)

diff --git a/SDL_Core/src/components/application_manager/src/application_manager_impl.cc b/SDL_Core/src/components/application_manager/src/application_manager_impl.cc
index cd91f8a..9ceb46e 100644 (file)
--- a/SDL_Core/src/components/application_manager/src/application_manager_impl.cc
+++ b/SDL_Core/src/components/application_manager/src/application_manager_impl.cc
@@ -349,7 +349,7 @@ Application* ApplicationManagerImpl::RegisterApplication(
   int min_version =
     message[strings::msg_params][strings::sync_msg_version]
     [strings::minor_version].asInt();
-
+/*
   if (min_version < APIVersion::kAPIV2) {
     LOG4CXX_ERROR(logger_, "UNSUPPORTED_VERSION");
     utils::SharedPtr<smart_objects::SmartObject> response(
@@ -360,13 +360,13 @@ Application* ApplicationManagerImpl::RegisterApplication(
     ManageMobileCommand(response);
     delete application;
     return NULL;
-  }
+  }*/
   version.min_supported_api_version = static_cast<APIVersion>(min_version);
 
   int max_version =
     message[strings::msg_params][strings::sync_msg_version]
     [strings::major_version].asInt();
-
+/*
   if (max_version > APIVersion::kAPIV2) {
     LOG4CXX_ERROR(logger_, "UNSUPPORTED_VERSION");
     utils::SharedPtr<smart_objects::SmartObject> response(
@@ -377,7 +377,7 @@ Application* ApplicationManagerImpl::RegisterApplication(
     ManageMobileCommand(response);
     delete application;
     return NULL;
-  }
+  }*/
   version.max_supported_api_version = static_cast<APIVersion>(max_version);
   application->set_version(version);
 

diff --git a/SDL_Core/src/components/protocol_handler/src/protocol_handler_impl.cc b/SDL_Core/src/components/protocol_handler/src/protocol_handler_impl.cc
index 819f2fe..868369f 100644 (file)
--- a/SDL_Core/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/SDL_Core/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -128,7 +128,7 @@ void ProtocolHandlerImpl::SendStartSessionAck(
   unsigned char service_type) {
   LOG4CXX_TRACE_ENTER(logger_);
 
-  ProtocolPacket packet(protocol_version, COMPRESS_OFF, FRAME_TYPE_CONTROL,
+  ProtocolPacket packet(PROTOCOL_VERSION_2, COMPRESS_OFF, FRAME_TYPE_CONTROL,
                         service_type, FRAME_DATA_START_SESSION_ACK,
                         session_id, 0, hash_code);