Packets: not really a smart but efficient 'shortcut' for ConcretePacket::next() ...

[senf.git] / senf / Socket / Protocols / Raw / LLAddressing.cc

diff --git a/senf/Socket/Protocols/Raw/LLAddressing.cc b/senf/Socket/Protocols/Raw/LLAddressing.cc
index a15c2de..18392e8 100644 (file)
--- a/senf/Socket/Protocols/Raw/LLAddressing.cc
+++ b/senf/Socket/Protocols/Raw/LLAddressing.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 LLSocketAddress and LLAddressingPolicy non-inline non-template implementation
@@ -34,12 +39,11 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/finder.hpp>
 
-#include <senf/Utils/Exception.hh>
 #include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "LLAddressing.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ std::string senf::LLSocketAddress::interface()
     const
@@ -49,25 +53,25 @@ prefix_ std::string senf::LLSocketAddress::interface()
     char name[IFNAMSIZ];
     ::bzero(name, IFNAMSIZ);
     if (! ::if_indextoname(addr_.sll_ifindex, name))
-        throw AddressSyntaxException();
+        throw UnknownInterfaceException();
     return std::string(name);
 }
 
 prefix_ void senf::LLSocketAddress::interface(std::string const & iface)
 {
-    if (iface.empty()) 
+    if (iface.empty())
         addr_.sll_ifindex = 0;
     else {
         addr_.sll_ifindex = if_nametoindex(iface.c_str());
         if (addr_.sll_ifindex == 0)
-            throw AddressSyntaxException();
+            throw UnknownInterfaceException(iface);
     }
 }
 
 prefix_ std::ostream & senf::operator<<(std::ostream & os, LLSocketAddress const & llAddr)
 {
     os << "[" << llAddr.address()
-       << '%' << llAddr.interface() 
+       << '%' << llAddr.interface()
        << ' ' << llAddr.protocol()
        << ' ' << llAddr.arptype()
        << ( llAddr.pkttype() == senf::LLSocketAddress::Host ? " Host" :
@@ -80,7 +84,7 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, LLSocketAddress const
     return os;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "LLAddressing.mpp"