X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet6Address.cc;h=487a9523b1bccc8c9ce3dac3721854f536590ced;hb=HEAD;hp=9319489d2b7b911e998c9712b96ea8fc7c437f59;hpb=61b2e2ea5cb50df90931acf3fcd840493ba762a9;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet6Address.cc b/senf/Socket/Protocols/INet/INet6Address.cc
index 9319489..487a952 100644
--- a/senf/Socket/Protocols/INet/INet6Address.cc
+++ b/senf/Socket/Protocols/INet/INet6Address.cc
@@ -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 non-inline non-template implementation */
@@ -39,9 +44,9 @@
 
 //#include "INet6Address.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet6Address
 
 prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s,
@@ -49,7 +54,7 @@ prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s
 {
     struct in6_addr ina;
     if (::inet_pton(AF_INET6,s.c_str(),&ina) > 0)
-        return senf::INet6Address::from_data(&ina.s6_addr[0]);
+        return INet6Address::from_data(&ina.s6_addr[0]);
 
     if (s.empty())
         throw AddressSyntaxException() << ": empty string";
@@ -79,7 +84,7 @@ prefix_ senf::INet6Address senf::INet6Address::from_string(std::string const & s
 
     if (ent && ent->h_addrtype == AF_INET6)
         // We are only interested in the first address ...
-        return senf::INet6Address::from_data(
+        return INet6Address::from_data(
             &reinterpret_cast<in6_addr*>(*(ent->h_addr_list))->s6_addr[0]);
 
     if (resolve == ResolveINet4)
@@ -156,7 +161,7 @@ senf::INet6Address const senf::INet6Address::Loopback   (0u,0u,0u,0u,0u,0u,0u,1u
 senf::INet6Address const senf::INet6Address::AllNodes   (0xFF02u,0u,0u,0u,0u,0u,0u,1u);
 senf::INet6Address const senf::INet6Address::AllRouters (0xFF02u,0u,0u,0u,0u,0u,0u,2u);
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::INet6Network
 
 prefix_ senf::INet6Network::INet6Network(std::string const & s)
@@ -167,7 +172,7 @@ prefix_ senf::INet6Network::INet6Network(std::string const & s)
     if (i == std::string::npos)
         throw AddressSyntaxException(s);
     try {
-        prefix_len_ = boost::lexical_cast<unsigned>(std::string(s,i+1));
+        prefix_len_ = prefix_len_checked( boost::lexical_cast<unsigned>(std::string(s,i+1)));
     } catch (boost::bad_lexical_cast const &) {
         throw AddressSyntaxException(s);
     }
@@ -189,7 +194,7 @@ prefix_ std::istream & senf::operator>>(std::istream & is, INet6Network & addr)
     return is;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "INet6Address.mpp"