Move packet dispatch to return an enum that includes a pending option

Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-24 16:19:38 -07:00
parent 97a053a540
commit decf15df21
14 changed files with 73 additions and 38 deletions
@@ -16,7 +16,7 @@ namespace {{ xml.attrib['Name'] }}
    //! @param handler      the handler used to handle the received packet
    //! @return boolean true on successful dispatch, false if the request was not handled
    template <typename HANDLER>
-    bool DispatchPacket(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer, HANDLER& handler);
+    AzNetworking::PacketDispatchResult DispatchPacket(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer, HANDLER& handler);
 }
 {% endfor %}

@@ -2,7 +2,7 @@
 namespace {{ xml.attrib['Name'] }}
 {
    template <typename HANDLER>
-    inline bool DispatchPacket(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer, HANDLER& handler)
+    inline AzNetworking::PacketDispatchResult DispatchPacket(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer, HANDLER& handler)
    {
        switch (aznumeric_cast<int32_t>(packetHeader.GetPacketType()))
        {
@@ -10,16 +10,26 @@ namespace {{ xml.attrib['Name'] }}
            case aznumeric_cast<int32_t>({{ Packet.attrib['Name'] }}::Type):
            {
                AZLOG(Debug_DispatchPackets, "Received packet %s", "{{ Packet.attrib['Name'] }}");
+{%      if ('HandshakePacket' not in Packet.attrib) or (Packet.attrib['HandshakePacket'] == 'false') %}
+                if (!handler.IsHandshakeComplete())
+                {
+                    return AzNetworking::PacketDispatchResult::Pending;
+                }
+{% endif %}
+
                {{ Packet.attrib['Name'] }} packet;
                if (!serializer.Serialize(packet, "Packet"))
                {
-                    return false;
+                    return AzNetworking::PacketDispatchResult::Failure;
+                }
+                if(handler.HandleRequest(connection, packetHeader, packet))
+                {
+                    return AzNetworking::PacketDispatchResult::Success;
                }
-                return handler.HandleRequest(connection, packetHeader, packet);
            }
 {%      endfor %}
        }
-        return false;
+        return AzNetworking::PacketDispatchResult::Failure;
    }
 }
 {% endfor %}