X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FConsole%2FServer.ih;h=aa77d74d607d8cdd4aa735eb43ee62b757288dd0;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=a886bb66eaacd33ab6272d65962a66f8d42035af;hpb=958bdb52c39fa39f4ef91cafd9628bcb4f85a03c;p=senf.git

diff --git a/Utils/Console/Server.ih b/Utils/Console/Server.ih
index a886bb6..aa77d74 100644
--- a/Utils/Console/Server.ih
+++ b/Utils/Console/Server.ih
@@ -70,11 +70,6 @@ namespace detail {
         : public boost::iostreams::sink
     {
     public:
-        typedef ClientSocketHandle< 
-            senf::MakeSocketPolicy<StreamFramingPolicy,
-                                   WriteablePolicy,
-                                   ConnectedCommunicationPolicy>::policy > Handle;
-
         NonblockingSocketSink(Client & client);
         std::streamsize write(const char * s, std::streamsize n);
 
@@ -88,7 +83,7 @@ namespace detail {
 
     typedef senf::ServerSocketHandle<
         senf::MakeSocketPolicy< senf::TCPv4SocketProtocol::Policy, 
-                                senf::UnspecifiedAddressingPolicy>::policy > ServerHandle;
+                                senf::BSDAddressingPolicy>::policy > ServerHandle;
 
     /** \brief Internal: Generic client interface
 
@@ -118,7 +113,8 @@ namespace detail {
 
         void disablePrompt();
         void enablePrompt();
-        void translate(std::string & data);
+        void write(std::string const & data);
+        unsigned width() const;
 
     protected:
         ClientReader(Client & client);
@@ -126,7 +122,8 @@ namespace detail {
     private:
         virtual void v_disablePrompt() = 0;
         virtual void v_enablePrompt() = 0;
-        virtual void v_translate(std::string & data) = 0;
+        virtual void v_write(std::string const & data) = 0;
+        virtual unsigned v_width() const = 0;
 
         Client & client_;
     };
@@ -145,7 +142,8 @@ namespace detail {
     private:
         virtual void v_disablePrompt();
         virtual void v_enablePrompt();
-        virtual void v_translate(std::string & data);
+        virtual void v_write(std::string const & data);
+        virtual unsigned v_width() const;
 
         void clientData(senf::ReadHelper<ClientHandle>::ptr helper);
         void showPrompt();
@@ -169,7 +167,8 @@ namespace detail {
     private:
         virtual void v_disablePrompt();
         virtual void v_enablePrompt();
-        virtual void v_translate(std::string & data);
+        virtual void v_write(std::string const & data);
+        virtual unsigned v_width() const;
 
         void newData(int event);