X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FNetdeviceController.cc;h=a8f6a195c4b861c0c2b3340d6d3ba14d13e4d21c;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=37c255f68a79edcbf0ffdf8af83607a392ac5b2d;hpb=ef0be4d0484ff659d17e02a421ad5beaaa76e646;p=senf.git

diff --git a/Socket/NetdeviceController.cc b/Socket/NetdeviceController.cc
index 37c255f..a8f6a19 100644
--- a/Socket/NetdeviceController.cc
+++ b/Socket/NetdeviceController.cc
@@ -30,14 +30,15 @@
 // Custom includes
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <net/if.h>
 #include "../Utils/Exception.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
 prefix_ senf::NetdeviceController::NetdeviceController(std::string const & interface_name)
+    : sockfd_ (sockfd())
 {
-    openSocket();
     struct ifreq ifr;
     ::memset( &ifr, 0, sizeof(ifr));
     interface_name.copy( ifr.ifr_name, IFNAMSIZ);
@@ -46,8 +47,8 @@ prefix_ senf::NetdeviceController::NetdeviceController(std::string const & inter
 }
 
 prefix_ senf::NetdeviceController::NetdeviceController(int interface_index)
+    : sockfd_ (sockfd())
 {
-    openSocket();
     ifindex_ = interface_index;
 }
 
@@ -59,6 +60,22 @@ prefix_ std::string senf::NetdeviceController::interfaceName()
     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
 {
@@ -73,7 +90,12 @@ prefix_ void senf::NetdeviceController::hardwareAddress(const MACAddress &newAdd
     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);
-    doIoctl( ifr, SIOCSIFHWADDR);
+    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()
@@ -93,22 +115,58 @@ prefix_ void senf::NetdeviceController::mtu(int new_mtu)
     doIoctl( ifr, SIOCSIFMTU);
 }
 
-prefix_ int senf::NetdeviceController::interfaceIndex()
+prefix_ bool senf::NetdeviceController::promisc()
     const
 {
-    return ifindex_;
+    struct ifreq ifr;
+    ifrName( ifr);
+    doIoctl( ifr, SIOCGIFFLAGS);
+    return ifr.ifr_flags & IFF_PROMISC;
 }
 
-prefix_ senf::NetdeviceController::~NetdeviceController()
+prefix_ void senf::NetdeviceController::promisc(bool mode)
 {
-    close( sockfd_);
+    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_ void senf::NetdeviceController::openSocket()
+prefix_ bool senf::NetdeviceController::isUp()
+    const
 {
-    sockfd_ = ::socket( PF_INET, SOCK_DGRAM, 0);
-    if ( sockfd_ < 0)
-        SENF_THROW_SYSTEM_EXCEPTION("Could not open socket for NetdeviceController.");
+    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_;
 }
 
 prefix_ void senf::NetdeviceController::ifrName(ifreq& ifr)
@@ -116,7 +174,7 @@ prefix_ void senf::NetdeviceController::ifrName(ifreq& ifr)
 {
     ::memset( &ifr, 0, sizeof(ifr));
     ifr.ifr_ifindex = ifindex_;
-    if ( ::ioctl( sockfd_, SIOCGIFNAME, &ifr ) < 0 )
+    if ( ::ioctl( sockfd_->fd, SIOCGIFNAME, &ifr ) < 0 )
         SENF_THROW_SYSTEM_EXCEPTION("NetdeviceController")
         << " could not discover the name of the interface with index " << ifindex_ << ".";
 }
@@ -124,10 +182,36 @@ prefix_ void senf::NetdeviceController::ifrName(ifreq& ifr)
 prefix_ void senf::NetdeviceController::doIoctl(ifreq& ifr, int request)
     const
 {
-    if ( ::ioctl( sockfd_, request, &ifr ) < 0 )
+    if ( ::ioctl( sockfd_->fd, request, &ifr ) < 0 )
         SENF_THROW_SYSTEM_EXCEPTION("NetdeviceController::doIoctl failed.");
 }
 
+///////////////////////////////////////////////////////////////////////////
+// senf::NetdeviceController::SockFd
+
+prefix_ senf::NetdeviceController::SockFd::SockFd()
+    : fd (::socket(PF_INET, SOCK_DGRAM, 0))
+{
+    if ( fd < 0)
+        SENF_THROW_SYSTEM_EXCEPTION("Could not open socket for NetdeviceController.");
+    std::cerr << ">>Made SockFd: " << fd << std::endl;
+}
+
+prefix_ senf::NetdeviceController::SockFd::~SockFd()
+{
+    std::cerr << ">>Dispose SockFd: " << fd << std::endl;
+    ::close(fd);
+}
+
+prefix_ senf::NetdeviceController::SockFd::ptr senf::NetdeviceController::sockfd()
+{
+    static boost::weak_ptr<SockFd> sockfd;
+    SockFd::ptr p (sockfd.lock());
+    if (!p)
+         sockfd = p = SockFd::ptr(new SockFd());
+    return p;
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "NetdeviceController.mpp"