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

gossipd: rename fail_peer to drop_peer.

Browse source 
We don't actually send it a failure message, we just close it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-10-11 20:25:50 +10:30 • committed by Christian Decker
parent 0969626918
commit 399b5f61bc
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gossipd/gossip.c
View file

@ -459,25 +459,25 @@ static struct io_plan *release_peer(struct io_conn *conn, struct daemon *daemon,
return daemon_conn_read_next(conn, &daemon->master); return daemon_conn_read_next(conn, &daemon->master);
} }
static struct io_plan *fail_peer(struct io_conn *conn, struct daemon *daemon, static struct io_plan *drop_peer(struct io_conn *conn, struct daemon *daemon,
const u8 *msg) const u8 *msg)
{ {
u64 unique_id; u64 unique_id;
struct peer *peer; struct peer *peer;
if (!fromwire_gossipctl_fail_peer(msg, NULL, &unique_id)) if (!fromwire_gossipctl_drop_peer(msg, NULL, &unique_id))
master_badmsg(WIRE_GOSSIPCTL_FAIL_PEER, msg); master_badmsg(WIRE_GOSSIPCTL_DROP_PEER, msg);
/* This may not find the peer, if we fail beforehand. */ /* This may not find the peer, if we fail beforehand. */
peer = find_peer(daemon, unique_id); peer = find_peer(daemon, unique_id);
if (!peer) if (!peer)
status_trace("Unknown fail_peer %"PRIu64, unique_id); status_trace("Unknown drop_peer %"PRIu64, unique_id);
else if (peer->local) { else if (peer->local) {
status_trace("fail_peer %"PRIu64, unique_id); status_trace("drop_peer %"PRIu64, unique_id);
/* This owns the peer, so we can free it */ /* This owns the peer, so we can free it */
io_close(peer->conn); io_close(peer->conn);
} else { } else {
status_trace("Could not fail_peer %"PRIu64", it's not local", status_trace("Could not drop_peer %"PRIu64", it's not local",
unique_id); unique_id);
} }
@ -719,8 +719,8 @@ static struct io_plan *recv_req(struct io_conn *conn, struct daemon_conn *master
return new_peer(conn, daemon, master->msg_in); return new_peer(conn, daemon, master->msg_in);
case WIRE_GOSSIPCTL_RELEASE_PEER: case WIRE_GOSSIPCTL_RELEASE_PEER:
return release_peer(conn, daemon, master->msg_in); return release_peer(conn, daemon, master->msg_in);
case WIRE_GOSSIPCTL_FAIL_PEER: case WIRE_GOSSIPCTL_DROP_PEER:
return fail_peer(conn, daemon, master->msg_in); return drop_peer(conn, daemon, master->msg_in);
case WIRE_GOSSIPCTL_GET_PEER_GOSSIPFD: case WIRE_GOSSIPCTL_GET_PEER_GOSSIPFD:
return new_peer_fd(conn, daemon, master->msg_in); return new_peer_fd(conn, daemon, master->msg_in);

4
gossipd/gossip_wire.csv
View file

@ -98,8 +98,8 @@ gossip_forwarded_msg,,msglen,u16
gossip_forwarded_msg,,msg,msglen*u8 gossip_forwarded_msg,,msg,msglen*u8
# If peer is still connected, fail it (master does this for reconnect) # If peer is still connected, fail it (master does this for reconnect)
gossipctl_fail_peer,3011 gossipctl_drop_peer,3011
gossipctl_fail_peer,,unique_id,u64 gossipctl_drop_peer,,unique_id,u64
# Get a gossip fd for this peer (it has reconnected) # Get a gossip fd for this peer (it has reconnected)
gossipctl_get_peer_gossipfd,3012 gossipctl_get_peer_gossipfd,3012

1 # Peers can give a bad message, we close their fd, but no harm done.
98
99
100
101
102
103
104
105

2
lightningd/gossip_control.c
View file

@ -96,7 +96,7 @@ static int gossip_msg(struct subd *gossip, const u8 *msg, const int *fds)
case WIRE_GOSSIPCTL_INIT: case WIRE_GOSSIPCTL_INIT:
case WIRE_GOSSIPCTL_NEW_PEER: case WIRE_GOSSIPCTL_NEW_PEER:
case WIRE_GOSSIPCTL_RELEASE_PEER: case WIRE_GOSSIPCTL_RELEASE_PEER:
case WIRE_GOSSIPCTL_FAIL_PEER: case WIRE_GOSSIPCTL_DROP_PEER:
case WIRE_GOSSIPCTL_GET_PEER_GOSSIPFD: case WIRE_GOSSIPCTL_GET_PEER_GOSSIPFD:
case WIRE_GOSSIP_GETNODES_REQUEST: case WIRE_GOSSIP_GETNODES_REQUEST:
case WIRE_GOSSIP_GETROUTE_REQUEST: case WIRE_GOSSIP_GETROUTE_REQUEST:

2
lightningd/peer_control.c
View file

@ -498,7 +498,7 @@ static bool peer_reconnected(struct lightningd *ld,
case GOSSIPD: case GOSSIPD:
/* Tell gossipd to kick that one out, will call peer_fail */ /* Tell gossipd to kick that one out, will call peer_fail */
subd_send_msg(peer->ld->gossip, subd_send_msg(peer->ld->gossip,
take(towire_gossipctl_fail_peer(peer, take(towire_gossipctl_drop_peer(peer,
peer->unique_id))); peer->unique_id)));
tal_free(peer); tal_free(peer);
/* Continue with a new peer. */ /* Continue with a new peer. */