Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced get{host,serv}by{name,addr} by the threadsafe wrappers

Browse Source 
introduced in the previous revision.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-01-08 01:33:58 +00:00
parent 78606adf3a
commit 127189ebec
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/unix/gsocket.cpp
View File

@@ -1944,7 +1944,15 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
struct in_addr *array_addr;
/* It is a real name, we solve it */
if ((he = gethostbyname(hostname)) == NULL)
struct hostent h;
#if defined(HAVE_FUNC_GETHOSTBYNAME_R_3)
struct hostent_data buffer;
#else
char buffer[1024];
#endif
int err;
he = wxGethostbyname_r(hostname, &h, (void*)&buffer, sizeof(buffer), &err);
if (he == NULL)
{
/* Reset to invalid address */
addr->s_addr = INADDR_NONE;
@@ -1994,11 +2002,14 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
return GSOCK_INVPORT;
}
#if defined(__WXPM__) && defined(__EMX__)
se = getservbyname(port, (char*)protocol);
#if defined(HAVE_FUNC_GETSERVBYNAME_R_4)
struct servent_data buffer;
#else
se = getservbyname(port, protocol);
char buffer[1024];
#endif
struct servent serv;
se = wxGetservbyname_r(port, protocol, &serv,
(void*)&buffer, sizeof(buffer));
if (!se)
{
/* the cast to int suppresses compiler warnings about subscript having the
@@ -2048,7 +2059,15 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
addr = (struct sockaddr_in *)address->m_addr;
addr_buf = (char *)&(addr->sin_addr);
he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
struct hostent temphost;
#if defined(HAVE_FUNC_GETHOSTBYNAME_R_3)
struct hostent_data buffer;
#else
char buffer[1024];
#endif
int err;
he = wxGethostbyaddr_r(addr_buf, sizeof(addr->sin_addr), AF_INET, &temphost,
(void*)&buffer, sizeof(buffer), &err);
if (he == NULL)
{
address->m_error = GSOCK_NOHOST;