HPCC-32829 Remove redundant accept peerEp param

Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · Oct 18, 2024 · 9725270 · 9725270
1 parent 8becb08
commit 9725270
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/roxie/udplib/udpsha.hpp b/roxie/udplib/udpsha.hpp
@@ -347,7 +347,7 @@ class CSocketSimulator : public CInterfaceOf<ISocket>
     virtual size32_t writetms(void const* buf, size32_t minSize, size32_t size, unsigned timeoutms=WAIT_FOREVER) override { UNIMPLEMENTED; }
 
     virtual size32_t get_max_send_size() override { UNIMPLEMENTED; }
-    virtual ISocket* accept(bool allowcancel=false, SocketEndpoint *peerEp = nullptr) override { UNIMPLEMENTED; }
+    virtual ISocket* accept(bool allowcancel=false) override { UNIMPLEMENTED; }
     virtual int logPollError(unsigned revents, const char *rwstr) override { UNIMPLEMENTED; }
     virtual int wait_read(unsigned timeout) override { UNIMPLEMENTED; }
     virtual int wait_write(unsigned timeout) override { UNIMPLEMENTED; }

diff --git a/system/jlib/jsocket.cpp b/system/jlib/jsocket.cpp
@@ -654,7 +654,7 @@ class CSocket: public ISocket, public CInterface
     void        shutdown(unsigned mode=SHUTDOWN_READWRITE);
     void        shutdownNoThrow(unsigned mode);
 
-    ISocket*    accept(bool allowcancel, SocketEndpoint *peerEp=nullptr);
+    ISocket*    accept(bool allowcancel);
     int         wait_read(unsigned timeout);
     int         logPollError(unsigned revents, const char *rwstr);
     int         wait_write(unsigned timeout);
@@ -1254,7 +1254,7 @@ void CSocket::open(int listen_queue_size,bool reuseports)
 
 
 
-ISocket* CSocket::accept(bool allowcancel, SocketEndpoint *_peerEp)
+ISocket* CSocket::accept(bool allowcancel)
 {
     if ((accept_cancel_state!=accept_not_cancelled) && allowcancel) {
         accept_cancel_state=accept_cancelled;
@@ -1336,9 +1336,6 @@ ISocket* CSocket::accept(bool allowcancel, SocketEndpoint *_peerEp)
 
     SocketEndpoint peerEp;
     getSockAddrEndpoint(peerSockAddr, peerSockAddrLen, peerEp);
-    if (_peerEp)
-        *_peerEp = peerEp;
-
     CSocket *ret = new CSocket(newsock,sm_tcp,true,&peerEp);
     ret->checkCfgKeepAlive();
     ret->set_inherit(false);

diff --git a/system/jlib/jsocket.hpp b/system/jlib/jsocket.hpp
@@ -308,7 +308,7 @@ class jlib_decl ISocket : extends IInterface
     //
     // This method is called by server to accept client connection
     //
-    virtual ISocket* accept(bool allowcancel=false, SocketEndpoint *peerEp = nullptr) = 0; // not needed for UDP
+    virtual ISocket* accept(bool allowcancel=false) = 0; // not needed for UDP
 
     //
     // log poll() errors

diff --git a/system/mp/mpcomm.cpp b/system/mp/mpcomm.cpp
@@ -534,19 +534,20 @@ class CMPConnectThread: public Thread
         {
             CConnectSelectHandler &selectHandler;
             Owned<ISocket> sock;
-            SocketEndpoint peerEP;
             StringBuffer peerHostText, peerEndpointText;
             ConnectHdr hdr;
             cycle_t createTime = 0;
             size32_t readSoFar = 0;
             CriticalSection crit;
             bool closedOrHandled = false;
         public:
-            CSocketHandler(CConnectSelectHandler &_selectHandler, ISocket *_sock, const SocketEndpoint &_peerEP) : selectHandler(_selectHandler), sock(_sock), peerEP(_peerEP)
+            CSocketHandler(CConnectSelectHandler &_selectHandler, ISocket *_sock) : selectHandler(_selectHandler), sock(_sock)
             {
                 createTime = get_cycles_now();
+                SocketEndpoint peerEP;
+                sock->getPeerEndpoint(peerEP);
                 peerEP.getHostText(peerHostText); // always used by handleAcceptedSocket
-                peerEndpointText.append(peerEndpointText); // only used if tracing an error
+                peerEndpointText.append(peerHostText); // only used if tracing an error
                 if (peerEP.port)
                     peerEndpointText.append(':').append(peerEP.port);
             }
@@ -689,7 +690,7 @@ class CMPConnectThread: public Thread
             maintenanceSem.signal();
             maintenanceThread.join();
         }
-        void add(ISocket *sock, const SocketEndpoint &peerEP)
+        void add(ISocket *sock)
         {
             while (true)
             {
@@ -704,7 +705,7 @@ class CMPConnectThread: public Thread
                 MilliSleep(1000);
             }
 
-            Owned<CSocketHandler> socketHandler = new CSocketHandler(*this, LINK(sock), peerEP);
+            Owned<CSocketHandler> socketHandler = new CSocketHandler(*this, LINK(sock));
 
             size_t numHandlers;
             {
@@ -2553,10 +2554,9 @@ int CMPConnectThread::run()
     while (running)
     {
         Owned<ISocket> sock;
-        SocketEndpoint peerEP;
         try
         {
-            sock.setown(listensock->accept(true, &peerEP));
+            sock.setown(listensock->accept(true));
         }
         catch (IException *e)
         {
@@ -2595,7 +2595,7 @@ int CMPConnectThread::run()
             // After that, the socket will be removed from the connectSelectHamndler,
             // a CMPChannel will be estalbished, and the socket will be added to the MP CMPPacketReader select handler.
             // See handleAcceptedSocket.
-            connectSelectHandler.add(sock, peerEP);
+            connectSelectHandler.add(sock);
         }
         else
         {

diff --git a/system/security/securesocket/securesocket.cpp b/system/security/securesocket/securesocket.cpp
@@ -221,7 +221,7 @@ class CSecureSocket : implements ISecureSocket, public CInterface
     //
     // This method is called by server to accept client connection
     //
-    virtual ISocket* accept(bool allowcancel=false, SocketEndpoint *peerEp=nullptr) // not needed for UDP
+    virtual ISocket* accept(bool allowcancel=false) // not needed for UDP
     {
         throw MakeStringException(-1, "CSecureSocket::accept: not implemented");
     }