break;
case 'c': /* config file */
+ free(confbase);
confbase = xstrdup(optarg);
confbasegiven = true;
break;
case 'n': /* net name given */
+ free(netname);
netname = xstrdup(optarg);
break;
break;
case 3: /* open control socket here */
+ free(pidfilename);
pidfilename = xstrdup(optarg);
break;
case '?': /* wrong options */
usage(true);
+ free_names();
return false;
default:
if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
fprintf(stderr, "Invalid character in netname!\n");
+ free_names();
return false;
}
#endif
+ char *default_c = "tincd";
+
if(slash++) {
xasprintf(&c, "%.*stincd", (int)(slash - program_name), program_name);
} else {
- c = "tincd";
+ c = default_c;
}
int nargc = 0;
#ifdef HAVE_MINGW
int status = spawnvp(_P_WAIT, c, nargv);
+ free(nargv);
+
+ if(c != default_c) {
+ free(c);
+ }
+
if(status == -1) {
fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
return 1;
if(socketpair(AF_UNIX, SOCK_STREAM, 0, pfd)) {
fprintf(stderr, "Could not create umbilical socket: %s\n", strerror(errno));
free(nargv);
+
+ if(c != default_c) {
+ free(c);
+ }
+
return 1;
}
if(pid == -1) {
fprintf(stderr, "Could not fork: %s\n", strerror(errno));
free(nargv);
+
+ if(c != default_c) {
+ free(c);
+ }
+
return 1;
}
signal(SIGINT, SIG_DFL);
#endif
- if(failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+ bool failed = failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status);
+
+ if(failed) {
fprintf(stderr, "Error starting %s\n", c);
- return 1;
}
- return 0;
+ if(c != default_c) {
+ free(c);
+ }
+
+ return failed ? EXIT_FAILURE : EXIT_SUCCESS;
#endif
}
char *node = NULL;
char *variable;
char *value;
- int len;
+ size_t len;
len = strcspn(line, "\t =");
value = line + len;
if(node && !check_id(node)) {
fprintf(stderr, "Invalid name for node.\n");
+
+ if(node != line) {
+ free(node);
+ }
+
return 1;
}
fprintf(stderr, "Warning: %s is not a known configuration variable!\n", variable);
} else {
fprintf(stderr, "%s: is not a known configuration variable! Use --force to use it anyway.\n", variable);
+
+ if(node && node != line) {
+ free(node);
+ }
+
return 1;
}
}
if(node) {
snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, node);
+
+ if(node != line) {
+ free(node);
+ node = NULL;
+ }
} else {
snprintf(filename, sizeof(filename), "%s", tinc_conf);
}
return result;
}
+static void cleanup() {
+ free(tinc_conf);
+ free(hosts_dir);
+ free_names();
+}
int main(int argc, char *argv[]) {
program_name = argv[0];
make_names(false);
xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
+ atexit(cleanup);
if(show_version) {
version();
#endif
- srand(time(NULL));
+ gettimeofday(&now, NULL);
+ srand(now.tv_sec + now.tv_usec);
crypto_init();
if(optind >= argc) {