X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FServer.ih;h=e29387820b44fa038be1e109c9dd41b0c7880ec9;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=aa77d74d607d8cdd4aa735eb43ee62b757288dd0;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Console/Server.ih b/senf/Utils/Console/Server.ih index aa77d74..e293878 100644 --- a/senf/Utils/Console/Server.ih +++ b/senf/Utils/Console/Server.ih @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -30,8 +30,9 @@ #include #include #include +#include -///////////////////////////////ih.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { namespace console { @@ -66,7 +67,7 @@ namespace detail { \fixme Don't throw exceptions ... set stream error indicator (if at all) */ - class NonblockingSocketSink + class NonblockingSocketSink : public boost::iostreams::sink { public: @@ -74,7 +75,7 @@ namespace detail { std::streamsize write(const char * s, std::streamsize n); Client & client() const; - + private: Client & client_; }; @@ -82,7 +83,7 @@ namespace detail { typedef boost::iostreams::stream NonblockingSocketOStream; typedef senf::ServerSocketHandle< - senf::MakeSocketPolicy< senf::TCPv4SocketProtocol::Policy, + senf::MakeSocketPolicy< senf::TCPv4SocketProtocol::Policy, senf::BSDAddressingPolicy>::policy > ServerHandle; /** \brief Internal: Generic client interface @@ -93,6 +94,8 @@ namespace detail { class ClientReader { public: + SENF_LOG_CLASS_AREA(); + typedef ServerHandle::ClientHandle ClientHandle; virtual ~ClientReader() = 0; @@ -129,7 +132,7 @@ namespace detail { }; /** \brief Internal: Primitive ClientReader implementation - + This implementation uses the cooked telnet mode to read lines from the console. It does not support explicit line editing or any other advanced features. */ @@ -154,7 +157,7 @@ namespace detail { }; /** \brief Internal: Primitive ClientReader implementation - + This implementation uses the cooked telnet mode to read lines from the console. It does not support explicit line editing or any other advanced features. */ @@ -175,10 +178,10 @@ namespace detail { scheduler::FdEvent readevent_; std::string buffer_; }; - + }}} -///////////////////////////////ih.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #endif