Skip to content

connectd: check all chain hashs of the network array in init #3371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdecker merged 3 commits into from
Dec 28, 2019
Merged

connectd: check all chain hashs of the network array in init #3371

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af70d26
connectd: check all chain hashs of the TLV array
darosior Dec 24, 2019
6b7a73f
connectd: clean up a redundant check
darosior Dec 24, 2019
d45c279
connectd: return error when no common chain at init
darosior Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions connectd/peer_exchange_initmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct peer {
static bool contains_common_chain(struct bitcoin_blkid *chains)
{
for (size_t i = 0; i < tal_count(chains); i++) {
if (bitcoin_blkid_eq(&chains[0], &chainparams->genesis_blockhash))
if (bitcoin_blkid_eq(&chains[i], &chainparams->genesis_blockhash))
return true;
}
return false;
Expand Down Expand Up @@ -75,17 +75,13 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
* - MAY fail the connection.
*/
if (tlvs->networks) {
if (!tlvs->networks->chains) {
Copy link
Collaborator

@niftynei niftynei Dec 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this change belongs in a separate commit from the first, as they're not related changes

status_peer_debug(&peer->id,
"bad networks TLV in init '%s', closing",
tal_hex(tmpctx, msg));
return io_close(conn);
}
if (!contains_common_chain(tlvs->networks->chains)) {
status_peer_debug(&peer->id,
"No common chain with this peer '%s', closing",
tal_hex(tmpctx, msg));
return io_close(conn);
msg = towire_errorfmt(NULL, NULL, "No common network");
msg = cryptomsg_encrypt_msg(NULL, &peer->cs, take(msg));
return io_write(conn, msg, tal_count(msg), io_close_cb, NULL);
}
}

Expand Down