Changeset 6060 in orxonox.OLD

Timestamp:

Dec 12, 2005, 1:42:57 PM (18 years ago)

Author:

bwuest

Message:

Network changes

Location:

branches/network/src/lib/network

Files:

• network_protocol.cc (modified) (1 diff)
• network_protocol.h (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)
• network_stream.h (modified) (1 diff)
• synchronizeable.cc (modified) (3 diffs)
• synchronizeable.h (modified) (3 diffs)

branches/network/src/lib/network/network_protocol.cc

@@ -115 +115 @@
   h.version = data[1];
   /* unique ID */
-  h.uniqueID = data[2];
+  h.synchronizeableID = data[2];
   /* data length*/
   h.length = data[3];

branches/network/src/lib/network/network_protocol.h

@@ -17 +17 @@
   byte protocol;
   byte version;
-  byte uniqueID;
+  byte synchronizeableID;
   byte length;
 };

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

@@ -127 +127 @@
 }
 
+void NetworkStream::disconnectSynchronizeable(Synchronizeable& sync)
+{
+  this->synchronizeables.remove(&sync);
+
+  if( this->networkSockets.size()<=0 )
+    this->bActive = false;
+}
+
 
 void NetworkStream::processData()
@@ -241 +249 @@
         for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
         {
-          if ( *it && (*it)->getUniqueID()==header.uniqueID )
+          if ( *it && (*it)->getUniqueID()==header.synchronizeableID )
             (*it)->writeBytes(upBuffer+sizeof(header), dataLength);
         }

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

@@ -38 +38 @@
 
     void connectSynchronizeable(Synchronizeable& sync);
+    void disconnectSynchronizeable(Synchronizeable& sync);
 
     inline bool isServer() const { return (this->type == NET_SERVER)? true:false; }

branches/network/src/lib/network/synchronizeable.cc

@@ -20 +20 @@
 #include "netdefs.h"
 #include "network_manager.h"
+#include "network_stream.h"
 
 
@@ -28 +29 @@
 {
 
-  //owner = ?;
+  owner = 0;
   hostID = NetworkManager::getInstance()->getHostID();
   //state = ?;
@@ -47 +48 @@
  */
 Synchronizeable::~Synchronizeable()
-{}
+{
+  if ( this->networkStream )
+    this->networkStream->disconnectSynchronizeable(*this);
+}
 
 /**

branches/network/src/lib/network/synchronizeable.h

@@ -18 +18 @@
 #define STATE_SERVER 1
 #define STATE_OUTOFSYNC 2
+
+class NetworkStream;
 
 
@@ -43 +45 @@
     inline int getOwner(){ return owner; }
     inline void setOwner(int owner){ this->owner = owner; }
+    
+    inline void setNetworkStream(NetworkStream* stream) { this->networkStream = stream; }
 
   private:
@@ -55 +59 @@
     int state;
     std::list<int> synchronizeRequests;
+    
+    NetworkStream* networkStream;
 
   };