*** empty log message ***

This commit is contained in:
Arvid Norberg 2004-10-03 11:39:34 +00:00
parent d9f0ce12a3
commit de2f1f8cfb
4 changed files with 25 additions and 30 deletions

View File

@ -88,7 +88,7 @@ namespace libtorrent
unsigned char& operator[](int i)
{ assert(i >= 0 && i < number_size); return m_number[i]; }
unsigned char operator[](int i) const
unsigned char const& operator[](int i) const
{ assert(i >= 0 && i < number_size); return m_number[i]; }
typedef const unsigned char* const_iterator;

View File

@ -328,19 +328,6 @@ namespace libtorrent
line >> m_code;
std::getline(line, m_server_message);
m_state = read_header;
if (m_code != 200
&& m_code != 301
&& m_code != 302
&& m_code != 303
&& m_code != 307)
{
std::string error_msg = boost::lexical_cast<std::string>(m_code)
+ " " + m_server_message;
if (has_requester()) requester().tracker_request_error(
m_code, error_msg.c_str());
return true;
}
}
if (m_state == read_header)
@ -559,7 +546,10 @@ namespace libtorrent
try
{
const entry& failure = e["failure reason"];
throw std::runtime_error(failure.string().c_str());
if (has_requester()) requester().tracker_request_error(
m_code, failure.string().c_str());
return;
}
catch (const type_error&) {}

View File

@ -157,6 +157,7 @@ namespace
, map_entry("AZ", "Azureus")
, map_entry("BB", "BitBuddy")
, map_entry("BX", "BittorrentX")
, map_entry("CT", "CTorrent")
, map_entry("LT", "libtorrent")
, map_entry("M", "Mainline")
, map_entry("MT", "Moonlight Torrent")

View File

@ -312,7 +312,10 @@ namespace libtorrent { namespace detail
#endif
if (m_listen_port_range.first != 0 && m_listen_port_range.second != 0)
{
boost::mutex::scoped_lock l(m_mutex);
open_listen_port();
}
std::vector<boost::shared_ptr<socket> > readable_clients;
std::vector<boost::shared_ptr<socket> > writable_clients;
@ -1087,24 +1090,25 @@ namespace libtorrent
// the peers
entry::list_type& peer_list = rd["peers"].list();
std::vector<address> tmp_peers;
tmp_peers.reserve(peer_list.size());
for (entry::list_type::iterator i = peer_list.begin();
i != peer_list.end();
++i)
if (rd.find_key("peers"))
{
address a(
(*i)["ip"].string().c_str()
, (unsigned short)(*i)["port"].integer());
tmp_peers.push_back(a);
entry::list_type& peer_list = rd["peers"].list();
std::vector<address> tmp_peers;
tmp_peers.reserve(peer_list.size());
for (entry::list_type::iterator i = peer_list.begin();
i != peer_list.end();
++i)
{
address a(
(*i)["ip"].string().c_str()
, (unsigned short)(*i)["port"].integer());
tmp_peers.push_back(a);
}
peers.swap(tmp_peers);
}
peers.swap(tmp_peers);
// read piece map
const entry::list_type& slots = rd["slots"].list();
if ((int)slots.size() > info.num_pieces())