diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-20 18:49:30 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-20 18:49:30 +0100 |
| commit | c24099b460c4b2e83124d0aa8e51ba9bdd899a05 (patch) | |
| tree | deaa3b37bded5ffacb7bca58bdbdd0aac022cc58 /cpp/src | |
| parent | Fixed (ICE-5270) - "Documents\ZeroC\IceGridGUI" renamed "Documents\ZeroC\IceG... (diff) | |
| download | ice-c24099b460c4b2e83124d0aa8e51ba9bdd899a05.tar.bz2 ice-c24099b460c4b2e83124d0aa8e51ba9bdd899a05.tar.xz ice-c24099b460c4b2e83124d0aa8e51ba9bdd899a05.zip | |
Fixed ICE-5263 - IPv6 support for Windows XP
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 9754769479a..e60712ab51a 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -868,6 +868,12 @@ IceInternal::createServerSocket(bool udp, const Address& addr, ProtocolSupport p int flag = protocol == EnableIPv6 ? 1 : 0; if(setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&flag, int(sizeof(int))) == SOCKET_ERROR) { +#ifdef _WIN32 + if(getSocketErrno() == WSAENOPROTOOPT) + { + return fd; // Windows XP doesn't support IPV6_V6ONLY + } +#endif closeSocketNoThrow(fd); SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); |