mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2026-10-22 19:41:41 +00:00
check if piece length is within 16K-64M. Return error through RPC
This commit is contained in:
1 parent
c786d3ab84
commit
4b5bea5ee4
3 files changed
+17
-3
No files matched your search
@@ -490,7 +490,15 @@ namespace torrents
|
||||
else if (key == "piece length")
|
||||
{
|
||||
auto [value, l] = ExtractInteger (buf);
|
||||
if (l) m_PieceLength = value;
|
||||
if (l)
|
||||
{
|
||||
if ((size_t)value < MIN_PIECE_LENGTH || (size_t)value > MAX_PIECE_LENGTH)
|
||||
{
|
||||
LogPrint (eLogError, "Torrents: invalid piece length ", value);
|
||||
value = 0;
|
||||
}
|
||||
m_PieceLength = value;
|
||||
}
|
||||
return l;
|
||||
}
|
||||
else if (key == "pieces")
|
||||
@@ -501,6 +509,8 @@ namespace torrents
|
||||
}
|
||||
if (m_PieceLength > 0 && m_Length > 0)
|
||||
m_Pieces.reserve (m_Length/m_PieceLength + 1);
|
||||
else
|
||||
m_Error = "Malformed metaInfo";
|
||||
return ParsePieces (buf);
|
||||
}
|
||||
else if (key == "files")
|
||||
|
||||
@@ -36,6 +36,8 @@ namespace i2p
|
||||
namespace torrents
|
||||
{
|
||||
constexpr size_t REQUEST_BLOCK_SIZE = 16384;
|
||||
constexpr size_t MIN_PIECE_LENGTH = 16*1024; // 16K
|
||||
constexpr size_t MAX_PIECE_LENGTH = 64*1024*1024; // 64M
|
||||
constexpr uint16_t TORRENT_PORT = 6881; // not used by required by protocol
|
||||
constexpr int MIN_TRACKER_REQUESTS_INTERVAL = 15000; // in milliseconds
|
||||
constexpr size_t PEER_CONNECTION_RECEIVE_BUFFER_SIZE = 65535;
|
||||
@@ -219,6 +221,7 @@ namespace torrents
|
||||
std::string_view GetName () const { return m_Name; }
|
||||
void SetName (std::string_view name) { m_Name = AdjustName (name); }
|
||||
bool IsValid () const { return !m_Name.empty () && m_PieceLength && (m_Length || !m_Files.empty ()); }
|
||||
std::string_view GetError () const { return m_Error; }
|
||||
const std::filesystem::path& GetFullPath () const { return m_FullPath; }
|
||||
void SetFullPath (const std::filesystem::path& fullPath) { m_FullPath = fullPath; }
|
||||
const std::list<std::shared_ptr<TorrentFile> >& GetFiles () const { return m_Files; }
|
||||
@@ -285,7 +288,7 @@ namespace torrents
|
||||
|
||||
private:
|
||||
|
||||
std::string m_Name, m_Announce;
|
||||
std::string m_Name, m_Announce, m_Error;
|
||||
std::filesystem::path m_FullPath;
|
||||
size_t m_Length, m_PieceLength;
|
||||
std::vector<uint8_t> m_Info; // for BEP9
|
||||
|
||||
@@ -355,7 +355,8 @@ namespace torrents
|
||||
return priorities;
|
||||
}
|
||||
},
|
||||
{ "error", [](std::shared_ptr<Torrent> torrent) { return boost::json::value(0); } }, // no error
|
||||
{ "error", [](std::shared_ptr<Torrent> torrent) { return boost::json::value(torrent->GetError ().empty () ? 0 : 3); } }, // no error or local error
|
||||
{ "errorString", [](std::shared_ptr<Torrent> torrent) { return boost::json::value(torrent->GetError ()); } },
|
||||
{ "eta", [](std::shared_ptr<Torrent> torrent)
|
||||
{
|
||||
auto downloadRate = torrent->GetDownloadRate ();
|
||||
|
||||
Reference in new issue
Block a user