andy/fence-virt
1
0
Fork 0
forked from altcloud/fence-virt
Code Issues Pull Requests Releases Wiki Activity

fence-virt: Fix a few fd leaks

Browse Source 
Fix a few places where descriptors could leak in the client code.

Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
This commit is contained in:
Ryan McCabe 2012-10-17 13:31:25 -04:00
parent 10df3451a6
commit 0004a70072
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/mcast.c
View File

@ -168,8 +168,6 @@ tcp_exchange(int fd, fence_auth_type_t auth, void *key,
ret = 0;
}
close(fd);
return ret;
}
@ -264,7 +262,7 @@ mcast_fence_virt(fence_virt_args_t *args)
ip_list_t ipl;
char key[MAX_KEY_LEN];
struct timeval tv;
int lfd, key_len = 0, fd;
int lfd = -1, key_len = 0, fd, ret;
int attempts = 0;
uint32_t seqno;
@ -326,6 +324,7 @@ mcast_fence_virt(fence_virt_args_t *args)
do {
if (send_multicast_packets(&ipl, args, seqno,
key, key_len)) {
close(lfd);
return -1;
}
@ -343,12 +342,16 @@ mcast_fence_virt(fence_virt_args_t *args)
... = ssl_wait_connect... */
break;
default:
close(lfd);
return 1;
}
break;
} while (--attempts);
if (lfd >= 0)
close(lfd);
if (fd < 0) {
if (attempts <= 0) {
printf("Timed out waiting for response\n");
@ -363,14 +366,18 @@ mcast_fence_virt(fence_virt_args_t *args)
case AUTH_SHA1:
case AUTH_SHA256:
case AUTH_SHA512:
return tcp_exchange(fd, args->net.auth, key, key_len,
ret = tcp_exchange(fd, args->net.auth, key, key_len,
args->timeout);
close(fd);
return ret;
break;
/* case AUTH_X509:
return ssl_exchange(...); */
default:
close(fd);
return 1;
}
close(fd);
return 1;
}

8
client/tcp.c
View File

@ -85,7 +85,6 @@ tcp_exchange(int fd, fence_auth_type_t auth, void *key,
ret = 0;
}
close(fd);
return ret;
}
@ -147,6 +146,7 @@ tcp_fence_virt(fence_virt_args_t *args)
ret = _write_retry(fd, &freq, sizeof(freq), NULL);
if (ret != sizeof(freq)) {
perror("write");
close(fd);
return 1;
}
@ -155,15 +155,19 @@ tcp_fence_virt(fence_virt_args_t *args)
case AUTH_SHA1:
case AUTH_SHA256:
case AUTH_SHA512:
return tcp_exchange(fd, args->net.auth, key, key_len,
ret = tcp_exchange(fd, args->net.auth, key, key_len,
args->timeout);
close(fd);
return ret;
break;
/* case AUTH_X509:
return ssl_exchange(...); */
default:
dbg_printf(3, "Unknown auth type: %d\n", args->net.auth);
close(fd);
return 1;
}
close(fd);
return 1;
}