mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-17 19:03:42 +01:00
Code Issues Projects Releases Wiki Activity

Allow --announce-addr to work also with autotor: prefix

Browse Source 
Make --announce-addr with autotor: also
a meaningful use case.
The option  --announce-addr=autotor: is more
intuitive than to use the --addr=autotor: option

Signed-off-by: Saibato <saibato.naga@pm.me>

Declare opt_add_addr at top of option.c

We we use opt_add_addr and opt_announce_addr vice versa.
To make compiler happy, we declare it at top.

Signed-off-by: Saibato <saibato.naga@pm.me>
This commit is contained in:
Saibato 2019-09-27 09:59:13 +00:00 committed by Rusty Russell
parent 7283efa5b5
commit b3a6279392
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lightningd/options.c
View File

@ -44,6 +44,11 @@
bool deprecated_apis = true; bool deprecated_apis = true;
static bool opt_table_alloced = false; static bool opt_table_alloced = false;
/* Declare opt_add_addr here, because we we call opt_add_addr
* and opt_announce_addr vice versa
*/
static char *opt_add_addr(const char *arg, struct lightningd *ld);
/* Tal wrappers for opt. */ /* Tal wrappers for opt. */
static void *opt_allocfn(size_t size) static void *opt_allocfn(size_t size)
{ {
@ -153,7 +158,13 @@ static char *opt_add_announce_addr(const char *arg, struct lightningd *ld)
{ {
const struct wireaddr *wn; const struct wireaddr *wn;
size_t n = tal_count(ld->proposed_wireaddr); size_t n = tal_count(ld->proposed_wireaddr);
char *err = opt_add_addr_withtype(arg, ld, ADDR_ANNOUNCE, false); char *err;
/* Check for autotor and reroute the call to --addr */
if (strstarts(arg, "autotor:"))
return opt_add_addr(arg, ld);
err = opt_add_addr_withtype(arg, ld, ADDR_ANNOUNCE, false);
if (err) if (err)
return err; return err;