From f92b6cd90c4ecf4d7586fc29b2e32c168fcb7042 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 11 Sep 2006 23:34:07 +0000 Subject: [PATCH] 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. --- docs/bitrocket_thumb.png | Bin 0 -> 9566 bytes docs/im_thumb.jpg | Bin 0 -> 12093 bytes docs/projects.html | 12 ++++ docs/projects.rst | 10 ++++ include/Makefile.am | 5 -- include/libtorrent/kademlia/dht_tracker.hpp | 2 +- src/bt_peer_connection.cpp | 9 +-- test/test_ip_filter.cpp | 58 ++++++++++---------- test/test_piece_picker.cpp | 2 +- 9 files changed, 58 insertions(+), 40 deletions(-) create mode 100644 docs/bitrocket_thumb.png create mode 100644 docs/im_thumb.jpg diff --git a/docs/bitrocket_thumb.png b/docs/bitrocket_thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..c6648d1d5897e4f234f6fc52826b6a9ce61188b7 GIT binary patch literal 9566 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
btg_thumb.jpg
+

BitRocket

+

BitRocket is a MacOS X bittorrent client.

+ +
bitrocket_thumb.png
+ + +

Instant Media

+

IM is a client for downloading Internet TV.

+ +
im_thumb.jpg
+ +

MooPolice

MooPolice is a windows bittorrent client with a quite unique look.

diff --git a/docs/projects.rst b/docs/projects.rst index 8632bf792..f07f75351 100644 --- a/docs/projects.rst +++ b/docs/projects.rst @@ -33,6 +33,14 @@ project listed here, let me_ know. | Written by Michael Wojciechowski | | | 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_ is a windows bittorrent | | @@ -92,6 +100,8 @@ project listed here, let me_ know. .. _`electric sheep`: http://electricsheep.org .. _qBittorrent: http://www.qbittorrent.org/ .. _btg: http://developer.berlios.de/projects/btg/ +.. _BitRocket: http://www.bitrocket.org/ +.. _IM: http://www.im.com/ .. _MooPolice: http://www.moopolice.de .. _BitsCast: http://www.bitscast.com/software/ .. _Jamplayer: http://www.jamendo.com/en/static/jamendotools_jamplayer/ diff --git a/include/Makefile.am b/include/Makefile.am index eff167880..ad108deb7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -62,8 +62,6 @@ libtorrent/asio/basic_resolver.hpp \ libtorrent/asio/basic_socket.hpp \ libtorrent/asio/basic_socket_acceptor.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_streambuf.hpp \ libtorrent/asio/buffer.hpp \ @@ -89,7 +87,6 @@ libtorrent/asio/detail/epoll_reactor_fwd.hpp \ libtorrent/asio/detail/event.hpp \ libtorrent/asio/detail/fd_set_adapter.hpp \ libtorrent/asio/detail/handler_alloc_helpers.hpp \ -libtorrent/asio/detail/handler_dispatch_helpers.hpp \ libtorrent/asio/detail/hash_map.hpp \ libtorrent/asio/detail/io_control.hpp \ libtorrent/asio/detail/kqueue_reactor.hpp \ @@ -147,7 +144,6 @@ libtorrent/asio/detail/wrapped_handler.hpp \ libtorrent/asio/error.hpp \ libtorrent/asio/error_handler.hpp \ libtorrent/asio/handler_alloc_hook.hpp \ -libtorrent/asio/handler_dispatch_hook.hpp \ libtorrent/asio/impl/io_service.ipp \ libtorrent/asio/impl/read.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.hpp \ libtorrent/asio/strand.hpp \ -libtorrent/asio/strand_service.hpp \ libtorrent/asio/stream_socket_service.hpp \ libtorrent/asio/streambuf.hpp \ libtorrent/asio/system_exception.hpp \ diff --git a/include/libtorrent/kademlia/dht_tracker.hpp b/include/libtorrent/kademlia/dht_tracker.hpp index 273196e0b..2c35a5105 100644 --- a/include/libtorrent/kademlia/dht_tracker.hpp +++ b/include/libtorrent/kademlia/dht_tracker.hpp @@ -68,7 +68,7 @@ namespace libtorrent { namespace dht void add_node(udp::endpoint node); void add_node(std::pair const& node); - void rebind(asio::ip::address interface, int listen_port); + void rebind(asio::ip::address listen_interface, int listen_port); entry state() const; diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp index 29e22a8e7..779eaa78a 100755 --- a/src/bt_peer_connection.cpp +++ b/src/bt_peer_connection.cpp @@ -1354,10 +1354,6 @@ namespace libtorrent // reply with our handshake write_handshake(); 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 { @@ -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; reset_recv_buffer(20); #ifdef TORRENT_VERBOSE_LOGGING diff --git a/test/test_ip_filter.cpp b/test/test_ip_filter.cpp index 6355d8e34..ee8679b55 100644 --- a/test/test_ip_filter.cpp +++ b/test/test_ip_filter.cpp @@ -19,8 +19,8 @@ void test_rules_invariant(std::vector const& r, ip_filter c TEST_CHECK(!r.empty()); if (r.empty()) return; - TEST_CHECK(r.front().first == address::from_string("0.0.0.0")); - TEST_CHECK(r.back().last == address::from_string("255.255.255.255")); + TEST_CHECK(r.front().first == address_v4::from_string("0.0.0.0")); + TEST_CHECK(r.back().last == address_v4::from_string("255.255.255.255")); iterator i = r.begin(); iterator j = boost::next(i); @@ -41,15 +41,15 @@ int test_main() // **** test joining of ranges at the end **** ip_filter::ip_range expected1[] = { - {address::from_string("0.0.0.0"), address::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::from_string("3.0.0.1"), address::from_string("255.255.255.255"), 0} + {address_v4::from_string("0.0.0.0"), address_v4::from_string("0.255.255.255"), 0} + , {address_v4::from_string("1.0.0.0"), address_v4::from_string("3.0.0.0"), ip_filter::blocked} + , {address_v4::from_string("3.0.0.1"), address_v4::from_string("255.255.255.255"), 0} }; { 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::from_string("2.0.0.1"), address::from_string("3.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_v4::from_string("2.0.0.1"), address_v4::from_string("3.0.0.0"), ip_filter::blocked); range = f.export_filter(); test_rules_invariant(range, f); @@ -62,8 +62,8 @@ int test_main() { 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::from_string("1.0.0.0"), address::from_string("2.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_v4::from_string("1.0.0.0"), address_v4::from_string("2.0.0.0"), ip_filter::blocked); range = f.export_filter(); test_rules_invariant(range, f); @@ -77,8 +77,8 @@ int test_main() { 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::from_string("1.0.0.0"), address::from_string("2.4.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_v4::from_string("1.0.0.0"), address_v4::from_string("2.4.0.0"), ip_filter::blocked); range = f.export_filter(); test_rules_invariant(range, f); @@ -92,8 +92,8 @@ int test_main() { 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::from_string("2.0.0.1"), address::from_string("3.0.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_v4::from_string("2.0.0.1"), address_v4::from_string("3.0.0.0"), ip_filter::blocked); range = f.export_filter(); test_rules_invariant(range, f); @@ -107,12 +107,12 @@ int test_main() { 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::from_string("3.0.0.0"), address::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::from_string("7.0.0.0"), address::from_string("8.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_v4::from_string("3.0.0.0"), address_v4::from_string("4.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_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(); test_rules_invariant(range, f); @@ -120,9 +120,9 @@ int test_main() TEST_CHECK(range.size() == 3); ip_filter::ip_range expected[] = { - {address::from_string("0.0.0.0"), address::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::from_string("9.0.0.1"), address::from_string("255.255.255.255"), 0} + {address_v4::from_string("0.0.0.0"), address_v4::from_string("0.255.255.255"), 0} + , {address_v4::from_string("1.0.0.0"), address_v4::from_string("9.0.0.0"), ip_filter::blocked} + , {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)); @@ -132,12 +132,12 @@ int test_main() { 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::from_string("3.0.0.0"), address::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::from_string("7.0.0.0"), address::from_string("8.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_v4::from_string("3.0.0.0"), address_v4::from_string("4.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_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(); test_rules_invariant(range, f); @@ -145,9 +145,9 @@ int test_main() TEST_CHECK(range.size() == 3); ip_filter::ip_range expected[] = { - {address::from_string("0.0.0.0"), address::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::from_string("8.0.0.1"), address::from_string("255.255.255.255"), 0} + {address_v4::from_string("0.0.0.0"), address_v4::from_string("0.0.0.255"), 0} + , {address_v4::from_string("0.0.1.0"), address_v4::from_string("8.0.0.0"), ip_filter::blocked} + , {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)); diff --git a/test/test_piece_picker.cpp b/test/test_piece_picker.cpp index efa120308..a11442cbe 100644 --- a/test/test_piece_picker.cpp +++ b/test/test_piece_picker.cpp @@ -12,7 +12,7 @@ int test_main() const int num_pieces = 6; // 4 blocks per piece - piece_picker p(4, num_pieces * 4, 7); + piece_picker p(4, num_pieces * 4); // we have the first piece std::vector have(num_pieces, false);