R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Slight cleanup

Browse Source
This commit is contained in:
Amos 2022-02-06 17:27:47 +01:00
parent bba0120e88
commit 7fff22ccec
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/core/init.cpp
View File

@ -73,7 +73,7 @@ void Systems_Init()
int nError = ::WSAStartup(MAKEWORD(2, 2), &wsaData);
if (nError != 0)
{
assert(nError != 0 && "Failed to start Winsock via WSAStartup.");
std::cerr << "Failed to start Winsock via WSAStartup. Error: " << nError << std::endl;
}
// Begin the detour transaction to hook the the process
@ -149,7 +149,7 @@ void Systems_Shutdown()
int nError = ::WSACleanup();
if (nError != 0)
{
assert(nError != 0 && "Failed to stop winsock via WSACleanup.\n");
std::cerr << "Failed to stop winsock via WSACleanup. Error: " << nError << std::endl;
}
// Begin the detour transaction to unhook the the process

16
r5dev/netconsole/netconsole.cpp
View File

@ -14,8 +14,7 @@
//-----------------------------------------------------------------------------
void CNetCon::Send(void)
{
char buf[MAX_NETCONSOLE_INPUT_LEN]{};
std::string svUserInput;
static std::string svUserInput;
do
{
@ -24,11 +23,6 @@ void CNetCon::Send(void)
svUserInput.append("\n\r");
int nSendResult = ::send(pSocket->GetAcceptedSocketData(0)->m_hSocket, svUserInput.c_str(), svUserInput.size(), MSG_NOSIGNAL);
if (nSendResult != SOCKET_ERROR)
{
memcpy(buf, "", MAX_NETCONSOLE_INPUT_LEN);
}
} while (svUserInput.size() > 0);
}
@ -37,17 +31,17 @@ void CNetCon::Send(void)
//-----------------------------------------------------------------------------
void CNetCon::Recv(void)
{
static char buf[MAX_NETCONSOLE_INPUT_LEN]{};
static char szRecvBuf[MAX_NETCONSOLE_INPUT_LEN]{};
for (;;)
{
std::this_thread::sleep_for(std::chrono::milliseconds(100));
int nRecvLen = ::recv(pSocket->GetAcceptedSocketData(0)->m_hSocket, buf, sizeof(buf), MSG_NOSIGNAL);
int nRecvLen = ::recv(pSocket->GetAcceptedSocketData(0)->m_hSocket, szRecvBuf, sizeof(szRecvBuf), MSG_NOSIGNAL);
if (nRecvLen > 0 && nRecvLen < MAX_NETCONSOLE_INPUT_LEN - 1)
{
buf[nRecvLen + 1] = '\0';
printf("%s\n", buf);
szRecvBuf[nRecvLen + 1] = '\0';
printf("%s\n", szRecvBuf);
}
}
}