Use dup() instead of move semantics for Network::Socket

mobile-shell · Nov 23, 2012 · 6a16eec · 6a16eec
1 parent 05ec364
commit 6a16eec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/src/network/network.cc b/src/network/network.cc
@@ -140,8 +140,7 @@ void Connection::prune_sockets( void )
 }
 
 Connection::Socket::Socket()
-  : _fd( socket( AF_INET, SOCK_DGRAM, 0 ) ),
-    _moved( false )
+  : _fd( socket( AF_INET, SOCK_DGRAM, 0 ) )
 {
   if ( _fd < 0 ) {
     throw NetworkException( "socket", errno );
@@ -570,25 +569,26 @@ uint64_t Connection::timeout( void ) const
 
 Connection::Socket::~Socket()
 {
-  if ( !_moved ) {
-    if ( close( _fd ) < 0 ) {
-      throw NetworkException( "close", errno );
-    }
+  if ( close( _fd ) < 0 ) {
+    throw NetworkException( "close", errno );
   }
 }
 
 Connection::Socket::Socket( const Socket & other )
-  : _fd( other._fd ),
-    _moved( false )
+  : _fd( dup( other._fd ) )
 {
-  other.move();
+  if ( _fd < 0 ) {
+    throw NetworkException( "socket", errno );
+  }
 }
 
 const Connection::Socket & Connection::Socket::operator=( const Socket & other )
 {
-  _fd = other._fd;
+  _fd = dup( other._fd );
 
-  other.move();
+  if ( _fd < 0 ) {
+    throw NetworkException( "socket", errno );
+  }
 
   return *this;
 }

diff --git a/src/network/network.h b/src/network/network.h
@@ -107,11 +107,9 @@ namespace Network {
     {
     private:
       int _fd;
-      mutable bool _moved;
 
     public:
-      int fd( void ) const { assert( !_moved ); return _fd; }
-      void move( void ) const { assert( !_moved ); _moved = true; }
+      int fd( void ) const { return _fd; }
       Socket();
       ~Socket();