X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FRateStuffer%2Fratestuffer.cc;h=876a377174065a1f349c6ccc2a22f500fcf83f78;hb=be253d22a60afc49fa9265fcff4728742e9f9a2d;hp=3d42cdf74f6219b5f01aa6ad99f62affc23446d4;hpb=c7512677a51c8ba551ab23611d6e99bdc7a7fdfa;p=senf.git

diff --git a/Examples/RateStuffer/ratestuffer.cc b/Examples/RateStuffer/ratestuffer.cc
index 3d42cdf..876a377 100644
--- a/Examples/RateStuffer/ratestuffer.cc
+++ b/Examples/RateStuffer/ratestuffer.cc
@@ -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
@@ -32,13 +32,13 @@
 
 //#include "ppitest.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace module = senf::ppi::module;
 namespace connector = senf::ppi::connector;
 namespace ppi = senf::ppi;
 
-// ////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////////////////////////////////////////
 // RateFilter
 
 class RateFilter
@@ -47,8 +47,8 @@ class RateFilter
     SENF_PPI_MODULE(RateFilter);
 public:
 
-    connector::ActiveInput input;
-    connector::ActiveOutput output;
+    connector::ActiveInput<> input;
+    connector::ActiveOutput<> output;
 
     RateFilter(senf::ClockService::clock_type interval);
 
@@ -59,7 +59,7 @@ private:
 };
 
 RateFilter::RateFilter(senf::ClockService::clock_type interval)
-    : timer(interval) 
+    : timer(interval)
 {
     route(input,timer);
     route(timer,output);
@@ -71,7 +71,7 @@ void RateFilter::timeout()
     output(input());
 }
 
-// ////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////////////////////////////////////////
 
 class RateStuffer
 {
@@ -82,10 +82,10 @@ class RateStuffer
     RateFilter              rateFilter;
 
 public:
-    connector::PassiveInput & input;
-    connector::ActiveOutput & output;
+    connector::PassiveInput<> & input;
+    connector::ActiveOutput<> & output;
 
-    RateStuffer(senf::ClockService::clock_type interval, 
+    RateStuffer(senf::ClockService::clock_type interval,
                 senf::Packet packet,
                 unsigned high = 1,
                 unsigned low  = 0)
@@ -105,9 +105,9 @@ public:
         queue.qdisc(ppi::ThresholdQueueing(high,low));
     }
 };
-        
-// ////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////
+
+//-////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////////////////////////////////////////
 
 // Module setup:
 //
@@ -132,7 +132,7 @@ int main(int argc, char * argv[])
         senf::INet4SocketAddress("localhost:44345"));
 
     module::ActiveSocketSource<>  udpSource ( inputSocket );
-    RateStuffer                   stuffer   ( 1000000000ul, 
+    RateStuffer                   stuffer   ( 1000000000ul,
                                               senf::DataPacket::create(std::string("<idle>\n")),
                                               2u, 1u );
     module::PassiveSocketSink<>   udpSink   ( outputSocket );
@@ -145,7 +145,7 @@ int main(int argc, char * argv[])
     return 0;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "ppitest.mpp"