projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #198 - IRCv3 improvements
[quassel.git]
/
src
/
client
/
clientauthhandler.h
diff --git
a/src/client/clientauthhandler.h
b/src/client/clientauthhandler.h
index
4b4e088
..
9c9a522
100644
(file)
--- a/
src/client/clientauthhandler.h
+++ b/
src/client/clientauthhandler.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,6
+21,7
@@
#ifndef CLIENTAUTHHANDLER_H
#define CLIENTAUTHHANDLER_H
#ifndef CLIENTAUTHHANDLER_H
#define CLIENTAUTHHANDLER_H
+#include "compressor.h"
#include "authhandler.h"
#include "coreaccount.h"
#include "authhandler.h"
#include "coreaccount.h"
@@
-35,6
+36,12
@@
class ClientAuthHandler : public AuthHandler
public:
ClientAuthHandler(CoreAccount account, QObject *parent = 0);
public:
ClientAuthHandler(CoreAccount account, QObject *parent = 0);
+ enum DigestVersion {
+ Md5,
+ Sha2_512,
+ Latest=Sha2_512
+ };
+
public slots:
void connectToCore();
public slots:
void connectToCore();
@@
-78,10
+85,21
@@
private:
void handle(const Protocol::LoginSuccess &msg);
void handle(const Protocol::SessionState &msg);
void handle(const Protocol::LoginSuccess &msg);
void handle(const Protocol::SessionState &msg);
+ void setPeer(RemotePeer *peer);
+ void checkAndEnableSsl(bool coreSupportsSsl);
+ void startRegistration();
+
+#if QT_VERSION < 0x050000
+ QByteArray sha2_512(const QByteArray &input);
+#endif
+
private slots:
void onSocketConnected();
private slots:
void onSocketConnected();
- //void onSocketStateChanged(QAbstractSocket::SocketState state);
- //void onSocketError(QAbstractSocket::SocketError);
+ void onSocketStateChanged(QAbstractSocket::SocketState state);
+ void onSocketError(QAbstractSocket::SocketError);
+ void onSocketDisconnected();
+ void onReadyRead();
+
#ifdef HAVE_SSL
void onSslSocketEncrypted();
void onSslErrors();
#ifdef HAVE_SSL
void onSslSocketEncrypted();
void onSslErrors();
@@
-96,7
+114,9
@@
private:
bool _coreConfigured;
QVariantList _backendInfo;
CoreAccount _account;
bool _coreConfigured;
QVariantList _backendInfo;
CoreAccount _account;
-
+ bool _probing;
+ bool _legacy;
+ quint8 _connectionFeatures;
};
#endif
};
#endif