Stop using global variable mesh in net_setup.[ch].

[meshlink] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 887ccd0d9f394ed6a09e8f14a46dbbb9812e1d77..6f4364f2a33189b4a9fc5625495a550932b982ed 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -80,7 +80,7 @@ static bool send_initial_sptps_data(void *handle, uint8_t type, const char *data
 }
 
 bool send_req_key(node_t *to) {
-       if(!node_read_ecdsa_public_key(to)) {
+       if(!node_read_ecdsa_public_key(mesh, to)) {
                logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", to->name, to->hostname);
                send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
                return true;
@@ -111,7 +111,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
                }
 
                case ANS_PUBKEY: {
-                       if(node_read_ecdsa_public_key(from)) {
+                       if(node_read_ecdsa_public_key(mesh, from)) {
                                logger(DEBUG_PROTOCOL, LOG_WARNING, "Got ANS_PUBKEY from %s (%s) even though we already have his pubkey", from->name, from->hostname);
                                return true;
                        }
@@ -123,12 +123,12 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
                        }
 
                        logger(DEBUG_PROTOCOL, LOG_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
-                       append_config_file(from->name, "ECDSAPublicKey", pubkey);
+                       append_config_file(mesh, from->name, "ECDSAPublicKey", pubkey);
                        return true;
                }
 
                case REQ_KEY: {
-                       if(!node_read_ecdsa_public_key(from)) {
+                       if(!node_read_ecdsa_public_key(mesh, from)) {
                                logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", from->name, from->hostname);
                                send_request(from->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
                                return true;