From 3ef767fd52106765edfe22571ed75931fa3e0cf8 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 11 Apr 2019 14:45:21 +0930
Subject: [PATCH] gossipd: don't use cached node_announcement for redundancy
 checking

Re-parse the existing message, since we'e going to get rid of those
fields.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 gossipd/gossipd.c | 35 +++++++++++++++++++++++++++--------
 gossipd/routing.c |  2 +-
 gossipd/routing.h |  2 ++
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
index 46b294df0..5fd6950bb 100644
--- a/gossipd/gossipd.c
+++ b/gossipd/gossipd.c
@@ -427,32 +427,51 @@ static void send_node_announcement(struct daemon *daemon)
 /* Return true if the only change would be the timestamp. */
 static bool node_announcement_redundant(struct daemon *daemon)
 {
+	secp256k1_ecdsa_signature signature;
+	u32 timestamp;
+	struct node_id node_id;
+	u8 rgb_color[3];
+	u8 alias[32];
+	u8 *features, *addresses;
+	struct wireaddr *wireaddrs;
 	struct node *n = get_node(daemon->rstate, &daemon->id);
+
 	if (!n)
 		return false;
 
 	if (!n->node_announcement)
 		return false;
 
-	if (tal_count(n->addresses) != tal_count(daemon->announcable))
+	/* Note: validity of node_id is already checked. */
+	if (!fromwire_node_announcement(tmpctx, n->node_announcement,
+					&signature, &features, &timestamp,
+					&node_id, rgb_color, alias,
+					&addresses)) {
+		status_broken("Bad local node_announcement: %s",
+			      tal_hex(tmpctx, n->node_announcement));
+		return false;
+	}
+
+	wireaddrs = read_addresses(tmpctx, addresses);
+	if (tal_count(wireaddrs) != tal_count(daemon->announcable))
 		return false;
 
-	for (size_t i = 0; i < tal_count(n->addresses); i++)
-		if (!wireaddr_eq(&n->addresses[i], &daemon->announcable[i]))
+	for (size_t i = 0; i < tal_count(wireaddrs); i++)
+		if (!wireaddr_eq(&wireaddrs[i], &daemon->announcable[i]))
 			return false;
 
-	BUILD_ASSERT(ARRAY_SIZE(daemon->alias) == ARRAY_SIZE(n->alias));
+	BUILD_ASSERT(ARRAY_SIZE(daemon->alias) == ARRAY_SIZE(alias));
 	if (!memeq(daemon->alias, ARRAY_SIZE(daemon->alias),
-		   n->alias, ARRAY_SIZE(n->alias)))
+		   alias, ARRAY_SIZE(alias)))
 		return false;
 
-	BUILD_ASSERT(ARRAY_SIZE(daemon->rgb) == ARRAY_SIZE(n->rgb_color));
+	BUILD_ASSERT(ARRAY_SIZE(daemon->rgb) == ARRAY_SIZE(rgb_color));
 	if (!memeq(daemon->rgb, ARRAY_SIZE(daemon->rgb),
-		   n->rgb_color, ARRAY_SIZE(n->rgb_color)))
+		   rgb_color, ARRAY_SIZE(rgb_color)))
 		return false;
 
 	if (!memeq(daemon->globalfeatures, tal_count(daemon->globalfeatures),
-		   n->globalfeatures, tal_count(n->globalfeatures)))
+		   features, tal_count(features)))
 		return false;
 
 	return true;
diff --git a/gossipd/routing.c b/gossipd/routing.c
index b8dca9389..c412f149c 100644
--- a/gossipd/routing.c
+++ b/gossipd/routing.c
@@ -1584,7 +1584,7 @@ u8 *handle_channel_update(struct routing_state *rstate, const u8 *update TAKES,
 	return NULL;
 }
 
-static struct wireaddr *read_addresses(const tal_t *ctx, const u8 *ser)
+struct wireaddr *read_addresses(const tal_t *ctx, const u8 *ser)
 {
 	const u8 *cursor = ser;
 	size_t len = tal_count(ser);
diff --git a/gossipd/routing.h b/gossipd/routing.h
index 076ef214e..784c4dc69 100644
--- a/gossipd/routing.h
+++ b/gossipd/routing.h
@@ -385,4 +385,6 @@ void memleak_remove_routing_tables(struct htable *memtable,
  */
 struct timeabs gossip_time_now(const struct routing_state *rstate);
 
+/* Helper to convert on-wire addresses format to wireaddrs array */
+struct wireaddr *read_addresses(const tal_t *ctx, const u8 *ser);
 #endif /* LIGHTNING_GOSSIPD_ROUTING_H */