philipp/qhttpengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename internal class QProxySocket and add slot for downstream disconnect.

Browse Source
This commit is contained in:
Nathan Osman
2017-08-08 12:18:55 -07:00
parent 96a714c909
commit 461d5100dc
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/src/proxyhandler.cpp
View File

@@ -46,5 +46,5 @@ void ProxyHandler::process(Socket *socket, const QString &path)
socket->setParent(this);
// Create a new proxy socket
new QProxySocket(socket, path, d->address, d->port);
new ProxySocket(socket, path, d->address, d->port);
}

26
src/src/proxysocket.cpp
View File

@@ -26,28 +26,29 @@
using namespace QHttpEngine;
QProxySocket::QProxySocket(Socket *socket, const QString &path, const QHostAddress &address, quint16 port)
ProxySocket::ProxySocket(Socket *socket, const QString &path, const QHostAddress &address, quint16 port)
: QObject(socket),
mDownstreamSocket(socket),
mPath(path),
mHeadersParsed(false),
mHeadersWritten(false)
{
connect(mDownstreamSocket, &Socket::readyRead, this, &QProxySocket::onDownstreamReadyRead);
connect(mDownstreamSocket, &Socket::readyRead, this, &ProxySocket::onDownstreamReadyRead);
connect(mDownstreamSocket, &Socket::disconnected, this, &ProxySocket::onDownstreamDisconnected);
connect(&mUpstreamSocket, &QTcpSocket::connected, this, &QProxySocket::onUpstreamConnected);
connect(&mUpstreamSocket, &QTcpSocket::readyRead, this, &QProxySocket::onUpstreamReadyRead);
connect(&mUpstreamSocket, &QTcpSocket::connected, this, &ProxySocket::onUpstreamConnected);
connect(&mUpstreamSocket, &QTcpSocket::readyRead, this, &ProxySocket::onUpstreamReadyRead);
connect(
&mUpstreamSocket,
static_cast<void(QAbstractSocket::*)(QAbstractSocket::SocketError)>(&QAbstractSocket::error),
this,
&QProxySocket::onUpstreamError
&ProxySocket::onUpstreamError
);
mUpstreamSocket.connectToHost(address, port);
}
void QProxySocket::onDownstreamReadyRead()
void ProxySocket::onDownstreamReadyRead()
{
if (mHeadersWritten) {
mUpstreamSocket.write(mDownstreamSocket->readAll());
@@ -56,7 +57,12 @@ void QProxySocket::onDownstreamReadyRead()
}
}
void QProxySocket::onUpstreamConnected()
void ProxySocket::onDownstreamDisconnected()
{
mUpstreamSocket.disconnectFromHost();
}
void ProxySocket::onUpstreamConnected()
{
// Write the status line using the stripped path from the handler
mUpstreamSocket.write(
@@ -93,7 +99,7 @@ void QProxySocket::onUpstreamConnected()
}
}
void QProxySocket::onUpstreamReadyRead()
void ProxySocket::onUpstreamReadyRead()
{
// If the headers have not yet been parsed, then check to see if the end
// has been reached yet; if they have, just dump data
@@ -129,7 +135,7 @@ void QProxySocket::onUpstreamReadyRead()
}
}
void QProxySocket::onUpstreamError(QAbstractSocket::SocketError socketError)
void ProxySocket::onUpstreamError(QAbstractSocket::SocketError socketError)
{
if (mHeadersParsed) {
mDownstreamSocket->close();
@@ -138,7 +144,7 @@ void QProxySocket::onUpstreamError(QAbstractSocket::SocketError socketError)
}
}
QString QProxySocket::methodToString(Socket::Method method) const
QString ProxySocket::methodToString(Socket::Method method) const
{
switch (method) {
case Socket::OPTIONS: return "OPTIONS";

11
src/src/proxysocket.h
View File

@@ -20,8 +20,8 @@
* IN THE SOFTWARE.
*/
#ifndef QHTTPENGINE_QPROXYSOCKET_H
#define QHTTPENGINE_QPROXYSOCKET_H
#ifndef QHTTPENGINE_PROXYSOCKET_H
#define QHTTPENGINE_PROXYSOCKET_H
#include <QHostAddress>
#include <QObject>
@@ -36,17 +36,18 @@
* (the client's connection to the server) and one for upstream (the server's
* connection to the upstream proxy).
*/
class QProxySocket : public QObject
class ProxySocket: public QObject
{
Q_OBJECT
public:
explicit QProxySocket(QHttpEngine::Socket *socket, const QString &path, const QHostAddress &address, quint16 port);
explicit ProxySocket(QHttpEngine::Socket *socket, const QString &path, const QHostAddress &address, quint16 port);
private Q_SLOTS:
void onDownstreamReadyRead();
void onDownstreamDisconnected();
void onUpstreamConnected();
void onUpstreamReadyRead();
@@ -67,4 +68,4 @@ private:
QByteArray mUpstreamWrite;
};
#endif // QHTTPENGINE_QPROXYSOCKET_H
#endif // QHTTPENGINE_PROXYSOCKET_H