wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged python fix from RC_0_16

This commit is contained in:
Arvid Norberg 2012-10-13 02:08:34 +00:00
parent 6d7e9e4521
commit 7909479505
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@
* fix uTP edge case where udp socket buffer fills up * fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP * fix nagle implementation in uTP
* introduce a way to add built-in plugins from python
* consistently disconnect the same peer when two peers simultaneously connect * consistently disconnect the same peer when two peers simultaneously connect
* fix local endpoint queries for uTP connections * fix local endpoint queries for uTP connections
* small optimization to local peer discovery to ignore our own broadcasts * small optimization to local peer discovery to ignore our own broadcasts

27
bindings/python/src/session.cpp
View File

@ -12,6 +12,13 @@
#include <libtorrent/ip_filter.hpp> #include <libtorrent/ip_filter.hpp>
#include <libtorrent/disk_io_thread.hpp> #include <libtorrent/disk_io_thread.hpp>
#include <libtorrent/extensions.hpp> #include <libtorrent/extensions.hpp>
#include <libtorrent/extensions/lt_trackers.hpp>
#include <libtorrent/extensions/metadata_transfer.hpp>
#include <libtorrent/extensions/smart_ban.hpp>
#include <libtorrent/extensions/ut_metadata.hpp>
#include <libtorrent/extensions/ut_pex.hpp>
#include "gil.hpp" #include "gil.hpp"
using namespace boost::python; using namespace boost::python;
@ -43,8 +50,24 @@ namespace
} }
#endif #endif
void add_extension(session& s, object const& e)
{
if (!extract<std::string>(e).check()) return;
std::string name = extract<std::string>(e);
if (name == "ut_metadata")
s.add_extension(create_ut_metadata_plugin);
else if (name == "ut_pex")
s.add_extension(create_ut_pex_plugin);
else if (name == "smart_ban")
s.add_extension(create_smart_ban_plugin);
else if (name == "lt_trackers")
s.add_extension(create_lt_trackers_plugin);
else if (name == "metadata_transfer")
s.add_extension(create_metadata_plugin);
}
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
void add_extension(session& s, object const& e) {}
boost::shared_ptr<torrent_plugin> dummy_plugin_wrapper(torrent* t) { boost::shared_ptr<torrent_plugin> dummy_plugin_wrapper(torrent* t) {
return boost::shared_ptr<torrent_plugin>(); return boost::shared_ptr<torrent_plugin>();
@ -590,8 +613,8 @@ void bind_session()
.def("set_alert_mask", allow_threads(&session::set_alert_mask)) .def("set_alert_mask", allow_threads(&session::set_alert_mask))
.def("pop_alert", allow_threads(&session::pop_alert)) .def("pop_alert", allow_threads(&session::pop_alert))
.def("wait_for_alert", &wait_for_alert, return_internal_reference<>()) .def("wait_for_alert", &wait_for_alert, return_internal_reference<>())
#ifndef TORRENT_NO_DEPRECATE
.def("add_extension", &add_extension) .def("add_extension", &add_extension)
#ifndef TORRENT_NO_DEPRECATE
.def("set_peer_proxy", allow_threads(&session::set_peer_proxy)) .def("set_peer_proxy", allow_threads(&session::set_peer_proxy))
.def("set_tracker_proxy", allow_threads(&session::set_tracker_proxy)) .def("set_tracker_proxy", allow_threads(&session::set_tracker_proxy))
.def("set_web_seed_proxy", allow_threads(&session::set_web_seed_proxy)) .def("set_web_seed_proxy", allow_threads(&session::set_web_seed_proxy))