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

fixed test_ip_filter and test_piece_picker to reflect recent api changes. Fixed an Obj.C naming issue. Removed files from include/Makefile.am that was removed from asio.

This commit is contained in:
Arvid Norberg 2006-09-11 23:34:07 +00:00
parent dc2e25141c
commit f92b6cd90c
9 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/bitrocket_thumb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
docs/im_thumb.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

12
docs/projects.html
View File

@ -50,6 +50,18 @@ and Johan Ström.</p>
<td><div class="image first last"><img alt="btg_thumb.jpg" class="first last" src="btg_thumb.jpg" /></div> <td><div class="image first last"><img alt="btg_thumb.jpg" class="first last" src="btg_thumb.jpg" /></div>
</td> </td>
</tr> </tr>
<tr><td><p class="first"><strong>BitRocket</strong></p>
<p class="last"><a class="reference" href="http://www.bitrocket.org/">BitRocket</a> is a MacOS X bittorrent client.</p>
</td>
<td><div class="image first last"><img alt="bitrocket_thumb.png" class="first last" src="bitrocket_thumb.png" /></div>
</td>
</tr>
<tr><td><p class="first"><strong>Instant Media</strong></p>
<p class="last"><a class="reference" href="http://www.im.com/">IM</a> is a client for downloading Internet TV.</p>
</td>
<td><div class="image first last"><img alt="im_thumb.jpg" class="first last" src="im_thumb.jpg" /></div>
</td>
</tr>
<tr><td><p class="first"><strong>MooPolice</strong></p> <tr><td><p class="first"><strong>MooPolice</strong></p>
<p class="last"><a class="reference" href="http://www.moopolice.de">MooPolice</a> is a windows bittorrent <p class="last"><a class="reference" href="http://www.moopolice.de">MooPolice</a> is a windows bittorrent
client with a quite unique look.</p> client with a quite unique look.</p>

10
docs/projects.rst
View File

@ -33,6 +33,14 @@ project listed here, let me_ know.
| Written by Michael Wojciechowski | | | Written by Michael Wojciechowski | |
| and Johan Stršm. | | | and Johan Stršm. | |
+-------------------------------------------------------------------------------+-------------------------------------+ +-------------------------------------------------------------------------------+-------------------------------------+
| **BitRocket** | .. image:: bitrocket_thumb.png |
| | |
| BitRocket_ is a MacOS X bittorrent client. | |
+-------------------------------------------------------------------------------+-------------------------------------+
| **Instant Media** | .. image:: im_thumb.jpg |
| | |
| IM_ is a client for downloading Internet TV. | |
+-------------------------------------------------------------------------------+-------------------------------------+
| **MooPolice** | .. image:: moopolice_thumb.gif | | **MooPolice** | .. image:: moopolice_thumb.gif |
| | | | | |
| MooPolice_ is a windows bittorrent | | | MooPolice_ is a windows bittorrent | |
@ -92,6 +100,8 @@ project listed here, let me_ know.
.. _`electric sheep`: http://electricsheep.org .. _`electric sheep`: http://electricsheep.org
.. _qBittorrent: http://www.qbittorrent.org/ .. _qBittorrent: http://www.qbittorrent.org/
.. _btg: http://developer.berlios.de/projects/btg/ .. _btg: http://developer.berlios.de/projects/btg/
.. _BitRocket: http://www.bitrocket.org/
.. _IM: http://www.im.com/
.. _MooPolice: http://www.moopolice.de .. _MooPolice: http://www.moopolice.de
.. _BitsCast: http://www.bitscast.com/software/ .. _BitsCast: http://www.bitscast.com/software/
.. _Jamplayer: http://www.jamendo.com/en/static/jamendotools_jamplayer/ .. _Jamplayer: http://www.jamendo.com/en/static/jamendotools_jamplayer/

5
include/Makefile.am
View File

@ -62,8 +62,6 @@ libtorrent/asio/basic_resolver.hpp \
libtorrent/asio/basic_socket.hpp \ libtorrent/asio/basic_socket.hpp \
libtorrent/asio/basic_socket_acceptor.hpp \ libtorrent/asio/basic_socket_acceptor.hpp \
libtorrent/asio/basic_socket_iostream.hpp \ libtorrent/asio/basic_socket_iostream.hpp \
libtorrent/asio/basic_socketbuf.hpp \
libtorrent/asio/basic_strand.hpp \
libtorrent/asio/basic_stream_socket.hpp \ libtorrent/asio/basic_stream_socket.hpp \
libtorrent/asio/basic_streambuf.hpp \ libtorrent/asio/basic_streambuf.hpp \
libtorrent/asio/buffer.hpp \ libtorrent/asio/buffer.hpp \
@ -89,7 +87,6 @@ libtorrent/asio/detail/epoll_reactor_fwd.hpp \
libtorrent/asio/detail/event.hpp \ libtorrent/asio/detail/event.hpp \
libtorrent/asio/detail/fd_set_adapter.hpp \ libtorrent/asio/detail/fd_set_adapter.hpp \
libtorrent/asio/detail/handler_alloc_helpers.hpp \ libtorrent/asio/detail/handler_alloc_helpers.hpp \
libtorrent/asio/detail/handler_dispatch_helpers.hpp \
libtorrent/asio/detail/hash_map.hpp \ libtorrent/asio/detail/hash_map.hpp \
libtorrent/asio/detail/io_control.hpp \ libtorrent/asio/detail/io_control.hpp \
libtorrent/asio/detail/kqueue_reactor.hpp \ libtorrent/asio/detail/kqueue_reactor.hpp \
@ -147,7 +144,6 @@ libtorrent/asio/detail/wrapped_handler.hpp \
libtorrent/asio/error.hpp \ libtorrent/asio/error.hpp \
libtorrent/asio/error_handler.hpp \ libtorrent/asio/error_handler.hpp \
libtorrent/asio/handler_alloc_hook.hpp \ libtorrent/asio/handler_alloc_hook.hpp \
libtorrent/asio/handler_dispatch_hook.hpp \
libtorrent/asio/impl/io_service.ipp \ libtorrent/asio/impl/io_service.ipp \
libtorrent/asio/impl/read.ipp \ libtorrent/asio/impl/read.ipp \
libtorrent/asio/impl/read_until.ipp \ libtorrent/asio/impl/read_until.ipp \
@ -188,7 +184,6 @@ libtorrent/asio/ssl/stream_base.hpp \
libtorrent/asio/ssl/stream_service.hpp \ libtorrent/asio/ssl/stream_service.hpp \
libtorrent/asio/ssl.hpp \ libtorrent/asio/ssl.hpp \
libtorrent/asio/strand.hpp \ libtorrent/asio/strand.hpp \
libtorrent/asio/strand_service.hpp \
libtorrent/asio/stream_socket_service.hpp \ libtorrent/asio/stream_socket_service.hpp \
libtorrent/asio/streambuf.hpp \ libtorrent/asio/streambuf.hpp \
libtorrent/asio/system_exception.hpp \ libtorrent/asio/system_exception.hpp \

2
include/libtorrent/kademlia/dht_tracker.hpp
View File

@ -68,7 +68,7 @@ namespace libtorrent { namespace dht
void add_node(udp::endpoint node); void add_node(udp::endpoint node);
void add_node(std::pair<std::string, int> const& node); void add_node(std::pair<std::string, int> const& node);
void rebind(asio::ip::address interface, int listen_port); void rebind(asio::ip::address listen_interface, int listen_port);
entry state() const; entry state() const;

9
src/bt_peer_connection.cpp
View File

@ -1354,10 +1354,6 @@ namespace libtorrent
// reply with our handshake // reply with our handshake
write_handshake(); write_handshake();
write_bitfield(t->pieces()); write_bitfield(t->pieces());
#ifndef TORRENT_DISABLE_DHT
if (m_supports_dht_port && m_ses.m_dht)
write_dht_port(m_ses.m_dht_settings.service_port);
#endif
} }
else else
{ {
@ -1372,6 +1368,11 @@ namespace libtorrent
} }
} }
#ifndef TORRENT_DISABLE_DHT
if (m_supports_dht_port && m_ses.m_dht)
write_dht_port(m_ses.m_dht_settings.service_port);
#endif
m_state = read_peer_id; m_state = read_peer_id;
reset_recv_buffer(20); reset_recv_buffer(20);
#ifdef TORRENT_VERBOSE_LOGGING #ifdef TORRENT_VERBOSE_LOGGING

58
test/test_ip_filter.cpp
View File

@ -19,8 +19,8 @@ void test_rules_invariant(std::vector<ip_filter::ip_range> const& r, ip_filter c
TEST_CHECK(!r.empty()); TEST_CHECK(!r.empty());
if (r.empty()) return; if (r.empty()) return;
TEST_CHECK(r.front().first == address::from_string("0.0.0.0")); TEST_CHECK(r.front().first == address_v4::from_string("0.0.0.0"));
TEST_CHECK(r.back().last == address::from_string("255.255.255.255")); TEST_CHECK(r.back().last == address_v4::from_string("255.255.255.255"));
iterator i = r.begin(); iterator i = r.begin();
iterator j = boost::next(i); iterator j = boost::next(i);
@ -41,15 +41,15 @@ int test_main()
// **** test joining of ranges at the end **** // **** test joining of ranges at the end ****
ip_filter::ip_range expected1[] = ip_filter::ip_range expected1[] =
{ {
{address::from_string("0.0.0.0"), address::from_string("0.255.255.255"), 0} {address_v4::from_string("0.0.0.0"), address_v4::from_string("0.255.255.255"), 0}
, {address::from_string("1.0.0.0"), address::from_string("3.0.0.0"), ip_filter::blocked} , {address_v4::from_string("1.0.0.0"), address_v4::from_string("3.0.0.0"), ip_filter::blocked}
, {address::from_string("3.0.0.1"), address::from_string("255.255.255.255"), 0} , {address_v4::from_string("3.0.0.1"), address_v4::from_string("255.255.255.255"), 0}
}; };
{ {
ip_filter f; ip_filter f;
f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("1.0.0.0"), address_v4::from_string("2.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("2.0.0.1"), address_v4::from_string("3.0.0.0"), ip_filter::blocked);
range = f.export_filter(); range = f.export_filter();
test_rules_invariant(range, f); test_rules_invariant(range, f);
@ -62,8 +62,8 @@ int test_main()
{ {
ip_filter f; ip_filter f;
f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("2.0.0.1"), address_v4::from_string("3.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("1.0.0.0"), address_v4::from_string("2.0.0.0"), ip_filter::blocked);
range = f.export_filter(); range = f.export_filter();
test_rules_invariant(range, f); test_rules_invariant(range, f);
@ -77,8 +77,8 @@ int test_main()
{ {
ip_filter f; ip_filter f;
f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("2.0.0.1"), address_v4::from_string("3.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.4.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("1.0.0.0"), address_v4::from_string("2.4.0.0"), ip_filter::blocked);
range = f.export_filter(); range = f.export_filter();
test_rules_invariant(range, f); test_rules_invariant(range, f);
@ -92,8 +92,8 @@ int test_main()
{ {
ip_filter f; ip_filter f;
f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.4.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("1.0.0.0"), address_v4::from_string("2.4.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("2.0.0.1"), address::from_string("3.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("2.0.0.1"), address_v4::from_string("3.0.0.0"), ip_filter::blocked);
range = f.export_filter(); range = f.export_filter();
test_rules_invariant(range, f); test_rules_invariant(range, f);
@ -107,12 +107,12 @@ int test_main()
{ {
ip_filter f; ip_filter f;
f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("1.0.0.0"), address_v4::from_string("2.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("3.0.0.0"), address::from_string("4.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("3.0.0.0"), address_v4::from_string("4.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("5.0.0.0"), address::from_string("6.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("5.0.0.0"), address_v4::from_string("6.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("7.0.0.0"), address::from_string("8.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("7.0.0.0"), address_v4::from_string("8.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("1.0.1.0"), address::from_string("9.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("1.0.1.0"), address_v4::from_string("9.0.0.0"), ip_filter::blocked);
range = f.export_filter(); range = f.export_filter();
test_rules_invariant(range, f); test_rules_invariant(range, f);
@ -120,9 +120,9 @@ int test_main()
TEST_CHECK(range.size() == 3); TEST_CHECK(range.size() == 3);
ip_filter::ip_range expected[] = ip_filter::ip_range expected[] =
{ {
{address::from_string("0.0.0.0"), address::from_string("0.255.255.255"), 0} {address_v4::from_string("0.0.0.0"), address_v4::from_string("0.255.255.255"), 0}
, {address::from_string("1.0.0.0"), address::from_string("9.0.0.0"), ip_filter::blocked} , {address_v4::from_string("1.0.0.0"), address_v4::from_string("9.0.0.0"), ip_filter::blocked}
, {address::from_string("9.0.0.1"), address::from_string("255.255.255.255"), 0} , {address_v4::from_string("9.0.0.1"), address_v4::from_string("255.255.255.255"), 0}
}; };
TEST_CHECK(std::equal(range.begin(), range.end(), expected, &compare)); TEST_CHECK(std::equal(range.begin(), range.end(), expected, &compare));
@ -132,12 +132,12 @@ int test_main()
{ {
ip_filter f; ip_filter f;
f.add_rule(address::from_string("1.0.0.0"), address::from_string("2.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("1.0.0.0"), address_v4::from_string("2.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("3.0.0.0"), address::from_string("4.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("3.0.0.0"), address_v4::from_string("4.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("5.0.0.0"), address::from_string("6.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("5.0.0.0"), address_v4::from_string("6.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("7.0.0.0"), address::from_string("8.0.0.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("7.0.0.0"), address_v4::from_string("8.0.0.0"), ip_filter::blocked);
f.add_rule(address::from_string("0.0.1.0"), address::from_string("7.0.4.0"), ip_filter::blocked); f.add_rule(address_v4::from_string("0.0.1.0"), address_v4::from_string("7.0.4.0"), ip_filter::blocked);
range = f.export_filter(); range = f.export_filter();
test_rules_invariant(range, f); test_rules_invariant(range, f);
@ -145,9 +145,9 @@ int test_main()
TEST_CHECK(range.size() == 3); TEST_CHECK(range.size() == 3);
ip_filter::ip_range expected[] = ip_filter::ip_range expected[] =
{ {
{address::from_string("0.0.0.0"), address::from_string("0.0.0.255"), 0} {address_v4::from_string("0.0.0.0"), address_v4::from_string("0.0.0.255"), 0}
, {address::from_string("0.0.1.0"), address::from_string("8.0.0.0"), ip_filter::blocked} , {address_v4::from_string("0.0.1.0"), address_v4::from_string("8.0.0.0"), ip_filter::blocked}
, {address::from_string("8.0.0.1"), address::from_string("255.255.255.255"), 0} , {address_v4::from_string("8.0.0.1"), address_v4::from_string("255.255.255.255"), 0}
}; };
TEST_CHECK(std::equal(range.begin(), range.end(), expected, &compare)); TEST_CHECK(std::equal(range.begin(), range.end(), expected, &compare));

2
test/test_piece_picker.cpp
View File

@ -12,7 +12,7 @@ int test_main()
const int num_pieces = 6; const int num_pieces = 6;
// 4 blocks per piece // 4 blocks per piece
piece_picker p(4, num_pieces * 4, 7); piece_picker p(4, num_pieces * 4);
// we have the first piece // we have the first piece
std::vector<bool> have(num_pieces, false); std::vector<bool> have(num_pieces, false);