Add attribution data to onionreply and update_fail_htlc

Adding the optional TLVs to update_fail_htlc and struct onionreply
so that we can parse and store it.

Key Changes:
 - Add tlvtype 'attribution_data' to 'update_fail_htlc' msgtype.
 - Add 'htlc_hold_time' & 'truncated_hmac' to struct onionreply.

Author: adi2011

common/onionreply.c

@@ -8,6 +8,9 @@ void towire_onionreply(u8 **cursor, const struct onionreply *r)
 {
 	towire_u16(cursor, tal_count(r->contents));
 	towire_u8_array(cursor, r->contents, tal_count(r->contents));
+	if (r->htlc_hold_time && r->truncated_hmac)
+		towire_u8_array(cursor, r->htlc_hold_time, 80);
+		towire_u8_array(cursor, r->truncated_hmac, 840);
 }
 
 struct onionreply *fromwire_onionreply(const tal_t *ctx,
@@ -16,6 +19,14 @@ struct onionreply *fromwire_onionreply(const tal_t *ctx,
 	struct onionreply *r = tal(ctx, struct onionreply);
 	r->contents = fromwire_tal_arrn(r, cursor, max,
 					fromwire_u16(cursor, max));
+	if (*max >= 80 + 840) {
+		r->htlc_hold_time = fromwire_tal_arrn(r, cursor, max, 80);
+		r->truncated_hmac = fromwire_tal_arrn(r, cursor, max, 840);
+	} else {
+		r->htlc_hold_time = NULL;
+		r->truncated_hmac = NULL;
+	}
+
 	if (!*cursor)
 		return tal_free(r);
 	return r;
@@ -31,12 +42,26 @@ struct onionreply *dup_onionreply(const tal_t *ctx,
 
 	n = tal(ctx, struct onionreply);
 	n->contents = tal_dup_talarr(n, u8, r->contents);
+	if (r->htlc_hold_time && r->truncated_hmac) {
+		n->htlc_hold_time = tal_dup_arr(r, u8, r->htlc_hold_time, 80, 0);
+		n->truncated_hmac = tal_dup_arr(r, u8, r->truncated_hmac, 840, 0);
+	} else {
+		n->htlc_hold_time = NULL;
+		n->truncated_hmac = NULL;
+	}
 	return n;
 }
 
-struct onionreply *new_onionreply(const tal_t *ctx, const u8 *contents TAKES)
+struct onionreply *new_onionreply(const tal_t *ctx, const u8 *contents TAKES, const u8 htlc_hold_time[80] TAKES, const u8 truncated_hmac[840] TAKES)
 {
 	struct onionreply *r = tal(ctx, struct onionreply);
 	r->contents = tal_dup_talarr(r, u8, contents);
+	if (htlc_hold_time && truncated_hmac) {
+		r->htlc_hold_time = tal_dup_arr(r, u8, htlc_hold_time, 80, 0);
+		r->truncated_hmac = tal_dup_arr(r, u8, truncated_hmac, 840, 0);
+	} else {
+		r->htlc_hold_time = NULL;
+		r->truncated_hmac = NULL;
+	}
 	return r;
 }

common/onionreply.h

@@ -7,6 +7,8 @@
 /* A separate type for an onion reply, to differentiate from a wire msg. */
 struct onionreply {
 	u8 *contents;
+	u8 *htlc_hold_time;
+	u8 *truncated_hmac;
 };
 
 /**
@@ -20,5 +22,5 @@ struct onionreply *fromwire_onionreply(const tal_t *ctx,
 struct onionreply *dup_onionreply(const tal_t *ctx,
 				  const struct onionreply *r TAKES);
 
-struct onionreply *new_onionreply(const tal_t *ctx, const u8 *contents TAKES);
+struct onionreply *new_onionreply(const tal_t *ctx, const u8 *contents TAKES, const u8 htlc_hold_time[80] TAKES, const u8 truncated_hmac[840] TAKES);
 #endif /* LIGHTNING_COMMON_ONIONREPLY_H */

wire/peer_wire.csv

@@ -287,6 +287,9 @@ msgdata,update_fail_htlc,channel_id,channel_id,
 msgdata,update_fail_htlc,id,u64,
 msgdata,update_fail_htlc,len,u16,
 msgdata,update_fail_htlc,reason,byte,len
+tlvtype,update_fail_htlc_tlvs,attribution_data,1
+tlvdata,update_fail_htlc_tlvs,attribution_data,htlc_hold_times,u8,80
+tlvdata,update_fail_htlc_tlvs,attribution_data,truncated_hmacs,u8,840
 msgtype,update_fail_malformed_htlc,135
 msgdata,update_fail_malformed_htlc,channel_id,channel_id,
 msgdata,update_fail_malformed_htlc,id,u64,