X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_client.cpp;h=d8dc413aeae469529ab80a35e43b2288adfb9875;hp=a26b004cfacd5e33f0f8f8f28413738cab17f7d7;hb=ced847b29c9d6a123b08a743b5b542985f73b585;hpb=487afb796c9547de4353c503939b6666f8e0877d

diff --git a/src/socket_client.cpp b/src/socket_client.cpp
index a26b004..d8dc413 100644
--- a/src/socket_client.cpp
+++ b/src/socket_client.cpp
@@ -94,6 +94,7 @@ socket_client_connection::socket_client_connection(const std::string& _path,
     {
         lastErrorMsg=e.what();
         LOGSTREAM(debug,"unix connect error: " << lastErrorMsg);
+        // FIXME: Calls virtual function close in constructor
         close();
     }
 
@@ -101,6 +102,15 @@ socket_client_connection::socket_client_connection(const std::string& _path,
         do_callbacks(new_connection);
 }
 
+/**
+ * Destructor. Closes an open connection.
+ */
+socket_client_connection::~socket_client_connection()
+{
+    close();
+}
+
+
 /// establish a connection via tcp
 void socket_client_connection::tcp_connect(int max_retries)
 {
@@ -175,6 +185,17 @@ void socket_client_connection::connect_with_timeout(struct sockaddr *sock_addr,u
 {
     set_socket_options(sock);
 
+   /* non-blocking mode */
+    int flflags;
+    flflags=fcntl(sock,F_GETFL,0);
+    if (flflags < 0)
+        EXCEPTIONSTREAM(error,t2n_communication_error,"fcntl error on socket: " << strerror(errno));
+
+    flflags &= (O_NONBLOCK ^ 0xFFFF);
+    if (fcntl(sock,F_SETFL,flflags) < 0)
+        EXCEPTIONSTREAM(error,t2n_communication_error,"fcntl error on socket: " << strerror(errno));
+
+
     LOGSTREAM(debug,"connect_with_timeout()");
     int ret=::connect(sock,sock_addr, sockaddr_size);