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

experimental IPv6 implementation (patch 1771429)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-18 20:53:33 +00:00
parent 559843f078
commit 8575ff507f
19 changed files with 797 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
src/unix/gsocket.cpp
View File

@@ -450,6 +450,12 @@ struct servent *wxGetservbyname_r(const char *port, const char *protocol,
# define GSocket_Debug(args)
#endif /* __GSOCKET_DEBUG__ */
#if wxUSE_IPV6
typedef struct sockaddr_storage wxSockAddr;
#else
typedef struct sockaddr wxSockAddr;
#endif
/* Table of GUI-related functions. We must call them indirectly because
* of wxBase and GUI separation: */
@@ -678,7 +684,7 @@ GSocketError GSocket::SetPeer(GAddress *address)
GAddress *GSocket::GetLocal()
{
GAddress *address;
struct sockaddr addr;
wxSockAddr addr;
WX_SOCKLEN_T size = sizeof(addr);
GSocketError err;
@@ -695,7 +701,7 @@ GAddress *GSocket::GetLocal()
return NULL;
}
if (getsockname(m_fd, &addr, (WX_SOCKLEN_T *) &size) < 0)
if (getsockname(m_fd, (sockaddr*)&addr, (WX_SOCKLEN_T *) &size) < 0)
{
m_error = GSOCK_IOERR;
return NULL;
@@ -709,7 +715,7 @@ GAddress *GSocket::GetLocal()
return NULL;
}
err = _GAddress_translate_from(address, &addr, size);
err = _GAddress_translate_from(address, (sockaddr*)&addr, size);
if (err != GSOCK_NOERROR)
{
GAddress_destroy(address);
@@ -827,7 +833,7 @@ GSocketError GSocket::SetServer()
*/
GSocket *GSocket::WaitConnection()
{
struct sockaddr from;
wxSockAddr from;
WX_SOCKLEN_T fromlen = sizeof(from);
GSocket *connection;
GSocketError err;
@@ -859,7 +865,7 @@ GSocket *GSocket::WaitConnection()
return NULL;
}
connection->m_fd = accept(m_fd, &from, (WX_SOCKLEN_T *) &fromlen);
connection->m_fd = accept(m_fd, (sockaddr*)&from, (WX_SOCKLEN_T *) &fromlen);
/* Reenable CONNECTION events */
Enable(GSOCK_CONNECTION);
@@ -888,7 +894,7 @@ GSocket *GSocket::WaitConnection()
return NULL;
}
err = _GAddress_translate_from(connection->m_peer, &from, fromlen);
err = _GAddress_translate_from(connection->m_peer, (sockaddr*)&from, fromlen);
if (err != GSOCK_NOERROR)
{
delete connection;
@@ -1673,7 +1679,7 @@ int GSocket::Recv_Stream(char *buffer, int size)
int GSocket::Recv_Dgram(char *buffer, int size)
{
struct sockaddr from;
wxSockAddr from;
WX_SOCKLEN_T fromlen = sizeof(from);
int ret;
GSocketError err;
@@ -1682,7 +1688,7 @@ int GSocket::Recv_Dgram(char *buffer, int size)
do
{
ret = recvfrom(m_fd, buffer, size, 0, &from, (WX_SOCKLEN_T *) &fromlen);
ret = recvfrom(m_fd, buffer, size, 0, (sockaddr*)&from, (WX_SOCKLEN_T *) &fromlen);
}
while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
@@ -1700,7 +1706,7 @@ int GSocket::Recv_Dgram(char *buffer, int size)
}
}
err = _GAddress_translate_from(m_peer, &from, fromlen);
err = _GAddress_translate_from(m_peer, (sockaddr*)&from, fromlen);
if (err != GSOCK_NOERROR)
{
GAddress_destroy(m_peer);
@@ -1989,11 +1995,11 @@ GSocketError _GAddress_translate_from(GAddress *address,
case AF_UNIX:
address->m_family = GSOCK_UNIX;
break;
#ifdef AF_INET6
#if wxUSE_IPV6
case AF_INET6:
address->m_family = GSOCK_INET6;
break;
#endif
#endif // wxUSE_IPV6
default:
{
address->m_error = GSOCK_INVOP;
@@ -2256,6 +2262,169 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
return ntohs(addr->sin_port);
}
#if wxUSE_IPV6
/*
* -------------------------------------------------------------------------
* Internet IPv6 address family
* -------------------------------------------------------------------------
*/
GSocketError _GAddress_Init_INET6(GAddress *address)
{
struct in6_addr any_address = IN6ADDR_ANY_INIT;
address->m_len = sizeof(struct sockaddr_in6);
address->m_addr = (struct sockaddr *) malloc(address->m_len);
if (address->m_addr == NULL)
{
address->m_error = GSOCK_MEMERR;
return GSOCK_MEMERR;
}
memset(address->m_addr,0,address->m_len);
address->m_family = GSOCK_INET6;
address->m_realfamily = AF_INET6;
((struct sockaddr_in6 *)address->m_addr)->sin6_family = AF_INET6;
((struct sockaddr_in6 *)address->m_addr)->sin6_addr = any_address;
return GSOCK_NOERROR;
}
GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname)
{
assert(address != NULL);
CHECK_ADDRESS(address, INET6);
addrinfo hints;
memset( & hints, 0, sizeof( hints ) );
hints.ai_family = AF_INET6;
addrinfo * info = 0;
if ( getaddrinfo( hostname, "0", & hints, & info ) || ! info )
{
address->m_error = GSOCK_NOHOST;
return GSOCK_NOHOST;
}
memcpy( address->m_addr, info->ai_addr, info->ai_addrlen );
freeaddrinfo( info );
return GSOCK_NOERROR;
}
GSocketError GAddress_INET6_SetAnyAddress(GAddress *address)
{
assert(address != NULL);
CHECK_ADDRESS(address, INET6);
struct in6_addr addr;
memset( & addr, 0, sizeof( addr ) );
return GAddress_INET6_SetHostAddress(address, addr);
}
GSocketError GAddress_INET6_SetHostAddress(GAddress *address,
struct in6_addr hostaddr)
{
assert(address != NULL);
CHECK_ADDRESS(address, INET6);
((struct sockaddr_in6 *)address->m_addr)->sin6_addr = hostaddr;
return GSOCK_NOERROR;
}
GSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port,
const char *protocol)
{
struct servent *se;
struct sockaddr_in6 *addr;
assert(address != NULL);
CHECK_ADDRESS(address, INET6);
if (!port)
{
address->m_error = GSOCK_INVPORT;
return GSOCK_INVPORT;
}
se = getservbyname(port, protocol);
if (!se)
{
if (isdigit(port[0]))
{
int port_int;
port_int = atoi(port);
addr = (struct sockaddr_in6 *)address->m_addr;
addr->sin6_port = htons((u_short) port_int);
return GSOCK_NOERROR;
}
address->m_error = GSOCK_INVPORT;
return GSOCK_INVPORT;
}
addr = (struct sockaddr_in6 *)address->m_addr;
addr->sin6_port = se->s_port;
return GSOCK_NOERROR;
}
GSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port)
{
struct sockaddr_in6 *addr;
assert(address != NULL);
CHECK_ADDRESS(address, INET6);
addr = (struct sockaddr_in6 *)address->m_addr;
addr->sin6_port = htons(port);
return GSOCK_NOERROR;
}
GSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, size_t sbuf)
{
struct hostent *he;
char *addr_buf;
struct sockaddr_in6 *addr;
assert(address != NULL);
CHECK_ADDRESS(address, INET6);
addr = (struct sockaddr_in6 *)address->m_addr;
addr_buf = (char *)&(addr->sin6_addr);
he = gethostbyaddr(addr_buf, sizeof(addr->sin6_addr), AF_INET6);
if (he == NULL)
{
address->m_error = GSOCK_NOHOST;
return GSOCK_NOHOST;
}
strncpy(hostname, he->h_name, sbuf);
return GSOCK_NOERROR;
}
GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr)
{
assert(address != NULL);
assert(hostaddr != NULL);
CHECK_ADDRESS_RETVAL(address, INET6, GSOCK_INVADDR);
*hostaddr = ( (struct sockaddr_in6 *)address->m_addr )->sin6_addr;
return GSOCK_NOERROR;
}
unsigned short GAddress_INET6_GetPort(GAddress *address)
{
assert(address != NULL);
CHECK_ADDRESS_RETVAL(address, INET6, 0);
return ntohs( ((struct sockaddr_in6 *)address->m_addr)->sin6_port );
}
#endif // wxUSE_IPV6
/*
* -------------------------------------------------------------------------
* Unix address family