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

wire: make lengths of variable fields implied by tal_count()

Browse Source 
This is a much nicer interface, and works better in practice too.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-01-10 15:19:25 +10:30
parent 7b1a4fc765
commit 42f474af18
3 changed files with 33 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/p2p_announce.c
View File

@@ -473,15 +473,15 @@ static void broadcast_node_announcement(struct lightningd_state *dstate)
serialized = towire_node_announcement(tmpctx, &signature,
timestamp,
&dstate->id, rgb_color, alias,
0, NULL,
tal_count(address), address);
NULL,
address);
privkey_sign(dstate, serialized + 66, tal_count(serialized) - 66,
&signature);
serialized = towire_node_announcement(tmpctx, &signature,
timestamp,
&dstate->id, rgb_color, alias,
0, NULL,
tal_count(address), address);
NULL,
address);
broadcast(dstate, WIRE_NODE_ANNOUNCEMENT, serialized, NULL);
tal_free(tmpctx);
}
@@ -541,7 +541,7 @@ static void broadcast_channel_announcement(struct lightningd_state *dstate, stru
node_id[1],
bitcoin_key[0],
bitcoin_key[1],
0, NULL);
NULL);
privkey_sign(dstate, serialized + 128, tal_count(serialized) - 128, my_node_signature);
serialized = towire_channel_announcement(tmpctx, &node_signature[0],
@@ -553,7 +553,7 @@ static void broadcast_channel_announcement(struct lightningd_state *dstate, stru
node_id[1],
bitcoin_key[0],
bitcoin_key[1],
0, NULL);
NULL);
broadcast(dstate, WIRE_CHANNEL_ANNOUNCEMENT, serialized, NULL);
tal_free(tmpctx);
}