Fix spelling errors.

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 12e81e4c7063c4d32096c22210536dddc6f27075..3676e9cb6f47ac88ab36f3c90e9849db4aeaa4ba 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -164,8 +164,18 @@ static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const
        n->devclass = DEV_CLASS_UNKNOWN;
        n->ecdsa = ecdsa_set_public_key(data);
        n->submesh = c->submesh;
+
+       // Remember its current address
+       node_add_recent_address(mesh, n, &c->address);
+
+       if(!node_write_config(mesh, n) || !config_sync(mesh, "current")) {
+               logger(mesh, MESHLINK_ERROR, "Error writing configuration file for invited node %s!\n", c->name);
+               free_node(n);
+               return false;
+
+       }
+
        node_add(mesh, n);
-       node_write_config(mesh, n);
 
        logger(mesh, MESHLINK_INFO, "Key successfully received from %s", c->name);
 
@@ -336,9 +346,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                return false;
        }
 
-       node_read_public_key(mesh, n);
-
-       if(!ecdsa_active(n->ecdsa)) {
+       if(!node_read_public_key(mesh, n)) {
                logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
 
                if(n->status.reachable && !n->status.waitingforkey) {
@@ -429,9 +437,11 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                                n->connection->outgoing = NULL;
                        }
 
+                       /* Remove the edge before terminating the connection, to prevent a graph update. */
+                       edge_del(mesh, n->connection->edge);
+                       n->connection->edge = NULL;
+
                        terminate_connection(mesh, n->connection, false);
-                       /* Run graph algorithm to keep things in sync */
-                       graph(mesh);
                }
        }