Ensure we exchange a session key for application data exchange.

[meshlink-tiny] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index e292d58c61b44c74cf985ac2eaa2eadb831d7efe..573da14817126e6876bed2d15397f747adc2d815 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -42,7 +42,7 @@
 extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
 
 bool send_id(meshlink_handle_t *mesh, connection_t *c) {
-       return send_request(mesh, c, NULL, "%d %s %d.%d %s", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname);
+       return send_request(mesh, c, "%d %s %d.%d %s", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname);
 }
 
 bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
@@ -143,7 +143,7 @@ bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
        }
 
        c->last_ping_time = mesh->loop.now.tv_sec;
-       return send_request(mesh, c, NULL, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, OPTION_PMTU_DISCOVERY | (PROT_MINOR << 24));
+       return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, OPTION_PMTU_DISCOVERY | (PROT_MINOR << 24));
 }
 
 bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
@@ -173,23 +173,6 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                n = new_node();
                n->name = xstrdup(c->name);
                node_add(mesh, n);
-       } else {
-               if(n->connection) {
-                       /* Oh dear, we already have a connection to this node. */
-                       logger(mesh, MESHLINK_INFO, "Established a second connection with %s, closing old connection", n->connection->name);
-
-                       if(n->connection->outgoing) {
-                               if(c->outgoing) {
-                                       logger(mesh, MESHLINK_WARNING, "Two outgoing connections to the same node!");
-                               } else {
-                                       c->outgoing = n->connection->outgoing;
-                               }
-
-                               n->connection->outgoing = NULL;
-                       }
-
-                       terminate_connection(mesh, n->connection, false);
-               }
        }
 
        n->devclass = devclass;
@@ -213,26 +196,9 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                mesh->meta_status_cb(mesh, (meshlink_node_t *)n, true);
        }
 
-       /*  Terminate any connections to this node that are not activated yet */
-
-       for list_each(connection_t, other, mesh->connections) {
-               if(!other->status.active && !strcmp(other->name, c->name)) {
-                       if(other->outgoing) {
-                               if(c->outgoing) {
-                                       logger(mesh, MESHLINK_WARNING, "Two outgoing connections to the same node!");
-                               } else {
-                                       c->outgoing = other->outgoing;
-                               }
-
-                               other->outgoing = NULL;
-                       }
-
-                       logger(mesh, MESHLINK_DEBUG, "Terminating pending second connection with %s", n->name);
-                       terminate_connection(mesh, other, false);
-               }
-       }
-
-       /* TODO: Create an edge_t for this connection, send it */
+       send_add_edge(mesh, c, 0);
+       n->status.reachable = true;
+       update_node_status(mesh, c->node);
 
        /* Request a session key to jump start UDP traffic */