OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Toss pnAddrInfo (one less project!)

Browse Source
This commit is contained in:
Adam Johnson
2012-06-10 20:03:44 -04:00
parent 6a9d5a6f48
commit 5f99e20af8
10 changed files with 18 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt
View File

@ -34,7 +34,10 @@ set(pnNetCommon_SOURCES
)
add_library(pnNetCommon STATIC ${pnNetCommon_HEADERS} ${pnNetCommon_SOURCES})
target_link_libraries(pnNetCommon pnAddrInfo plStatusLog)
target_link_libraries(pnNetCommon plStatusLog)
if(WIN32)
target_link_libraries(pnNetCommon Ws2_32)
endif(WIN32)
source_group("Header Files" FILES ${pnNetCommon_HEADERS})
source_group("Source Files" FILES ${pnNetCommon_SOURCES})

22
Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp
View File

@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "pnNetCommon.h"
#include "pnAddrInfo/pnAddrInfo.h"
#if HS_BUILD_FOR_UNIX
# include <sys/socket.h>
# include <netinet/in.h>
@ -68,19 +68,25 @@ plString GetTextAddr(uint32_t binAddr)
uint32_t GetBinAddr(const char * textAddr)
{
uint32_t addr = 0;
if (!textAddr)
return addr;
struct addrinfo* ai = NULL;
addr = inet_addr(textAddr);
if(addr == INADDR_NONE)
{
ai = pnAddrInfo::GetAddrByNameSimple(textAddr);
if(ai!= NULL)
memcpy(&addr,(void*)(&(((sockaddr_in*)(ai->ai_addr))->sin_addr)),sizeof(addr));
pnAddrInfo::Free(ai);
struct addrinfo* ai = nil;
struct addrinfo hints;
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = PF_INET;
hints.ai_flags = AI_CANONNAME;
if (getaddrinfo(textAddr, nil, &hints, &ai) != 0)
{
hsAssert(false, "getaddrinfo failed");
return addr;
}
memcpy(&addr, (void*)(&(((sockaddr_in*)(ai->ai_addr))->sin_addr)), sizeof(addr));
freeaddrinfo(ai);
}
return addr;