X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FSocketSink.ct;h=b6509c268a7aef2344ef667555f6baed45bf9320;hb=51044eb18f034c1a059ffe2fb109a422c1cbe251;hp=ba7fffccec3dc97c4619c3552d84a602c427ff57;hpb=a479735a65e334af538b895f182f8efd36a541c5;p=senf.git

diff --git a/PPI/SocketSink.ct b/PPI/SocketSink.ct
index ba7fffc..b6509c2 100644
--- a/PPI/SocketSink.ct
+++ b/PPI/SocketSink.ct
@@ -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
@@ -31,41 +31,59 @@
 ///////////////////////////////ct.p////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::ppi::module::ActiveSocketSink<Sink>
+// senf::ppi::module::ActiveSocketSink<Writer>
 
-template <class Sink>
-prefix_ senf::ppi::module::ActiveSocketSink<Sink>::ActiveSocketSink(Handle handle)
+template <class Writer>
+prefix_ senf::ppi::module::ActiveSocketSink<Writer>::ActiveSocketSink(Handle handle)
     : handle_(handle), event_(handle_, IOEvent::Write), writer_()
 {
     registerEvent( event_, &ActiveSocketSink::write );
     route(input, event_);
 }
 
+template <class Writer>
+prefix_ senf::ppi::module::ActiveSocketSink<Writer>::ActiveSocketSink(Handle handle,
+                                                                    Writer const & writer)
+    : handle_(handle), event_(handle_, IOEvent::Write), writer_(writer)
+{
+    registerEvent( event_, &ActiveSocketSink::write );
+    route(input, event_);
+}
+
 ////////////////////////////////////////
 // private members
 
-template <class Sink>
-prefix_ void senf::ppi::module::ActiveSocketSink<Sink>::write()
+template <class Writer>
+prefix_ void senf::ppi::module::ActiveSocketSink<Writer>::write()
 {
     writer_(handle_,input());
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::ppi::module::PassiveSocketSink<Sink>
+// senf::ppi::module::PassiveSocketSink<Writer>
 
-template <class Sink>
-prefix_ senf::ppi::module::PassiveSocketSink<Sink>::PassiveSocketSink(Handle handle)
+template <class Writer>
+prefix_ senf::ppi::module::PassiveSocketSink<Writer>::PassiveSocketSink(Handle handle)
     : handle_(handle), writer_()
 {
     noroute(input);
     input.onRequest(&PassiveSocketSink::write);
 }
 
+template <class Writer>
+prefix_ senf::ppi::module::PassiveSocketSink<Writer>::PassiveSocketSink(Handle handle,
+                                                                      Writer const & writer)
+    : handle_(handle), writer_(writer)
+{
+    noroute(input);
+    input.onRequest(&PassiveSocketSink::write);
+}
+
 ////////////////////////////////////////
 // private members
 
-template <class Sink>
-prefix_ void senf::ppi::module::PassiveSocketSink<Sink>::write()
+template <class Writer>
+prefix_ void senf::ppi::module::PassiveSocketSink<Writer>::write()
 {
     writer_(handle_,input());
 }