diff options
| author | Frank Ronneburg <fronneburg@xevo.com> | 2018-03-28 00:49:07 +0900 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-03-27 16:39:24 -0700 |
| commit | 78825ba8035661d0e1a60da3bddb750cbc7dfa56 (patch) | |
| tree | 368892b162300ab0198c32035a5500f273202929 /src/components/protocol | |
| parent | f2c2844eed982badaf27ddcb8a7fb96d5ad2d60b (diff) | |
| download | sdl_core-78825ba8035661d0e1a60da3bddb750cbc7dfa56.tar.gz | |
Merge pull request #221 in NAR/sdl-core from task/secondary_session_startup to feature/Ford-WiFi
Secondary Transport Protocol and Connection level changes
* commit '25bf959753bad04f3929745f8c9195fd4ded8a19':
send EndService/EndSession properly
handle tcp updates on the fly
handle session ended correctly vis-a-vis multiple transports
manage primary and secondary connections in Start Service code flow
fix: protocol version of Register Secondary Transport ACK/NACK
implement RegisterSecondaryTransport ACK and NAK
delay initial TransportEventUpdate until after StartSessionAck
first protocol steps towards establishing a secondary transport
Conflicts:
src/components/connection_handler/include/connection_handler/connection_handler_impl.h
src/components/connection_handler/src/connection_handler_impl.cc
src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
src/components/protocol_handler/src/protocol_handler_impl.cc
src/components/transport_manager/src/transport_manager_impl.cc
Diffstat (limited to 'src/components/protocol')
| -rw-r--r-- | src/components/protocol/src/bson_object_keys.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/protocol/src/bson_object_keys.cc b/src/components/protocol/src/bson_object_keys.cc index fb225b1461..11160d7082 100644 --- a/src/components/protocol/src/bson_object_keys.cc +++ b/src/components/protocol/src/bson_object_keys.cc @@ -12,6 +12,12 @@ const char* height = "height"; const char* width = "width"; const char* video_protocol = "videoProtocol"; const char* video_codec = "videoCodec"; +const char* secondary_transports = "secondaryTransports"; +const char* audio_service_transports = "audioServiceTransports"; +const char* video_service_transports = "videoServiceTransports"; +const char* tcp_ip_address = "tcpIpAddress"; +const char* tcp_port = "tcpPort"; +const char* reason = "reason"; } // namespace strings |