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

gossipd: don't use peer softrefs for gossip credit.

Browse Source 
We use a "softref" which is a magic pointer which gets NULL'ed when
the object is freed.  But it's heavy, and a bit tricky to use, and we
only use it in gossipd.

Instead, keep the nodeid, and do a lookup (now that's fast) if we want
to credit the sender for valid gossip.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-07-06 17:05:54 +09:30
parent 6e2a34373c
commit 17e0c057aa
11 changed files with 117 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gossipd/gossip_generation.c
View File

@@ -590,7 +590,7 @@ static void apply_update(struct daemon *daemon,
take(update);
}
msg = handle_channel_update(daemon->rstate, update, peer, NULL, true);
msg = handle_channel_update(daemon->rstate, update, &chan->nodes[!direction]->id, NULL, true);
if (msg)
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"%s: rejected local channel update %s: %s",

42
gossipd/gossipd.c
View File

@@ -109,10 +109,20 @@ struct peer *find_peer(struct daemon *daemon, const struct node_id *id)
}
/* Increase a peer's gossip_counter, if peer not NULL */
void peer_supplied_good_gossip(struct peer *peer, size_t amount)
void peer_supplied_good_gossip(struct daemon *daemon,
const struct node_id *source_peer,
size_t amount)
{
if (peer)
peer->gossip_counter += amount;
struct peer *peer;
if (!source_peer)
return;
peer = find_peer(daemon, source_peer);
if (!peer)
return;
peer->gossip_counter += amount;
}
/* Queue a gossip message for the peer: connectd simply forwards it to
@@ -232,7 +242,7 @@ static bool get_node_announcement_by_id(const tal_t *ctx,
* queue. We'll send a request to lightningd to look it up, and continue
* processing in `handle_txout_reply`. */
static const u8 *handle_channel_announcement_msg(struct daemon *daemon,
struct peer *peer,
const struct node_id *source_peer,
const u8 *msg)
{
const struct short_channel_id *scid;
@@ -243,7 +253,7 @@ static const u8 *handle_channel_announcement_msg(struct daemon *daemon,
* which case, it frees and NULLs that ptr) */
err = handle_channel_announcement(daemon->rstate, msg,
daemon->current_blockheight,
&scid, peer);
&scid, source_peer);
if (err)
return err;
else if (scid) {
@@ -269,7 +279,7 @@ static u8 *handle_channel_update_msg(struct peer *peer, const u8 *msg)
u8 *err;
unknown_scid.u64 = 0;
err = handle_channel_update(peer->daemon->rstate, msg, peer,
err = handle_channel_update(peer->daemon->rstate, msg, &peer->id,
&unknown_scid, false);
if (err)
return err;
@@ -292,7 +302,7 @@ static u8 *handle_node_announce(struct peer *peer, const u8 *msg)
bool was_unknown = false;
u8 *err;
err = handle_node_announcement(peer->daemon->rstate, msg, peer,
err = handle_node_announcement(peer->daemon->rstate, msg, &peer->id,
&was_unknown);
if (was_unknown)
query_unknown_node(peer->daemon->seeker, peer);
@@ -304,25 +314,17 @@ static void handle_local_channel_announcement(struct daemon *daemon, const u8 *m
u8 *cannouncement;
const u8 *err;
struct node_id id;
struct peer *peer;
if (!fromwire_gossipd_local_channel_announcement(msg, msg,
&id,
&cannouncement))
master_badmsg(WIRE_GOSSIPD_LOCAL_CHANNEL_ANNOUNCEMENT, msg);
/* We treat it OK even if peer has disconnected since (unlikely though!) */
peer = find_peer(daemon, &id);
if (!peer)
status_debug("Unknown peer %s for local_channel_announcement",
type_to_string(tmpctx, struct node_id, &id));
err = handle_channel_announcement_msg(daemon, peer, cannouncement);
err = handle_channel_announcement_msg(daemon, &id, cannouncement);
if (err) {
status_broken("peer %s invalid local_channel_announcement %s (%s)",
type_to_string(tmpctx, struct node_id, &id),
tal_hex(tmpctx, msg),
tal_hex(tmpctx, err));
status_peer_broken(&id, "invalid local_channel_announcement %s (%s)",
tal_hex(tmpctx, msg),
tal_hex(tmpctx, err));
}
}
@@ -573,7 +575,7 @@ static void handle_recv_gossip(struct daemon *daemon, const u8 *outermsg)
/* These are messages relayed from peer */
switch ((enum peer_wire)fromwire_peektype(msg)) {
case WIRE_CHANNEL_ANNOUNCEMENT:
err = handle_channel_announcement_msg(peer->daemon, peer, msg);
err = handle_channel_announcement_msg(peer->daemon, &id, msg);
goto handled_msg;
case WIRE_CHANNEL_UPDATE:
err = handle_channel_update_msg(peer, msg);

4
gossipd/gossipd.h
View File

@@ -135,7 +135,9 @@ struct peer {
struct peer *find_peer(struct daemon *daemon, const struct node_id *id);
/* This peer (may be NULL) gave is valid gossip. */
void peer_supplied_good_gossip(struct peer *peer, size_t amount);
void peer_supplied_good_gossip(struct daemon *daemon,
const struct node_id *source_peer,
size_t amount);
/* Get a random peer. NULL if no peers. */
struct peer *first_random_peer(struct daemon *daemon,

2
gossipd/queries.c
View File

@@ -808,7 +808,7 @@ const u8 *handle_reply_channel_range(struct peer *peer, const u8 *msg)
/* Credit peer for answering gossip, so seeker doesn't get upset:
* since scids are only 8 bytes, use a discount over normal gossip. */
peer_supplied_good_gossip(peer, tal_count(scids) / 20);
peer_supplied_good_gossip(peer->daemon, &peer->id, tal_count(scids) / 20);
/* Old code used to set this to 1 all the time; not setting it implies
* we're talking to an upgraded node. */

114
gossipd/routing.c
View File

@@ -29,8 +29,8 @@ struct pending_node_announce {
u8 *node_announcement;
u32 timestamp;
u32 index;
/* Automagically turns to NULL if peer freed */
struct peer *peer_softref;
/* If non-NULL this is peer to credit it with */
struct node_id *source_peer;
};
/* As per the below BOLT #7 quote, we delay forgetting a channel until 12
@@ -106,8 +106,8 @@ struct unupdated_channel {
u32 index;
/* Channel capacity */
struct amount_sat sat;
/* Automagically turns to NULL of peer freed */
struct peer *peer_softref;
/* If non-NULL this is peer to credit it with */
struct node_id *source_peer;
};
static struct unupdated_channel *
@@ -579,10 +579,10 @@ static void init_half_chan(struct routing_state *rstate,
}
static void bad_gossip_order(const u8 *msg,
const struct peer *peer,
const struct node_id *source_peer,
const char *details)
{
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Bad gossip order: %s before announcement %s",
peer_wire_name(fromwire_peektype(msg)),
details);
@@ -773,7 +773,7 @@ static void catch_node_announcement(const tal_t *ctx,
pna->timestamp = 0;
pna->index = 0;
pna->refcount = 0;
pna->peer_softref = NULL;
pna->source_peer = NULL;
pending_node_map_add(rstate->pending_node_map, pna);
}
pna->refcount++;
@@ -796,7 +796,7 @@ static void process_pending_node_announcement(struct routing_state *rstate,
if (!routing_add_node_announcement(rstate,
pna->node_announcement,
pna->index,
pna->peer_softref, NULL,
pna->source_peer, NULL,
false))
status_unusual("pending node_announcement %s too old?",
tal_hex(tmpctx, pna->node_announcement));
@@ -894,7 +894,7 @@ bool routing_add_channel_announcement(struct routing_state *rstate,
const u8 *msg TAKES,
struct amount_sat sat,
u32 index,
struct peer *peer)
const struct node_id *source_peer)
{
struct chan *oldchan;
secp256k1_ecdsa_signature node_signature_1, node_signature_2;
@@ -961,7 +961,7 @@ bool routing_add_channel_announcement(struct routing_state *rstate,
uc->scid = scid;
uc->id[0] = node_id_1;
uc->id[1] = node_id_2;
set_softref(uc, &uc->peer_softref, peer);
uc->source_peer = tal_dup_or_null(uc, struct node_id, source_peer);
uintmap_add(&rstate->unupdated_chanmap, scid.u64, uc);
tal_add_destructor2(uc, destroy_unupdated_channel, rstate);
@@ -972,10 +972,10 @@ bool routing_add_channel_announcement(struct routing_state *rstate,
/* If we had private updates, they'll immediately create the channel. */
if (private_updates[0])
routing_add_channel_update(rstate, take(private_updates[0]), 0,
peer, false, false, false);
source_peer, false, false, false);
if (private_updates[1])
routing_add_channel_update(rstate, take(private_updates[1]), 0,
peer, false, false, false);
source_peer, false, false, false);
/* Now we can finish cleanup of gossip store, so there's no window where
* channel (or nodes) vanish. */
@@ -993,7 +993,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
const u8 *announce TAKES,
u32 current_blockheight,
const struct short_channel_id **scid,
struct peer *peer)
const struct node_id *source_peer TAKES)
{
struct pending_cannouncement *pending;
struct bitcoin_blkid chain_hash;
@@ -1003,10 +1003,10 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
struct chan *chan;
pending = tal(rstate, struct pending_cannouncement);
set_softref(pending, &pending->peer_softref, peer);
pending->source_peer = tal_dup_or_null(pending, struct node_id, source_peer);
pending->updates[0] = NULL;
pending->updates[1] = NULL;
pending->update_peer_softref[0] = pending->update_peer_softref[1] = NULL;
pending->update_source_peer[0] = pending->update_source_peer[1] = NULL;
pending->announce = tal_dup_talarr(pending, u8, announce);
pending->update_timestamps[0] = pending->update_timestamps[1] = 0;
@@ -1036,7 +1036,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
* anyway. */
if (current_blockheight != 0
&& short_channel_id_blocknum(&pending->short_channel_id) > current_blockheight) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(pending->source_peer,
"Ignoring future channel_announcment for %s"
" (current block %u)",
type_to_string(tmpctx, struct short_channel_id,
@@ -1093,7 +1093,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
* - MUST ignore the message.
*/
if (!bitcoin_blkid_eq(&chain_hash, &chainparams->genesis_blockhash)) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(pending->source_peer,
"Received channel_announcement %s for unknown chain %s",
type_to_string(pending, struct short_channel_id,
&pending->short_channel_id),
@@ -1132,7 +1132,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
> 100000) {
static bool warned = false;
if (!warned) {
status_peer_unusual(peer ? &peer->id : NULL,
status_peer_unusual(pending->source_peer,
"Flooded by channel_announcements:"
" ignoring some");
warned = true;
@@ -1140,7 +1140,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
goto ignored;
}
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(pending->source_peer,
"Received channel_announcement for channel %s",
type_to_string(tmpctx, struct short_channel_id,
&pending->short_channel_id));
@@ -1174,17 +1174,17 @@ static void process_pending_channel_update(struct daemon *daemon,
struct routing_state *rstate,
const struct short_channel_id *scid,
const u8 *cupdate,
struct peer *peer)
const struct node_id *source_peer)
{
u8 *err;
if (!cupdate)
return;
err = handle_channel_update(rstate, cupdate, peer, NULL, false);
err = handle_channel_update(rstate, cupdate, source_peer, NULL, false);
if (err) {
/* FIXME: We could send this error back to peer if != NULL */
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Pending channel_update for %s: %s",
type_to_string(tmpctx, struct short_channel_id,
scid),
@@ -1201,14 +1201,11 @@ bool handle_pending_cannouncement(struct daemon *daemon,
{
const u8 *s;
struct pending_cannouncement *pending;
const struct node_id *src;
pending = find_pending_cannouncement(rstate, scid);
if (!pending)
return false;
src = pending->peer_softref ? &pending->peer_softref->id : NULL;
/* BOLT #7:
*
* The receiving node:
@@ -1217,7 +1214,7 @@ bool handle_pending_cannouncement(struct daemon *daemon,
* - MUST ignore the message.
*/
if (tal_count(outscript) == 0) {
status_peer_debug(src,
status_peer_debug(pending->source_peer,
"channel_announcement: no unspent txout %s",
type_to_string(pending,
struct short_channel_id,
@@ -1242,7 +1239,7 @@ bool handle_pending_cannouncement(struct daemon *daemon,
&pending->bitcoin_key_2));
if (!scripteq(s, outscript)) {
status_peer_debug(src,
status_peer_debug(pending->source_peer,
"channel_announcement: txout %s expected %s, got %s",
type_to_string(
pending, struct short_channel_id,
@@ -1259,16 +1256,16 @@ bool handle_pending_cannouncement(struct daemon *daemon,
/* Can fail if channel_announcement too old */
if (!routing_add_channel_announcement(rstate, pending->announce, sat, 0,
pending->peer_softref))
status_peer_unusual(src,
pending->source_peer))
status_peer_unusual(pending->source_peer,
"Could not add channel_announcement %s: too old?",
tal_hex(tmpctx, pending->announce));
else {
/* Did we have an update waiting? If so, apply now. */
process_pending_channel_update(daemon, rstate, scid, pending->updates[0],
pending->update_peer_softref[0]);
pending->update_source_peer[0]);
process_pending_channel_update(daemon, rstate, scid, pending->updates[1],
pending->update_peer_softref[1]);
pending->update_source_peer[1]);
}
tal_free(pending);
@@ -1278,7 +1275,7 @@ bool handle_pending_cannouncement(struct daemon *daemon,
static void update_pending(struct pending_cannouncement *pending,
u32 timestamp, const u8 *update,
const u8 direction,
struct peer *peer)
const struct node_id *source_peer TAKES)
{
SUPERVERBOSE("Deferring update for pending channel %s/%d",
type_to_string(tmpctx, struct short_channel_id,
@@ -1286,16 +1283,20 @@ static void update_pending(struct pending_cannouncement *pending,
if (pending->update_timestamps[direction] < timestamp) {
if (pending->updates[direction]) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Replacing existing update");
tal_free(pending->updates[direction]);
}
pending->updates[direction]
= tal_dup_talarr(pending, u8, update);
pending->update_timestamps[direction] = timestamp;
clear_softref(pending, &pending->update_peer_softref[direction]);
set_softref(pending, &pending->update_peer_softref[direction],
peer);
tal_free(pending->update_source_peer[direction]);
pending->update_source_peer[direction]
= tal_dup_or_null(pending, struct node_id, source_peer);
} else {
/* Don't leak if we don't update! */
if (taken(source_peer))
tal_free(source_peer);
}
}
@@ -1317,7 +1318,7 @@ static void delete_spam_update(struct routing_state *rstate,
bool routing_add_channel_update(struct routing_state *rstate,
const u8 *update TAKES,
u32 index,
struct peer *peer,
const struct node_id *source_peer,
bool ignore_timestamp,
bool force_spam_flag,
bool force_zombie_flag)
@@ -1439,7 +1440,7 @@ bool routing_add_channel_update(struct routing_state *rstate,
if (is_chan_public(chan)
&& !ratelimit(rstate,
&hc->tokens, hc->bcast.timestamp, timestamp)) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Spammy update for %s/%u flagged"
" (last %u, now %u)",
type_to_string(tmpctx,
@@ -1505,7 +1506,7 @@ bool routing_add_channel_update(struct routing_state *rstate,
if (zombie && timestamp_reasonable(rstate,
chan->half[!direction].bcast.timestamp) &&
chan->half[!direction].bcast.index && !index) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Resurrecting zombie channel %s.",
type_to_string(tmpctx,
struct short_channel_id,
@@ -1583,7 +1584,7 @@ bool routing_add_channel_update(struct routing_state *rstate,
if (!spam)
hc->bcast.index = hc->rgraph.index;
peer_supplied_good_gossip(peer, 1);
peer_supplied_good_gossip(rstate->daemon, source_peer, 1);
}
if (uc) {
@@ -1594,7 +1595,7 @@ bool routing_add_channel_update(struct routing_state *rstate,
tal_free(uc);
}
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Received %schannel_update for channel %s/%d now %s",
ignore_timestamp ? "(forced) " : "",
type_to_string(tmpctx, struct short_channel_id,
@@ -1631,7 +1632,7 @@ static const struct node_id *get_channel_owner(struct routing_state *rstate,
}
u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
struct peer *peer,
const struct node_id *source_peer,
struct short_channel_id *unknown_scid,
bool force)
{
@@ -1679,7 +1680,7 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
* - MUST ignore the channel update.
*/
if (!bitcoin_blkid_eq(&chain_hash, &chainparams->genesis_blockhash)) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Received channel_update for unknown chain %s",
type_to_string(tmpctx, struct bitcoin_blkid,
&chain_hash));
@@ -1695,13 +1696,13 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
/* If we have an unvalidated channel, just queue on that */
pending = find_pending_cannouncement(rstate, &short_channel_id);
if (pending) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Updated pending announce with update %s/%u",
type_to_string(tmpctx,
struct short_channel_id,
&short_channel_id),
direction);
update_pending(pending, timestamp, serialized, direction, peer);
update_pending(pending, timestamp, serialized, direction, source_peer);
return NULL;
}
@@ -1710,7 +1711,7 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
if (unknown_scid)
*unknown_scid = short_channel_id;
bad_gossip_order(serialized,
peer,
source_peer,
tal_fmt(tmpctx, "%s/%u",
type_to_string(tmpctx,
struct short_channel_id,
@@ -1733,7 +1734,7 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
return warn;
}
routing_add_channel_update(rstate, take(serialized), 0, peer, force,
routing_add_channel_update(rstate, take(serialized), 0, source_peer, force,
false, false);
return NULL;
}
@@ -1741,7 +1742,7 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
bool routing_add_node_announcement(struct routing_state *rstate,
const u8 *msg TAKES,
u32 index,
struct peer *peer,
const struct node_id *source_peer TAKES,
bool *was_unknown,
bool force_spam_flag)
{
@@ -1792,7 +1793,7 @@ bool routing_add_node_announcement(struct routing_state *rstate,
*was_unknown = true;
/* Don't complain if it's a zombie node! */
if (!node || !is_node_zombie(node)) {
bad_gossip_order(msg, peer,
bad_gossip_order(msg, source_peer,
type_to_string(tmpctx, struct node_id,
&node_id));
}
@@ -1806,9 +1807,9 @@ bool routing_add_node_announcement(struct routing_state *rstate,
pna->timestamp = timestamp;
pna->index = index;
tal_free(pna->node_announcement);
clear_softref(pna, &pna->peer_softref);
tal_free(pna->source_peer);
pna->node_announcement = tal_dup_talarr(pna, u8, msg);
set_softref(pna, &pna->peer_softref, peer);
pna->source_peer = tal_dup_or_null(pna, struct node_id, source_peer);
return true;
}
@@ -1855,7 +1856,7 @@ bool routing_add_node_announcement(struct routing_state *rstate,
/* Make sure it's not spamming us. */
if (!ratelimit(rstate,
&node->tokens, node->bcast.timestamp, timestamp)) {
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Spammy nannounce for %s flagged"
" (last %u, now %u)",
type_to_string(tmpctx,
@@ -1905,12 +1906,12 @@ bool routing_add_node_announcement(struct routing_state *rstate,
if (!spam)
node->bcast.index = node->rgraph.index;
peer_supplied_good_gossip(peer, 1);
peer_supplied_good_gossip(rstate->daemon, source_peer, 1);
}
/* Only log this if *not* loading from store. */
if (!index)
status_peer_debug(peer ? &peer->id : NULL,
status_peer_debug(source_peer,
"Received node_announcement for node %s",
type_to_string(tmpctx, struct node_id,
&node_id));
@@ -1919,7 +1920,8 @@ bool routing_add_node_announcement(struct routing_state *rstate,
}
u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann,
struct peer *peer, bool *was_unknown)
const struct node_id *source_peer TAKES,
bool *was_unknown)
{
u8 *serialized;
struct sha256_double hash;
@@ -2000,7 +2002,7 @@ u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann,
}
/* May still fail, if we don't know the node. */
routing_add_node_announcement(rstate, serialized, 0, peer, was_unknown, false);
routing_add_node_announcement(rstate, serialized, 0, source_peer, was_unknown, false);
return NULL;
}

24
gossipd/routing.h
View File

@@ -144,8 +144,7 @@ struct pending_cannouncement {
struct pubkey bitcoin_key_1;
struct pubkey bitcoin_key_2;
/* Automagically turns to NULL of peer freed */
struct peer *peer_softref;
struct node_id *source_peer;
/* The raw bits */
const u8 *announce;
@@ -153,8 +152,8 @@ struct pending_cannouncement {
/* Deferred updates, if we received them while waiting for
* this (one for each direction) */
const u8 *updates[2];
/* Peers responsible: turns to NULL if they're freed */
struct peer *update_peer_softref[2];
/* Peers responsible */
struct node_id *update_source_peer[2];
/* Only ever replace with newer updates */
u32 update_timestamps[2];
@@ -297,7 +296,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
const u8 *announce TAKES,
u32 current_blockheight,
const struct short_channel_id **scid,
struct peer *peer);
const struct node_id *source_peer TAKES);
/**
* handle_pending_cannouncement -- handle channel_announce once we've
@@ -318,15 +317,16 @@ struct chan *next_chan(const struct node *node, struct chan_map_iter *i);
* If the error is that the channel is unknown, fills in *unknown_scid
* (if not NULL). */
u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
struct peer *peer,
const struct node_id *source_peer TAKES,
struct short_channel_id *unknown_scid,
bool force);
/* Returns NULL if all OK, otherwise an error for the peer which sent.
* If was_unknown is not NULL, sets it to true if that was the reason for
* the error: the node was unknown to us. */
u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node,
struct peer *peer, bool *was_unknown);
u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node_ann,
const struct node_id *source_peer TAKES,
bool *was_unknown);
/* Get a node: use this instead of node_map_get() */
struct node *get_node(struct routing_state *rstate,
@@ -344,13 +344,13 @@ void route_prune(struct routing_state *rstate);
* index is usually 0, in which case it's set by insert_broadcast adding it
* to the store.
*
* peer is an optional peer responsible for this.
* source_peer is an optional peer responsible for this.
*/
bool routing_add_channel_announcement(struct routing_state *rstate,
const u8 *msg TAKES,
struct amount_sat sat,
u32 index,
struct peer *peer);
const struct node_id *source_peer TAKES);
/**
* Add a channel_update without checking for errors
@@ -363,7 +363,7 @@ bool routing_add_channel_announcement(struct routing_state *rstate,
bool routing_add_channel_update(struct routing_state *rstate,
const u8 *update TAKES,
u32 index,
struct peer *peer,
const struct node_id *source_peer TAKES,
bool ignore_timestamp,
bool force_spam_flag,
bool force_zombie_flag);
@@ -377,7 +377,7 @@ bool routing_add_channel_update(struct routing_state *rstate,
bool routing_add_node_announcement(struct routing_state *rstate,
const u8 *msg TAKES,
u32 index,
struct peer *peer,
const struct node_id *source_peer TAKES,
bool *was_unknown,
bool force_spam_flag);

4
gossipd/test/run-check_channel_announcement.c
View File

@@ -114,7 +114,9 @@ struct oneshot *new_reltimer_(struct timers *timers UNNEEDED,
void *notleak_(void *ptr UNNEEDED, bool plus_children UNNEEDED)
{ fprintf(stderr, "notleak_ called!\n"); abort(); }
/* Generated stub for peer_supplied_good_gossip */
void peer_supplied_good_gossip(struct peer *peer UNNEEDED, size_t amount UNNEEDED)
void peer_supplied_good_gossip(struct daemon *daemon UNNEEDED,
const struct node_id *source_peer UNNEEDED,
size_t amount UNNEEDED)
{ fprintf(stderr, "peer_supplied_good_gossip called!\n"); abort(); }
/* Generated stub for status_failed */
void status_failed(enum status_failreason code UNNEEDED,

7
gossipd/test/run-check_node_announcement.c
View File

@@ -51,13 +51,14 @@ struct timeabs gossip_time_now(const struct routing_state *rstate UNNEEDED)
{ fprintf(stderr, "gossip_time_now called!\n"); abort(); }
/* Generated stub for handle_channel_update */
u8 *handle_channel_update(struct routing_state *rstate UNNEEDED, const u8 *update TAKES UNNEEDED,
struct peer *peer UNNEEDED,
const struct node_id *source_peer TAKES UNNEEDED,
struct short_channel_id *unknown_scid UNNEEDED,
bool force UNNEEDED)
{ fprintf(stderr, "handle_channel_update called!\n"); abort(); }
/* Generated stub for handle_node_announcement */
u8 *handle_node_announcement(struct routing_state *rstate UNNEEDED, const u8 *node UNNEEDED,
struct peer *peer UNNEEDED, bool *was_unknown UNNEEDED)
u8 *handle_node_announcement(struct routing_state *rstate UNNEEDED, const u8 *node_ann UNNEEDED,
const struct node_id *source_peer TAKES UNNEEDED,
bool *was_unknown UNNEEDED)
{ fprintf(stderr, "handle_node_announcement called!\n"); abort(); }
/* Generated stub for master_badmsg */
void master_badmsg(u32 type_expected UNNEEDED, const u8 *msg)

11
gossipd/test/run-crc32_of_update.c
View File

@@ -81,13 +81,14 @@ struct timeabs gossip_time_now(const struct routing_state *rstate UNNEEDED)
{ fprintf(stderr, "gossip_time_now called!\n"); abort(); }
/* Generated stub for handle_channel_update */
u8 *handle_channel_update(struct routing_state *rstate UNNEEDED, const u8 *update TAKES UNNEEDED,
struct peer *peer UNNEEDED,
const struct node_id *source_peer TAKES UNNEEDED,
struct short_channel_id *unknown_scid UNNEEDED,
bool force UNNEEDED)
{ fprintf(stderr, "handle_channel_update called!\n"); abort(); }
/* Generated stub for handle_node_announcement */
u8 *handle_node_announcement(struct routing_state *rstate UNNEEDED, const u8 *node UNNEEDED,
struct peer *peer UNNEEDED, bool *was_unknown UNNEEDED)
u8 *handle_node_announcement(struct routing_state *rstate UNNEEDED, const u8 *node_ann UNNEEDED,
const struct node_id *source_peer TAKES UNNEEDED,
bool *was_unknown UNNEEDED)
{ fprintf(stderr, "handle_node_announcement called!\n"); abort(); }
/* Generated stub for master_badmsg */
void master_badmsg(u32 type_expected UNNEEDED, const u8 *msg)
@@ -107,7 +108,9 @@ struct peer *next_random_peer(struct daemon *daemon UNNEEDED,
bool node_has_broadcastable_channels(const struct node *node UNNEEDED)
{ fprintf(stderr, "node_has_broadcastable_channels called!\n"); abort(); }
/* Generated stub for peer_supplied_good_gossip */
void peer_supplied_good_gossip(struct peer *peer UNNEEDED, size_t amount UNNEEDED)
void peer_supplied_good_gossip(struct daemon *daemon UNNEEDED,
const struct node_id *source_peer UNNEEDED,
size_t amount UNNEEDED)
{ fprintf(stderr, "peer_supplied_good_gossip called!\n"); abort(); }
/* Generated stub for queue_peer_from_store */
void queue_peer_from_store(struct peer *peer UNNEEDED,

4
gossipd/test/run-extended-info.c
View File

@@ -75,7 +75,9 @@ struct peer *next_random_peer(struct daemon *daemon UNNEEDED,
struct peer_node_id_map_iter *it UNNEEDED)
{ fprintf(stderr, "next_random_peer called!\n"); abort(); }
/* Generated stub for peer_supplied_good_gossip */
void peer_supplied_good_gossip(struct peer *peer UNNEEDED, size_t amount UNNEEDED)
void peer_supplied_good_gossip(struct daemon *daemon UNNEEDED,
const struct node_id *source_peer UNNEEDED,
size_t amount UNNEEDED)
{ fprintf(stderr, "peer_supplied_good_gossip called!\n"); abort(); }
/* Generated stub for queue_peer_from_store */
void queue_peer_from_store(struct peer *peer UNNEEDED,

4
gossipd/test/run-txout_failure.c
View File

@@ -76,7 +76,9 @@ bool nannounce_different(struct gossip_store *gs UNNEEDED,
void *notleak_(void *ptr UNNEEDED, bool plus_children UNNEEDED)
{ fprintf(stderr, "notleak_ called!\n"); abort(); }
/* Generated stub for peer_supplied_good_gossip */
void peer_supplied_good_gossip(struct peer *peer UNNEEDED, size_t amount UNNEEDED)
void peer_supplied_good_gossip(struct daemon *daemon UNNEEDED,
const struct node_id *source_peer UNNEEDED,
size_t amount UNNEEDED)
{ fprintf(stderr, "peer_supplied_good_gossip called!\n"); abort(); }
/* Generated stub for sanitize_error */
char *sanitize_error(const tal_t *ctx UNNEEDED, const u8 *errmsg UNNEEDED,