mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 18:11:28 +01:00
Code Issues Projects Releases Wiki Activity

gossipd: suppress redundant local updates which we would generate.

Browse Source 
This doesn't do anything for us now, since we actually tend to produce
DISABLE/ENABLE update pairs.  But the infrastructure is useful for the
next patch.

We also add more details to the trace message in the core update code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-07-03 06:24:12 +09:30 committed by Christian Decker
parent 2d533dc82e
commit ef59a8f4aa
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gossipd/gossip.c
View File

@ -1656,6 +1656,21 @@ static u8 *create_channel_update(const tal_t *ctx,
return update; return update;
} }
/* Return true if the only change would be the timestamp. */
static bool update_redundant(const struct half_chan *hc,
bool disable, u16 cltv_delta, u64 htlc_minimum_msat,
u32 fee_base_msat, u32 fee_proportional_millionths)
{
if (!is_halfchan_defined(hc))
return false;
return !(hc->flags & ROUTING_FLAGS_DISABLED) == !disable
&& hc->delay == cltv_delta
&& hc->htlc_minimum_msat == htlc_minimum_msat
&& hc->base_fee == fee_base_msat
&& hc->proportional_fee == fee_proportional_millionths;
}
static void handle_local_channel_update(struct peer *peer, const u8 *msg) static void handle_local_channel_update(struct peer *peer, const u8 *msg)
{ {
struct short_channel_id scid; struct short_channel_id scid;
@ -1701,6 +1716,25 @@ static void handle_local_channel_update(struct peer *peer, const u8 *msg)
return; return;
} }
/* Avoid redundant updates on public channels: on non-public channels
* we'd need to consider pending updates, so don't bother. */
if (is_chan_public(chan)
&& update_redundant(&chan->half[direction],
disable, cltv_delta, htlc_minimum_msat,
fee_base_msat, fee_proportional_millionths)) {
status_trace("Suppressing redundant channel update for %s:(%u) %s %"PRIu64"/%u vs %u/%u",
type_to_string(tmpctx, struct short_channel_id,
&scid),
direction,
is_halfchan_defined(&chan->half[direction])
? (chan->half[direction].flags & ROUTING_FLAGS_DISABLED ? "DISABLED" : "ACTIVE")
: "UNDEFINED",
chan->half[direction].last_timestamp,
(u32)time_now().ts.tv_sec,
chan->half[direction].flags, disable);
return;
}
cupdate = create_channel_update(tmpctx, peer->daemon->rstate, cupdate = create_channel_update(tmpctx, peer->daemon->rstate,
chan, direction, chan, direction,
disable, cltv_delta, disable, cltv_delta,

5
gossipd/routing.c
View File

@ -1207,11 +1207,14 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update,
return err; return err;
} }
status_trace("Received channel_update for channel %s(%d) now %s (from %s)", status_trace("Received channel_update for channel %s(%d) now %s was %s (from %s)",
type_to_string(tmpctx, struct short_channel_id, type_to_string(tmpctx, struct short_channel_id,
&short_channel_id), &short_channel_id),
flags & 0x01, flags & 0x01,
flags & ROUTING_FLAGS_DISABLED ? "DISABLED" : "ACTIVE", flags & ROUTING_FLAGS_DISABLED ? "DISABLED" : "ACTIVE",
is_halfchan_defined(c)
? (c->flags & ROUTING_FLAGS_DISABLED ? "DISABLED" : "ACTIVE")
: "UNDEFINED",
source); source);
if (!routing_add_channel_update(rstate, serialized)) if (!routing_add_channel_update(rstate, serialized))