PPI: Add optional template arg for packet type to connectors

[senf.git] / PPI / DebugModules.hh

diff --git a/PPI/DebugModules.hh b/PPI/DebugModules.hh
index 7611442..60ac7e5 100644 (file)
--- a/PPI/DebugModules.hh
+++ b/PPI/DebugModules.hh
@@ -1,8 +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
@@ -28,11 +28,11 @@
 
 // Custom includes
 #include <deque>
-#include "../Utils/SafeBool.hh"
+#include "../Utils/safe_bool.hh"
 #include "../Packets/Packets.hh"
 #include "Module.hh"
 #include "ActiveFeeder.hh"
-#include "../Utils/Logger.hh"
+#include "../Utils/Logger/SenfLog.hh"
 
 //#include "DebugModules.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -75,12 +75,12 @@ namespace debug {
      */
     class ActiveSource
         : public Module, 
-          public SafeBool<ActiveSource>
+          public safe_bool<ActiveSource>
     {
         SENF_PPI_MODULE(ActiveSource);
 
     public:
-        connector::ActiveOutput output;
+        connector::ActiveOutput<> output;
 
         ActiveSource();
 
@@ -106,7 +106,7 @@ namespace debug {
     public:
         typedef Queue::size_type size_type;
         
-        connector::PassiveOutput output;
+        connector::PassiveOutput<> output;
 
         PassiveSource();
 
@@ -136,12 +136,12 @@ namespace debug {
      */
     class ActiveSink
         : public Module,
-          public SafeBool<ActiveSink>
+          public safe_bool<ActiveSink>
     {
         SENF_PPI_MODULE(ActiveSink);
 
     public:
-        connector::ActiveInput input;
+        connector::ActiveInput<> input;
 
         ActiveSink();
 
@@ -167,7 +167,7 @@ namespace debug {
         typedef Queue::size_type size_type;
         typedef Queue::const_iterator iterator;
 
-        connector::PassiveInput input;
+        connector::PassiveInput<> input;
 
         PassiveSink();
 
@@ -213,7 +213,7 @@ namespace debug {
     public:
         typedef PassiveSource::size_type size_type;
         
-        connector::ActiveOutput & output;
+        connector::ActiveOutput<> & output;
 
         ActiveFeederSource();
 
@@ -246,7 +246,7 @@ namespace debug {
         typedef PassiveSink::size_type size_type;
         typedef PassiveSink::iterator iterator;
 
-        connector::ActiveInput & input;
+        connector::ActiveInput<> & input;
         
         ActiveFeederSink();
 
@@ -264,18 +264,18 @@ namespace debug {
     /** \brief Log received packets
 
         This module will log all packets sent to it's input using SENF_LOG to the given log
-        \a Stream, \a Area and \a level.
+        \a Stream, \a Area and \a Level.
      */
-    template < class Stream           = log::Debug, 
-               class Area             = log::DefaultArea, 
-               senf::log::Level level = log::VERBOSE >
+    template < class Stream = log::Debug, 
+               class Area   = log::DefaultArea, 
+               class Level  = log::VERBOSE >
     class LogSink
         : public module::Module
     {
         SENF_PPI_MODULE(LogSink);
     public:
 
-        connector::PassiveInput input;
+        connector::PassiveInput<> input;
 
         LogSink();