Add support for AIO using filedescriptors.

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index d26b0f651f3dde6c374a7dcd49784d998bb6efde..c7d6882984e8239f7f30345fa54bb04aae2a7ebd 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -205,7 +205,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 
        config_t config;
 
-       if(!invitation_read(mesh, cookie, &config)) {
+       if(!invitation_read(mesh, "current", cookie, &config, mesh->config_key)) {
                logger(mesh, MESHLINK_ERROR, "Error while trying to read invitation file\n");
                return false;
        }
@@ -238,6 +238,9 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
        // Send the node the contents of the invitation file
        sptps_send_record(&c->sptps, 0, config.buf, config.len);
 
+       config_free(&config);
+       free(submesh_name);
+
        c->status.invitation_used = true;
 
        logger(mesh, MESHLINK_INFO, "Invitation %s successfully sent to %s", cookie, c->name);
@@ -368,14 +371,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 }
 
 bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
-
-       /* Check some options */
-
-       if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
-               c->options |= OPTION_PMTU_DISCOVERY;
-       }
-
-       return send_request(mesh, c, NULL, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, (c->options & 0xffffff) | (PROT_MINOR << 24));
+       return send_request(mesh, c, NULL, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, OPTION_PMTU_DISCOVERY | (PROT_MINOR << 24));
 }
 
 static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
@@ -436,18 +432,11 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        n->devclass = devclass;
        n->status.dirty = true;
 
-       n->last_successfull_connection = time(NULL);
+       n->last_successfull_connection = mesh->loop.now.tv_sec;
 
        n->connection = c;
        c->node = n;
 
-       if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
-               c->options &= ~OPTION_PMTU_DISCOVERY;
-               options &= ~OPTION_PMTU_DISCOVERY;
-       }
-
-       c->options |= options;
-
        /* Activate this connection */
 
        c->allow_request = ALL;
@@ -469,7 +458,6 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
        c->edge->weight = dev_class_traits[devclass].edge_weight;
        c->edge->connection = c;
-       c->edge->options = c->options;
 
        edge_add(mesh, c->edge);