X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet6Address.hh;h=cf43b8deb95a22311c5d9bf6adaec9d6ea30bd64;hb=51b24c3227717ce5ad8111a99c2d7eea5fa0bd8d;hp=c22b28050d7d2ea1aa84a3f560f755d7079d6042;hpb=61b2e2ea5cb50df90931acf3fcd840493ba762a9;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet6Address.hh b/senf/Socket/Protocols/INet/INet6Address.hh
index c22b280..cf43b8d 100644
--- a/senf/Socket/Protocols/INet/INet6Address.hh
+++ b/senf/Socket/Protocols/INet/INet6Address.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 INet6Address public header */
@@ -39,7 +44,7 @@
 
 //#include "INet6Address.mpp"
 #include "INet6Address.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -131,7 +136,7 @@ namespace senf {
           public comparable_safe_bool<INet6Address>
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Types
 
         static INet6Address const None;        ///< The empty (::0) address
@@ -160,9 +165,9 @@ namespace senf {
             , UnassignedScope   =  6    /**< Unassigned scope, may be defined locally */
         };
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         explicit INet6Address(senf::NoInit_t); ///< Construct uninitialized (!) address
         explicit INet6Address(boost::uint16_t a0=0u, boost::uint16_t a1=0u, boost::uint16_t a2=0u,
@@ -220,10 +225,10 @@ namespace senf {
 
         in6_addr toin6_addr() const;    ///< get the linux in6_addr struct (convenience only)
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Accessors
-        ///@{
+        //\{
 
         INet6Network network() const; ///< Return <tt>/64</tt> Network of this address
         bool hasEUI64() const;          ///< \c true, if address is based on an EUID-64
@@ -279,14 +284,14 @@ namespace senf {
 
         bool boolean_test() const;      ///< \c true, if address != '::' (None)
 
-        ///@}
+        //\}
         ///\name Mutators
-        ///@{
+        //\{
 
         void network(boost::uint64_t net); ///< Set network part of address
         void id(boost::uint64_t id);    ///< Set interface id part of address
 
-        ///@}
+        //\}
 
     };
 
@@ -347,17 +352,17 @@ namespace senf {
           public comparable_safe_bool<INet6Network>
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         INet6Network();                 ///< Construct empty (::/0) network
         INet6Network(INet6Address const & address, unsigned prefix_len);
                                         ///< Construct network from given address and prefix length
         explicit INet6Network(std::string const & s); ///< Construct network from CIDR notation
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         INet6Address const & address() const; ///< Get the network address
         unsigned prefix_len() const;    ///< Get the network prefix length
@@ -407,7 +412,7 @@ namespace senf {
     std::istream & operator>>(std::istream & is, INet6Network & addr);
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "INet6Address.cci"
 #include "INet6Address.ct"
 #include "INet6Address.cti"