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, "%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 %u", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname, PROTOCOL_TINY);
}
bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
assert(*request);
char name[MAX_STRING_SIZE];
+ uint32_t flags;
- if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
+ if(sscanf(request, "%*d " MAX_STRING " %d.%d %*s %u", name, &c->protocol_major, &c->protocol_minor, &flags) < 4) {
logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ID", c->name);
return false;
}
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) {
- logger(mesh, MESHLINK_INFO, "Requesting key from peer %s", c->name);
- send_req_key(mesh, n);
- }
-
return false;
}
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;
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 */
-
- /* Request a session key to jump start UDP traffic */
-
- if(c->status.initiator) {
- send_req_key(mesh, n);
- }
+ send_add_edge(mesh, c, 0);
+ n->status.reachable = true;
+ update_node_status(mesh, c->node);
return true;
}