X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.cc;h=594e8bbaf4836e50f7370e298c2de380ebc4fa14;hb=51b24c3227717ce5ad8111a99c2d7eea5fa0bd8d;hp=121b0beba03314338f90f46b189515dbfa7ff08e;hpb=93d9568d448749dc187e7622b733a4a3caa319df;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.cc b/senf/Socket/Protocols/Raw/MACAddress.cc
index 121b0be..594e8bb 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.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 MACAddress non-inline non-template implementation */
@@ -28,8 +33,6 @@
 
 // Custom includes
 #include <iomanip>
-#include <string>
-#include <sstream>
 #include <boost/io/ios_state.hpp>
 #include <senf/Socket/Protocols/AddressExceptions.hh>
 #include "ParseString.hh"
@@ -52,7 +55,7 @@ prefix_ senf::MACAddress senf::MACAddress::from_string(std::string const & s)
 prefix_ senf::MACAddress senf::MACAddress::from_eui64(senf::EUI64 const & eui)
 {
     if (eui[3] != 0xffu || eui[4] != 0xfeu)
-        throw AddressSyntaxException() << "EUI64 is not MAC compatible: " << eui;
+        throw AddressSyntaxException() << ": EUI64 is not MAC compatible: " << eui;
     MACAddress mac (senf::noinit);
     mac[0] = eui[0];
     mac[1] = eui[1];
@@ -73,7 +76,7 @@ senf::MACAddress const senf::MACAddress::None;
 prefix_ std::ostream & senf::operator<<(std::ostream & os, MACAddress const & mac)
 {
     boost::io::ios_all_saver ias (os);
-    os << std::hex << std::setfill('0');
+    os << std::hex << std::setfill('0') << std::right;
     for (MACAddress::const_iterator i (mac.begin()); i != mac.end(); ++i) {
         if (i != mac.begin())
             os << ':';