X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FPassiveQueue.hh;h=20734b69574f4ff4f365760190e8c163ce8003cd;hb=69255c0f1669fc80b0e4a2bf524715f336b127ad;hp=ba2888887180ed7567ef5ae549647dfbcbeec548;hpb=31d85cd6b8e03c5ecc924ca8892906be1bab702f;p=senf.git

diff --git a/PPI/PassiveQueue.hh b/PPI/PassiveQueue.hh
index ba28888..20734b6 100644
--- a/PPI/PassiveQueue.hh
+++ b/PPI/PassiveQueue.hh
@@ -1,6 +1,8 @@
+// $Id$
+//
 // Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
@@ -25,6 +27,9 @@
 #define HH_PassiveQueue_ 1
 
 // Custom includes
+#include "Connectors.hh"
+#include "Module.hh"
+#include "predecl.hh"
 
 //#include "PassiveQueue.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -40,30 +45,43 @@ namespace module {
         requested from the passive output, a packet is dequeued. 
 
         The PassiveQueue will automatically throttle in both directions. Throttling on the input
-        connector is the standard throttling as implemented in connector::PassiveInput. Additional,
-        forward throttling notifications are sent out whenever the queue is empty.
+        connector is the standard throttling as implemented in
+        connector::PassiveInput<>. Additional forward throttling notifications are sent out
+        whenever the queue is empty.
+
+        \ingroup adapter_modules
      */
     class PassiveQueue 
+        : public module::Module
     {
+        SENF_PPI_MODULE(PassiveQueue);
     public:
-        connector::PassiveInput input;
-        connector::PassiveOutput output;
+        connector::PassiveInput<> input;
+        connector::PassiveOutput<> output;
         
         PassiveQueue();
 
-        void qdisc(QueueingDiscipline const & disc); ///< Change the queueing discipline
-        /**< This call changs the queueing discipline of the queue. This call is just forwarded to
-             the \a input connector.
-             
-             \see connector::PassiveInput::qdisc() */
+        template <class QDiscipline>
+        void qdisc(QDiscipline const & disc); ///< Change the queueing discipline
+                                        /**< This call changes the queueing discipline of the
+                                             queue. This call is just forwarded to the \a input
+                                             connector.
+                                             
+                                             \see connector::GenericPassiveInput::qdisc() */
+
+    private:
+        void init();
+
+        void onInput();
+        void onOutput();
     };
 
 }}}
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "PassiveQueue.cci"
+#include "PassiveQueue.cci"
 //#include "PassiveQueue.ct"
-//#include "PassiveQueue.cti"
+#include "PassiveQueue.cti"
 #endif
 
 
@@ -74,4 +92,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: