sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed name resolution on Windows 2000.

Browse Source
This commit is contained in:
lotodore
2007-09-01 15:23:14 +00:00
parent 09db256768
commit 22a0f2d67e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/win32/socket_helper.cpp
+6 -3
View File
@@ -29,7 +29,7 @@
using namespace std; using namespace std;
typedef int (WSAAPI * getaddrinfo_ptr_t) (const char *, const char* , const struct addrinfo *, struct addrinfo **); typedef int (WSAAPI * getaddrinfo_ptr_t) (const char *, const char* , const struct addrinfo *, struct addrinfo **);
typedef void (WSAAPI * freeaddrinfo_ptr_t) (struct addrinfo*); typedef void (WSAAPI * freeaddrinfo_ptr_t) (struct addrinfo*);
static wstring static wstring
utf8ToWchar(const char *str) utf8ToWchar(const char *str)
@@ -119,12 +119,15 @@ socket_resolve(const char *str, const char *port, int addrFamily, int sockType,
} }
// If we cannot use getaddrinfo (OS older than XP), // If we cannot use getaddrinfo (OS older than XP),
// we call the "classic" gethostbyname. // we call the "classic" gethostbyname.
if (!useGetaddrinfo && protocol == AF_INET) if (!useGetaddrinfo && addrFamily == AF_INET)
{ {
struct hostent *host = gethostbyname(str); struct hostent *host = gethostbyname(str);
if (host && host->h_addr_list) if (host && host->h_addr_list)
{ {
memcpy(addr, host->h_addr_list, host->h_length); struct sockaddr_in *addr_in = (struct sockaddr_in *)addr;
addr_in->sin_family = AF_INET;
addr_in->sin_port = htons(atoi(port));
memcpy(&addr_in->sin_addr, host->h_addr_list[0], host->h_length);
retVal = true; retVal = true;
} }
} }