X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FServer.cci;h=8f34fcc41bab1565754af879e3c2db7feee19503;hb=f08685d9795a3be20ce5c7a337087358ccd77eb5;hp=7665fd70ffcb680d13e68be8bee1f8c1e58e7dac;hpb=3aced0177a1c69c7af338b4e66db8694a71873ae;p=senf.git

diff --git a/senf/Utils/Console/Server.cci b/senf/Utils/Console/Server.cci
index 7665fd7..8f34fcc 100644
--- a/senf/Utils/Console/Server.cci
+++ b/senf/Utils/Console/Server.cci
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Server inline non-template implementation */
@@ -50,13 +55,13 @@ prefix_ senf::console::detail::ServerManager & senf::console::detail::ServerMana
 }
 
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
-// senf::console::detail::NonblockingSocketSink
+// senf::console::detail::SocketStreamSink
 
-prefix_ senf::console::detail::NonblockingSocketSink::NonblockingSocketSink(Client & client)
+prefix_ senf::console::detail::SocketStreamSink::SocketStreamSink(Client & client)
     : client_ (client)
 {}
 
-prefix_ senf::console::Client & senf::console::detail::NonblockingSocketSink::client()
+prefix_ senf::console::Client & senf::console::detail::SocketStreamSink::client()
     const
 {
     return client_;
@@ -171,7 +176,7 @@ prefix_ unsigned senf::console::Client::width()
 
 prefix_ senf::console::Client & senf::console::Client::get(std::ostream & os)
 {
-    return dynamic_cast<detail::NonblockingSocketOStream&>(os)->client();
+    return dynamic_cast<detail::SocketStreamOStream&>(os)->client();
 }
 
 prefix_ senf::console::Client::ClientHandle senf::console::Client::handle()