diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-11 16:07:16 +0100 |
| commit | 0a52973ce569827357cfa9ac0a2e96c09ffbf7cc (patch) | |
| tree | f219b25bebeca4f1e9e58e7174fe7870675b6246 /cpp/src/Ice/Network.h | |
| parent | Add Makefile.mak rule to register assemblies in source dir. (diff) | |
| download | ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.bz2 ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.tar.xz ice-0a52973ce569827357cfa9ac0a2e96c09ffbf7cc.zip | |
Fixed ICE-5215: IPv6 support enabled by default
Diffstat (limited to 'cpp/src/Ice/Network.h')
| -rw-r--r-- | cpp/src/Ice/Network.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index 52259f33630..5761e75436c 100644 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -19,6 +19,7 @@ #include <Ice/PropertiesF.h> // For setTcpBufSize #include <Ice/LoggerF.h> // For setTcpBufSize #include <Ice/Protocol.h> +#include <Ice/EndpointTypes.h> #ifdef ICE_OS_WINRT # include <Ice/EventHandlerF.h> @@ -188,13 +189,14 @@ typedef IceUtil::Handle<NativeInfo> NativeInfoPtr; ICE_API bool noMoreFds(int); ICE_API std::string errorToStringDNS(int); -ICE_API std::vector<Address> getAddresses(const std::string&, int, ProtocolSupport, bool); +ICE_API std::vector<Address> getAddresses(const std::string&, int, ProtocolSupport, Ice::EndpointSelectionType, bool, + bool); ICE_API ProtocolSupport getProtocolSupport(const Address&); -ICE_API Address getAddressForServer(const std::string&, int, ProtocolSupport); -ICE_API Address getAddress(const std::string&, int, ProtocolSupport); +ICE_API Address getAddressForServer(const std::string&, int, ProtocolSupport, bool); ICE_API int compareAddress(const Address&, const Address&); ICE_API SOCKET createSocket(bool, const Address&); +ICE_API SOCKET createServerSocket(bool, const Address&, ProtocolSupport); ICE_API void closeSocketNoThrow(SOCKET); ICE_API void closeSocket(SOCKET); |