From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Mon, 27 Sep 2010 09:52:56 +0000 (+0000)
Subject: Utils/Console: Hopefully fix Console crash on unexpected client close
X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=1de89c7aba54d15f79a6d4d1dc8ecddad010f30b

Utils/Console: Hopefully fix Console crash on unexpected client close

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1720 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/senf/Utils/Console/Server.cc b/senf/Utils/Console/Server.cc
index 40b4d80..188ffbc 100644
--- a/senf/Utils/Console/Server.cc
+++ b/senf/Utils/Console/Server.cc
@@ -66,9 +66,7 @@ prefix_ std::streamsize senf::console::detail::NonblockingSocketSink::write(cons
             client_.write(data);
         }
     }
-    catch (SystemException & ex) {
-        ;
-    }
+    catch (...) {}
     return n;
 }
 
@@ -126,7 +124,7 @@ prefix_ void senf::console::Server::removeClient(Client & client)
                     log << client.handle().peer();
                 }
                 catch (senf::SystemException ex) {
-                    log << "(unknown)";
+                    log << "(dead socket)";
                 }
             }));
     // THIS DELETES THE CLIENT INSTANCE !!
@@ -173,9 +171,9 @@ prefix_ void senf::console::detail::DumbClientReader::showPrompt()
     prompt += " ";
 
     stream() << std::flush;
-    v_write(prompt);
     promptLen_ = prompt.size();
     promptActive_ = true;
+    v_write(prompt);
 }
 
 prefix_ void senf::console::detail::DumbClientReader::v_disablePrompt()
@@ -197,13 +195,20 @@ prefix_ void senf::console::detail::DumbClientReader::v_write(std::string const
     try {
         handle().write(data);
     }
+    catch (senf::ExceptionMixin & ex) {
+        SENF_LOG(("unexpected failure writing to socket:" << ex.message()));
+        try { handle().facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD); }
+        catch (...) {}
+    }
     catch (std::exception & ex) {
         SENF_LOG(("unexpected failure writing to socket:" << ex.what()));
-        stopClient(); // SUICIDE
+        try { handle().facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD); }
+        catch (...) {}
     }
     catch (...) {
         SENF_LOG(("unexpected failure writing to socket: unknown exception"));
-        stopClient(); // SUICIDE
+        try { handle().facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD); }
+        catch (...) {}
     }
 }
 
@@ -235,13 +240,20 @@ prefix_ void senf::console::detail::NoninteractiveClientReader::v_write(std::str
     try {
         handle().write(data);
     }
+    catch (senf::ExceptionMixin & ex) {
+        SENF_LOG(("unexpected failure writing to socket:" << ex.message()));
+        try { handle().facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD); }
+        catch (...) {}
+    }
     catch (std::exception & ex) {
         SENF_LOG(("unexpected failure writing to socket:" << ex.what()));
-        stopClient(); // SUICIDE
+        try { handle().facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD); }
+        catch (...) {}
     }
     catch (...) {
         SENF_LOG(("unexpected failure writing to socket: unknown exception"));
-        stopClient(); // SUICIDE
+        try { handle().facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD); }
+        catch (...) {}
     }
 }
 
@@ -338,7 +350,8 @@ prefix_ std::string::size_type senf::console::Client::handleInput(std::string da
         // handled gracefully by the ClientReader. We cannot call stop() here, since we are called
         // from the client reader callback and that will continue executing after stop() has been
         // called. stop() however will delete *this instance ... BANG ...
-        handle_.facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD);
+        try { handle_.facet<senf::TCPSocketProtocol>().shutdown(senf::TCPSocketProtocol::ShutRD); }
+        catch (...) {}
     }
     catch (std::exception & ex) {
         std::string msg (ex.what());