Revision: 40712
http://brlcad.svn.sourceforge.net/brlcad/?rev=40712&view=rev
Author: davidloman
Date: 2010-09-27 19:41:00 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
Replace all references to the word 'host' with 'node' when referring to another
node on the GSNetwork. Should help make things easier to understand.
Modified Paths:
--------------
rt^3/trunk/include/GeometryService.h
rt^3/trunk/include/NetMsgTypes.h
rt^3/trunk/src/GS/GeometryService.cxx
rt^3/trunk/src/libNet/CMakeLists.txt
rt^3/trunk/src/libNet/NetMsgFactory.cxx
rt^3/trunk/src/libNet/Portal.cxx
rt^3/trunk/tests/GS/GeometryServiceTest.cxx
rt^3/trunk/tests/libNet/PrintingMsgHandler.h
rt^3/trunk/tests/libNet/netMsgSerialTest.cxx
Added Paths:
-----------
rt^3/trunk/include/NewNodeOnNetMsg.h
rt^3/trunk/include/RemoteNodenameSetMsg.h
rt^3/trunk/src/libNet/netMsg/NewNodeOnNetMsg.cxx
rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx
Removed Paths:
-------------
rt^3/trunk/include/NewHostOnNetMsg.h
rt^3/trunk/include/RemoteGSHostnameSetMsg.h
rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx
rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx
Modified: rt^3/trunk/include/GeometryService.h
===================================================================
--- rt^3/trunk/include/GeometryService.h 2010-09-27 19:13:53 UTC (rev
40711)
+++ rt^3/trunk/include/GeometryService.h 2010-09-27 19:41:00 UTC (rev
40712)
@@ -37,11 +37,11 @@
{
public:
- GeometryService(const QString localGSHostname);
+ GeometryService(const QString localNodeName);
virtual ~GeometryService();
private:
Logger* log;
- QString localGSHostname;
+ QString localNodeName;
};
#endif
Modified: rt^3/trunk/include/NetMsgTypes.h
===================================================================
--- rt^3/trunk/include/NetMsgTypes.h 2010-09-27 19:13:53 UTC (rev 40711)
+++ rt^3/trunk/include/NetMsgTypes.h 2010-09-27 19:41:00 UTC (rev 40712)
@@ -37,11 +37,11 @@
#define FAILURE 0x0050
#define SUCCESS 0x0051
-#define REMGSHOSTNAMESET 0x0100
+#define GS_REMOTE_NODENAME_SET 0x0100
#define DISCONNECTREQ 0x0150
-#define NEWHOSTONNET 0x0200
+#define NEWNODEONNET 0x0200
#define FULLHOSTLISTREQ 0x0250
#define FULLHOSTLIST 0x0255
Deleted: rt^3/trunk/include/NewHostOnNetMsg.h
===================================================================
--- rt^3/trunk/include/NewHostOnNetMsg.h 2010-09-27 19:13:53 UTC (rev
40711)
+++ rt^3/trunk/include/NewHostOnNetMsg.h 2010-09-27 19:41:00 UTC (rev
40712)
@@ -1,58 +0,0 @@
-/* N E W H O S T O N N E T M S G . H
- * BRL-CAD
- *
- * Copyright (c) 2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file NewHostOnNetMsg.h
- *
- * Brief description
- *
- */
-
-#ifndef __NEWHOSTONNETMSG_H__
-#define __NEWHOSTONNETMSG_H__
-
-#include "GenericOneStringMsg.h"
-
-class NewHostOnNetMsg: public GenericOneStringMsg
-{
-
-public:
- /* Normal Constructor */
- NewHostOnNetMsg(QString s);
-
- /* Reply Constructor */
- NewHostOnNetMsg(NetMsg* msg, QString gsHostname);
-
- /* Deserializing Constructor */
- NewHostOnNetMsg(QDataStream* ds, Portal* origin);
-
- /* Destructor */
- virtual ~NewHostOnNetMsg();
-
- QString getNewGSHostname();
-};
-
-#endif
-
-// Local Variables: ***
-// mode: C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
Copied: rt^3/trunk/include/NewNodeOnNetMsg.h (from rev 40695,
rt^3/trunk/include/NewHostOnNetMsg.h)
===================================================================
--- rt^3/trunk/include/NewNodeOnNetMsg.h (rev 0)
+++ rt^3/trunk/include/NewNodeOnNetMsg.h 2010-09-27 19:41:00 UTC (rev
40712)
@@ -0,0 +1,58 @@
+/* N E W N O D E O N N E T M S G . H
+ * BRL-CAD
+ *
+ * Copyright (c) 2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file NewNodeOnNetMsg.h
+ *
+ * Brief description
+ *
+ */
+
+#ifndef __NEWNODEONNETMSG_H__
+#define __NEWNODEONNETMSG_H__
+
+#include "GenericOneStringMsg.h"
+
+class NewNodeOnNetMsg: public GenericOneStringMsg
+{
+
+public:
+ /* Normal Constructor */
+ NewNodeOnNetMsg(QString s);
+
+ /* Reply Constructor */
+ NewNodeOnNetMsg(NetMsg* msg, QString gsHostname);
+
+ /* Deserializing Constructor */
+ NewNodeOnNetMsg(QDataStream* ds, Portal* origin);
+
+ /* Destructor */
+ virtual ~NewNodeOnNetMsg();
+
+ QString getNewNodename();
+};
+
+#endif
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Deleted: rt^3/trunk/include/RemoteGSHostnameSetMsg.h
===================================================================
--- rt^3/trunk/include/RemoteGSHostnameSetMsg.h 2010-09-27 19:13:53 UTC (rev
40711)
+++ rt^3/trunk/include/RemoteGSHostnameSetMsg.h 2010-09-27 19:41:00 UTC (rev
40712)
@@ -1,59 +0,0 @@
-/* R E M O T E G S H O S T N A M E S E T M S G . H
- * BRL-CAD
- *
- * Copyright (c) 2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file RemoteGSHostnameSetMsg.cxx
- *
- * Brief description
- *
- */
-
-#ifndef __REMOTEGSHOSTNAMESETMSG_H__
-#define __REMOTEGSHOSTNAMESETMSG_H__
-
-#include "GenericOneStringMsg.h"
-
-class RemoteGSHostnameSetMsg: public GenericOneStringMsg
-{
-
-public:
-
- /* Normal Constructor */
- RemoteGSHostnameSetMsg(QString s);
-
- /* Reply Constructor */
- RemoteGSHostnameSetMsg(NetMsg* msg, QString gsHostname);
-
- /* Deserializing Constructor */
- RemoteGSHostnameSetMsg(QDataStream* ds, Portal* origin);
-
- /* Destructor */
- virtual ~RemoteGSHostnameSetMsg();
-
- QString getRemoteGSHostname();
-
-};
-
-#endif //__REMOTEGSHOSTNAMESETMSG_H__
-// Local Variables: ***
-// mode: C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
Copied: rt^3/trunk/include/RemoteNodenameSetMsg.h (from rev 40695,
rt^3/trunk/include/RemoteGSHostnameSetMsg.h)
===================================================================
--- rt^3/trunk/include/RemoteNodenameSetMsg.h (rev 0)
+++ rt^3/trunk/include/RemoteNodenameSetMsg.h 2010-09-27 19:41:00 UTC (rev
40712)
@@ -0,0 +1,60 @@
+/* R E M O T E N O D E N A M E S E T M S G . H
+ * BRL-CAD
+ *
+ * Copyright (c) 2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file RemoteNodenameSetMsg.h
+ *
+ * Brief description
+ *
+ */
+
+#ifndef __REMOTENODENAMESETMSG_H__
+#define __REMOTENODENAMESETMSG_H__
+
+#include "GenericOneStringMsg.h"
+
+class RemoteNodenameSetMsg: public GenericOneStringMsg
+{
+
+public:
+
+ /* Normal Constructor */
+ RemoteNodenameSetMsg(QString s);
+
+ /* Reply Constructor */
+ RemoteNodenameSetMsg(NetMsg* msg, QString gsHostname);
+
+ /* Deserializing Constructor */
+ RemoteNodenameSetMsg(QDataStream* ds, Portal* origin);
+
+ /* Destructor */
+ virtual ~RemoteNodenameSetMsg();
+
+ QString getRemoteNodename();
+
+};
+
+#endif //__REMOTENODENAMESETMSG_H__
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx 2010-09-27 19:13:53 UTC (rev
40711)
+++ rt^3/trunk/src/GS/GeometryService.cxx 2010-09-27 19:41:00 UTC (rev
40712)
@@ -26,11 +26,11 @@
#include "GeometryService.h"
#include "SessionManager.h"
-GeometryService::GeometryService(const QString gsHostname) :
- localGSHostname(gsHostname)
+GeometryService::GeometryService(const QString localNodeName) :
+localNodeName(localNodeName)
{
this->log = Logger::getInstance();
- this->log->logINFO("GeometryService", gsHostname + " is starting up...");
+ this->log->logINFO("GeometryService", localNodeName + " is starting
up...");
}
GeometryService::~GeometryService()
Modified: rt^3/trunk/src/libNet/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/libNet/CMakeLists.txt 2010-09-27 19:13:53 UTC (rev
40711)
+++ rt^3/trunk/src/libNet/CMakeLists.txt 2010-09-27 19:41:00 UTC (rev
40712)
@@ -19,7 +19,7 @@
# information.
#
#########################################################################
-# @file rt^3/src/libNetwork/CMakeLists.txt
+# @file rt^3/src/libNet/CMakeLists.txt
#
# $Revision: $
# $Author: $
@@ -58,10 +58,10 @@
netMsg/GenericMultiByteMsg.cxx
netMsg/FailureMsg.cxx
netMsg/SuccessMsg.cxx
- netMsg/RemoteGSHostnameSetMsg.cxx
+ netMsg/RemoteNodenameSetMsg.cxx
netMsg/NewSessionReqMsg.cxx
netMsg/SessionInfoMsg.cxx
- netMsg/NewHostOnNetMsg.cxx
+ netMsg/NewNodeOnNetMsg.cxx
netMsg/GeometryReqMsg.cxx
netMsg/GeometryManifestMsg.cxx
netMsg/GeometryChunkMsg.cxx
@@ -76,7 +76,7 @@
NetMsgFactory.h
NetMsg.h
TypeOnlyMsg.h
- RemoteGSHostnameSetMsg.h
+ RemoteNodenameSetMsg.h
GenericOneStringMsg.h
GenericOneByteMsg.h
GenericTwoBytesMsg.h
@@ -86,7 +86,7 @@
SuccessMsg.h
NewSessionReqMsg.h
SessionInfoMsg.h
- NewHostOnNetMsg.h
+ NewNodeOnNetMsg.h
GeometryReqMsg.h
GeometryManifestMsg.h
GeometryChunkMsg.h
Modified: rt^3/trunk/src/libNet/NetMsgFactory.cxx
===================================================================
--- rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-09-27 19:13:53 UTC (rev
40711)
+++ rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-09-27 19:41:00 UTC (rev
40712)
@@ -89,11 +89,11 @@
return new GenericOneByteMsg(qds, origin);
case SUCCESS:
return new GenericOneByteMsg(qds, origin);
- case REMGSHOSTNAMESET:
+ case GS_REMOTE_NODENAME_SET:
return new GenericOneStringMsg(qds, origin);
case DISCONNECTREQ:
return new TypeOnlyMsg(qds, origin);
- case NEWHOSTONNET:
+ case NEWNODEONNET:
return new GenericOneStringMsg(qds, origin);
// case FULLHOSTLISTREQ:
// return new NetMsg(qds, origin);
Modified: rt^3/trunk/src/libNet/Portal.cxx
===================================================================
--- rt^3/trunk/src/libNet/Portal.cxx 2010-09-27 19:13:53 UTC (rev 40711)
+++ rt^3/trunk/src/libNet/Portal.cxx 2010-09-27 19:41:00 UTC (rev 40712)
@@ -28,7 +28,7 @@
#include "brlcad/bu.h"
#include "NetMsgFactory.h"
#include "NetMsgTypes.h"
-#include "RemoteGSHostnameSetMsg.h"
+#include "RemoteNodenameSetMsg.h"
Portal::Portal(PkgTcpClient* client)
{
@@ -65,7 +65,7 @@
localNodeName = QUuid::createUuid().toString();
}
- RemoteGSHostnameSetMsg* msg = new RemoteGSHostnameSetMsg(localNodeName);
+ RemoteNodenameSetMsg* msg = new RemoteNodenameSetMsg(localNodeName);
this->send(msg);
}
@@ -111,9 +111,9 @@
{
quint16 type = msg->getMsgType();
- if (type == REMGSHOSTNAMESET) {
- RemoteGSHostnameSetMsg* t = (RemoteGSHostnameSetMsg*)msg;
- this->remoteNodeName = t->getRemoteGSHostname();
+ if (type == GS_REMOTE_NODENAME_SET) {
+ RemoteNodenameSetMsg* t = (RemoteNodenameSetMsg*)msg;
+ this->remoteNodeName = t->getRemoteNodename();
this->handshakeComplete = true;
delete msg;
return true;
Deleted: rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx 2010-09-27 19:13:53 UTC
(rev 40711)
+++ rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx 2010-09-27 19:41:00 UTC
(rev 40712)
@@ -1,67 +0,0 @@
-/* N E W H O S T O N N E T M S G . C X X
- * BRL-CAD
- *
- * Copyright (c) 2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file NewHostOnNetMsg.cxx
- *
- * Brief description
- *
- */
-
-#include "NetMsgTypes.h"
-#include "NewHostOnNetMsg.h"
-#include <sstream>
-
-/* Normal Constructor */
-NewHostOnNetMsg::NewHostOnNetMsg(QString gsHostname) :
- GenericOneStringMsg(REMGSHOSTNAMESET, gsHostname)
-{
-}
-
-/* Reply Constructor */
-NewHostOnNetMsg::NewHostOnNetMsg(NetMsg* msg, QString gsHostname) :
- GenericOneStringMsg(REMGSHOSTNAMESET, msg, gsHostname)
-{
-}
-
-/* Deserializing Constructor */
-NewHostOnNetMsg::NewHostOnNetMsg(QDataStream* ds, Portal* origin) :
- GenericOneStringMsg(ds, origin)
-{
-}
-
-/* Destructor */
-NewHostOnNetMsg::~NewHostOnNetMsg()
-{
-}
-
-/*
- *Getters n Setters
- */
-QString NewHostOnNetMsg::getNewGSHostname()
-{
- return this->strData;
-}
-
-// Local Variables: ***
-// mode: C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
Copied: rt^3/trunk/src/libNet/netMsg/NewNodeOnNetMsg.cxx (from rev 40695,
rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx)
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NewNodeOnNetMsg.cxx
(rev 0)
+++ rt^3/trunk/src/libNet/netMsg/NewNodeOnNetMsg.cxx 2010-09-27 19:41:00 UTC
(rev 40712)
@@ -0,0 +1,68 @@
+/* N E W N O D E O N N E T M S G . C X X
+ * BRL-CAD
+ *
+ * Copyright (c) 2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file NewNodeOnNetMsg.cxx
+ *
+ * Brief description
+ *
+ */
+
+
+#include "NetMsgTypes.h"
+#include "NewNodeOnNetMsg.h"
+#include <sstream>
+
+/* Normal Constructor */
+NewNodeOnNetMsg::NewNodeOnNetMsg(QString nodename) :
+ GenericOneStringMsg(GS_REMOTE_NODENAME_SET, nodename)
+{
+}
+
+/* Reply Constructor */
+NewNodeOnNetMsg::NewNodeOnNetMsg(NetMsg* msg, QString nodename) :
+ GenericOneStringMsg(GS_REMOTE_NODENAME_SET, msg, nodename)
+{
+}
+
+/* Deserializing Constructor */
+NewNodeOnNetMsg::NewNodeOnNetMsg(QDataStream* ds, Portal* origin) :
+ GenericOneStringMsg(ds, origin)
+{
+}
+
+/* Destructor */
+NewNodeOnNetMsg::~NewNodeOnNetMsg()
+{
+}
+
+/*
+ *Getters n Setters
+ */
+QString NewNodeOnNetMsg::getNewNodename()
+{
+ return this->strData;
+}
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Deleted: rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx 2010-09-27
19:13:53 UTC (rev 40711)
+++ rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx 2010-09-27
19:41:00 UTC (rev 40712)
@@ -1,67 +0,0 @@
-/* R E M O T E G S H O S T N A M E S E T M S G . C X X
- * BRL-CAD
- *
- * Copyright (c) 2010 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @file RemoteGSHostnameSetMsg.cxx
- *
- * Brief description
- *
- */
-
-#include "NetMsgTypes.h"
-#include "RemoteGSHostnameSetMsg.h"
-#include <sstream>
-
-/* Normal Constructor */
-RemoteGSHostnameSetMsg::RemoteGSHostnameSetMsg(QString gsHostname) :
- GenericOneStringMsg(REMGSHOSTNAMESET, gsHostname)
-{
-}
-
-/* Reply Constructor */
-RemoteGSHostnameSetMsg::RemoteGSHostnameSetMsg(NetMsg* msg, QString
gsHostname) :
- GenericOneStringMsg(REMGSHOSTNAMESET, msg, gsHostname)
-{
-}
-
-/* Deserializing Constructor */
-RemoteGSHostnameSetMsg::RemoteGSHostnameSetMsg(QDataStream* ds, Portal*
origin) :
- GenericOneStringMsg(ds, origin)
-{
-}
-
-/* Destructor */
-RemoteGSHostnameSetMsg::~RemoteGSHostnameSetMsg()
-{
-}
-
-/*
- *Getters n Setters
- */
-QString RemoteGSHostnameSetMsg::getRemoteGSHostname()
-{
- return this->strData;
-}
-
-// Local Variables: ***
-// mode: C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
Copied: rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx (from rev 40695,
rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx)
===================================================================
--- rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx
(rev 0)
+++ rt^3/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx 2010-09-27
19:41:00 UTC (rev 40712)
@@ -0,0 +1,67 @@
+/* R E M O T E N O D E N A M E S E T M S G . C X X
+ * BRL-CAD
+ *
+ * Copyright (c) 2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file RemoteNodenameSetMsg.cxx
+ *
+ * Brief description
+ *
+ */
+
+#include "NetMsgTypes.h"
+#include "RemoteNodenameSetMsg.h"
+#include <sstream>
+
+/* Normal Constructor */
+RemoteNodenameSetMsg::RemoteNodenameSetMsg(QString gsHostname) :
+ GenericOneStringMsg(GS_REMOTE_NODENAME_SET, gsHostname)
+{
+}
+
+/* Reply Constructor */
+RemoteNodenameSetMsg::RemoteNodenameSetMsg(NetMsg* msg, QString gsHostname) :
+ GenericOneStringMsg(GS_REMOTE_NODENAME_SET, msg, gsHostname)
+{
+}
+
+/* Deserializing Constructor */
+RemoteNodenameSetMsg::RemoteNodenameSetMsg(QDataStream* ds, Portal* origin) :
+ GenericOneStringMsg(ds, origin)
+{
+}
+
+/* Destructor */
+RemoteNodenameSetMsg::~RemoteNodenameSetMsg()
+{
+}
+
+/*
+ *Getters n Setters
+ */
+QString RemoteNodenameSetMsg::getRemoteNodename()
+{
+ return this->strData;
+}
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: rt^3/trunk/tests/GS/GeometryServiceTest.cxx
===================================================================
--- rt^3/trunk/tests/GS/GeometryServiceTest.cxx 2010-09-27 19:13:53 UTC (rev
40711)
+++ rt^3/trunk/tests/GS/GeometryServiceTest.cxx 2010-09-27 19:41:00 UTC (rev
40712)
@@ -33,9 +33,9 @@
#include "libgs.h"
#include "libnet.h"
-#include <QUuid>
-#include <QString>
-#include <QHostAddress>
+#include <QtCore/QUuid>
+#include <QtCore/QString>
+#include <QtNetwork/QHostAddress>
static const quint16 DEFAULT_PORT = 7777;
Modified: rt^3/trunk/tests/libNet/PrintingMsgHandler.h
===================================================================
--- rt^3/trunk/tests/libNet/PrintingMsgHandler.h 2010-09-27 19:13:53 UTC
(rev 40711)
+++ rt^3/trunk/tests/libNet/PrintingMsgHandler.h 2010-09-27 19:41:00 UTC
(rev 40712)
@@ -36,7 +36,7 @@
void handleNetMsg(NetMsg* msg, NetPortal* origin)
{
- Logger::getInstance()->logINFO(_name, "Received msg type '" +
QString::number(msg->getMsgType()) + "' from '" + origin->getRemoteGSHostname()
+ "'");
+ Logger::getInstance()->logINFO(_name, "Received msg type '" +
QString::number(msg->getMsgType()) + "' from '" + origin->getRemoteNodename() +
"'");
}
private:
Modified: rt^3/trunk/tests/libNet/netMsgSerialTest.cxx
===================================================================
--- rt^3/trunk/tests/libNet/netMsgSerialTest.cxx 2010-09-27 19:13:53 UTC
(rev 40711)
+++ rt^3/trunk/tests/libNet/netMsgSerialTest.cxx 2010-09-27 19:41:00 UTC
(rev 40712)
@@ -172,11 +172,11 @@
testMsg(&msg112, "GeometryReqMsg-Reply");
/* Test Normal */
- NewHostOnNetMsg msg121("Kiaser Sose");
- testMsg(&msg121, "NewHostOnNetMsg-Normal");
+ NewNodeOnNetMsg msg121("Kiaser Sose");
+ testMsg(&msg121, "NewNodeOnNetMsg-Normal");
/* Test Reply */
- NewHostOnNetMsg msg122(&msg121, "Kiaser Sose");
- testMsg(&msg122, "NewHostOnNetMsg-Reply");
+ NewNodeOnNetMsg msg122(&msg121, "Kiaser Sose");
+ testMsg(&msg122, "NewNodeOnNetMsg-Reply");
/* Test Normal */
NewSessionReqMsg msg131("Kiaser Sose", "YourMom");
@@ -186,11 +186,11 @@
testMsg(&msg132, "NewSessionReqMsg-Reply");
/* Test Normal */
- RemoteGSHostnameSetMsg msg141("RogerRamJet");
- testMsg(&msg141, "RemoteGSHostnameSetMsg-Normal");
+ RemoteNodenameSetMsg msg141("RogerRamJet");
+ testMsg(&msg141, "RemoteNodenameSetMsg-Normal");
/* Test Reply */
- RemoteGSHostnameSetMsg msg142(&msg141, "RogerRamJet");
- testMsg(&msg142, "RemoteGSHostnameSetMsg-Reply");
+ RemoteNodenameSetMsg msg142(&msg141, "RogerRamJet");
+ testMsg(&msg142, "RemoteNodenameSetMsg-Reply");
QUuid uuid = QUuid::createUuid();
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
