diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-03-07 14:24:21 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-03-07 14:24:21 +0000 |
| commit | 10b52bd9ac2ce48dfb45707a2cacdea20705d544 (patch) | |
| tree | 68a814db652ac211999bd736724f358290cae3a1 /src/DefaultBtAnnounce.cc | |
| parent | 4785b7190cbec0788e262ab0f9cd487cc66d6bf9 (diff) | |
2010-03-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
urlencode -> percentEncode,
torrentUrlencode -> torrentPercentEncode
* src/BtHandshakeMessage.cc
* src/BtHandshakeMessageValidator.h
* src/DHTMessageFactoryImpl.cc
* src/DefaultBtAnnounce.cc
* src/HandshakeExtensionMessage.cc
* src/HttpRequest.cc
* src/XmlRpcMethodImpl.cc
* src/bittorrent_helper.cc
* src/util.cc
* src/util.h
* test/DHTAnnouncePeerMessageTest.cc
* test/DHTGetPeersMessageTest.cc
* test/DHTGetPeersReplyMessageTest.cc
* test/UTPexExtensionMessageTest.cc
* test/UtilTest.cc
Diffstat (limited to 'src/DefaultBtAnnounce.cc')
| -rw-r--r-- | src/DefaultBtAnnounce.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/DefaultBtAnnounce.cc b/src/DefaultBtAnnounce.cc index e77550f1..cfecf3a2 100644 --- a/src/DefaultBtAnnounce.cc +++ b/src/DefaultBtAnnounce.cc @@ -144,10 +144,11 @@ std::string DefaultBtAnnounce::getAnnounceUrl() { std::string uri = announceList.getAnnounce(); uri += uriHasQuery(uri) ? "&" : "?"; uri += "info_hash="; - uri += util::torrentUrlencode(bittorrent::getInfoHash(_downloadContext), - INFO_HASH_LENGTH); + uri += util::torrentPercentEncode(bittorrent::getInfoHash(_downloadContext), + INFO_HASH_LENGTH); uri += "&peer_id="; - uri += util::torrentUrlencode(bittorrent::getStaticPeerId(), PEER_ID_LENGTH); + uri += util::torrentPercentEncode(bittorrent::getStaticPeerId(), + PEER_ID_LENGTH); uri += "&uploaded="; uri += util::uitos(stat.getSessionUploadLength()); uri += "&downloaded="; @@ -158,7 +159,7 @@ std::string DefaultBtAnnounce::getAnnounceUrl() { uri += "&key="; // Use last 8 bytes of peer ID as a key size_t keyLen = 8; - uri += util::torrentUrlencode + uri += util::torrentPercentEncode (bittorrent::getStaticPeerId()+PEER_ID_LENGTH-keyLen, keyLen); uri += "&numwant="; uri += util::uitos(numWant); @@ -173,7 +174,7 @@ std::string DefaultBtAnnounce::getAnnounceUrl() { uri += event; } if(!trackerId.empty()) { - uri += "&trackerid="+util::torrentUrlencode(trackerId); + uri += "&trackerid="+util::torrentPercentEncode(trackerId); } if(option->getAsBool(PREF_BT_REQUIRE_CRYPTO)) { uri += "&requirecrypto=1"; |