feedc0de/DbMinecraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Memory management of socket using unique_ptr, many new util functions

Browse Source
This commit is contained in:
feedc0de
2020-07-18 00:24:47 +02:00
parent b39078eedc
commit fcadff65e2
20 changed files with 365 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loginclient.cpp
+13 -10
View File
@@ -5,18 +5,20 @@
#include "server.h"
#include "playclient.h"
LoginClient::LoginClient(QTcpSocket &socket, Server &server) :
QObject{&server}, m_socket{socket}, m_server{server}, m_dataStream{&m_socket}
LoginClient::LoginClient(std::unique_ptr<QTcpSocket> &&socket, Server &server) :
QObject{&server}, m_socket{std::move(socket)}, m_server{server}, m_dataStream{m_socket.get()}
{
m_socket.setParent(this);
m_socket->setParent(this);
connect(&m_socket, &QIODevice::readyRead, this, &LoginClient::readyRead);
connect(&m_socket, &QAbstractSocket::disconnected, this, &QObject::deleteLater);
connect(m_socket.get(), &QIODevice::readyRead, this, &LoginClient::readyRead);
connect(m_socket.get(), &QAbstractSocket::disconnected, this, &QObject::deleteLater);
}
LoginClient::~LoginClient() = default;
void LoginClient::readyRead()
{
while(m_socket.bytesAvailable())
while(m_socket && m_socket->bytesAvailable())
{
if(!m_packetSize)
{
@@ -24,16 +26,16 @@ void LoginClient::readyRead()
qDebug() << "packet size" << m_packetSize;
}
if(m_socket.bytesAvailable() < m_packetSize)
if(m_socket->bytesAvailable() < m_packetSize)
{
qWarning() << "packet not fully available" << m_socket.bytesAvailable();
qWarning() << "packet not fully available" << m_socket->bytesAvailable();
return;
}
qint32 bytesRead;
const auto type = m_dataStream.readVar<qint32>(bytesRead);
m_packetSize -= bytesRead;
const auto buffer = m_socket.read(m_packetSize);
const auto buffer = m_socket->read(m_packetSize);
Q_ASSERT(buffer.size() == m_packetSize);
m_packetSize = 0;
@@ -64,7 +66,8 @@ void LoginClient::readPacket(packets::login::serverbound::PacketType type, const
packet.username = name;
packet.serialize(m_dataStream);
}
new PlayClient{m_socket, m_server};
m_dataStream.setDevice({});
new PlayClient{std::move(m_socket), m_server};
deleteLater();
break;
}