Skip to content
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

Jump to bottom

RakNet InternalPacketPool & RakPeer::Send improvements and fixes #923

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −4
Open

RakNet InternalPacketPool & RakPeer::Send improvements and fixes #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a391055
sync raknet, use RakServer::Send functions with omp NetworkBitStream …
AmyrAhmady May 2, 2024
efbf6f3
update raknet submodule
AmyrAhmady May 8, 2024
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
6 changes: 3 additions & 3 deletions Server/Components/LegacyNetwork/legacy_network_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@ class RakNetLegacyNetwork final : public Network, public CoreEventHandler, publi
const PeerNetworkData::NetworkID& nid = netData.networkID;
const RakNet::PlayerID rid { unsigned(nid.address.v4), nid.port };

return rakNetServer.Send((const char*)bs.GetData(), bs.GetNumberOfUnreadBits(), RakNet::HIGH_PRIORITY, reliability, channel, rid, true);
return rakNetServer.Send(&bs, RakNet::HIGH_PRIORITY, reliability, channel, rid, true);
}
}

return rakNetServer.Send((const char*)bs.GetData(), bs.GetNumberOfUnreadBits(), RakNet::HIGH_PRIORITY, reliability, channel, RakNet::UNASSIGNED_PLAYER_ID, true);
return rakNetServer.Send(&bs, RakNet::HIGH_PRIORITY, reliability, channel, RakNet::UNASSIGNED_PLAYER_ID, true);
}

bool sendPacket(IPlayer& peer, Span<uint8_t> data, int channel, bool dispatchEvents) override
Expand Down Expand Up @@ -180,7 +180,7 @@ class RakNetLegacyNetwork final : public Network, public CoreEventHandler, publi
const PeerNetworkData::NetworkID& nid = netData.networkID;
const RakNet::PlayerID rid { unsigned(nid.address.v4), nid.port };
const RakNet::PacketReliability reliability = (channel == OrderingChannel_Reliable) ? RakNet::RELIABLE : ((channel == OrderingChannel_Unordered) ? RakNet::UNRELIABLE : RakNet::UNRELIABLE_SEQUENCED);
return rakNetServer.Send((const char*)bs.GetData(), bs.GetNumberOfBytesUsed(), RakNet::HIGH_PRIORITY, reliability, channel, rid, false);
return rakNetServer.Send(&bs, RakNet::HIGH_PRIORITY, reliability, channel, rid, false);
}

bool broadcastRPC(int id, Span<uint8_t> data, int channel, const IPlayer* exceptPeer, bool dispatchEvents) override
Expand Down
2 changes: 1 addition & 1 deletion lib/RakNet
Open in desktop
Submodule RakNet updated 15 files
+6 −28 CMakeLists.txt
+302 −0 Include/raknet/DS_MemoryPoolModern.h
+0 −58 Include/raknet/InternalPacketPool.h
+9 −0 Include/raknet/RakClient.h
+9 −0 Include/raknet/RakClientInterface.h
+10 −0 Include/raknet/RakPeer.h
+11 −0 Include/raknet/RakPeerInterface.h
+11 −0 Include/raknet/RakServer.h
+11 −0 Include/raknet/RakServerInterface.h
+10 −2 Include/raknet/ReliabilityLayer.h
+0 −75 Source/InternalPacketPool.cpp
+9 −1 Source/RakClient.cpp
+30 −1 Source/RakPeer.cpp
+97 −130 Source/ReliabilityLayer.cpp
+5 −0 Source/rakserver.cpp
Loading