}
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) {
return false;
}
- if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+ if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid");
return false;
}
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;
/* Create an edge_t for this connection */
- assert(devclass >= 0 && devclass <= _DEV_CLASS_MAX);
+ assert(devclass >= 0 && devclass < DEV_CLASS_COUNT);
c->edge = new_edge();
c->edge->from = mesh->self;
c->edge->to = n;
sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
- c->edge->weight = dev_class_traits[devclass].edge_weight;
+ c->edge->weight = mesh->dev_class_traits[devclass].edge_weight;
c->edge->connection = c;
- c->edge->options = c->options;
edge_add(mesh, c->edge);