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

diff --git a/src/socket_client.cpp b/src/socket_client.cpp
index 100ca54..d8dc413 100644
--- a/src/socket_client.cpp
+++ b/src/socket_client.cpp
@@ -37,14 +37,17 @@
 
 #include "socket_client.hxx"
 #include "t2n_exception.hxx"
+#include "log.hxx"
 
 using namespace std;
 
 namespace libt2n
 {
 
+/// returns a closed connection if connection could not be established, call get_last_error_msg() for details
 socket_client_connection::socket_client_connection(int _port, const std::string& _server, 
-            long long _connect_timeout_usec, int _max_retries)
+            long long _connect_timeout_usec, int _max_retries,
+            std::ostream *_logstream, log_level_values _log_level)
     : client_connection(), socket_handler(0,tcp_s)
 {
     max_retries=_max_retries;
@@ -53,11 +56,27 @@ socket_client_connection::socket_client_connection(int _port, const std::string&
     server=_server;
     port=_port;
 
-    tcp_connect(max_retries);
+    set_logging(_logstream,_log_level);
+
+    try
+    {
+        tcp_connect(max_retries);
+    }
+    catch (t2n_communication_error &e)
+    {
+        lastErrorMsg=e.what();
+        LOGSTREAM(debug,"tcp connect error: " << lastErrorMsg);
+        close();
+    }
+
+    if (!connection::is_closed())
+        do_callbacks(new_connection);
 }
 
+/// returns a closed connection if connection could not be established, call get_last_error_msg() for details
 socket_client_connection::socket_client_connection(const std::string& _path,
-            long long _connect_timeout_usec, int _max_retries)
+            long long _connect_timeout_usec, int _max_retries,
+            std::ostream *_logstream, log_level_values _log_level)
     : client_connection(), socket_handler(0,unix_s)
 {
     max_retries=_max_retries;
@@ -65,9 +84,34 @@ socket_client_connection::socket_client_connection(const std::string& _path,
 
     path=_path;
 
-    unix_connect(max_retries);
+    set_logging(_logstream,_log_level);
+
+    try
+    {
+        unix_connect(max_retries);
+    }
+    catch (t2n_communication_error &e)
+    {
+        lastErrorMsg=e.what();
+        LOGSTREAM(debug,"unix connect error: " << lastErrorMsg);
+        // FIXME: Calls virtual function close in constructor
+        close();
+    }
+
+    if (!connection::is_closed())
+        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)
 {
     struct sockaddr_in sock_addr;
@@ -98,12 +142,16 @@ void socket_client_connection::tcp_connect(int max_retries)
     {
         // recurse if retries left
         if (max_retries > 0)
+        {
+            LOGSTREAM(debug,"retrying connect after connect error");
             tcp_connect(max_retries-1);
+        }
+        else
+            throw t2n_connect_error("no more retries left after connect error");
     }
-
-    do_callbacks(new_connection);
 }
 
+/// establish a connection via unix-socket
 void socket_client_connection::unix_connect(int max_retries)
 {
     struct sockaddr_un unix_addr;
@@ -123,22 +171,40 @@ void socket_client_connection::unix_connect(int max_retries)
     {
         // recurse if retries left
         if (max_retries > 0)
-            tcp_connect(max_retries-1);
+        {
+            LOGSTREAM(debug,"retrying connect after connect error");
+            unix_connect(max_retries-1);
+        }
+        else
+            throw t2n_connect_error("no more retries left after connect error");
     }
-
-    do_callbacks(new_connection);
 }
 
+/// execute a connect on a prepared socket (tcp or unix) respecting timeouts
 void socket_client_connection::connect_with_timeout(struct sockaddr *sock_addr,unsigned int sockaddr_size)
 {
     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);
 
     if (ret < 0)
     {
         if (errno==EINPROGRESS)
         {
+            LOGSTREAM(debug,"connect_with_timeout(): EINPROGRESS");
+
             /* set timeout */
             struct timeval tval;
             struct timeval *timeout_ptr;
@@ -174,6 +240,8 @@ void socket_client_connection::connect_with_timeout(struct sockaddr *sock_addr,u
         else
             throw t2n_connect_error(string("connect() error: ")+strerror(errno));
     }
+
+    LOGSTREAM(debug,"connect_with_timeout(): success");
 }
 
 void socket_client_connection::close()
@@ -185,4 +253,28 @@ void socket_client_connection::close()
     }
 }
 
+/** @brief try to reconnect the current connection with the same connection credentials (host and port or path)
+
+    @note will throw an exeption if reconnecting not possible
+*/
+void socket_client_connection::reconnect()
+{
+    LOGSTREAM(debug,"reconnect()");
+
+    // close the current connection if still open
+    close();
+
+    socket_type_value type=get_type();
+
+    if (type == tcp_s)
+        tcp_connect(max_retries);
+    else if (type == unix_s)
+        unix_connect(max_retries);
+
+    // connection is open now, otherwise an execption would have been thrown
+    reopen();
+
+    LOGSTREAM(debug,"reconnect() done, client_connection::is_closed() now " << client_connection::is_closed());
+}
+
 }