Changeset 444

Timestamp:

Dec 9, 2007, 7:02:16 PM (17 years ago)

Author:

scheusso

Message:

chatserver/client ok

Location:

code/branches/FICN/src/network

Files:

• ClientInformation.cc (modified) (1 diff)
• ClientInformation.h (modified) (1 diff)
• ConnectionManager.cc (modified) (1 diff)
• Server.cc (modified) (2 diffs)
• dummyserver3.cc (modified) (1 diff)

code/branches/FICN/src/network/ClientInformation.cc

@@ -173 +173 @@
 ClientInformation *ClientInformation::findClient(ENetAddress *address, bool look_backwards){
   ClientInformation *temp = this;
-  while(temp!=0 && (temp->getPeer()->address.host!=address->host || temp->getPeer()->address.port != address->port))
+  while(temp!=0){
+    if(temp->head){
+      temp = temp->next();
+      continue;
+    }
+    if(temp->getPeer()->address.host==address->host && temp->getPeer()->address.port == address->port)
+      break;
     temp = temp->next();
+  }
   // returns 0 if nothing has been found
   return temp;

code/branches/FICN/src/network/ClientInformation.h

@@ -14 +14 @@
 
 #include <enet/enet.h>
+#include <iostream> //debug
 
 #define GAMESTATEID_INITIAL -1

code/branches/FICN/src/network/ConnectionManager.cc

@@ -55 +55 @@
   ENetPacket *ConnectionManager::getPacket(int &clientID){
     ENetAddress address;
-    ENetPacket *packet=getPacket(address);
-    clientID=head_->findClient(&address)->getID();
+    ENetPacket *packet=getPacket(address);std::cout << "searching clientid " << head_->getID() << std::endl;
+    ClientInformation *temp =head_->findClient(&address);
+    std::cout << "searching clientid " << temp << std::endl;
+    clientID=temp->getID();
     return packet;
   }

code/branches/FICN/src/network/Server.cc

@@ -22 +22 @@
   Server::Server(){
     packet_gen = PacketGenerator();
-    clients = new ClientInformation();
+    clients = new ClientInformation(true);
     connection = new ConnectionManager(clients);
     gamestates = new GameStateManager(clients);
@@ -109 +109 @@
     int clientID=-1;
     while(!connection->queueEmpty()){
+      std::cout << "Client " << clientID << " sent: " << std::endl;
       packet = connection->getPacket(clientID);
       elaborate(packet, clientID);

code/branches/FICN/src/network/dummyserver3.cc

@@ -26 +26 @@
 void dummyserver3::loop(){
   open();
-  while(true)
+  while(true){
     tick();
+  }
 }