Merge pull request #9057 from Michael-Gardner/HPCC-16194

HPCC-16194 SocketEndpointv4 added getUrlStr(StringBuffer &) to struct

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

system/mp/mpcomm.cpp

@@ -103,6 +103,12 @@ struct SocketEndpointV4
         val.setNetAddress(sizeof(ip),&ip);
         val.port = port;
     }
+    StringBuffer & getUrlStr(StringBuffer &val)
+    {
+        SocketEndpoint s;
+        this->get(s);
+        return s.getUrlStr(val);
+    }
 };
 
 class PacketHeader // standard packet header - no virtuals 
@@ -844,7 +850,7 @@ protected: friend class CMPPacketReader;
                                 e->Release();
 
 #ifdef _TRACE
-                                LOG(MCdebugInfo(100), unknownJob, "MP: Retrying connection to %s, %d attempts left",remoteep.getUrlStr(str).toCharArray(),retrycount+1);
+                                LOG(MCdebugInfo(100), unknownJob, "MP: Retrying connection to %s, %d attempts left",remoteep.getUrlStr(str).str(),retrycount+1);
 #endif
                         }
                         else
@@ -1070,7 +1076,7 @@ public:
                 return true;
         }
         StringBuffer ep;
-        remoteep.getUrlStr(ep);
+        remoteep.getUrlStr(ep); 
         loop {
             CTimeMon pingtm(1000*60);
             if (sendPing(pingtm)) 
@@ -1927,8 +1933,10 @@ int CMPConnectThread::run()
 #ifdef _FULLTRACE       
             StringBuffer s;
             SocketEndpoint ep1;
-            sock->getPeerEndpoint(ep1);
-            PROGLOG("MP: Connect Thread: socket accepted from %s",ep1.getUrlStr(s).str());
+            if (sock) {
+                sock->getPeerEndpoint(ep1);
+                PROGLOG("MP: Connect Thread: socket accepted from %s",ep1.getUrlStr(s).str());
+            }
 #endif
         }
         catch (IException *e)