Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -103,6 +103,14 @@ namespace AzNetworking
        //! @return the connection identifier for this connection instance
        ConnectionId GetConnectionId() const;

+        //! Sets connection user data to the provided value.
+        //! @param userData the user data value to bind to this connection
+        void SetUserData(void* userData);
+
+        //! Retrieves the connection user data bound to this instance.
+        //! @return the connection user data bound to this instance
+        void* GetUserData() const;
+
        //! Sets the remote address for this connection instance.
        //! @param address the remote address to use for this connection instance
        void SetRemoteAddress(const IpAddress& address);
@@ -122,9 +130,10 @@ namespace AzNetworking
    private:

        // The following data members are here in the interface for performance reasons
-        ConnectionId      m_connectionId;
+        ConnectionId      m_connectionId = InvalidConnectionId;
        IpAddress         m_remoteAddress;
        ConnectionMetrics m_connectionMetrics;
+        void*             m_userData = nullptr;
    };
 }

@@ -34,6 +34,16 @@ namespace AzNetworking
        return m_connectionId;
    }

+    inline void IConnection::SetUserData(void* userData)
+    {
+        m_userData = userData;
+    }
+
+    inline void* IConnection::GetUserData() const
+    {
+        return m_userData;
+    }
+
    inline void IConnection::SetRemoteAddress(const IpAddress& address)
    {
        m_remoteAddress = address;