initial support for torrent tag store in DHT

This commit is contained in:
Arvid Norberg
2009-09-27 03:38:41 +00:00
parent 1017a716ef
commit f36688a364
13 changed files with 502 additions and 63 deletions

View File

@@ -35,6 +35,7 @@ test-suite libtorrent :
[ run test_primitives.cpp ]
[ run test_ip_filter.cpp ]
[ run test_hasher.cpp ]
[ run test_dht.cpp ]
[ run test_storage.cpp ]
[ run test_upnp.cpp ]

View File

@@ -8,6 +8,7 @@ test_programs = \
test_hasher \
test_http_connection \
test_ip_filter \
test_dht \
test_lsd \
test_metadata_extension \
test_natpmp \
@@ -40,6 +41,7 @@ libtest_la_SOURCES = main.cpp setup_transfer.cpp
test_auto_unchoke_SOURCES = test_auto_unchoke.cpp
test_bandwidth_limiter_SOURCES = test_bandwidth_limiter.cpp
test_bdecode_performance_SOURCES = test_bdecode_performance.cpp
test_dht_SOURCES = test_dht.cpp
test_bencoding_SOURCES = test_bencoding.cpp
test_buffer_SOURCES = test_buffer.cpp
test_fast_extension_SOURCES = test_fast_extension.cpp

88
test/test_dht.cpp Normal file
View File

@@ -0,0 +1,88 @@
/*
Copyright (c) 2008, Arvid Norberg
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the distribution.
* Neither the name of the author nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#include "libtorrent/session.hpp"
#include "test.hpp"
int test_main()
{
using namespace libtorrent;
int dht_port = 48199;
session ses(fingerprint("LT", 0, 1, 0, 0), std::make_pair(dht_port, 49000));
// DHT should be running on port 48199 now
io_service ios;
error_code ec;
datagram_socket sock(ios);
sock.open(udp::v4(), ec);
TEST_CHECK(!ec);
if (ec) std::cout << ec.message() << std::endl;
char const ping_msg[] = "d1:ad2:id20:00000000000000000001e1:q4:ping1:t2:101:y1:qe";
// ping
sock.send_to(asio::buffer(ping_msg, sizeof(ping_msg) - 1)
, udp::endpoint(address::from_string("127.0.0.1"), dht_port), 0, ec);
TEST_CHECK(!ec);
if (ec) std::cout << ec.message() << std::endl;
char inbuf[1600];
udp::endpoint ep;
int size = sock.receive_from(asio::buffer(inbuf, sizeof(inbuf)), ep, 0, ec);
TEST_CHECK(!ec);
if (ec) std::cout << ec.message() << std::endl;
lazy_entry pong;
int ret = lazy_bdecode(inbuf, inbuf + size, pong);
TEST_CHECK(ret == 0);
if (ret != 0) return 1;
TEST_CHECK(pong.type() == lazy_entry::dict_t);
if (pong.type() != lazy_entry::dict_t) return 1;
lazy_entry const* t = pong.dict_find_string("t");
TEST_CHECK(t);
if (t) TEST_CHECK(t->string_value() == "10");
lazy_entry const* y = pong.dict_find_string("y");
TEST_CHECK(y);
if (y) TEST_CHECK(y->string_value() == "r");
return 0;
}

View File

@@ -44,6 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TORRENT_DISABLE_DHT
#include "libtorrent/kademlia/node_id.hpp"
#include "libtorrent/kademlia/routing_table.hpp"
#include "libtorrent/kademlia/node.hpp"
#endif
#include <boost/tuple/tuple.hpp>
#include <boost/tuple/tuple_comparison.hpp>
@@ -365,6 +366,49 @@ int test_main()
{
using namespace libtorrent;
#ifndef TORRENT_DISABLE_DHT
// test search_torrent_entry
dht::search_torrent_entry ste1;
dht::search_torrent_entry ste2;
char const* ste1_tags[] = {"tag1", "tag2", "tag3", "tag4"};
ste1.publish("ste1", ste1_tags, 4);
char const* ste11_tags[] = {"tag2", "tag3"};
ste1.publish("ste1", ste11_tags, 2);
char const* ste2_tags[] = {"tag1", "tag2", "tag5", "tag6"};
ste2.publish("ste2", ste2_tags, 4);
char const* ste21_tags[] = {"tag1", "tag5"};
ste2.publish("ste2", ste21_tags, 2);
char const* test_tags1[] = {"tag1", "tag2"};
char const* test_tags2[] = {"tag3", "tag2"};
int m1 = ste1.match(test_tags1, 2);
int m2 = ste2.match(test_tags1, 2);
TEST_CHECK(m1 == m2);
m1 = ste1.match(test_tags2, 2);
m2 = ste2.match(test_tags2, 2);
TEST_CHECK(m1 > m2);
#endif
// test split_string
char const* tags[10];
char tags_str[] = " this is\ta test\t string\x01to be split and it cannot "
"extend over the limit of elements \t";
int ret = split_string(tags, 10, tags_str);
TEST_CHECK(ret == 10);
TEST_CHECK(strcmp(tags[0], "this") == 0);
TEST_CHECK(strcmp(tags[1], "is") == 0);
TEST_CHECK(strcmp(tags[2], "a") == 0);
TEST_CHECK(strcmp(tags[3], "test") == 0);
TEST_CHECK(strcmp(tags[4], "string") == 0);
TEST_CHECK(strcmp(tags[5], "to") == 0);
TEST_CHECK(strcmp(tags[6], "be") == 0);
TEST_CHECK(strcmp(tags[7], "split") == 0);
TEST_CHECK(strcmp(tags[8], "and") == 0);
TEST_CHECK(strcmp(tags[9], "it") == 0);
// test snprintf
char msg[10];