zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/src/Ice/Network.h

@@ -1,55 +1,48 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_NETWORK_H
 #define ICE_NETWORK_H
 
-#ifdef __hpux
-#   define _XOPEN_SOURCE_EXTENDED
-#endif
-
-#include <Ice/Config.h>
+#include "Ice/Config.h"
+#include "Ice/EndpointTypes.h"
+#include "Ice/Logger.h"      // For setTcpBufSize
+#include "Ice/PropertiesF.h" // For setTcpBufSize
+#include "Ice/StringUtil.h"  // For ErrorCode
+#include "NetworkF.h"
+#include "NetworkProxyF.h"
+#include "Protocol.h"
+#include "ProtocolInstanceF.h"
 
-#include <Ice/NetworkF.h>
-#include <Ice/NetworkProxyF.h>
-#include <Ice/PropertiesF.h> // For setTcpBufSize
-#include <Ice/LoggerF.h> // For setTcpBufSize
-#include <Ice/Protocol.h>
-#include <Ice/ProtocolInstanceF.h>
-#include <Ice/EndpointTypes.h>
+#include <cassert>
+#include <cstring>
 
 #if defined(_WIN32)
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-#  if !defined(__MINGW32__)
+#    define NOMINMAX
+#    include <windows.h>
+#    include <winsock2.h>
+#    include <ws2tcpip.h>
 typedef int ssize_t;
-#  endif
 #else
-#   include <unistd.h>
-#   include <fcntl.h>
-#   include <sys/socket.h>
-#   include <sys/poll.h>
-#   include <netinet/in.h>
-#   include <netinet/tcp.h>
-#   include <arpa/inet.h>
-#   include <netdb.h>
+#    include <arpa/inet.h>
+#    include <fcntl.h>
+#    include <netdb.h>
+#    include <netinet/in.h>
+#    include <netinet/tcp.h>
+#    include <sys/poll.h>
+#    include <sys/socket.h>
+#    include <unistd.h>
 #endif
 
-#if defined(__linux__) && !defined(ICE_NO_EPOLL)
-#   define ICE_USE_EPOLL 1
-#elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE)
-#   define ICE_USE_KQUEUE 1
-#elif defined(__APPLE__) && !defined(ICE_NO_CFSTREAM)
-#   define ICE_USE_CFSTREAM 1
+#if defined(__linux__)
+#    define ICE_USE_EPOLL 1
+#elif defined(__APPLE__) && TARGET_OS_IPHONE != 0
+#    define ICE_USE_CFSTREAM 1
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#    define ICE_USE_KQUEUE 1
 #elif defined(_WIN32)
-#  if !defined(ICE_NO_IOCP)
-#     define ICE_USE_IOCP 1
-#  else
-#     define ICE_USE_SELECT 1
-#  endif
+#    define ICE_USE_IOCP 1
 #else
-#   define ICE_USE_POLL 1
+#    error "Unsupported platform"
 #endif
 
 #if defined(_WIN32) || defined(__osf__)
@@ -57,233 +50,216 @@ typedef int socklen_t;
 #endif
 
 #if !defined(_WIN32)
-#   define SOCKET int
-#   define INVALID_SOCKET -1
-#   define SOCKET_ERROR -1
+#    define SOCKET int
+#    define INVALID_SOCKET -1
+#    define SOCKET_ERROR -1
 #endif
 
 #ifndef SHUT_RD
-#   define SHUT_RD 0
+#    define SHUT_RD 0
 #endif
 
 #ifndef SHUT_WR
-#   define SHUT_WR 1
+#    define SHUT_WR 1
 #endif
 
 #ifndef SHUT_RDWR
-#   define SHUT_RDWR 2
+#    define SHUT_RDWR 2
 #endif
 
 #ifndef NETDB_INTERNAL
-#   define NETDB_INTERNAL -1
+#    define NETDB_INTERNAL -1
 #endif
 
 #ifndef NETDB_SUCCESS
-#   define NETDB_SUCCESS 0
-#endif
-
-#if defined(__MINGW32__) && !defined WSAID_CONNECTEX
-#  define WSAID_CONNECTEX {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}}
-#  define WSAID_ACCEPTEX {0xb5367df1,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
-#  define SO_UPDATE_ACCEPT_CONTEXT   0x700B
-#  define SO_UPDATE_CONNECT_CONTEXT  0x7010
-    typedef BOOL (PASCAL FAR * LPFN_CONNECTEX) (IN SOCKET s, IN const struct sockaddr FAR *name, IN int namelen,
-                                                IN PVOID lpSendBuffer OPTIONAL, IN DWORD dwSendDataLength,
-                                                OUT LPDWORD lpdwBytesSent, IN LPOVERLAPPED lpOverlapped);
-
-    typedef BOOL (PASCAL FAR * LPFN_ACCEPTEX)(IN SOCKET sListenSocket, IN SOCKET sAcceptSocket,
-                                              IN PVOID lpOutputBuffer, IN DWORD dwReceiveDataLength,
-                                              IN DWORD dwLocalAddressLength, IN DWORD dwRemoteAddressLength,
-                                              OUT LPDWORD lpdwBytesReceived, IN LPOVERLAPPED lpOverlapped);
+#    define NETDB_SUCCESS 0
 #endif
 
 namespace IceInternal
 {
-
-union Address
-{
-    Address()
+    union Address
     {
-        memset(&saStorage, 0, sizeof(sockaddr_storage));
-        saStorage.ss_family = AF_UNSPEC;
-    }
-
-    sockaddr sa;
-    sockaddr_in saIn;
-    sockaddr_in6 saIn6;
-    sockaddr_storage saStorage;
-};
-
-enum SocketOperation
-{
-    SocketOperationNone = 0,
-    SocketOperationRead = 1,
-    // With BSD sockets, write and connect readiness are the same so
-    // we use the same value for both.
-    SocketOperationWrite = 2,
+        Address()
+        {
+            memset(&saStorage, 0, sizeof(sockaddr_storage));
+            saStorage.ss_family = AF_UNSPEC;
+        }
+
+        sockaddr sa;
+        sockaddr_in saIn;
+        sockaddr_in6 saIn6;
+        sockaddr_storage saStorage;
+    };
+
+    enum SocketOperation
+    {
+        SocketOperationNone = 0,
+        SocketOperationRead = 1,
+        // With BSD sockets, write and connect readiness are the same so
+        // we use the same value for both.
+        SocketOperationWrite = 2,
 #ifdef ICE_USE_CFSTREAM
-    SocketOperationConnect = 4
+        SocketOperationConnect = 4
 #else
-    SocketOperationConnect = 2
+        SocketOperationConnect = 2
 #endif
-};
+    };
 
 //
 // AsyncInfo struct for Windows IOCP holds the result of
 // asynchronous operations after it completed.
 //
 #if defined(ICE_USE_IOCP)
-struct ICE_API AsyncInfo : WSAOVERLAPPED
-{
-    AsyncInfo(SocketOperation);
-
-    SocketOperation status;
-    WSABUF buf;
-    DWORD flags;
-    DWORD count;
-    DWORD error;
-};
+    struct ICE_API AsyncInfo : WSAOVERLAPPED
+    {
+        AsyncInfo(SocketOperation);
+
+        SocketOperation status;
+        WSABUF buf;
+        DWORD flags;
+        DWORD count;
+        DWORD error;
+    };
 #endif
 
-class ICE_API ReadyCallback : public virtual ::IceUtil::Shared
-{
-public:
-
-    virtual ~ReadyCallback();
-
-    virtual void ready(SocketOperation, bool) = 0;
-};
-typedef IceUtil::Handle<ReadyCallback> ReadyCallbackPtr;
+    class ICE_API ReadyCallback
+    {
+    public:
+        virtual ~ReadyCallback();
 
-class ICE_API NativeInfo : public virtual IceUtil::Shared
-{
-public:
+        virtual void ready(SocketOperation, bool) = 0;
+    };
+    using ReadyCallbackPtr = std::shared_ptr<ReadyCallback>;
 
-    virtual ~NativeInfo();
+    class ICE_API NativeInfo
+    {
+    public:
+        virtual ~NativeInfo();
 
-    NativeInfo(SOCKET socketFd = INVALID_SOCKET) : _fd(socketFd)
+        NativeInfo(SOCKET socketFd = INVALID_SOCKET)
+            : _fd(socketFd)
 #if !defined(ICE_USE_IOCP)
-        , _newFd(INVALID_SOCKET)
+              ,
+              _newFd(INVALID_SOCKET)
 #endif
-    {
-    }
+        {
+        }
 
-    SOCKET fd() const
-    {
-        return _fd;
-    }
+        [[nodiscard]] SOCKET fd() const { return _fd; }
 
-    void setReadyCallback(const ReadyCallbackPtr& callback);
+        void setReadyCallback(const ReadyCallbackPtr& callback);
 
-    void ready(SocketOperation operation, bool value)
-    {
-        assert(_readyCallback);
-        _readyCallback->ready(operation, value);
-    }
+        void ready(SocketOperation operation, bool value)
+        {
+            assert(_readyCallback);
+            _readyCallback->ready(operation, value);
+        }
 
-    //
-    // This is implemented by transceiver and acceptor implementations.
-    //
+        //
+        // This is implemented by transceiver and acceptor implementations.
+        //
 #if defined(ICE_USE_IOCP)
-    virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
-    void initialize(HANDLE, ULONG_PTR);
-    void completed(SocketOperation);
+        virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
+        void initialize(HANDLE, ULONG_PTR);
+        void completed(SocketOperation);
 #else
-    bool newFd();
-    void setNewFd(SOCKET);
+        bool newFd();
+        void setNewFd(SOCKET);
 #endif
 
-protected:
-
-    SOCKET _fd;
-    ReadyCallbackPtr _readyCallback;
+    protected:
+        SOCKET _fd;
+        ReadyCallbackPtr _readyCallback;
 
 #if defined(ICE_USE_IOCP)
-    HANDLE _handle;
-    ULONG_PTR _key;
+        HANDLE _handle;
+        ULONG_PTR _key;
 #else
-    SOCKET _newFd;
+        SOCKET _newFd;
 #endif
-};
-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, Ice::EndpointSelectionType, bool,
-                                          bool);
-ICE_API ProtocolSupport getProtocolSupport(const Address&);
-ICE_API Address getAddressForServer(const std::string&, int, ProtocolSupport, bool, bool);
-ICE_API int compareAddress(const Address&, const Address&);
-
-ICE_API bool isIPv6Supported();
-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);
-
-ICE_API std::string addrToString(const Address&);
-ICE_API void fdToLocalAddress(SOCKET, Address&);
-ICE_API bool fdToRemoteAddress(SOCKET, Address&);
-ICE_API std::string fdToString(SOCKET, const NetworkProxyPtr&, const Address&);
-ICE_API std::string fdToString(SOCKET);
-ICE_API void fdToAddressAndPort(SOCKET, std::string&, int&, std::string&, int&);
-ICE_API void addrToAddressAndPort(const Address&, std::string&, int&);
-ICE_API std::string addressesToString(const Address&, const Address&, bool);
-ICE_API bool isAddressValid(const Address&);
-
-ICE_API std::vector<std::string> getHostsForEndpointExpand(const std::string&, ProtocolSupport, bool);
-ICE_API std::vector<std::string> getInterfacesForMulticast(const std::string&, ProtocolSupport);
-
-ICE_API std::string inetAddrToString(const Address&);
-ICE_API int getPort(const Address&);
-ICE_API void setPort(Address&, int);
-
-ICE_API bool isMulticast(const Address&);
-ICE_API void setTcpBufSize(SOCKET, const ProtocolInstancePtr&);
-ICE_API void setTcpBufSize(SOCKET, int, int, const ProtocolInstancePtr&);
-
-ICE_API void setBlock(SOCKET, bool);
-ICE_API void setSendBufferSize(SOCKET, int);
-ICE_API int getSendBufferSize(SOCKET);
-ICE_API void setRecvBufferSize(SOCKET, int);
-ICE_API int getRecvBufferSize(SOCKET);
-
-ICE_API void setMcastGroup(SOCKET, const Address&, const std::string&);
-ICE_API void setMcastInterface(SOCKET, const std::string&, const Address&);
-ICE_API void setMcastTtl(SOCKET, int, const Address&);
-ICE_API void setReuseAddress(SOCKET, bool);
-ICE_API Address doBind(SOCKET, const Address&, const std::string& intf = "");
-ICE_API void doListen(SOCKET, int);
-
-ICE_API bool interrupted();
-ICE_API bool acceptInterrupted();
-ICE_API bool noBuffers();
-ICE_API bool wouldBlock();
-ICE_API bool notConnected();
-ICE_API bool recvTruncated();
-
-ICE_API bool connectFailed();
-ICE_API bool connectionRefused();
-ICE_API bool connectInProgress();
-ICE_API bool connectionLost();
-
-ICE_API bool doConnect(SOCKET, const Address&, const Address&);
-ICE_API void doFinishConnect(SOCKET);
-ICE_API SOCKET doAccept(SOCKET);
-
-ICE_API void createPipe(SOCKET fds[2]);
-
-ICE_API int getSocketErrno();
-
-ICE_API Address getNumericAddress(const std::string&);
+    };
+    using NativeInfoPtr = std::shared_ptr<NativeInfo>;
+
+    ICE_API std::string errorToStringDNS(ErrorCode);
+
+    ICE_API std::vector<Address>
+    getAddresses(const std::string& host, int port, ProtocolSupport protocol, bool preferIPv6, bool canBlock);
+
+    ICE_API ProtocolSupport getProtocolSupport(const Address&);
+    ICE_API Address getAddressForServer(const std::string&, int, ProtocolSupport, bool, bool);
+    ICE_API int compareAddress(const Address&, const Address&);
+
+    ICE_API bool isIPv6Supported();
+    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);
+
+    ICE_API std::string addrToString(const Address&);
+    ICE_API void fdToLocalAddress(SOCKET, Address&);
+    ICE_API bool fdToRemoteAddress(SOCKET, Address&);
+    ICE_API std::string fdToString(SOCKET, const NetworkProxyPtr&, const Address&);
+    ICE_API std::string fdToString(SOCKET);
+    ICE_API void fdToAddressAndPort(SOCKET, std::string&, int&, std::string&, int&);
+    ICE_API void addrToAddressAndPort(const Address&, std::string&, int&);
+    ICE_API std::string addressesToString(const Address&, const Address&, bool);
+    ICE_API bool isAddressValid(const Address&);
+
+    ICE_API std::vector<std::string> getInterfacesForMulticast(const std::string&, ProtocolSupport);
+
+    ICE_API std::string inetAddrToString(const Address&);
+    ICE_API int getPort(const Address&);
+    ICE_API void setPort(Address&, int);
+
+    ICE_API bool isMulticast(const Address&);
+    ICE_API void setTcpBufSize(SOCKET, const ProtocolInstancePtr&);
+    ICE_API void setTcpBufSize(SOCKET, int, int, const ProtocolInstancePtr&);
+
+    ICE_API void setBlock(SOCKET, bool);
+    ICE_API void setSendBufferSize(SOCKET, int);
+    ICE_API int getSendBufferSize(SOCKET);
+    ICE_API void setRecvBufferSize(SOCKET, int);
+    ICE_API int getRecvBufferSize(SOCKET);
+
+    ICE_API void setMcastGroup(SOCKET, const Address&, const std::string&);
+    ICE_API void setMcastInterface(SOCKET, const std::string&, const Address&);
+    ICE_API void setMcastTtl(SOCKET, int, const Address&);
+    ICE_API void setReuseAddress(SOCKET, bool);
+    ICE_API Address doBind(SOCKET, const Address&, const std::string& intf = "");
+    ICE_API void doListen(SOCKET, int);
+
+    ICE_API bool interrupted();
+    ICE_API bool acceptInterrupted();
+    ICE_API bool noBuffers();
+    ICE_API bool wouldBlock();
+    ICE_API bool notConnected();
+    ICE_API bool recvTruncated();
+
+    ICE_API bool connectFailed();
+    ICE_API bool connectionRefused();
+    ICE_API bool connectInProgress();
+    ICE_API bool connectionLost();
+
+    ICE_API bool doConnect(SOCKET, const Address&, const Address&);
+    ICE_API void doFinishConnect(SOCKET);
+    ICE_API SOCKET doAccept(SOCKET);
+
+    ICE_API void createPipe(SOCKET fds[2]);
+
+    ICE_API Ice::SyscallException::ErrorCode getSocketErrno();
+
+    ICE_API Address getNumericAddress(const std::string&);
+    ICE_API std::string normalizeIPv6Address(const std::string&);
 
 #if defined(ICE_USE_IOCP)
-ICE_API void doConnectAsync(SOCKET, const Address&, const Address&, AsyncInfo&);
-ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&);
+    ICE_API void doConnectAsync(SOCKET, const Address&, const Address&, AsyncInfo&);
+    ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&);
 #endif
 
-ICE_API bool isIpAddress(const std::string&);
+    ICE_API bool isIpAddress(const std::string&);
+    ICE_API bool isLoopbackOrMulticastAddress(const std::string&);
 
+    ICE_API std::string getHostName();
 }
 
 #endif

data/dist/ice/cpp/src/Ice/NetworkF.h

@@ -1,19 +1,11 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_NETWORK_F_H
 #define ICE_NETWORK_F_H
 
-#include <IceUtil/Shared.h>
-
-#include <Ice/Handle.h>
-
 namespace IceInternal
 {
-
-union Address;
-
+    union Address;
 }
 
 #endif