sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/ENet: Refactor

This commit is contained in:
Lynix 2017-02-15 08:26:56 +01:00
parent df5d22eb30
commit 890b06bfcb
4 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Network/ENetPeer.hpp
View File

@ -50,6 +50,10 @@ namespace Nz
void DisconnectNow(UInt32 data); void DisconnectNow(UInt32 data);
inline const IpAddress& GetAddress() const; inline const IpAddress& GetAddress() const;
inline UInt32 GetMtu() const;
inline UInt32 GetPacketThrottleAcceleration() const;
inline UInt32 GetPacketThrottleDeceleration() const;
inline UInt32 GetPacketThrottleInterval() const;
inline UInt16 GetPeerId() const; inline UInt16 GetPeerId() const;
inline ENetPeerState GetState() const; inline ENetPeerState GetState() const;

20
include/Nazara/Network/ENetPeer.inl
View File

@ -13,6 +13,26 @@ namespace Nz
return m_address; return m_address;
} }
inline UInt32 ENetPeer::GetMtu() const
{
return m_mtu;
}
inline UInt32 ENetPeer::GetPacketThrottleAcceleration() const
{
return m_packetThrottleAcceleration;
}
inline UInt32 ENetPeer::GetPacketThrottleDeceleration() const
{
return m_packetThrottleDeceleration;
}
inline UInt32 ENetPeer::GetPacketThrottleInterval() const
{
return m_packetThrottleInterval;
}
inline UInt16 ENetPeer::GetPeerId() const inline UInt16 ENetPeer::GetPeerId() const
{ {
return m_incomingPeerID; return m_incomingPeerID;

28
src/Nazara/Network/ENetHost.cpp
View File

@ -335,12 +335,12 @@ namespace Nz
void ENetHost::AddToDispatchQueue(ENetPeer* peer) void ENetHost::AddToDispatchQueue(ENetPeer* peer)
{ {
m_dispatchQueue.UnboundedSet(peer->m_incomingPeerID); m_dispatchQueue.UnboundedSet(peer->GetPeerId());
} }
void ENetHost::RemoveFromDispatchQueue(ENetPeer* peer) void ENetHost::RemoveFromDispatchQueue(ENetPeer* peer)
{ {
m_dispatchQueue.UnboundedReset(peer->m_incomingPeerID); m_dispatchQueue.UnboundedReset(peer->GetPeerId());
} }
bool ENetHost::DispatchIncomingCommands(ENetEvent* event) bool ENetHost::DispatchIncomingCommands(ENetEvent* event)
@ -446,18 +446,20 @@ namespace Nz
windowSize = Clamp<UInt32>(windowSize, ENetConstants::ENetProtocol_MinimumWindowSize, ENetConstants::ENetProtocol_MaximumWindowSize); windowSize = Clamp<UInt32>(windowSize, ENetConstants::ENetProtocol_MinimumWindowSize, ENetConstants::ENetProtocol_MaximumWindowSize);
ENetProtocol verifyCommand(ENetProtocolCommand_VerifyConnect | ENetProtocolFlag_Acknowledge, 0xFF); ENetProtocol verifyCommand(ENetProtocolCommand_VerifyConnect | ENetProtocolFlag_Acknowledge, 0xFF);
verifyCommand.verifyConnect.outgoingPeerID = HostToNet(peer->m_incomingPeerID); verifyCommand.verifyConnect.connectID = peer->m_connectID;
verifyCommand.verifyConnect.incomingSessionID = peer->m_outgoingSessionID; verifyCommand.verifyConnect.incomingSessionID = peer->m_outgoingSessionID;
verifyCommand.verifyConnect.outgoingSessionID = peer->m_incomingSessionID; verifyCommand.verifyConnect.outgoingSessionID = peer->m_incomingSessionID;
verifyCommand.verifyConnect.mtu = HostToNet(peer->m_mtu);
verifyCommand.verifyConnect.windowSize = HostToNet(windowSize);
verifyCommand.verifyConnect.channelCount = HostToNet(channelCount); verifyCommand.verifyConnect.channelCount = HostToNet(channelCount);
verifyCommand.verifyConnect.incomingBandwidth = HostToNet(m_incomingBandwidth); verifyCommand.verifyConnect.incomingBandwidth = HostToNet(m_incomingBandwidth);
verifyCommand.verifyConnect.mtu = HostToNet(peer->GetMtu());
verifyCommand.verifyConnect.outgoingBandwidth = HostToNet(m_outgoingBandwidth); verifyCommand.verifyConnect.outgoingBandwidth = HostToNet(m_outgoingBandwidth);
verifyCommand.verifyConnect.packetThrottleInterval = HostToNet(peer->m_packetThrottleInterval); verifyCommand.verifyConnect.outgoingPeerID = HostToNet(peer->GetPeerId());
verifyCommand.verifyConnect.packetThrottleAcceleration = HostToNet(peer->m_packetThrottleAcceleration); verifyCommand.verifyConnect.packetThrottleAcceleration = HostToNet(peer->GetPacketThrottleAcceleration());
verifyCommand.verifyConnect.packetThrottleDeceleration = HostToNet(peer->m_packetThrottleDeceleration); verifyCommand.verifyConnect.packetThrottleDeceleration = HostToNet(peer->GetPacketThrottleDeceleration());
verifyCommand.verifyConnect.connectID = peer->m_connectID; verifyCommand.verifyConnect.packetThrottleInterval = HostToNet(peer->GetPacketThrottleInterval());
verifyCommand.verifyConnect.windowSize = HostToNet(windowSize);
peer->QueueOutgoingCommand(verifyCommand); peer->QueueOutgoingCommand(verifyCommand);
return peer; return peer;
@ -475,7 +477,7 @@ namespace Nz
UInt16 flags = peerID & ENetProtocolHeaderFlag_Mask; UInt16 flags = peerID & ENetProtocolHeaderFlag_Mask;
peerID &= ~(ENetProtocolHeaderFlag_Mask | ENetProtocolHeaderSessionMask); peerID &= ~(ENetProtocolHeaderFlag_Mask | ENetProtocolHeaderSessionMask);
std::size_t headerSize = (flags & ENetProtocolHeaderFlag_SentTime ? sizeof(ENetProtocolHeader) : (size_t) & ((ENetProtocolHeader *)0)->sentTime); std::size_t headerSize = (flags & ENetProtocolHeaderFlag_SentTime) ? sizeof(ENetProtocolHeader) : NazaraOffsetOf(ENetProtocolHeader, sentTime);
ENetPeer* peer; ENetPeer* peer;
if (peerID == ENetConstants::ENetProtocol_MaximumPeerId) if (peerID == ENetConstants::ENetProtocol_MaximumPeerId)
@ -491,7 +493,7 @@ namespace Nz
if (peer->GetState() == ENetPeerState::Disconnected || peer->GetState() == ENetPeerState::Zombie) if (peer->GetState() == ENetPeerState::Disconnected || peer->GetState() == ENetPeerState::Zombie)
return false; return false;
if (m_receivedAddress != peer->m_address && peer->m_address != IpAddress::BroadcastIpV4) if (m_receivedAddress != peer->GetAddress() && peer->GetAddress() != IpAddress::BroadcastIpV4)
return false; return false;
if (peer->m_outgoingPeerID < ENetConstants::ENetProtocol_MaximumPeerId && sessionID != peer->m_incomingSessionID) if (peer->m_outgoingPeerID < ENetConstants::ENetProtocol_MaximumPeerId && sessionID != peer->m_incomingSessionID)
@ -771,7 +773,7 @@ namespace Nz
auto currentAcknowledgement = peer->m_acknowledgements.begin(); auto currentAcknowledgement = peer->m_acknowledgements.begin();
while (currentAcknowledgement != peer->m_acknowledgements.end()) while (currentAcknowledgement != peer->m_acknowledgements.end())
{ {
if (m_commandCount >= m_commands.size() || m_bufferCount >= m_buffers.size() || peer->m_mtu - m_packetSize < sizeof(ENetProtocolAcknowledge)) if (m_commandCount >= m_commands.size() || m_bufferCount >= m_buffers.size() || peer->GetMtu() - m_packetSize < sizeof(ENetProtocolAcknowledge))
{ {
m_continueSending = true; m_continueSending = true;
break; break;
@ -1013,7 +1015,7 @@ namespace Nz
currentPeer->m_lastSendTime = m_serviceTime; currentPeer->m_lastSendTime = m_serviceTime;
std::size_t sentLength; std::size_t sentLength;
if (!m_socket.SendMultiple(currentPeer->m_address, m_buffers.data(), m_bufferCount, &sentLength)) if (!m_socket.SendMultiple(currentPeer->GetAddress(), m_buffers.data(), m_bufferCount, &sentLength))
return -1; return -1;
currentPeer->RemoveSentUnreliableCommands(); currentPeer->RemoveSentUnreliableCommands();

2
src/Nazara/Network/ENetPeer.cpp
View File

@ -845,7 +845,7 @@ namespace Nz
if (!IsConnected()) if (!IsConnected())
return false; return false;
m_packetThrottleInterval = NetToHost(command->throttleConfigure.packetThrottleInterval); m_packetThrottleInterval = NetToHost(command->throttleConfigure.packetThrottleInterval);
m_packetThrottleAcceleration = NetToHost(command->throttleConfigure.packetThrottleAcceleration); m_packetThrottleAcceleration = NetToHost(command->throttleConfigure.packetThrottleAcceleration);
m_packetThrottleDeceleration = NetToHost(command->throttleConfigure.packetThrottleDeceleration); m_packetThrottleDeceleration = NetToHost(command->throttleConfigure.packetThrottleDeceleration);