backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-30 12:32:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use standard byte types in socket queues

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-10 09:46:48 +11:00
parent 344921bb26
commit cc8c956358
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.World/Network/Socket.cpp
View file

@ -147,7 +147,7 @@ void Socket::setPlayer(INetworkPlayer *player)
}
}
void Socket::pushDataToQueue(const BYTE * pbData, DWORD dwDataSize, bool fromHost /*= true*/)
void Socket::pushDataToQueue(const std::uint8_t *pbData, std::size_t dataSize, bool fromHost /*= true*/)
{
int queueIdx = SOCKET_CLIENT_END;
if(!fromHost)
@ -160,7 +160,7 @@ void Socket::pushDataToQueue(const BYTE * pbData, DWORD dwDataSize, bool fromHos
}
EnterCriticalSection(&m_queueLockNetwork[queueIdx]);
for( unsigned int i = 0; i < dwDataSize; i++ )
for(std::size_t i = 0; i < dataSize; ++i)
{
m_queueNetwork[queueIdx].push(*pbData++);
}
@ -564,4 +564,4 @@ void Socket::SocketOutputStreamNetwork::writeWithFlags(byteArray b, unsigned int
void Socket::SocketOutputStreamNetwork::close()
{
m_streamOpen = false;
}
}

3
Minecraft.World/Network/Socket.h
View file

@ -1,4 +1,5 @@
#pragma once
#include <cstddef>
#include <cstdint>
#ifndef __linux__
#include <xrnm.h>
@ -123,7 +124,7 @@ public:
Socket(bool response = false); // 4J - Create a local socket, for end 0 or 1 of a connection
Socket(INetworkPlayer *player, bool response = false, bool hostLocal = false); // 4J - Create a socket for an INetworkPlayer
SocketAddress *getRemoteSocketAddress();
void pushDataToQueue(const BYTE * pbData, DWORD dwDataSize, bool fromHost = true);
void pushDataToQueue(const std::uint8_t *pbData, std::size_t dataSize, bool fromHost = true);
static void addIncomingSocket(Socket *socket);
InputStream *getInputStream(bool isServerConnection);
void setSoTimeout(int a );