Changeset 5733 in orxonox.OLD

Timestamp:

Nov 23, 2005, 3:08:07 PM (18 years ago)

Author:

rennerc

Message:

network_socket: changed type of ip in constructor

Location:

branches/network/src

Files:

• lib/network/network_socket.cc (modified) (1 diff)
• lib/network/network_socket.h (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (1 diff)

branches/network/src/lib/network/network_socket.cc

@@ -63 +63 @@
  * Constructor to connect directly
  */
-NetworkSocket::NetworkSocket(char * ipAddress, unsigned int port)
+NetworkSocket::NetworkSocket(IPaddress ip, unsigned int port)
 {
   NetworkSocket();
-  IPaddress ip;
-  SDLNet_ResolveHost(&ip, ipAddress, port);
   connectToServer(ip, port);
 }

branches/network/src/lib/network/network_socket.h

@@ -73 +73 @@
 
   NetworkSocket();
-  NetworkSocket(char * ipAddress, unsigned int port);
+  NetworkSocket(IPaddress ip, unsigned int port);
   ~NetworkSocket();
 

branches/network/src/subprojects/network/network_unit_test.cc

@@ -30 +30 @@
 int testSocket(int argc, char** argv)
 {
+  IPaddress ip;
+  SDLNet_ResolveHost(&ip, "127.0.0.1", 9999);
   NetworkSocket server;
   server.listen(9999);
   SDL_Delay(20);
 
-  NetworkSocket client("127.0.0.1", 9999);
+  NetworkSocket client(ip, 9999);
 
   char buf[1024];