X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FSocketHandle.cc;h=2eea009f3de25aa2491e394d068c585874e8e896;hb=refs%2Fheads%2Fmaster;hp=517ee9eceb26367929ba5835992a56ee17ffe8ef;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Socket/SocketHandle.cc b/senf/Socket/SocketHandle.cc
index 517ee9e..2eea009 100644
--- a/senf/Socket/SocketHandle.cc
+++ b/senf/Socket/SocketHandle.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // 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 SocketHandle non-inline non-template implementation
@@ -29,14 +34,13 @@
 
 // Custom includes
 #include <sstream>
-#include <sys/socket.h>
 #include <senf/Utils/TypeInfo.hh>
 
 //#include "SocketHandle.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::SocketBody
 
 prefix_ void senf::SocketBody::state(SocketStateMap & map, unsigned lod)
@@ -45,7 +49,7 @@ prefix_ void senf::SocketBody::state(SocketStateMap & map, unsigned lod)
     map["file.refcount"]   << refcount();
     map["socket.server"]   << isServer();
     map["socket.protocol"] << v_protocolName();
-    map["socket.protocol.policy"]   << prettyName(typeid(protocol().policy()));
+    map["socket.protocol.policy"] << prettyName(typeid(protocol().policy()));
     protocol().state(map,lod);
 }
 
@@ -65,19 +69,9 @@ prefix_ bool senf::SocketBody::v_eof()
     return protocol().eof();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::StateMapOrdering
 
-namespace {
-    bool contains(std::string::const_iterator b, std::string::const_iterator e, char c)
-    {
-        for (; b != e; ++b)
-            if (*b == c)
-                return true;
-        return false;
-    }
-}
-
 prefix_ std::string senf::detail::dumpState(SocketStateMap const & map)
 {
     std::stringstream s;
@@ -88,7 +82,7 @@ prefix_ std::string senf::detail::dumpState(SocketStateMap const & map)
     return s.str();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "SocketHandle.mpp"