Changeset 5987 in orxonox.OLD for branches/network/src/lib/network/network_socket.h

Timestamp:

Dec 8, 2005, 8:13:22 AM (19 years ago)

Author:

rennerc

Message:

network_socket: removed listen function
server_socket: created serversocket
network_unit_test: replaced sockettest for new client/socket model

File:

• branches/network/src/lib/network/network_socket.h (modified) (4 diffs)

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

@@ -18 +18 @@
 //sleep if outgoing buffer is empty
 #define _MSECONDS_SLEEP_EMPTY_BUFFER 10
-//sleep when waiting for connections
-#define _MSECONDS_SLEEP_LISTEN 100
+
 
 /* contains memmove and memcpy */
@@ -64 +63 @@
   bool terminateThread;
 
-  static int thread_listen(void * data);
   static int thread_read(void * data);
 #ifdef _USE_OUTGOING_BUFFER
@@ -70 +68 @@
 #endif
 
-  bool _isListening;
+  int writeBytes(byte * data, int length);
+  int readBytes(byte * data, int length);
+  int readBlock(byte * data, int length);
+
+  void init();
 
 public:
@@ -76 +78 @@
   NetworkSocket();
   NetworkSocket(IPaddress ip);
+  NetworkSocket(TCPsocket sock);
   ~NetworkSocket();
 
   void connectToServer(IPaddress ip);
-  void listen(unsigned int port);
   void disconnectServer();
-  int writeBytes(byte * data, int length);
-  int readBytes(byte * data, int length);
-  int readBlock(byte * data, int length);
 
-private:
-  void init();
+  bool writePacket(byte * data, int length);
+  int readPacket(byte * data, int maxLength);
 
 };