Changeset 5851

Timestamp:

Oct 1, 2009, 4:40:28 PM (15 years ago)

Author:

scheusso

Message:

cleaned up a little bit in connection handling

Location:

code/branches/core5/src/libraries/network

Files:

• ClientConnection.cc (modified) (1 diff)
• ClientConnection.h (modified) (1 diff)
• Connection.cc (modified) (1 diff)
• Connection.h (modified) (1 diff)
• Server.cc (modified) (2 diffs)
• Server.h (modified) (1 diff)
• ServerConnection.cc (modified) (1 diff)
• ServerConnection.h (modified) (1 diff)

code/branches/core5/src/libraries/network/ClientConnection.cc

@@ -133 +133 @@
   }
 
-  void ClientConnection::addClient(ENetEvent* event)
+  void ClientConnection::addPeer(ENetEvent* event)
   {
     assert(0);
   }
-  void ClientConnection::disconnectPeer(ENetEvent* event)
+  void ClientConnection::removePeer(ENetEvent* event)
   {
     this->established_=false;

code/branches/core5/src/libraries/network/ClientConnection.h

@@ -54 +54 @@
     inline bool isConnected(){ return this->established_; }
   private:
-    virtual void addClient(ENetEvent* event);
-    virtual void disconnectPeer(ENetEvent* event);
+    virtual void addPeer(ENetEvent* event);
+    virtual void removePeer(ENetEvent* event);
     
     bool disconnectConnection();

code/branches/core5/src/libraries/network/Connection.cc

@@ -83 +83 @@
         // log handling ================
         case ENET_EVENT_TYPE_CONNECT:
-          addClient( &event );
+          addPeer( &event );
           break;
         case ENET_EVENT_TYPE_DISCONNECT:
-          disconnectPeer( &event );
+          removePeer( &event );
           break;
         case ENET_EVENT_TYPE_RECEIVE:

code/branches/core5/src/libraries/network/Connection.h

@@ -67 +67 @@
     
     void processQueue();
-    virtual void addClient(ENetEvent* event)=0;
-    virtual void disconnectPeer(ENetEvent* event)=0;
+    virtual void addPeer(ENetEvent* event)=0;
+    virtual void removePeer(ENetEvent* event)=0;
     virtual bool processPacket(ENetEvent* event);
     

code/branches/core5/src/libraries/network/Server.cc

@@ -270 +270 @@
 
 
-  void Server::addClient(ENetEvent *event){
+  void Server::addPeer(ENetEvent *event){
     static unsigned int newid=1;
 
@@ -289 +289 @@
     createClient(temp->getID());
 }
+
+  void Server::removePeer(ENetEvent *event)
+  {
+    COUT(4) << "removing client from list" << std::endl;
+    ClientInformation *client = ClientInformation::findClient(&event->peer->address);
+    if(!client)
+      return;
+    else
+    {
+      //ServerConnection::disconnectClient( client );
+      ClientConnectionListener::broadcastClientDisconnected( client->getID() );
+      delete client;
+    }
+  }
 
   bool Server::createClient(int clientID){

code/branches/core5/src/libraries/network/Server.h

@@ -65 +65 @@
     unsigned int playerID(){return 0;}
     
-    void addClient(ENetEvent *event);
+    void addPeer(ENetEvent *event);
+    void removePeer(ENetEvent *event);
+    
     bool createClient(int clientID);
     void disconnectClient( ClientInformation *client);

code/branches/core5/src/libraries/network/ServerConnection.cc

@@ -105 +105 @@
   }
   
-  void ServerConnection::disconnectPeer( ENetEvent* event )
-  {
-    COUT(4) << "removing client from list" << std::endl;
-    ClientInformation *client = ClientInformation::findClient(&event->peer->address);
-    if(!client)
-      return;
-    else
-      ServerConnection::disconnectClient( client );
-  }
-  
   void ServerConnection::disconnectClient(int clientID){
     ClientInformation *client = ClientInformation::findClient(clientID);

code/branches/core5/src/libraries/network/ServerConnection.h

@@ -59 +59 @@
     static bool addPacketAll(ENetPacket *packet);
     virtual void disconnectClient(ClientInformation *client);
-    virtual void disconnectPeer( ENetEvent* event );
     void disconnectClient(int clientID);
   protected: