X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FNetdeviceController.cc;h=b514904ba5378ac49c8b624153a278839812eddd;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=5f6ab52f28f4065ebbf7ed845f5817ba9fb4d092;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/Socket/NetdeviceController.cc b/Socket/NetdeviceController.cc
index 5f6ab52..b514904 100644
--- a/Socket/NetdeviceController.cc
+++ b/Socket/NetdeviceController.cc
@@ -30,6 +30,7 @@
 // Custom includes
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <net/if.h>
 #include "../Utils/Exception.hh"
 
 #define prefix_
@@ -52,13 +53,31 @@ prefix_ senf::NetdeviceController::NetdeviceController(int interface_index)
 }
 
 prefix_ std::string senf::NetdeviceController::interfaceName()
+    const
 {
     struct ifreq ifr;
     ifrName( ifr);
     return std::string( ifr.ifr_name);
 }
 
+prefix_ void senf::NetdeviceController::interfaceName(const std::string & newname)
+{
+    if (sizeof(newname) <= IFNAMSIZ) {
+        struct ifreq ifr;
+        ifrName(ifr);
+        strncpy(ifr. ifr_newname, newname.c_str(), IFNAMSIZ);
+        try {
+            doIoctl(ifr, SIOCSIFNAME);
+        } catch (senf::SystemException e) {
+            e << "Could not change the interface name. Is the interface really down?";
+            throw ;
+        }
+    }
+    return;
+}
+
 prefix_ senf::MACAddress senf::NetdeviceController::hardwareAddress()
+    const
 {
     struct ifreq ifr;
     ifrName( ifr);
@@ -66,7 +85,21 @@ prefix_ senf::MACAddress senf::NetdeviceController::hardwareAddress()
     return senf::MACAddress::from_data( ifr.ifr_hwaddr.sa_data);
 }
 
+prefix_ void senf::NetdeviceController::hardwareAddress(const MACAddress &newAddress) {
+    struct ifreq ifr;
+    ifrName( ifr);
+    ifr.ifr_hwaddr.sa_family = 1; // TODO: lookup named constant; PF_LOCAL ???
+    std::copy(newAddress.begin(), newAddress.end(), ifr.ifr_hwaddr.sa_data);
+    try {
+        doIoctl(ifr, SIOCSIFHWADDR);
+    } catch (senf::SystemException e) {
+        e << "Could not change the interface MAC address. Is the interface really down?";
+        throw ;
+    }
+}
+
 prefix_ int senf::NetdeviceController::mtu()
+    const
 {
     struct ifreq ifr;
     ifrName( ifr);
@@ -82,7 +115,56 @@ prefix_ void senf::NetdeviceController::mtu(int new_mtu)
     doIoctl( ifr, SIOCSIFMTU);
 }
 
+prefix_ bool senf::NetdeviceController::promisc()
+    const
+{
+    struct ifreq ifr;
+    ifrName( ifr);
+    doIoctl( ifr, SIOCGIFFLAGS);
+    return ifr.ifr_flags & IFF_PROMISC;
+}
+
+prefix_ void senf::NetdeviceController::promisc(bool mode)
+{
+    struct ifreq ifr;
+    ifrName( ifr);
+    doIoctl( ifr, SIOCGIFFLAGS);
+    if (mode)
+        ifr.ifr_flags |= IFF_PROMISC;
+    else
+        ifr.ifr_flags &= ~IFF_PROMISC;
+    doIoctl( ifr, SIOCSIFFLAGS);
+}
+
+prefix_ bool senf::NetdeviceController::isUp()
+    const
+{
+    struct ifreq ifr;
+    ifrName(ifr);
+    doIoctl(ifr, SIOCGIFFLAGS);
+    return ifr.ifr_flags & IFF_UP;
+}
+
+prefix_ void senf::NetdeviceController::up()
+{
+    struct ifreq ifr;
+    ifrName(ifr);
+    doIoctl(ifr, SIOCGIFFLAGS);
+    ifr.ifr_flags |= IFF_UP;
+    doIoctl(ifr, SIOCSIFFLAGS);
+}
+
+prefix_ void senf::NetdeviceController::down()
+{
+    struct ifreq ifr;
+    ifrName(ifr);
+    doIoctl(ifr, SIOCGIFFLAGS);
+    ifr.ifr_flags &= ~IFF_UP;
+    doIoctl(ifr, SIOCSIFFLAGS);
+}
+
 prefix_ int senf::NetdeviceController::interfaceIndex()
+    const
 {
     return ifindex_;
 }
@@ -96,29 +178,31 @@ prefix_ void senf::NetdeviceController::openSocket()
 {
     sockfd_ = ::socket( PF_INET, SOCK_DGRAM, 0);
     if ( sockfd_ < 0)
-        throwErrno();
+        SENF_THROW_SYSTEM_EXCEPTION("Could not open socket for NetdeviceController.");
 }
 
 prefix_ void senf::NetdeviceController::ifrName(ifreq& ifr)
+    const
 {
     ::memset( &ifr, 0, sizeof(ifr));
     ifr.ifr_ifindex = ifindex_;
     if ( ::ioctl( sockfd_, SIOCGIFNAME, &ifr ) < 0 )
-        throwErrno();
+        SENF_THROW_SYSTEM_EXCEPTION("NetdeviceController")
+        << " could not discover the name of the interface with index " << ifindex_ << ".";
 }
 
-
 prefix_ void senf::NetdeviceController::doIoctl(ifreq& ifr, int request)
+    const
 {
     if ( ::ioctl( sockfd_, request, &ifr ) < 0 )
-        throwErrno();
+        SENF_THROW_SYSTEM_EXCEPTION("NetdeviceController::doIoctl failed.");
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "NetdeviceController.mpp"
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100