From df16d73e458739ba66c1c6a1fb07f57b3ddcd5c4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Feb 2020 14:21:09 +0000 Subject: [PATCH] logging: site: Introduce transport_peers_init which doesn't log This eliminates some spurious startup messages. It also allows transport_peers_clear to read *peers, since it doesn't have to do initialisation. Signed-off-by: Ian Jackson --- site.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/site.c b/site.c index 72cee24..ee4c310 100644 --- a/site.c +++ b/site.c @@ -257,6 +257,7 @@ typedef struct { } transport_peers; /* Basic operations on transport peer address sets */ +static void transport_peers_init(struct site *st, transport_peers *peers); static void transport_peers_clear(struct site *st, transport_peers *peers); static int transport_peers_valid(transport_peers *peers); static void transport_peers_copy(struct site *st, transport_peers *dst, @@ -2512,8 +2513,8 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, st->chosen_transform=0; st->current.key_timeout=0; st->auxiliary_key.key_timeout=0; - transport_peers_clear(st,&st->peers); - transport_peers_clear(st,&st->setup_peers); + transport_peers_init(st,&st->peers); + transport_peers_init(st,&st->setup_peers); /* XXX mlock these */ st->dhsecret=safe_malloc(st->dh->len,"site:dhsecret"); st->sharedsecretlen=st->sharedsecretallocd=0; @@ -2729,6 +2730,9 @@ static void transport_data_msgok(struct site *st, const struct comm_addr *a) { static int transport_peers_valid(transport_peers *peers) { return peers->npeers; } +static void transport_peers_init(struct site *st, transport_peers *peers) { + peers->npeers= 0; +} static void transport_peers_clear(struct site *st, transport_peers *peers) { peers->npeers= 0; transport_peers_debug(st,peers,"clear",0,0,0); -- 2.30.2