flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-24 09:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added / prepared for state disconnecting:

Browse Source 
Taking up the idea of MS (disconnecting),
and based on a real world issue where the transition state
of disconnecting was still handled as connected.
This commit is contained in:
Klaus Basan
2014-02-04 14:14:32 +01:00
committed by Mathew Sutcliffe
parent 34c75c7505
commit 79f5b6fcd3
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/cli_client/client.cpp
View File

@@ -363,6 +363,7 @@ void Client::connectionStatusChanged(BlackCore::INetwork::ConnectionStatus oldSt
switch (newStatus) switch (newStatus)
{ {
case BlackCore::INetwork::Disconnected: std::cout << "CONN_STATUS_DISCONNECTED"; break; case BlackCore::INetwork::Disconnected: std::cout << "CONN_STATUS_DISCONNECTED"; break;
case BlackCore::INetwork::Disconnecting: std::cout << "CONN_STATUS_DISCONNECTING"; break;
case BlackCore::INetwork::DisconnectedError: std::cout << "CONN_STATUS_DISCONNECTED_ERROR"; break; case BlackCore::INetwork::DisconnectedError: std::cout << "CONN_STATUS_DISCONNECTED_ERROR"; break;
case BlackCore::INetwork::Connecting: std::cout << "CONN_STATUS_CONNECTING"; break; case BlackCore::INetwork::Connecting: std::cout << "CONN_STATUS_CONNECTING"; break;
case BlackCore::INetwork::Connected: std::cout << "CONN_STATUS_CONNECTED"; break; case BlackCore::INetwork::Connected: std::cout << "CONN_STATUS_CONNECTED"; break;
@@ -370,6 +371,7 @@ void Client::connectionStatusChanged(BlackCore::INetwork::ConnectionStatus oldSt
switch (oldStatus) switch (oldStatus)
{ {
case BlackCore::INetwork::Disconnected: std::cout << " (was CONN_STATUS_DISCONNECTED)\n"; break; case BlackCore::INetwork::Disconnected: std::cout << " (was CONN_STATUS_DISCONNECTED)\n"; break;
case BlackCore::INetwork::Disconnecting: std::cout << " (was CONN_STATUS_DISCONNECTING)\n"; break;
case BlackCore::INetwork::DisconnectedError: std::cout << " (was CONN_STATUS_DISCONNECTED_ERROR)\n"; break; case BlackCore::INetwork::DisconnectedError: std::cout << " (was CONN_STATUS_DISCONNECTED_ERROR)\n"; break;
case BlackCore::INetwork::Connecting: std::cout << " (was CONN_STATUS_CONNECTING)\n"; break; case BlackCore::INetwork::Connecting: std::cout << " (was CONN_STATUS_CONNECTING)\n"; break;
case BlackCore::INetwork::Connected: std::cout << " (was CONN_STATUS_CONNECTED)\n"; break; case BlackCore::INetwork::Connected: std::cout << " (was CONN_STATUS_CONNECTED)\n"; break;

1
src/blackcore/network.h
View File

@@ -88,6 +88,7 @@ namespace BlackCore
enum ConnectionStatus enum ConnectionStatus
{ {
Disconnected = 0, //!< Not connected Disconnected = 0, //!< Not connected
Disconnecting, //!< In transition to disconnected
DisconnectedError, //!< Disconnected due to socket error DisconnectedError, //!< Disconnected due to socket error
Connecting, //!< Connection initiated but not established Connecting, //!< Connection initiated but not established
Connected //!< Connection established Connected //!< Connection established

4
src/blackcore/network_vatlib.cpp
View File

@@ -343,6 +343,8 @@ namespace BlackCore
if (m_net && m_net->IsValid() && m_net->IsNetworkConnected()) if (m_net && m_net->IsValid() && m_net->IsNetworkConnected())
{ {
// I let others know we are going down
emit this->connectionStatusChanged(convertConnectionStatus(m_status), Disconnecting);
m_net->LogoffAndDisconnect(c_logoffTimeoutSec); m_net->LogoffAndDisconnect(c_logoffTimeoutSec);
} }
} }
@@ -788,7 +790,7 @@ namespace BlackCore
case Cvatlib_Network::error_NoFP: msg = "Server: no flight plan"; break; case Cvatlib_Network::error_NoFP: msg = "Server: no flight plan"; break;
case Cvatlib_Network::error_NoWeather: msg = "Server: requested weather profile does not exist"; break; case Cvatlib_Network::error_NoWeather: msg = "Server: requested weather profile does not exist"; break;
// we have no idea what these mean // we have no idea what these mean
case Cvatlib_Network::error_Registered: case Cvatlib_Network::error_Registered:
case Cvatlib_Network::error_InvalidControl: msg = "Server: "; msg.append(cbvar_cast(cbvar)->fromFSD(msgData)); break; case Cvatlib_Network::error_InvalidControl: msg = "Server: "; msg.append(cbvar_cast(cbvar)->fromFSD(msgData)); break;