Merge pull request #2781 from chriseth/uniquePtrFrameCoder

Use unique_ptr for RLPXFrameCoder.

libp2p/Host.cpp

@@ -225,7 +225,7 @@ void Host::doneWorking()
 	m_sessions.clear();
 }
 
-void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s)
+void Host::startPeerSession(Public const& _id, RLP const& _rlp, unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s)
 {
 	// session maybe ingress or egress so m_peers and node table entries may not exist
 	shared_ptr<Peer> p;
@@ -264,7 +264,7 @@ void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameCoder*
 	clog(NetMessageSummary) << "Hello: " << clientVersion << "V[" << protocolVersion << "]" << _id << showbase << capslog.str() << dec << listenPort;
 	
 	// create session so disconnects are managed
-	auto ps = make_shared<Session>(this, _io, _s, p, PeerSessionInfo({_id, clientVersion, p->endpoint.address.to_string(), listenPort, chrono::steady_clock::duration(), _rlp[2].toSet<CapDesc>(), 0, map<string, string>(), protocolVersion}));
+	auto ps = make_shared<Session>(this, move(_io), _s, p, PeerSessionInfo({_id, clientVersion, p->endpoint.address.to_string(), listenPort, chrono::steady_clock::duration(), _rlp[2].toSet<CapDesc>(), 0, map<string, string>(), protocolVersion}));
 	if (protocolVersion < dev::p2p::c_protocolVersion - 1)
 	{
 		ps->disconnect(IncompatibleProtocol);

libp2p/Host.h

@@ -225,7 +225,7 @@ public:
 	bool haveNetwork() const { return m_run && !!m_nodeTable; }
 	
 	/// Validates and starts peer session, taking ownership of _io. Disconnects and returns false upon error.
-	void startPeerSession(Public const& _id, RLP const& _hello, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s);
+	void startPeerSession(Public const& _id, RLP const& _hello, std::unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s);
 
 	/// Get session by id
 	std::shared_ptr<Session> peerSession(NodeId const& _id) { RecursiveGuard l(x_sessions); return m_sessions.count(_id) ? m_sessions[_id].lock() : std::shared_ptr<Session>(); }

libp2p/RLPxHandshake.cpp

@@ -143,8 +143,7 @@ void RLPXHandshake::error()
 		clog(NetP2PConnect) << "Handshake Failed (Connection reset by peer)";
 
 	m_socket->close();
-	if (m_io != nullptr)
+	m_io.reset();
-		delete m_io;
 }
 
 void RLPXHandshake::transition(boost::system::error_code _ech)
@@ -194,7 +193,7 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
 
 		/// This pointer will be freed if there is an error otherwise
 		/// it will be passed to Host which will take ownership.
-		m_io = new RLPXFrameCoder(*this);
+		m_io.reset(new RLPXFrameCoder(*this));
 
 		// old packet format
 		// 5 arguments, HelloPacket
@@ -286,7 +285,7 @@ void RLPXHandshake::transition(boost::system::error_code _ech)
 						try
 						{
 							RLP rlp(frame.cropped(1), RLP::ThrowOnFail | RLP::FailIfTooSmall);
-							m_host->startPeerSession(m_remote, rlp, m_io, m_socket);
+							m_host->startPeerSession(m_remote, rlp, move(m_io), m_socket);
 						}
 						catch (std::exception const& _e)
 						{

libp2p/RLPxHandshake.h

@@ -123,7 +123,7 @@ protected:
 	
 	/// Used to read and write RLPx encrypted frames for last step of handshake authentication.
 	/// Passed onto Host which will take ownership.
-	RLPXFrameCoder* m_io = nullptr;
+	std::unique_ptr<RLPXFrameCoder> m_io;
 	
 	std::shared_ptr<RLPXSocket> m_socket;		///< Socket.
 	boost::asio::deadline_timer m_idleTimer;	///< Timer which enforces c_timeout.

libp2p/Session.cpp

@@ -33,9 +33,9 @@ using namespace std;
 using namespace dev;
 using namespace dev::p2p;
 
-Session::Session(Host* _h, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info):
+Session::Session(Host* _h, unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info):
 	m_server(_h),
-	m_io(_io),
+	m_io(move(_io)),
 	m_socket(_s),
 	m_peer(_n),
 	m_info(_info),
@@ -69,7 +69,6 @@ Session::~Session()
 		}
 	}
 	catch (...){}
-	delete m_io;
 }
 
 ReputationManager& Session::repMan() const

libp2p/Session.h

@@ -55,7 +55,7 @@ class Session: public std::enable_shared_from_this<Session>
 	friend class HostCapabilityFace;
 
 public:
-	Session(Host* _server, RLPXFrameCoder* _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info);
+	Session(Host* _server, std::unique_ptr<RLPXFrameCoder>&& _io, std::shared_ptr<RLPXSocket> const& _s, std::shared_ptr<Peer> const& _n, PeerSessionInfo _info);
 	virtual ~Session();
 
 	void start();
@@ -113,7 +113,7 @@ private:
 
 	Host* m_server;							///< The host that owns us. Never null.
 
-	RLPXFrameCoder* m_io;						///< Transport over which packets are sent.
+	std::unique_ptr<RLPXFrameCoder> m_io;	///< Transport over which packets are sent.
 	std::shared_ptr<RLPXSocket> m_socket;		///< Socket of peer's connection.
 	Mutex x_writeQueue;						///< Mutex for the write queue.
 	std::deque<bytes> m_writeQueue;			///< The write queue.