summaryrefslogtreecommitdiff
path: root/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/connection_handler/include/connection_handler/connection_handler_impl.h')
-rw-r--r--src/components/connection_handler/include/connection_handler/connection_handler_impl.h51
1 files changed, 2 insertions, 49 deletions
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
index c2bac31c1b..7355838b63 100644
--- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
+++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
@@ -530,54 +530,6 @@ class ConnectionHandlerImpl
private:
/**
- * \brief Struct to keep variables between OnSessionStartedCallback() and
- * NotifyServiceStartedResult()
- **/
- struct ServiceStartedContext {
- transport_manager::ConnectionUID connection_handle_;
- uint8_t session_id_;
- uint32_t new_session_id_;
- protocol_handler::ServiceType service_type_;
- uint32_t hash_id_;
- bool is_protected_;
-
- /**
- * \brief Constructor
- */
- ServiceStartedContext()
- : connection_handle_(0)
- , session_id_(0)
- , new_session_id_(0)
- , service_type_(protocol_handler::kInvalidServiceType)
- , hash_id_(0)
- , is_protected_(0) {}
-
- /**
- * \brief Constructor
- * \param connection_handle Connection identifier within which session is
- * started.
- * \param session_id Session ID specified to OnSessionStartedCallback()
- * \param new_session_id Session ID generated
- * \param service_type Type of service
- * \param hash_id Hash ID generated from connection_handle and
- * new_session_id
- * \param is_protected Whether service will be protected
- **/
- ServiceStartedContext(transport_manager::ConnectionUID connection_handle,
- uint8_t session_id,
- uint32_t new_session_id,
- protocol_handler::ServiceType service_type,
- uint32_t hash_id,
- bool is_protected)
- : connection_handle_(connection_handle)
- , session_id_(session_id)
- , new_session_id_(new_session_id)
- , service_type_(service_type)
- , hash_id_(hash_id)
- , is_protected_(is_protected) {}
- };
-
- /**
* \brief Disconnect application.
*
* \param device_handle DeviceHandle of disconnected device.
@@ -635,7 +587,8 @@ class ConnectionHandlerImpl
utils::StlMapDeleter<ConnectionList> connection_list_deleter_;
sync_primitives::Lock start_service_context_map_lock_;
- std::map<uint32_t, ServiceStartedContext> start_service_context_map_;
+ std::map<uint32_t, protocol_handler::StartingSessionContext>
+ start_service_context_map_;
#ifdef BUILD_TESTS
// Methods for test usage