gossipd: be more verbose and less assert()ive on bad node_announcement.

We hit the timestamp assert on ElementsProject#2750; it shouldn't happen, but crashing doesn't leave much information. Reported-by: @m-schmook Signed-off-by: Rusty Russell <[email protected]>
dcorral · Jun 21, 2019 · fc27250 · fc27250
1 parent 9bf0467
commit fc27250
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
@@ -485,8 +485,18 @@ static bool get_node_announcement(const tal_t *ctx,
 			      n->bcast.index, tal_hex(tmpctx, msg));
 		return false;
 	}
-	assert(node_id_eq(&id, &n->id));
-	assert(timestamp == n->bcast.timestamp);
+
+	if (!node_id_eq(&id, &n->id) || timestamp != n->bcast.timestamp) {
+		status_broken("Wrong node_announcement @%u:"
+			      " expected %s timestamp %u "
+			      " got %s timestamp %u",
+			      n->bcast.index,
+			      type_to_string(tmpctx, struct node_id, &n->id),
+			      timestamp,
+			      type_to_string(tmpctx, struct node_id, &id),
+			      n->bcast.timestamp);
+		return false;
+	}
 
 	*wireaddrs = read_addresses(ctx, addresses);
 	tal_free(addresses);