Changeset 442 for code/branches

Timestamp:

Dec 9, 2007, 6:01:24 PM (17 years ago)

Author:

scheusso

Message:

still problems with chatserver/client

Location:

code/branches/FICN/src/network

Files:

• ClientInformation.cc (modified) (1 diff)
• ConnectionManager.cc (modified) (1 diff)
• Server.cc (modified) (2 diffs)
• dummyclient2.cc (modified) (1 diff)
• dummyserver.cc (modified) (1 diff)

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

@@ -58 +58 @@
 
 ClientInformation *ClientInformation::next(){
-  return this->nexte;
+  if(this!=0)
+    return this->nexte;
+  else
+    return 0;
 }
 ClientInformation *ClientInformation::prev(){
-  return this->preve;
+  if(this!=0)
+    return this->preve;
+  else
+    return 0;
 }
 

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

@@ -198 +198 @@
   bool ConnectionManager::addClient(ENetEvent *event){
     ClientInformation *temp = head_->insertBack(new ClientInformation);
-    temp->setID(temp->prev()->getID());
+    temp->setID(temp->prev()->getID()+1);
     temp->setPeer(event->peer);
+    std::cout << "added client id: " << temp->prev()->getID() << std::endl;
     return true;
   }

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

@@ -74 +74 @@
   bool Server::sendMSG(std::string msg){
     ENetPacket *packet = packet_gen.chatMessage(msg.c_str());
+    std::cout <<"adding packets" << std::endl;
     connection->addPacketAll(packet);
+    std::cout <<"added packets" << std::endl;
     return connection->sendPackets();
   }
@@ -84 +86 @@
   bool Server::sendMSG(const char *msg){
     ENetPacket *packet = packet_gen.chatMessage(msg);
+    std::cout <<"adding packets" << std::endl;
     connection->addPacketAll(packet);
+    std::cout <<"added packets" << std::endl;
     return connection->sendPackets();
   }

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

@@ -47 +47 @@
       std::cout << "failed sending" << std::endl;
     }
-    usleep(1000000);
+//    usleep(1000000);
   }
 

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

@@ -33 +33 @@
     if(server.queueEmpty())
 // Warning: usleep(100) is Sleep(100/1000) = Sleep(0), which is nothing!
-      usleep(100);
+      usleep(10000000);
     else{
       ENetAddress addr;