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

peer_failed: don't send error ourselves.

Browse Source 
gossipd actually does that now, so we don't need this synchronous send
hack.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-02-19 11:36:15 +10:30
parent 02d469b3d4
commit dba08f9d1b
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/peer_failed.c
View File

@@ -1,13 +1,10 @@
#include <ccan/io/io.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/crypto_sync.h>
#include <common/gen_peer_status_wire.h> #include <common/gen_peer_status_wire.h>
#include <common/gen_status_wire.h> #include <common/gen_status_wire.h>
#include <common/peer_failed.h> #include <common/peer_failed.h>
#include <common/status.h> #include <common/status.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h>
/* We only support one channel per peer anyway */ /* We only support one channel per peer anyway */
void peer_failed_(int peer_fd, int gossip_fd, void peer_failed_(int peer_fd, int gossip_fd,
@@ -23,15 +20,10 @@ void peer_failed_(int peer_fd, int gossip_fd,
desc = tal_vfmt(NULL, fmt, ap); desc = tal_vfmt(NULL, fmt, ap);
va_end(ap); va_end(ap);
status_broken("SENT ERROR:%s", desc);
msg = towire_errorfmt(desc, channel_id, "%s", desc);
/* This is only best-effort; don't block. */
io_fd_block(peer_fd, false);
sync_crypto_write(cs, peer_fd, msg);
msg = towire_status_peer_error(NULL, channel_id, msg = towire_status_peer_error(NULL, channel_id,
desc, cs, gossip_index, msg); desc, cs, gossip_index,
towire_errorfmt(desc, channel_id,
"%s", desc));
tal_free(desc); tal_free(desc);
status_send_fatal(take(msg), peer_fd, gossip_fd); status_send_fatal(take(msg), peer_fd, gossip_fd);
} }