1 files changed, 21 insertions, 6 deletions

diff --git a/qpid/cpp/src/qpid/sys/Socket.h b/qpid/cpp/src/qpid/sys/Socket.h
index 9f62f3be1c..7d50afc59f 100644
--- a/qpid/cpp/src/qpid/sys/Socket.h
+++ b/qpid/cpp/src/qpid/sys/Socket.h
@@ -33,18 +33,21 @@ namespace sys {
 class Duration;
 class SocketAddress;
 
-class QPID_COMMON_CLASS_EXTERN Socket : public IOHandle
+class Socket : public IOHandle
 {
 public:
     /** Create a socket wrapper for descriptor. */
     QPID_COMMON_EXTERN Socket();
 
+    /** Set timeout for read and write */
+    void setTimeout(const Duration& interval) const;
+
     /** Set socket non blocking */
     void setNonblocking() const;
 
     QPID_COMMON_EXTERN void setTcpNoDelay() const;
 
-    QPID_COMMON_EXTERN void connect(const std::string& host, const std::string& port) const;
+    QPID_COMMON_EXTERN void connect(const std::string& host, uint16_t port) const;
     QPID_COMMON_EXTERN void connect(const SocketAddress&) const;
 
     QPID_COMMON_EXTERN void close() const;
@@ -54,9 +57,19 @@ public:
      *@param backlog maximum number of pending connections.
      *@return The bound port.
      */
-    QPID_COMMON_EXTERN int listen(const std::string& host = "", const std::string& port = "0", int backlog = 10) const;
+    QPID_COMMON_EXTERN int listen(uint16_t port = 0, int backlog = 10) const;
     QPID_COMMON_EXTERN int listen(const SocketAddress&, int backlog = 10) const;
 
+    /** Returns the "socket name" ie the address bound to
+     * the near end of the socket
+     */
+    QPID_COMMON_EXTERN std::string getSockname() const;
+
+    /** Returns the "peer name" ie the address bound to
+     * the remote end of the socket
+     */
+    std::string getPeername() const;
+
     /**
      * Returns an address (host and port) for the remote end of the
      * socket
@@ -71,7 +84,10 @@ public:
     /**
      * Returns the full address of the connection: local and remote host and port.
      */
-    QPID_COMMON_INLINE_EXTERN std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
+    QPID_COMMON_EXTERN std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
+
+    QPID_COMMON_EXTERN uint16_t getLocalPort() const;
+    uint16_t getRemotePort() const;
 
     /**
      * Returns the error code stored in the socket.  This may be used
@@ -93,8 +109,7 @@ private:
     void createSocket(const SocketAddress&) const;
 
     Socket(IOHandlePrivate*);
-    mutable std::string localname;
-    mutable std::string peername;
+    mutable std::string connectname;
     mutable bool nonblocking;
     mutable bool nodelay;
 };