char *get_my_hostname() {
char *hostname = NULL;
+ char *port = NULL;
+ char *hostport = NULL;
char *name = get_my_name(false);
char *filename = NULL;
if(*q == '=')
q += 1 + strspn(q + 1, "\t ");
*p = 0;
- if(strcasecmp(line, "Address"))
- continue;
p = q + strcspn(q, "\t ");
if(*p)
*p++ = 0;
p += strspn(p, "\t ");
p[strcspn(p, "\t ")] = 0;
+ if(!port && !strcasecmp(line, "Port")) {
+ port = xstrdup(q);
+ continue;
+ }
+ if(strcasecmp(line, "Address"))
+ continue;
+ hostname = xstrdup(q);
if(*p) {
- if(strchr(q, ':'))
- xasprintf(&hostname, "[%s]:%s", q, p);
- else
- xasprintf(&hostname, "%s:%s", q, p);
- } else {
- hostname = xstrdup(q);
+ free(port);
+ port = xstrdup(p);
}
break;
}
}
}
- if(hostname) {
- free(filename);
- return hostname;
- }
+ if(hostname)
+ goto done;
// If that doesn't work, guess externally visible hostname
fprintf(stderr, "Trying to discover externally visible hostname...\n");
if(!rstrip(line)) {
if(hostname)
- goto done;
+ goto save;
else
goto again;
}
free(hostname);
hostname = xstrdup(line);
-done:
+save:
if(filename) {
FILE *f = fopen(filename, "a");
if(f) {
} else {
fprintf(stderr, "Could not append Address to %s: %s\n", filename, strerror(errno));
}
- free(filename);
}
- return hostname;
+done:
+ if(port) {
+ if(strchr(hostname, ':'))
+ xasprintf(&hostport, "[%s]:%s", hostname, port);
+ else
+ xasprintf(&hostport, "%s:%s", hostname, port);
+ } else {
+ hostport = hostname;
+ hostname = NULL;
+ }
+
+ free(hostname);
+ free(port);
+ free(filename);
+ return hostport;
}
static bool fcopy(FILE *out, const char *filename) {
ecdsa_free(key);
rsa_free(rsa);
+ check_port(name);
+
fprintf(stderr, "Invitation succesfully accepted.\n");
shutdown(sock, SHUT_RDWR);
success = true;
return 1;
}
- // Make sure confdir exists.
- if(mkdir(confdir, 0755) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
+ // Make sure confbase exists and is accessible.
+ if(mkdir(confbase, 0755) && errno != EEXIST) {
+ fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
+ return 1;
+ }
+
+ if(access(confbase, R_OK | W_OK | X_OK)) {
+ fprintf(stderr, "No permission to write in directory %s: %s\n", confbase, strerror(errno));
+ return 1;
+ }
+
+ // If a netname or explicit configuration directory is specified, check for an existing tinc.conf.
+ if((netname || confbasegiven) && !access(tinc_conf, F_OK)) {
+ fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
return 1;
}