[Csp-commits] svn:csp r1177 - trunk/CSP/CSPSim/Source/SimNet

[<sv...@ww...>]

Author: wolverine
Date: 2004-07-24 18:10:58 -0700 (Sat, 24 Jul 2004)
New Revision: 1177

Modified:
   trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp
   trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp
   trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp
   trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp
   trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp
   trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp
Log:
networking changes

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1177

Modified: trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/DispatchMessageHandler.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -23,6 +23,11 @@
  */
 
 #include <SimNet/Networking.h>
+#include <SimNet/NetworkMessage.h>
+#include <SimNet/NetworkNode.h>
+#include <SimNet/NetworkMessageHandler.h>
+#include <SimNet/DispatchMessageHandler.h>
+
 #include "DynamicObject.h"
 #include "Config.h"
 

Modified: trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/EchoMessageHandler.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -29,6 +29,11 @@
 #include <SimNet/Networking.h>
 #include <SimData/LogStream.h>
 #include "Log.h"
+#include <SimNet/NetworkNode.h>
+#include <SimNet/NetworkMessage.h>
+#include <SimNet/NetworkMessenger.h>
+#include <SimNet/NetworkMessageHandler.h>
+#include <SimNet/EchoMessageHandler.h>
 
 EchoMessageHandler::EchoMessageHandler() {
 	m_messenger = NULL;

Modified: trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/MessageSocketDuplex.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -22,6 +22,7 @@
  * @author Scott Flicker (Wolverine)
  */
 #include <SimNet/Networking.h>
+#include <SimNet/NetworkNode.h>
 #include "Log.h"
 
 MessageSocketDuplex::MessageSocketDuplex() {

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkMessage.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -26,6 +26,8 @@
  */
 
 #include <SimNet/Networking.h>
+#include <SimNet/NetworkMessage.h>
+#include <SimNet/NetworkNode.h>
 
 unsigned short NetworkMessage::m_magicNumber = 0xACDC;
 unsigned short NetworkMessage::m_HeaderLen = 16;

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkMessenger.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -25,6 +25,9 @@
 #include <SimNet/Networking.h>
 #include <SimData/LogStream.h>
 #include "Log.h"
+#include <SimNet/NetworkMessage.h>
+#include <SimNet/NetworkNode.h>
+#include <SimNet/NetworkMessenger.h>
 
 NetworkMessenger::NetworkMessenger() {
 	CSP_LOG(NETWORK, DEBUG, "NetworkMessenger.NetworkMessenger()");

Modified: trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/NetworkNode.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -25,6 +25,7 @@
  */
 
 #include <SimNet/Networking.h>
+#include <SimNet/NetworkNode.h>
 
 NetworkNode::NetworkNode() {
 	// m_node_id = 0;

Modified: trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/PrintMessageHandler.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -29,6 +29,11 @@
 #include <SimData/LogStream.h>
 #include "Log.h"
 #include <SimNet/Networking.h>
+#include <SimNet/NetworkMessage.h>
+#include <SimNet/NetworkNode.h>
+#include <SimNet/NetworkMessageHandler.h>
+#include <SimNet/PrintMessageHandler.h>
+
 #include <stdio.h>
 
 PrintMessageHandler::PrintMessageHandler() {

Modified: trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp	2004-07-25 01:08:35 UTC (rev 1176)
+++ trunk/CSP/CSPSim/Source/SimNet/RedirectMessageHandler.cpp	2004-07-25 01:10:58 UTC (rev 1177)
@@ -1,18 +1,18 @@
 
 // Combat Simulator Project - FlightSim Demo
-// Copyright (C) 2004 The Combat Simulator Project
+// Copyright (C) 2002 The Combat Simulator Project
 // http://csp.sourceforge.net
-//
+// 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
-//
+// 
 // This program 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 General Public License for more details.
-//
+// 
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -23,36 +23,48 @@
  * @author Scott Flicker (Wolverine)
  *
  * Class for Handling Network Messages.
- * Redirects messages to other clients.
+ * Redirects messages to other clients. 
  */
 
 
 #include <SimData/LogStream.h>
 #include "Log.h"
 #include <SimNet/Networking.h>
+#include <SimNet/NetworkMessage.h>
+#include <SimNet/NetworkNode.h>
+#include <SimNet/NetworkMessenger.h>
+#include <SimNet/NetworkMessageHandler.h>
+#include <SimNet/RedirectMessageHandler.h>
 
-RedirectMessageHandler::RedirectMessageHandler() {
-	m_messenger = NULL;
+
+RedirectMessageHandler::RedirectMessageHandler()
+{
+  m_messenger = NULL;
 }
 
-RedirectMessageHandler::~RedirectMessageHandler() {
+RedirectMessageHandler::~RedirectMessageHandler()
+{
+
 }
 
-void RedirectMessageHandler::process(NetworkMessage * message) {
-	CSP_LOG(NETWORK, DEBUG, "RedirectMessageHandler::process()\n");
+void RedirectMessageHandler::process(NetworkMessage * message)
+{
+    CSP_LOG(APP, DEBUG, "RedirectMessageHandler::process()\n");
 
-	NetworkNode * originatorNode = message->getOriginatorNode();
-	CSP_LOG(NETWORK, DEBUG, "RedirectMessageHandler::process() - Sending back to host: " << originatorNode->getHostname() << ", port: " << originatorNode->getPort());
 
-	// must make a copy of the message since the buffer in the parameter will be returned
-	// to the pool after this function exists.
-	NetworkMessage * messageCopy = m_messenger->allocMessageBuffer();
-	memcpy((void*)messageCopy, (void*)message, 512);
+    NetworkNode * originatorNode = message->getOriginatorNode();
+    CSP_LOG(APP, DEBUG, "RedirectMessageHandler::process() - Sending back to host: " << 
+		    originatorNode->getHostname() << ", port: " << originatorNode->getPort());
 
-	// MessageHeader * header = (MessageHeader*)messageCopy;
-	// ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)messageCopy->getPayloadPtr();
+    // must make a copy of the message since the buffer in the parameter will be returned 
+    // to the pool after this function exists.
+    NetworkMessage * messageCopy = m_messenger->allocMessageBuffer();
+    memcpy( (void*)messageCopy, (void*)message, 512);
+    
+//    MessageHeader * header = (MessageHeader*)messageCopy;
+//    ObjectUpdateMessagePayload * ptrPayload = (ObjectUpdateMessagePayload*)messageCopy->getPayloadPtr();
 
-	m_messenger->queueMessage(originatorNode, messageCopy);
+    m_messenger->queueMessage(originatorNode, messageCopy);
 }