Changeset 9291 in orxonox.OLD

Timestamp:

Jul 14, 2006, 12:25:17 PM (18 years ago)

Author:

patrick

Message:

network socket and addresses passins

Location:

branches/proxy/src/lib/network

Files:

• network_socket.h (modified) (3 diffs)
• network_stream.cc (modified) (1 diff)
• udp_socket.h (modified) (1 diff)

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

@@ -27 +27 @@
      */
     virtual void connectToServer( std::string host, int port ) = 0;
-    
+
     /**
      * disconnect from server
@@ -40 +40 @@
      */
     virtual bool writePacket(byte * data, int length) = 0;
-    
+
     /**
      * read a packet sent by another NetworkSocket
@@ -54 +54 @@
      */
     inline bool isOk() { return this->bOk; }
-  
+
+    /** @returns the ip adderess of the destination socket */
+    IPaddress getDestAddress() { return ip; }
+
+
   protected:
-    bool bOk;            //!< check for socket status
+    bool              bOk;            //!< check for socket status
 
+    IPaddress         ip;             //!< host,port
 };
 

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

@@ -463 +463 @@
 
               it->second.nodeType = it->second.handshake->getRemoteNodeType();
+              it->second.ip = it->second.socket->getDestAddress();
               this->networkMonitor->addNode(&it->second);
 

branches/proxy/src/lib/network/udp_socket.h

@@ -38 +38 @@
     virtual int readPacket(byte * data, int maxLength);
 
-    IPaddress getAddress() { return this->ip; }
-
 
   private:
     UdpServerSocket * serverSocket;   //!< will get packets here
     int               userId;         //!< user id used by serverSocket
-    IPaddress         ip;             //!< host,port
     UDPsocket         socket;         //!< socket used to send/recieve
     UDPpacket *       packet;