Changeset 7402 in orxonox.OLD

Timestamp:

Apr 27, 2006, 5:06:47 PM (18 years ago)

Author:

patrick

Message:

network: server socket adapted

Location:

branches/network/src/lib/network

Files:

• netdefs.h (modified) (1 diff)
• server_socket.cc (modified) (5 diffs)
• server_socket.h (modified) (1 diff)

branches/network/src/lib/network/netdefs.h

@@ -28 +28 @@
 } NodeType;
 
+typedef enum ConnectionType {
+  NET_UDP = 0,
+  NET_TCP
+};
+
 
 typedef enum {

branches/network/src/lib/network/server_socket.cc

@@ -26 +26 @@
 #include "debug.h"
 
-ServerSocket::ServerSocket(  )
+
+ServerSocket::ServerSocket( ConnectionType connectionType )
 {
+  this->connectionType = connectionType;
   init();
 }
 
-ServerSocket::ServerSocket( unsigned int port )
+
+ServerSocket::ServerSocket( ConnectionType connectionType, unsigned int port )
 {
+  this->connectionType = connectionType;
   init();
   listen(port);
 }
+
+
+ServerSocket::ServerSocket()
+{
+  this->connectionType == NET_TCP;
+  init();
+}
+
+
+ServerSocket::ServerSocket( unsigned int port )
+{
+  this->connectionType == NET_TCP;
+  init();
+  listen(port);
+}
+
 
 /**
@@ -49 +69 @@
   _isListening = false;
 }
+
+
+
 
 void ServerSocket::init( )
@@ -97 +120 @@
   }
 
-  listenSocket = SDLNet_TCP_Open(&ip);
-
-  if (!listenSocket)
+  if( this->connectionType == NET_TCP)
   {
-    PRINTF(1)("SDLNet_TCP_Open: %s\n", SDLNet_GetError());
+    listenSocketTCP = SDLNet_TCP_Open(&ip);
+    if( !listenSocketTCP) {
+      PRINTF(1)("SDLNet_TCP_Open: %s\n", SDLNet_GetError());
+      _isListening = false;
+      return false;
+    }
+  }
+  else
+  {
+    listenSocketUDP = SDLNet_UDP_Open(port);
+    PRINTF(1)("SDLNet_UDP_Open: %s\n", SDLNet_GetError());
     _isListening = false;
     return false;
   }
+
 
   return true;
@@ -110 +142 @@
 
 
+/**
+ *  returns a new NetworkSocket
+ * @return new socket
+ */
 NetworkSocket* ServerSocket::getNewSocket( )
 {
@@ -119 +155 @@
   }
 
-  TCPsocket sock = SDLNet_TCP_Accept(listenSocket);
-
-  if ( !sock )
+  if( this->connectionType == NET_TCP)
   {
-    return NULL;
+    TCPsocket sockTCP = SDLNet_TCP_Accept(this->listenSocketTCP);
+    if( !sockTCP)
+      return NULL;
+    else
+      return new NetworkSocket(sockTCP);
   }
   else
   {
-    return new NetworkSocket(sock);
+#warning UDP getNewSocket incomplet
+//     UDPsocket sockUDP = SDLNet_UDP_Accept(this->listenSocketUDP);
+//     if( !sockUDP)
+//       return NULL;
+
+//     else
+//       return new NetworkSocket();
   }
 }
 
+
+/**
+ * closes the ServerSocket
+ */
 void ServerSocket::close( )
 {

branches/network/src/lib/network/server_socket.h

@@ -24 +24 @@
 #define _MSECONDS_SLEEP_LISTEN 100
 
+
 class ServerSocket : public BaseObject
 {
-  private:
-    TCPsocket listenSocket;
-    bool terminateThread;
+  public:
+#warning old socket structure
+    ServerSocket();
+    ServerSocket(unsigned int port);
 
-    bool _isListening;
+    ServerSocket(ConnectionType connectionType);
+    ServerSocket(ConnectionType connectionType, unsigned int port );
+    virtual ~ServerSocket();
 
-    void init();
-
-  public:
-    ServerSocket();
-    ServerSocket( unsigned int port );
-    virtual ~ServerSocket();
     bool listen( unsigned int port );
     NetworkSocket* getNewSocket( void );
     void close();
     inline bool isOk(){ return listenSocket!=NULL; }
+
+
+  private:
+    void init();
+
+
+  private:
+#warning old socket structure
+    TCPsocket         listenSocket;
+
+    ConnectionType    connectionType;                        //!< the connection type of the socket {TCP,UDP}
+    TCPsocket         listenSocketTCP;                       //!< tcp socket
+    UDPsocket         listenSocketUDP;                       //!< udp socket
+    bool              terminateThread;                       //!< true if thread terminated
+
+    bool              _isListening;                          //!< true if listening
+
+
 };