X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FServer.cci;h=e235c62f6ebf0c9a6637ec397ba1cba8fb436d72;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=488fb3a7cbccfbcdeec96cf6d9d3e514b4b75cd4;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Server.cci b/senf/Utils/Console/Server.cci
index 488fb3a..e235c62 100644
--- a/senf/Utils/Console/Server.cci
+++ b/senf/Utils/Console/Server.cci
@@ -1,36 +1,41 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// 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 */
 
-#include "Server.ih"
+//#include "Server.ih"
 
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ServerManager
 
 prefix_ void senf::console::detail::ServerManager::add(ptr server)
@@ -49,7 +54,7 @@ prefix_ senf::console::detail::ServerManager & senf::console::detail::ServerMana
     return manager;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::NonblockingSocketSink
 
 prefix_ senf::console::detail::NonblockingSocketSink::NonblockingSocketSink(Client & client)
@@ -62,7 +67,7 @@ prefix_ senf::console::Client & senf::console::detail::NonblockingSocketSink::cl
     return client_;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Server
 
 prefix_ senf::console::Server & senf::console::Server::name(std::string const & name)
@@ -107,7 +112,7 @@ prefix_ void senf::console::Server::stop()
     detail::ServerManager::remove(boost::intrusive_ptr<Server>(this));
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::Client
 
 prefix_ senf::console::Client::~Client()
@@ -185,7 +190,7 @@ prefix_ std::ostream & senf::console::Client::stream()
     return out_t::member;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ClientReader
 
 prefix_ senf::console::detail::ClientReader::~ClientReader()
@@ -252,7 +257,7 @@ prefix_ senf::console::detail::ClientReader::ClientReader(Client & client)
     : client_ (client)
 {}
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_