From 10e2779953d94174c8627057613b53cc019cc333 Mon Sep 17 00:00:00 2001 From: Saibato Date: Sun, 13 Oct 2019 15:12:23 +0000 Subject: [PATCH] Minor fixups Signed-off-by: Saibato --- common/base64.c | 4 ++++ common/wireaddr.c | 2 +- common/wireaddr.h | 2 +- connectd/tor_autoservice.c | 1 - lightningd/lightningd.c | 1 + lightningd/lightningd.h | 2 +- lightningd/options.c | 2 -- lightningd/options.h | 4 ---- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/common/base64.c b/common/base64.c index 018d6b821f7b..a7b55cc1d26d 100644 --- a/common/base64.c +++ b/common/base64.c @@ -2,6 +2,10 @@ #include #include +/* Decode/encode from/to base64, base64 helper functions. + * We import base64 from libsodium to generate tor V3 ED25519-V3 onions from blobs +*/ + char *b64_encode(const tal_t *ctx, char *data, size_t len) { char *str = tal_arrz(ctx, char, sodium_base64_encoded_len(len, sodium_base64_VARIANT_ORIGINAL) + 1); diff --git a/common/wireaddr.c b/common/wireaddr.c index d10251a00a89..5534b076203e 100644 --- a/common/wireaddr.c +++ b/common/wireaddr.c @@ -445,7 +445,7 @@ bool parse_wireaddr_internal(const char *arg, struct wireaddr_internal *addr, const char **err_msg) { u16 splitport; - char *ip; + char *ip = NULL; bool needed_dns = false; /* Addresses starting with '/' are local socket paths */ diff --git a/common/wireaddr.h b/common/wireaddr.h index 59619d906da5..7fd06ea1179b 100644 --- a/common/wireaddr.h +++ b/common/wireaddr.h @@ -44,7 +44,7 @@ struct sockaddr_un; #define TOR_V3_ADDRLEN 35 #define LARGEST_ADDRLEN TOR_V3_ADDRLEN #define TOR_V3_BLOBLEN 64 -#define TOR_UNIQUE_STRING "gen-default-toraddress" +#define TOR_UNIQUE_STRING "gen-default-toraddress" enum wire_addr_type { ADDR_TYPE_IPV4 = 1, diff --git a/connectd/tor_autoservice.c b/connectd/tor_autoservice.c index b5cbc874b440..b0f80602704e 100644 --- a/connectd/tor_autoservice.c +++ b/connectd/tor_autoservice.c @@ -26,7 +26,6 @@ static void *buf_resize(struct membuf *mb, void *buf, size_t len) { tal_resize(&buf, len); - return buf; } diff --git a/lightningd/lightningd.c b/lightningd/lightningd.c index 743774842f49..effb92dcfde5 100644 --- a/lightningd/lightningd.c +++ b/lightningd/lightningd.c @@ -729,6 +729,7 @@ int main(int argc, char *argv[]) /*~ Our default color and alias are derived from our node id, so we * can only set those now (if not set by config options). */ setup_color_and_alias(ld); + /*~ Set up connect daemon: this manages receiving and making * TCP connections. It needs to talk to the gossip daemon * which knows (via node_announcement messages) the public diff --git a/lightningd/lightningd.h b/lightningd/lightningd.h index f578ffc4e704..3655bbc20b56 100644 --- a/lightningd/lightningd.h +++ b/lightningd/lightningd.h @@ -226,7 +226,7 @@ struct lightningd { #endif /* DEVELOPER */ /* tor support */ - struct wireaddr *proxyaddr;; + struct wireaddr *proxyaddr; bool use_proxy_always; char *tor_service_password; bool pure_tor_setup; diff --git a/lightningd/options.c b/lightningd/options.c index e79cd8e52d8b..d795d4e88e35 100644 --- a/lightningd/options.c +++ b/lightningd/options.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -1080,7 +1079,6 @@ static void register_opts(struct lightningd *ld) opt_register_arg("--proxy", opt_add_proxy_addr, NULL, ld,"Set a socks v5 proxy IP address and port"); - opt_register_arg("--tor-service-password", opt_set_talstr, NULL, &ld->tor_service_password, "Set a Tor hidden service password"); diff --git a/lightningd/options.h b/lightningd/options.h index 8601febba459..4b707e0af752 100644 --- a/lightningd/options.h +++ b/lightningd/options.h @@ -14,10 +14,6 @@ void handle_opts(struct lightningd *ld, int argc, char *argv[]); /* Derive default color and alias from the pubkey. */ void setup_color_and_alias(struct lightningd *ld); -/* generate the nodes Tor address */ -void setup_default_tor(struct lightningd *ld); - - /* Global to allow deprecated options. */ extern bool deprecated_apis; #endif /* LIGHTNING_LIGHTNINGD_OPTIONS_H */