logging: site: Introduce transport_peers_init which doesn't log

[secnet.git] / site.c

diff --git a/site.c b/site.c
index 08875133c1cc5fd0ca95677412f88df35c7308ab..ee4c3100e1345055ed9ebccefb88dbdc6e3e541f 100644 (file)
--- 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,
@@ -787,8 +788,7 @@ static bool_t unpick_msg(struct site *st, uint32_t type,
     if (type_is_msg23(type) && m->remote.extrainfo.size) {
        m->n_pubkeys_accepted_nom = buf_unprepend_uint8(&m->remote.extrainfo);
        if (!m->n_pubkeys_accepted_nom) return False;
-       int ki_nom;
-       for (ki_nom=0; ki_nom<m->n_pubkeys_accepted_nom; ki_nom++) {
+       for (int ki_nom=0; ki_nom<m->n_pubkeys_accepted_nom; ki_nom++) {
            CHECK_AVAIL(&m->remote.extrainfo,KEYIDSZ);
            struct sigkeyid *kid = buf_unprepend(&m->remote.extrainfo,KEYIDSZ);
            if (ki_nom<MAX_SIG_KEYS) m->pubkeys_accepted[ki_nom] = kid;
@@ -2513,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;
@@ -2730,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);