premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

moved some errors over to use error_code

This commit is contained in:
Arvid Norberg 2009-02-13 19:01:02 +00:00
parent 2a9605f9db
commit 3187bd9905
5 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/libtorrent/error_code.hpp
View File

@ -50,7 +50,17 @@ namespace libtorrent
{
no_error = 0,
file_collision,
failed_hash_check
failed_hash_check,
torrent_is_no_dict,
torrent_missing_info,
torrent_info_no_dict,
torrent_missing_piece_length,
torrent_missing_name,
torrent_invalid_name,
torrent_invalid_length,
torrent_file_parse_failed,
torrent_missing_pieces,
torrent_invalid_hashes,
};
}

4
include/libtorrent/torrent_info.hpp
View File

@ -271,7 +271,7 @@ namespace libtorrent
void add_node(std::pair<std::string, int> const& node)
{ m_nodes.push_back(node); }
bool parse_info_section(lazy_entry const& e, std::string& error);
bool parse_info_section(lazy_entry const& e, error_code& ex);
lazy_entry const* info(char const* key) const
{
@ -291,7 +291,7 @@ namespace libtorrent
private:
void copy_on_write();
bool parse_torrent_file(lazy_entry const& libtorrent, std::string& error);
bool parse_torrent_file(lazy_entry const& libtorrent, error_code& ec);
file_storage m_files;

12
src/error_code.cpp
View File

@ -49,7 +49,17 @@ namespace libtorrent
{
"no error",
"torrent file collides with file from another torrent",
"hash check failed"
"hash check failed",
"torrent file is not a dictionary",
"missing or invalid 'info' section in torrent file",
"'info' entry is not a dictionary",
"invalid or missing 'piece length' entry in torrent file",
"missing name in torrent file",
"invalid 'name' of torrent (possible exploit attempt)",
"invalid length of torrent",
"failed to parse files from torrent file",
"invalid or missing 'pieces' entry in torrent file",
"incorrect number of piece hashes in torrent file",
};
if (ev < 0 || ev >= sizeof(msgs)/sizeof(msgs[0]))
return "Unknown error";

6
src/torrent.cpp
View File

@ -3416,9 +3416,9 @@ namespace libtorrent
}
lazy_entry metadata;
std::string error = "parser error";
int ret = lazy_bdecode(metadata_buf, metadata_buf + metadata_size, metadata);
if (ret != 0 || !m_torrent_file->parse_info_section(metadata, error))
error_code ec;
if (ret != 0 || !m_torrent_file->parse_info_section(metadata, ec))
{
// this means the metadata is correct, since we
// verified it against the info-hash, but we
@ -3427,7 +3427,7 @@ namespace libtorrent
{
alerts().post_alert(metadata_failed_alert(get_handle()));
}
set_error("invalid metadata: " + error);
set_error("invalid metadata: " + ec.message());
pause();
return false;
}

66
src/torrent_info.cpp
View File

@ -292,12 +292,12 @@ namespace libtorrent
lazy_entry e;
lazy_bdecode(&tmp[0], &tmp[0] + tmp.size(), e);
std::string error;
error_code ec;
#ifndef BOOST_NO_EXCEPTIONS
if (!parse_torrent_file(e, error))
throw invalid_torrent_file(error);
if (!parse_torrent_file(e, ec))
throw invalid_torrent_file(ec.message());
#else
parse_torrent_file(e, error);
parse_torrent_file(e, ec);
#endif
}
#endif
@ -309,12 +309,12 @@ namespace libtorrent
, m_info_section_size(0)
, m_piece_hashes(0)
{
std::string error;
error_code ec;
#ifndef BOOST_NO_EXCEPTIONS
if (!parse_torrent_file(torrent_file, error))
throw invalid_torrent_file(error);
if (!parse_torrent_file(torrent_file, ec))
throw invalid_torrent_file(ec.message());
#else
parse_torrent_file(torrent_file, error);
parse_torrent_file(torrent_file, ec);
#endif
}
@ -325,14 +325,14 @@ namespace libtorrent
, m_info_section_size(0)
, m_piece_hashes(0)
{
std::string error;
error_code ec;
lazy_entry e;
lazy_bdecode(buffer, buffer + size, e);
#ifndef BOOST_NO_EXCEPTIONS
if (!parse_torrent_file(e, error))
throw invalid_torrent_file(error);
if (!parse_torrent_file(e, ec))
throw invalid_torrent_file(ec.message());
#else
parse_torrent_file(e, error);
parse_torrent_file(e, ec);
#endif
}
@ -367,12 +367,12 @@ namespace libtorrent
lazy_entry e;
lazy_bdecode(&buf[0], &buf[0] + buf.size(), e);
std::string error;
error_code ec;
#ifndef BOOST_NO_EXCEPTIONS
if (!parse_torrent_file(e, error))
throw invalid_torrent_file(error);
if (!parse_torrent_file(e, ec))
throw invalid_torrent_file(ec.message());
#else
parse_torrent_file(e, error);
parse_torrent_file(e, ec);
#endif
}
@ -396,12 +396,12 @@ namespace libtorrent
lazy_entry e;
lazy_bdecode(&buf[0], &buf[0] + buf.size(), e);
std::string error;
error_code ec;
#ifndef BOOST_NO_EXCEPTIONS
if (!parse_torrent_file(e, error))
throw invalid_torrent_file(error);
if (!parse_torrent_file(e, ec))
throw invalid_torrent_file(ec.message());
#else
parse_torrent_file(e, error);
parse_torrent_file(e, ec);
#endif
}
@ -434,11 +434,11 @@ namespace libtorrent
swap(m_info_dict, ti.m_info_dict);
}
bool torrent_info::parse_info_section(lazy_entry const& info, std::string& error)
bool torrent_info::parse_info_section(lazy_entry const& info, error_code& ec)
{
if (info.type() != lazy_entry::dict_t)
{
error = "'info' entry is not a dictionary";
ec = error_code(errors::torrent_info_no_dict, libtorrent_category);
return false;
}
@ -459,7 +459,7 @@ namespace libtorrent
int piece_length = info.dict_find_int_value("piece length", -1);
if (piece_length <= 0)
{
error = "invalid or missing 'piece length' entry in torrent file";
ec = error_code(errors::torrent_missing_piece_length, libtorrent_category);
return false;
}
m_files.set_piece_length(piece_length);
@ -469,7 +469,7 @@ namespace libtorrent
if (name.empty()) name = info.dict_find_string_value("name");
if (name.empty())
{
error = "missing name in torrent file";
ec = error_code(errors::torrent_missing_name, libtorrent_category);
return false;
}
@ -502,7 +502,7 @@ namespace libtorrent
}
if (name == ".." || name == ".")
{
error = "invalid 'name' of torrent (possible exploit attempt)";
ec = error_code(errors::torrent_invalid_name, libtorrent_category);
return false;
}
@ -524,7 +524,7 @@ namespace libtorrent
e.pad_file = true;
if (e.size < 0)
{
error = "invalid length of torrent";
ec = error_code(errors::torrent_invalid_length, libtorrent_category);
return false;
}
m_files.add_file(e);
@ -534,7 +534,7 @@ namespace libtorrent
{
if (!extract_files(*i, m_files, name))
{
error = "failed to parse files from torrent file";
ec = error_code(errors::torrent_file_parse_failed, libtorrent_category);
return false;
}
m_multifile = true;
@ -551,13 +551,13 @@ namespace libtorrent
lazy_entry const* pieces = info.dict_find("pieces");
if (pieces == 0 || pieces->type() != lazy_entry::string_t)
{
error = "invalid or missing 'pieces' entry in torrent file";
ec = error_code(errors::torrent_missing_pieces, libtorrent_category);
return false;
}
if (pieces->string_length() != m_files.num_pieces() * 20)
{
error = "incorrect number of piece hashes in torrent file";
ec = error_code(errors::torrent_invalid_hashes, libtorrent_category);
return false;
}
@ -569,11 +569,11 @@ namespace libtorrent
return true;
}
bool torrent_info::parse_torrent_file(lazy_entry const& torrent_file, std::string& error)
bool torrent_info::parse_torrent_file(lazy_entry const& torrent_file, error_code& ec)
{
if (torrent_file.type() != lazy_entry::dict_t)
{
error = "torrent file is not a dictionary";
ec = error_code(errors::torrent_is_no_dict, libtorrent_category);
return false;
}
@ -693,10 +693,10 @@ namespace libtorrent
lazy_entry const* info = torrent_file.dict_find_dict("info");
if (info == 0)
{
error = "missing or invalid 'info' section in torrent file";
ec = error_code(errors::torrent_missing_info, libtorrent_category);
return false;
}
return parse_info_section(*info, error);
return parse_info_section(*info, ec);
}
boost::optional<pt::ptime>