2 files changed, 33 insertions, 7 deletions

diff --git a/src/connection.cpp b/src/connection.cpp
index 9d8b02c..efef144 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -165,7 +165,7 @@ bool Connection::open( int nNewSocket )
         return true;
 }
 
-bool Connection::open( const char *sAddr, int nPort )
+bool Connection::open( const char *sAddr, int nPort, int nSec )
 {
         struct sockaddr_in xServerName;
         bActive = false;
@@ -204,13 +204,42 @@ bool Connection::open( const char *sAddr, int nPort )
         }
 
         //printf("Making actual connection...");
-        fflush( stdout );
-        int ret = connect(
+        //fflush( stdout );
+        connect(
                 nSocket,
                 (struct sockaddr *)&xServerName,
                 sizeof(xServerName)
                 );
         //printf("Connected.\n");
+        
+        bActive = true;
+        bDisconnectMe = false;
+
+        if( nSec > 0 )
+        {
+                fd_set rfds, wfds, efds;
+                int retval;
+                
+                FD_ZERO(&rfds);
+                FD_SET(nSocket, &rfds);
+                FD_ZERO(&wfds);
+                FD_SET(nSocket, &wfds);
+                FD_ZERO(&efds);
+                FD_SET(nSocket, &efds);
+
+                struct timeval tv;
+                tv.tv_sec = nSec;
+                tv.tv_usec = 0;
+                
+                retval = select( nSocket+1, &rfds, &wfds, &efds, &tv );
+
+                if( retval == 0 )
+                {
+                        close();
+                        throw ExceptionBase("Connection timeout.\n");
+                }
+                
+        }
 
         /*
         if( ret < 0 )
@@ -218,9 +247,6 @@ bool Connection::open( const char *sAddr, int nPort )
                 return false;
         }*/
 
-        bActive = true;
-        bDisconnectMe = false;
-
         return true;
 }
 
diff --git a/src/connection.h b/src/connection.h
index 7e1141d..0e991c7 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -49,7 +49,7 @@ public:
          *@todo Make this function add log entries to a standard MultiLog if
          * something goes wrong.
          */
-        bool open( const char *sAddr, int nPort );
+        bool open( const char *sAddr, int nPort, int nSec=30 );
 
         void ensureCapacity( int nSize );