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

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

In Magnet URI with tr parameter, put each announce URI in separate
	tier.
	* src/bittorrent_helper.cc
	* test/BittorrentHelperTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-11-28 12:39:08 +00:00
parent 6939be2765
commit 5f082a9ff4
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
In Magnet URI with tr parameter, put each announce URI in separate
tier.
* src/bittorrent_helper.cc
* test/BittorrentHelperTest.cc
2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-11-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed ExtensionMessage::getBencodedData() as Renamed ExtensionMessage::getBencodedData() as

8
src/bittorrent_helper.cc
View File

@ -881,7 +881,13 @@ BDE parseMagnet(const std::string& magnet)
} }
BDE announceList = BDE::list(); BDE announceList = BDE::list();
if(r.containsKey("tr")) { if(r.containsKey("tr")) {
announceList << r["tr"]; const BDE& uris = r["tr"];
for(BDE::List::const_iterator i = uris.listBegin(); i != uris.listEnd();
++i) {
BDE tier = BDE::list();
tier << *i;
announceList << tier;
}
} }
std::string name = "[METADATA]"; std::string name = "[METADATA]";
if(r.containsKey("dn") && r["dn"].size()) { if(r.containsKey("dn") && r["dn"].size()) {

3
test/BittorrentHelperTest.cc
View File

@ -712,10 +712,11 @@ void BittorrentHelperTest::testParseMagnet()
util::toHex(attrs[bittorrent::INFO_HASH].s())); util::toHex(attrs[bittorrent::INFO_HASH].s()));
CPPUNIT_ASSERT_EQUAL(std::string("[METADATA]aria2"), CPPUNIT_ASSERT_EQUAL(std::string("[METADATA]aria2"),
attrs[bittorrent::NAME].s()); attrs[bittorrent::NAME].s());
CPPUNIT_ASSERT_EQUAL((size_t)2, attrs[bittorrent::ANNOUNCE_LIST].size());
CPPUNIT_ASSERT_EQUAL(std::string("http://tracker1"), CPPUNIT_ASSERT_EQUAL(std::string("http://tracker1"),
attrs[bittorrent::ANNOUNCE_LIST][0][0].s()); attrs[bittorrent::ANNOUNCE_LIST][0][0].s());
CPPUNIT_ASSERT_EQUAL(std::string("http://tracker2"), CPPUNIT_ASSERT_EQUAL(std::string("http://tracker2"),
attrs[bittorrent::ANNOUNCE_LIST][0][1].s()); attrs[bittorrent::ANNOUNCE_LIST][1][0].s());
magnet = "magnet:?xt=urn:btih:248d0a1cd08284299de78d5c1ed359bb46717d8c"; magnet = "magnet:?xt=urn:btih:248d0a1cd08284299de78d5c1ed359bb46717d8c";
attrs = bittorrent::parseMagnet(magnet); attrs = bittorrent::parseMagnet(magnet);