if(*name == '$') {
char *envname = getenv(name + 1);
+ char hostname[32] = "";
if(!envname) {
if(strcmp(name + 1, "HOST")) {
fprintf(stderr, "Invalid Name: environment variable %s does not exist\n", name + 1);
return false;
}
- char envname[32];
- if(gethostname(envname, 32)) {
+ if(gethostname(hostname, sizeof hostname) || !*hostname) {
fprintf(stderr, "Could not get hostname: %s\n", strerror(errno));
return false;
}
- envname[31] = 0;
+ hostname[31] = 0;
+ envname = hostname;
}
free(name);
name = xstrdup(envname);
bool choice;
int i, err;
int replaywin_int;
+ bool port_specified = false;
myself = new_node();
myself->connection = new_connection();
return false;
}
+ /* Read tinc.conf and our own host config file */
+
myself->name = name;
myself->connection->name = xstrdup(name);
xasprintf(&fname, "%s/hosts/%s", confbase, name);
if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
myport = xstrdup("655");
+ else
+ port_specified = true;
+
+ /* Ensure myport is numeric */
if(!atoi(myport)) {
struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
} while(cfg);
}
- if(listen_sockets)
- logger(LOG_NOTICE, "Ready");
- else {
+ if(!listen_sockets) {
logger(LOG_ERR, "Unable to create any listening socket!");
return false;
}
+ /* If no Port option was specified, set myport to the port used by the first listening socket. */
+
+ if(!port_specified) {
+ sockaddr_t sa;
+ socklen_t salen = sizeof sa;
+ if(!getsockname(listen_socket[0].udp, &sa.sa, &salen)) {
+ free(myport);
+ sockaddr2str(&sa, NULL, &myport);
+ if(!myport)
+ myport = xstrdup("655");
+ }
+ }
+
+ /* Done. */
+
+ logger(LOG_NOTICE, "Ready");
return true;
}