diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp index 506e03c0..f71854d2 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp @@ -177,7 +177,7 @@ static bool ListenPortIncrement ( ) { NtListener * listener; for (listener = s_listenList.Head(); listener; listener = s_listenList.Next(listener)) { - if (!NetAddressEqual(listener->addr, listenAddr)) + if (listener->addr != listenAddr) continue; if (listener->notifyProc != notifyProc) continue; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h index e238b8b9..761fad44 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.h @@ -79,6 +79,13 @@ public: plNetAddress(const char* addr, uint16_t port); virtual ~plNetAddress(){} + bool operator==(const plNetAddress& other) const { + return (GetHost() == other.GetHost()) && (GetPort() == other.GetPort()); + } + bool operator!=(const plNetAddress& other) const { + return !(*this == other); + } + void Clear(); bool SetAnyAddr(); diff --git a/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp index c6bbd0f5..d52accf2 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp +++ b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp @@ -94,15 +94,6 @@ static NetAddressNode NodeFromString (const wchar_t * string[]) { * ***/ -//=========================================================================== -int NetAddressCompare (const NetAddress & a1, const NetAddress & a2) { - const sockaddr_in & i1 = * (const sockaddr_in *) &a1; - const sockaddr_in & i2 = * (const sockaddr_in *) &a2; - - int d = i1.sin_addr.S_un.S_addr - i2.sin_addr.S_un.S_addr; - return d ? d : i1.sin_port - i2.sin_port; -} - //=========================================================================== void NetAddressToString ( const NetAddress & addr, diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h index 97574804..2143fe53 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h @@ -80,11 +80,6 @@ enum ENetAddressFormat { kNumNetAddressFormats }; -int NetAddressCompare (const NetAddress & a1, const NetAddress & a2); -inline bool NetAddressEqual (const NetAddress & a1, const NetAddress & a2) { - return NetAddressCompare(a1, a2) == 0; -} - void NetAddressToString ( const NetAddress & addr, wchar_t * str,