static bool show_version = false;
static char *name = NULL;
-static char *identname = NULL; /* program name for syslog */
-static char *pidfilename = NULL; /* pid file location */
+static char *identname = NULL; /* program name for syslog */
+static char *pidfilename = NULL; /* pid file location */
static char *confdir = NULL;
static char controlcookie[1024];
char *netname = NULL;
while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
switch (r) {
- case 0: /* long option */
+ case 0: /* long option */
break;
- case 'c': /* config file */
+ case 'c': /* config file */
confbase = xstrdup(optarg);
break;
- case 'n': /* net name given */
+ case 'n': /* net name given */
netname = xstrdup(optarg);
break;
- case 1: /* show help */
+ case 1: /* show help */
show_help = true;
break;
- case 2: /* show version */
+ case 2: /* show version */
show_version = true;
break;
- case 5: /* open control socket here */
+ case 5: /* open control socket here */
pidfilename = xstrdup(optarg);
break;
- case 6:
+ case 6: /* force */
force = true;
break;
- case '?':
+ case '?': /* wrong options */
usage(true);
return false;
}
}
- if(!netname && (netname = getenv("NETNAME")))
- netname = xstrdup(netname);
+ if(!netname && (netname = getenv("NETNAME")))
+ netname = xstrdup(netname);
- /* netname "." is special: a "top-level name" */
+ /* netname "." is special: a "top-level name" */
- if(netname && (!*netname || !strcmp(netname, "."))) {
- free(netname);
- netname = NULL;
- }
+ if(netname && (!*netname || !strcmp(netname, "."))) {
+ free(netname);
+ netname = NULL;
+ }
if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
fprintf(stderr, "Invalid character in netname!\n");
filename = buf2;
}
- umask(0077); /* Disallow everything for group and other */
+ umask(0077); /* Disallow everything for group and other */
disable_old_keys(filename, what);
static bool ecdsa_keygen(bool ask) {
ecdsa_t key;
FILE *f;
- char *filename;
+ char *pubname, *privname;
fprintf(stderr, "Generating ECDSA keypair:\n");
} else
fprintf(stderr, "Done.\n");
- xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
- f = ask_and_open(filename, "private ECDSA key", "a", ask);
+ xasprintf(&privname, "%s" SLASH "ecdsa_key.priv", confbase);
+ f = ask_and_open(privname, "private ECDSA key", "a", ask);
+ free(privname);
if(!f)
return false;
-
+
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
fchmod(fileno(f), 0600);
#endif
-
+
ecdsa_write_pem_private_key(&key, f);
fclose(f);
- free(filename);
if(name)
- xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
else
- xasprintf(&filename, "%s" SLASH "ecdsa_key.pub", confbase);
+ xasprintf(&pubname, "%s" SLASH "ecdsa_key.pub", confbase);
- f = ask_and_open(filename, "public ECDSA key", "a", ask);
+ f = ask_and_open(pubname, "public ECDSA key", "a", ask);
+ free(pubname);
if(!f)
return false;
free(pubkey);
fclose(f);
- free(filename);
return true;
}
static bool rsa_keygen(int bits, bool ask) {
rsa_t key;
FILE *f;
- char *filename;
+ char *pubname, *privname;
fprintf(stderr, "Generating %d bits keys:\n", bits);
} else
fprintf(stderr, "Done.\n");
- xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
- f = ask_and_open(filename, "private RSA key", "a", ask);
+ xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
+ f = ask_and_open(privname, "private RSA key", "a", ask);
+ free(privname);
if(!f)
return false;
-
+
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
fchmod(fileno(f), 0600);
#endif
-
+
rsa_write_pem_private_key(&key, f);
fclose(f);
- free(filename);
if(name)
- xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
else
- xasprintf(&filename, "%s" SLASH "rsa_key.pub", confbase);
+ xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
- f = ask_and_open(filename, "public RSA key", "a", ask);
+ f = ask_and_open(pubname, "public RSA key", "a", ask);
+ free(pubname);
if(!f)
return false;
rsa_write_pem_public_key(&key, f);
fclose(f);
- free(filename);
return true;
}
blen -= result;
}
- return true;
+ return true;
}
static void pcap(int fd, FILE *out, int snaplen) {
}
sendline(fd, "%d ^%s %d", ID, controlcookie, TINC_CTL_VERSION_CURRENT);
-
+
if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) {
if(verbose)
fprintf(stderr, "Could not fully establish control socket connection\n");
c = "tincd";
int nargc = 0;
- char **nargv = xmalloc_and_zero((orig_argc + argc) * sizeof *nargv);
+ char **nargv = xmalloc_and_zero((optind + argc) * sizeof *nargv);
- for(int i = 0; i < orig_argc; i++)
+ nargv[nargc++] = c;
+ for(int i = 1; i < optind; i++)
nargv[nargc++] = orig_argv[i];
for(int i = 1; i < argc; i++)
nargv[nargc++] = argv[i];
pid_t pid = fork();
if(pid == -1) {
fprintf(stderr, "Could not fork: %s\n", strerror(errno));
+ free(nargv);
return 1;
}
if(!pid)
exit(execvp(c, nargv));
-
+
+ free(nargv);
+
int status = -1;
if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
fprintf(stderr, "Error starting %s\n", c);
#ifndef HAVE_MINGW
if(!connect_tincd(true)) {
if(pid) {
- if(kill(pid, SIGTERM))
+ if(kill(pid, SIGTERM)) {
+ fprintf(stderr, "Could not send TERM signal to process with PID %u: %s\n", pid, strerror(errno));
return 1;
+ }
+
fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid);
+ waitpid(pid, NULL, 0);
return 0;
}
fprintf(stderr, "Could not stop tinc daemon.\n");
return 1;
}
+
+ // Wait for tincd to close the connection...
+ fd_set r;
+ FD_ZERO(&r);
+ FD_SET(fd, &r);
+ select(fd + 1, &r, NULL, NULL, NULL);
#else
if(!remove_service())
return 1;
{"ECDSAPrivateKeyFile", VAR_SERVER},
{"ExperimentalProtocol", VAR_SERVER},
{"Forwarding", VAR_SERVER},
- {"GraphDumpFile", VAR_SERVER},
+ {"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
{"Hostnames", VAR_SERVER},
{"IffOneQueue", VAR_SERVER},
{"Interface", VAR_SERVER},
{"ProcessPriority", VAR_SERVER},
{"Proxy", VAR_SERVER},
{"ReplayWindow", VAR_SERVER},
+ {"ScriptsExtension", VAR_SERVER},
+ {"ScriptsInterpreter", VAR_SERVER},
{"StrictSubnets", VAR_SERVER},
{"TunnelServer", VAR_SERVER},
{"UDPRcvBuf", VAR_SERVER},
char *value;
int len;
- len = strcspn(line, "\t =");
- value = line + len;
- value += strspn(value, "\t ");
- if(*value == '=') {
- value++;
- value += strspn(value, "\t ");
- }
- line[len] = '\0';
+ len = strcspn(line, "\t =");
+ value = line + len;
+ value += strspn(value, "\t ");
+ if(*value == '=') {
+ value++;
+ value += strspn(value, "\t ");
+ }
+ line[len] = '\0';
variable = strchr(line, '.');
if(variable) {
node = line;
char *line = NULL;
int maxargs = argc + 16;
char **nargv = xmalloc(maxargs * sizeof *nargv);
- optind = argc;
for(int i = 0; i < argc; i++)
nargv[i] = argv[i];
}
}
+ free(nargv);
+
if(tty)
printf("\n");
return result;
if(!parse_options(argc, argv))
return 1;
-
+
make_names();
if(show_version) {