Packets/80221Bundle: fixed message validation

[senf.git] / senf / Utils / Console / Server.cc

diff --git a/senf/Utils/Console/Server.cc b/senf/Utils/Console/Server.cc
index 243a782..6c53f27 100644 (file)
--- a/senf/Utils/Console/Server.cc
+++ b/senf/Utils/Console/Server.cc
@@ -24,16 +24,11 @@
     \brief Server non-inline non-template implementation */
 
 #include "Server.hh"
-#include "Server.ih"
+//#include "Server.ih"
 
 // Custom includes
-#include <errno.h>
-#include <iostream>
 #include <boost/algorithm/string/trim.hpp>
-#include <boost/iostreams/device/file_descriptor.hpp>
-#include <boost/iostreams/stream.hpp>
 #include <boost/bind.hpp>
-#include <senf/Utils/senfassert.hh>
 #include <senf/Utils/membind.hh>
 #include <senf/Utils/Logger/SenfLog.hh>
 #include <senf/Version.hh>
@@ -56,7 +51,7 @@
 namespace {
     senf::console::SysInfo::Proxy addSysInfo (
             "SENF: The Simple and Extensible Network Framework\n"
-            "  © 2006-2010 Fraunhofer Institute for Open Communication Systems, Network Research\n"
+            "  © 2006-2011 Fraunhofer Institute for Open Communication Systems, Network Research\n"
             "  Contact: senf-dev@lists.berlios.de\n"
             "  Version: " SENF_LIB_VERSION " Revision number: " SENF_REVISION "\n"
             "  Build-type: " BUILD_TYPE ", SenfLog compile time limit: " +
@@ -132,7 +127,7 @@ prefix_ void senf::console::Server::removeClient(Client & client)
                 try {
                     log << client.handle().peer();
                 }
-                catch (senf::SystemException ex) {
+                catch (senf::SystemException & ex) {
                     log << "(dead socket)";
                 }
             }));
@@ -165,7 +160,7 @@ senf::console::detail::DumbClientReader::clientData(senf::ReadHelper<ClientHandl
 
     std::string data (tail_ + helper->data());
     tail_ = helper->tail();
-    boost::trim(data);                  // Gets rid of superfluous  \r or \n characters
+    boost::trim(data); // Gets rid of superfluous  \r or \n characters
     handleInput(data);
 
     showPrompt();
@@ -405,9 +400,7 @@ prefix_ unsigned senf::console::Client::getWidth(std::ostream & os, unsigned def
 
 prefix_ senf::console::Client::SysBacktrace::SysBacktrace()
 {
-    namespace fty = senf::console::factory;
-
-    sysdir().add("backtrace", fty::Command(&SysBacktrace::backtrace)
+    sysdir().add("backtrace", factory::Command(&SysBacktrace::backtrace)
                  .doc("Display the backtrace of the last error / exception in this console") );
 }