zeroc-ice 3.7.1 → 3.7.6

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/SliceChecksums.h>
 #include <IceUtil/Mutex.h>

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/SlicedData.h>
 #include <Ice/OutputStream.h>

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/StreamSocket.h>
 #include <Ice/NetworkProxy.h>
@@ -92,7 +87,7 @@ StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer)
 #if defined(ICE_USE_IOCP)
         doFinishConnectAsync(_fd, _write);
 #elif defined(ICE_OS_UWP)
-        if(_write.count == SOCKET_ERROR)
+        if(_write.error != ERROR_SUCCESS)
         {
             try
             {
@@ -183,7 +178,7 @@ StreamSocket::read(Buffer& buf)
     {
         while(true)
         {
-            ssize_t ret = read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
+            ssize_t ret = read(reinterpret_cast<char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
             if(ret == 0)
             {
                 return SocketOperationRead;
@@ -196,7 +191,7 @@ StreamSocket::read(Buffer& buf)
             }
         }
     }
-    buf.i += read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
+    buf.i += read(reinterpret_cast<char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
 #endif
     return buf.i != buf.b.end() ? SocketOperationRead : SocketOperationNone;
 }
@@ -209,7 +204,7 @@ StreamSocket::write(Buffer& buf)
     {
         while(true)
         {
-            ssize_t ret = write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
+            ssize_t ret = write(reinterpret_cast<const char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
             if(ret == 0)
             {
                 return SocketOperationWrite;
@@ -222,7 +217,7 @@ StreamSocket::write(Buffer& buf)
             }
         }
     }
-    buf.i += write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
+    buf.i += write(reinterpret_cast<const char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
 #endif
     return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationNone;
 }
@@ -277,7 +272,7 @@ StreamSocket::read(char* buf, size_t length)
 
         buf += ret;
         read += ret;
-        length -= ret;
+        length -= static_cast<size_t>(ret);
 
         if(packetSize > length)
         {
@@ -344,7 +339,7 @@ StreamSocket::write(const char* buf, size_t length)
 
         buf += ret;
         sent += ret;
-        length -= ret;
+        length -= static_cast<size_t>(ret);
 
         if(packetSize > length)
         {
@@ -389,6 +384,7 @@ StreamSocket::startWrite(Buffer& buf)
 
     _write.buf.len = static_cast<DWORD>(packetSize);
     _write.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _write.error = ERROR_SUCCESS;
     int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, ICE_NULLPTR);
     if(err == SOCKET_ERROR)
     {
@@ -415,7 +411,7 @@ StreamSocket::finishWrite(Buffer& buf)
         return;
     }
 
-    if(static_cast<int>(_write.count) == SOCKET_ERROR)
+    if(_write.error != ERROR_SUCCESS)
     {
         WSASetLastError(_write.error);
         if(connectionLost())
@@ -444,6 +440,7 @@ StreamSocket::startRead(Buffer& buf)
     size_t packetSize = getRecvPacketSize(length);
     _read.buf.len = static_cast<DWORD>(packetSize);
     _read.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _read.error = ERROR_SUCCESS;
     int err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, ICE_NULLPTR);
     if(err == SOCKET_ERROR)
     {
@@ -469,7 +466,7 @@ StreamSocket::finishRead(Buffer& buf)
         return;
     }
 
-    if(static_cast<int>(_read.count) == SOCKET_ERROR)
+    if(_read.error != ERROR_SUCCESS)
     {
         WSASetLastError(_read.error);
         if(connectionLost())
@@ -542,7 +539,7 @@ StreamSocket::startWrite(Buffer& buf)
     {
         checkErrorCode(__FILE__, __LINE__, ex->HResult);
     }
-    return packetSize == static_cast<int>(buf.b.end() - buf.i);
+    return packetSize == static_cast<size_t>(buf.b.end() - buf.i);
 }
 
 void
@@ -554,7 +551,7 @@ StreamSocket::finishWrite(Buffer& buf)
         return;
     }
 
-    if(_write.count == SOCKET_ERROR)
+    if(_write.error != ERROR_SUCCESS)
     {
         checkErrorCode(__FILE__, __LINE__, _write.error);
     }
@@ -586,7 +583,7 @@ StreamSocket::finishRead(Buffer& buf)
         return;
     }
 
-    if(_read.count == SOCKET_ERROR)
+    if(_read.error != ERROR_SUCCESS)
     {
         checkErrorCode(__FILE__, __LINE__, _read.error);
     }

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STREAM_SOCKET_H
 #define ICE_STREAM_SOCKET_H

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Config.h>
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_STRING_UTIL_H
 #define ICE_STRING_UTIL_H

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef _WIN32
 
@@ -111,7 +106,7 @@ Ice::SysLoggerI::SysLoggerI(const string& prefix, const string& facilityString)
     }
 
     int logopt = LOG_PID | LOG_CONS;
-    openlog(prefix.c_str(), logopt, _facility);
+    openlog(_prefix.c_str(), logopt, _facility);
 }
 
 Ice::SysLoggerI::SysLoggerI(const string& prefix, int facility) :
@@ -119,7 +114,7 @@ Ice::SysLoggerI::SysLoggerI(const string& prefix, int facility) :
     _prefix(prefix)
 {
     int logopt = LOG_PID | LOG_CONS;
-    openlog(prefix.c_str(), logopt, facility);
+    openlog(_prefix.c_str(), logopt, facility);
 }
 
 Ice::SysLoggerI::~SysLoggerI()

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_SYS_LOGGER_I_H
 #define ICE_SYS_LOGGER_I_H

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

@@ -0,0 +1,66 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifdef ICE_USE_SYSTEMD
+
+#include <Ice/SystemdJournalI.h>
+#include <Ice/LocalException.h>
+#include <syslog.h>
+#include <systemd/sd-journal.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+Ice::SystemdJournalI::SystemdJournalI(const string& prefix) :
+    _prefix(prefix)
+{
+}
+
+void
+Ice::SystemdJournalI::print(const string& message)
+{
+    write(LOG_INFO, message);
+}
+
+void
+Ice::SystemdJournalI::trace(const string& category, const string& message)
+{
+    write(LOG_INFO, category + ": " + message);
+}
+
+void
+Ice::SystemdJournalI::warning(const string& message)
+{
+    write(LOG_WARNING, message);
+}
+
+void
+Ice::SystemdJournalI::error(const string& message)
+{
+    write(LOG_ERR, message);
+}
+
+string
+Ice::SystemdJournalI::getPrefix()
+{
+    return _prefix;
+}
+
+Ice::LoggerPtr
+Ice::SystemdJournalI::cloneWithPrefix(const string& prefix)
+{
+    return ICE_MAKE_SHARED(SystemdJournalI, prefix);
+}
+
+void
+Ice::SystemdJournalI::write(int priority, const string& message) const
+{
+    sd_journal_send("MESSAGE=%s", message.c_str(),
+                    "PRIORITY=%i", priority,
+                    "SYSLOG_IDENTIFIER=%s", _prefix.c_str(),
+                    NULL); // Using NULL is necessary for EL7, see #293
+}
+
+#endif

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

@@ -0,0 +1,39 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef ICE_SYSTEMD_JOURNAL_I_H
+#define ICE_SYSTEMD_JOURNAL_I_H
+
+#ifdef ICE_USE_SYSTEMD
+
+#include <Ice/Logger.h>
+
+namespace Ice
+{
+
+class SystemdJournalI : public Logger
+{
+public:
+
+    SystemdJournalI(const std::string&);
+
+    virtual void print(const std::string&);
+    virtual void trace(const std::string&, const std::string&);
+    virtual void warning(const std::string&);
+    virtual void error(const std::string&);
+    virtual std::string getPrefix();
+    virtual LoggerPtr cloneWithPrefix(const std::string&);
+
+private:
+
+    void write(int, const std::string&) const;
+
+    const std::string _prefix;
+};
+
+}
+
+#endif
+
+#endif

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

@@ -1,11 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+
+#include <Ice/Config.h>
+
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
 
 #include <Ice/TcpAcceptor.h>
 #include <Ice/TcpTransceiver.h>
@@ -131,6 +130,7 @@ IceInternal::TcpAcceptor::startAccept()
     assert(_acceptFd == INVALID_SOCKET);
     _acceptFd = createSocket(false, _addr);
     const int sz = static_cast<int>(_acceptBuf.size() / 2);
+    _info.error = ERROR_SUCCESS;
     if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
     {
         if(!wouldBlock())
@@ -143,7 +143,7 @@ IceInternal::TcpAcceptor::startAccept()
 void
 IceInternal::TcpAcceptor::finishAccept()
 {
-    if(static_cast<int>(_info.count) == SOCKET_ERROR || _fd == INVALID_SOCKET)
+    if(_info.error != ERROR_SUCCESS || _fd == INVALID_SOCKET)
     {
         closeSocketNoThrow(_acceptFd);
         _acceptFd = INVALID_SOCKET;
@@ -351,3 +351,5 @@ IceInternal::TcpAcceptor::~TcpAcceptor()
     assert(_acceptFd == INVALID_SOCKET);
 #endif
 }
+
+#endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TCP_ACCEPTOR_H
 #define ICE_TCP_ACCEPTOR_H

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

@@ -1,11 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+
+#include <Ice/Config.h>
+
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
 
 #include <Ice/TcpConnector.h>
 #include <Ice/TcpTransceiver.h>
@@ -125,3 +124,4 @@ IceInternal::TcpConnector::TcpConnector(const ProtocolInstancePtr& instance, con
 IceInternal::TcpConnector::~TcpConnector()
 {
 }
+#endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TCP_CONNECTOR_H
 #define ICE_TCP_CONNECTOR_H

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

@@ -1,11 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
+
+#include <Ice/Config.h>
+
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
 
 #include <Ice/TcpEndpointI.h>
 #include <Ice/Network.h>
@@ -383,3 +382,4 @@ IceInternal::TcpEndpointFactory::clone(const ProtocolInstancePtr& instance) cons
 {
     return new TcpEndpointFactory(instance);
 }
+#endif