Commit b31836c4 authored by Adrien Béraud's avatar Adrien Béraud

dht: remove tools

dhtnode is now part of opendht

Refs #59539

Change-Id: Ib7ed30018a0c4391cac1ca047e9e7fb534a1fc61
parent 2910f862
......@@ -28,10 +28,6 @@ else
SUBDIRS = src ringtones man $(TESTS_DIR) doc bin
endif
if USE_DHT
SUBDIRS += tools
endif
EXTRA_DIST = m4/libtool.m4 \
m4/lt~obsolete.m4 \
m4/ltoptions.m4 \
......
......@@ -614,7 +614,6 @@ AC_CONFIG_FILES([Makefile \
src/video/v4l2/Makefile \
src/video/test/Makefile \
test/Makefile \
tools/Makefile \
ringtones/Makefile \
man/Makefile \
doc/Makefile \
......
# DHT
DHT_VERSION := 93fa3ada57d2eca72af36163b6f8b1bec182fa19
DHT_VERSION := c9405c5ae4a6308090b8644038887b8570c0aae8
DHT_URL := https://github.com/aberaud/dht/archive/$(DHT_VERSION).tar.gz
PKGS += dht
......
include ../globals.mak
libexecdir=$(libdir)/dht
libexec_PROGRAMS = dhtnode
dhtnode_SOURCES = dhtnode.cpp
dhtnode_CXXFLAGS= @OPENDHT_CFLAGS@
dhtnode_LDFLAGS = @GNUTLS_LIBS@ -lpthread @OPENDHT_LIBS@
/*
* Copyright (C) 2014 Savoir-Faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* 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, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#include <opendht.h>
extern "C" {
#include <gnutls/gnutls.h>
}
#include <sys/socket.h>
#include <iostream>
#include <string>
#include <sstream>
#include <chrono>
using namespace dht;
namespace Color {
enum Code {
FG_RED = 31,
FG_GREEN = 32,
FG_YELLOW = 33,
FG_BLUE = 34,
FG_DEFAULT = 39,
BG_RED = 41,
BG_GREEN = 42,
BG_BLUE = 44,
BG_DEFAULT = 49
};
class Modifier {
Code code;
public:
Modifier(Code pCode) : code(pCode) {}
friend std::ostream&
operator<<(std::ostream& os, const Modifier& mod) {
return os << "\033[" << mod.code << "m";
}
};
}
const Color::Modifier def(Color::FG_DEFAULT);
const Color::Modifier red(Color::FG_RED);
const Color::Modifier yellow(Color::FG_YELLOW);
void printLog(std::ostream& s, char const* m, va_list args) {
static constexpr int BUF_SZ = 4096;
char buffer[BUF_SZ];
int ret = vsnprintf(buffer, sizeof(buffer), m, args);
if (ret < 0)
return;
s.write(buffer, std::min(ret, BUF_SZ));
if (ret >= BUF_SZ)
s << "[[TRUNCATED]]";
s.put('\n');
}
int
main(int argc, char **argv)
{
if (argc < 2)
throw std::invalid_argument("Entrez un port");
int i = 1;
int p = atoi(argv[i++]);
if (p <= 0 || p >= 0x10000)
throw std::invalid_argument("Port invalide: " + std::to_string(p));
in_port_t port = p;
std::vector<sockaddr_storage> bootstrap_nodes {};
while (i < argc) {
addrinfo hints;
memset(&hints, 0, sizeof(hints));
addrinfo *info = nullptr, *infop = nullptr;
hints.ai_socktype = SOCK_DGRAM;
/*if(!ipv6)
hints.ai_family = AF_INET;
else if(!ipv4)
hints.ai_family = AF_INET6;
else
hints.ai_family = 0;*/
int rc = getaddrinfo(argv[i], argv[i + 1], &hints, &info);
if(rc != 0)
throw std::invalid_argument(std::string("getaddrinfo: ") + gai_strerror(rc));
i++;
if(i >= argc)
break;
infop = info;
while (infop) {
sockaddr_storage tmp;
memcpy(&tmp, infop->ai_addr, infop->ai_addrlen);
bootstrap_nodes.push_back(tmp);
infop = infop->ai_next;
}
freeaddrinfo(info);
i++;
}
int rc = gnutls_global_init();
if (rc != GNUTLS_E_SUCCESS)
throw std::runtime_error(std::string("Error initializing GnuTLS: ")+gnutls_strerror(rc));
auto ca_tmp = dht::crypto::generateIdentity("DHT Node CA");
auto crt_tmp = dht::crypto::generateIdentity("DHT Node", ca_tmp);
DhtRunner dht;
dht.run(port, crt_tmp, true, [](dht::Dht::Status ipv4, dht::Dht::Status ipv6) {
std::cout << (int)ipv4 << (int)ipv6 << std::endl;
});
dht.setLoggers(
[](char const* m, va_list args){ std::cerr << red; printLog(std::cerr, m, args); std::cerr << def; },
[](char const* m, va_list args){ std::cout << yellow; printLog(std::cout, m, args); std::cout << def; },
[](char const* m, va_list args){ printLog(std::cout, m, args); }
);
dht.bootstrap(bootstrap_nodes);
#if 0
Dht::InfoHash id = Dht::InfoHash::get("coucou");
i = 0;
while (true)
{
std::vector<uint8_t> data (16,i+1);
dht.put(id, Dht::Value{data}, [i](bool ok) {
std::cout << "Announce done ! %d" << std::hex << (i+1) << std::dec << std::endl;
});
i++;
std::this_thread::sleep_for( std::chrono::milliseconds( 2000 ) );
}
#else
while (true)
{
std::string line;
std::getline(std::cin, line);
std::istringstream iss(line);
std::string op, idstr, value;
iss >> op >> idstr;
if (op == "x") {
break;
}
dht::InfoHash id {idstr};
if (op == "g") {
dht.get(id, [](const std::vector<std::shared_ptr<Value>>& values) {
std::cout << "Get - found values : " << std::endl;
for (const auto& a : values) {
std::cout << "\t" << *a << std::endl;
}
return true;
});
}
else if (op == "p") {
std::string v;
iss >> v;
dht.put(id, dht::Value {
dht::ValueType::USER_DATA.id,
std::vector<uint8_t> {v.begin(), v.end()}
}, [](bool ok) {
std::cout << "Put done !" << ok << std::endl;
});
}
else if (op == "e") {
std::string tostr;
std::string v;
iss >> tostr >> v;
dht.putEncrypted(id, tostr, dht::Value {
dht::ValueType::USER_DATA.id,
std::vector<uint8_t> {v.begin(), v.end()}
}, [](bool ok) {
std::cout << "Put encrypted done !" << ok << std::endl;
});
}
else if (op == "a") {
in_port_t port;
iss >> port;
dht.put(id, dht::Value {dht::ServiceAnnouncement::TYPE.id, dht::ServiceAnnouncement(port)}, [](bool ok) {
std::cout << "Announce done !" << ok << std::endl;
});
}
}
#endif
dht.join();
gnutls_global_deinit();
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment