mirror of https://github.com/oxen-io/lokinet
prepare for 0.5.0
parent
b9cb59f021
commit
78d191bd75
@ -1,2 +1,2 @@
|
||||
HeaderFilterRegex: 'llarp/.*'
|
||||
Checks: 'readability-else-after-return,clang-analyzer-core-*'
|
||||
Checks: 'readability-else-after-return,clang-analyzer-core-*,modernize-*'
|
||||
|
@ -1,28 +1,16 @@
|
||||
set(CMAKE_SYSTEM_NAME Windows)
|
||||
set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
|
||||
set(TOOLCHAIN_SUFFIX "")
|
||||
set(WIN64_CROSS_COMPILE ON)
|
||||
|
||||
add_definitions("-DWINNT_CROSS_COMPILE")
|
||||
|
||||
# target environment on the build host system
|
||||
# second one is for non-root installs
|
||||
set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /usr/local/opt/mingw-w64/toolchain-x86_64/ /opt/mingw64 /home/$ENV{USER}/mingw32 /home/$ENV{USER}/mingw64 /home/$ENV{USER}/mingw64/${TOOLCHAIN_PREFIX} /home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX})
|
||||
|
||||
# modify default behavior of FIND_XXX() commands
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
|
||||
# cross compilers to use
|
||||
if($ENV{COMPILER} MATCHES "clang")
|
||||
set(USING_CLANG ON)
|
||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-clang)
|
||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-clang++)
|
||||
else()
|
||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${TOOLCHAIN_SUFFIX})
|
||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${TOOLCHAIN_SUFFIX})
|
||||
add_compile_options("-Wa,-mbig-obj")
|
||||
endif()
|
||||
set(TOOLCHAIN_PATHS
|
||||
/usr/${TOOLCHAIN_PREFIX}
|
||||
/usr/local/opt/mingw-w64/toolchain-x86_64
|
||||
/usr/local/opt/mingw-w64/toolchain-x86_64/x86_64-w64-mingw32
|
||||
/opt/mingw64
|
||||
/home/$ENV{USER}/mingw32
|
||||
/home/$ENV{USER}/mingw64
|
||||
/home/$ENV{USER}/mingw64/${TOOLCHAIN_PREFIX}
|
||||
/home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX})
|
||||
|
||||
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
||||
set(WIN64_CROSS_COMPILE ON)
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/mingw_core.cmake")
|
||||
|
@ -1,26 +1,15 @@
|
||||
set(CMAKE_SYSTEM_NAME Windows)
|
||||
set(TOOLCHAIN_PREFIX i686-w64-mingw32)
|
||||
set(TOOLCHAIN_SUFFIX "")
|
||||
set(WOW64_CROSS_COMPILE ON)
|
||||
|
||||
add_definitions("-DWINNT_CROSS_COMPILE")
|
||||
|
||||
# target environment on the build host system
|
||||
# second one is for non-root installs
|
||||
set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} /opt/mingw32 /home/$ENV{USER}/mingw32 /home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX})
|
||||
|
||||
# modify default behavior of FIND_XXX() commands
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
|
||||
# cross compilers to use
|
||||
if($ENV{COMPILER} MATCHES "clang")
|
||||
set(USING_CLANG ON)
|
||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-clang)
|
||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-clang++)
|
||||
else()
|
||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
|
||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
|
||||
endif()
|
||||
set(TOOLCHAIN_PATHS
|
||||
/usr/${TOOLCHAIN_PREFIX}
|
||||
/usr/local/opt/mingw-w64/toolchain-i686
|
||||
/usr/local/opt/mingw-w64/toolchain-i686/i686-w64-mingw32
|
||||
/opt/mingw32
|
||||
/home/$ENV{USER}/mingw32
|
||||
/home/$ENV{USER}/mingw32/${TOOLCHAIN_PREFIX}
|
||||
)
|
||||
|
||||
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
||||
set(WOW64_CROSS_COMPILE ON)
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/mingw_core.cmake")
|
||||
|
@ -1,2 +1,3 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
typedef int32_t crypto_int32;
|
||||
typedef int32_t crypto_int32;
|
||||
|
@ -1,2 +1,3 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
typedef uint32_t crypto_uint32;
|
||||
typedef uint32_t crypto_uint32;
|
||||
|
@ -1,598 +1,99 @@
|
||||
#include <buffer.hpp>
|
||||
#include <crypto/crypto.hpp>
|
||||
#include <fs.hpp>
|
||||
#include <llarp.h>
|
||||
#include <logger.hpp>
|
||||
#include <messages/dht.hpp>
|
||||
#include <net.hpp>
|
||||
#include <nodedb.hpp>
|
||||
#include <router.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <time.hpp>
|
||||
#include <util/logger.hpp>
|
||||
#include <util/ostream_logger.hpp>
|
||||
|
||||
#include <fstream>
|
||||
#include <getopt.h>
|
||||
#include <signal.h>
|
||||
#include <absl/synchronization/mutex.h>
|
||||
#include <cxxopts.hpp>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
struct llarp_main *ctx = 0;
|
||||
|
||||
void
|
||||
handle_signal(int sig)
|
||||
{
|
||||
if(ctx)
|
||||
llarp_main_signal(ctx, sig);
|
||||
}
|
||||
|
||||
#ifndef TESTNET
|
||||
#define TESTNET 0
|
||||
#endif
|
||||
|
||||
void
|
||||
displayRC(const llarp::RouterContact &rc)
|
||||
{
|
||||
std::cout << rc.pubkey << std::endl;
|
||||
for(const auto &addr : rc.addrs)
|
||||
{
|
||||
std::cout << "AddressInfo: " << addr << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
// fwd declr
|
||||
struct check_online_request;
|
||||
|
||||
void
|
||||
HandleDHTLocate(llarp_router_lookup_job *job)
|
||||
bool
|
||||
dumpRc(const std::vector< std::string >& files, bool json)
|
||||
{
|
||||
llarp::LogInfo("DHT result: ", job->found ? "found" : "not found");
|
||||
if(job->found)
|
||||
{
|
||||
// save to nodedb?
|
||||
displayRC(job->result);
|
||||
}
|
||||
// shutdown router
|
||||
|
||||
// well because we're in the gotroutermessage, we can't sigint because we'll
|
||||
// deadlock because we're session locked
|
||||
// llarp_main_signal(ctx, SIGINT);
|
||||
|
||||
// llarp_timer_run(logic->timer, logic->thread);
|
||||
// we'll we don't want logic thread
|
||||
// but we want to switch back to the main thread
|
||||
// llarp_logic_stop();
|
||||
// still need to exit this logic thread...
|
||||
llarp_main_abort(ctx);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
// take -c to set location of daemon.ini
|
||||
// take -o to set log level
|
||||
// --generate-blank /path/to/file.signed
|
||||
// --update-ifs /path/to/file.signed
|
||||
// --key /path/to/long_term_identity.key
|
||||
// --import
|
||||
// --export
|
||||
|
||||
// --generate /path/to/file.signed
|
||||
// --update /path/to/file.signed
|
||||
// --verify /path/to/file.signed
|
||||
// printf("has [%d]options\n", argc);
|
||||
if(argc < 2)
|
||||
{
|
||||
printf(
|
||||
"please specify: \n"
|
||||
"--generate with a path to a router contact file\n"
|
||||
"--update with a path to a router contact file\n"
|
||||
"--list path to nodedb skiplist\n"
|
||||
"--import with a path to a router contact file\n"
|
||||
"--export a hex formatted public key\n"
|
||||
"--locate a hex formatted public key\n"
|
||||
"--find a base32 formatted service address\n"
|
||||
"--b32 a hex formatted public key\n"
|
||||
"--hex a base32 formatted public key\n"
|
||||
"--localInfo \n"
|
||||
"--read with a path to a router contact file\n"
|
||||
"--verify with a path to a router contact file\n"
|
||||
"\n");
|
||||
return 0;
|
||||
}
|
||||
bool haveRequiredOptions = false;
|
||||
bool genMode = false;
|
||||
bool updMode = false;
|
||||
bool listMode = false;
|
||||
bool importMode = false;
|
||||
bool exportMode = false;
|
||||
bool locateMode = false;
|
||||
bool findMode = false;
|
||||
bool localMode = false;
|
||||
bool verifyMode = false;
|
||||
bool readMode = false;
|
||||
bool toHexMode = false;
|
||||
bool toB32Mode = false;
|
||||
int c;
|
||||
char *conffname;
|
||||
char defaultConfName[] = "daemon.ini";
|
||||
conffname = defaultConfName;
|
||||
char *rcfname = nullptr;
|
||||
char *nodesdir = nullptr;
|
||||
|
||||
llarp::RouterContact rc;
|
||||
while(1)
|
||||
{
|
||||
static struct option long_options[] = {
|
||||
{"file", required_argument, 0, 'f'},
|
||||
{"config", required_argument, 0, 'c'},
|
||||
{"logLevel", required_argument, 0, 'o'},
|
||||
{"generate", required_argument, 0, 'g'},
|
||||
{"update", required_argument, 0, 'u'},
|
||||
{"list", required_argument, 0, 'l'},
|
||||
{"import", required_argument, 0, 'i'},
|
||||
{"export", required_argument, 0, 'e'},
|
||||
{"locate", required_argument, 0, 'q'},
|
||||
{"find", required_argument, 0, 'F'},
|
||||
{"localInfo", no_argument, 0, 'n'},
|
||||
{"read", required_argument, 0, 'r'},
|
||||
{"b32", required_argument, 0, 'b'},
|
||||
{"hex", required_argument, 0, 'h'},
|
||||
{"verify", required_argument, 0, 'V'},
|
||||
{0, 0, 0, 0}};
|
||||
int option_index = 0;
|
||||
c = getopt_long(argc, argv, "c:f:o:g:lu:i:e:q:F:nr:b:h:V:", long_options,
|
||||
&option_index);
|
||||
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
|
||||
if(c == -1)
|
||||
break;
|
||||
switch(c)
|
||||
{
|
||||
case 0:
|
||||
break;
|
||||
case 'c':
|
||||
conffname = optarg;
|
||||
break;
|
||||
case 'o':
|
||||
if(strncmp(optarg, "debug",
|
||||
MIN(strlen(optarg), static_cast< unsigned long >(5)))
|
||||
== 0)
|
||||
{
|
||||
llarp::SetLogLevel(llarp::eLogDebug);
|
||||
}
|
||||
else if(strncmp(optarg, "info",
|
||||
MIN(strlen(optarg), static_cast< unsigned long >(4)))
|
||||
== 0)
|
||||
{
|
||||
llarp::SetLogLevel(llarp::eLogInfo);
|
||||
}
|
||||
else if(strncmp(optarg, "warn",
|
||||
MIN(strlen(optarg), static_cast< unsigned long >(4)))
|
||||
== 0)
|
||||
{
|
||||
llarp::SetLogLevel(llarp::eLogWarn);
|
||||
}
|
||||
else if(strncmp(optarg, "error",
|
||||
MIN(strlen(optarg), static_cast< unsigned long >(5)))
|
||||
== 0)
|
||||
{
|
||||
llarp::SetLogLevel(llarp::eLogError);
|
||||
}
|
||||
break;
|
||||
case 'V':
|
||||
rcfname = optarg;
|
||||
haveRequiredOptions = true;
|
||||
verifyMode = true;
|
||||
break;
|
||||
case 'f':
|
||||
rcfname = optarg;
|
||||
break;
|
||||
case 'l':
|
||||
nodesdir = optarg;
|
||||
listMode = true;
|
||||
break;
|
||||
case 'i':
|
||||
// printf ("option -g with value `%s'\n", optarg);
|
||||
nodesdir = optarg;
|
||||
importMode = true;
|
||||
break;
|
||||
case 'e':
|
||||
// printf ("option -g with value `%s'\n", optarg);
|
||||
rcfname = optarg;
|
||||
exportMode = true;
|
||||
break;
|
||||
case 'q':
|
||||
// printf ("option -g with value `%s'\n", optarg);
|
||||
rcfname = optarg;
|
||||
locateMode = true;
|
||||
break;
|
||||
case 'F':
|
||||
rcfname = optarg;
|
||||
haveRequiredOptions = true;
|
||||
findMode = true;
|
||||
break;
|
||||
case 'g':
|
||||
// printf ("option -g with value `%s'\n", optarg);
|
||||
rcfname = optarg;
|
||||
genMode = true;
|
||||
break;
|
||||
case 'u':
|
||||
// printf ("option -u with value `%s'\n", optarg);
|
||||
rcfname = optarg;
|
||||
updMode = true;
|
||||
break;
|
||||
case 'n':
|
||||
localMode = true;
|
||||
break;
|
||||
case 'r':
|
||||
rcfname = optarg;
|
||||
readMode = true;
|
||||
break;
|
||||
case 'b':
|
||||
rcfname = optarg;
|
||||
haveRequiredOptions = true;
|
||||
toB32Mode = true;
|
||||
break;
|
||||
case 'h':
|
||||
rcfname = optarg;
|
||||
haveRequiredOptions = true;
|
||||
toHexMode = true;
|
||||
break;
|
||||
default:
|
||||
printf("Bad option: %c\n", c);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#undef MIN
|
||||
if(!haveRequiredOptions)
|
||||
{
|
||||
llarp::LogError("Parameters dont all have their required parameters.\n");
|
||||
return 0;
|
||||
}
|
||||
// printf("parsed options\n");
|
||||
|
||||
if(!genMode && !updMode && !listMode && !importMode && !exportMode
|
||||
&& !locateMode && !localMode && !readMode && !findMode && !toB32Mode
|
||||
&& !toHexMode && !verifyMode)
|
||||
nlohmann::json result;
|
||||
for(const auto& file : files)
|
||||
{
|
||||
llarp::LogError(
|
||||
"I don't know what to do, no generate or update parameter\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifdef LOKINET_DEBUG
|
||||
absl::SetMutexDeadlockDetectionMode(absl::OnDeadlockCycle::kAbort);
|
||||
#endif
|
||||
llarp::RouterContact rc;
|
||||
const bool ret = rc.Read(file.c_str());
|
||||
|
||||
llarp::RouterContact tmp;
|
||||
|
||||
if(verifyMode)
|
||||
{
|
||||
llarp::Crypto crypto(llarp::Crypto::sodium{});
|
||||
if(!rc.Read(rcfname))
|
||||
if(ret)
|
||||
{
|
||||
std::cout << "failed to read " << rcfname << std::endl;
|
||||
return 1;
|
||||
}
|
||||
if(!rc.Verify(&crypto))
|
||||
{
|
||||
std::cout << rcfname << " is invalid" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
if(!rc.IsPublicRouter())
|
||||
{
|
||||
std::cout << rcfname << " is not a public router";
|
||||
if(rc.addrs.size() == 0)
|
||||
if(json)
|
||||
{
|
||||
std::cout << " because it has no public addresses";
|
||||
result[file] = rc.ToJson();
|
||||
}
|
||||
std::cout << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
std::cout << "router identity and dht routing key: " << rc.pubkey
|
||||
<< std::endl;
|
||||
|
||||
std::cout << "router encryption key: " << rc.enckey << std::endl;
|
||||
|
||||
if(rc.HasNick())
|
||||
std::cout << "router nickname: " << rc.Nick() << std::endl;
|
||||
|
||||
std::cout << "advertised addresses: " << std::endl;
|
||||
for(const auto &addr : rc.addrs)
|
||||
{
|
||||
std::cout << addr << std::endl;
|
||||
}
|
||||
std::cout << std::endl;
|
||||
|
||||
std::cout << "advertised exits: ";
|
||||
if(rc.exits.size())
|
||||
{
|
||||
for(const auto &exit : rc.exits)
|
||||
else
|
||||
{
|
||||
std::cout << exit << std::endl;
|
||||
std::cout << "file = " << file << "\n";
|
||||
std::cout << rc << "\n\n";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "none";
|
||||
std::cerr << "file = " << file << " was not a valid rc file\n";
|
||||
}
|
||||
std::cout << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
ctx = llarp_main_init(conffname, !TESTNET);
|
||||
if(!ctx)
|
||||
{
|
||||
llarp::LogError("Cant set up context");
|
||||
return 1;
|
||||
}
|
||||
signal(SIGINT, handle_signal);
|
||||
if(json)
|
||||
std::cout << result << "\n";
|
||||
|
||||
// is this Neuro or Jeff's?
|
||||
// this is the only one...
|
||||
if(listMode)
|
||||
{
|
||||
llarp::Crypto crypto(llarp::Crypto::sodium{});
|
||||
auto nodedb = llarp_nodedb_new(&crypto);
|
||||
llarp_nodedb_iter itr;
|
||||
itr.visit = [](llarp_nodedb_iter *i) -> bool {
|
||||
std::cout << i->rc->pubkey << std::endl;
|
||||
return true;
|
||||
};
|
||||
if(llarp_nodedb_load_dir(nodedb, nodesdir) > 0)
|
||||
llarp_nodedb_iterate_all(nodedb, itr);
|
||||
llarp_nodedb_free(&nodedb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(importMode)
|
||||
{
|
||||
if(rcfname == nullptr)
|
||||
{
|
||||
std::cout << "no file to import" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
llarp::Crypto crypto(llarp::Crypto::sodium{});
|
||||
auto nodedb = llarp_nodedb_new(&crypto);
|
||||
if(!llarp_nodedb_ensure_dir(nodesdir))
|
||||
{
|
||||
std::cout << "failed to ensure " << nodesdir << strerror(errno)
|
||||
<< std::endl;
|
||||
return 1;
|
||||
}
|
||||
llarp_nodedb_set_dir(nodedb, nodesdir);
|
||||
if(!rc.Read(rcfname))
|
||||
{
|
||||
std::cout << "failed to read " << rcfname << " " << strerror(errno)
|
||||
<< std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if(!rc.Verify(&crypto))
|
||||
{
|
||||
std::cout << rcfname << " is invalid" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
if(!llarp_nodedb_put_rc(nodedb, rc))
|
||||
{
|
||||
std::cout << "failed to store " << strerror(errno) << std::endl;
|
||||
return 1;
|
||||
}
|
||||
int
|
||||
main(int argc, char* argv[])
|
||||
{
|
||||
#ifdef LOKINET_DEBUG
|
||||
absl::SetMutexDeadlockDetectionMode(absl::OnDeadlockCycle::kAbort);
|
||||
#endif
|
||||
|
||||
std::cout << "imported " << rc.pubkey << std::endl;
|
||||
// clang-format off
|
||||
cxxopts::Options options(
|
||||
"lokinet-rcutil",
|
||||
"LokiNET is a free, open source, private, decentralized, \"market based sybil resistant\" and IP based onion routing network"
|
||||
);
|
||||
|
||||
return 0;
|
||||
}
|
||||
options.add_options()
|
||||
("v,verbose", "Verbose", cxxopts::value<bool>())
|
||||
("h,help", "help", cxxopts::value<bool>())
|
||||
("j,json", "output in json", cxxopts::value<bool>())
|
||||
("dump", "dump rc file", cxxopts::value<std::vector<std::string> >(), "FILE");
|
||||
// clang-format on
|
||||
|
||||
if(genMode)
|
||||
try
|
||||
{
|
||||
printf("Creating [%s]\n", rcfname);
|
||||
// if we zero it out then
|
||||
// set updated timestamp
|
||||
rc.last_updated = llarp::time_now_ms();
|
||||
// load longterm identity
|
||||
llarp::Crypto crypt(llarp::Crypto::sodium{});
|
||||
|
||||
// which is in daemon.ini config: router.encryption-privkey (defaults
|
||||
// "encryption.key")
|
||||
fs::path encryption_keyfile = "encryption.key";
|
||||
llarp::SecretKey encryption;
|
||||
const auto result = options.parse(argc, argv);
|
||||
|
||||
llarp_findOrCreateEncryption(&crypt, encryption_keyfile, encryption);
|
||||
const bool json = result["json"].as< bool >();
|
||||
|
||||
rc.enckey = llarp::seckey_topublic(encryption);
|
||||
|
||||
// get identity public sig key
|
||||
fs::path ident_keyfile = "identity.key";
|
||||
llarp::SecretKey identity;
|
||||
llarp_findOrCreateIdentity(&crypt, ident_keyfile, identity);
|
||||
|
||||
rc.pubkey = llarp::seckey_topublic(identity);
|
||||
|
||||
// this causes a segfault
|
||||
if(!rc.Sign(&crypt, identity))
|
||||
if(result.count("verbose") > 0)
|
||||
{
|
||||
std::cout << "failed to sign" << std::endl;
|
||||
return 1;
|
||||
SetLogLevel(llarp::eLogDebug);
|
||||
llarp::LogContext::Instance().logStream =
|
||||
std::make_unique< llarp::OStreamLogStream >(std::cerr);
|
||||
llarp::LogDebug("debug logging activated");
|
||||
}
|
||||
// set filename
|
||||
fs::path our_rc_file = rcfname;
|
||||
// write file
|
||||
rc.Write(our_rc_file.string().c_str());
|
||||
|
||||
// llarp_rc_write(&tmp, our_rc_file.string().c_str());
|
||||
|
||||
// release memory for tmp lists
|
||||
// llarp_rc_free(&tmp);
|
||||
}
|
||||
if(updMode)
|
||||
{
|
||||
printf("rcutil.cpp - Loading [%s]\n", rcfname);
|
||||
llarp::RouterContact tmp;
|
||||
// llarp_rc_clear(&rc);
|
||||
rc.Clear();
|
||||
// FIXME: new rc api
|
||||
// llarp_rc_read(rcfname, &rc);
|
||||
|
||||
// set updated timestamp
|
||||
rc.last_updated = llarp::time_now_ms();
|
||||
// load longterm identity
|
||||
llarp::Crypto crypt(llarp::Crypto::sodium{});
|
||||
|
||||
// no longer used?
|
||||
// llarp_crypto_libsodium_init(&crypt);
|
||||
llarp::SecretKey identityKey; // FIXME: Jeff requests we use this
|
||||
fs::path ident_keyfile = "identity.key";
|
||||
llarp::SecretKey identity;
|
||||
llarp_findOrCreateIdentity(&crypt, ident_keyfile, identity);
|
||||
|
||||
// FIXME: update RC API
|
||||
// get identity public key
|
||||
// const uint8_t *pubkey = llarp::seckey_topublic(identity);
|
||||
|
||||
// FIXME: update RC API
|
||||
// llarp_rc_set_pubsigkey(&rc, pubkey);
|
||||
// // FIXME: update RC API
|
||||
// llarp_rc_sign(&crypt, identity, &rc);
|
||||
|
||||
// set filename
|
||||
fs::path our_rc_file_out = "update_debug.rc";
|
||||
// write file
|
||||
// FIXME: update RC API
|
||||
// rc.Write(our_rc_file.string().c_str());
|
||||
// llarp_rc_write(&tmp, our_rc_file_out.string().c_str());
|
||||
}
|
||||
|
||||
if(listMode)
|
||||
{
|
||||
llarp::Crypto crypto(llarp::Crypto::sodium{});
|
||||
auto nodedb = llarp_nodedb_new(&crypto);
|
||||
llarp_nodedb_iter itr;
|
||||
itr.visit = [](llarp_nodedb_iter *i) -> bool {
|
||||
std::cout << llarp::PubKey(i->rc->pubkey) << std::endl;
|
||||
return true;
|
||||
};
|
||||
if(llarp_nodedb_load_dir(nodedb, nodesdir) > 0)
|
||||
llarp_nodedb_iterate_all(nodedb, itr);
|
||||
llarp_nodedb_free(&nodedb);
|
||||
return 0;
|
||||
}
|
||||
if(exportMode)
|
||||
{
|
||||
llarp_main_loadDatabase(ctx);
|
||||
// llarp::LogInfo("Looking for string: ", rcfname);
|
||||
|
||||
llarp::PubKey binaryPK;
|
||||
llarp::HexDecode(rcfname, binaryPK.data(), binaryPK.size());
|
||||
|
||||
llarp::LogInfo("Looking for binary: ", binaryPK);
|
||||
llarp::RouterContact *rc = llarp_main_getDatabase(ctx, binaryPK.data());
|
||||
if(!rc)
|
||||
if(result.count("help") > 0)
|
||||
{
|
||||
llarp::LogError("Can't load RC from database");
|
||||
std::cout << options.help() << std::endl;
|
||||
return 0;
|
||||
}
|
||||
std::string filename(rcfname);
|
||||
filename.append(".signed");
|
||||
llarp::LogInfo("Writing out: ", filename);
|
||||
// FIXME: update RC API
|
||||
// rc.Write(our_rc_file.string().c_str());
|
||||
// llarp_rc_write(rc, filename.c_str());
|
||||
}
|
||||
if(locateMode)
|
||||
{
|
||||
llarp::LogInfo("Going online");
|
||||
llarp_main_setup(ctx);
|
||||
|
||||
llarp::PubKey binaryPK;
|
||||
llarp::HexDecode(rcfname, binaryPK.data(), binaryPK.size());
|
||||
|
||||
llarp::LogInfo("Queueing job");
|
||||
llarp_router_lookup_job *job = new llarp_router_lookup_job;
|
||||
job->iterative = true;
|
||||
job->found = false;
|
||||
job->hook = &HandleDHTLocate;
|
||||
// llarp_rc_new(&job->result);
|
||||
job->target = binaryPK; // set job's target
|
||||
|
||||
// create query DHT request
|
||||
check_online_request *request = new check_online_request;
|
||||
request->ptr = ctx;
|
||||
request->job = job;
|
||||
request->online = false;
|
||||
request->nodes = 0;
|
||||
request->first = false;
|
||||
llarp_main_queryDHT(request);
|
||||
|
||||
llarp::LogInfo("Processing");
|
||||
// run system and wait
|
||||
llarp_main_run(ctx);
|
||||
}
|
||||
if(findMode)
|
||||
{
|
||||
llarp::LogInfo("Going online");
|
||||
llarp_main_setup(ctx);
|
||||
|
||||
llarp::LogInfo("Please find ", rcfname);
|
||||
std::string str(rcfname);
|
||||
|
||||
llarp::service::Tag tag(rcfname);
|
||||
llarp::LogInfo("Tag ", tag);
|
||||
|
||||
llarp::service::Address addr;
|
||||
str = str.append(".loki");
|
||||
llarp::LogInfo("Prestring ", str);
|
||||
bool res = addr.FromString(str.c_str());
|
||||
llarp::LogInfo(res ? "Success" : "not a base32 string");
|
||||
|
||||
// Base32Decode(rcfname, addr);
|
||||
llarp::LogInfo("Addr ", addr);
|
||||
|
||||
// uint64_t txid, const llarp::service::Address& addr
|
||||
// FIXME: new API?
|
||||
// msg->M.push_back(new llarp::dht::FindIntroMessage(tag, 1));
|
||||
|
||||
// I guess we may need a router to get any replies
|
||||
llarp::LogInfo("Processing");
|
||||
// run system and wait
|
||||
llarp_main_run(ctx);
|
||||
}
|
||||
if(localMode)
|
||||
{
|
||||
// FIXME: update llarp_main_getLocalRC
|
||||
// llarp::RouterContact *rc = llarp_main_getLocalRC(ctx);
|
||||
// displayRC(rc);
|
||||
// delete it
|
||||
}
|
||||
{
|
||||
if(rc.Read(rcfname))
|
||||
displayRC(rc);
|
||||
if(result.count("dump") > 0)
|
||||
{
|
||||
if(!dumpRc(result["dump"].as< std::vector< std::string > >(), json))
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(toB32Mode)
|
||||
catch(const cxxopts::OptionParseException& ex)
|
||||
{
|
||||
llarp::LogInfo("Converting hex string ", rcfname);
|
||||
std::string str(rcfname);
|
||||
|
||||
llarp::PubKey binaryPK;
|
||||
// llarp::service::Address::FromString
|
||||
llarp::HexDecode(rcfname, binaryPK.data(), binaryPK.size());
|
||||
char tmp[(1 + 32) * 2] = {0};
|
||||
std::string b32 = llarp::Base32Encode(binaryPK, tmp);
|
||||
llarp::LogInfo("to base32 ", b32);
|
||||
std::cerr << ex.what() << std::endl;
|
||||
std::cout << options.help() << std::endl;
|
||||
return 1;
|
||||
}
|
||||
if(toHexMode)
|
||||
{
|
||||
llarp::service::Address addr;
|
||||
llarp::Base32Decode(rcfname, addr);
|
||||
llarp::LogInfo("Converting base32 string ", addr);
|
||||
|
||||
// llarp::service::Address::ToString
|
||||
char ftmp[68] = {0};
|
||||
const char *hexname =
|
||||
llarp::HexEncode< llarp::service::Address, decltype(ftmp) >(addr, ftmp);
|
||||
|
||||
llarp::LogInfo("to hex ", hexname);
|
||||
}
|
||||
// it's a unique_ptr, should clean up itself
|
||||
// llarp_main_free(ctx);
|
||||
return 0; // success
|
||||
return 0;
|
||||
}
|
||||
|
@ -1,3 +1,6 @@
|
||||
#include <constants/version.hpp>
|
||||
|
||||
const char Version::LLARP_NET_ID[] = "testnet";
|
||||
#ifndef LLARP_DEFAULT_NETID
|
||||
#define LLARP_DEFAULT_NETID "testnet"
|
||||
#endif
|
||||
const char Version::LLARP_NET_ID[] = LLARP_DEFAULT_NETID;
|
||||
|
@ -1,156 +0,0 @@
|
||||
#include <iwp/outermessage.hpp>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
namespace iwp
|
||||
{
|
||||
std::array< byte_t, 6 > OuterMessage::obtain_flow_id_magic =
|
||||
std::array< byte_t, 6 >{{'n', 'e', 't', 'i', 'd', '?'}};
|
||||
|
||||
std::array< byte_t, 6 > OuterMessage::give_flow_id_magic =
|
||||
std::array< byte_t, 6 >{{'n', 'e', 't', 'i', 'd', '!'}};
|
||||
|
||||
OuterMessage::OuterMessage()
|
||||
{
|
||||
Clear();
|
||||
}
|
||||
|
||||
OuterMessage::~OuterMessage()
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
OuterMessage::Clear()
|
||||
{
|
||||
command = 0;
|
||||
flow.Zero();
|
||||
netid.Zero();
|
||||
reject.fill(0);
|
||||
N.Zero();
|
||||
X.Zero();
|
||||
Xsize = 0;
|
||||
Zsig.Zero();
|
||||
Zhash.Zero();
|
||||
pubkey.Zero();
|
||||
magic.fill(0);
|
||||
uinteger = 0;
|
||||
A.reset();
|
||||
}
|
||||
|
||||
void
|
||||
OuterMessage::CreateReject(const char* msg, llarp_time_t now,
|
||||
const PubKey& pk)
|
||||
{
|
||||
Clear();
|
||||
std::copy_n(msg, std::min(strlen(msg), reject.size()), reject.begin());
|
||||
uinteger = now;
|
||||
pubkey = pk;
|
||||
}
|
||||
|
||||
bool
|
||||
OuterMessage::Encode(llarp_buffer_t* buf) const
|
||||
{
|
||||
if(buf->size_left() < 2)
|
||||
return false;
|
||||
*buf->cur = command;
|
||||
buf->cur++;
|
||||
*buf->cur = '=';
|
||||
buf->cur++;
|
||||
switch(command)
|
||||
{
|
||||
case eOCMD_ObtainFlowID:
|
||||
|
||||
case eOCMD_GiveFlowID:
|
||||
if(!buf->write(reject.begin(), reject.end()))
|
||||
return false;
|
||||
if(!buf->write(give_flow_id_magic.begin(), give_flow_id_magic.end()))
|
||||
return false;
|
||||
if(!buf->write(flow.begin(), flow.end()))
|
||||
return false;
|
||||
if(!buf->write(pubkey.begin(), pubkey.end()))
|
||||
return false;
|
||||
return buf->write(Zsig.begin(), Zsig.end());
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool
|
||||
OuterMessage::Decode(llarp_buffer_t* buf)
|
||||
{
|
||||
static constexpr size_t header_size = 2;
|
||||
|
||||
if(buf->size_left() < header_size)
|
||||
return false;
|
||||
command = *buf->cur;
|
||||
++buf->cur;
|
||||
if(*buf->cur != '=')
|
||||
return false;
|
||||
++buf->cur;
|
||||
switch(command)
|
||||
{
|
||||
case eOCMD_ObtainFlowID:
|
||||
if(!buf->read_into(magic.begin(), magic.end()))
|
||||
return false;
|
||||
if(!buf->read_into(netid.begin(), netid.end()))
|
||||
return false;
|
||||
if(!buf->read_uint64(uinteger))
|
||||
return false;
|
||||
if(!buf->read_into(pubkey.begin(), pubkey.end()))
|
||||
return false;
|
||||
if(buf->size_left() <= Zsig.size())
|
||||
return false;
|
||||
Xsize = buf->size_left() - Zsig.size();
|
||||
if(!buf->read_into(X.begin(), X.begin() + Xsize))
|
||||
return false;
|
||||
return buf->read_into(Zsig.begin(), Zsig.end());
|
||||
case eOCMD_GiveFlowID:
|
||||
if(!buf->read_into(magic.begin(), magic.end()))
|
||||
return false;
|
||||
if(!buf->read_into(flow.begin(), flow.end()))
|
||||
return false;
|
||||
if(!buf->read_into(pubkey.begin(), pubkey.end()))
|
||||
return false;
|
||||
buf->cur += buf->size_left() - Zsig.size();
|
||||
return buf->read_into(Zsig.begin(), Zsig.end());
|
||||
case eOCMD_Reject:
|
||||
if(!buf->read_into(reject.begin(), reject.end()))
|
||||
return false;
|
||||
if(!buf->read_uint64(uinteger))
|
||||
return false;
|
||||
if(!buf->read_into(pubkey.begin(), pubkey.end()))
|
||||
return false;
|
||||
buf->cur += buf->size_left() - Zsig.size();
|
||||
return buf->read_into(Zsig.begin(), Zsig.end());
|
||||
case eOCMD_SessionNegotiate:
|
||||
if(!buf->read_into(flow.begin(), flow.end()))
|
||||
return false;
|
||||
if(!buf->read_into(pubkey.begin(), pubkey.end()))
|
||||
return false;
|
||||
if(!buf->read_uint64(uinteger))
|
||||
return false;
|
||||
if(buf->size_left() == Zsig.size() + 32)
|
||||
{
|
||||
A.reset(new AlignedBuffer< 32 >());
|
||||
if(!buf->read_into(A->begin(), A->end()))
|
||||
return false;
|
||||
}
|
||||
return buf->read_into(Zsig.begin(), Zsig.end());
|
||||
case eOCMD_TransmitData:
|
||||
if(!buf->read_into(flow.begin(), flow.end()))
|
||||
return false;
|
||||
if(!buf->read_into(N.begin(), N.end()))
|
||||
return false;
|
||||
if(buf->size_left() <= Zhash.size())
|
||||
return false;
|
||||
Xsize = buf->size_left() - Zhash.size();
|
||||
if(!buf->read_into(X.begin(), X.begin() + Xsize))
|
||||
return false;
|
||||
return buf->read_into(Zhash.begin(), Zhash.end());
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
} // namespace iwp
|
||||
|
||||
} // namespace llarp
|
@ -1,86 +0,0 @@
|
||||
#ifndef LLARP_IWP_OUTERMESSAGE_HPP
|
||||
#define LLARP_IWP_OUTERMESSAGE_HPP
|
||||
|
||||
#include <crypto/types.hpp>
|
||||
#include <router_contact.hpp>
|
||||
#include <util/aligned.hpp>
|
||||
|
||||
#include <array>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
namespace iwp
|
||||
{
|
||||
using FlowID_t = AlignedBuffer< 32 >;
|
||||
|
||||
using OuterCommand_t = byte_t;
|
||||
|
||||
constexpr OuterCommand_t eOCMD_ObtainFlowID = 'O';
|
||||
constexpr OuterCommand_t eOCMD_GiveFlowID = 'G';
|
||||
constexpr OuterCommand_t eOCMD_Reject = 'R';
|
||||
constexpr OuterCommand_t eOCMD_SessionNegotiate = 'S';
|
||||
constexpr OuterCommand_t eOCMD_TransmitData = 'D';
|
||||
|
||||
using InnerCommand_t = byte_t;
|
||||
|
||||
constexpr InnerCommand_t eICMD_KeepAlive = 'k';
|
||||
constexpr InnerCommand_t eICMD_KeepAliveAck = 'l';
|
||||
constexpr InnerCommand_t eICMD_Congestion = 'c';
|
||||
constexpr InnerCommand_t eICMD_AntiCongestion = 'd';
|
||||
constexpr InnerCommand_t eICMD_Transmit = 't';
|
||||
constexpr InnerCommand_t eICMD_Ack = 'a';
|
||||
constexpr InnerCommand_t eICMD_RotateKeys = 'r';
|
||||
constexpr InnerCommand_t eICMD_UpgradeProtocol = 'u';
|
||||
constexpr InnerCommand_t eICMD_VersionUpgrade = 'v';
|
||||
|
||||
struct OuterMessage
|
||||
{
|
||||
// required members
|
||||
byte_t command;
|
||||
FlowID_t flow;
|
||||
|
||||
OuterMessage();
|
||||
~OuterMessage();
|
||||
|
||||
// static members
|
||||
static std::array< byte_t, 6 > obtain_flow_id_magic;
|
||||
static std::array< byte_t, 6 > give_flow_id_magic;
|
||||
|
||||
void
|
||||
CreateReject(const char *msg, llarp_time_t now, const PubKey &pk);
|
||||
|
||||
// optional members follow
|
||||
std::array< byte_t, 6 > magic;
|
||||
NetID netid;
|
||||
// either timestamp or counter
|
||||
uint64_t uinteger;
|
||||
std::array< byte_t, 14 > reject;
|
||||
AlignedBuffer< 24 > N;
|
||||
PubKey pubkey;
|
||||
|
||||
std::unique_ptr< AlignedBuffer< 32 > > A;
|
||||
|
||||
static constexpr size_t ipv6_mtu = 1280;
|
||||
static constexpr size_t overhead_size = 16 + 24 + 32;
|
||||
static constexpr size_t payload_size = ipv6_mtu - overhead_size;
|
||||
|
||||
AlignedBuffer< payload_size > X;
|
||||
size_t Xsize;
|
||||
ShortHash Zhash;
|
||||
Signature Zsig;
|
||||
|
||||
/// encode to buffer
|
||||
bool
|
||||
Encode(llarp_buffer_t *buf) const;
|
||||
|
||||
/// decode from buffer
|
||||
bool
|
||||
Decode(llarp_buffer_t *buf);
|
||||
|
||||
/// clear members
|
||||
void
|
||||
Clear();
|
||||
};
|
||||
} // namespace iwp
|
||||
} // namespace llarp
|
||||
#endif
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue