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

Allow the log output to be stopped with control-C in tinc's shell.

Browse source
This commit is contained in:
Guus Sliepen 2013-05-30 17:38:48 +02:00
parent 6bf3595a91
commit ce5e0f6557
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/tincctl.c
View file

@ -469,7 +469,8 @@ bool recvline(int fd, char *line, size_t len) {
char *newline = NULL; char *newline = NULL;
if(!fd) if(!fd)
abort(); abort();
while(!(newline = memchr(buffer, '\n', blen))) { while(!(newline = memchr(buffer, '\n', blen))) {
int result = recv(fd, buffer + blen, sizeof buffer - blen, 0); int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
if(result == -1 && errno == EINTR) if(result == -1 && errno == EINTR)
@ -1187,6 +1188,13 @@ static int cmd_pcap(int argc, char *argv[]) {
return 0; return 0;
} }
#ifdef SIGINT
static void sigint_handler(int sig) {
fprintf(stderr, "\n");
shutdown(fd, SHUT_RDWR);
}
#endif
static int cmd_log(int argc, char *argv[]) { static int cmd_log(int argc, char *argv[]) {
if(argc > 2) { if(argc > 2) {
fprintf(stderr, "Too many arguments!\n"); fprintf(stderr, "Too many arguments!\n");
@ -1196,7 +1204,18 @@ static int cmd_log(int argc, char *argv[]) {
if(!connect_tincd(true)) if(!connect_tincd(true))
return 1; return 1;
#ifdef SIGINT
signal(SIGINT, sigint_handler);
#endif
logcontrol(fd, stdout, argc > 1 ? atoi(argv[1]) : -1); logcontrol(fd, stdout, argc > 1 ? atoi(argv[1]) : -1);
#ifdef SIGINT
signal(SIGINT, SIG_DFL);
#endif
close(fd);
fd = -1;
return 0; return 0;
} }