X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FRateStuffer%2Fratestuffer.cc;h=6f6a63423d70a59577bc9455ad077b78299ff3b1;hb=20c3dbf64b3beed10655dceaee5791680fb25383;hp=8d3456e551bf6bec001c82fd71f8f3262948f88f;hpb=e84dd6c52a07fc9e283cbd72c7616f3523920387;p=senf.git

diff --git a/Examples/RateStuffer/ratestuffer.cc b/Examples/RateStuffer/ratestuffer.cc
index 8d3456e..6f6a634 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
@@ -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);
@@ -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,7 +105,7 @@ public:
         queue.qdisc(ppi::ThresholdQueueing(high,low));
     }
 };
-        
+
 // ////////////////////////////////////////////////////////////////////////
 // ////////////////////////////////////////////////////////////////////////
 
@@ -117,8 +117,8 @@ public:
 //                   +----------------------------------------------------+
 //                   | stuffer                                            |
 //                   |                                                    |
-// [ udpReader ] O-->:---> [ queue ] -->O [      ]                        |
-//                   |                    [ join ] -->O [ rateFilter] O-->:O--> [ udpWriter ]
+// [ udpSource ] O-->:---> [ queue ] -->O [      ]                        |
+//                   |                    [ join ] -->O [ rateFilter] O-->:O--> [ udpSink ]
 //                   | [ generator ] -->O [      ]                        |
 //                   |                                                    |
 //                   +----------------------------------------------------+
@@ -131,14 +131,14 @@ int main(int argc, char * argv[])
     senf::ConnectedUDPv4ClientSocketHandle outputSocket(
         senf::INet4SocketAddress("localhost:44345"));
 
-    module::ActiveSocketReader<>  udpReader  ( inputSocket );
-    RateStuffer                   stuffer    ( 1000000000ul, 
-                                               senf::DataPacket::create(std::string("<idle>\n")),
-                                               2u, 1u );
-    module::PassiveSocketWriter<> udpWriter  ( outputSocket );
+    module::ActiveSocketSource<>  udpSource ( inputSocket );
+    RateStuffer                   stuffer   ( 1000000000ul,
+                                              senf::DataPacket::create(std::string("<idle>\n")),
+                                              2u, 1u );
+    module::PassiveSocketSink<>   udpSink   ( outputSocket );
 
-    ppi::connect( udpReader, stuffer   );
-    ppi::connect( stuffer,   udpWriter );
+    ppi::connect( udpSource, stuffer   );
+    ppi::connect( stuffer,   udpSink );
 
     ppi::run();