X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.cc;h=121b0beba03314338f90f46b189515dbfa7ff08e;hb=7ee689fe38d66aa3a0004d55e8708750d35adc0b;hp=53a96fbc6ade90bc6e11fc083f52bb1789ec5f94;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.cc b/senf/Socket/Protocols/Raw/MACAddress.cc
index 53a96fb..121b0be 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.cc
@@ -31,17 +31,18 @@
 #include <string>
 #include <sstream>
 #include <boost/io/ios_state.hpp>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 #include "ParseString.hh"
 #include "EUI64.hh"
 
 //#include "MACAddress.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::MACAddress
 
-prefix_ senf::MACAddress::MACAddress senf::MACAddress::from_string(std::string const & s)
+prefix_ senf::MACAddress senf::MACAddress::from_string(std::string const & s)
 {
     MACAddress mac (senf::noinit);
     detail::parseHexString(s, ":-", mac.begin(), mac.end());
@@ -51,7 +52,7 @@ prefix_ senf::MACAddress::MACAddress senf::MACAddress::from_string(std::string c
 prefix_ senf::MACAddress senf::MACAddress::from_eui64(senf::EUI64 const & eui)
 {
     if (eui[3] != 0xffu || eui[4] != 0xfeu)
-        throw AddressSyntaxException();
+        throw AddressSyntaxException() << "EUI64 is not MAC compatible: " << eui;
     MACAddress mac (senf::noinit);
     mac[0] = eui[0];
     mac[1] = eui[1];
@@ -66,7 +67,7 @@ senf::MACAddress const senf::MACAddress::Broadcast = senf::MACAddress(0xFFFFFFFF
 senf::MACAddress const senf::MACAddress::None;
 
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // namespace members
 
 prefix_ std::ostream & senf::operator<<(std::ostream & os, MACAddress const & mac)
@@ -95,11 +96,11 @@ prefix_ std::istream & senf::operator>>(std::istream & is, MACAddress & mac)
     return is;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "MACAddress.mpp"
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100