lightningd/peer_control: reorder, move more functions out.

Signed-off-by: Rusty Russell <[email protected]>
muxi166 · Feb 20, 2018 · 36652a3 · 36652a3
1 parent 372040b
commit 36652a3
Show file tree

Hide file tree

Showing 6 changed files with 289 additions and 297 deletions.
diff --git a/lightningd/connect_control.c b/lightningd/connect_control.c
@@ -89,6 +89,19 @@ void peer_connection_failed(struct lightningd *ld, const u8 *msg)
 	connect_failed(ld, &id, error);
 }
 
+/* Gossipd tells us peer was already connected. */
+void peer_already_connected(struct lightningd *ld, const u8 *msg)
+{
+	struct pubkey id;
+
+	if (!fromwire_gossip_peer_already_connected(msg, NULL, &id))
+		fatal("Gossip gave bad GOSSIP_PEER_ALREADY_CONNECTED message %s",
+		      tal_hex(msg, msg));
+
+	/* If we were waiting for connection, we succeeded. */
+	connect_succeeded(ld, &id);
+}
+
 static void json_connect(struct command *cmd,
 			 const char *buffer, const jsmntok_t *params)
 {

diff --git a/lightningd/connect_control.h b/lightningd/connect_control.h
@@ -12,4 +12,7 @@ void connect_failed(struct lightningd *ld, const struct pubkey *id,
 /* Gossipd was unable to connect to the peer */
 void peer_connection_failed(struct lightningd *ld, const u8 *msg);
 
+/* This simply means we asked to reach a peer, but we already have it */
+void peer_already_connected(struct lightningd *ld, const u8 *msg);
+
 #endif /* LIGHTNING_LIGHTNINGD_CONNECT_CONTROL_H */