Pārlūkot izejas kodu

Update NetSoakTest against recent AzNetworking changes

Signed-off-by: puvvadar <[email protected]>
puvvadar 3 gadi atpakaļ
vecāks
revīzija
a0d9180d7a

+ 7 - 3
Gem/Code/Source/NetSoakTestSystemComponent.cpp

@@ -209,6 +209,11 @@ namespace NetSoakTest
         return AZ::TICK_PLACEMENT + 2;
     }
 
+    bool NetSoakTestSystemComponent::IsHandshakeComplete() const
+    {
+        return true;
+    }
+
     bool NetSoakTestSystemComponent::HandleRequest([[maybe_unused]] IConnection* connection,
         [[maybe_unused]] const IPacketHeader& packetHeader, [[maybe_unused]] const NetSoakTestPackets::Small& packet)
     {
@@ -229,11 +234,10 @@ namespace NetSoakTest
 
     void NetSoakTestSystemComponent::OnConnect(IConnection* connection)
     {
-        ConnectionQuality testQuality;
+        ConnectionQuality& testQuality = connection->GetConnectionQuality();
         testQuality.m_latencyMs = soak_latencyms;
         testQuality.m_lossPercentage = soak_losspercentage;
         testQuality.m_varianceMs = soak_variancems;
-        connection->SetConnectionQuality(testQuality);
 
         if (connection->GetConnectionRole() == ConnectionRole::Connector)
         {
@@ -245,7 +249,7 @@ namespace NetSoakTest
         }
     }
 
-    bool NetSoakTestSystemComponent::OnPacketReceived([[maybe_unused]] IConnection* connection, [[maybe_unused]] const IPacketHeader& packetHeader, [[maybe_unused]] ISerializer& serializer)
+    PacketDispatchResult NetSoakTestSystemComponent::OnPacketReceived(IConnection* connection, const IPacketHeader& packetHeader, ISerializer& serializer)
     {
         return NetSoakTestPackets::DispatchPacket(connection, packetHeader, serializer, *this);
     }

+ 2 - 1
Gem/Code/Source/NetSoakTestSystemComponent.h

@@ -39,6 +39,7 @@ namespace NetSoakTest
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
         static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
+        bool IsHandshakeComplete() const;
         bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, const NetSoakTestPackets::Small& packet);
         bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, const NetSoakTestPackets::Large& packet);
 
@@ -65,7 +66,7 @@ namespace NetSoakTest
         // IConnectionListener interface
         AzNetworking::ConnectResult ValidateConnect(const AzNetworking::IpAddress& remoteAddress, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer) override;
         void OnConnect(AzNetworking::IConnection* connection) override;
-        bool OnPacketReceived(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer) override;
+        AzNetworking::PacketDispatchResult OnPacketReceived(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer) override;
         void OnPacketLost(AzNetworking::IConnection* connection, AzNetworking::PacketId packetId) override;
         void OnDisconnect(AzNetworking::IConnection* connection, AzNetworking::DisconnectReason reason, AzNetworking::TerminationEndpoint endpoint) override;
         ////////////////////////////////////////////////////////////////////////