miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove useless tests in ctl

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-07-21 14:28:48 +00:00
parent 2f3f9e7e86
commit a7f57de42a
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ctl.c
View File

@@ -13,17 +13,12 @@
int int
ctl_reply(int fd, struct ctl_msg *res, struct ctl_msg *req) ctl_reply(int fd, struct ctl_msg *res, struct ctl_msg *req)
{ {
if (fd == -1) {
errno = EINVAL;
return -1;
}
if ((send(fd, req, sizeof(struct ctl_msg), 0) == -1) || if ((send(fd, req, sizeof(struct ctl_msg), 0) == -1) ||
(recv(fd, res, sizeof(struct ctl_msg), 0) == -1)) (recv(fd, res, sizeof(struct ctl_msg), 0) == -1))
return -1; return -1;
if (res->type != req->type || !res->reply) { if (res->type != req->type || !res->reply) {
errno = EINVAL; errno = EBADMSG;
return -1; return -1;
} }
@@ -82,9 +77,6 @@ ctl_bind(int fd, const char *dir, const char *file)
void void
ctl_delete(int fd) ctl_delete(int fd)
{ {
if (fd == -1)
return;
struct sockaddr_storage ss = { 0 }; struct sockaddr_storage ss = { 0 };
socklen_t sslen = sizeof(ss); socklen_t sslen = sizeof(ss);
@@ -108,9 +100,6 @@ ctl_create(const char *dir, const char *file)
int fd = socket(AF_UNIX, SOCK_DGRAM, 0); int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
if (fd == -1)
return -1;
if (ctl_bind(fd, dir, file)) { if (ctl_bind(fd, dir, file)) {
int err = errno; int err = errno;
close(fd); close(fd);
@@ -169,9 +158,6 @@ ctl_connect(const char *dir, const char *file)
int fd = ctl_create(dir, NULL); int fd = ctl_create(dir, NULL);
if (fd == -1)
return -1;
if (connect(fd, (struct sockaddr *)&sun, sizeof(sun))) { if (connect(fd, (struct sockaddr *)&sun, sizeof(sun))) {
int err = errno; int err = errno;
ctl_delete(fd); ctl_delete(fd);