BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-03 08:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

use message() instead of what() for ec

Browse Source
This commit is contained in:
Lion Kortlepel 2022-10-06 01:35:50 +02:00
parent 7d1318653c
commit 4320a91e5c
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Client.cpp
View File

@ -62,11 +62,11 @@ void TClient::Disconnect(std::string_view Reason) {
boost::system::error_code ec; boost::system::error_code ec;
mSocket.shutdown(socket_base::shutdown_both, ec); mSocket.shutdown(socket_base::shutdown_both, ec);
if (ec) { if (ec) {
beammp_warnf("Failed to shutdown client socket: {}", ec.what()); beammp_warnf("Failed to shutdown client socket: {}", ec.message());
} }
mSocket.close(ec); mSocket.close(ec);
if (ec) { if (ec) {
beammp_warnf("Failed to close client socket: {}", ec.what()); beammp_warnf("Failed to close client socket: {}", ec.message());
} }
} }

24
src/TNetwork.cpp
View File

@ -64,13 +64,13 @@ void TNetwork::UDPServerMain() {
boost::system::error_code ec; boost::system::error_code ec;
mUDPSock.open(UdpListenEndpoint.protocol(), ec); mUDPSock.open(UdpListenEndpoint.protocol(), ec);
if (ec) { if (ec) {
beammp_error("open() failed: " + ec.what()); beammp_error("open() failed: " + ec.message());
std::this_thread::sleep_for(std::chrono::seconds(5)); std::this_thread::sleep_for(std::chrono::seconds(5));
Application::GracefullyShutdown(); Application::GracefullyShutdown();
} }
mUDPSock.bind(UdpListenEndpoint, ec); mUDPSock.bind(UdpListenEndpoint, ec);
if (ec) { if (ec) {
beammp_error("bind() failed: " + ec.what()); beammp_error("bind() failed: " + ec.message());
std::this_thread::sleep_for(std::chrono::seconds(5)); std::this_thread::sleep_for(std::chrono::seconds(5));
Application::GracefullyShutdown(); Application::GracefullyShutdown();
} }
@ -118,7 +118,7 @@ void TNetwork::TCPServerMain() {
boost::system::error_code ec; boost::system::error_code ec;
Listener.open(ListenEp.protocol(), ec); Listener.open(ListenEp.protocol(), ec);
if (ec) { if (ec) {
beammp_errorf("Failed to open socket: {}", ec.what()); beammp_errorf("Failed to open socket: {}", ec.message());
return; return;
} }
socket_base::linger LingerOpt {}; socket_base::linger LingerOpt {};
@ -127,7 +127,7 @@ void TNetwork::TCPServerMain() {
if (ec) { if (ec) {
beammp_errorf("Failed to set up listening socket to not linger / reuse address. " beammp_errorf("Failed to set up listening socket to not linger / reuse address. "
"This may cause the socket to refuse to bind(). Error: {}", "This may cause the socket to refuse to bind(). Error: {}",
ec.what()); ec.message());
} }
ip::tcp::acceptor Acceptor(mServer.IoCtx(), ListenEp); ip::tcp::acceptor Acceptor(mServer.IoCtx(), ListenEp);
@ -135,7 +135,7 @@ void TNetwork::TCPServerMain() {
if (ec) { if (ec) {
beammp_errorf("listen() failed, which is needed for the server to operate. " beammp_errorf("listen() failed, which is needed for the server to operate. "
"Shutting down. Error: {}", "Shutting down. Error: {}",
ec.what()); ec.message());
Application::GracefullyShutdown(); Application::GracefullyShutdown();
} }
Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good); Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good);
@ -149,7 +149,7 @@ void TNetwork::TCPServerMain() {
ip::tcp::endpoint ClientEp; ip::tcp::endpoint ClientEp;
ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec); ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
if (ec) { if (ec) {
beammp_errorf("failed to accept: {}", ec.what()); beammp_errorf("failed to accept: {}", ec.message());
} }
TConnection Conn { std::move(ClientSocket), ClientEp }; TConnection Conn { std::move(ClientSocket), ClientEp };
std::thread ID(&TNetwork::Identify, this, std::move(Conn)); std::thread ID(&TNetwork::Identify, this, std::move(Conn));
@ -366,7 +366,7 @@ bool TNetwork::TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync
boost::system::error_code ec; boost::system::error_code ec;
write(Sock, buffer(ToSend), ec); write(Sock, buffer(ToSend), ec);
if (ec) { if (ec) {
beammp_debugf("write(): {}", ec.what()); beammp_debugf("write(): {}", ec.message());
c.Disconnect("write() failed"); c.Disconnect("write() failed");
return false; return false;
} }
@ -388,7 +388,7 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
read(Sock, buffer(HeaderData), ec); read(Sock, buffer(HeaderData), ec);
if (ec) { if (ec) {
// TODO: handle this case (read failed) // TODO: handle this case (read failed)
beammp_debugf("TCPRcv: Reading header failed: {}", ec.what()); beammp_debugf("TCPRcv: Reading header failed: {}", ec.message());
return {}; return {};
} }
Header = *reinterpret_cast<int32_t*>(HeaderData.data()); Header = *reinterpret_cast<int32_t*>(HeaderData.data());
@ -405,7 +405,7 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
auto N = read(Sock, buffer(Data), ec); auto N = read(Sock, buffer(Data), ec);
if (ec) { if (ec) {
// TODO: handle this case properly // TODO: handle this case properly
beammp_debugf("TCPRcv: Reading data failed: {}", ec.what()); beammp_debugf("TCPRcv: Reading data failed: {}", ec.message());
return {}; return {};
} }
@ -771,7 +771,7 @@ bool TNetwork::TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Da
boost::system::error_code ec; boost::system::error_code ec;
write(socket, buffer(Data, Size), ec); write(socket, buffer(Data, Size), ec);
if (ec) { if (ec) {
beammp_errorf("Failed to send raw data to client: {}", ec.what()); beammp_errorf("Failed to send raw data to client: {}", ec.message());
return false; return false;
} }
C.UpdatePingTime(); C.UpdatePingTime();
@ -911,7 +911,7 @@ bool TNetwork::UDPSend(TClient& Client, std::vector<uint8_t> Data) {
boost::system::error_code ec; boost::system::error_code ec;
mUDPSock.send_to(buffer(Data), Addr, 0, ec); mUDPSock.send_to(buffer(Data), Addr, 0, ec);
if (ec) { if (ec) {
beammp_debugf("UDP sendto() failed: {}", ec.what()); beammp_debugf("UDP sendto() failed: {}", ec.message());
if (!Client.IsDisconnected()) if (!Client.IsDisconnected())
Client.Disconnect("UDP send failed"); Client.Disconnect("UDP send failed");
return false; return false;
@ -924,7 +924,7 @@ std::vector<uint8_t> TNetwork::UDPRcvFromClient(ip::udp::endpoint& ClientEndpoin
boost::system::error_code ec; boost::system::error_code ec;
const auto Rcv = mUDPSock.receive_from(mutable_buffer(Ret.data(), Ret.size()), ClientEndpoint, 0, ec); const auto Rcv = mUDPSock.receive_from(mutable_buffer(Ret.data(), Ret.size()), ClientEndpoint, 0, ec);
if (ec) { if (ec) {
beammp_errorf("UDP recvfrom() failed: {}", ec.what()); beammp_errorf("UDP recvfrom() failed: {}", ec.message());
return {}; return {};
} }
// FIXME: This breaks binary data due to \0. // FIXME: This breaks binary data due to \0.