mirror of
https://github.com/savoirfairelinux/opendht.git
synced 2026-11-08 04:21:51 +00:00
Switch project license from GPL-3.0-or-later to MIT
This commit is contained in:
Adrien Béraud committed
1 parent
4fd4745647
commit
f9cba71d51
123 files changed
+5944
-7638
No files matched your search
+216
-173
@@ -1,19 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2014-2026 Savoir-faire Linux Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// Copyright (c) 2014-2026 Savoir-faire Linux Inc.
|
||||
// SPDX-License-Identifier: MIT
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
@@ -32,40 +18,56 @@ extern "C" {
|
||||
|
||||
using namespace dht;
|
||||
|
||||
void print_info() {
|
||||
void
|
||||
print_info()
|
||||
{
|
||||
std::cout << "dhtnode, a simple OpenDHT command line node runner." << std::endl;
|
||||
std::cout << "Report bugs to: https://opendht.net" << std::endl;
|
||||
}
|
||||
|
||||
void print_version() {
|
||||
void
|
||||
print_version()
|
||||
{
|
||||
std::cout << "OpenDHT version " << dht::version() << std::endl;
|
||||
print_info();
|
||||
}
|
||||
|
||||
void print_usage() {
|
||||
std::cout << "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]] [--proxyserver local_port] [--proxyserverssl local_port] [--bundleid bundleid] [--pushserver endpoint]" << std::endl << std::endl;
|
||||
void
|
||||
print_usage()
|
||||
{
|
||||
std::cout
|
||||
<< "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]] "
|
||||
"[--proxyserver local_port] [--proxyserverssl local_port] [--bundleid bundleid] [--pushserver endpoint]"
|
||||
<< std::endl
|
||||
<< std::endl;
|
||||
print_info();
|
||||
}
|
||||
|
||||
void print_id_req() {
|
||||
void
|
||||
print_id_req()
|
||||
{
|
||||
std::cout << "An identity is required to perform this operation (run with -i)" << std::endl;
|
||||
}
|
||||
|
||||
void print_help() {
|
||||
void
|
||||
print_help()
|
||||
{
|
||||
std::cout << "OpenDHT command line interface (CLI)" << std::endl;
|
||||
std::cout << "Possible commands:" << std::endl
|
||||
<< " h, help Print this help message." << std::endl
|
||||
<< " x, quit Quit the program." << std::endl
|
||||
<< " log Start/stop printing DHT logs." << std::endl;
|
||||
|
||||
std::cout << std::endl << "Node information:" << std::endl
|
||||
std::cout << std::endl
|
||||
<< "Node information:" << std::endl
|
||||
<< " ll Print basic information and stats about the current node." << std::endl
|
||||
<< " ls [key] Print basic information about current search(es)." << std::endl
|
||||
<< " ld [key] Print basic information about currenty stored values on this node (or key)." << std::endl
|
||||
<< " lr Print the full current routing table of this node." << std::endl;
|
||||
|
||||
#ifdef OPENDHT_PROXY_SERVER
|
||||
std::cout << std::endl << "Operations with the proxy:" << std::endl
|
||||
std::cout << std::endl
|
||||
<< "Operations with the proxy:" << std::endl
|
||||
#ifdef OPENDHT_PUSH_NOTIFICATIONS
|
||||
<< " pst [port] <pushServer> Start the proxy interface on port." << std::endl
|
||||
#else
|
||||
@@ -73,10 +75,11 @@ void print_help() {
|
||||
<< " psx [port] Start the proxy ssl interface on port." << std::endl
|
||||
#endif // OPENDHT_PUSH_NOTIFICATIONS
|
||||
<< " psp [port] Stop the proxy interface on port." << std::endl;
|
||||
#endif //OPENDHT_PROXY_SERVER
|
||||
#endif // OPENDHT_PROXY_SERVER
|
||||
|
||||
#ifdef OPENDHT_PROXY_CLIENT
|
||||
std::cout << std::endl << "Operations with the proxy:" << std::endl
|
||||
std::cout << std::endl
|
||||
<< "Operations with the proxy:" << std::endl
|
||||
#ifdef OPENDHT_PUSH_NOTIFICATIONS
|
||||
<< " stt [server_address] <device_key> Start the proxy client." << std::endl
|
||||
<< " rs [token] Resubscribe to opendht." << std::endl
|
||||
@@ -85,32 +88,41 @@ void print_help() {
|
||||
<< " stt [server_address] Start the proxy client." << std::endl
|
||||
#endif // OPENDHT_PUSH_NOTIFICATIONS
|
||||
<< " stp Stop the proxy client." << std::endl;
|
||||
#endif //OPENDHT_PROXY_CLIENT
|
||||
#endif // OPENDHT_PROXY_CLIENT
|
||||
|
||||
std::cout << std::endl << "Operations on the DHT:" << std::endl
|
||||
<< " b <ip:port> Ping potential node at given IP address/port." << std::endl
|
||||
<< " g <key> Get values at <key>." << std::endl
|
||||
<< " l <key> Listen for value changes at <key>." << std::endl
|
||||
<< " cl <key> <token> Cancel listen for <token> and <key>." << std::endl
|
||||
<< " p <key> <str> Put string value at <key>." << std::endl
|
||||
<< " pp <key> <str> Put string value at <key> (persistent version)." << std::endl
|
||||
<< " cpp <key> <id> Cancel persistent put operation for <key> and value <id>." << std::endl
|
||||
<< " s <key> <str> Put string value at <key>, signed with our generated private key." << std::endl
|
||||
<< " e <key> <dest> <str> Put string value at <key>, encrypted for <dest> with its public key (if found)." << std::endl
|
||||
<< " cc Trigger connectivity changed signal." << std::endl;
|
||||
std::cout
|
||||
<< std::endl
|
||||
<< "Operations on the DHT:" << std::endl
|
||||
<< " b <ip:port> Ping potential node at given IP address/port." << std::endl
|
||||
<< " g <key> Get values at <key>." << std::endl
|
||||
<< " l <key> Listen for value changes at <key>." << std::endl
|
||||
<< " cl <key> <token> Cancel listen for <token> and <key>." << std::endl
|
||||
<< " p <key> <str> Put string value at <key>." << std::endl
|
||||
<< " pp <key> <str> Put string value at <key> (persistent version)." << std::endl
|
||||
<< " cpp <key> <id> Cancel persistent put operation for <key> and value <id>." << std::endl
|
||||
<< " s <key> <str> Put string value at <key>, signed with our generated private key." << std::endl
|
||||
<< " e <key> <dest> <str> Put string value at <key>, encrypted for <dest> with its public key (if found)."
|
||||
<< std::endl
|
||||
<< " cc Trigger connectivity changed signal." << std::endl;
|
||||
|
||||
#ifdef OPENDHT_INDEXATION
|
||||
std::cout << std::endl << "Indexation operations on the DHT:" << std::endl
|
||||
<< " il <name> <key> [exact match] Lookup the index named <name> with the key <key>." << std::endl
|
||||
<< " Set [exact match] to 'false' for inexact match lookup." << std::endl
|
||||
<< " ii <name> <key> <value> Inserts the value <value> under the key <key> in the index named <name>." << std::endl
|
||||
<< std::endl;
|
||||
std::cout
|
||||
<< std::endl
|
||||
<< "Indexation operations on the DHT:" << std::endl
|
||||
<< " il <name> <key> [exact match] Lookup the index named <name> with the key <key>." << std::endl
|
||||
<< " Set [exact match] to 'false' for inexact match lookup." << std::endl
|
||||
<< " ii <name> <key> <value> Inserts the value <value> under the key <key> in the index named <name>."
|
||||
<< std::endl
|
||||
<< std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
void
|
||||
cmd_loop(std::shared_ptr<DhtRunner>& node,
|
||||
dht_params& params
|
||||
#ifdef OPENDHT_PROXY_SERVER
|
||||
, std::map<in_port_t, std::unique_ptr<DhtProxyServer>>& proxies
|
||||
,
|
||||
std::map<in_port_t, std::unique_ptr<DhtProxyServer>>& proxies
|
||||
#endif
|
||||
)
|
||||
{
|
||||
@@ -126,8 +138,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
std::map<std::string, indexation::Pht> indexes;
|
||||
#endif
|
||||
|
||||
while (true)
|
||||
{
|
||||
while (true) {
|
||||
// using the GNU Readline API
|
||||
std::string line = readLine();
|
||||
if (!line.empty() && line[0] == '\0')
|
||||
@@ -146,7 +157,8 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
node->getNodeInfo([&](const std::shared_ptr<dht::NodeInfo>& nodeInfo) {
|
||||
print_node_info(*nodeInfo);
|
||||
std::cout << nodeInfo->ongoing_ops << " ongoing operations" << std::endl;
|
||||
std::cout << "Storage has " << nodeInfo->storage_values << " values, using " << (nodeInfo->storage_size/1024) << " KB" << std::endl;
|
||||
std::cout << "Storage has " << nodeInfo->storage_values << " values, using "
|
||||
<< (nodeInfo->storage_size / 1024) << " KB" << std::endl;
|
||||
std::cout << "IPv4 stats:" << std::endl;
|
||||
std::cout << nodeInfo->ipv4.toString() << std::endl;
|
||||
std::cout << "IPv6 stats:" << std::endl;
|
||||
@@ -184,7 +196,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
else
|
||||
std::cout << node->getSearchesLog() << std::endl;
|
||||
continue;
|
||||
} else if (op == "la") {
|
||||
} else if (op == "la") {
|
||||
std::cout << "Reported public addresses:" << std::endl;
|
||||
auto addrs = node->getPublicAddressStr();
|
||||
for (const auto& addr : addrs)
|
||||
@@ -214,9 +226,9 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
#ifdef OPENDHT_PROXY_SERVER
|
||||
else if (op == "pst") {
|
||||
#ifdef OPENDHT_PUSH_NOTIFICATIONS
|
||||
iss >> idstr >> pushServer;
|
||||
iss >> idstr >> pushServer;
|
||||
#else
|
||||
iss >> idstr;
|
||||
iss >> idstr;
|
||||
#endif // OPENDHT_PUSH_NOTIFICATIONS
|
||||
try {
|
||||
in_port_t port = std::stoi(idstr);
|
||||
@@ -224,27 +236,28 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
serverConfig.port = port;
|
||||
serverConfig.pushServer = pushServer;
|
||||
proxies.emplace(port, std::make_unique<DhtProxyServer>(node, serverConfig));
|
||||
} catch (...) { }
|
||||
} catch (...) {
|
||||
}
|
||||
continue;
|
||||
} else if (op == "psx") {
|
||||
#ifdef OPENDHT_PUSH_NOTIFICATIONS
|
||||
iss >> idstr >> pushServer;
|
||||
iss >> idstr >> pushServer;
|
||||
#else
|
||||
iss >> idstr;
|
||||
iss >> idstr;
|
||||
#endif // OPENDHT_PUSH_NOTIFICATIONS
|
||||
try {
|
||||
if (params.proxy_id.first and params.proxy_id.second){
|
||||
if (params.proxy_id.first and params.proxy_id.second) {
|
||||
in_port_t port = std::stoi(idstr);
|
||||
ProxyServerConfig serverConfig;
|
||||
serverConfig.identity = params.proxy_id;
|
||||
serverConfig.port = port;
|
||||
serverConfig.pushServer = pushServer;
|
||||
proxies.emplace(port, std::make_unique<DhtProxyServer>(node, serverConfig));
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
std::cerr << "Missing Identity private key or certificate" << std::endl;
|
||||
}
|
||||
} catch (...) { }
|
||||
} catch (...) {
|
||||
}
|
||||
continue;
|
||||
} else if (op == "psp") {
|
||||
iss >> idstr;
|
||||
@@ -252,10 +265,11 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
auto it = proxies.find(std::stoi(idstr));
|
||||
if (it != proxies.end())
|
||||
proxies.erase(it);
|
||||
} catch (...) { }
|
||||
} catch (...) {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
#endif //OPENDHT_PROXY_SERVER
|
||||
#endif // OPENDHT_PROXY_SERVER
|
||||
#ifdef OPENDHT_PROXY_CLIENT
|
||||
else if (op == "stt") {
|
||||
node->enableProxy(true);
|
||||
@@ -267,16 +281,19 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
#ifdef OPENDHT_PUSH_NOTIFICATIONS
|
||||
else if (op == "rp") {
|
||||
iss >> value;
|
||||
node->pushNotificationReceived({{"to", "dhtnode"}, {"token", value}});
|
||||
node->pushNotificationReceived({
|
||||
{"to", "dhtnode"},
|
||||
{"token", value }
|
||||
});
|
||||
continue;
|
||||
}
|
||||
#endif // OPENDHT_PUSH_NOTIFICATIONS
|
||||
#endif //OPENDHT_PROXY_CLIENT
|
||||
#endif // OPENDHT_PROXY_CLIENT
|
||||
|
||||
if (op.empty())
|
||||
continue;
|
||||
|
||||
static const std::set<std::string> VALID_OPS {"g", "l", "cl", "il", "ii", "p", "pp", "cpp", "s", "e", "a", "q"};
|
||||
static const std::set<std::string> VALID_OPS {"g", "l", "cl", "il", "ii", "p", "pp", "cpp", "s", "e", "a", "q"};
|
||||
if (VALID_OPS.find(op) == VALID_OPS.cend()) {
|
||||
std::cout << "Unknown command: " << op << std::endl;
|
||||
std::cout << " (type 'h' or 'help' for a list of possible commands)" << std::endl;
|
||||
@@ -284,15 +301,18 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
}
|
||||
dht::InfoHash id;
|
||||
|
||||
if (false) {}
|
||||
if (false) {
|
||||
}
|
||||
#ifdef OPENDHT_INDEXATION
|
||||
else if (op == "il" or op == "ii") {
|
||||
// Pht syntax
|
||||
iss >> index >> keystr;
|
||||
auto new_index = std::find_if(indexes.begin(), indexes.end(),
|
||||
[&](std::pair<const std::string, indexation::Pht>& i) {
|
||||
return i.first == index;
|
||||
}) == indexes.end();
|
||||
auto new_index = std::find_if(indexes.begin(),
|
||||
indexes.end(),
|
||||
[&](std::pair<const std::string, indexation::Pht>& i) {
|
||||
return i.first == index;
|
||||
})
|
||||
== indexes.end();
|
||||
if (not index.size()) {
|
||||
std::cerr << "You must enter the index name." << std::endl;
|
||||
continue;
|
||||
@@ -305,7 +325,9 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
return std::make_pair(f.first, f.second.size());
|
||||
});
|
||||
indexes.emplace(index, Pht {index, std::move(ks), node});
|
||||
} catch (std::invalid_argument& e) { std::cout << e.what() << std::endl; }
|
||||
} catch (std::invalid_argument& e) {
|
||||
std::cout << e.what() << std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -329,47 +351,63 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
std::string rem;
|
||||
std::getline(iss, rem);
|
||||
auto total = std::make_shared<size_t>();
|
||||
node->get(id, [start, total](const std::vector<std::shared_ptr<Value>>& values) {
|
||||
auto now = std::chrono::high_resolution_clock::now();
|
||||
(*total) += values.size();
|
||||
std::cout << "Get: found " << values.size() << " value(s) after " << print_duration(now-start) << " (total " << *total << ')' << std::endl;
|
||||
for (const auto& value : values)
|
||||
std::cout << "\t" << *value << std::endl;
|
||||
return true;
|
||||
}, [start, total](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Get: " << (ok ? "completed" : "failure") << ", took " << print_duration(end-start) << " (total " << *total << ')' << std::endl;
|
||||
}, {}, dht::Where {rem});
|
||||
}
|
||||
else if (op == "q") {
|
||||
node->get(
|
||||
id,
|
||||
[start, total](const std::vector<std::shared_ptr<Value>>& values) {
|
||||
auto now = std::chrono::high_resolution_clock::now();
|
||||
(*total) += values.size();
|
||||
std::cout << "Get: found " << values.size() << " value(s) after " << print_duration(now - start)
|
||||
<< " (total " << *total << ')' << std::endl;
|
||||
for (const auto& value : values)
|
||||
std::cout << "\t" << *value << std::endl;
|
||||
return true;
|
||||
},
|
||||
[start, total](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Get: " << (ok ? "completed" : "failure") << ", took " << print_duration(end - start)
|
||||
<< " (total " << *total << ')' << std::endl;
|
||||
},
|
||||
{},
|
||||
dht::Where {rem});
|
||||
} else if (op == "q") {
|
||||
std::string rem;
|
||||
std::getline(iss, rem);
|
||||
node->query(id, [start](const std::vector<std::shared_ptr<FieldValueIndex>>& field_value_indexes) {
|
||||
auto now = std::chrono::high_resolution_clock::now();
|
||||
for (auto& index : field_value_indexes) {
|
||||
std::cout << "Query: found field value index after " << print_duration(now-start) << std::endl;
|
||||
std::cout << "\t" << *index << std::endl;
|
||||
}
|
||||
return true;
|
||||
}, [start](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Query: " << (ok ? "completed" : "failure") << ", took " << print_duration(end-start) << std::endl;
|
||||
}, dht::Query {rem});
|
||||
}
|
||||
else if (op == "l") {
|
||||
node->query(
|
||||
id,
|
||||
[start](const std::vector<std::shared_ptr<FieldValueIndex>>& field_value_indexes) {
|
||||
auto now = std::chrono::high_resolution_clock::now();
|
||||
for (auto& index : field_value_indexes) {
|
||||
std::cout << "Query: found field value index after " << print_duration(now - start)
|
||||
<< std::endl;
|
||||
std::cout << "\t" << *index << std::endl;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
[start](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Query: " << (ok ? "completed" : "failure") << ", took " << print_duration(end - start)
|
||||
<< std::endl;
|
||||
},
|
||||
dht::Query {rem});
|
||||
} else if (op == "l") {
|
||||
std::string rem;
|
||||
std::getline(iss, rem);
|
||||
auto total = std::make_shared<size_t>();
|
||||
auto token = node->listen(id, [total](const std::vector<std::shared_ptr<Value>>& values, bool expired) {
|
||||
if (expired)
|
||||
(*total) -= values.size();
|
||||
else
|
||||
(*total) += values.size();
|
||||
std::cout << "Listen: found " << values.size() << " values" << (expired ? " expired" : "") << " (total " << *total << ')' << std::endl;
|
||||
for (const auto& value : values)
|
||||
std::cout << "\t" << *value << std::endl;
|
||||
return true;
|
||||
}, {}, dht::Where {rem});
|
||||
auto token = node->listen(
|
||||
id,
|
||||
[total](const std::vector<std::shared_ptr<Value>>& values, bool expired) {
|
||||
if (expired)
|
||||
(*total) -= values.size();
|
||||
else
|
||||
(*total) += values.size();
|
||||
std::cout << "Listen: found " << values.size() << " values" << (expired ? " expired" : "")
|
||||
<< " (total " << *total << ')' << std::endl;
|
||||
for (const auto& value : values)
|
||||
std::cout << "\t" << *value << std::endl;
|
||||
return true;
|
||||
},
|
||||
{},
|
||||
dht::Where {rem});
|
||||
auto t = token.get();
|
||||
std::cout << "Listening, token: " << t << std::endl;
|
||||
}
|
||||
@@ -379,47 +417,47 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
size_t token;
|
||||
try {
|
||||
token = std::stoul(rem);
|
||||
} catch(...) {
|
||||
} catch (...) {
|
||||
std::cerr << "Syntax: cl [key] [token]" << std::endl;
|
||||
continue;
|
||||
}
|
||||
node->cancelListen(id, token);
|
||||
}
|
||||
else if (op == "p") {
|
||||
} else if (op == "p") {
|
||||
std::string v;
|
||||
iss >> v;
|
||||
auto value = std::make_shared<dht::Value>(
|
||||
dht::ValueType::USER_DATA.id,
|
||||
std::vector<uint8_t> {v.begin(), v.end()});
|
||||
auto value = std::make_shared<dht::Value>(dht::ValueType::USER_DATA.id,
|
||||
std::vector<uint8_t> {v.begin(), v.end()});
|
||||
value->user_type = "text/plain";
|
||||
node->put(id, value, [start, value](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
auto flags(std::cout.flags());
|
||||
std::cout << "Put: " << (ok ? "success" : "failure") << ", took " << print_duration(end-start) << ". Value ID: " << std::hex << value->id << std::endl;
|
||||
std::cout << "Put: " << (ok ? "success" : "failure") << ", took " << print_duration(end - start)
|
||||
<< ". Value ID: " << std::hex << value->id << std::endl;
|
||||
std::cout.flags(flags);
|
||||
});
|
||||
}
|
||||
else if (op == "pp") {
|
||||
} else if (op == "pp") {
|
||||
std::string v;
|
||||
iss >> v;
|
||||
auto value = std::make_shared<dht::Value>(
|
||||
dht::ValueType::USER_DATA.id,
|
||||
std::vector<uint8_t> {v.begin(), v.end()}
|
||||
);
|
||||
auto value = std::make_shared<dht::Value>(dht::ValueType::USER_DATA.id,
|
||||
std::vector<uint8_t> {v.begin(), v.end()});
|
||||
value->user_type = "text/plain";
|
||||
node->put(id, value, [start, value](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
auto flags(std::cout.flags());
|
||||
std::cout << "Put: " << (ok ? "success" : "failure") << ", took " << print_duration(end-start) << ". Value ID: " << std::hex << value->id << std::endl;
|
||||
std::cout.flags(flags);
|
||||
}, time_point::max(), true);
|
||||
}
|
||||
else if (op == "cpp") {
|
||||
node->put(
|
||||
id,
|
||||
value,
|
||||
[start, value](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
auto flags(std::cout.flags());
|
||||
std::cout << "Put: " << (ok ? "success" : "failure") << ", took " << print_duration(end - start)
|
||||
<< ". Value ID: " << std::hex << value->id << std::endl;
|
||||
std::cout.flags(flags);
|
||||
},
|
||||
time_point::max(),
|
||||
true);
|
||||
} else if (op == "cpp") {
|
||||
std::string rem;
|
||||
iss >> rem;
|
||||
node->cancelPut(id, std::stoul(rem, nullptr, 16));
|
||||
}
|
||||
else if (op == "s") {
|
||||
} else if (op == "s") {
|
||||
if (not params.id.first) {
|
||||
print_id_req();
|
||||
continue;
|
||||
@@ -431,10 +469,10 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
value->user_type = "text/plain";
|
||||
node->putSigned(id, std::move(value), [start](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Put signed: " << (ok ? "success" : "failure") << " (took " << print_duration(end-start) << "s)" << std::endl;
|
||||
std::cout << "Put signed: " << (ok ? "success" : "failure") << " (took " << print_duration(end - start)
|
||||
<< "s)" << std::endl;
|
||||
});
|
||||
}
|
||||
else if (op == "e") {
|
||||
} else if (op == "e") {
|
||||
if (not params.id.first) {
|
||||
print_id_req();
|
||||
continue;
|
||||
@@ -442,23 +480,24 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
std::string tostr;
|
||||
std::string v;
|
||||
iss >> tostr >> v;
|
||||
auto value = std::make_shared<dht::Value>(
|
||||
dht::ValueType::USER_DATA.id,
|
||||
std::vector<uint8_t> {v.begin(), v.end()}
|
||||
);
|
||||
auto value = std::make_shared<dht::Value>(dht::ValueType::USER_DATA.id,
|
||||
std::vector<uint8_t> {v.begin(), v.end()});
|
||||
value->user_type = "text/plain";
|
||||
node->putEncrypted(id, InfoHash(tostr), std::move(value), [start](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Put encrypted: " << (ok ? "success" : "failure") << " (took " << print_duration(end-start) << ')' << std::endl;
|
||||
std::cout << "Put encrypted: " << (ok ? "success" : "failure") << " (took "
|
||||
<< print_duration(end - start) << ')' << std::endl;
|
||||
});
|
||||
}
|
||||
else if (op == "a") {
|
||||
} else if (op == "a") {
|
||||
in_port_t port;
|
||||
iss >> port;
|
||||
node->put(id, dht::Value {dht::IpServiceAnnouncement::TYPE.id, dht::IpServiceAnnouncement(port)}, [start](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Announce: " << (ok ? "success" : "failure") << " (took " << print_duration(end-start) << std::endl;
|
||||
});
|
||||
node->put(id,
|
||||
dht::Value {dht::IpServiceAnnouncement::TYPE.id, dht::IpServiceAnnouncement(port)},
|
||||
[start](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Announce: " << (ok ? "success" : "failure") << " (took "
|
||||
<< print_duration(end - start) << std::endl;
|
||||
});
|
||||
}
|
||||
#ifdef OPENDHT_INDEXATION
|
||||
else if (op == "il") {
|
||||
@@ -466,7 +505,8 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
iss >> exact_match;
|
||||
try {
|
||||
auto key = createPhtKey(parseStringMap(keystr));
|
||||
indexes.at(index).lookup(key,
|
||||
indexes.at(index).lookup(
|
||||
key,
|
||||
[=](std::vector<std::shared_ptr<indexation::Value>>& vals, indexation::Prefix p) {
|
||||
if (vals.empty())
|
||||
return;
|
||||
@@ -475,20 +515,20 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
<< " hash: " << p.hash() << std::endl;
|
||||
std::cout << " entries:" << std::endl;
|
||||
for (const auto& v : vals)
|
||||
std::cout << " " << v->first.toString() << "[vid: " << std::hex << v->second << std::dec << "]" << std::endl;
|
||||
std::cout << " " << v->first.toString() << "[vid: " << std::hex << v->second
|
||||
<< std::dec << "]" << std::endl;
|
||||
},
|
||||
[start](bool ok) {
|
||||
auto end = std::chrono::high_resolution_clock::now();
|
||||
std::cout << "Pht::lookup: " << (ok ? "done." : "failed.")
|
||||
<< " took " << print_duration(end-start) << std::endl;
|
||||
|
||||
}, exact_match.size() != 0 and exact_match == "false" ? false : true
|
||||
);
|
||||
std::cout << "Pht::lookup: " << (ok ? "done." : "failed.") << " took "
|
||||
<< print_duration(end - start) << std::endl;
|
||||
},
|
||||
exact_match.size() != 0 and exact_match == "false" ? false : true);
|
||||
} catch (std::invalid_argument& e) {
|
||||
std::cout << e.what() << std::endl;
|
||||
} catch (std::out_of_range& e) {
|
||||
}
|
||||
catch (std::invalid_argument& e) { std::cout << e.what() << std::endl; }
|
||||
catch (std::out_of_range& e) { }
|
||||
}
|
||||
else if (op == "ii") {
|
||||
} else if (op == "ii") {
|
||||
iss >> idstr;
|
||||
InfoHash h {idstr};
|
||||
if (not isInfoHash(h))
|
||||
@@ -497,23 +537,22 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
|
||||
indexation::Value v {h, 0};
|
||||
try {
|
||||
auto key = createPhtKey(parseStringMap(keystr));
|
||||
indexes.at(index).insert(key, v,
|
||||
[=](bool ok) {
|
||||
std::cout << "Pht::insert: " << (ok ? "done." : "failed.") << std::endl;
|
||||
}
|
||||
);
|
||||
indexes.at(index).insert(key, v, [=](bool ok) {
|
||||
std::cout << "Pht::insert: " << (ok ? "done." : "failed.") << std::endl;
|
||||
});
|
||||
} catch (std::invalid_argument& e) {
|
||||
std::cout << e.what() << std::endl;
|
||||
} catch (std::out_of_range& e) {
|
||||
}
|
||||
catch (std::invalid_argument& e) { std::cout << e.what() << std::endl; }
|
||||
catch (std::out_of_range& e) { }
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
std::cout << std::endl << "Stopping node..." << std::endl;
|
||||
std::cout << std::endl << "Stopping node..." << std::endl;
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
SetConsoleOutputCP(CP_UTF8);
|
||||
@@ -559,19 +598,21 @@ main(int argc, char **argv)
|
||||
serverConfig.pushServer = params.pushserver;
|
||||
serverConfig.bundleId = params.bundle_id;
|
||||
serverConfig.address = params.proxy_address;
|
||||
if (params.proxyserverssl and params.proxy_id.first and params.proxy_id.second){
|
||||
if (params.proxyserverssl and params.proxy_id.first and params.proxy_id.second) {
|
||||
serverConfig.identity = params.proxy_id;
|
||||
serverConfig.port = params.proxyserverssl;
|
||||
if (not params.persist_path.empty())
|
||||
serverConfig.persistStatePath = params.persist_path + '_' + std::to_string(serverConfig.port);
|
||||
proxies.emplace(params.proxyserverssl, std::make_unique<DhtProxyServer>(node, serverConfig, dhtConf.second.logger));
|
||||
proxies.emplace(params.proxyserverssl,
|
||||
std::make_unique<DhtProxyServer>(node, serverConfig, dhtConf.second.logger));
|
||||
}
|
||||
if (params.proxyserver) {
|
||||
serverConfig.identity = {};
|
||||
serverConfig.port = params.proxyserver;
|
||||
if (not params.persist_path.empty())
|
||||
serverConfig.persistStatePath = params.persist_path + '_' + std::to_string(serverConfig.port);
|
||||
proxies.emplace(params.proxyserver, std::make_unique<DhtProxyServer>(node, serverConfig, dhtConf.second.logger));
|
||||
proxies.emplace(params.proxyserver,
|
||||
std::make_unique<DhtProxyServer>(node, serverConfig, dhtConf.second.logger));
|
||||
}
|
||||
#else
|
||||
std::cerr << "DHT proxy server requested but OpenDHT built without proxy server support." << std::endl;
|
||||
@@ -580,31 +621,33 @@ main(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (params.daemonize or params.service)
|
||||
while (runner.wait());
|
||||
while (runner.wait())
|
||||
;
|
||||
else
|
||||
cmd_loop(node, params
|
||||
cmd_loop(node,
|
||||
params
|
||||
#ifdef OPENDHT_PROXY_SERVER
|
||||
, proxies
|
||||
,
|
||||
proxies
|
||||
#endif
|
||||
);
|
||||
|
||||
} catch(const std::exception&e) {
|
||||
std::cerr << std::endl << e.what() << std::endl;
|
||||
} catch (const std::exception& e) {
|
||||
std::cerr << std::endl << e.what() << std::endl;
|
||||
}
|
||||
|
||||
std::condition_variable cv;
|
||||
std::mutex m;
|
||||
bool done {false};
|
||||
|
||||
node->shutdown([&]()
|
||||
{
|
||||
node->shutdown([&]() {
|
||||
done = true;
|
||||
cv.notify_all();
|
||||
});
|
||||
|
||||
// wait for shutdown
|
||||
std::unique_lock<std::mutex> lk(m);
|
||||
cv.wait(lk, [&](){ return done; });
|
||||
cv.wait(lk, [&]() { return done; });
|
||||
|
||||
node->join();
|
||||
#ifdef _MSC_VER
|
||||
|
||||
Reference in new issue
Block a user