forked from premiere/premiere-libtorrent
Merge pull request #353 from aldenml/save-max_peers
Store dht_settings::max_peers in session state
This commit is contained in:
commit
6965888fa8
|
@ -206,7 +206,7 @@ namespace libtorrent
|
||||||
|
|
||||||
// if this is set, we'll be calculating the hash
|
// if this is set, we'll be calculating the hash
|
||||||
// for this piece. This member stores the interim
|
// for this piece. This member stores the interim
|
||||||
// state while we're calulcating the hash.
|
// state while we're calculating the hash.
|
||||||
partial_hash* hash;
|
partial_hash* hash;
|
||||||
|
|
||||||
// set to a unique identifier of a peer that last
|
// set to a unique identifier of a peer that last
|
||||||
|
|
|
@ -358,7 +358,7 @@ private:
|
||||||
|
|
||||||
#if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS)
|
#if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS)
|
||||||
// this is set to true after the encryption method has been
|
// this is set to true after the encryption method has been
|
||||||
// succesfully negotiated (either plaintext or rc4), to signal
|
// successfully negotiated (either plaintext or rc4), to signal
|
||||||
// automatic encryption/decryption.
|
// automatic encryption/decryption.
|
||||||
bool m_encrypted:1;
|
bool m_encrypted:1;
|
||||||
|
|
||||||
|
@ -377,7 +377,7 @@ private:
|
||||||
// where in the send buffer actual payload
|
// where in the send buffer actual payload
|
||||||
// data is located. This is currently
|
// data is located. This is currently
|
||||||
// only used to be able to gather statistics
|
// only used to be able to gather statistics
|
||||||
// seperately on payload and protocol data.
|
// separately on payload and protocol data.
|
||||||
struct range
|
struct range
|
||||||
{
|
{
|
||||||
range(int s, int l)
|
range(int s, int l)
|
||||||
|
|
|
@ -44,7 +44,7 @@ namespace libtorrent
|
||||||
// sort. Only the unchoke slots first elements are sorted.
|
// sort. Only the unchoke slots first elements are sorted.
|
||||||
// the return value are the number of peers that should be unchoked. This
|
// the return value are the number of peers that should be unchoked. This
|
||||||
// is also the number of elements that are valid at the beginning of the
|
// is also the number of elements that are valid at the beginning of the
|
||||||
// peer list. Peers bayond this initial range are not sorted.
|
// peer list. Peers beyond this initial range are not sorted.
|
||||||
TORRENT_EXTRA_EXPORT int unchoke_sort(std::vector<peer_connection*>& peers
|
TORRENT_EXTRA_EXPORT int unchoke_sort(std::vector<peer_connection*>& peers
|
||||||
, int max_upload_rate, time_duration unchoke_interval
|
, int max_upload_rate, time_duration unchoke_interval
|
||||||
, aux::session_settings const& sett);
|
, aux::session_settings const& sett);
|
||||||
|
|
|
@ -255,7 +255,7 @@ namespace libtorrent
|
||||||
// this generally improves disk performance.
|
// this generally improves disk performance.
|
||||||
no_atime = 0x8,
|
no_atime = 0x8,
|
||||||
|
|
||||||
// open the file for random acces. This disables read-ahead
|
// open the file for random access. This disables read-ahead
|
||||||
// logic
|
// logic
|
||||||
random_access = 0x10,
|
random_access = 0x10,
|
||||||
|
|
||||||
|
|
|
@ -690,6 +690,7 @@ namespace aux {
|
||||||
dht_sett["max_fail_count"] = m_dht_settings.max_fail_count;
|
dht_sett["max_fail_count"] = m_dht_settings.max_fail_count;
|
||||||
dht_sett["max_torrents"] = m_dht_settings.max_torrents;
|
dht_sett["max_torrents"] = m_dht_settings.max_torrents;
|
||||||
dht_sett["max_dht_items"] = m_dht_settings.max_dht_items;
|
dht_sett["max_dht_items"] = m_dht_settings.max_dht_items;
|
||||||
|
dht_sett["max_peers"] = m_dht_settings.max_peers;
|
||||||
dht_sett["max_torrent_search_reply"] = m_dht_settings.max_torrent_search_reply;
|
dht_sett["max_torrent_search_reply"] = m_dht_settings.max_torrent_search_reply;
|
||||||
dht_sett["restrict_routing_ips"] = m_dht_settings.restrict_routing_ips;
|
dht_sett["restrict_routing_ips"] = m_dht_settings.restrict_routing_ips;
|
||||||
dht_sett["restrict_search_ips"] = m_dht_settings.restrict_search_ips;
|
dht_sett["restrict_search_ips"] = m_dht_settings.restrict_search_ips;
|
||||||
|
@ -763,6 +764,8 @@ namespace aux {
|
||||||
if (val) m_dht_settings.max_torrents = val.int_value();
|
if (val) m_dht_settings.max_torrents = val.int_value();
|
||||||
val = settings.dict_find_int("max_dht_items");
|
val = settings.dict_find_int("max_dht_items");
|
||||||
if (val) m_dht_settings.max_dht_items = val.int_value();
|
if (val) m_dht_settings.max_dht_items = val.int_value();
|
||||||
|
val = settings.dict_find_int("max_peers");
|
||||||
|
if (val) m_dht_settings.max_peers = val.int_value();
|
||||||
val = settings.dict_find_int("max_torrent_search_reply");
|
val = settings.dict_find_int("max_torrent_search_reply");
|
||||||
if (val) m_dht_settings.max_torrent_search_reply = val.int_value();
|
if (val) m_dht_settings.max_torrent_search_reply = val.int_value();
|
||||||
val = settings.dict_find_int("restrict_routing_ips");
|
val = settings.dict_find_int("restrict_routing_ips");
|
||||||
|
|
Loading…
Reference in New Issue