libt2n: (tomj) documented code problems; have to find out if this is the source of...

[libt2n] / src / socket_server.cpp

diff --git a/src/socket_server.cpp b/src/socket_server.cpp
index 0eff676..ad8bb84 100644 (file)
--- a/src/socket_server.cpp
+++ b/src/socket_server.cpp
@@ -67,7 +67,10 @@ socket_server::socket_server(int port, const std::string& ip)
         EXCEPTIONSTREAM(error,t2n_server_error,"failed listening on invalid ip " << ip);
 
     if (bind (sock, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) < 0)
+    {
+        // FIXME: Calls virtual function socket_server::get_logstream() in constructor
         EXCEPTIONSTREAM(error,t2n_server_error,"error binding socket: " << strerror(errno));
+    }
 
     start_listening();
 }
@@ -83,6 +86,8 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std
 {
     unix_path=path;
 
+    // TODO: Every EXCEPTIONSTREAM in here calls virtual function get_logstream()
+
     /* Create the socket. */
     sock = socket (PF_UNIX, SOCK_STREAM, 0);
     if (sock < 0)
@@ -152,14 +157,17 @@ void socket_server::new_connection()
     int newsock = accept (sock,(struct sockaddr *) &clientname,&size);
     if (newsock < 0)
     {
-        if (errno == EAGAIN)
+        // return on non-fatal errors (list taken from man-page)
+        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ECONNABORTED || errno == EINTR ||
+            errno == EMFILE || errno == ENFILE || errno == ENOBUFS || errno == ENOMEM ||
+            errno == EPROTO || errno ==  EPERM || errno == ETIMEDOUT)
         {
-            LOGSTREAM(error,"accept error (EAGAIN): no connection waiting");
+            LOGSTREAM(error,"non-fatal accept error: " << strerror(errno));
             return;
         }
 
-        /* default: break */
-        EXCEPTIONSTREAM(error,t2n_server_error,"error accepting connection: " << strerror(errno));
+        /* fatal error: will usually kill or restart the server */
+        EXCEPTIONSTREAM(error,t2n_server_error,"fatal error accepting connection: " << strerror(errno));
     }
 
     FD_SET (newsock, &connection_set);
@@ -237,13 +245,23 @@ bool socket_server::fill_buffer(long long usec_timeout,long long* usec_timeout_r
 /// call fill_buffer() on all connections, called from fill_buffer()
 bool socket_server::fill_connection_buffers()
 {
-    bool data_found;
+    bool data_found = false;
 
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
     for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
         if (!i->second->server_connection::is_closed())
-            if (i->second->fill_buffer(0))
-                data_found=true;
+        {
+            // shutdown all connections which throw exceptions to protect the server
+            try
+            {
+                if (i->second->fill_buffer(0))
+                    data_found=true;
+            }
+            catch (t2n_transfer_error &e)
+                { i->second->close(); }
+            catch(...)
+                { throw; }
+        }
 
     return data_found;
 }