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

channeld: check short_channel_ids match before announcing channel.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-01-10 13:13:21 +10:30
committed by Christian Decker
parent b1e93c8838
commit cc60735aee
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
channeld/channel.c
View File

@@ -468,11 +468,30 @@ static void handle_peer_funding_locked(struct peer *peer, const u8 *msg)
send_announcement_signatures(peer); send_announcement_signatures(peer);
} }
/* Once we have both, we'd better make sure we agree what they are! */
static void check_short_ids_match(struct peer *peer)
{
assert(peer->have_sigs[LOCAL]);
assert(peer->have_sigs[REMOTE]);
if (!short_channel_id_eq(&peer->short_channel_ids[LOCAL],
&peer->short_channel_ids[REMOTE]))
peer_failed(PEER_FD, &peer->cs, &peer->channel_id,
"We disagree on short_channel_ids:"
" I have %s, you say %s",
type_to_string(peer, struct short_channel_id,
&peer->short_channel_ids[LOCAL]),
type_to_string(peer, struct short_channel_id,
&peer->short_channel_ids[REMOTE]));
}
static void announce_channel(struct peer *peer) static void announce_channel(struct peer *peer)
{ {
tal_t *tmpctx = tal_tmpctx(peer); tal_t *tmpctx = tal_tmpctx(peer);
u8 *cannounce, *cupdate; u8 *cannounce, *cupdate;
check_short_ids_match(peer);
cannounce = create_channel_announcement(tmpctx, peer); cannounce = create_channel_announcement(tmpctx, peer);
cupdate = create_channel_update(tmpctx, peer, false); cupdate = create_channel_update(tmpctx, peer, false);
@@ -496,13 +515,12 @@ static void handle_peer_announcement_signatures(struct peer *peer, const u8 *msg
tal_hex(msg, msg)); tal_hex(msg, msg));
/* Make sure we agree on the channel ids */ /* Make sure we agree on the channel ids */
/* FIXME: Check short_channel_id */
if (!structeq(&chanid, &peer->channel_id)) { if (!structeq(&chanid, &peer->channel_id)) {
peer_failed(PEER_FD, &peer->cs, &peer->channel_id, peer_failed(PEER_FD, &peer->cs, &peer->channel_id,
"Wrong channel_id or short_channel_id in %s or %s", "Wrong channel_id: expected %s, got %s",
tal_hexstr(trc, &chanid, sizeof(struct channel_id)), type_to_string(trc, struct channel_id,
tal_hexstr(trc, &peer->short_channel_ids[REMOTE], &peer->channel_id),
sizeof(struct short_channel_id))); type_to_string(trc, struct channel_id, &chanid));
} }
peer->have_sigs[REMOTE] = true; peer->have_sigs[REMOTE] = true;