Changeset 9268 in orxonox.OLD

Timestamp:

Jul 13, 2006, 11:32:48 AM (18 years ago)

Author:

patrick

Message:

extending handshake for node type exchange

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (2 diffs)
• handshake.h (modified) (3 diffs)
• network_stream.cc (modified) (3 diffs)
• network_stream.h (modified) (3 diffs)

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

@@ -43 +43 @@
   errorString_handler = registerVarId( new SynchronizeableString( &localState.errorString, &remoteState.errorString, "errorString", PERMISSION_ALL ) );
 
+  this->nodeTypeHandler = registerVarId( new SynchronizeableInt( &localState.nodeType, &remoteState.nodeType, "nodeType", PERMISSION_ALL ) );
+
   candel_id = registerVarId( new SynchronizeableInt( &localState.canDel, &remoteState.canDel, "canDel", PERMISSION_ALL ) );
 
@@ -56 +58 @@
   localState.orxId = _ORXONOX_ID;
   localState.version = _ORXONOX_VERSION;
+//   localState.nodeType =
   localState.canDel = 0;
 

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

@@ -12 +12 @@
 
 struct HandshakeState {
-  int orxId;
-  int version;
+  int orxId;                         //!< orxonox id
+  int version;                       //!< network protocol version
 
-  int networkManagerId;
-  int messageManagerId;
-  int hostId;
+  int networkManagerId;              //!< unique id of the network manager
+  int messageManagerId;              //!< unique id of the message manager
+  int hostId;                        //!< host id
+  int nodeType;                      //!< type of the network node
 
-  int completed;
-  int canDel;
+  int completed;                     //!< true if completed
+  int canDel;                        //!< true if marked for deletion
 
-  int error;
+  int error;                         //!< error number
 
-  std::string errorString;
+  std::string errorString;           //!< error string
 
   //additional data
-  std::string preferedNickName;
+  std::string preferedNickName;      //!< prefered nick name
 };
 
@@ -77 +78 @@
     int                msgManId_handler;                      //!< message manager handler
     int                hostId_handler;                        //!< host id handler
-    int                serverAddressHandler;                  //!< server address handler
+    int                nodeTypeHandler;                       //!< node type handler
 
     int                completed_handler;                     //!< handshake completion handler
@@ -83 +84 @@
     int                errorString_handler;                   //!< handshake error string handler
     int                candel_id;                             //!< handshake deletion handler
+    int                nodeType;                              //!, the type of the network node
 
 };

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

@@ -26 +26 @@
 #include "udp_server_socket.h"
 #include "connection_monitor.h"
+#include "network_monitor.h"
 #include "synchronizeable.h"
 #include "network_game_manager.h"
@@ -45 +46 @@
 #include <algorithm>
 
-/* include your own header */
+
 #include "network_stream.h"
 
-/* probably unnecessary */
+
 using namespace std;
 
@@ -792 +793 @@
 /**
  * is executed when a handshake has finished
- * @todo create playable for new user
  */
 void NetworkStream::handleNewClient( int userId )
 {
+  // init and assign the message manager
   MessageManager::getInstance()->initUser( userId );
-
+  // do all game relevant stuff here
   networkGameManager->signalNewPlayer( userId );
-}
+
+  // register the new client at the network monitor
+//   this->networkMonitor->addClient();
+}
+
 
 /**

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

@@ -22 +22 @@
 class ServerSocket;
 class NetworkGameManager;
+class NetworkMonitor;
 
 
@@ -66 +67 @@
 
   private:
+
     inline SynchronizeableList::const_iterator getSyncBegin(){ return synchronizeables.begin(); }
     inline SynchronizeableList::const_iterator getSyncEnd(){ return synchronizeables.end(); }
     inline PeerInfo & getPeerInfo( int userId ) { return peers[userId]; }
-
+    void cleanUpOldSyncList();
     int getSyncCount();
 
     void updateConnectionList();
+
     void handleHandshakes();
     void handleUpstream( int tick );
     void handleDownstream(int tick );
     void handleNewClient( int userId );
-    void cleanUpOldSyncList();
+
 
     void writeToNewDict( byte * data, int length, bool upstream );
@@ -91 +94 @@
     int                        currentState;                //!< current state id
 
+    NetworkMonitor*            networkMonitor;              //!< the network monitor
     NetworkGameManager*        networkGameManager;          //!< reference to the network game manager
     ServerSocket*              serverSocket;                //!< the listening socket of the server