premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

moved current ip_change_notifier implementation to compilation unit (#1890) 

moved current ip_change_notifier implementation to compilation unit
This commit is contained in:
Alden Torres 2017-04-05 23:42:37 -04:00 committed by Arvid Norberg
parent cec874591d
commit df0a3bd015
2 changed files with 63 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/libtorrent/aux_/ip_notifier.hpp
View File

@ -34,50 +34,21 @@ POSSIBILITY OF SUCH DAMAGE.
#define TORRENT_IP_NOTIFIER_HPP_INCLUDED
#include <functional>
#include <array>
#include <memory>
#include "libtorrent/error_code.hpp"
#include "libtorrent/address.hpp"
#include "libtorrent/io_service.hpp"
#if defined TORRENT_BUILD_SIMULATOR
// TODO: simulator support
#elif TORRENT_USE_NETLINK
#include "libtorrent/netlink.hpp"
#elif defined TORRENT_WINDOWS
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/asio/windows/object_handle.hpp>
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#endif
namespace libtorrent { namespace aux
{
struct ip_change_notifier
struct TORRENT_EXTRA_EXPORT ip_change_notifier
{
explicit ip_change_notifier(io_service& ios);
~ip_change_notifier();
ip_change_notifier(ip_change_notifier const&) = delete;
ip_change_notifier& operator=(ip_change_notifier const&) = delete;
// cb will be invoked when a change is detected in the
// system's IP addresses
void async_wait(std::function<void(error_code const&)> cb);
void cancel();
virtual void async_wait(std::function<void(error_code const&)> cb) = 0;
virtual void cancel() = 0;
private:
void on_notify(error_code const& error
, std::size_t bytes_transferred
, std::function<void(error_code const&)> cb);
#if defined TORRENT_BUILD_SIMULATOR
// TODO: simulator support
#elif TORRENT_USE_NETLINK
netlink::socket m_socket;
std::array<char, 4096> m_buf;
#elif defined TORRENT_WINDOWS
OVERLAPPED m_ovl = {};
boost::asio::windows::object_handle m_hnd;
#endif
virtual ~ip_change_notifier() {}
};
TORRENT_EXTRA_EXPORT std::unique_ptr<ip_change_notifier> create_ip_notifier(io_service& ios);

68
src/ip_notifier.cpp
View File

@ -32,19 +32,63 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/ip_notifier.hpp"
#if defined TORRENT_WINDOWS && !defined TORRENT_BUILD_SIMULATOR
#if defined TORRENT_BUILD_SIMULATOR
// TODO: simulator support
#elif TORRENT_USE_NETLINK
#include "libtorrent/netlink.hpp"
#include <array>
#elif defined TORRENT_WINDOWS
#include "libtorrent/aux_/throw.hpp"
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/asio/windows/object_handle.hpp>
#include <iphlpapi.h>
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#endif
#include "libtorrent/aux_/throw.hpp"
using namespace std::placeholders;
namespace libtorrent { namespace aux
{
ip_change_notifier::ip_change_notifier(io_service& ios)
namespace
{
#if defined TORRENT_BUILD_SIMULATOR
// TODO: ip_change_notifier_sim
#elif TORRENT_USE_NETLINK
// TODO: ip_change_notifier_nl
#elif defined TORRENT_WINDOWS
// TODO: ip_change_notifier_win
#endif
// TODO: to remove when separated per platform
struct ip_change_notifier_impl final : ip_change_notifier
{
explicit ip_change_notifier_impl(io_service& ios);
~ip_change_notifier_impl() override;
ip_change_notifier_impl(ip_change_notifier_impl const&) = delete;
ip_change_notifier_impl& operator=(ip_change_notifier_impl const&) = delete;
// cb will be invoked when a change is detected in the
// system's IP addresses
void async_wait(std::function<void(error_code const&)> cb) override;
void cancel() override;
private:
void on_notify(error_code const& error
, std::size_t bytes_transferred
, std::function<void(error_code const&)> cb);
#if defined TORRENT_BUILD_SIMULATOR
// TODO: simulator support
#elif TORRENT_USE_NETLINK
netlink::socket m_socket;
std::array<char, 4096> m_buf;
#elif defined TORRENT_WINDOWS
OVERLAPPED m_ovl = {};
boost::asio::windows::object_handle m_hnd;
#endif
};
ip_change_notifier_impl::ip_change_notifier_impl(io_service& ios)
#if defined TORRENT_BUILD_SIMULATOR
#elif TORRENT_USE_NETLINK
: m_socket(ios
@ -63,7 +107,7 @@ namespace libtorrent { namespace aux
#endif
}
ip_change_notifier::~ip_change_notifier()
ip_change_notifier_impl::~ip_change_notifier_impl()
{
#if defined TORRENT_WINDOWS && !defined TORRENT_BUILD_SIMULATOR
cancel();
@ -71,13 +115,14 @@ namespace libtorrent { namespace aux
#endif
}
void ip_change_notifier::async_wait(std::function<void(error_code const&)> cb)
void ip_change_notifier_impl::async_wait(std::function<void(error_code const&)> cb)
{
#if defined TORRENT_BUILD_SIMULATOR
TORRENT_UNUSED(&ip_change_notifier_impl::on_notify);
TORRENT_UNUSED(cb);
#elif TORRENT_USE_NETLINK
m_socket.async_receive(boost::asio::buffer(m_buf)
, std::bind(&ip_change_notifier::on_notify, this, _1, _2, cb));
, std::bind(&ip_change_notifier_impl::on_notify, this, _1, _2, cb));
#elif defined TORRENT_WINDOWS
HANDLE hnd;
DWORD err = NotifyAddrChange(&hnd, &m_ovl);
@ -91,11 +136,12 @@ namespace libtorrent { namespace aux
{ cb(error_code(err, system_category())); });
}
#else
TORRENT_UNUSED(&ip_change_notifier_impl::on_notify);
cb(make_error_code(boost::system::errc::not_supported));
#endif
}
void ip_change_notifier::cancel()
void ip_change_notifier_impl::cancel()
{
#if defined TORRENT_BUILD_SIMULATOR
#elif TORRENT_USE_NETLINK
@ -106,7 +152,7 @@ namespace libtorrent { namespace aux
#endif
}
void ip_change_notifier::on_notify(error_code const& ec
void ip_change_notifier_impl::on_notify(error_code const& ec
, std::size_t bytes_transferred
, std::function<void(error_code const&)> cb)
{
@ -125,8 +171,10 @@ namespace libtorrent { namespace aux
cb(ec);
}
} // anonymous namespace
std::unique_ptr<ip_change_notifier> create_ip_notifier(io_service& ios)
{
return std::unique_ptr<ip_change_notifier>(new ip_change_notifier(ios));
return std::unique_ptr<ip_change_notifier>(new ip_change_notifier_impl(ios));
}
}}