[brlcad-commits] SF.net SVN: brlcad:[44981] geomcore/trunk/src/libNet

[<dav...@us...>]

Revision: 44981
          http://brlcad.svn.sourceforge.net/brlcad/?rev=44981&view=rev
Author:   davidloman
Date:     2011-06-14 19:55:09 +0000 (Tue, 14 Jun 2011)

Log Message:
-----------
Make Portal/PortalManager respond to a RemNodeNameSet message rather than automatically sending its localNodeName.

Modified Paths:
--------------
    geomcore/trunk/src/libNet/Portal.cxx
    geomcore/trunk/src/libNet/PortalManager.cxx

Modified: geomcore/trunk/src/libNet/Portal.cxx
===================================================================
--- geomcore/trunk/src/libNet/Portal.cxx	2011-06-14 19:24:34 UTC (rev 44980)
+++ geomcore/trunk/src/libNet/Portal.cxx	2011-06-14 19:55:09 UTC (rev 44981)
@@ -244,6 +244,10 @@
 			RemoteNodenameSetMsg* t = (RemoteNodenameSetMsg*) msg;
 			this->remoteNodeName.assign(t->getRemoteNodename());
 			this->handshakeComplete = true;
+
+		        RemoteNodenameSetMsg response(msg, this->pm->getLocalNodeName());
+		        this->send(&response);
+
 		}
 
 		/* Normally, the NetMsgRouter does the delete, but this opcode never gets routed. */

Modified: geomcore/trunk/src/libNet/PortalManager.cxx
===================================================================
--- geomcore/trunk/src/libNet/PortalManager.cxx	2011-06-14 19:24:34 UTC (rev 44980)
+++ geomcore/trunk/src/libNet/PortalManager.cxx	2011-06-14 19:55:09 UTC (rev 44981)
@@ -278,7 +278,7 @@
   this->masterFDSLock.unlock();
 
   /* Start handshake */
-  p->sendGSNodeName();
+  //p->sendGSNodeName();
 
   return p;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.