Changeset 6139 in orxonox.OLD for trunk/src/lib/network/network_socket.h

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

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

trunk/src/lib/network/network_socket.h

@@ -63 +63 @@
   bool terminateThread;
 
+  SDL_mutex* threadTerminationMutex;
   static int thread_read(void * data);
+  bool thread_read_running;
+  bool thread_write_running;
+
+  SDL_Thread*            readThread;
+  SDL_Thread*            writeThread;
+
 #ifdef _USE_OUTGOING_BUFFER
   static int thread_write(void * data);
@@ -74 +81 @@
   void init();
 
+  //dont make this public use destroy() instead
+  ~NetworkSocket();
+
 public:
 
@@ -79 +89 @@
   NetworkSocket(IPaddress ip);
   NetworkSocket(TCPsocket sock);
-  ~NetworkSocket();
+  void destroy() { terminateThread = true; };
+
 
   void connectToServer(IPaddress ip);
@@ -87 +98 @@
   int readPacket(byte * data, int maxLength);
 
+  inline bool isOk() { return tcpSocket!=NULL; }
+
 };