X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FQueueingSocketSink.ct;h=e3f00165b0677bc6d42bbd3aa3fa157364976db6;hb=HEAD;hp=594c5019e2aa0b1a64057b020cf7844b5767c223;hpb=32bf29e751e6c73ca2bc78c21996e4320e934673;p=senf.git

diff --git a/senf/PPI/QueueingSocketSink.ct b/senf/PPI/QueueingSocketSink.ct
index 594c501..e3f0016 100644
--- a/senf/PPI/QueueingSocketSink.ct
+++ b/senf/PPI/QueueingSocketSink.ct
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief QueueingSocketSink non-inline template implementation  */
@@ -26,11 +31,12 @@
 //#include "QueueingSocketSink.ih"
 
 // Custom includes
+#include <senf/Utils/Console/ParsedCommand.hh>
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::QueueingAlgorithmRegistry
 
 template <class QAlgorithm>
@@ -42,7 +48,7 @@ prefix_ void senf::ppi::QueueingAlgorithmRegistry::registerQAlgorithm(std::strin
         throw Exception("Duplicated QAlgorithm Registration ") << key;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::detail::QueueingAlgorithmRegistry_Entry<QAlgorithm>
 
 template <class QAlgorithm>
@@ -52,7 +58,7 @@ prefix_ senf::ppi::QueueingAlgorithm::ptr senf::ppi::detail::QueueingAlgorithmRe
     return QAlgorithm::create();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::module::PassiveQueueingSocketSink<Writer>
 
 template <class Writer>
@@ -72,13 +78,23 @@ prefix_ senf::ppi::module::PassiveQueueingSocketSink<Writer>::PassiveQueueingSoc
     event_.enabled( false);
     noroute(input);
     input.onRequest( &PassiveQueueingSocketSink::write);
+    input.qdisc( QueueingDiscipline::NONE);
+    checkThrottle();
+}
+
+template <class Writer>
+prefix_ void senf::ppi::module::PassiveQueueingSocketSink<Writer>::handle(Handle const & handle)
+{
+    handle_ = handle;
+    event_.set( handle_, IOEvent::Write);
+    qAlgo_->clear();
     checkThrottle();
 }
 
 template <class Writer>
 prefix_ void senf::ppi::module::PassiveQueueingSocketSink<Writer>::write()
 {
-    PacketType p ( input.read());
+    PacketType p ( input());
     if (qAlgo_->size() > 0) {
         qAlgo_->enqueue( p);
         return;
@@ -126,7 +142,7 @@ prefix_ void senf::ppi::module::PassiveQueueingSocketSink<Writer>::setQAlgorithm
     qAlgorithm( QueueingAlgorithmRegistry::instance().createQAlgorithm( key));
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_