diff options
| author | Sho Amano <samano@xevo.com> | 2018-03-30 12:48:29 +0900 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-04-04 14:12:55 -0700 |
| commit | 75a3a88a3eac086ab50998a05d45ad7c3e3547b3 (patch) | |
| tree | efdee91d38d41b4ec49bc7890a88d847f5db3338 /src/components/protocol_handler/include | |
| parent | fe6620a918502184e2c20c4afed706bc7122f1bb (diff) | |
| download | sdl_core-75a3a88a3eac086ab50998a05d45ad7c3e3547b3.tar.gz | |
Merge pull request #225 in NAR/sdl-core from feat/network_name_and_notify_hmi to feature/Ford-WiFi
* commit '9e5b8c4523e7b9baa0f9a2f2fadb732853c5c9ef':
combine SetSecondaryTransportID into OnSecondaryTransportStarted
Enable UpdateAppList when secondary transport is connected
trigger UpdateAppList when secondary transport is added or removed
Add secondaryDeviceInfo field in HMIApplication struct
Fix a trace log
Support reading network interface name from .ini file
Improve the stop method of TCP server socket loop
Support specific network interface for TcpClientListener
Conflicts:
src/components/application_manager/src/application_manager_impl.cc
src/components/transport_manager/src/transport_manager_default.cc
Diffstat (limited to 'src/components/protocol_handler/include')
| -rw-r--r-- | src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 beed2bf90b..038f80e61e 100644 --- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h +++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h @@ -458,7 +458,7 @@ class ProtocolHandlerImpl RESULT_CODE SendRegisterSecondaryTransportNAck(ConnectionID connection_id, ConnectionID primary_transport_connection_id, uint8_t session_id, - char *reason = NULL); + BsonObject *reason = NULL); /** * @brief Notifies about receiving message from TM. |