zeroc-ice 3.7.10 → 3.8.0

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

@@ -1,289 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_NETWORK_H
-#define ICE_NETWORK_H
-
-#ifdef __hpux
-#   define _XOPEN_SOURCE_EXTENDED
-#endif
-
-#include <Ice/Config.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>
-
-#if defined(_WIN32)
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-#  if !defined(__MINGW32__)
-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>
-#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
-#elif defined(_WIN32)
-#  if !defined(ICE_NO_IOCP)
-#     define ICE_USE_IOCP 1
-#  else
-#     define ICE_USE_SELECT 1
-#  endif
-#else
-#   define ICE_USE_POLL 1
-#endif
-
-#if defined(_WIN32) || defined(__osf__)
-typedef int socklen_t;
-#endif
-
-#if !defined(_WIN32)
-#   define SOCKET int
-#   define INVALID_SOCKET -1
-#   define SOCKET_ERROR -1
-#endif
-
-#ifndef SHUT_RD
-#   define SHUT_RD 0
-#endif
-
-#ifndef SHUT_WR
-#   define SHUT_WR 1
-#endif
-
-#ifndef SHUT_RDWR
-#   define SHUT_RDWR 2
-#endif
-
-#ifndef NETDB_INTERNAL
-#   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);
-#endif
-
-namespace IceInternal
-{
-
-union Address
-{
-    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
-#else
-    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;
-};
-#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 NativeInfo : public virtual IceUtil::Shared
-{
-public:
-
-    virtual ~NativeInfo();
-
-    NativeInfo(SOCKET socketFd = INVALID_SOCKET) : _fd(socketFd)
-#if !defined(ICE_USE_IOCP)
-        , _newFd(INVALID_SOCKET)
-#endif
-    {
-    }
-
-    SOCKET fd() const
-    {
-        return _fd;
-    }
-
-    void setReadyCallback(const ReadyCallbackPtr& callback);
-
-    void ready(SocketOperation operation, bool value)
-    {
-        assert(_readyCallback);
-        _readyCallback->ready(operation, value);
-    }
-
-    //
-    // 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);
-#else
-    bool newFd();
-    void setNewFd(SOCKET);
-#endif
-
-protected:
-
-    SOCKET _fd;
-    ReadyCallbackPtr _readyCallback;
-
-#if defined(ICE_USE_IOCP)
-    HANDLE _handle;
-    ULONG_PTR _key;
-#else
-    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&);
-
-#if defined(ICE_USE_IOCP)
-ICE_API void doConnectAsync(SOCKET, const Address&, const Address&, AsyncInfo&);
-ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&);
-#endif
-
-ICE_API bool isIpAddress(const std::string&);
-
-}
-
-#endif

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

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

data/ext/ice/cpp/src/Ice/NetworkProxy.cpp

@@ -1,311 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/NetworkProxy.h>
-#include <Ice/HttpParser.h>
-#include <Ice/LocalException.h>
-#include <Ice/Properties.h>
-
-using namespace std;
-using namespace IceInternal;
-
-IceUtil::Shared* IceInternal::upCast(NetworkProxy* p) { return p; }
-
-NetworkProxy::~NetworkProxy()
-{
-    // Out of line to avoid weak vtable
-}
-
-namespace
-{
-
-class SOCKSNetworkProxy : public NetworkProxy
-{
-public:
-
-    SOCKSNetworkProxy(const string&, int);
-    SOCKSNetworkProxy(const Address&);
-
-    virtual void beginWrite(const Address&, Buffer&);
-    virtual SocketOperation endWrite(Buffer&);
-    virtual void beginRead(Buffer&);
-    virtual SocketOperation endRead(Buffer&);
-    virtual void finish(Buffer&, Buffer&);
-    virtual NetworkProxyPtr resolveHost(ProtocolSupport) const;
-    virtual Address getAddress() const;
-    virtual string getName() const;
-    virtual ProtocolSupport getProtocolSupport() const;
-
-private:
-
-    string _host;
-    int _port;
-    Address _address;
-};
-
-class HTTPNetworkProxy : public NetworkProxy
-{
-public:
-
-    HTTPNetworkProxy(const string&, int);
-    HTTPNetworkProxy(const Address&, ProtocolSupport);
-
-    virtual void beginWrite(const Address&, Buffer&);
-    virtual SocketOperation endWrite(Buffer&);
-    virtual void beginRead(Buffer&);
-    virtual SocketOperation endRead(Buffer&);
-    virtual void finish(Buffer&, Buffer&);
-    virtual NetworkProxyPtr resolveHost(ProtocolSupport) const;
-    virtual Address getAddress() const;
-    virtual string getName() const;
-    virtual ProtocolSupport getProtocolSupport() const;
-
-private:
-
-    string _host;
-    int _port;
-    Address _address;
-    ProtocolSupport _protocol;
-};
-
-}
-
-SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port)
-{
-    assert(!host.empty());
-}
-
-SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr)
-{
-}
-
-void
-SOCKSNetworkProxy::beginWrite(const Address& addr, Buffer& buf)
-{
-    //
-    // SOCKS connect request
-    //
-    buf.b.resize(9);
-    buf.i = buf.b.begin();
-    Ice::Byte* dest = &buf.b[0];
-    *dest++ = 0x04; // SOCKS version 4.
-    *dest++ = 0x01; // Command, establish a TCP/IP stream connection
-
-    const Ice::Byte* src;
-
-    //
-    // Port (already in big-endian order)
-    //
-    src = reinterpret_cast<const Ice::Byte*>(&addr.saIn.sin_port);
-    *dest++ = *src++;
-    *dest++ = *src;
-
-    //
-    // IPv4 address (already in big-endian order)
-    //
-    src = reinterpret_cast<const Ice::Byte*>(&addr.saIn.sin_addr.s_addr);
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src++;
-    *dest++ = *src;
-
-    *dest = 0x00; // User ID.
-}
-
-SocketOperation
-SOCKSNetworkProxy::endWrite(Buffer& buf)
-{
-    // Once the request is sent, read the response
-    return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationRead;
-}
-
-void
-SOCKSNetworkProxy::beginRead(Buffer& buf)
-{
-    //
-    // Read the SOCKS4 response whose size is 8 bytes.
-    //
-    buf.b.resize(8);
-    buf.i = buf.b.begin();
-}
-
-SocketOperation
-SOCKSNetworkProxy::endRead(Buffer& buf)
-{
-    // We're done once we read the response
-    return buf.i != buf.b.end() ? SocketOperationRead : SocketOperationNone;
-}
-
-void
-SOCKSNetworkProxy::finish(Buffer& readBuffer, Buffer&)
-{
-    readBuffer.i = readBuffer.b.begin();
-
-    if(readBuffer.b.end() - readBuffer.i < 2)
-    {
-        throw Ice::UnmarshalOutOfBoundsException(__FILE__, __LINE__);
-    }
-
-    const Ice::Byte* src = &(*readBuffer.i);
-    const Ice::Byte b1 = *src++;
-    const Ice::Byte b2 = *src++;
-    if(b1 != 0x00 || b2 != 0x5a)
-    {
-        throw Ice::ConnectFailedException(__FILE__, __LINE__);
-    }
-}
-
-NetworkProxyPtr
-SOCKSNetworkProxy::resolveHost(ProtocolSupport protocol) const
-{
-    assert(!_host.empty());
-    return new SOCKSNetworkProxy(getAddresses(_host, _port, protocol, Ice::ICE_ENUM(EndpointSelectionType, Random), false, true)[0]);
-}
-
-Address
-SOCKSNetworkProxy::getAddress() const
-{
-    assert(_host.empty()); // Host must be resolved.
-    return _address;
-}
-
-string
-SOCKSNetworkProxy::getName() const
-{
-    return "SOCKS";
-}
-
-ProtocolSupport
-SOCKSNetworkProxy::getProtocolSupport() const
-{
-    return EnableIPv4;
-}
-
-HTTPNetworkProxy::HTTPNetworkProxy(const string& host, int port) :
-    _host(host), _port(port), _protocol(EnableBoth)
-{
-    assert(!host.empty());
-}
-
-HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol) :
-    _port(0), _address(addr), _protocol(protocol)
-{
-}
-
-void
-HTTPNetworkProxy::beginWrite(const Address& addr, Buffer& buf)
-{
-    //
-    // HTTP connect request
-    //
-    ostringstream out;
-    out << "CONNECT " << addrToString(addr) << " HTTP/1.1\r\n" << "Host: " << addrToString(addr) << "\r\n\r\n";
-    string str = out.str();
-    buf.b.resize(str.size());
-    memcpy(&buf.b[0], str.c_str(), str.size());
-    buf.i = buf.b.begin();
-}
-
-SocketOperation
-HTTPNetworkProxy::endWrite(Buffer& buf)
-{
-    // Once the request is sent, read the response
-    return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationRead;
-}
-
-void
-HTTPNetworkProxy::beginRead(Buffer& buf)
-{
-    //
-    // Read the Http response
-    //
-    buf.b.resize(7); // Enough space for reading at least HTTP1.1
-    buf.i = buf.b.begin();
-}
-
-SocketOperation
-HTTPNetworkProxy::endRead(Buffer& buf)
-{
-    //
-    // Check if we received the full HTTP response, if not, continue
-    // reading otherwise we're done.
-    //
-    const Ice::Byte* end = HttpParser().isCompleteMessage(buf.b.begin(), buf.i);
-    if(!end && buf.i == buf.b.end())
-    {
-        //
-        // Read one more byte, we can't easily read bytes in advance
-        // since the transport implenentation might be be able to read
-        // the data from the memory instead of the socket. This is for
-        // instance the case with the OpenSSL transport (or we would
-        // have to use a buffering BIO).
-        //
-        buf.b.resize(buf.b.size() + 1);
-        buf.i = buf.b.begin() + buf.b.size() - 1;
-        return SocketOperationRead;
-    }
-    return SocketOperationNone;
-}
-
-void
-HTTPNetworkProxy::finish(Buffer& readBuffer, Buffer&)
-{
-    HttpParser parser;
-    parser.parse(readBuffer.b.begin(), readBuffer.b.end());
-    if(parser.status() != 200)
-    {
-        throw Ice::ConnectFailedException(__FILE__, __LINE__);
-    }
-}
-
-NetworkProxyPtr
-HTTPNetworkProxy::resolveHost(ProtocolSupport protocol) const
-{
-    assert(!_host.empty());
-    return new HTTPNetworkProxy(getAddresses(_host, _port, protocol, Ice::ICE_ENUM(EndpointSelectionType, Random), false, true)[0], protocol);
-}
-
-Address
-HTTPNetworkProxy::getAddress() const
-{
-    assert(_host.empty()); // Host must be resolved.
-    return _address;
-}
-
-string
-HTTPNetworkProxy::getName() const
-{
-    return "HTTP";
-}
-
-ProtocolSupport
-HTTPNetworkProxy::getProtocolSupport() const
-{
-    return _protocol;
-}
-
-NetworkProxyPtr
-IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSupport protocolSupport)
-{
-    string proxyHost;
-
-    proxyHost = properties->getProperty("Ice.SOCKSProxyHost");
-    if(!proxyHost.empty())
-    {
-        if(protocolSupport == EnableIPv6)
-        {
-            throw Ice::InitializationException(__FILE__, __LINE__, "IPv6 only is not supported with SOCKS4 proxies");
-        }
-        int proxyPort = properties->getPropertyAsIntWithDefault("Ice.SOCKSProxyPort", 1080);
-        return new SOCKSNetworkProxy(proxyHost, proxyPort);
-    }
-
-    proxyHost = properties->getProperty("Ice.HTTPProxyHost");
-    if(!proxyHost.empty())
-    {
-        return new HTTPNetworkProxy(proxyHost, properties->getPropertyAsIntWithDefault("Ice.HTTPProxyPort", 1080));
-    }
-
-    return 0;
-}

data/ext/ice/cpp/src/Ice/NetworkProxy.h

@@ -1,72 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_NETWORK_PROXY_H
-#define ICE_NETWORK_PROXY_H
-
-#include <Ice/Network.h>
-#include <Ice/Buffer.h>
-
-namespace IceInternal
-{
-
-class ICE_API NetworkProxy : public virtual IceUtil::Shared
-{
-public:
-
-    virtual ~NetworkProxy();
-
-    //
-    // Write the connection request on the connection established
-    // with the network proxy server. This is called right after
-    // the connection establishment succeeds.
-    //
-    virtual void beginWrite(const Address&, Buffer&) = 0;
-    virtual SocketOperation endWrite(Buffer&) = 0;
-
-    //
-    // Once the connection request has been sent, this is called
-    // to prepare and read the response from the proxy server.
-    //
-    virtual void beginRead(Buffer&) = 0;
-    virtual SocketOperation endRead(Buffer&) = 0;
-
-    //
-    // This is called when the response from the proxy has been
-    // read. The proxy should copy the extra read data (if any) in the
-    // given byte vector.
-    //
-    virtual void finish(Buffer&, Buffer&) = 0;
-
-    //
-    // If the proxy host needs to be resolved, this should return
-    // a new NetworkProxy containing the IP address of the proxy.
-    // This is called from the endpoint host resolver thread, so
-    // it's safe if this this method blocks.
-    //
-    virtual NetworkProxyPtr resolveHost(ProtocolSupport) const = 0;
-
-    //
-    // Returns the IP address of the network proxy. This method
-    // must not block. It's only called on a network proxy object
-    // returned by resolveHost().
-    //
-    virtual Address getAddress() const = 0;
-
-    //
-    // Returns the name of the proxy, used for tracing purposes.
-    //
-    virtual std::string getName() const = 0;
-
-    //
-    // Returns the protocols supported by the proxy.
-    //
-    virtual ProtocolSupport getProtocolSupport() const = 0;
-};
-
-NetworkProxyPtr createNetworkProxy(const Ice::PropertiesPtr&, ProtocolSupport);
-
-}
-
-#endif

data/ext/ice/cpp/src/Ice/NetworkProxyF.h

@@ -1,21 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_NETWORK_PROXY_F_H
-#define ICE_NETWORK_PROXY_F_H
-
-#include <IceUtil/Shared.h>
-
-#include <Ice/Handle.h>
-
-namespace IceInternal
-{
-
-class NetworkProxy;
-ICE_API IceUtil::Shared* upCast(NetworkProxy*);
-typedef Handle<NetworkProxy> NetworkProxyPtr;
-
-}
-
-#endif