From 24cb8f684574f5105ea396c8a72fae202b49bf25 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 29 Dec 2019 11:54:00 +0100 Subject: [PATCH] Add ENet::GetTotalPacketReceived --- ChangeLog.md | 1 + include/Nazara/Network/ENetPeer.hpp | 2 ++ include/Nazara/Network/ENetPeer.inl | 5 +++++ src/Nazara/Network/ENetHost.cpp | 3 +++ src/Nazara/Network/ENetPeer.cpp | 1 + 5 files changed, 12 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index ad8ee9527..c9ca47f68 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -210,6 +210,7 @@ Nazara Engine: - Added physics function to control sleeping behavior - String::Number is now locale-independent - Added ENetPeer::GetTotalByte[Received|Sent] +- Added ENetPeer::GetTotalPacketSent Nazara Development Kit: - Added ImageWidget (#139) diff --git a/include/Nazara/Network/ENetPeer.hpp b/include/Nazara/Network/ENetPeer.hpp index 7669bc142..7675855d4 100644 --- a/include/Nazara/Network/ENetPeer.hpp +++ b/include/Nazara/Network/ENetPeer.hpp @@ -58,6 +58,7 @@ namespace Nz inline ENetPeerState GetState() const; inline UInt64 GetTotalByteReceived() const; inline UInt64 GetTotalByteSent() const; + inline UInt64 GetTotalPacketReceived() const; inline UInt64 GetTotalPacketLost() const; inline UInt64 GetTotalPacketSent() const; @@ -241,6 +242,7 @@ namespace Nz UInt32 m_windowSize; UInt64 m_totalByteReceived; UInt64 m_totalByteSent; + UInt64 m_totalPacketReceived; UInt64 m_totalPacketLost; UInt64 m_totalPacketSent; bool m_isSimulationEnabled; diff --git a/include/Nazara/Network/ENetPeer.inl b/include/Nazara/Network/ENetPeer.inl index 660614944..8b2d0f21a 100644 --- a/include/Nazara/Network/ENetPeer.inl +++ b/include/Nazara/Network/ENetPeer.inl @@ -72,6 +72,11 @@ namespace Nz return m_totalByteSent; } + inline UInt64 ENetPeer::GetTotalPacketReceived() const + { + return m_totalPacketReceived; + } + inline UInt64 ENetPeer::GetTotalPacketLost() const { return m_totalPacketLost; diff --git a/src/Nazara/Network/ENetHost.cpp b/src/Nazara/Network/ENetHost.cpp index 4966a9042..54e508641 100644 --- a/src/Nazara/Network/ENetHost.cpp +++ b/src/Nazara/Network/ENetHost.cpp @@ -658,6 +658,9 @@ namespace Nz return commandError(); } + if (peer) + peer->m_totalPacketReceived++; + if (peer && (command->header.command & ENetProtocolFlag_Acknowledge) != 0) { UInt16 sentTime; diff --git a/src/Nazara/Network/ENetPeer.cpp b/src/Nazara/Network/ENetPeer.cpp index c897f4790..294585631 100644 --- a/src/Nazara/Network/ENetPeer.cpp +++ b/src/Nazara/Network/ENetPeer.cpp @@ -165,6 +165,7 @@ namespace Nz m_eventData = 0; m_totalByteReceived = 0; m_totalByteSent = 0; + m_totalPacketReceived = 0; m_totalPacketLost = 0; m_totalPacketSent = 0; m_totalWaitingData = 0;