X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FNetdeviceController.hh;h=98897ff2d09985953af49c66d916c9a40df32d0f;hb=23a1bdee20b3fb19bd442efed8aa73b2bf0d585a;hp=0d15068a7e3f99455b7d30509db502f9ca09a53b;hpb=f877e260b7f08c22e5838c2134edb18f899691fb;p=senf.git

diff --git a/senf/Socket/NetdeviceController.hh b/senf/Socket/NetdeviceController.hh
index 0d15068..98897ff 100644
--- a/senf/Socket/NetdeviceController.hh
+++ b/senf/Socket/NetdeviceController.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief NetdeviceController public header
@@ -30,17 +35,17 @@
 // Custom includes
 #include <string>
 #include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <senf/Socket/Protocols/Raw/MACAddress.hh>
-
 
 //#include "NetdeviceController.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 struct ifreq;
 
 namespace senf {
 
+    struct MACAddress;
+
+
     /** \brief Netdevice Controller
 
         This controller provides an interface which can be used to configure network
@@ -58,7 +63,7 @@ namespace senf {
         int interfaceIndex() const;     ///< return the interface index
         MACAddress hardwareAddress() const;
                                         ///< return hardware address
-        void hardwareAddress(const MACAddress &newAddress);
+        void hardwareAddress(MACAddress const & newAddress);
                                         ///< set hardware address
                                         /**< Changes the hardware address of the interface.
                                              Note, that setting the hardware address is a privileged
@@ -67,7 +72,7 @@ namespace senf {
                                              SystemException to be thrown. */
         std::string interfaceName() const;
                                         ///< return interface name
-        void interfaceName(const std::string &newName);
+        void interfaceName(std::string const & newName);
                                         ///< set interface name
                                         /**< Changes the name of the interface.
                                              Note, that setting the name is a privileged operation.
@@ -106,15 +111,14 @@ namespace senf {
         static SockFd::ptr sockfd();
 
     private:
-        void doIoctl(ifreq& ifr, int request) const;
-        void ifrName(ifreq& ifr) const;
+        void ifrName(ifreq & ifr) const;
         SockFd::ptr sockfd_;
         int ifindex_;
     };
 
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "NetdeviceController.cci"
 //#include "NetdeviceController.ct"
 //#include "NetdeviceController.cti"