Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove now unused socks5 socket engine [ci reset]

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-02-19 20:13:31 +02:00
parent 59da27ca99
commit 5d9a745c11
7 changed files with 3 additions and 2225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/global/qconfig.h.cmake
View file

@ -118,6 +118,7 @@
#define QT_NO_FTP
#define QT_NO_HTTP
#define QT_NO_NETWORKDISKCACHE
#define QT_NO_SOCKS5
// Not supported, used to bootstrap
#cmakedefine QT_NO_QOBJECT
@ -260,7 +261,6 @@
#cmakedefine QT_NO_SIGNALMAPPER
#cmakedefine QT_NO_SIZEGRIP
#cmakedefine QT_NO_SLIDER
#cmakedefine QT_NO_SOCKS5
#cmakedefine QT_NO_SORTFILTERPROXYMODEL
#cmakedefine QT_NO_SPINBOX
#cmakedefine QT_NO_SPLASHSCREEN
@ -366,11 +366,6 @@
# define QT_NO_SCROLLBAR
#endif
// SOCKS5
#if !defined(QT_NO_SOCKS5) && defined(QT_NO_NETWORKPROXY)
# define QT_NO_SOCKS5
#endif
// QSplitter
#if !defined(QT_NO_SPLITTER) && defined(QT_NO_RUBBERBAND)
# define QT_NO_SPLITTER

2
src/network/CMakeLists.txt
View file

@ -48,7 +48,6 @@ set(NETWORK_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qnetworkinterface.h
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qnetworkinterface_p.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qabstractsocketengine_p.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qsocks5socketengine_p.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qabstractsocket.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qabstractsocket_p.h
${CMAKE_CURRENT_SOURCE_DIR}/socket/qtcpsocket.h
@ -87,7 +86,6 @@ set(NETWORK_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostinfo_unix.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel/qnetworkinterface_unix.cpp
${CMAKE_CURRENT_SOURCE_DIR}/socket/qabstractsocketengine.cpp
${CMAKE_CURRENT_SOURCE_DIR}/socket/qsocks5socketengine.cpp
${CMAKE_CURRENT_SOURCE_DIR}/socket/qabstractsocket.cpp
${CMAKE_CURRENT_SOURCE_DIR}/socket/qtcpsocket.cpp
${CMAKE_CURRENT_SOURCE_DIR}/socket/qudpsocket.cpp

2
src/network/kernel/qnetworkproxy.cpp
View file

@ -189,8 +189,6 @@
QT_BEGIN_NAMESPACE
class QSocks5SocketEngineHandler;
class QGlobalNetworkProxy
{
public:

1873
src/network/socket/qsocks5socketengine.cpp
View file

File diff suppressed because it is too large Load diff

279
src/network/socket/qsocks5socketengine_p.h
View file

@ -1,279 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2016 Ivailo Monev
**
** This file is part of the QtNetwork module of the Katie Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QSOCKS5SOCKETENGINE_P_H
#define QSOCKS5SOCKETENGINE_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Katie API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include "qabstractsocketengine_p.h"
#include "qnetworkproxy.h"
QT_BEGIN_NAMESPACE
#ifndef QT_NO_SOCKS5
class QSocks5SocketEnginePrivate;
class Q_AUTOTEST_EXPORT QSocks5SocketEngine : public QAbstractSocketEngine
{
Q_OBJECT
public:
QSocks5SocketEngine(QObject *parent = nullptr);
~QSocks5SocketEngine();
bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol);
bool initialize(int socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState);
void setProxy(const QNetworkProxy &networkProxy);
int socketDescriptor() const;
bool isValid() const;
bool connectInternal();
bool connectToHost(const QHostAddress &address, quint16 port);
bool connectToHostByName(const QString &name, quint16 port);
bool bind(const QHostAddress &address, quint16 port);
bool listen();
int accept();
void close();
qint64 bytesAvailable() const;
qint64 read(char *data, qint64 maxlen);
qint64 write(const char *data, qint64 len);
#ifndef QT_NO_UDPSOCKET
#ifndef QT_NO_NETWORKINTERFACE
bool joinMulticastGroup(const QHostAddress &groupAddress,
const QNetworkInterface &interface);
bool leaveMulticastGroup(const QHostAddress &groupAddress,
const QNetworkInterface &interface);
QNetworkInterface multicastInterface() const;
bool setMulticastInterface(const QNetworkInterface &iface);
#endif // QT_NO_NETWORKINTERFACE
qint64 readDatagram(char *data, qint64 maxlen, QHostAddress *addr = 0,
quint16 *port = 0);
qint64 writeDatagram(const char *data, qint64 len, const QHostAddress &addr,
quint16 port);
bool hasPendingDatagrams() const;
qint64 pendingDatagramSize() const;
#endif // QT_NO_UDPSOCKET
qint64 bytesToWrite() const;
int option(SocketOption option) const;
bool setOption(SocketOption option, int value);
bool waitForRead(int msecs = 30000, bool *timedOut = 0);
bool waitForWrite(int msecs = 30000, bool *timedOut = 0);
bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite,
bool checkRead, bool checkWrite,
int msecs = 30000, bool *timedOut = 0);
bool isReadNotificationEnabled() const;
void setReadNotificationEnabled(bool enable);
bool isWriteNotificationEnabled() const;
void setWriteNotificationEnabled(bool enable);
bool isExceptionNotificationEnabled() const;
void setExceptionNotificationEnabled(bool enable);
private:
Q_DECLARE_PRIVATE(QSocks5SocketEngine)
Q_DISABLE_COPY(QSocks5SocketEngine)
Q_PRIVATE_SLOT(d_func(), void _q_controlSocketConnected())
Q_PRIVATE_SLOT(d_func(), void _q_controlSocketReadNotification())
Q_PRIVATE_SLOT(d_func(), void _q_controlSocketError(QAbstractSocket::SocketError))
#ifndef QT_NO_UDPSOCKET
Q_PRIVATE_SLOT(d_func(), void _q_udpSocketReadNotification())
#endif
Q_PRIVATE_SLOT(d_func(), void _q_controlSocketBytesWritten())
Q_PRIVATE_SLOT(d_func(), void _q_emitPendingReadNotification())
Q_PRIVATE_SLOT(d_func(), void _q_emitPendingWriteNotification())
Q_PRIVATE_SLOT(d_func(), void _q_emitPendingConnectionNotification())
Q_PRIVATE_SLOT(d_func(), void _q_controlSocketDisconnected())
Q_PRIVATE_SLOT(d_func(), void _q_controlSocketStateChanged(QAbstractSocket::SocketState))
};
class QTcpSocket;
class QSocks5Authenticator
{
public:
QSocks5Authenticator();
virtual ~QSocks5Authenticator();
virtual char methodId();
virtual bool beginAuthenticate(QTcpSocket *socket, bool *completed);
virtual bool continueAuthenticate(QTcpSocket *socket, bool *completed);
virtual bool seal(const QByteArray buf, QByteArray *sealedBuf);
virtual bool unSeal(const QByteArray sealedBuf, QByteArray *buf);
virtual bool unSeal(QTcpSocket *sealedSocket, QByteArray *buf);
virtual QString errorString() { return QString(); }
};
class QSocks5PasswordAuthenticator : public QSocks5Authenticator
{
public:
QSocks5PasswordAuthenticator(const QString &userName, const QString &password);
char methodId();
bool beginAuthenticate(QTcpSocket *socket, bool *completed);
bool continueAuthenticate(QTcpSocket *socket, bool *completed);
QString errorString();
private:
QString userName;
QString password;
};
struct QSocks5Data;
struct QSocks5ConnectData;
struct QSocks5UdpAssociateData;
struct QSocks5BindData;
class QSocks5SocketEnginePrivate : public QAbstractSocketEnginePrivate
{
Q_DECLARE_PUBLIC(QSocks5SocketEngine)
public:
QSocks5SocketEnginePrivate();
~QSocks5SocketEnginePrivate();
enum Socks5State
{
Uninitialized = 0,
ConnectError,
AuthenticationMethodsSent,
Authenticating,
AuthenticatingError,
RequestMethodSent,
RequestError,
Connected,
UdpAssociateSuccess,
BindSuccess,
ControlSocketError,
SocksError,
HostNameLookupError
};
Socks5State socks5State;
enum Socks5Mode
{
NoMode,
ConnectMode,
BindMode,
UdpAssociateMode
};
Socks5Mode mode;
enum Socks5Error
{
SocksFailure = 0x01,
ConnectionNotAllowed = 0x02,
NetworkUnreachable = 0x03,
HostUnreachable = 0x04,
ConnectionRefused = 0x05,
TTLExpired = 0x06,
CommandNotSupported = 0x07,
AddressTypeNotSupported = 0x08,
LastKnownError = AddressTypeNotSupported,
UnknownError
};
void initialize(Socks5Mode socks5Mode);
void setErrorState(Socks5State state, const QString &extraMessage = QString());
void setErrorState(Socks5State state, Socks5Error socks5error);
void reauthenticate();
void parseAuthenticationMethodReply();
void parseAuthenticatingReply();
void sendRequestMethod();
void parseRequestMethodReply();
void parseNewConnection();
bool waitForConnected(int msecs, bool *timedOut);
void _q_controlSocketConnected();
void _q_controlSocketReadNotification();
void _q_controlSocketError(QAbstractSocket::SocketError);
#ifndef QT_NO_UDPSOCKET
void checkForDatagrams() const;
void _q_udpSocketReadNotification();
#endif
void _q_controlSocketBytesWritten();
void _q_controlSocketDisconnected();
void _q_controlSocketStateChanged(QAbstractSocket::SocketState);
QNetworkProxy proxyInfo;
bool readNotificationEnabled, writeNotificationEnabled, exceptNotificationEnabled;
int socketDescriptor;
QSocks5Data *data;
QSocks5ConnectData *connectData;
#ifndef QT_NO_UDPSOCKET
QSocks5UdpAssociateData *udpData;
#endif
QSocks5BindData *bindData;
QString peerName;
mutable bool readNotificationActivated;
mutable bool writeNotificationActivated;
bool readNotificationPending;
void _q_emitPendingReadNotification();
void emitReadNotification();
bool writeNotificationPending;
void _q_emitPendingWriteNotification();
void emitWriteNotification();
bool connectionNotificationPending;
void _q_emitPendingConnectionNotification();
void emitConnectionNotification();
};
class Q_AUTOTEST_EXPORT QSocks5SocketEngineHandler : public QSocketEngineHandler
{
public:
virtual QAbstractSocketEngine *createSocketEngine(QAbstractSocket::SocketType socketType,
const QNetworkProxy &, QObject *parent);
virtual QAbstractSocketEngine *createSocketEngine(int socketDescripter, QObject *parent);
};
QT_END_NAMESPACE
#endif // QT_NO_SOCKS5
#endif // QSOCKS5SOCKETENGINE_H

63
translations/qt.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-19 17:37+0200\n"
"POT-Creation-Date: 2022-02-19 20:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -4739,8 +4739,6 @@ msgstr ""
#: src/network/kernel/qhostinfo_unix.cpp:87
#: src/network/kernel/qhostinfo_unix.cpp:171
#: src/network/socket/qabstractsocket.cpp:830
#: src/network/socket/qsocks5socketengine.cpp:620
#: src/network/socket/qsocks5socketengine.cpp:646
msgid "Host not found"
msgstr ""
@ -4783,7 +4781,6 @@ msgstr ""
#: src/network/socket/qabstractsocket.cpp:872
#: src/network/socket/qnativesocketengine.cpp:213
#: src/network/socket/qsocks5socketengine.cpp:650
msgid "Connection refused"
msgstr ""
@ -4841,7 +4838,6 @@ msgid "Host unreachable"
msgstr ""
#: src/network/socket/qnativesocketengine.cpp:204
#: src/network/socket/qsocks5socketengine.cpp:642
msgid "Network unreachable"
msgstr ""
@ -4933,63 +4929,6 @@ msgstr ""
msgid "This platform does not support IPv6"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:575
msgid "Connection to proxy refused"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:579
msgid "Connection to proxy closed prematurely"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:583
msgid "Proxy host not found"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:588
msgid "Connection to proxy timed out"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:605
msgid "Proxy authentication failed"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:606
msgid "Proxy authentication failed: %1"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:615
msgid "SOCKS version 5 protocol error"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:634
msgid "General SOCKSv5 server failure"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:638
msgid "Connection not allowed by SOCKSv5 server"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:654
msgid "TTL expired"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:658
msgid "SOCKSv5 command not supported"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:662
msgid "Address type not supported"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:667
msgid "Unknown SOCKSv5 proxy error code 0x%1"
msgstr ""
#: src/network/socket/qsocks5socketengine.cpp:1356
msgctxt "QSocks5SocketEngine"
msgid "Network operation timed out"
msgstr ""
#: src/scripttools/debugging/qscriptedit.cpp:391
#: src/scripttools/debugging/qscriptdebugger.cpp:1767
msgid "Toggle Breakpoint"

2
translations/qt_tools.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-19 17:37+0200\n"
"POT-Creation-Date: 2022-02-19 20:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"