Rename PacketRegistry::RegistrationProxy to ScopedRegistrationProxy

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

diff --git a/senf/PPI/Joins.cc b/senf/PPI/Joins.cc
index 653149a..bad31fa 100644 (file)
--- a/senf/PPI/Joins.cc
+++ b/senf/PPI/Joins.cc
@@ -39,6 +39,13 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::ppi::module::PassiveJoin
 
+prefix_ senf::ppi::module::PassiveJoin::PassiveJoin()
+{
+    noroute(output);
+    output.onThrottle(&PassiveJoin::onThrottle);
+    output.onUnthrottle(&PassiveJoin::onUnthrottle);
+}
+
 ////////////////////////////////////////
 // private members
 
@@ -48,11 +55,6 @@ prefix_ void senf::ppi::module::PassiveJoin::connectorSetup(connector::PassiveIn
     conn.onRequest(boost::bind(&PassiveJoin::request,this,boost::ref(conn)));
 }
 
-prefix_ void senf::ppi::module::PassiveJoin::request(connector::GenericPassiveInput & input)
-{
-    output(input());
-}
-
 prefix_ void senf::ppi::module::PassiveJoin::onThrottle()
 {
     using boost::lambda::_1;
@@ -72,6 +74,12 @@ prefix_ void senf::ppi::module::PassiveJoin::onUnthrottle()
 ///////////////////////////////////////////////////////////////////////////
 // senf::ppi::module::PriorityJoin
 
+prefix_ senf::ppi::module::PriorityJoin::PriorityJoin()
+{
+    noroute(output);
+    output.onRequest(&PriorityJoin::request);
+}
+
 ////////////////////////////////////////
 // private members
 
@@ -85,12 +93,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());
 }