Changeset 9538 in orxonox.OLD

Timestamp:

Jul 27, 2006, 11:46:50 PM (18 years ago)

Author:

patrick

Message:

more proxy control functionality: message passing init

Location:

branches/proxy/src/lib/network

Files:

• message_manager.h (modified) (1 diff)
• network_manager.cc (modified) (3 diffs)
• network_stream.cc (modified) (3 diffs)
• proxy/proxy_control.cc (modified) (2 diffs)
• proxy/proxy_control.h (modified) (2 diffs)

branches/proxy/src/lib/network/message_manager.h

@@ -36 +36 @@
   MSGID_RESPAWN,                              //!< respawn message
 
-  MSGID_FORWARDMESSAGE                        //!< forwarding a messag between proxy and master server
+  MSGID_PROXY_NEWCLIENT                        //!< informs the master server about a new client
 };
 

branches/proxy/src/lib/network/network_manager.cc

@@ -31 +31 @@
 #include "network_log.h"
 #include "network_game_manager.h"
+#include "proxy/proxy_control.h"
 
 
@@ -116 +117 @@
   this->networkStream->createNetworkGameManager();
 
+  // init the proxy control center
+  ProxyControl::getInstance();
+
   PRINTF(0)("Created Network Master Server\n");
   SDL_Delay(20);
@@ -140 +144 @@
   this->networkStream->createServer( port, port +1);
 
-
   // and to the other proxy servers also, this would be very nice if its works
-
-
-  // start the network game manager
-  //this->networkStream->createNetworkGameManager();
-
+  /* put it here....*/
+
+  // init the proxy control center
+  ProxyControl::getInstance();
 
   PRINTF(0)("Created Network Proxy Server\n");

branches/proxy/src/lib/network/network_stream.cc

@@ -11 +11 @@
 ### File Specific:
    main-programmer: Christoph Renner rennerc@ee.ethz.ch
-   co-programmer:   Patrick Boenzli  boenzlip@orxonox.ethz.ch
+   co-programmer:   Patrick Boenzli  patrick@orxonox.ethz.ch
 
      June 2006: finishing work on the network stream for pps presentation (rennerc@ee.ethz.ch)
-     July 2006: some code rearangement and integration of the proxy server mechanism (boenzlip@ee.ethz.ch)
+     July 2006: some code rearangement and integration of the proxy server mechanism (patrick@orxonox.ethz.ch)
 */
 
@@ -20 +20 @@
 #define DEBUG_MODULE_NETWORK
 
+#include "proxy/proxy_control.h"
 
 #include "base_object.h"
@@ -646 +647 @@
 
                 // work with the ProxyControl to init the new client
+                ProxyControl::getInstance()->signalNewClient(it->second.userId);
 
 

branches/proxy/src/lib/network/proxy/proxy_control.cc

@@ -41 +41 @@
   this->setClassID( CL_PROXY_CONTROL, "ProxyControl" );
 
-//   MessageManager::getInstance()->registerMessageHandler( MSGID_CHANGENICKNAME, changeNickHandler, NULL );
+  MessageManager::getInstance()->registerMessageHandler( MSGID_PROXY_NEWCLIENT, messageHandlerNewClient, NULL );
 
   PRINTF(0)("ProxyControl created\n");
@@ -71 +71 @@
 }
 
+
+/**
+ *  signals new client connected to this local proxy
+ * @param userId userId of the new client
+ */
+void ProxyControl::signalNewClient(int userId)
+{
+  // make sure we are a proxy server
+  assert(SharedNetworkData::getInstance()->isProxyServerActive());
+
+
+}
+
+
+/**
+ * this is the handler for proxy signals: new clients
+ *
+ * @param messageType the type of the message
+ * @param data message data
+ * @param dataLength length of the message data
+ * @param someData some other atteched data
+ * @param senderId id of the sender client
+ * @param destinationId id of the destination client
+ * @return true if succeeded
+ */
+bool ProxyControl::messageHandlerNewClient( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
+{
+  // part for the master server
+  if( SharedNetworkData::getInstance()->isMasterServer())
+  {
+
+  }
+  else if(SharedNetworkData::getInstance()->isProxyServerActive())
+  {
+
+  }
+
+  return true;
+}

branches/proxy/src/lib/network/proxy/proxy_control.h

@@ -16 +16 @@
 
 
+
 //! A class for storing player information
 class ProxyControl : public Synchronizeable
@@ -26 +27 @@
 
     virtual void varChangeHandler( std::list<int> & id );
+
+    void signalNewClient(int userId);
+    static bool messageHandlerNewClient( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  );