Changeset 229

Timestamp:

Nov 20, 2007, 9:36:41 PM (16 years ago)

Author:

scheusso

Message:

added class Client (rootclass of the network module for the client) and modified makefile

Location:

code/branches/network/src/network

Files:

• Client.cc (added)
• Client.h (added)
• ClientConnection.cc (modified) (2 diffs)
• ClientConnection.h (modified) (1 diff)
• ConnectionManager.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

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

@@ -50 +50 @@
   }
   
-  void ClientConnection::createConnection(){
+  bool ClientConnection::createConnection(){
     network_threads.create_thread(boost::bind(boost::mem_fn(&ClientConnection::receiverThread), this));
-//     boost::thread thr(boost::bind(boost::mem_fn(&ClientConnection::receiverThread), this));
-    return;
+    // wait 10 seconds for the connection to be established
+    return waitEstablished(10000);
   }
   
@@ -77 +77 @@
       return false;
     if(enet_host_service(client, event, NETWORK_SEND_WAIT)>=0)
+      return true;
+    else 
+      return false;
+  }
+  
+  bool ClientConnection::sendPackets(){
+    ENetEvent event;
+    if(server==NULL)
+      return false;
+    if(enet_host_service(client, &event, NETWORK_SEND_WAIT)>=0)
       return true;
     else 

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

@@ -41 +41 @@
     bool queueEmpty();
     // create a new listener thread
-    void createConnection();
+    bool createConnection();
     bool closeConnection();
     // add a packet to queue for the server
     bool addPacket(ENetPacket *packet);
     // send out all queued packets
+    bool sendPackets();
+    // send out all queued packets and save result in event
     bool sendPackets(ENetEvent *event);
     bool waitEstablished(int milisec);

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

@@ -73 +73 @@
   
   bool ConnectionManager::addPacket(ENetPacket *packet, int ID){
-    if(client=NULL)
+    if(client==NULL)
       return false;
     ClientList *temp=client;

code/branches/network/src/network/Makefile

@@ -23 +23 @@
 PacketDecoder.o: PacketDecoder.cc
         ${CC} -c PacketDecoder.cc -o PacketDecoder.o -g ${INC}
-
+Client.o: Client.cc
+        ${CC} -c Client.cc -g ${INC}
 
 clean: