aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-04 23:04:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

broadcast: don't reorder channel_announce when we get the real one.

Browse Source 
If channel_announce is rebroadcast, it should replace the existing one
in-place.  We currently only do this if we start from the unsigned one
and replace it with the signed one when we hit 6 confirms.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-12-21 13:13:24 +10:30
committed by Christian Decker
parent 425143646c
commit f293ff0a6a
6 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
gossipd/broadcast.c
View File

@@ -1,3 +1,4 @@
#include <ccan/mem/mem.h>
#include <gossipd/broadcast.h>
struct broadcast_state *new_broadcast_state(tal_t *ctx)
@@ -21,28 +22,48 @@ static struct queued_message *new_queued_message(tal_t *ctx,
return msg;
}
/* Returns 0 for not-found */
static u64 find_broadcast(const struct broadcast_state *bstate,
const int type, const u8 *tag)
{
struct queued_message *msg;
u64 index;
/* FIXME: Use a hash */
for (msg = uintmap_first(&bstate->broadcasts, &index);
msg;
msg = uintmap_after(&bstate->broadcasts, &index)) {
if (msg->type == type
&& memeq(msg->tag, tal_len(msg->tag), tag, tal_len(tag)))
return index;
}
return 0;
}
void queue_broadcast(struct broadcast_state *bstate,
const int type,
const u8 *tag,
const u8 *payload)
const u8 *payload,
bool replace_inplace)
{
struct queued_message *msg;
u64 index;
/* Remove any tag&type collisions */
for (msg = uintmap_first(&bstate->broadcasts, &index);
msg;
msg = uintmap_after(&bstate->broadcasts, &index)) {
if (msg->type == type && memcmp(msg->tag, tag, tal_count(tag)) == 0) {
uintmap_del(&bstate->broadcasts, index);
tal_free(msg);
}
}
index = find_broadcast(bstate, type, tag);
if (index == 0)
replace_inplace = false;
else
tal_free(uintmap_del(&bstate->broadcasts, index));
/* Now add the message to the queue */
msg = new_queued_message(bstate, type, tag, payload);
uintmap_add(&bstate->broadcasts, bstate->next_index, msg);
bstate->next_index += 1;
if (replace_inplace) {
uintmap_add(&bstate->broadcasts, index, msg);
} else {
uintmap_add(&bstate->broadcasts, bstate->next_index, msg);
bstate->next_index += 1;
}
}
struct queued_message *next_broadcast_message(struct broadcast_state *bstate, u64 last_index)