diff --git a/daemon/rcutil.cpp b/daemon/rcutil.cpp index 413b0f4b1..47a697642 100644 --- a/daemon/rcutil.cpp +++ b/daemon/rcutil.cpp @@ -1,190 +1,148 @@ #include -#include #include -#include -#include -#include -#include "fs.hpp" - -static void -progress() -{ - printf("."); - fflush(stdout); -} - -struct llarp_main -{ - struct llarp_crypto crypto; - struct llarp_router *router = nullptr; - struct llarp_threadpool *worker = nullptr; - struct llarp_threadpool *thread = nullptr; - struct llarp_logic *logic = nullptr; - struct llarp_config *config = nullptr; - struct llarp_nodedb *nodedb = nullptr; - struct llarp_ev_loop *mainloop = nullptr; - char nodedb_dir[256]; - int exitcode; - - int - shutdown() - { - printf("Shutting down "); - - progress(); - if(mainloop) - llarp_ev_loop_stop(mainloop); - - progress(); - if(worker) - llarp_threadpool_stop(worker); - - progress(); +#include "logger.hpp" - if(worker) - llarp_threadpool_join(worker); - - progress(); - if(logic) - llarp_logic_stop(logic); - - progress(); - - if(router) - llarp_stop_router(router); - - progress(); - llarp_free_router(&router); - - progress(); - llarp_free_config(&config); - - progress(); - llarp_ev_loop_free(&mainloop); - - progress(); - llarp_free_threadpool(&worker); - - progress(); - - llarp_free_logic(&logic); - progress(); - - printf("\n"); - fflush(stdout); - return exitcode; - } -}; - -void -iter_main_config(struct llarp_config_iterator *itr, const char *section, - const char *key, const char *val) -{ - llarp_main *m = static_cast< llarp_main * >(itr->user); - - if(!strcmp(section, "router")) - { - if(!strcmp(key, "threads")) - { - int workers = atoi(val); - if(workers > 0 && m->worker == nullptr) - { - m->worker = llarp_init_threadpool(workers, "llarp-worker"); - } - } - } - if(!strcmp(section, "netdb")) - { - if(!strcmp(key, "dir")) - { - strncpy(m->nodedb_dir, val, sizeof(m->nodedb_dir)); - } - } -} +struct llarp_main *ctx = 0; llarp_main *sllarp = nullptr; -void -run_net(void *user) -{ - llarp_ev_loop_run(static_cast< llarp_ev_loop * >(user)); -} - void handle_signal(int sig) { - printf("\ninterrupted\n"); - llarp_ev_loop_stop(sllarp->mainloop); - llarp_logic_stop(sllarp->logic); + if(ctx) + llarp_main_signal(ctx, sig); } +#ifndef TESTNET +#define TESTNET 0 +#endif + #include #include #include #include +#include "fs.hpp" +#include "buffer.hpp" +#include "crypto.hpp" + +bool printNode(struct llarp_nodedb_iter *iter) { + char ftmp[68] = {0}; + const char *hexname = + llarp::HexEncode< llarp::PubKey, decltype(ftmp) >(iter->rc->pubkey, ftmp); + + printf("[%d]=>[%s]\n", iter->index, hexname); + return false; +} + int main(int argc, char *argv[]) { + // take -c to set location of daemon.ini // --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 // printf("has [%d]options\n", argc); - if(argc < 3) + if(argc < 2) { printf( - "please specify --generate or --update with a path to a router contact " - "file\n"); + "please specify: \n" + "--generate with a path to a router contact file\n" + "--update with a path to a router contact file\n" + "--list \n" + "--import with a path to a router contact file\n" + "--export with a path to a router contact file\n" + "\n"); return 0; } bool genMode = false; bool updMode = false; + bool listMode = false; + bool importMode = false; + bool exportMode = false; int c; + char *conffname; + char defaultConfName[] = "daemon.ini"; + conffname = defaultConfName; char *rcfname; - char defaultName[] = "other.signed"; - rcfname = defaultName; + char defaultRcName[] = "other.signed"; + rcfname = defaultRcName; + bool haveRequiredOptions = false; while(1) { static struct option long_options[] = { + {"config", required_argument, 0, 'c'}, {"generate", required_argument, 0, 'g'}, {"update", required_argument, 0, 'u'}, + {"list", no_argument, 0, 'l'}, + {"import", required_argument, 0, 'i'}, + {"export", required_argument, 0, 'e'}, {0, 0, 0, 0}}; int option_index = 0; - c = getopt_long(argc, argv, "gu", long_options, &option_index); + c = getopt_long(argc, argv, "cgluie", long_options, &option_index); if(c == -1) break; switch(c) { case 0: break; + case 'c': + conffname = optarg; + break; + case 'l': + haveRequiredOptions = true; + listMode = true; + break; + case 'i': + // printf ("option -g with value `%s'\n", optarg); + rcfname = optarg; + haveRequiredOptions = true; + importMode = true; + break; + case 'e': + // printf ("option -g with value `%s'\n", optarg); + rcfname = optarg; + haveRequiredOptions = true; + exportMode = true; + break; case 'g': // printf ("option -g with value `%s'\n", optarg); rcfname = optarg; + haveRequiredOptions = true; genMode = true; break; case 'u': // printf ("option -u with value `%s'\n", optarg); rcfname = optarg; + haveRequiredOptions = true; updMode = true; break; default: abort(); } } + if (!haveRequiredOptions) { + llarp::Error("Parameters dont all have their required parameters.\n"); + return 0; + } printf("parsed options\n"); - if(!genMode && !updMode) + if(!genMode && !updMode && !listMode &&!importMode && !exportMode) { - printf("I don't know what to do, no generate or update parameter\n"); - return 1; + llarp::Error("I don't know what to do, no generate or update parameter\n"); + return 0; } - sllarp = new llarp_main; - // llarp_new_config(&sllarp->config); - // llarp_ev_loop_alloc(&sllarp->mainloop); - llarp_crypto_libsodium_init(&sllarp->crypto); + ctx = llarp_main_init(conffname, !TESTNET); + if (!ctx) { + llarp::Error("Cant set up context"); + return 0; + } + signal(SIGINT, handle_signal); llarp_rc tmp; if(genMode) @@ -220,33 +178,10 @@ main(int argc, char *argv[]) if(updMode) { printf("rcutil.cpp - Loading [%s]\n", rcfname); - fs::path our_rc_file = rcfname; - std::error_code ec; - if(!fs::exists(our_rc_file, ec)) - { - printf("File not found\n"); - return 0; - } - std::ifstream f(our_rc_file, std::ios::binary); - if(!f.is_open()) - { - printf("Can't open file\n"); - return 0; - } - byte_t tmpc[MAX_RC_SIZE]; - llarp_buffer_t buf; - buf.base = tmpc; - buf.cur = buf.base; - buf.sz = sizeof(tmpc); - f.read((char *)tmpc, sizeof(MAX_RC_SIZE)); - // printf("contents[%s]\n", tmpc); - if(!llarp_rc_bdecode(&tmp, &buf)) - { - printf("Can't decode\n"); - return 0; - } + llarp_rc *rc = llarp_rc_read(rcfname); + // set updated timestamp - tmp.last_updated = llarp_time_now_ms(); + rc->last_updated = llarp_time_now_ms(); // load longterm identity llarp_crypto crypt; llarp_crypto_libsodium_init(&crypt); @@ -255,16 +190,35 @@ main(int argc, char *argv[]) llarp_findOrCreateIdentity(&crypt, ident_keyfile.c_str(), identity); // get identity public key uint8_t *pubkey = llarp::seckey_topublic(identity); - llarp_rc_set_pubkey(&tmp, pubkey); - llarp_rc_sign(&crypt, identity, &tmp); + llarp_rc_set_pubkey(rc, pubkey); + llarp_rc_sign(&crypt, identity, rc); + // set filename fs::path our_rc_file_out = "update_debug.rc"; // write file llarp_rc_write(&tmp, our_rc_file_out.c_str()); - // release memory for tmp lists - llarp_rc_free(&tmp); } - - delete sllarp; - return 1; + if (listMode) { + llarp_main_loadDatabase(ctx); + llarp_nodedb_iter iter; + iter.visit = printNode; + llarp_main_iterateDatabase(ctx, iter); + } + if (importMode) { + llarp_main_loadDatabase(ctx); + llarp::Info("Loading ", rcfname); + llarp_rc *rc = llarp_rc_read(rcfname); + if (!rc) + { + llarp::Error("Can't load RC"); + return 0; + } + llarp_main_putDatabase(ctx, rc); + } + if (exportMode) { + llarp_main_loadDatabase(ctx); + // TODO: write me + } + llarp_main_free(ctx); + return 1; // success }