From 22a481fbaa5a768a8edbd8461147b4f26e2d2575 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sun, 24 Nov 2024 12:10:16 +1030 Subject: [PATCH] common: routine to make wireaddr_internal from wireaddr. Signed-off-by: Rusty Russell --- common/wireaddr.c | 8 ++++++++ common/wireaddr.h | 3 +++ lightningd/opening_control.c | 4 +--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/common/wireaddr.c b/common/wireaddr.c index b8d23d643..484dd830c 100644 --- a/common/wireaddr.c +++ b/common/wireaddr.c @@ -767,6 +767,14 @@ void wireaddr_from_sockname(struct wireaddr_internal *addr, strncpy(addr->u.sockname, sockname, sizeof(addr->u.sockname)-1); } +void wireaddr_internal_from_wireaddr(struct wireaddr_internal *addr, + const struct wireaddr *waddr) +{ + addr->itype = ADDR_INTERNAL_WIREADDR; + addr->u.wireaddr.is_websocket = false; + addr->u.wireaddr.wireaddr = *waddr; +} + bool wireaddr_to_sockname(const struct wireaddr_internal *addr, struct sockaddr_un *sun) { diff --git a/common/wireaddr.h b/common/wireaddr.h index d9b0cbfdd..efa0e1f16 100644 --- a/common/wireaddr.h +++ b/common/wireaddr.h @@ -193,6 +193,9 @@ char *fmt_wireaddr_internal(const tal_t *ctx, bool wireaddr_from_unresolved(struct wireaddr_internal *addr, const char *name, u16 port); +void wireaddr_internal_from_wireaddr(struct wireaddr_internal *addr, + const struct wireaddr *waddr); + void wireaddr_from_sockname(struct wireaddr_internal *addr, const char *sockname); bool wireaddr_to_sockname(const struct wireaddr_internal *addr, diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c index 3dd2e028f..19298e0b4 100644 --- a/lightningd/opening_control.c +++ b/lightningd/opening_control.c @@ -1488,9 +1488,7 @@ static struct channel *stub_chan(struct command *cmd, if (!peer) { struct wireaddr_internal wint; - wint.itype = ADDR_INTERNAL_WIREADDR; - wint.u.wireaddr.is_websocket = false; - wint.u.wireaddr.wireaddr = addr; + wireaddr_internal_from_wireaddr(&wint, &addr); peer = new_peer(cmd->ld, 0, &nodeid,