From c479f23561d8b987e710cfcd09b6d3e1eb9f5a24 Mon Sep 17 00:00:00 2001 From: subtly Date: Wed, 19 Nov 2014 06:18:11 +0100 Subject: [PATCH] remove unused method. skip upnp for ipv6. --- libp2p/Host.cpp | 5 ++--- libp2p/Host.h | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp index 4c6973ae3..e7c476441 100644 --- a/libp2p/Host.cpp +++ b/libp2p/Host.cpp @@ -158,7 +158,7 @@ void Host::determinePublic(string const& _publicAddress, bool _upnp) // iterate m_peerAddresses (populated by populateAddresses()) for (auto const& addr : m_peerAddresses) - if ((p = m_upnp->addRedirect(addr.to_string().c_str(), m_listenPort))) + if (addr.is_v4() && (p = m_upnp->addRedirect(addr.to_string().c_str(), m_listenPort))) break; if (p) clog(NetNote) << "Punched through NAT and mapped local port" << m_listenPort << "onto external port" << p << "."; @@ -187,7 +187,7 @@ void Host::determinePublic(string const& _publicAddress, bool _upnp) else { // No UPnP - fallback on given public address or, if empty, the assumed peer address. - bi::address adr; // = m_peerAddresses.size() ? m_peerAddresses[0] : bi::address(); + bi::address adr; if (m_peerAddresses.size()) { // prefer local ipv4 over local ipv6 @@ -687,7 +687,6 @@ void Host::run(boost::system::error_code const& error) // determine public IP, but only if we're able to listen for connections // todo: visualize when listen is unavailable in UI - // tood: only punch hole for ipv4 if (m_listenPort) { determinePublic(m_netPrefs.publicIP, m_netPrefs.upnp); diff --git a/libp2p/Host.h b/libp2p/Host.h index 7c4fbe1ce..b60949278 100644 --- a/libp2p/Host.h +++ b/libp2p/Host.h @@ -128,9 +128,6 @@ public: /// Will block on network process events. virtual ~Host(); - /// Closes all peers. - void disconnectPeers(); - /// Basic peer network protocol version. unsigned protocolVersion() const; @@ -200,7 +197,6 @@ private: /// Try UPNP or listen to assumed address. Requires valid m_listenPort. void determinePublic(std::string const& _publicAddress, bool _upnp); - void ensureAccepting(); void growPeers();