j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Improve starting/stopping tincd using tincctl.

Browse source 
When starting tincd, tincctl now strips non-options from the command line, and
sets argv[0] to the name of the tincd command instead of copying its own
command name.

When stopping a running tincd, tincctl now waits for it to terminate.
This commit is contained in:
Guus Sliepen 2012-10-06 17:45:03 +02:00
parent 47f33e07ff
commit ef9358c0d6
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/tincctl.c
View file

@ -817,9 +817,10 @@ static int cmd_start(int argc, char *argv[]) {
c = "tincd"; c = "tincd";
int nargc = 0; 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]; nargv[nargc++] = orig_argv[i];
for(int i = 1; i < argc; i++) for(int i = 1; i < argc; i++)
nargv[nargc++] = argv[i]; nargv[nargc++] = argv[i];
@ -852,9 +853,13 @@ static int cmd_stop(int argc, char *argv[]) {
#ifndef HAVE_MINGW #ifndef HAVE_MINGW
if(!connect_tincd(true)) { if(!connect_tincd(true)) {
if(pid) { 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; return 1;
}
fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid); fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid);
waitpid(pid, NULL, 0);
return 0; return 0;
} }
@ -866,6 +871,12 @@ static int cmd_stop(int argc, char *argv[]) {
fprintf(stderr, "Could not stop tinc daemon.\n"); fprintf(stderr, "Could not stop tinc daemon.\n");
return 1; 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 #else
if(!remove_service()) if(!remove_service())
return 1; return 1;
@ -2037,7 +2048,6 @@ static int cmd_shell(int argc, char *argv[]) {
char *line = NULL; char *line = NULL;
int maxargs = argc + 16; int maxargs = argc + 16;
char **nargv = xmalloc(maxargs * sizeof *nargv); char **nargv = xmalloc(maxargs * sizeof *nargv);
optind = argc;
for(int i = 0; i < argc; i++) for(int i = 0; i < argc; i++)
nargv[i] = argv[i]; nargv[i] = argv[i];