Changeset 9463 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 25, 2006, 7:29:31 PM (18 years ago)

Author:

patrick

Message:

the proxy network interface is started

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (6 diffs)

branches/proxy/src/lib/network/network_stream.cc

@@ -112 +112 @@
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_STREAM, "NetworkStream");
-  this->serverSocket = NULL;
+  this->clientSocket = NULL;
+  this->proxySocket = NULL;
   this->networkGameManager = NULL;
   this->networkMonitor = NULL;
@@ -140 +141 @@
 NetworkStream::~NetworkStream()
 {
-  if ( this->serverSocket )
-  {
-    serverSocket->close();
-    delete serverSocket;
-    serverSocket = NULL;
+  if ( this->clientSocket )
+  {
+    clientSocket->close();
+    delete clientSocket;
+    clientSocket = NULL;
+  }
+  if ( this->proxySocket)
+  {
+    proxySocket->close();
+    delete proxySocket;
+    proxySocket = NULL;
   }
   for ( PeerList::iterator i = peers.begin(); i!=peers.end(); i++)
@@ -219 +226 @@
  * @param port: interface port for all clients
  */
-void NetworkStream::createServer(int port)
-{
-  this->serverSocket = new UdpServerSocket(port);
+void NetworkStream::createServer(int clientPort, int proxyPort)
+{
+  this->proxySocket = new UdpServerSocket(clientPort);
+  this->clientSocket= new UdpServerSocket(proxyPort);
 }
 
@@ -308 +316 @@
   {
     // execute everytthing the master server shoudl do
-    if ( serverSocket )
-      serverSocket->update();
+    if ( clientSocket )
+      clientSocket->update();
 
     this->updateConnectionList();
@@ -316 +324 @@
   {
     // execute everything the proxy server should do
-    if ( serverSocket )
-      serverSocket->update();
+    if ( clientSocket )
+      clientSocket->update();
 
     this->updateConnectionList();
@@ -360 +368 @@
   //check for new connections
 
-  NetworkSocket* tempNetworkSocket = serverSocket->getNewSocket();
+  NetworkSocket* tempNetworkSocket = clientSocket->getNewSocket();
 
   // we got new network node