X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FServer.hh;h=3b7a93e90d598b83a83e647d1393d5666c6ef419;hb=0eaf5340de8c2fbb02b1e0e13a797931e221dff3;hp=26092fa4d65c431cf24fc677c7f8c10ae16a72ef;hpb=d0776a27ffd63ab51b4e3419a8a6f87d11e60594;p=senf.git diff --git a/Console/Server.hh b/Console/Server.hh index 26092fa..3b7a93e 100644 --- a/Console/Server.hh +++ b/Console/Server.hh @@ -31,8 +31,6 @@ #include #include #include -#include -#include #include "../Utils/intrusive_refcount.hh" #include "../Socket/Protocols/INet/TCPSocketHandle.hh" #include "../Socket/ServerSocketHandle.hh" @@ -44,6 +42,7 @@ #include "../Utils/Logger.hh" //#include "Server.mpp" +#include "Server.ih" ///////////////////////////////hh.p//////////////////////////////////////// namespace senf { @@ -57,6 +56,13 @@ namespace console { \todo Add readline support \todo Add interactivity detection using timeout + \idea To support blocking commands, we could give the Client 'suspend()' and 'resume()' + members. suspend() would probably throw some kind of exception to transfer control back + to the Client instance. on resume(), the command would be called again, maybe setting + some flag or something. Example for use: Host name resolution: Here we can just built + our own little host-name cache. When the name is not found, we ask the resolver to + resolve it and call 'resume' when the name is found. Since it is in the cache now, the + command will now complete. */ class Server : boost::noncopyable @@ -77,6 +83,7 @@ namespace console { ///< Start server on given IPv4 address/port static Server & start(senf::INet6SocketAddress const & address); ///< Start server on given IPv6 address/port + static Server & instance(); void name(std::string const & name); ///< Set server name /**< This information is used in the prompt string. */ @@ -87,6 +94,7 @@ namespace console { Server(ServerHandle handle); static void start(ServerHandle handle); + static boost::scoped_ptr & instancePtr(); void newClient(Scheduler::EventId event); void removeClient(Client & client); @@ -97,8 +105,6 @@ namespace console { Clients clients_; std::string name_; - static boost::scoped_ptr instance_; - friend class Client; }; @@ -109,21 +115,14 @@ namespace console { and passes the commands to an Executor instance. \fixme Fix Client::clientData implementation - \fixme Remove the 'dup' needed here so we don't close the same fd twice (see Client - constructor) - \fixme Make output non-blocking (use a non-blocking/discarding streambuf) and possibly set - socket send buffer size \fixme Don't register a new ReadHelper every round - \fixme Ensure, that output errors (or any errors) in the console don't terminate the - application */ class Client : public senf::intrusive_refcount, - private boost::base_from_member< boost::iostreams::stream >, + private boost::base_from_member< detail::NonblockingSocketOStream >, public senf::log::IOStreamTarget { - typedef boost::base_from_member< - boost::iostreams::stream > out_t; + typedef boost::base_from_member< detail::NonblockingSocketOStream > out_t; SENF_LOG_CLASS_AREA(); SENF_LOG_DEFAULT_LEVEL( senf::log::NOTICE ); @@ -153,6 +152,7 @@ namespace console { Executor executor_; std::string name_; unsigned promptLen_; + std::string lastCommand_; friend class Server; };