const char *name;
uint32_t len = packmsg_get_str_raw(in, &name);
- if(len != strlen(n->name) || strncmp(name, n->name, len)) {
+ if(len != strlen(n->name) || !name || strncmp(name, n->name, len)) {
config_free(config);
return false;
}
}
}
- int32_t devclass = packmsg_get_int32(&in);
+ dev_class_t devclass = packmsg_get_int32(&in);
bool blacklisted = packmsg_get_bool(&in);
config_free(&config);
- if(!packmsg_input_ok(&in) || devclass < 0 || devclass > _DEV_CLASS_MAX) {
+ if(!packmsg_input_ok(&in) || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
return false;
}
}
config_t config = {buf, packmsg_output_size(&out, buf)};
- return config_write(mesh, "current", n->name, &config, mesh->config_key);
+
+ if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+ call_error_cb(mesh, MESHLINK_ESTORAGE);
+ return false;
+ }
+
+ return true;
}
static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
struct addrinfo *ai;
struct addrinfo hint = {
- .ai_family = addressfamily,
+ .ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM,
.ai_protocol = IPPROTO_TCP,
.ai_flags = AI_PASSIVE,
mesh->listen_socket[mesh->listen_sockets].bindto = bindto;
memcpy(&mesh->listen_socket[mesh->listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+ memcpy(&mesh->listen_socket[mesh->listen_sockets].broadcast_sa, aip->ai_addr, aip->ai_addrlen);
+
+ if(aip->ai_family == AF_INET6) {
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x0] = 0xff;
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x1] = 0x02;
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0xf] = 0x01;
+ } else {
+ mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in.sin_addr.s_addr = 0xffffffff;
+ }
+
mesh->listen_sockets++;
success = true;
}
bool setup_myself(meshlink_handle_t *mesh) {
/* Set some defaults */
- mesh->localdiscovery = true;
- keylifetime = 3600; // TODO: check if this can be removed as well
mesh->maxtimeout = 900;
- mesh->self->options |= OPTION_PMTU_DISCOVERY;
/* Done */
mesh->self->nexthop = mesh->self;
- mesh->self->via = mesh->self;
mesh->self->status.reachable = true;
mesh->self->last_state_change = mesh->loop.now.tv_sec;
init_edges(mesh);
init_requests(mesh);
- mesh->pinginterval = 60;
- mesh->pingtimeout = 5;
- maxoutbufsize = 10 * MTU;
-
if(!setup_myself(mesh)) {
return false;
}