Browse Source

remove unused method. skip upnp for ipv6.

cl-refactor
subtly 10 years ago
parent
commit
c479f23561
  1. 5
      libp2p/Host.cpp
  2. 4
      libp2p/Host.h

5
libp2p/Host.cpp

@ -158,7 +158,7 @@ void Host::determinePublic(string const& _publicAddress, bool _upnp)
// iterate m_peerAddresses (populated by populateAddresses()) // iterate m_peerAddresses (populated by populateAddresses())
for (auto const& addr : m_peerAddresses) 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; break;
if (p) if (p)
clog(NetNote) << "Punched through NAT and mapped local port" << m_listenPort << "onto external port" << 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 else
{ {
// No UPnP - fallback on given public address or, if empty, the assumed peer address. // 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()) if (m_peerAddresses.size())
{ {
// prefer local ipv4 over local ipv6 // 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 // determine public IP, but only if we're able to listen for connections
// todo: visualize when listen is unavailable in UI // todo: visualize when listen is unavailable in UI
// tood: only punch hole for ipv4
if (m_listenPort) if (m_listenPort)
{ {
determinePublic(m_netPrefs.publicIP, m_netPrefs.upnp); determinePublic(m_netPrefs.publicIP, m_netPrefs.upnp);

4
libp2p/Host.h

@ -128,9 +128,6 @@ public:
/// Will block on network process events. /// Will block on network process events.
virtual ~Host(); virtual ~Host();
/// Closes all peers.
void disconnectPeers();
/// Basic peer network protocol version. /// Basic peer network protocol version.
unsigned protocolVersion() const; unsigned protocolVersion() const;
@ -200,7 +197,6 @@ private:
/// Try UPNP or listen to assumed address. Requires valid m_listenPort. /// Try UPNP or listen to assumed address. Requires valid m_listenPort.
void determinePublic(std::string const& _publicAddress, bool _upnp); void determinePublic(std::string const& _publicAddress, bool _upnp);
void ensureAccepting(); void ensureAccepting();
void growPeers(); void growPeers();

Loading…
Cancel
Save