switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / PPI / Joins.cc

diff --git a/senf/PPI/Joins.cc b/senf/PPI/Joins.cc
index 653149a..1ec0843 100644 (file)
--- a/senf/PPI/Joins.cc
+++ b/senf/PPI/Joins.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 Joins non-inline non-template implementation */
@@ -34,23 +39,26 @@
 
 //#include "Joins.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::module::PassiveJoin
 
-////////////////////////////////////////
+prefix_ senf::ppi::module::PassiveJoin::PassiveJoin()
+{
+    noroute(output);
+    output.onThrottle(&PassiveJoin::onThrottle);
+    output.onUnthrottle(&PassiveJoin::onUnthrottle);
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 prefix_ void senf::ppi::module::PassiveJoin::connectorSetup(connector::PassiveInput<> & conn)
 {
     noroute(conn);
     conn.onRequest(boost::bind(&PassiveJoin::request,this,boost::ref(conn)));
-}
-
-prefix_ void senf::ppi::module::PassiveJoin::request(connector::GenericPassiveInput & input)
-{
-    output(input());
+    conn.qdisc( QueueingDiscipline::NONE);
 }
 
 prefix_ void senf::ppi::module::PassiveJoin::onThrottle()
@@ -69,10 +77,16 @@ prefix_ void senf::ppi::module::PassiveJoin::onUnthrottle()
                   bind(&connector::GenericPassiveInput::unthrottle, _1));
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::module::PriorityJoin
 
-////////////////////////////////////////
+prefix_ senf::ppi::module::PriorityJoin::PriorityJoin()
+{
+    noroute(output);
+    output.onRequest(&PriorityJoin::request);
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 prefix_ void
@@ -85,12 +99,12 @@ senf::ppi::module::PriorityJoin::connectorSetup(PriorityJoin::ConnectorType & co
 
     if (priority < 0) {
         priority = connectors().size() + priority;
-        if (priority < 0) 
+        if (priority < 0)
             priority = 0;
     }
     if (priority >= int(connectors().size())-1)
         return;
-    
+
     connectors().insert(connectors().begin()+priority, connectors().pop_back().release());
 }
 
@@ -117,7 +131,7 @@ prefix_ void senf::ppi::module::PriorityJoin::onUnthrottle()
     output.unthrottle();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Joins.mpp"