HPCC-17017 Add port info to socket tracename

Signed-off-by: Mark Kelly <mark.kelly@lexisnexisrisk.com>
hpcc-systems · Jul 7, 2017 · bffe09a · bffe09a
1 parent bbd297a
commit bffe09a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/system/jlib/jsocket.cpp b/system/jlib/jsocket.cpp
@@ -410,7 +410,7 @@ class CSocket: public ISocket, public CInterface
     int         peer_name(char *name,size32_t namemax);
     SocketEndpoint &getPeerEndpoint(SocketEndpoint &ep);
     IpAddress & getPeerAddress(IpAddress &addr);
-    SocketEndpoint &getEndpoint(SocketEndpoint &ep);
+    SocketEndpoint &getEndpoint(SocketEndpoint &ep) const override;
     void        set_return_addr(int port,const char *name);  // sets returnep
     void        cancel_accept();
     size32_t    get_max_send_size();
@@ -1155,7 +1155,7 @@ void CSocket::set_return_addr(int port,const char *retname)
 }
 
 
-SocketEndpoint &CSocket::getEndpoint(SocketEndpoint &ep)
+SocketEndpoint &CSocket::getEndpoint(SocketEndpoint &ep) const
 {
     if (state != ss_open) {
         THROWJSOCKEXCEPTION(JSOCKERR_not_opened);

diff --git a/system/jlib/jsocket.hpp b/system/jlib/jsocket.hpp
@@ -332,7 +332,7 @@ class jlib_decl ISocket : extends IInterface
     virtual IpAddress &getPeerAddress(IpAddress &addr)=0;
 
     // Get local endpoint of socket
-    virtual SocketEndpoint &getEndpoint(SocketEndpoint &ep)=0;
+    virtual SocketEndpoint &getEndpoint(SocketEndpoint &ep) const = 0;
 
     //
     // Close socket

diff --git a/system/security/securesocket/securesocket.cpp b/system/security/securesocket/securesocket.cpp
@@ -258,7 +258,7 @@ class CSecureSocket : implements ISecureSocket, public CInterface
     }
 
     // Get local endpoint of socket
-    virtual SocketEndpoint &getEndpoint(SocketEndpoint &ep)
+    virtual SocketEndpoint &getEndpoint(SocketEndpoint &ep) const override
     {
         return m_socket->getEndpoint(ep);
     }