X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=e04921ce4807c3b07a3bfd82aa7ae539db0f53e3;hp=a74c12d302042dd45d7961dc7ee08cc7a4b1c7f6;hb=c9e3e41c9446e58073225db379d28e1a08e15cd8;hpb=8f7204aa8928f769a9cd74b3bfca4a4c5982c393 diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index a74c12d3..e04921ce 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by the Quassel Project * + * Copyright (C) 2005-2012 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef CORECONNECTION_H_ @@ -24,6 +24,7 @@ // TODO: support system application proxy (new in Qt 4.6) #include "QPointer" +#include "QTimer" #ifdef HAVE_SSL # include @@ -31,132 +32,184 @@ # include #endif +#ifdef HAVE_KDE +# include +#endif + #include "coreaccount.h" #include "types.h" class CoreAccountModel; class Network; +class SignalProxy; -class CoreConnection : public QObject { - Q_OBJECT +class CoreConnection : public QObject +{ + Q_OBJECT public: - enum ConnectionState { - Disconnected, - Connecting, - Connected, - Synchronizing, - Synchronized - }; + enum ConnectionState { + Disconnected, + Connecting, + Connected, + Synchronizing, + Synchronized + }; - CoreConnection(CoreAccountModel *model, QObject *parent = 0); + CoreConnection(CoreAccountModel *model, QObject *parent = 0); - void init(); + void init(); - inline ConnectionState state() const; - inline bool isConnected() const; - inline CoreAccount currentAccount() const; + bool isConnected() const; + ConnectionState state() const; + CoreAccount currentAccount() const; - inline int progressMinimum() const; - inline int progressMaximum() const; - inline int progressValue() const; - inline QString progressText() const; + bool isEncrypted() const; + bool isLocalConnection() const; -public slots: - bool connectToCore(AccountId = 0); - void reconnectToCore(); - void disconnectFromCore(); + int progressMinimum() const; + int progressMaximum() const; + int progressValue() const; + QString progressText() const; -// void useInternalCore(); + //! Check if we consider the last connect as reconnect + bool wasReconnect() const { return _wasReconnect; } -signals: - void stateChanged(CoreConnection::ConnectionState); - void synchronized(); +#ifdef HAVE_SSL + const QSslSocket *sslSocket() const; +#endif - void connectionError(const QString &errorMsg); - void connectionWarnings(const QStringList &warnings); - void connectionMsg(const QString &msg); - void disconnected(); +public slots: + bool connectToCore(AccountId = 0); + void reconnectToCore(); + void disconnectFromCore(); - void progressRangeChanged(int minimum, int maximum); - void progressValueChanged(int value); - void progressTextChanged(const QString &); +signals: + void stateChanged(CoreConnection::ConnectionState); + void encrypted(bool isEncrypted = true); + void synchronized(); + void lagUpdated(int msecs); + + void connectionError(const QString &errorMsg); + void connectionErrorPopup(const QString &errorMsg); + void connectionWarnings(const QStringList &warnings); + void connectionMsg(const QString &msg); + void disconnected(); + + void progressRangeChanged(int minimum, int maximum); + void progressValueChanged(int value); + void progressTextChanged(const QString &); + + void startCoreSetup(const QVariantList &); + void coreSetupSuccess(); + void coreSetupFailed(const QString &error); + + void startInternalCore(); + void connectToInternalCore(SignalProxy *proxy); + + // These signals MUST be handled synchronously! + void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString()); + void handleNoSslInClient(bool *accepted); + void handleNoSslInCore(bool *accepted); +#ifdef HAVE_SSL + void handleSslErrors(const QSslSocket *socket, bool *accepted, bool *permanently); +#endif - void startCoreSetup(const QVariantList &); +private slots: + void connectToCurrentAccount(); + void disconnectFromCore(const QString &errorString, bool wantReconnect = true); - // This signal MUST be handled synchronously! - void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString()); + void socketStateChanged(QAbstractSocket::SocketState); + void coreSocketError(QAbstractSocket::SocketError); + void coreHasData(); + void coreSocketConnected(); + void coreSocketDisconnected(); - void handleIgnoreWarnings(bool permanently); + void clientInitAck(const QVariantMap &msg); -private slots: - void connectToCurrentAccount(); + // for sync progress + void networkInitDone(); + void checkSyncState(); - void socketStateChanged(QAbstractSocket::SocketState); - void coreSocketError(QAbstractSocket::SocketError); - void coreHasData(); - void coreSocketConnected(); - void coreSocketDisconnected(); + void syncToCore(const QVariantMap &sessionState); + void internalSessionStateReceived(const QVariant &packedState); + void sessionStateReceived(const QVariantMap &state); - void clientInitAck(const QVariantMap &msg); + void resetConnection(bool wantReconnect = false); + void connectionReady(); - // for sync progress - void networkInitDone(); - void checkSyncState(); + void loginToCore(const QString &user, const QString &password, bool remember); // for config wizard + void loginToCore(const QString &previousError = QString()); + void loginSuccess(); + void loginFailed(const QString &errorMessage); - void syncToCore(const QVariantMap &sessionState); - //void internalSessionStateReceived(const QVariant &packedState); - void sessionStateReceived(const QVariantMap &state); + void doCoreSetup(const QVariant &setupData); - void setWarningsHandler(const char *slot); - void resetWarningsHandler(); - void resetConnection(); - void connectionReady(); - //void doCoreSetup(const QVariant &setupData); + void updateProgress(int value, int maximum); + void setProgressText(const QString &text); + void setProgressValue(int value); + void setProgressMinimum(int minimum); + void setProgressMaximum(int maximum); - void loginToCore(const QString &previousError = QString()); - void loginSuccess(); - void loginFailed(const QString &errorMessage); + void setState(QAbstractSocket::SocketState socketState); + void setState(ConnectionState state); - void updateProgress(int value, int maximum); - void setProgressText(const QString &text); - void setProgressValue(int value); - void setProgressMinimum(int minimum); - void setProgressMaximum(int maximum); +#ifdef HAVE_SSL + void sslSocketEncrypted(); + void sslErrors(); +#endif + + void networkDetectionModeChanged(const QVariant &mode); + void pingTimeoutIntervalChanged(const QVariant &interval); + void reconnectIntervalChanged(const QVariant &interval); + void reconnectTimeout(); - void setState(QAbstractSocket::SocketState socketState); - void setState(ConnectionState state); +#ifdef HAVE_KDE + void solidNetworkStatusChanged(Solid::Networking::Status status); +#endif private: - CoreAccountModel *_model; - CoreAccount _account; - QVariantMap _coreMsgBuffer; + CoreAccountModel *_model; + CoreAccount _account; + QVariantMap _coreMsgBuffer; + + QPointer _socket; + quint32 _blockSize; + ConnectionState _state; + + QTimer _reconnectTimer; + bool _wantReconnect; - QPointer _socket; - quint32 _blockSize; - ConnectionState _state; + QSet _netsToSync; + int _numNetsToSync; + int _progressMinimum, _progressMaximum, _progressValue; + QString _progressText; - QSet _netsToSync; - int _numNetsToSync; - int _progressMinimum, _progressMaximum, _progressValue; - QString _progressText; + QString _coreInfoString(const QVariantMap &); + bool _wasReconnect; + bool _requestedDisconnect; - QString _coreInfoString(const QVariantMap &); + inline CoreAccountModel *accountModel() const; - inline CoreAccountModel *accountModel() const; + friend class CoreConfigWizard; }; + Q_DECLARE_METATYPE(CoreConnection::ConnectionState) // Inlines -int CoreConnection::progressMinimum() const { return _progressMinimum; } -int CoreConnection::progressMaximum() const { return _progressMaximum; } -int CoreConnection::progressValue() const { return _progressValue; } -QString CoreConnection::progressText() const { return _progressText; } - -CoreConnection::ConnectionState CoreConnection::state() const { return _state; } -bool CoreConnection::isConnected() const { return state() >= Connected; } -CoreAccount CoreConnection::currentAccount() const { return _account; } -CoreAccountModel *CoreConnection::accountModel() const { return _model; } +inline int CoreConnection::progressMinimum() const { return _progressMinimum; } +inline int CoreConnection::progressMaximum() const { return _progressMaximum; } +inline int CoreConnection::progressValue() const { return _progressValue; } +inline QString CoreConnection::progressText() const { return _progressText; } + +inline CoreConnection::ConnectionState CoreConnection::state() const { return _state; } +inline bool CoreConnection::isConnected() const { return state() >= Connected; } +inline CoreAccount CoreConnection::currentAccount() const { return _account; } +inline CoreAccountModel *CoreConnection::accountModel() const { return _model; } + +#ifdef HAVE_SSL +inline const QSslSocket *CoreConnection::sslSocket() const { return qobject_cast(_socket); } +#endif #endif