From 2053104e24d7c369d118349ca707226d8b0b38dd Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 30 Apr 2007 17:27:21 +0000 Subject: [PATCH] added proxy_settings and removed fields from session_settings to make the python bindings more up to date --- bindings/python/src/session.cpp | 8 +++++++- bindings/python/src/session_settings.cpp | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp index f801452de..e6050d1bb 100755 --- a/bindings/python/src/session.cpp +++ b/bindings/python/src/session.cpp @@ -72,7 +72,7 @@ namespace void add_extension(session& s, object const& e) { -// allow_threading_guard guard; + allow_threading_guard guard; s.add_extension(invoke_extension_factory(e)); } @@ -199,6 +199,12 @@ void bind_session() ) .def("pop_alert", allow_threads(&session::pop_alert), session_pop_alert_doc) .def("add_extension", &add_extension) + .def("set_peer_proxy", allow_threads(&session::set_peer_proxy)) + .def("set_tracker_proxy", allow_threads(&session::set_tracker_proxy)) + .def("set_web_seed_proxy", allow_threads(&session::set_web_seed_proxy)) +#ifndef TORRENT_DISABLE_DHT + .def("set_dht_proxy", allow_threads(&session::set_dht_proxy)) +#endif ; def("supports_sparse_files", &supports_sparse_files); diff --git a/bindings/python/src/session_settings.cpp b/bindings/python/src/session_settings.cpp index 69dd62785..4d7026676 100755 --- a/bindings/python/src/session_settings.cpp +++ b/bindings/python/src/session_settings.cpp @@ -11,10 +11,6 @@ using namespace libtorrent; void bind_session_settings() { class_("session_settings") - .def_readwrite("proxy_ip", &session_settings::proxy_ip) - .def_readwrite("proxy_port", &session_settings::proxy_port) - .def_readwrite("proxy_login", &session_settings::proxy_login) - .def_readwrite("proxy_password", &session_settings::proxy_password) .def_readwrite("user_agent", &session_settings::user_agent) .def_readwrite("tracker_completion_timeout", &session_settings::tracker_completion_timeout) .def_readwrite("tracker_receive_timeout", &session_settings::tracker_receive_timeout) @@ -28,5 +24,19 @@ void bind_session_settings() .def_readwrite("urlseed_timeout", &session_settings::urlseed_timeout) .def_readwrite("urlseed_pipeline_size", &session_settings::urlseed_pipeline_size) ; + + scope ps = class_("proxy_settings") + .def_readwrite("hostname", &proxy_settings::hostname) + .def_readwrite("port", &proxy_settings::port) + .def_readwrite("password", &proxy_settings::password) + .def_readwrite("username", &proxy_settings::username) + .def_readwrite("type", &proxy_settings::type) + ; + + ps.attr("none") = (int)proxy_settings::none; + ps.attr("socks5") = (int)proxy_settings::socks5; + ps.attr("socks5_pw") = (int)proxy_settings::socks5_pw; + ps.attr("http") = (int)proxy_settings::http; + ps.attr("http_pw") = (int)proxy_settings::http_pw; }