Changeset 7256 in orxonox.OLD for trunk/src/lib/network

Timestamp:

Mar 30, 2006, 11:45:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

Location:

trunk/src/lib/network

Files:

• network_manager.cc (modified) (1 diff)
• network_manager.h (modified) (1 diff)

trunk/src/lib/network/network_manager.cc

@@ -88 +88 @@
  * @param hostName: the name of the destination host
  */
-int NetworkManager::establishConnection(const char* name, unsigned int port)
+int NetworkManager::establishConnection(const std::string & name, unsigned int port)
 {
   IPaddress ipAddress;
-  int error = SDLNet_ResolveHost(&ipAddress, name, port);
+  int error = SDLNet_ResolveHost(&ipAddress, name.c_str(), port);
   if( error == -1) {
     printf("\n\nerror on address resolution, program inconsistency\n\n");

trunk/src/lib/network/network_manager.h

@@ -36 +36 @@
     void shutdown();
 
-    int establishConnection(const char* name, unsigned int port);
+    int establishConnection( const std::string & name, unsigned int port);
     int createServer(unsigned int port);