Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish desturctor, fix localhost lookup

Browse Source
This commit is contained in:
Salanto 2022-06-09 20:49:37 +02:00 committed by Rosemary Witchaven
parent a47e120ff4
commit a2c769f173
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/include/network/network_socket.h
View File

@ -44,6 +44,11 @@ class NetworkSocket : public QObject
*/ */
NetworkSocket(QWebSocket *f_socket, QObject *parent = nullptr); NetworkSocket(QWebSocket *f_socket, QObject *parent = nullptr);
/**
* @brief Default destructor for the NetworkSocket object.
*/
~NetworkSocket();
/** /**
* @brief Returns the Address of the remote socket. * @brief Returns the Address of the remote socket.
* *

13
core/src/network/network_socket.cpp
View File

@ -39,7 +39,8 @@ NetworkSocket::NetworkSocket(QWebSocket *f_socket, QObject *parent) :
this, &NetworkSocket::clientDisconnected); this, &NetworkSocket::clientDisconnected);
bool l_is_local = (m_client_socket.ws->peerAddress() == QHostAddress::LocalHost) || bool l_is_local = (m_client_socket.ws->peerAddress() == QHostAddress::LocalHost) ||
(m_client_socket.ws->peerAddress() == QHostAddress::LocalHostIPv6); (m_client_socket.ws->peerAddress() == QHostAddress::LocalHostIPv6) ||
(m_client_socket.ws->peerAddress() == QHostAddress("::ffff:127.0.0.1"));
// TLDR : We check if the header comes trough a proxy/tunnel running locally. // TLDR : We check if the header comes trough a proxy/tunnel running locally.
// This is to ensure nobody can send those headers from the web. // This is to ensure nobody can send those headers from the web.
QNetworkRequest l_request = m_client_socket.ws->request(); QNetworkRequest l_request = m_client_socket.ws->request();
@ -51,6 +52,16 @@ NetworkSocket::NetworkSocket(QWebSocket *f_socket, QObject *parent) :
} }
} }
NetworkSocket::~NetworkSocket()
{
if (m_socket_type == TCP) {
m_client_socket.tcp->deleteLater();
}
else {
m_client_socket.ws->deleteLater();
}
}
QHostAddress NetworkSocket::peerAddress() QHostAddress NetworkSocket::peerAddress()
{ {
return m_socket_ip; return m_socket_ip;