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

protocol: don't ever reply to PKT_ERR with PKT_ERR.

Browse Source 
The simplest way is to always use peer_received_unexpected_pkt() which
sends the error packet, and ensure it doesn't do so in response to
pkt_err.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-11-09 08:04:27 +10:30
parent d77d5edc07
commit 536a48940e
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
daemon/peer.c
View File

@@ -469,16 +469,22 @@ static bool peer_database_err(struct peer *peer)
return peer_comms_err(peer, pkt_err(peer, "database error")); return peer_comms_err(peer, pkt_err(peer, "database error"));
} }
void peer_unexpected_pkt(struct peer *peer, const Pkt *pkt, const char *where) /* Unexpected packet received: stop listening, send error, start
* breakdown procedure, return false. */
static bool peer_received_unexpected_pkt(struct peer *peer, const Pkt *pkt,
const char *where)
{ {
const char *p; const char *p;
Pkt *err;
log_unusual(peer->log, "%s: received unexpected pkt %u (%s) in %s", log_unusual(peer->log, "%s: received unexpected pkt %u (%s) in %s",
where, pkt->pkt_case, pkt_name(pkt->pkt_case), where, pkt->pkt_case, pkt_name(pkt->pkt_case),
state_name(peer->state)); state_name(peer->state));
if (pkt->pkt_case != PKT__PKT_ERROR) if (pkt->pkt_case != PKT__PKT_ERROR) {
return; err = pkt_err_unexpected(peer, pkt);
goto out;
}
/* Check packet for weird chars. */ /* Check packet for weird chars. */
for (p = pkt->error->problem; *p; p++) { for (p = pkt->error->problem; *p; p++) {
@@ -489,17 +495,20 @@ void peer_unexpected_pkt(struct peer *peer, const Pkt *pkt, const char *where)
strlen(pkt->error->problem)); strlen(pkt->error->problem));
log_unusual(peer->log, "Error pkt (hex) %s", p); log_unusual(peer->log, "Error pkt (hex) %s", p);
tal_free(p); tal_free(p);
return; goto out;
} }
log_unusual(peer->log, "Error pkt '%s'", pkt->error->problem); log_unusual(peer->log, "Error pkt '%s'", pkt->error->problem);
}
/* Unexpected packet received: stop listening, start breakdown procedure. */ /* BOLT #2:
static bool peer_received_unexpected_pkt(struct peer *peer, const Pkt *pkt, *
const char *where) * A node MUST fail the connection if it receives an `err`
{ * message, and MUST NOT send an `err` message in this case.
peer_unexpected_pkt(peer, pkt, where); * For other connection failures, a node SHOULD send an
return peer_comms_err(peer, pkt_err_unexpected(peer, pkt)); * informative `err` message.
*/
err = NULL;
out:
return peer_comms_err(peer, err);
} }
/* Creation the bitcoin anchor tx, spending output user provided. */ /* Creation the bitcoin anchor tx, spending output user provided. */
@@ -1644,7 +1653,7 @@ static bool shutdown_pkt_in(struct peer *peer, const Pkt *pkt)
switch (pkt->pkt_case) { switch (pkt->pkt_case) {
case PKT__PKT_UPDATE_REVOCATION: case PKT__PKT_UPDATE_REVOCATION:
if (peer->state == STATE_SHUTDOWN) if (peer->state == STATE_SHUTDOWN)
err = pkt_err_unexpected(peer, pkt); return peer_received_unexpected_pkt(peer, pkt, __func__);
else { else {
err = handle_pkt_revocation(peer, pkt, STATE_SHUTDOWN); err = handle_pkt_revocation(peer, pkt, STATE_SHUTDOWN);
if (!err) if (!err)
@@ -1668,7 +1677,7 @@ static bool shutdown_pkt_in(struct peer *peer, const Pkt *pkt)
* *
* A node... MUST NOT send more than one `close_shutdown`. */ * A node... MUST NOT send more than one `close_shutdown`. */
if (peer->closing.their_script) if (peer->closing.their_script)
err = pkt_err_unexpected(peer, pkt); return peer_received_unexpected_pkt(peer, pkt, __func__);
else { else {
err = accept_pkt_close_shutdown(peer, pkt); err = accept_pkt_close_shutdown(peer, pkt);
if (!err) { if (!err) {
@@ -1696,8 +1705,7 @@ static bool shutdown_pkt_in(struct peer *peer, const Pkt *pkt)
err = handle_pkt_commit(peer, pkt); err = handle_pkt_commit(peer, pkt);
break; break;
case PKT__PKT_ERROR: case PKT__PKT_ERROR:
peer_unexpected_pkt(peer, pkt, __func__); return peer_received_unexpected_pkt(peer, pkt, __func__);
return peer_comms_err(peer, NULL);
case PKT__PKT_AUTH: case PKT__PKT_AUTH:
case PKT__PKT_OPEN: case PKT__PKT_OPEN:
@@ -1706,9 +1714,7 @@ static bool shutdown_pkt_in(struct peer *peer, const Pkt *pkt)
case PKT__PKT_OPEN_COMPLETE: case PKT__PKT_OPEN_COMPLETE:
case PKT__PKT_CLOSE_SIGNATURE: case PKT__PKT_CLOSE_SIGNATURE:
default: default:
peer_unexpected_pkt(peer, pkt, __func__); return peer_received_unexpected_pkt(peer, pkt, __func__);
err = pkt_err_unexpected(peer, pkt);
break;
} }
if (err) if (err)

2
daemon/peer.h
View File

@@ -278,8 +278,6 @@ const char *command_htlc_add(struct peer *peer, u64 msatoshi,
enum fail_error *error_code, enum fail_error *error_code,
struct htlc **htlc); struct htlc **htlc);
void peer_unexpected_pkt(struct peer *peer, const Pkt *pkt, const char *where);
/* Peer has an issue, breakdown and fail. */ /* Peer has an issue, breakdown and fail. */
void peer_fail(struct peer *peer, const char *caller); void peer_fail(struct peer *peer, const char *caller);