瀏覽代碼

BUG:#111 Fix loopback problems with ftslave

Changes the consistency check from isHost to isLocal to allow an
ftslave instance to be started on a loopback ip as well as the
real network ip

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 14 年之前
父節點
當前提交
787237fac9
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      common/remote/rmtspawn.cpp
  2. 1 1
      dali/ft/fttransform.cpp

+ 1 - 1
common/remote/rmtspawn.cpp

@@ -137,7 +137,7 @@ ISocket * spawnRemoteChild(SpawnKind kind, const char * exe, const SocketEndpoin
 #if defined(_WIN32)
         //Run the program directly if it is being run on the local machine - so ssh doesn't need to be running...
         //Change once we have solved the problems with ssh etc. on windows?
-        if (childEP.isHost())
+        if (childEP.isLocal())
         {
             DWORD runcode;
             if (!invoke_program(cmd.str(), runcode, false))

+ 1 - 1
dali/ft/fttransform.cpp

@@ -575,7 +575,7 @@ void TransferServer::deserializeAction(MemoryBuffer & msg, unsigned action)
 {
     SocketEndpoint ep;
     ep.deserialize(msg);
-    if (!ep.isHost())
+    if (!ep.isLocal())
         assertex(!"Command transferred to the wrong computer!!!");
 
     srcFormat.deserialize(msg);