mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

gossip: Move error return into peer handler

Browse source 
Ee will be replaying gossip messages from the gossip_store soon. This means that
not all messages originate from a peer, so we move the queuing of error messages
up into the peer message handler.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker 2018-03-18 14:57:15 +01:00 • committed by Rusty Russell
parent 49b0c375ce
commit e750d3cda1
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gossipd/gossip.c
View file

@ -485,9 +485,9 @@ static void send_node_announcement(struct daemon *daemon)
}
/* Returns error if we should send an error. */
static void handle_gossip_msg(struct peer *peer, u8 *msg)
static u8 *handle_gossip_msg(struct daemon *daemon, const u8 *msg)
{
struct routing_state *rstate = peer->daemon->rstate;
struct routing_state *rstate = daemon->rstate;
int t = fromwire_peektype(msg);
u8 *err;
@ -497,9 +497,9 @@ static void handle_gossip_msg(struct peer *peer, u8 *msg)
/* If it's OK, tells us the short_channel_id to lookup */
err = handle_channel_announcement(rstate, msg, &scid);
if (err)
queue_peer_msg(peer, take(err));
return err;
else if (scid)
daemon_conn_send(&peer->daemon->master,
daemon_conn_send(&daemon->master,
take(towire_gossip_get_txout(NULL,
scid)));
break;
@ -508,15 +508,18 @@ static void handle_gossip_msg(struct peer *peer, u8 *msg)
case WIRE_NODE_ANNOUNCEMENT:
err = handle_node_announcement(rstate, msg);
if (err)
queue_peer_msg(peer, take(err));
return err;
break;
case WIRE_CHANNEL_UPDATE:
err = handle_channel_update(rstate, msg);
if (err)
queue_peer_msg(peer, take(err));
return err;
break;
}
/* All good, no error to report */
return NULL;
}
static void handle_ping(struct peer *peer, u8 *ping)
@ -602,6 +605,7 @@ static struct io_plan *peer_msgin(struct io_conn *conn,
struct peer *peer, u8 *msg)
{
enum wire_type t = fromwire_peektype(msg);
u8 *err;
switch (t) {
case WIRE_ERROR:
@ -613,7 +617,9 @@ static struct io_plan *peer_msgin(struct io_conn *conn,
case WIRE_CHANNEL_ANNOUNCEMENT:
case WIRE_NODE_ANNOUNCEMENT:
case WIRE_CHANNEL_UPDATE:
handle_gossip_msg(peer, msg);
err = handle_gossip_msg(peer->daemon, msg);
if (err)
queue_peer_msg(peer, take(err));
return peer_next_in(conn, peer);
case WIRE_PING:
@ -839,12 +845,15 @@ static struct io_plan *owner_msg_in(struct io_conn *conn,
struct daemon_conn *dc)
{
struct peer *peer = dc->ctx;
u8 *msg = dc->msg_in;
u8 *msg = dc->msg_in, *err;
int type = fromwire_peektype(msg);
if (type == WIRE_CHANNEL_ANNOUNCEMENT || type == WIRE_CHANNEL_UPDATE ||
type == WIRE_NODE_ANNOUNCEMENT) {
handle_gossip_msg(peer, dc->msg_in);
err = handle_gossip_msg(peer->daemon, dc->msg_in);
if (err)
queue_peer_msg(peer, take(err));
} else if (type == WIRE_GOSSIP_GET_UPDATE) {
handle_get_update(peer, dc->msg_in);
} else if (type == WIRE_GOSSIP_LOCAL_ADD_CHANNEL) {
@ -915,7 +924,6 @@ static bool nonlocal_dump_gossip(struct io_conn *conn, struct daemon_conn *dc)
const u8 *next;
struct peer *peer = dc->ctx;
/* Make sure we are not connected directly */
assert(!peer->local);