Changeset 208 for code/branches

Timestamp:

Nov 14, 2007, 3:35:18 PM (17 years ago)

Author:

scheusso

Message:

blabla

Location:

code/branches/network/src/network

Files:

• Makefile (modified) (2 diffs)
• dummyclient.cc (modified) (3 diffs)

code/branches/network/src/network/Makefile

@@ -6 +6 @@
 
 # Link command:
-server: clean PacketBuffer.o ConnectionManager.o dummyserver.o PacketDecoder.o PacketGenerator.o
-        g++ PacketDecoder.o PacketGenerator.o ConnectionManager.o dummyserver.o PacketBuffer.o -o server -lenet -lboost_thread -g
+server: PacketBuffer.o ConnectionManager.o dummyserver.o PacketDecoder.o PacketGenerator.o
+        ${CC} PacketDecoder.o PacketGenerator.o ConnectionManager.o dummyserver.o PacketBuffer.o -o server -lenet -lboost_thread -g
 
-dummyserver.o:
-        g++ -c dummyserver.cc -o dummyserver.o -g ${INC}
+dummyserver.o: dummyserver.cc
+        ${CC} -c dummyserver.cc -o dummyserver.o -g ${INC}
 # Compilation commands:
-ConnectionManager.o:
-        g++ -c ConnectionManager.cc -o ConnectionManager.o -g ${INC}
+ConnectionManager.o: ConnectionManager.cc
+        ${CC} -c ConnectionManager.cc -o ConnectionManager.o -g ${INC}
 
-PacketBuffer.o: 
-        g++ -c PacketBuffer.cc -o PacketBuffer.o -g ${INC}
-PacketGenerator.o:
-        g++ -c PacketGenerator.cc -o PacketGenerator.o -g ${INC}
-PacketDecoder.o:
-        g++ -c PacketDecoder.cc -o PacketDecoder.o -g ${INC}
+PacketBuffer.o: PacketBuffer.cc
+        ${CC} -c PacketBuffer.cc -o PacketBuffer.o -g ${INC}
+PacketGenerator.o: PacketGenerator.cc
+        ${CC} -c PacketGenerator.cc -o PacketGenerator.o -g ${INC}
+PacketDecoder.o: PacketDecoder.cc
+        ${CC} -c PacketDecoder.cc -o PacketDecoder.o -g ${INC}
 
 
@@ -26 +26 @@
         rm -rf *.o
 
-client: PacketGenerator.o
-        g++ dummyclient.cc PacketGenerator.o -o client -lenet -g ${INC}
+client: PacketGenerator.o dummyclient.cc
+        ${CC} dummyclient.cc PacketGenerator.o -o client -lenet -g ${INC}

code/branches/network/src/network/dummyclient.cc

@@ -5 +5 @@
 
 #include <iostream>
+#include <string>
 #include <enet/enet.h>
 #include "network/PacketManager.h"
@@ -20 +21 @@
   atexit(enet_deinitialize);
   
-  enet_address_set_host(&address, "127.0.0.1");
+  cout << "Enter address of the server xxx.xxx.xxx.xxx (enter for localhost)" << endl;
+  string str;
+  getline(cin, str);
+  cout << "You entered: " << str << endl;
+  if(str.compare("")==0)
+    str="127.0.0.1";
+  
+  enet_address_set_host(&address, str.c_str());
   address.port = 5555;
 
@@ -38 +46 @@
         // wait 5 seconds for the connection attempt to succeed
   if(enet_host_service(client, &event, 5000) > 0 && event.type == ENET_EVENT_TYPE_CONNECT){
-    puts("Connection to localhost:5555 succeeded.");
+    cout << "Connection to " << str << " succeeded." << endl;
+    //puts("Connection to localhost:5555 succeeded.");
   }else{
     enet_peer_reset(peer);
-    puts("Connection to localhost:5555 failed.");
+    cout << "Connection to " << str << " failed." << endl;
+    //puts("Connection to localhost:5555 failed.");
   }