Revision: 40713
http://brlcad.svn.sourceforge.net/brlcad/?rev=40713&view=rev
Author: davidloman
Date: 2010-09-27 19:49:42 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
Missed a few 'host'->'node' changes.
Modified Paths:
--------------
rt^3/trunk/include/NetMsgTypes.h
rt^3/trunk/include/NewNodeOnNetMsg.h
rt^3/trunk/include/RemoteNodenameSetMsg.h
rt^3/trunk/src/GS/geoserve.config
rt^3/trunk/src/GS/gsmain.cxx
rt^3/trunk/src/libNet/NetMsgFactory.cxx
rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx
Modified: rt^3/trunk/include/NetMsgTypes.h
===================================================================
--- rt^3/trunk/include/NetMsgTypes.h 2010-09-27 19:41:00 UTC (rev 40712)
+++ rt^3/trunk/include/NetMsgTypes.h 2010-09-27 19:49:42 UTC (rev 40713)
@@ -43,8 +43,8 @@
#define NEWNODEONNET 0x0200
-#define FULLHOSTLISTREQ 0x0250
-#define FULLHOSTLIST 0x0255
+#define FULLNODELISTREQ 0x0250
+#define FULL_NODE_LIST 0x0255
#define NEWSESSIONREQ 0x0300
#define SESSIONINFO 0x0305
@@ -64,7 +64,7 @@
#define UNKNOWN_PORTAL_FAILURE 0x0040
#define PORTAL_WRITE_FAILURE 0x0050
#define PORTAL_READ_FAILURE 0x0060
-#define REM_HOST_DISCONNECT 0x0070
+#define REM_NODE_DISCONNECT 0x0070
#define LOCAL_DISCONNECT_REQ 0x0080
#define AUTHENTICATION_FAILED 0x0090
Modified: rt^3/trunk/include/NewNodeOnNetMsg.h
===================================================================
--- rt^3/trunk/include/NewNodeOnNetMsg.h 2010-09-27 19:41:00 UTC (rev
40712)
+++ rt^3/trunk/include/NewNodeOnNetMsg.h 2010-09-27 19:49:42 UTC (rev
40713)
@@ -36,7 +36,7 @@
NewNodeOnNetMsg(QString s);
/* Reply Constructor */
- NewNodeOnNetMsg(NetMsg* msg, QString gsHostname);
+ NewNodeOnNetMsg(NetMsg* msg, QString gsNodename);
/* Deserializing Constructor */
NewNodeOnNetMsg(QDataStream* ds, Portal* origin);
Modified: rt^3/trunk/include/RemoteNodenameSetMsg.h
===================================================================
--- rt^3/trunk/include/RemoteNodenameSetMsg.h 2010-09-27 19:41:00 UTC (rev
40712)
+++ rt^3/trunk/include/RemoteNodenameSetMsg.h 2010-09-27 19:49:42 UTC (rev
40713)
@@ -37,7 +37,7 @@
RemoteNodenameSetMsg(QString s);
/* Reply Constructor */
- RemoteNodenameSetMsg(NetMsg* msg, QString gsHostname);
+ RemoteNodenameSetMsg(NetMsg* msg, QString gsNodename);
/* Deserializing Constructor */
RemoteNodenameSetMsg(QDataStream* ds, Portal* origin);
Modified: rt^3/trunk/src/GS/geoserve.config
===================================================================
--- rt^3/trunk/src/GS/geoserve.config 2010-09-27 19:41:00 UTC (rev 40712)
+++ rt^3/trunk/src/GS/geoserve.config 2010-09-27 19:49:42 UTC (rev 40713)
@@ -1,5 +1,5 @@
# Geometry Service Configuration File
-GSHostName Aries
+LocalNodeName Aries
ListenAddress 127.0.0.1
ListenPort 5309
\ No newline at end of file
Modified: rt^3/trunk/src/GS/gsmain.cxx
===================================================================
--- rt^3/trunk/src/GS/gsmain.cxx 2010-09-27 19:41:00 UTC (rev 40712)
+++ rt^3/trunk/src/GS/gsmain.cxx 2010-09-27 19:49:42 UTC (rev 40713)
@@ -45,12 +45,12 @@
return 1;
}
- QString gsHostname = c->getConfigValue("GSHostName");
- if (gsHostname == "") {
- gsHostname = "DefaultGSHostname";
+ QString localNodename = c->getConfigValue("LocalNodeName");
+ if (localNodename == "") {
+ localNodename = "DefaultGSNodename";
}
- log->logBANNER("GSMain", "Booting GeometryService: " + gsHostname);
+ log->logBANNER("GSMain", "Booting GeometryService: " + localNodename);
return 0;
}
Modified: rt^3/trunk/src/libNet/NetMsgFactory.cxx
===================================================================
--- rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-09-27 19:41:00 UTC (rev
40712)
+++ rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-09-27 19:49:42 UTC (rev
40713)
@@ -95,9 +95,9 @@
return new TypeOnlyMsg(qds, origin);
case NEWNODEONNET:
return new GenericOneStringMsg(qds, origin);
- // case FULLHOSTLISTREQ:
+ // case FULL_NODE_LISTREQ:
// return new NetMsg(qds, origin);
- // case FULLHOSTLIST:
+ // case FULL_NODE_LIST:
// return new NetMsg(qds, origin);
case NEWSESSIONREQ:
return new NewSessionReqMsg(qds, origin);
Modified: rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx 2010-09-27
19:41:00 UTC (rev 40712)
+++ rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx 2010-09-27
19:49:42 UTC (rev 40713)
@@ -28,14 +28,14 @@
#include <sstream>
/* Normal Constructor */
-RemoteNodenameSetMsg::RemoteNodenameSetMsg(QString gsHostname) :
- GenericOneStringMsg(GS_REMOTE_NODENAME_SET, gsHostname)
+RemoteNodenameSetMsg::RemoteNodenameSetMsg(QString localNodename) :
+ GenericOneStringMsg(GS_REMOTE_NODENAME_SET, localNodename)
{
}
/* Reply Constructor */
-RemoteNodenameSetMsg::RemoteNodenameSetMsg(NetMsg* msg, QString gsHostname) :
- GenericOneStringMsg(GS_REMOTE_NODENAME_SET, msg, gsHostname)
+RemoteNodenameSetMsg::RemoteNodenameSetMsg(NetMsg* msg, QString localNodename)
:
+ GenericOneStringMsg(GS_REMOTE_NODENAME_SET, msg, localNodename)
{
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
