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

gossipd: APIs return more information about routing message handling.

Browse Source 
In particular, we'll need to know the short_channel_id if a
channel_update is unknown (implies we're missing a channel), and whether
processing a pending channel_announcement was successful (implies that
the channel was real).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-06-12 08:57:07 +09:30
parent 5ef7aa70d2
commit 18069ab3da
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gossipd/gossipd.c
View File

@@ -606,7 +606,8 @@ static const u8 *handle_channel_announcement_msg(struct peer *peer,
static u8 *handle_channel_update_msg(struct peer *peer, const u8 *msg)
{
/* Hand the channel_update to the routing code */
u8 *err = handle_channel_update(peer->daemon->rstate, msg, "subdaemon");
u8 *err = handle_channel_update(peer->daemon->rstate, msg, "subdaemon",
NULL);
if (err)
return err;
@@ -1311,7 +1312,7 @@ static void update_local_channel(struct daemon *daemon,
/* We feed it into routing.c like any other channel_update; it may
* discard it (eg. non-public channel), but it should not complain
* about it being invalid! */
msg = handle_channel_update(daemon->rstate, take(update), caller);
msg = handle_channel_update(daemon->rstate, take(update), caller, NULL);
if (msg)
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"%s: rejected local channel update %s: %s",

19
gossipd/routing.c
View File

@@ -1646,7 +1646,7 @@ static void process_pending_channel_update(struct routing_state *rstate,
return;
/* FIXME: We don't remember who sent us updates, so can't error them */
err = handle_channel_update(rstate, cupdate, "pending update");
err = handle_channel_update(rstate, cupdate, "pending update", NULL);
if (err) {
status_trace("Pending channel_update for %s: %s",
type_to_string(tmpctx, struct short_channel_id, scid),
@@ -1655,7 +1655,7 @@ static void process_pending_channel_update(struct routing_state *rstate,
}
}
void handle_pending_cannouncement(struct routing_state *rstate,
bool handle_pending_cannouncement(struct routing_state *rstate,
const struct short_channel_id *scid,
struct amount_sat sat,
const u8 *outscript)
@@ -1665,7 +1665,7 @@ void handle_pending_cannouncement(struct routing_state *rstate,
pending = find_pending_cannouncement(rstate, scid);
if (!pending)
return;
return false;
/* BOLT #7:
*
@@ -1680,7 +1680,7 @@ void handle_pending_cannouncement(struct routing_state *rstate,
scid));
tal_free(pending);
uintmap_add(&rstate->txout_failures, scid->u64, true);
return;
return false;
}
/* BOLT #7:
@@ -1703,7 +1703,7 @@ void handle_pending_cannouncement(struct routing_state *rstate,
scid),
tal_hex(tmpctx, s), tal_hex(tmpctx, outscript));
tal_free(pending);
return;
return false;
}
/* Remove pending now, so below functions don't see it. */
@@ -1719,6 +1719,7 @@ void handle_pending_cannouncement(struct routing_state *rstate,
process_pending_channel_update(rstate, scid, pending->updates[1]);
tal_free(pending);
return true;
}
static void update_pending(struct pending_cannouncement *pending,
@@ -1963,7 +1964,8 @@ void remove_channel_from_store(struct routing_state *rstate,
}
u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
const char *source)
const char *source,
struct short_channel_id *unknown_scid)
{
u8 *serialized;
const struct node_id *owner;
@@ -2031,6 +2033,8 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
owner = get_channel_owner(rstate, &short_channel_id, direction);
if (!owner) {
if (unknown_scid)
*unknown_scid = short_channel_id;
bad_gossip_order(serialized,
source,
tal_fmt(tmpctx, "%s/%u",
@@ -2386,7 +2390,8 @@ void routing_failure(struct routing_state *rstate,
/* lightningd will only extract this if UPDATE is set. */
if (channel_update) {
u8 *err = handle_channel_update(rstate, channel_update, "error");
u8 *err = handle_channel_update(rstate, channel_update, "error",
NULL);
if (err) {
status_unusual("routing_failure: "
"bad channel_update %s",

12
gossipd/routing.h
View File

@@ -301,9 +301,10 @@ u8 *handle_channel_announcement(struct routing_state *rstate,
/**
* handle_pending_cannouncement -- handle channel_announce once we've
* completed short_channel_id lookup.
* completed short_channel_id lookup. Returns true if handling created
* a new channel.
*/
void handle_pending_cannouncement(struct routing_state *rstate,
bool handle_pending_cannouncement(struct routing_state *rstate,
const struct short_channel_id *scid,
const struct amount_sat sat,
const u8 *txscript);
@@ -312,9 +313,12 @@ void handle_pending_cannouncement(struct routing_state *rstate,
struct chan *first_chan(const struct node *node, struct chan_map_iter *i);
struct chan *next_chan(const struct node *node, struct chan_map_iter *i);
/* Returns NULL if all OK, otherwise an error for the peer which sent. */
/* Returns NULL if all OK, otherwise an error for the peer which sent.
* 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,
const char *source);
const char *source,
struct short_channel_id *unknown_scid);
/* Returns NULL if all OK, otherwise an error for the peer which sent. */
u8 *handle_node_announcement(struct routing_state *rstate, const u8 *node);