aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/per_per_state: generalize lightningd/peer_comm Part 1

Browse Source 
Encapsulating the peer state was a win for lightningd; not surprisingly,
it's even more of a win for the other daemons, especially as we want
to add a little gossip information.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-06-04 03:41:25 +09:30
parent f1b4b14be5
commit 38d2899fbb
45 changed files with 490 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/peer_failed.c
View File

@@ -1,3 +1,4 @@
#include <ccan/breakpoint/breakpoint.h>
#include <ccan/tal/str/str.h>
#include <common/crypto_sync.h>
#include <common/gen_peer_status_wire.h>
@@ -8,11 +9,24 @@
#include <common/wire_error.h>
#include <stdarg.h>
/* Fatal error here, return peer control to lightningd */
static void NORETURN
peer_fatal_continue(const u8 *msg TAKES, const struct per_peer_state *pps)
{
int reason = fromwire_peektype(msg);
breakpoint();
status_send(msg);
status_send_fd(pps->peer_fd);
status_send_fd(pps->gossip_fd);
status_send_fd(pps->gossip_store_fd);
exit(0x80 | (reason & 0xFF));
}
/* We only support one channel per peer anyway */
void peer_failed_(int peer_fd, int gossip_fd, int gossip_store_fd,
struct crypto_state *cs,
const struct channel_id *channel_id,
const char *fmt, ...)
void peer_failed(struct per_peer_state *pps,
const struct channel_id *channel_id,
const char *fmt, ...)
{
va_list ap;
const char *desc;
@@ -24,20 +38,19 @@ void peer_failed_(int peer_fd, int gossip_fd, int gossip_store_fd,
/* Tell peer the error. */
err = towire_errorfmt(desc, channel_id, "%s", desc);
sync_crypto_write(cs, peer_fd, err);
sync_crypto_write(pps, err);
/* Tell master the error so it can re-xmit. */
msg = towire_status_peer_error(NULL, channel_id,
desc, cs,
desc, pps,
err);
peer_billboard(true, desc);
tal_free(desc);
status_send_fatal(take(msg), peer_fd, gossip_fd, gossip_store_fd);
peer_fatal_continue(take(msg), pps);
}
/* We're failing because peer sent us an error message */
void peer_failed_received_errmsg(int peer_fd, int gossip_fd, int gossip_store_fd,
struct crypto_state *cs,
void peer_failed_received_errmsg(struct per_peer_state *pps,
const char *desc,
const struct channel_id *channel_id)
{
@@ -46,13 +59,12 @@ void peer_failed_received_errmsg(int peer_fd, int gossip_fd, int gossip_store_fd
if (!channel_id)
channel_id = &all_channels;
msg = towire_status_peer_error(NULL, channel_id, desc, cs, NULL);
msg = towire_status_peer_error(NULL, channel_id, desc, pps, NULL);
peer_billboard(true, "Received error from peer: %s", desc);
status_send_fatal(take(msg), peer_fd, gossip_fd, gossip_store_fd);
peer_fatal_continue(take(msg), pps);
}
void peer_failed_connection_lost(void)
{
status_send_fatal(take(towire_status_peer_connection_lost(NULL)),
-1, -1, -1);
status_send_fatal(take(towire_status_peer_connection_lost(NULL)));
}