QPID-4615: Allow unix qpidd to pass in existing socket fds on cmdline.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1451446 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 4 deletions

diff --git a/cpp/src/qpid/sys/posix/BSDSocket.h b/cpp/src/qpid/sys/posix/BSDSocket.h
index 862d36c1b9..ae73718d55 100644
--- a/cpp/src/qpid/sys/posix/BSDSocket.h
+++ b/cpp/src/qpid/sys/posix/BSDSocket.h
@@ -45,6 +45,10 @@ class QPID_COMMON_CLASS_EXTERN BSDSocket : public Socket
 public:
     /** Create a socket wrapper for descriptor. */
     QPID_COMMON_EXTERN BSDSocket();
+
+    /** Construct socket with existing fd (posix specific and not in Socket interface) */
+    QPID_COMMON_EXTERN BSDSocket(int fd);
+
     QPID_COMMON_EXTERN ~BSDSocket();
 
     QPID_COMMON_EXTERN operator const IOHandle&() const;
@@ -103,10 +107,6 @@ protected:
     mutable std::string peername;
     mutable bool nonblocking;
     mutable bool nodelay;
-
-    /** Construct socket with existing handle */
-    BSDSocket(int fd);
-    friend class qpid::sys::ssl::SslMuxSocket; // Needed for this constructor
 };
 
 }}
diff --git a/cpp/src/qpid/sys/posix/SocketAddress.cpp b/cpp/src/qpid/sys/posix/SocketAddress.cpp
index cd23442226..1e5e52faab 100644
--- a/cpp/src/qpid/sys/posix/SocketAddress.cpp
+++ b/cpp/src/qpid/sys/posix/SocketAddress.cpp
@@ -76,6 +76,7 @@ std::string SocketAddress::asString(::sockaddr const * const addr, size_t addrle
     switch (addr->sa_family) {
         case AF_INET: s += dispName; break;
         case AF_INET6: s += "["; s += dispName; s+= "]"; break;
+        case AF_UNIX: s += "UNIX:"; break;
         default: throw Exception(QPID_MSG("Unexpected socket type"));
     }
     s += ":";