From 55cf413fc3df2548c5a1841955186ecf30e71cb1 Mon Sep 17 00:00:00 2001 From: Michael Schmoock Date: Sun, 8 May 2022 12:09:32 +0200 Subject: [PATCH] wireaddr: moves wireaddr_arr_contains to wireaddr.h ...So it can be reused somewhere else Changelog-None --- common/wireaddr.c | 9 +++++++++ common/wireaddr.h | 3 +++ gossipd/gossip_generation.c | 9 --------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/common/wireaddr.c b/common/wireaddr.c index 7d5354713..b81d9bf3a 100644 --- a/common/wireaddr.c +++ b/common/wireaddr.c @@ -899,3 +899,12 @@ int wireaddr_cmp_type(const struct wireaddr *a, return tal_bytelen(a_wire) - tal_bytelen(b_wire); return cmp; } + +bool wireaddr_arr_contains(const struct wireaddr *was, + const struct wireaddr *wa) +{ + for (size_t i = 0; i < tal_count(was); i++) + if (wireaddr_eq(&was[i], wa)) + return true; + return false; +} diff --git a/common/wireaddr.h b/common/wireaddr.h index 783c5ba2d..6c1401e74 100644 --- a/common/wireaddr.h +++ b/common/wireaddr.h @@ -197,4 +197,7 @@ struct wireaddr *fromwire_wireaddr_array(const tal_t *ctx, const u8 *ser); int wireaddr_cmp_type(const struct wireaddr *a, const struct wireaddr *b, void *unused); +bool wireaddr_arr_contains(const struct wireaddr *was, + const struct wireaddr *wa); + #endif /* LIGHTNING_COMMON_WIREADDR_H */ diff --git a/gossipd/gossip_generation.c b/gossipd/gossip_generation.c index 04a920777..dfb621beb 100644 --- a/gossipd/gossip_generation.c +++ b/gossipd/gossip_generation.c @@ -20,15 +20,6 @@ #include #include -static bool wireaddr_arr_contains(const struct wireaddr *was, - const struct wireaddr *wa) -{ - for (size_t i = 0; i < tal_count(was); i++) - if (wireaddr_eq(&was[i], wa)) - return true; - return false; -} - /* Create a node_announcement with the given signature. It may be NULL in the * case we need to create a provisional announcement for the HSM to sign. * This is called twice: once with the dummy signature to get it signed and a