Skip to content

Fix ping instability by serializing async writes with a per-session w… #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nadav78 wants to merge 1 commit into
base: toybattles_mvsurge
Choose a base branch
from
Open

Fix ping instability by serializing async writes with a per-session w… #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 10 additions & 22 deletions Common/include/Network/Session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ namespace Common
std::string m_ip;
std::string m_gradedIp{ "" };
std::uint_least16_t m_port;
std::queue<std::vector<std::uint8_t>> m_writeQueue{};

public:
std::string m_hwid = "";
Expand Down Expand Up @@ -142,50 +143,37 @@ namespace Common
}
void sendConnectionACK(Common::Enums::ServerType serverType);

void doWrite();

template<PacketType packetType, typename Packet>
bool asyncWriteImpl(const Packet& message)
requires (packetType == PacketType::ENCRYPTED || packetType == PacketType::UNECRYPTED)
{
if (!m_socket.is_open())
{
return false;
}

auto packetData = std::make_shared<std::vector<std::uint8_t>>();

std::vector<std::uint8_t> packetData;
if constexpr (packetType == PacketType::ENCRYPTED)
{
if (!message.isValidMain())
{
return false;
}
*packetData = message.generateOutgoingPacket(m_crypt.UserKey, m_crypt.isUsed);
packetData = message.generateOutgoingPacket(m_crypt.UserKey, m_crypt.isUsed);
}
else if constexpr (packetType == PacketType::UNECRYPTED)
{
if (!message.isValidCast())
{
return false;
}
*packetData = message.generateOutgoingPacket();
packetData = message.generateOutgoingPacket();
}

auto packetSize = message.getFullSize();

//if (m_crypt.isUsed) Common::Parser::parse(m_reader.data(), m_reader.size(), 13000, "client", "server", m_crypt.UserKey);
asio::async_write(m_socket, asio::buffer(packetData->data(), packetSize),
[this, self = this->shared_from_this(), packetData](const asio::error_code& errorCode, std::size_t)
{
if (!m_socket.is_open())
{
return;
}
if (errorCode)
{
closeSocket();
}

});
const bool idle = m_writeQueue.empty();
m_writeQueue.push(std::move(packetData));
if (idle)
doWrite();

return true;
}
Expand Down
20 changes: 19 additions & 1 deletion Common/src/Network/Session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,25 @@ namespace Common
}
}

void Session::closeSocket()
void Session::doWrite()
{
if (m_writeQueue.empty() || !m_socket.is_open())
return;

asio::async_write(m_socket, asio::buffer(m_writeQueue.front().data(), m_writeQueue.front().size()),
[this, self = this->shared_from_this()](const asio::error_code& errorCode, std::size_t)
{
m_writeQueue.pop();
if (errorCode)
{
closeSocket();
return;
}
doWrite();
});
}

void Session::closeSocket()
{
if (!m_socket.is_open())
{
Expand Down
Loading