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

Make tincctl robust against dropped control connections.

Browse source
This commit is contained in:
Guus Sliepen 2012-09-28 17:36:25 +02:00
parent c5325ffdd1
commit e971130b60
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/tincctl.c
View file

@ -687,8 +687,19 @@ static bool remove_service(void) {
#endif
static bool connect_tincd(bool verbose) {
if(fd >= 0)
return true;
if(fd >= 0) {
fd_set r;
FD_ZERO(&r);
FD_SET(fd, &r);
struct timeval tv = {0, 0};
if(select(fd + 1, &r, NULL, NULL, &tv)) {
fprintf(stderr, "Previous connection to tincd lost, reconnecting.\n");
close(fd);
fd = -1;
} else {
return true;
}
}
FILE *f = fopen(pidfilename, "r");
if(!f) {
@ -751,6 +762,8 @@ static bool connect_tincd(bool verbose) {
if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
if(verbose)
fprintf(stderr, "Cannot connect to %s port %s: %s\n", host, port, sockstrerror(sockerrno));
close(fd);
fd = -1;
return false;
}
@ -762,6 +775,8 @@ static bool connect_tincd(bool verbose) {
if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %s %d", &code, data, &version) != 3 || code != 0) {
if(verbose)
fprintf(stderr, "Cannot read greeting from control socket: %s\n", sockstrerror(sockerrno));
close(fd);
fd = -1;
return false;
}
@ -770,6 +785,8 @@ static bool connect_tincd(bool verbose) {
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");
close(fd);
fd = -1;
return false;
}