/*
net_setup.c -- Setup.
- Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+ Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
FILE *fp;
char filename[PATH_MAX];
- snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
+ snprintf(filename, PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
fp = fopen(filename, "rb");
if(!fp) {
mesh->invitation_key = NULL;
}
- snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+ snprintf(filename, PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
fp = fopen(filename, "rb");
free(p);
}
- if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
n->devclass = _DEV_CLASS_MAX;
exit:
bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
- if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+ if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
return false;
bool result = false;
// ignore read errors; in case the file does not exist we will create it
read_host_config(mesh, config_tree, n->name);
- config_t* cnf = lookup_config(config_tree, "DeviceClass");
+ config_t *cnf = lookup_config(config_tree, "DeviceClass");
if(!cnf) {
cnf = new_config();
struct dirent *ent;
char dname[PATH_MAX];
- snprintf(dname,PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
+ snprintf(dname, PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
dir = opendir(dname);
if(!dir) {
logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
*address = 0;
}
- struct addrinfo *ai, hint = {0};
+ struct addrinfo *ai, hint = {};
hint.ai_family = addressfamily;
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = IPPROTO_TCP;
return false;
}
+ bool success = false;
+
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
// Ignore duplicate addresses
bool found = false;
mesh->listen_socket[mesh->listen_sockets].bindto = bindto;
memcpy(&mesh->listen_socket[mesh->listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
mesh->listen_sockets++;
+ success = true;
}
freeaddrinfo(ai);
- return true;
+ return success;
}
/*
mesh->listen_sockets = 0;
if(!add_listen_address(mesh, address, NULL)) {
- if(!strcmp(mesh->myport, "0")) {
- logger(mesh, MESHLINK_WARNING, "Could not bind to port %s, asking OS to choose one for us", mesh->myport);
+ if(strcmp(mesh->myport, "0")) {
+ logger(mesh, MESHLINK_INFO, "Could not bind to port %s, asking OS to choose one for us", mesh->myport);
free(mesh->myport);
mesh->myport = strdup("0");
if(!mesh->myport)
return false;
}
- xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
- mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
-
/* Done. */
mesh->last_config_check = mesh->loop.now.tv_sec;