X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_handler.cpp;h=ed1489581177d6d8b7a8d4df3735280a53892940;hp=2856adf4e67a5de09ad920628fbe6f07d3216dba;hb=6f6d24c02ef3e3a7600432bed1c801a611c3c918;hpb=9424729586fdb0aabb671d2f1266bdb07e0bed38

diff --git a/src/socket_handler.cpp b/src/socket_handler.cpp
index 2856adf..ed14895 100644
--- a/src/socket_handler.cpp
+++ b/src/socket_handler.cpp
@@ -38,6 +38,7 @@
 
 #include "socket_handler.hxx"
 #include "t2n_exception.hxx"
+#include "log.hxx"
 
 using namespace std;
 
@@ -51,59 +52,31 @@ void socket_handler::set_socket_options(int sock)
 
     /* fast reuse enable */
     if (setsockopt(sock,SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)) < 0)
-    {
-        string err="error setting socket option: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_communication_error(err);
-    }
+        EXCEPTIONSTREAM(error,t2n_communication_error,"error setting socket option: " << strerror(errno));
 
     /* keepalive enable */
     if (setsockopt(sock,SOL_SOCKET, SO_KEEPALIVE, &i, sizeof(i)) < 0)
-    {
-        string err="error setting socket option: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_communication_error(err);
-    }
+        EXCEPTIONSTREAM(error,t2n_communication_error,"error setting socket option: " << strerror(errno));
 
     /* close on exec */
     int fdflags;
     fdflags=fcntl(sock,F_GETFD, 0);
     if (fdflags < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_communication_error(err);
-    }
+        EXCEPTIONSTREAM(error,t2n_communication_error,"fcntl error on socket: " << strerror(errno));
+
     fdflags |= FD_CLOEXEC;
     if (fcntl(sock,F_SETFD,fdflags) < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_communication_error(err);
-    }
+        EXCEPTIONSTREAM(error,t2n_communication_error,"fcntl error on socket: " << strerror(errno));
 
     /* non-blocking mode */
     int flflags;
     flflags=fcntl(sock,F_GETFL,0);
     if (flflags < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_communication_error(err);
-    }
+        EXCEPTIONSTREAM(error,t2n_communication_error,"fcntl error on socket: " << strerror(errno));
+
     flflags |= O_NONBLOCK;
     if (fcntl(sock,F_SETFL,flflags) < 0)
-    {
-        string err="fcntl error on socket: ";
-        err+=strerror(errno);
-        log(error, err);
-        throw t2n_communication_error(err);
-    }
+        EXCEPTIONSTREAM(error,t2n_communication_error,"fcntl error on socket: " << strerror(errno));
 }
 
 /// close the underlying socket connection. Don't call directly, use the version provided
@@ -124,11 +97,11 @@ bool socket_handler::is_closed()
 }
 
 /** @brief check if new data is waiting on the raw socket
-    @param usec_timeout wait until new data is found, max timeout usecs.
+    @param[in,out] usec_timeout wait until new data is found, max timeout usecs.
             -1: wait endless
-            NULL: no timeout
+            0: return instantly
 */
-bool socket_handler::data_waiting(long long usec_timeout)
+bool socket_handler::data_waiting(long long usec_timeout,long long* usec_timeout_remaining)
 {
     // just our socket
     fd_set active_fd_set;
@@ -145,12 +118,19 @@ bool socket_handler::data_waiting(long long usec_timeout)
     {
         timeout_ptr = &tval;
 
-        // timeout von long long usec in int sec + int usec umrechnen
+        // convert timeout from long long usec to int sec + int usec
         tval.tv_sec = usec_timeout / 1000000;
         tval.tv_usec = usec_timeout % 1000000;
     }
 
-    if(select (FD_SETSIZE, &active_fd_set, NULL, NULL, timeout_ptr) > 0)
+    int ret=select (FD_SETSIZE, &active_fd_set, NULL, NULL, timeout_ptr);
+
+    // return the timeout we did not use
+    // todo: this is linux specific according to man 2 select
+    if (usec_timeout > 0 && usec_timeout_remaining != NULL)
+        *usec_timeout_remaining=(tval.tv_sec*1000000)+tval.tv_usec;
+
+    if (ret > 0)
         return true;
     else
         return false;
@@ -158,14 +138,14 @@ bool socket_handler::data_waiting(long long usec_timeout)
 
 /** @brief read data from the raw socket and copy it into the provided buffer
     @param buffer the buffer where to append the new data
-    @param usec_timeout wait until new data is found, max timeout usecs.
+    @param[in,out] usec_timeout wait until new data is found, max timeout usecs.
             -1: wait endless
-            NULL: no timeout
+            0: return instantly
 */
-bool socket_handler::fill_buffer(std::string& buffer, long long usec_timeout)
+bool socket_handler::fill_buffer(std::string& buffer, long long usec_timeout, long long *timeout_remaining)
 {
     // fast path for timeout==0
-    if (usec_timeout==0 || data_waiting(usec_timeout))
+    if (usec_timeout==0 || data_waiting(usec_timeout,timeout_remaining))
         return fill_buffer(buffer);
     else
         return false;
@@ -189,11 +169,12 @@ bool socket_handler::fill_buffer(std::string& buffer)
         else if (errno == EINTR)
         {
             // interrupted, try again
+            LOGSTREAM(debug,"EINTR received on read(), trying again");
             try_again=true;
         }
         else
         {
-            log(error,string("error reading from socket : ")+strerror(errno));
+            LOGSTREAM(error,"error reading from socket : " << strerror(errno));
             // TODO: exception?
             return false;
         }
@@ -202,13 +183,17 @@ bool socket_handler::fill_buffer(std::string& buffer)
     // End-of-file
     if (nbytes == 0 && !try_again)
     {
+        LOGSTREAM(debug,"0 bytes received on read(), closing connection");
         close();
         return false;
     }
 
     // Data read -> store it
     if (nbytes > 0)
-        buffer.assign(socket_buffer,nbytes);
+    {
+        buffer.append(socket_buffer,nbytes);
+        LOGSTREAM(debug,nbytes << " bytes read");
+    }
 
     // more data waiting -> recurse
     if (data_waiting(0))
@@ -237,22 +222,19 @@ void socket_handler::socket_write(const std::string& data)
                rtn == -1 && (errno == EAGAIN || errno == EINTR))
         {
             usleep (80000);
-            log(debug,"resuming write() call after EAGAIN or EINTR");
+            LOGSTREAM(debug,"resuming write() call after EAGAIN or EINTR");
         }
 
         if (rtn == -1)
         {
-            log(error,string("write() returned ")+strerror(errno));
+            LOGSTREAM(error,"write() returned " << strerror(errno));
             // TODO: exception?
             return;
         }
         else if (rtn != write_size)
         {
-            ostringstream msg;
-            msg << "write() wrote " << rtn << " bytes, should have been " 
-                << write_size << " (complete: " << data.size() << ")";
-
-            log(error,msg.str());
+            LOGSTREAM(error,"write() wrote " << rtn << " bytes, should have been " 
+                << write_size << " (complete: " << data.size() << ")");
 
             // TODO: exception?
             return;
@@ -261,6 +243,8 @@ void socket_handler::socket_write(const std::string& data)
         offset += write_size;
     }
 
+    LOGSTREAM(debug,"wrote " << data.size() << " bytes");
+
     return;
 }