From 70735a0a6700f8c10d7b3a03e90dfe50bc120463 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sat, 21 Dec 2013 07:18:49 +0000 Subject: [PATCH] minor ifdef tweaks and DHT logging --- include/libtorrent/extensions/smart_ban.hpp | 4 ++++ src/kademlia/dht_tracker.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/libtorrent/extensions/smart_ban.hpp b/include/libtorrent/extensions/smart_ban.hpp index 27f321258..ba0ccb213 100644 --- a/include/libtorrent/extensions/smart_ban.hpp +++ b/include/libtorrent/extensions/smart_ban.hpp @@ -33,6 +33,8 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef TORRENT_SMART_BAN_HPP_INCLUDED #define TORRENT_SMART_BAN_HPP_INCLUDED +#ifndef TORRENT_DISABLE_EXTENSIONS + #ifdef _MSC_VER #pragma warning(push, 1) #endif @@ -58,5 +60,7 @@ namespace libtorrent TORRENT_EXPORT boost::shared_ptr create_smart_ban_plugin(torrent*, void*); } +#endif // TORRENT_DISABLE_EXTENSIONS + #endif // TORRENT_SMART_BAN_HPP_INCLUDED diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp index 69597635c..1269bf8f6 100644 --- a/src/kademlia/dht_tracker.cpp +++ b/src/kademlia/dht_tracker.cpp @@ -643,7 +643,13 @@ namespace libtorrent { namespace dht if (m_sock.send(addr, &m_send_buf[0], (int)m_send_buf.size(), ec, send_flags)) { - if (ec) return false; + if (ec) + { +#ifdef TORRENT_DHT_VERBOSE_LOGGING + TORRENT_LOG(dht_tracker) << "==> " << addr << " DROPPED (" << ec.message() << ") " << log_line.str(); +#endif + return false; + } // account for IP and UDP overhead m_sent_bytes += m_send_buf.size() + (addr.address().is_v6() ? 48 : 28);