From 3c474354260d73bbb2fd17def160c923aca6963c Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Thu, 30 Jan 2014 07:58:25 +0000 Subject: [PATCH] merged python binding fix from RC_0_16 --- ChangeLog | 2 ++ bindings/python/src/alert.cpp | 7 ++++++- docs/tuning.rst | 3 +-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c968ad60c..207b05e42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,8 @@ * fix uTP edge case where udp socket buffer fills up * fix nagle implementation in uTP + * fix python binding for external_ip_alert + 0.16.14 release * make lt_tex more robust against bugs and malicious behavior diff --git a/bindings/python/src/alert.cpp b/bindings/python/src/alert.cpp index 23bed941a..70b217c18 100644 --- a/bindings/python/src/alert.cpp +++ b/bindings/python/src/alert.cpp @@ -43,6 +43,11 @@ tuple incoming_connection_alert_ip(incoming_connection_alert const& ica) return endpoint_to_tuple(ica.ip); } +std::string external_ip_alert_ip(external_ip_alert const& eia) +{ + return eia.external_address.to_string(); +} + list stats_alert_transferred(stats_alert const& alert) { list result; @@ -351,7 +356,7 @@ void bind_alert() class_, noncopyable>( "external_ip_alert", no_init) - .def_readonly("external_address", &external_ip_alert::external_address) + .add_property("external_address", &external_ip_alert_ip) ; class_, noncopyable>( diff --git a/docs/tuning.rst b/docs/tuning.rst index cbb2bf594..de648d5ea 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -314,8 +314,7 @@ enough to not draining the socket's send buffer before the disk operation comple The watermark is bound to a max value, to avoid buffer sizes growing out of control. The default max send buffer size might not be enough to sustain very high upload rates, and you might have to increase it. It's specified in bytes in -``session_settings::send_buffer_watermark``. The ``high_performance_seed()`` preset -sets this value to 5 MB. +``session_settings::send_buffer_watermark``. peers -----