github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-11-29 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Adjusted the number of peer info which get_peers reply message can
	carry.
	* src/DHTGetPeersReplyMessage.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-11-29 10:17:03 +00:00
parent cccbeffce6
commit 8f00669d7b
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-29 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Adjusted the number of peer info which get_peers reply message can
carry.
* src/DHTGetPeersReplyMessage.cc
2009-11-29 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-11-29 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added extension_message_test_helper.h to aria2c_SOURCES. Added extension_message_test_helper.h to aria2c_SOURCES.

24
src/DHTGetPeersReplyMessage.cc
View File

@ -92,18 +92,26 @@ BDE DHTGetPeersReplyMessage::getResponse()
} }
rDict[NODES] = BDE(buffer, offset); rDict[NODES] = BDE(buffer, offset);
} else { } else {
// Limit the size of values list. The maxmum payload size of UDP // Limit the size of values list. The maxmum size of UDP datagram
// packet is limited to 65507bytes. aria2 uses 20bytes token and // is limited to 65535 bytes. aria2 uses 20bytes token and 2byte
// 2byte transaction ID. The size of get_peers reply message // transaction ID. The size of get_peers reply message without
// without values list is 87bytes: // values list is 87bytes:
// //
// d1:rd2:id20:aaaaaaaaaaaaaaaaaaaa5:token20:aaaaaaaaaaaaaaaaaaaa // d1:rd2:id20:aaaaaaaaaaaaaaaaaaaa5:token20:aaaaaaaaaaaaaaaaaaaa
// 6:valueslee1:t2:bb1:y1:re // 6:valueslee1:t2:bb1:y1:re
// //
// With this configuration, We can send (65507-87)/8 = 8177 // Because of Path MTU Discovery, UDP packet size which need not
// values. Since the size of token and transaction ID may vary in // to be fragmented is much smaller. Since Linux uses Path MTU
// implementations, we use 8100. // Dicoverry by default and returning ICMP message might be
static const size_t MAX_VALUES_SIZE = 8100; // filtered, we should avoid fragmentation. MTU of pppoe is 1492
// max according to RFC2516. We use maximum packet size to be
// 1000. Since it contains 20 bytes IP header and 8 bytes UDP
// header and 87 bytes reply message template described above, We
// can carry (1000-28-87)/8 = 110 peer info. Since DHT spec
// doesn't specify the maximum size of token, reply message
// template may get bigger than 87 bytes. So we use 100 as maximum
// number of peer info that a message can carry.
static const size_t MAX_VALUES_SIZE = 100;
BDE valuesList = BDE::list(); BDE valuesList = BDE::list();
for(std::deque<SharedHandle<Peer> >::const_iterator i = _values.begin(); for(std::deque<SharedHandle<Peer> >::const_iterator i = _values.begin();
i != _values.end() && valuesList.size() < MAX_VALUES_SIZE; ++i) { i != _values.end() && valuesList.size() < MAX_VALUES_SIZE; ++i) {