Changeset 9406 in orxonox.OLD for trunk/src/subprojects/network

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/subprojects/network/network_unit_test.cc (modified) (5 diffs)

trunk/src/subprojects/network/network_unit_test.cc

@@ -205 +205 @@
 
   /* create a server stream */
-  nm->createServer(port);
+  nm->createMasterServer(port);
 
   /* esatblish a connection */
-  IPaddress ip;
+  IP ip;
   int error = SDLNet_ResolveHost(&ip, "127.0.0.1", port);
   //SDLNet_ResolveHost(&ip, "localhost", port);
   if(error == -1)
     printf("\n\nerror on address resolution, program inconsistancy\n\n");
-  nm->establishConnection("localhost", port);
+  nm->createClient("localhost", port);
   nm->connectSynchronizeable( *clientSync );
   /* adding some break for connection setup */
@@ -262 +262 @@
   netMan->initialize();
   
-  netMan->createServer(/**ss, */ 9999);
+  netMan->createMasterServer(/**ss, */ 9999);
   
   SimpleSync* ss = new SimpleSync("Server");
@@ -307 +307 @@
     host = "localhost";
   
-  netMan->establishConnection(host, 9999);
+  netMan->createClient(host, 9999);
   
 //  SimpleSync* ss = new SimpleSync("SimpleSync");
@@ -353 +353 @@
   printf("Connecting to %s, on port %i\n", name, port);
 
-  IPaddress ip;
+  IP ip;
   int error = SDLNet_ResolveHost(&ip, name, port);
   if(error == -1)
@@ -361 +361 @@
   Synchronizeable* ss = new SimpleSync("SimpleSync\0");
 
-  netMan->establishConnection( name, port );
+  netMan->createClient( name, port );
   netMan->connectSynchronizeable( *ss );