protocol_handler updates

Authors

Alex Kutsan
Alexander Kutsan
Dmitriy Klimenko
Dmitriy Trunov
Dmitry Chmerev
Newton Kim
Nikolay Khlopkov
Vladislav Smenyuk

Signed-off-by: Justin Dickow <jjdickow@gmail.com>

diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler.h
index bbe3c41..9c5ce51 100644 (file)
--- a/src/components/protocol_handler/include/protocol_handler/protocol_handler.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler.h
@@ -88,6 +88,14 @@ class ProtocolHandler {
      */
     virtual void SendHeartBeat(int32_t connection_id, uint8_t session_id) = 0;
 
+    /**
+      * \brief Sends ending session to mobile application
+      * \param connection_id Identifier of connection within which
+      * session exists
+      * \param session_id ID of session to be ended
+      */
+    virtual void SendEndSession(int32_t connection_id, uint8_t session_id) = 0;
+
   protected:
     /**
      * \brief Destructor

diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
index 292a7f0..0a3e90a 100644 (file)
--- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
@@ -52,7 +52,9 @@
 #include "transport_manager/common.h"
 #include "transport_manager/transport_manager.h"
 #include "transport_manager/transport_manager_listener_empty.h"
+#ifdef TIME_TESTER
 #include "time_metric_observer.h"
+#endif  // TIME_TESTER
 
 /**
  *\namespace NsProtocolHandler
@@ -172,18 +174,29 @@ class ProtocolHandlerImpl
      */
     void SendFramesNumber(int32_t connection_key, int32_t number_of_frames);
 
+#ifdef TIME_TESTER
     /**
      * @brief Setup observer for time metric.
      *
      * @param observer - pointer to observer
      */
     void SetTimeMetricObserver(PHMetricObserver* observer);
+#endif  // TIME_TESTER
+
 
     /*
      * Prepare and send heartbeat message to mobile
      */
     void SendHeartBeat(int32_t connection_id, uint8_t session_id);
 
+    /**
+      * \brief Sends ending session to mobile application
+      * \param connection_id Identifier of connection within which
+      * session exists
+      * \param session_id ID of session to be ended
+      */
+    void SendEndSession(int32_t connection_id, uint8_t session_id);
+
   protected:
 
     /**
@@ -430,7 +443,10 @@ class ProtocolHandlerImpl
      *\brief (JSON Handler)
      */
     ProtocolObservers protocol_observers_;
+#ifdef TIME_TESTER
     PHMetricObserver* metric_observer_;
+#endif  // TIME_TESTER
+
     /**
      *\brief Pointer on instance of class implementing ISessionObserver
      *\brief (Connection Handler)

diff --git a/src/components/protocol_handler/include/protocol_handler/session_observer.h b/src/components/protocol_handler/include/protocol_handler/session_observer.h
index 1b691ca..a6b3e97 100644 (file)
--- a/src/components/protocol_handler/include/protocol_handler/session_observer.h
+++ b/src/components/protocol_handler/include/protocol_handler/session_observer.h
@@ -63,8 +63,7 @@ class SessionObserver {
      */
     virtual int32_t OnSessionStartedCallback(
       const transport_manager::ConnectionUID& connection_handle,
-      const uint8_t& sessionId,
-      const uint8_t& protocol_version,
+      const uint8_t sessionId,
       const ServiceType& service_type) = 0;
 
     /**
@@ -78,7 +77,7 @@ class SessionObserver {
      */
     virtual uint32_t OnSessionEndedCallback(
       const transport_manager::ConnectionUID& connection_handle,
-      const uint8_t& sessionId,
+      const uint8_t sessionId,
       const uint32_t& hashCode,
       const ServiceType& service_type) = 0;
 

diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 1207685..642b0b9 100644 (file)
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -154,8 +154,12 @@ ProtocolHandlerImpl::ProtocolHandlerImpl(
       raw_ford_messages_from_mobile_("MessagesFromMobileAppHandler", this,
                                      threads::ThreadOptions(kStackSize)),
       raw_ford_messages_to_mobile_("MessagesToMobileAppHandler", this,
-                                   threads::ThreadOptions(kStackSize)),
-      metric_observer_(NULL) {
+                                   threads::ThreadOptions(kStackSize))
+#ifdef TIME_TESTER
+      , metric_observer_(NULL)
+#endif  // TIME_TESTER
+
+{
   LOG4CXX_TRACE_ENTER(logger_);
 
   LOG4CXX_TRACE_EXIT(logger_);
@@ -187,11 +191,6 @@ void ProtocolHandlerImpl::RemoveProtocolObserver(ProtocolObserver* observer) {
 }
 
 void ProtocolHandlerImpl::set_session_observer(SessionObserver* observer) {
-  if (!observer) {
-    LOG4CXX_ERROR(logger_, "Invalid (NULL) pointer to ISessionObserver.");
-    return;
-  }
-
   session_observer_ = observer;
 }
 
@@ -202,10 +201,20 @@ void ProtocolHandlerImpl::SendStartSessionAck(ConnectionID connection_id,
                                               uint8_t service_type) {
   LOG4CXX_TRACE_ENTER(logger_);
 
+  uint8_t protocolVersion;
+
+  if (0 == profile::Profile::instance()->heart_beat_timeout()) {
+    protocolVersion = PROTOCOL_VERSION_2;
+    LOG4CXX_INFO(logger_, "Heart beat timeout == 0 => SET PROTOCOL_VERSION_2");
+  } else {
+    protocolVersion = PROTOCOL_VERSION_3;
+    LOG4CXX_INFO(logger_, "Heart beat timeout != 0 => SET PROTOCOL_VERSION_3");
+  }
+
   ProtocolFramePtr ptr(new protocol_handler::ProtocolPacket(connection_id,
-      PROTOCOL_VERSION_3, COMPRESS_OFF, FRAME_TYPE_CONTROL,
-      service_type, FRAME_DATA_START_SERVICE_ACK, session_id,
-      0, hash_code));
+    protocolVersion, COMPRESS_OFF, FRAME_TYPE_CONTROL,
+    service_type, FRAME_DATA_START_SERVICE_ACK, session_id,
+    0, hash_code));
 
   raw_ford_messages_to_mobile_.PostMessage(
       impl::RawFordMessageToMobile(ptr, false));
@@ -284,6 +293,25 @@ void ProtocolHandlerImpl::SendEndSessionAck(ConnectionID connection_id,
   LOG4CXX_TRACE_EXIT(logger_);
 }
 
+void ProtocolHandlerImpl::SendEndSession(int32_t connection_id,
+                                         uint8_t session_id) {
+  LOG4CXX_TRACE_ENTER(logger_);
+
+  ProtocolFramePtr ptr(new protocol_handler::ProtocolPacket(connection_id,
+      PROTOCOL_VERSION_3, COMPRESS_OFF, FRAME_TYPE_CONTROL,
+      SERVICE_TYPE_RPC, FRAME_DATA_END_SERVICE, session_id, 0,
+      session_observer_->KeyFromPair(connection_id, session_id)));
+
+  raw_ford_messages_to_mobile_.PostMessage(
+      impl::RawFordMessageToMobile(ptr, false));
+
+  LOG4CXX_INFO(logger_, "SendEndSession() for connection " << connection_id
+               << " for service_type " << static_cast<int32_t>(SERVICE_TYPE_RPC)
+               << " session_id " << static_cast<int32_t>(session_id));
+
+  LOG4CXX_TRACE_EXIT(logger_);
+}
+
 RESULT_CODE ProtocolHandlerImpl::SendHeartBeatAck(ConnectionID connection_id,
                                                   uint8_t session_id,
                                                   uint32_t message_id) {
@@ -302,7 +330,7 @@ RESULT_CODE ProtocolHandlerImpl::SendHeartBeatAck(ConnectionID connection_id,
 }
 
 void ProtocolHandlerImpl::SendHeartBeat(int32_t connection_id,
-                                               uint8_t session_id) {
+                                        uint8_t session_id) {
   LOG4CXX_TRACE_ENTER(logger_);
 
   ProtocolFramePtr ptr(new protocol_handler::ProtocolPacket(connection_id,
@@ -405,9 +433,12 @@ void ProtocolHandlerImpl::OnTMMessageReceived(const RawMessagePtr tm_message) {
            protocol_frames.begin();
        it != protocol_frames.end(); ++it) {
     impl::RawFordMessageFromMobile msg(*it);
+#ifdef TIME_TESTER
     if (metric_observer_) {
       metric_observer_->StartMessageProcess(msg->message_id());
     }
+#endif  // TIME_TESTER
+
     raw_ford_messages_from_mobile_.PostMessage(msg);
   }
   LOG4CXX_TRACE_EXIT(logger_);
@@ -648,6 +679,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleMessage(ConnectionID connection_id,
       RawMessagePtr raw_message(
           new RawMessage(connection_key, packet->protocol_version(), packet->data(),
                          packet->data_size(), packet->service_type()));
+#ifdef TIME_TESTER
       if (metric_observer_) {
         PHMetricObserver::MessageMetric* metric = new PHMetricObserver::MessageMetric();
         metric->message_id = packet->message_id();
@@ -655,6 +687,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleMessage(ConnectionID connection_id,
         metric->raw_msg = raw_message;
         metric_observer_->EndMessageProcess(metric);
       }
+#endif
       NotifySubscribers(raw_message);
       break;
     }
@@ -738,11 +771,13 @@ RESULT_CODE ProtocolHandlerImpl::HandleMultiFrameMessage(
       RawMessagePtr rawMessage (new RawMessage(
           key, completePacket->protocol_version(), completePacket->data(),
           completePacket->total_data_bytes(), completePacket->service_type()));
+#ifdef TIME_TESTER
       if (metric_observer_) {
         PHMetricObserver::MessageMetric* metric = new PHMetricObserver::MessageMetric();
         metric->raw_msg = rawMessage;
         metric_observer_->EndMessageProcess(metric);
       }
+#endif // TIME_TESTER
       NotifySubscribers(rawMessage);
 
       incomplete_multi_frame_messages_.erase(it);
@@ -836,7 +871,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageStartSession(
                    static_cast<int>(packet.protocol_version()));
 
   int32_t session_id = session_observer_->OnSessionStartedCallback(
-      connection_id, packet.session_id(), packet.protocol_version(),
+      connection_id, packet.session_id(),
       ServiceTypeFromByte(packet.service_type()));
 
   if (-1 != session_id) {
@@ -920,9 +955,12 @@ void ProtocolHandlerImpl::SendFramesNumber(int32_t connection_key,
         impl::RawFordMessageToMobile(ptr, false));
 }
 
+#ifdef TIME_TESTER
 void ProtocolHandlerImpl::SetTimeMetricObserver(PHMetricObserver* observer) {
   metric_observer_ = observer;
 }
+#endif  // TIME_TESTER
+
 
 std::string ConvertPacketDataToString(const uint8_t* data,
                                       const std::size_t data_size) {