mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 21:35:11 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: simplify permanent failure.

Browse Source 
Turns out everyone wanted a formatted string anyway.

Inspired-by: practicalswift
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-01-03 16:29:35 +10:30
parent 5eceaa7be9
commit ba22484901
4 changed files with 37 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lightningd/peer_control.c
View File

@ -189,55 +189,46 @@ static void drop_to_chain(struct peer *peer)
}
/* This lets us give a more detailed error than just a destructor. */
static void free_peer(struct peer *peer, const char *msg)
static void free_peer(struct peer *peer, const char *why)
{
if (peer->opening_cmd) {
command_fail(peer->opening_cmd, "%s", msg);
command_fail(peer->opening_cmd, "%s", why);
peer->opening_cmd = NULL;
}
tal_free(peer);
}
void peer_fail_permanent(struct peer *peer, const u8 *msg TAKES)
void peer_fail_permanent(struct peer *peer, const char *fmt, ...)
{
/* BOLT #1:
*
* The channel is referred to by `channel_id` unless `channel_id` is
* zero (ie. all bytes zero), in which case it refers to all
* channels. */
static const struct channel_id all_channels;
va_list ap;
char *why;
/* Subtle: we don't want tal_strndup here, it will take() msg! */
why = tal_arrz(NULL, char, tal_len(msg) + 1);
memcpy(why, msg, tal_len(msg));
va_start(ap, fmt);
why = tal_vfmt(peer, fmt, ap);
va_end(ap);
log_unusual(peer->log, "Peer permanent failure in %s: %s",
peer_state_name(peer->state), why);
/* We can have multiple errors, eg. onchaind failures. */
if (!peer->error)
if (!peer->error) {
/* BOLT #1:
*
* The channel is referred to by `channel_id` unless `channel_id` is
* zero (ie. all bytes zero), in which case it refers to all
* channels. */
static const struct channel_id all_channels;
u8 *msg = tal_dup_arr(peer, u8, (const u8 *)why, strlen(why), 0);
peer->error = towire_error(peer, &all_channels, msg);
tal_free(msg);
}
peer_set_owner(peer, NULL);
if (taken(msg))
tal_free(msg);
if (peer_persists(peer))
drop_to_chain(peer);
else
free_peer(peer, why);
tal_free(why);
return;
}
void peer_fail_permanent_str(struct peer *peer, const char *str TAKES)
{
/* Don't use tal_strdup, since we need tal_len */
u8 *msg = tal_dup_arr(peer, u8, (const u8 *)str, strlen(str) + 1, 0);
if (taken(str))
tal_free(str);
peer_fail_permanent(peer, take(msg));
}
void peer_internal_error(struct peer *peer, const char *fmt, ...)
@ -250,7 +241,7 @@ void peer_internal_error(struct peer *peer, const char *fmt, ...)
logv_add(peer->log, fmt, ap);
va_end(ap);
peer_fail_permanent_str(peer, "Internal error");
peer_fail_permanent(peer, "Internal error");
}
void peer_fail_transient(struct peer *peer, const char *fmt, ...)
@ -1385,7 +1376,7 @@ static enum watch_result funding_spent(struct peer *peer,
struct htlc_stub *stubs;
const tal_t *tmpctx = tal_tmpctx(peer);
peer_fail_permanent_str(peer, "Funding transaction spent");
peer_fail_permanent(peer, "Funding transaction spent");
/* We could come from almost any state. */
peer_set_condition(peer, peer->state, FUNDING_SPEND_SEEN);
@ -1671,9 +1662,8 @@ static void peer_got_shutdown(struct peer *peer, const u8 *msg)
* is not one of those forms. */
if (!is_p2pkh(scriptpubkey, NULL) && !is_p2sh(scriptpubkey, NULL)
&& !is_p2wpkh(scriptpubkey, NULL) && !is_p2wsh(scriptpubkey, NULL)) {
char *str = tal_fmt(peer, "Bad shutdown scriptpubkey %s",
peer_fail_permanent(peer, "Bad shutdown scriptpubkey %s",
tal_hex(peer, scriptpubkey));
peer_fail_permanent_str(peer, take(str));
return;
}
@ -2670,7 +2660,8 @@ static void json_close(struct command *cmd,
/* Easy case: peer can simply be forgotten. */
if (!peer_persists(peer)) {
peer_fail_permanent(peer, NULL);
peer_fail_permanent(peer, "Peer closed in state %s",
peer_state_name(peer->state));
command_success(cmd, null_response(cmd));
return;
}

4
lightningd/peer_control.h
View File

@ -208,9 +208,7 @@ u8 *get_supported_local_features(const tal_t *ctx);
/* Peer has failed, but try reconnected. */
PRINTF_FMT(2,3) void peer_fail_transient(struct peer *peer, const char *fmt,...);
/* Peer has failed, give up on it. */
void peer_fail_permanent(struct peer *peer, const u8 *msg TAKES);
/* Version where we supply the reason string. */
void peer_fail_permanent_str(struct peer *peer, const char *str TAKES);
void peer_fail_permanent(struct peer *peer, const char *fmt, ...);
/* Permanent error, but due to internal problems, not peer. */
void peer_internal_error(struct peer *peer, const char *fmt, ...);

29
lightningd/peer_htlcs.c
View File

@ -1213,12 +1213,11 @@ void peer_got_revoke(struct peer *peer, const u8 *msg)
if (!wallet_shachain_add_hash(peer->ld->wallet, &peer->their_shachain,
shachain_index(revokenum),
&per_commitment_secret)) {
char *err = tal_fmt(peer,
peer_fail_permanent(peer,
"Bad per_commitment_secret %s for %"PRIu64,
type_to_string(msg, struct sha256,
&per_commitment_secret),
revokenum);
peer_fail_permanent(peer, take((u8 *)err));
return;
}
@ -1429,13 +1428,12 @@ void notify_new_block(struct lightningd *ld, u32 height)
if (hout->key.peer->error)
continue;
peer_fail_permanent_str(hout->key.peer,
take(tal_fmt(hout,
"Offered HTLC %"PRIu64
" %s cltv %u hit deadline",
hout->key.id,
htlc_state_name(hout->hstate),
hout->cltv_expiry)));
peer_fail_permanent(hout->key.peer,
"Offered HTLC %"PRIu64
" %s cltv %u hit deadline",
hout->key.id,
htlc_state_name(hout->hstate),
hout->cltv_expiry);
removed = true;
}
/* Iteration while removing is safe, but can skip entries! */
@ -1474,13 +1472,12 @@ void notify_new_block(struct lightningd *ld, u32 height)
if (hin->key.peer->error)
continue;
peer_fail_permanent_str(hin->key.peer,
take(tal_fmt(hin,
"Fulfilled HTLC %"PRIu64
" %s cltv %u hit deadline",
hin->key.id,
htlc_state_name(hin->hstate),
hin->cltv_expiry)));
peer_fail_permanent(hin->key.peer,
"Fulfilled HTLC %"PRIu64
" %s cltv %u hit deadline",
hin->key.id,
htlc_state_name(hin->hstate),
hin->cltv_expiry);
removed = true;
}
/* Iteration while removing is safe, but can skip entries! */

5
lightningd/subd.c
View File

@ -459,10 +459,7 @@ static struct io_plan *sd_msg_read(struct io_conn *conn, struct subd *sd)
struct peer *peer = sd->peer;
sd->peer = NULL;
peer_fail_permanent(peer,
take(tal_dup_arr(peer, u8,
(u8 *)str, str_len,
0)));
peer_fail_permanent(peer, "%s: %.*s", sd->name, str_len, str);
}
goto close;
}