aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

connectd: make sure we announce websocket addr which succeeded.

Browse Source 
By accessing `addr` after the loop, it's possible that it's one which
failed, in complex scenarios.

Also gives us a chance to warn if they specify a websocket but don't
actually end up advertizing it (you *must* advertize a normal addr as
well).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-03-04 16:40:57 +10:30
parent c075d78431
commit 885a6f50ae
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
connectd/connectd.c
View File

@@ -1419,20 +1419,34 @@ setup_listeners(const tal_t *ctx,
if (!lfd)
continue;
announced_some = true;
if (!announced_some) {
/* BOLT-websocket #7:
* - MUST NOT add a `type 6` address unless
* there is also at least one address of
* different type.
*/
if (tal_count(*announcable) != 0) {
wireaddr_from_websocket(&addr.u.wireaddr,
daemon->websocket_port);
add_announcable(announcable,
&addr.u.wireaddr);
} else {
status_unusual("Bound to websocket %s,"
" but we cannot announce"
" the websocket as we don't"
" announce anything else!",
type_to_string(tmpctx,
struct wireaddr_internal,
&addr));
}
announced_some = true;
}
tal_arr_expand(&listen_fds, tal_steal(listen_fds, lfd));
}
/* We add the websocket port to the announcement if we made one
* *and* we have other announced addresses. */
/* BOLT-websocket #7:
* - MUST NOT add a `type 6` address unless there is also at
* least one address of different type.
*/
if (announced_some && tal_count(*announcable) != 0) {
wireaddr_from_websocket(&addr.u.wireaddr, daemon->websocket_port);
add_announcable(announcable, &addr.u.wireaddr);
} else
/* If none of those was possible, it's a configuration error? */
if (tal_count(listen_fds) == num_nonws_listens)
return NULL;
}