fixes for Ubuntu Oneiric (g++ 4.6.1, boost 1.46.1)

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

diff --git a/senf/Utils/Console/Server.ih b/senf/Utils/Console/Server.ih
index aa77d74..cc66b51 100644 (file)
--- a/senf/Utils/Console/Server.ih
+++ b/senf/Utils/Console/Server.ih
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Server internal header */
@@ -29,9 +34,11 @@
 // Custom includes
 #include <boost/iostreams/concepts.hpp>
 #include <boost/iostreams/stream.hpp>
-#include <set>
+#include <senf/Scheduler/ReadHelper.hh>
+#include <senf/Socket/Protocols/INet/TCPSocketHandle.hh>
+#include <senf/Utils/Logger/SenfLog.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -66,23 +73,23 @@ namespace detail {
 
         \fixme Don't throw exceptions ... set stream error indicator (if at all)
      */
-    class NonblockingSocketSink 
+    class SocketStreamSink
         : public boost::iostreams::sink
     {
     public:
-        NonblockingSocketSink(Client & client);
+        SocketStreamSink(Client & client);
         std::streamsize write(const char * s, std::streamsize n);
 
         Client & client() const;
-        
+
     private:
         Client & client_;
     };
 
-    typedef boost::iostreams::stream<NonblockingSocketSink> NonblockingSocketOStream;
+    typedef boost::iostreams::stream<SocketStreamSink> SocketStreamOStream;
 
     typedef senf::ServerSocketHandle<
-        senf::MakeSocketPolicy< senf::TCPv4SocketProtocol::Policy, 
+        senf::MakeSocketPolicy< senf::TCPv4SocketProtocol::Policy,
                                 senf::BSDAddressingPolicy>::policy > ServerHandle;
 
     /** \brief Internal: Generic client interface
@@ -93,6 +100,8 @@ namespace detail {
     class ClientReader
     {
     public:
+        SENF_LOG_CLASS_AREA();
+
         typedef ServerHandle::ClientHandle ClientHandle;
 
         virtual ~ClientReader() = 0;
@@ -129,7 +138,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 +163,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.
      */
@@ -164,6 +173,11 @@ namespace detail {
     public:
         NoninteractiveClientReader(Client & client);
 
+        typedef std::vector<char> SendQueue;
+
+        void streamBufferMaxSize(SendQueue::size_type size);
+        SendQueue::size_type streamBufferMaxSize() const;
+
     private:
         virtual void v_disablePrompt();
         virtual void v_enablePrompt();
@@ -171,14 +185,18 @@ namespace detail {
         virtual unsigned v_width() const;
 
         void newData(int event);
+        void writeHandler( int event);
 
+        SendQueue::size_type streamBufferMaxSize_;
+        SendQueue sendQueue_;
         scheduler::FdEvent readevent_;
+        scheduler::FdEvent writeevent_;
         std::string buffer_;
     };
-    
+
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f