X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FNetdeviceController.cc;h=b93998c044ff21daa3bee505d468bfe45d95be0c;hb=ab05c3d687d911b4d204aa20bf900dc23d174545;hp=6cc7d6b367b72eb1a21fdd28810dd44eb7ea4289;hpb=d91d33394bc18350f20407201bd5fbe7346f8f7f;p=senf.git

diff --git a/Socket/NetdeviceController.cc b/Socket/NetdeviceController.cc
index 6cc7d6b..b93998c 100644
--- a/Socket/NetdeviceController.cc
+++ b/Socket/NetdeviceController.cc
@@ -1,9 +1,9 @@
-// $Id: BufferingPolicy.cc 533 2007-11-23 17:34:30Z g0dil $
+// $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
+// 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
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief BufferingPolicy non-inline non-template implementation
+    \brief NetdeviceController non-inline non-template implementation
  */
 
 #include "NetdeviceController.hh"
@@ -30,38 +30,96 @@
 // Custom includes
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
-#include <netinet/ether.h>
 #include "../Utils/Exception.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ senf::NetdeviceController::NetdeviceController(std::string const interface_name)
+prefix_ senf::NetdeviceController::NetdeviceController(std::string const & interface_name)
 {
-    sockfd_ = ::socket(PF_PACKET, SOCK_DGRAM, 0);
-    if (sockfd_ < 0)
-        throwErrno();
-    interfacename_ = interface_name;
+    openSocket();
+    struct ifreq ifr;
+    ::memset( &ifr, 0, sizeof(ifr));
+    interface_name.copy( ifr.ifr_name, IFNAMSIZ);
+    doIoctl( ifr, SIOCGIFINDEX);
+    ifindex_ = ifr.ifr_ifindex;
+}
+
+prefix_ senf::NetdeviceController::NetdeviceController(int interface_index)
+{
+    openSocket();
+    ifindex_ = interface_index;
+}
+
+prefix_ std::string senf::NetdeviceController::interfaceName()
+    const
+{
+    struct ifreq ifr;
+    ifrName( ifr);
+    return std::string( ifr.ifr_name);
 }
 
 prefix_ senf::MACAddress senf::NetdeviceController::hardwareAddress()
+    const
 {
     struct ifreq ifr;
-    ::memset( &ifr, 0, sizeof(ifr));
-    interfacename_.copy( ifr.ifr_name, IFNAMSIZ);
-    if ( ::ioctl( sockfd_, SIOCGIFHWADDR , &ifr ) < 0 )
-        throwErrno();
-    return senf::MACAddress::from_string( 
-            ether_ntoa( (struct ether_addr*) ifr.ifr_hwaddr.sa_data ) );
+    ifrName( ifr);
+    doIoctl( ifr, SIOCGIFHWADDR);
+    return senf::MACAddress::from_data( ifr.ifr_hwaddr.sa_data);
+}
+
+prefix_ int senf::NetdeviceController::mtu()
+    const
+{
+    struct ifreq ifr;
+    ifrName( ifr);
+    doIoctl( ifr, SIOCGIFMTU);
+    return ifr.ifr_mtu;
+}
+
+prefix_ void senf::NetdeviceController::mtu(int new_mtu)
+    const
+{
+    struct ifreq ifr;
+    ifrName( ifr);
+    ifr.ifr_mtu = new_mtu;
+    doIoctl( ifr, SIOCSIFMTU);
+}
+
+prefix_ int senf::NetdeviceController::interfaceIndex()
+    const
+{
+    return ifindex_;
 }
 
 prefix_ senf::NetdeviceController::~NetdeviceController()
 {
-    close( sockfd_ );
+    close( sockfd_);
 }
 
+prefix_ void senf::NetdeviceController::openSocket()
+{
+    sockfd_ = ::socket( PF_INET, SOCK_DGRAM, 0);
+    if ( sockfd_ < 0)
+        throw SystemException();
+}
 
+prefix_ void senf::NetdeviceController::ifrName(ifreq& ifr)
+    const
+{
+    ::memset( &ifr, 0, sizeof(ifr));
+    ifr.ifr_ifindex = ifindex_;
+    if ( ::ioctl( sockfd_, SIOCGIFNAME, &ifr ) < 0 )
+        throw SystemException();
+}
+
+
+prefix_ void senf::NetdeviceController::doIoctl(ifreq& ifr, int request)
+    const
+{
+    if ( ::ioctl( sockfd_, request, &ifr ) < 0 )
+        throw SystemException();
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_