refs #274, pending connection state detection and disallowing further connection states while pending

This commit is contained in:
Klaus Basan
2014-06-17 23:12:32 +02:00
parent 427dd83a6a
commit ca8cbc4a0a
4 changed files with 57 additions and 11 deletions

View File

@@ -117,11 +117,24 @@ namespace BlackCore
return status == DisconnectedError;
}
/*!
* Returns true if the given ConnectionStatus represents a pending state.
*/
static bool isPendingStatus(ConnectionStatus status)
{
return status == Disconnecting || status == Connecting;
}
/*!
* Returns true if the current ConnectionStatus is a connected state.
*/
virtual bool isConnected() const = 0;
/*!
* Returns true if the current ConnectionStatus is in transition, e.g. connecting.
*/
virtual bool isPendingConnection() const = 0;
/*!
* Returns a list of URLs where network status data can be found.
* To obtain the status, one of these URLs should be picked at random.
@@ -226,8 +239,8 @@ namespace BlackCore
virtual void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data) = 0;
/*!
* Send an FSInn custom packet.
* \details FSIPI(R) queries
* Send a FSInn custom packet.
* \details FSIPI(R) queries, some example data below:
* <BLOCKQUOTE>
* index 0 .. 0/1 ???
* 1 .. MQT, GEC, DLH -> Airline ICAO, most of the time empty
@@ -242,9 +255,9 @@ namespace BlackCore
*/
//! @{
virtual void sendFsipiCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator,
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) = 0;
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) = 0;
virtual void sendFsipirCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator,
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) = 0;
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString) = 0;
//! @}
//! @}
@@ -509,13 +522,13 @@ namespace BlackCore
* We received an FSInn custom packet.
*/
void fsipiCustomPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator,
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString);
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString);
/*!
* We received an FSInn custom response packet.
*/
void fsipirCustomPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &airlineDesignator,
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString);
const QString &aircraftDesignator, const QString &combinedType, const QString &modelString);
//! @}
////////////////////////////////////////////////////////////////