Merge branch 'dev' into dev-netadapters

This commit is contained in:
pokamest 2021-11-28 17:42:11 +03:00
commit 97d3b92988
41 changed files with 1035 additions and 501 deletions

View file

@ -50,23 +50,16 @@ signals:
void timeoutTimerEvent();
void protocolError(amnezia::ErrorCode e);
// This signal is emitted when the controller is initialized. Note that the
// VPN tunnel can be already active. In this case, "connected" should be set
// to true and the "connectionDate" should be set to the activation date if
// known.
// If "status" is set to false, the backend service is considered unavailable.
void initialized(bool status, bool connected,
const QDateTime& connectionDate);
protected slots:
virtual void onTimeout();
public slots:
virtual void onTimeout(); // todo: remove?
void setBytesChanged(quint64 receivedBytes, quint64 sentBytes);
void setConnectionState(VpnProtocol::ConnectionState state);
protected:
void startTimeoutTimer();
void stopTimeoutTimer();
virtual void setBytesChanged(quint64 receivedBytes, quint64 sentBytes);
virtual void setConnectionState(VpnProtocol::ConnectionState state);
ConnectionState m_connectionState;
QString m_routeGateway;
QString m_vpnLocalAddress;