Warning message support

closingd/closingd.c

@@ -51,13 +51,13 @@ static struct bitcoin_tx *close_tx(const tal_t *ctx,
 	out_minus_fee[LOCAL] = out[LOCAL];
 	out_minus_fee[REMOTE] = out[REMOTE];
 	if (!amount_sat_sub(&out_minus_fee[opener], out[opener], fee))
-		peer_failed(pps, channel_id,
-			    "Funder cannot afford fee %s (%s and %s)",
-			    type_to_string(tmpctx, struct amount_sat, &fee),
-			    type_to_string(tmpctx, struct amount_sat,
-					   &out[LOCAL]),
-			    type_to_string(tmpctx, struct amount_sat,
-					   &out[REMOTE]));
+		peer_failed_warn(pps, channel_id,
+				 "Funder cannot afford fee %s (%s and %s)",
+				 type_to_string(tmpctx, struct amount_sat, &fee),
+				 type_to_string(tmpctx, struct amount_sat,
+						&out[LOCAL]),
+				 type_to_string(tmpctx, struct amount_sat,
+						&out[REMOTE]));
 
 	status_debug("Making close tx at = %s/%s fee %s",
 		     type_to_string(tmpctx, struct amount_sat, &out[LOCAL]),
@@ -76,18 +76,18 @@ static struct bitcoin_tx *close_tx(const tal_t *ctx,
 			     out_minus_fee[REMOTE],
 			     dust_limit);
 	if (!tx)
-		peer_failed(pps, channel_id,
-			    "Both outputs below dust limit:"
-			    " funding = %s"
-			    " fee = %s"
-			    " dust_limit = %s"
-			    " LOCAL = %s"
-			    " REMOTE = %s",
-			    type_to_string(tmpctx, struct amount_sat, &funding),
-			    type_to_string(tmpctx, struct amount_sat, &fee),
-			    type_to_string(tmpctx, struct amount_sat, &dust_limit),
-			    type_to_string(tmpctx, struct amount_sat, &out[LOCAL]),
-			    type_to_string(tmpctx, struct amount_sat, &out[REMOTE]));
+		peer_failed_err(pps, channel_id,
+				"Both outputs below dust limit:"
+				" funding = %s"
+				" fee = %s"
+				" dust_limit = %s"
+				" LOCAL = %s"
+				" REMOTE = %s",
+				type_to_string(tmpctx, struct amount_sat, &funding),
+				type_to_string(tmpctx, struct amount_sat, &fee),
+				type_to_string(tmpctx, struct amount_sat, &dust_limit),
+				type_to_string(tmpctx, struct amount_sat, &out[LOCAL]),
+				type_to_string(tmpctx, struct amount_sat, &out[REMOTE]));
 	return tx;
 }
 
@@ -201,10 +201,10 @@ static void do_reconnect(struct per_peer_state *pps,
 					  &next_remote_revocation_number,
 					  &their_secret,
 					  &next_commitment_point)) {
-		peer_failed(pps, channel_id,
-			    "bad reestablish msg: %s %s",
-			    peer_wire_name(fromwire_peektype(channel_reestablish)),
-			    tal_hex(tmpctx, channel_reestablish));
+		peer_failed_warn(pps, channel_id,
+				 "bad reestablish msg: %s %s",
+				 peer_wire_name(fromwire_peektype(channel_reestablish)),
+				 tal_hex(tmpctx, channel_reestablish));
 	}
 	status_debug("Got reestablish commit=%"PRIu64" revoke=%"PRIu64,
 		     next_local_commitment_number,
@@ -360,9 +360,9 @@ receive_offer(struct per_peer_state *pps,
 	their_sig.sighash_type = SIGHASH_ALL;
 	if (!fromwire_closing_signed(msg, &their_channel_id,
 				     &received_fee, &their_sig.s))
-		peer_failed(pps, channel_id,
-			    "Expected closing_signed: %s",
-			    tal_hex(tmpctx, msg));
+		peer_failed_warn(pps, channel_id,
+				 "Expected closing_signed: %s",
+				 tal_hex(tmpctx, msg));
 
 	/* BOLT #2:
 	 *
@@ -412,17 +412,17 @@ receive_offer(struct per_peer_state *pps,
 		if (!trimmed
 		    || !check_tx_sig(trimmed, 0, NULL, funding_wscript,
 				     &funding_pubkey[REMOTE], &their_sig)) {
-			peer_failed(pps, channel_id,
-				    "Bad closing_signed signature for"
-				    " %s (and trimmed version %s)",
-				    type_to_string(tmpctx,
-						   struct bitcoin_tx,
-						   tx),
-				    trimmed ?
-				    type_to_string(tmpctx,
-						   struct bitcoin_tx,
-						   trimmed)
-				    : "NONE");
+			peer_failed_warn(pps, channel_id,
+					 "Bad closing_signed signature for"
+					 " %s (and trimmed version %s)",
+					 type_to_string(tmpctx,
+							struct bitcoin_tx,
+							tx),
+					 trimmed ?
+					 type_to_string(tmpctx,
+							struct bitcoin_tx,
+							trimmed)
+					 : "NONE");
 		}
 		tx = trimmed;
 	}
@@ -507,10 +507,10 @@ adjust_offer(struct per_peer_state *pps, const struct channel_id *channel_id,
 
 	/* Within 1 satoshi?  Agree. */
 	if (!amount_sat_add(&min_plus_one, feerange->min, AMOUNT_SAT(1)))
-		peer_failed(pps, channel_id,
-			    "Fee offer %s min too large",
-			    type_to_string(tmpctx, struct amount_sat,
-					   &feerange->min));
+		peer_failed_warn(pps, channel_id,
+				 "Fee offer %s min too large",
+				 type_to_string(tmpctx, struct amount_sat,
+						&feerange->min));
 
 	if (amount_sat_greater_eq(min_plus_one, feerange->max))
 		return remote_offer;
@@ -524,15 +524,15 @@ adjust_offer(struct per_peer_state *pps, const struct channel_id *channel_id,
 
 	/* Max is below our minimum acceptable? */
 	if (!amount_sat_sub(&range_len, feerange->max, min_fee_to_accept))
-		peer_failed(pps, channel_id,
-			    "Feerange %s-%s"
-			    " below minimum acceptable %s",
-			    type_to_string(tmpctx, struct amount_sat,
-					   &feerange->min),
-			    type_to_string(tmpctx, struct amount_sat,
-					   &feerange->max),
-			    type_to_string(tmpctx, struct amount_sat,
-					   &min_fee_to_accept));
+		peer_failed_warn(pps, channel_id,
+				 "Feerange %s-%s"
+				 " below minimum acceptable %s",
+				 type_to_string(tmpctx, struct amount_sat,
+						&feerange->min),
+				 type_to_string(tmpctx, struct amount_sat,
+						&feerange->max),
+				 type_to_string(tmpctx, struct amount_sat,
+						&min_fee_to_accept));
 
 	if (fee_negotiation_step_unit ==
 	    CLOSING_FEE_NEGOTIATION_STEP_UNIT_SATOSHI) {

common/peer_failed.c

@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <ccan/breakpoint/breakpoint.h>
 #include <ccan/tal/str/str.h>
 #include <common/crypto_sync.h>
@@ -24,45 +25,71 @@ peer_fatal_continue(const u8 *msg TAKES, const struct per_peer_state *pps)
 }
 
 /* We only support one channel per peer anyway */
-void peer_failed(struct per_peer_state *pps,
-		 const struct channel_id *channel_id,
-		 const char *fmt, ...)
+static void NORETURN
+peer_failed(struct per_peer_state *pps,
+	    bool warn,
+	    const struct channel_id *channel_id,
+	    const char *desc)
+{
+	u8 *msg;
+
+	if (warn) {
+		msg = towire_warningfmt(desc, channel_id, "%s", desc);
+	} else {
+		msg = towire_errorfmt(desc, channel_id, "%s", desc);
+	}
+	sync_crypto_write(pps, msg);
+
+	/* Tell master the error so it can re-xmit. */
+	msg = towire_status_peer_error(NULL, channel_id,
+				       desc,
+				       warn,
+				       pps,
+				       msg);
+	peer_billboard(true, desc);
+	peer_fatal_continue(take(msg), pps);
+}
+
+void peer_failed_warn(struct per_peer_state *pps,
+		      const struct channel_id *channel_id,
+		      const char *fmt, ...)
 {
 	va_list ap;
 	const char *desc;
-	u8 *msg, *err;
 
  	va_start(ap, fmt);
-	desc = tal_vfmt(NULL, fmt, ap);
+	desc = tal_vfmt(tmpctx, fmt, ap);
 	va_end(ap);
 
-	/* Tell peer the error. */
-	err = towire_errorfmt(desc, channel_id, "%s", desc);
-	sync_crypto_write(pps, err);
+	peer_failed(pps, true, channel_id, desc);
+}
 
-	/* Tell master the error so it can re-xmit. */
-	msg = towire_status_peer_error(NULL, channel_id,
-				       desc, false, pps,
-				       err);
-	peer_billboard(true, desc);
-	tal_free(desc);
-	peer_fatal_continue(take(msg), pps);
+void peer_failed_err(struct per_peer_state *pps,
+		     const struct channel_id *channel_id,
+		     const char *fmt, ...)
+{
+	va_list ap;
+	const char *desc;
+
+	assert(channel_id);
+ 	va_start(ap, fmt);
+	desc = tal_vfmt(tmpctx, fmt, ap);
+	va_end(ap);
+
+	peer_failed(pps, false, channel_id, desc);
 }
 
-/* We're failing because peer sent us an error message */
+/* We're failing because peer sent us an error/warning message */
 void peer_failed_received_errmsg(struct per_peer_state *pps,
 				 const char *desc,
 				 const struct channel_id *channel_id,
-				 bool soft_error)
+				 bool warning)
 {
-	static const struct channel_id all_channels;
 	u8 *msg;
 
-	if (!channel_id)
-		channel_id = &all_channels;
-	msg = towire_status_peer_error(NULL, channel_id, desc, soft_error, pps,
+	msg = towire_status_peer_error(NULL, channel_id, desc, warning, pps,
 				       NULL);
-	peer_billboard(true, "Received error from peer: %s", desc);
+	peer_billboard(true, "Received %s", desc);
 	peer_fatal_continue(take(msg), pps);
 }
 

common/peer_failed.h

@@ -8,14 +8,25 @@ struct channel_id;
 struct per_peer_state;
 
 /**
- * peer_failed - Exit with error for peer.
+ * peer_failed_warn - Send a warning msg and close the connection.
  * @pps: the per-peer state.
- * @channel_id: channel with error, or NULL for all.
+ * @channel_id: channel with error, or NULL for no particular channel.
  * @fmt...: format as per status_failed(STATUS_FAIL_PEER_BAD)
  */
-void peer_failed(struct per_peer_state *pps,
-		 const struct channel_id *channel_id,
-		 const char *fmt, ...)
+void peer_failed_warn(struct per_peer_state *pps,
+		      const struct channel_id *channel_id,
+		      const char *fmt, ...)
+	PRINTF_FMT(3,4) NORETURN;
+
+/**
+ * peer_failed_err - Send a warning msg and close the channel.
+ * @pps: the per-peer state.
+ * @channel_id: channel with error.
+ * @fmt...: format as per status_failed(STATUS_FAIL_PEER_BAD)
+ */
+void peer_failed_err(struct per_peer_state *pps,
+		     const struct channel_id *channel_id,
+		     const char *fmt, ...)
 	PRINTF_FMT(3,4) NORETURN;
 
 /* We're failing because peer sent us an error message: NULL

common/peer_status_wire.csv

@@ -7,7 +7,7 @@ msgtype,status_peer_error,0xFFF4
 msgdata,status_peer_error,channel,channel_id,
 msgdata,status_peer_error,desc,wirestring,
 # Take a deep breath, then try reconnecting to the precious little snowflake.
-msgdata,status_peer_error,soft_error,bool,
+msgdata,status_peer_error,warning,bool,
 msgdata,status_peer_error,pps,per_peer_state,
 msgdata,status_peer_error,len,u16,
 msgdata,status_peer_error,error_for_them,u8,len