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

diff --git a/Socket/NetdeviceController.cc b/Socket/NetdeviceController.cc
index b514904..a8f6a19 100644
--- a/Socket/NetdeviceController.cc
+++ b/Socket/NetdeviceController.cc
@@ -37,8 +37,8 @@
 ///////////////////////////////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);
@@ -47,8 +47,8 @@ prefix_ senf::NetdeviceController::NetdeviceController(std::string const & inter
 }
 
 prefix_ senf::NetdeviceController::NetdeviceController(int interface_index)
+    : sockfd_ (sockfd())
 {
-    openSocket();
     ifindex_ = interface_index;
 }
 
@@ -169,24 +169,12 @@ prefix_ int senf::NetdeviceController::interfaceIndex()
     return ifindex_;
 }
 
-prefix_ senf::NetdeviceController::~NetdeviceController()
-{
-    close( sockfd_);
-}
-
-prefix_ void senf::NetdeviceController::openSocket()
-{
-    sockfd_ = ::socket( PF_INET, SOCK_DGRAM, 0);
-    if ( sockfd_ < 0)
-        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 )
+    if ( ::ioctl( sockfd_->fd, SIOCGIFNAME, &ifr ) < 0 )
         SENF_THROW_SYSTEM_EXCEPTION("NetdeviceController")
         << " could not discover the name of the interface with index " << ifindex_ << ".";
 }
@@ -194,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"