Update upstream source from tag 'upstream/2.1.1+dfsg'

Update to upstream version '2.1.1+dfsg'
with Debian dir fae8a5463c58b9ee303cb04f24606a56a5a08fba

3 files changed, 7 insertions, 212 deletions

diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp
deleted file mode 100644
index d9ae8b2..0000000
--- a/src/lib/arch/unix/ArchFileUnix.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * barrier -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2002 Chris Schoeneman
- * 
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- * 
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "arch/unix/ArchFileUnix.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <cstring>
-
-//
-// ArchFileUnix
-//
-
-ArchFileUnix::ArchFileUnix()
-{
-    // do nothing
-}
-
-ArchFileUnix::~ArchFileUnix()
-{
-    // do nothing
-}
-
-const char*
-ArchFileUnix::getBasename(const char* pathname)
-{
-    if (pathname == NULL) {
-        return NULL;
-    }
-
-    const char* basename = strrchr(pathname, '/');
-    if (basename != NULL) {
-        return basename + 1;
-    }
-    else {
-        return pathname;
-    }
-}
-
-std::string
-ArchFileUnix::getUserDirectory()
-{
-    char* buffer = NULL;
-    std::string dir;
-#if HAVE_GETPWUID_R
-    struct passwd pwent;
-    struct passwd* pwentp;
-#if defined(_SC_GETPW_R_SIZE_MAX)
-    long size = sysconf(_SC_GETPW_R_SIZE_MAX);
-    if (size == -1) {
-        size = BUFSIZ;
-    }
-#else
-    long size = BUFSIZ;
-#endif
-    buffer = new char[size];
-    getpwuid_r(getuid(), &pwent, buffer, size, &pwentp);
-#else
-    struct passwd* pwentp = getpwuid(getuid());
-#endif
-    if (pwentp != NULL && pwentp->pw_dir != NULL) {
-        dir = pwentp->pw_dir;
-    }
-    delete[] buffer;
-    return dir;
-}
-
-std::string
-ArchFileUnix::getSystemDirectory()
-{
-    return "/etc";
-}
-
-std::string
-ArchFileUnix::getInstalledDirectory()
-{
-#if WINAPI_XWINDOWS
-    return "/usr/bin";
-#else
-    return "/Applications/Barrier.app/Contents/MacOS";
-#endif
-}
-
-std::string
-ArchFileUnix::getLogDirectory()
-{
-    return "/var/log";
-}
-
-std::string
-ArchFileUnix::getPluginDirectory()
-{
-    if (!m_pluginDirectory.empty()) {
-        return m_pluginDirectory;
-    }
-
-#if WINAPI_XWINDOWS
-    return getProfileDirectory().append("/plugins");
-#else
-    return getProfileDirectory().append("/Plugins");
-#endif
-}
-
-std::string
-ArchFileUnix::getProfileDirectory()
-{
-    String dir;
-    if (!m_profileDirectory.empty()) {
-        dir = m_profileDirectory;
-    }
-    else {
-#if WINAPI_XWINDOWS
-        dir = getUserDirectory().append("/.barrier");
-#else
-        dir = getUserDirectory().append("/Library/Application Support/Barrier");
-#endif
-    }
-    return dir;
-
-}
-
-std::string
-ArchFileUnix::concatPath(const std::string& prefix,
-                const std::string& suffix)
-{
-    std::string path;
-    path.reserve(prefix.size() + 1 + suffix.size());
-    path += prefix;
-    if (path.size() == 0 || path[path.size() - 1] != '/') {
-        path += '/';
-    }
-    path += suffix;
-    return path;
-}
-
-void
-ArchFileUnix::setProfileDirectory(const String& s)
-{
-    m_profileDirectory = s;
-}
-
-void
-ArchFileUnix::setPluginDirectory(const String& s)
-{
-    m_pluginDirectory = s;
-}
diff --git a/src/lib/arch/unix/ArchFileUnix.h b/src/lib/arch/unix/ArchFileUnix.h
deleted file mode 100644
index 86dea0c..0000000
--- a/src/lib/arch/unix/ArchFileUnix.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * barrier -- mouse and keyboard sharing utility
- * Copyright (C) 2012-2016 Symless Ltd.
- * Copyright (C) 2002 Chris Schoeneman
- * 
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file LICENSE that should have accompanied this file.
- * 
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "arch/IArchFile.h"
-
-#define ARCH_FILE ArchFileUnix
-
-//! Unix implementation of IArchFile
-class ArchFileUnix : public IArchFile {
-public:
-    ArchFileUnix();
-    virtual ~ArchFileUnix();
-
-    // IArchFile overrides
-    virtual const char*    getBasename(const char* pathname);
-    virtual std::string    getUserDirectory();
-    virtual std::string    getSystemDirectory();
-    virtual std::string    getInstalledDirectory();
-    virtual std::string    getLogDirectory();
-    virtual std::string    getPluginDirectory();
-    virtual std::string    getProfileDirectory();
-    virtual std::string    concatPath(const std::string& prefix,
-                            const std::string& suffix);
-    virtual void        setProfileDirectory(const String& s);
-    virtual void        setPluginDirectory(const String& s);
-
-private:
-    String                m_profileDirectory;
-    String                m_pluginDirectory;
-};
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index 149218c..2a9259c 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -113,6 +113,11 @@ ArchNetworkBSD::newSocket(EAddressFamily family, ESocketType type)
     }
     try {
         setBlockingOnSocket(fd, false);
+        if (family == kINET6) {
+            int flag = 0;
+            if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &flag, sizeof(flag)) != 0)
+                throwError(errno);
+        }
     }
     catch (...) {
         close(fd);
@@ -647,8 +652,8 @@ ArchNetworkBSD::newAnyAddr(EAddressFamily family)
     switch (family) {
     case kINET: {
         auto* ipAddr = TYPED_ADDR(struct sockaddr_in, addr);
+        memset(ipAddr, 0, sizeof(struct sockaddr_in));
         ipAddr->sin_family         = AF_INET;
-        ipAddr->sin_port           = 0;
         ipAddr->sin_addr.s_addr    = INADDR_ANY;
         addr->m_len                = (socklen_t)sizeof(struct sockaddr_in);
         break;
@@ -656,8 +661,8 @@ ArchNetworkBSD::newAnyAddr(EAddressFamily family)
 
     case kINET6: {
         auto* ipAddr = TYPED_ADDR(struct sockaddr_in6, addr);
+        memset(ipAddr, 0, sizeof(struct sockaddr_in6));
         ipAddr->sin6_family         = AF_INET6;
-        ipAddr->sin6_port           = 0;
         memcpy(&ipAddr->sin6_addr, &in6addr_any, sizeof(in6addr_any));
         addr->m_len                = (socklen_t)sizeof(struct sockaddr_in6);
         break;