refactor: 복사 코드 함수화
This commit is contained in:
parent
1a7a4b7466
commit
2d35fd6c8b
3 changed files with 29 additions and 48 deletions
|
|
@ -16,6 +16,20 @@ public:
|
||||||
void Start();
|
void Start();
|
||||||
void Send(std::span<const uint8_t> data);
|
void Send(std::span<const uint8_t> data);
|
||||||
|
|
||||||
|
template <typename T> void SendPacket(PacketID id, const T &payload) {
|
||||||
|
PacketHeader header;
|
||||||
|
header.id = static_cast<uint16_t>(id);
|
||||||
|
header.size = sizeof(T);
|
||||||
|
|
||||||
|
std::vector<uint8_t> buffer(sizeof(PacketHeader) + sizeof(T));
|
||||||
|
std::memcpy(buffer.data(), &header, sizeof(PacketHeader));
|
||||||
|
std::memcpy(buffer.data() + sizeof(PacketHeader), &payload, sizeof(T));
|
||||||
|
|
||||||
|
Send(buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendPacket(PacketID id);
|
||||||
|
|
||||||
void SetNickname(const std::string &nickname);
|
void SetNickname(const std::string &nickname);
|
||||||
const std::string &GetNickname() const;
|
const std::string &GetNickname() const;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,7 @@ PacketHandler::HandlePacket(std::shared_ptr<Session> session,
|
||||||
switch (static_cast<PacketID>(packet.header.id)) {
|
switch (static_cast<PacketID>(packet.header.id)) {
|
||||||
case PacketID::Ping: {
|
case PacketID::Ping: {
|
||||||
Logger::Log("Ping 수신됨");
|
Logger::Log("Ping 수신됨");
|
||||||
session->Send(std::span<const uint8_t>(
|
session->SendPacket(PacketID::Ping);
|
||||||
reinterpret_cast<const uint8_t *>(&packet.header),
|
|
||||||
sizeof(PacketHeader)));
|
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case PacketID::CS_Login: {
|
case PacketID::CS_Login: {
|
||||||
|
|
@ -40,18 +38,7 @@ PacketHandler::HandlePacket(std::shared_ptr<Session> session,
|
||||||
if (!SessionManager::GetInstance().TryJoin(session, userData.nickname)) {
|
if (!SessionManager::GetInstance().TryJoin(session, userData.nickname)) {
|
||||||
Logger::Log("중복 로그인 거부: ", nickname);
|
Logger::Log("중복 로그인 거부: ", nickname);
|
||||||
loginResult.result = 0;
|
loginResult.result = 0;
|
||||||
|
session->SendPacket(PacketID::SC_LoginResult, loginResult);
|
||||||
PacketHeader header;
|
|
||||||
header.id = static_cast<uint16_t>(PacketID::SC_LoginResult);
|
|
||||||
header.size = sizeof(PKT_SC_LoginResult);
|
|
||||||
|
|
||||||
std::vector<uint8_t> buffer(sizeof(PacketHeader) +
|
|
||||||
sizeof(PKT_SC_LoginResult));
|
|
||||||
std::memcpy(buffer.data(), &header, sizeof(PacketHeader));
|
|
||||||
std::memcpy(buffer.data() + sizeof(PacketHeader), &loginResult,
|
|
||||||
sizeof(PKT_SC_LoginResult));
|
|
||||||
|
|
||||||
session->Send(buffer);
|
|
||||||
co_return;
|
co_return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -60,18 +47,7 @@ PacketHandler::HandlePacket(std::shared_ptr<Session> session,
|
||||||
", Level: ", session->GetSwordLevel(), ")");
|
", Level: ", session->GetSwordLevel(), ")");
|
||||||
|
|
||||||
loginResult.result = 1;
|
loginResult.result = 1;
|
||||||
|
session->SendPacket(PacketID::SC_LoginResult, loginResult);
|
||||||
PacketHeader header;
|
|
||||||
header.id = static_cast<uint16_t>(PacketID::SC_LoginResult);
|
|
||||||
header.size = sizeof(PKT_SC_LoginResult);
|
|
||||||
|
|
||||||
std::vector<uint8_t> buffer(sizeof(PacketHeader) +
|
|
||||||
sizeof(PKT_SC_LoginResult));
|
|
||||||
std::memcpy(buffer.data(), &header, sizeof(PacketHeader));
|
|
||||||
std::memcpy(buffer.data() + sizeof(PacketHeader), &loginResult,
|
|
||||||
sizeof(PKT_SC_LoginResult));
|
|
||||||
|
|
||||||
session->Send(buffer);
|
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
case PacketID::CS_UpgradeSword: {
|
case PacketID::CS_UpgradeSword: {
|
||||||
|
|
@ -104,16 +80,7 @@ PacketHandler::HandlePacket(std::shared_ptr<Session> session,
|
||||||
res.currentGold = session->GetGold();
|
res.currentGold = session->GetGold();
|
||||||
|
|
||||||
// 결과 패킷 전송
|
// 결과 패킷 전송
|
||||||
PacketHeader header;
|
session->SendPacket(PacketID::SC_UpgradeResult, res);
|
||||||
header.id = static_cast<uint16_t>(PacketID::SC_UpgradeResult);
|
|
||||||
header.size = sizeof(PKT_SC_UpgradeResult);
|
|
||||||
|
|
||||||
std::vector<uint8_t> buffer(sizeof(PacketHeader) +
|
|
||||||
sizeof(PKT_SC_UpgradeResult));
|
|
||||||
std::memcpy(buffer.data(), &header, sizeof(PacketHeader));
|
|
||||||
std::memcpy(buffer.data() + sizeof(PacketHeader), &res,
|
|
||||||
sizeof(PKT_SC_UpgradeResult));
|
|
||||||
session->Send(buffer);
|
|
||||||
|
|
||||||
// 브로드캐스트
|
// 브로드캐스트
|
||||||
if (currentGold >= cost) {
|
if (currentGold >= cost) {
|
||||||
|
|
@ -158,17 +125,7 @@ PacketHandler::HandlePacket(std::shared_ptr<Session> session,
|
||||||
res.earnedGold = price;
|
res.earnedGold = price;
|
||||||
res.totalGold = newGold;
|
res.totalGold = newGold;
|
||||||
|
|
||||||
PacketHeader header;
|
session->SendPacket(PacketID::SC_SellResult, res);
|
||||||
header.id = static_cast<uint16_t>(PacketID::SC_SellResult);
|
|
||||||
header.size = sizeof(PKT_SC_SellResult);
|
|
||||||
|
|
||||||
std::vector<uint8_t> buffer(sizeof(PacketHeader) +
|
|
||||||
sizeof(PKT_SC_SellResult));
|
|
||||||
std::memcpy(buffer.data(), &header, sizeof(PacketHeader));
|
|
||||||
std::memcpy(buffer.data() + sizeof(PacketHeader), &res,
|
|
||||||
sizeof(PKT_SC_SellResult));
|
|
||||||
|
|
||||||
session->Send(buffer);
|
|
||||||
|
|
||||||
Logger::Log("검 판매 [", session->GetNickname(), "]: ", price,
|
Logger::Log("검 판매 [", session->GetNickname(), "]: ", price,
|
||||||
" 골드 획득");
|
" 골드 획득");
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
#include "SessionManager.h"
|
#include "SessionManager.h"
|
||||||
#include <boost/asio/co_spawn.hpp>
|
#include <boost/asio/co_spawn.hpp>
|
||||||
#include <boost/asio/detached.hpp>
|
#include <boost/asio/detached.hpp>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
Session::Session(tcp::socket socket) : socket_(std::move(socket)) {}
|
Session::Session(tcp::socket socket) : socket_(std::move(socket)) {}
|
||||||
|
|
||||||
|
|
@ -21,6 +22,15 @@ uint32_t Session::GetSwordLevel() const { return swordLevel_; }
|
||||||
|
|
||||||
void Session::Start() { DoReadHeader(); }
|
void Session::Start() { DoReadHeader(); }
|
||||||
|
|
||||||
|
void Session::SendPacket(PacketID id) {
|
||||||
|
PacketHeader header;
|
||||||
|
header.id = static_cast<uint16_t>(id);
|
||||||
|
header.size = 0;
|
||||||
|
std::vector<uint8_t> buffer(sizeof(PacketHeader));
|
||||||
|
std::memcpy(buffer.data(), &header, sizeof(PacketHeader));
|
||||||
|
Send(buffer);
|
||||||
|
}
|
||||||
|
|
||||||
void Session::Send(std::span<const uint8_t> data) {
|
void Session::Send(std::span<const uint8_t> data) {
|
||||||
auto self(shared_from_this());
|
auto self(shared_from_this());
|
||||||
boost::asio::post(
|
boost::asio::post(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue