}
char *meshlink_get_external_address_for_family(meshlink_handle_t *mesh, int family) {
- char *hostname = NULL;
+ const char *url = mesh->external_address_url;
+
+ if(!url) {
+ url = "http://meshlink.io/host.cgi";
+ }
+
+ /* Find the hostname part between the slashes */
+ if(strncmp(url, "http://", 7)) {
+ abort();
+ meshlink_errno = MESHLINK_EINTERNAL;
+ return NULL;
+ }
+
+ const char *begin = url + 7;
+
+ const char *end = strchr(begin, '/');
+
+ if(!end) {
+ end = begin + strlen(begin);
+ }
+
+ /* Make a copy */
+ char host[end - begin + 1];
+ strncpy(host, begin, end - begin);
+ host[end - begin] = 0;
+
+ char *port = strchr(host, ':');
+
+ if(port) {
+ *port++ = 0;
+ }
logger(mesh, MESHLINK_DEBUG, "Trying to discover externally visible hostname...\n");
- struct addrinfo *ai = str2addrinfo("meshlink.io", "80", SOCK_STREAM);
- static const char request[] = "GET http://www.meshlink.io/host.cgi HTTP/1.0\r\n\r\n";
+ struct addrinfo *ai = str2addrinfo(host, port ? port : "80", SOCK_STREAM);
char line[256];
+ char *hostname = NULL;
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
if(family != AF_UNSPEC && aip->ai_family != family) {
}
if(s >= 0) {
- send(s, request, sizeof(request) - 1, 0);
+ send(s, "GET ", 4, 0);
+ send(s, url, strlen(url), 0);
+ send(s, " HTTP/1.0\r\n\r\n", 13, 0);
int len = recv(s, line, sizeof(line) - 1, MSG_WAITALL);
if(len > 0) {
// This gets the hostname part for use in invitation URLs
static char *get_my_hostname(meshlink_handle_t *mesh, uint32_t flags) {
- char *hostname[4] = {NULL};
- char *port[4] = {NULL};
+ int count = 4 + (mesh->invitation_addresses ? mesh->invitation_addresses->count : 0);
+ int n = 0;
+ char *hostname[count];
+ char *port[count];
char *hostport = NULL;
+ memset(hostname, 0, sizeof(hostname));
+ memset(port, 0, sizeof(port));
+
if(!(flags & (MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC))) {
flags |= MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC;
}
flags |= MESHLINK_INVITE_IPV4 | MESHLINK_INVITE_IPV6;
}
+ // Add all explicitly set invitation addresses
+ if(mesh->invitation_addresses) {
+ for list_each(char, combo, mesh->invitation_addresses) {
+ hostname[n] = xstrdup(combo);
+ char *colon = strchr(hostname[n], ':');
+
+ if(colon) {
+ *colon = 0;
+ port[n] = colon + 1;
+ }
+
+ n++;
+ }
+ }
+
// Add local addresses if requested
if(flags & MESHLINK_INVITE_LOCAL) {
if(flags & MESHLINK_INVITE_IPV4) {
- hostname[0] = meshlink_get_local_address_for_family(mesh, AF_INET);
+ hostname[n++] = meshlink_get_local_address_for_family(mesh, AF_INET);
}
if(flags & MESHLINK_INVITE_IPV6) {
- hostname[1] = meshlink_get_local_address_for_family(mesh, AF_INET6);
+ hostname[n++] = meshlink_get_local_address_for_family(mesh, AF_INET6);
}
}
// Add public/canonical addresses if requested
if(flags & MESHLINK_INVITE_PUBLIC) {
// Try the CanonicalAddress first
- get_canonical_address(mesh->self, &hostname[2], &port[2]);
+ get_canonical_address(mesh->self, &hostname[n], &port[n]);
- if(!hostname[2]) {
+ if(!hostname[n] && count == 4) {
if(flags & MESHLINK_INVITE_IPV4) {
- hostname[2] = meshlink_get_external_address_for_family(mesh, AF_INET);
+ hostname[n++] = meshlink_get_external_address_for_family(mesh, AF_INET);
}
if(flags & MESHLINK_INVITE_IPV6) {
- hostname[3] = meshlink_get_external_address_for_family(mesh, AF_INET6);
+ hostname[n++] = meshlink_get_external_address_for_family(mesh, AF_INET6);
}
+ } else {
+ n++;
}
}
bool success = false;
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
- if(!(aip->ai_family == AF_INET || aip->ai_family == AF_INET6)) {
+ /* Try to bind to TCP. */
+
+ int tcp_fd = socket(aip->ai_family, SOCK_STREAM, IPPROTO_TCP);
+
+ if(tcp_fd == -1) {
continue;
}
- int fd = socket(aip->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ int result = bind(tcp_fd, aip->ai_addr, aip->ai_addrlen);
+ closesocket(tcp_fd);
- if(fd == -1) {
+ if(result) {
+ if(errno == EADDRINUSE) {
+ /* If this port is in use for any address family, avoid it. */
+ success = false;
+ break;
+ } else {
+ continue;
+ }
+ }
+
+ /* If TCP worked, then we require that UDP works as well. */
+
+ int udp_fd = socket(aip->ai_family, SOCK_DGRAM, IPPROTO_UDP);
+
+ if(udp_fd == -1) {
success = false;
break;
}
- int result = bind(fd, aip->ai_addr, aip->ai_addrlen);
- closesocket(fd);
+ result = bind(udp_fd, aip->ai_addr, aip->ai_addrlen);
+ closesocket(udp_fd);
if(result) {
success = false;
break;
- } else {
- success = true;
}
+
+ success = true;
}
freeaddrinfo(ai);
free(mesh->appname);
free(mesh->confbase);
free(mesh->config_key);
+ free(mesh->external_address_url);
ecdsa_free(mesh->private_key);
+ if(mesh->invitation_addresses) {
+ list_delete_list(mesh->invitation_addresses);
+ }
+
main_config_unlock(mesh);
pthread_mutex_unlock(&mesh->mutex);
return config_sync(mesh, "current");
}
+bool meshlink_add_invitation_address(struct meshlink_handle *mesh, const char *address, const char *port) {
+ if(!mesh || !address) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!is_valid_hostname(address)) {
+ logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address);
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(port && !is_valid_port(port)) {
+ logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s\n", address);
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ char *combo;
+
+ if(port) {
+ if(strchr(address, ':')) {
+ xasprintf(&combo, "[%s]:%s", address, port);
+ } else {
+ xasprintf(&combo, "%s:%s", address, port);
+ }
+ } else {
+ combo = xstrdup(address);
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ if(!mesh->invitation_addresses) {
+ mesh->invitation_addresses = list_alloc((list_action_t)free);
+ }
+
+ list_insert_tail(mesh->invitation_addresses, combo);
+ pthread_mutex_unlock(&mesh->mutex);
+
+ return true;
+}
+
+void meshlink_clear_invitation_addresses(struct meshlink_handle *mesh) {
+ if(!mesh) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ if(mesh->invitation_addresses) {
+ list_delete_list(mesh->invitation_addresses);
+ mesh->invitation_addresses = NULL;
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
return meshlink_set_canonical_address(mesh, (meshlink_node_t *)mesh->self, address, NULL);
}
return false;
}
- bool rval = meshlink_add_address(mesh, address);
+ bool rval = meshlink_set_canonical_address(mesh, (meshlink_node_t *)mesh->self, address, NULL);
free(address);
return rval;
state.sock = -1;
continue;
}
+
+ break;
}
freeaddrinfo(ai);
pthread_mutex_unlock(&mesh->mutex);
}
+void meshlink_set_external_address_discovery_url(struct meshlink_handle *mesh, const char *url) {
+ if(!mesh) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ if(url && (strncmp(url, "http://", 7) || strchr(url, ' '))) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ free(mesh->external_address_url);
+ mesh->external_address_url = url ? xstrdup(url) : NULL;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
void handle_network_change(meshlink_handle_t *mesh, bool online) {
(void)online;