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

Don't handle errors in tun.c

Browse Source
This commit is contained in:
Adrien Gallouët
2017-01-04 14:07:30 +00:00
parent a8595c36b4
commit 76cd7ed4b8
1 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/tun.c
View File

@@ -45,7 +45,9 @@ tun_create_by_id(char *name, size_t size, unsigned id)
str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name) - 1); str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name) - 1);
if (ioctl(fd, CTLIOCGINFO, &ci)) { if (ioctl(fd, CTLIOCGINFO, &ci)) {
int err = errno;
close(fd); close(fd);
errno = err;
return -1; return -1;
} }
@@ -58,7 +60,9 @@ tun_create_by_id(char *name, size_t size, unsigned id)
}; };
if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))) { if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))) {
int err = errno;
close(fd); close(fd);
errno = err;
return -1; return -1;
} }
@@ -72,8 +76,10 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
{ {
unsigned id = 0; unsigned id = 0;
if (sscanf(dev_name, "utun%u", &id) != 1) if (sscanf(dev_name, "utun%u", &id) != 1) {
errno = EINVAL;
return -1; return -1;
}
return tun_create_by_id(name, size, id); return tun_create_by_id(name, size, id);
} }
@@ -156,7 +162,7 @@ ssize_t
tun_read(int fd, void *data, size_t size) tun_read(int fd, void *data, size_t size)
{ {
if (!size) if (!size)
return -1; return 0;
#ifdef GT_BSD_TUN #ifdef GT_BSD_TUN
uint32_t family; uint32_t family;
@@ -173,27 +179,16 @@ tun_read(int fd, void *data, size_t size)
}; };
ssize_t ret = readv(fd, iov, 2); ssize_t ret = readv(fd, iov, 2);
#else
ssize_t ret = read(fd, data, size);
#endif
if (ret == -1) { if (ret <= (ssize_t)0)
if (errno == EAGAIN || errno == EINTR) return ret;
return -1;
if (errno) if (ret <= (ssize_t)sizeof(family))
perror("tun read");
return 0;
}
#ifdef GT_BSD_TUN
if (ret < (ssize_t)sizeof(family))
return 0; return 0;
return ret - sizeof(family); return ret - sizeof(family);
#else #else
return ret; return read(fd, data, size);
#endif #endif
} }
@@ -201,7 +196,7 @@ ssize_t
tun_write(int fd, const void *data, size_t size) tun_write(int fd, const void *data, size_t size)
{ {
if (!size) if (!size)
return -1; return 0;
#ifdef GT_BSD_TUN #ifdef GT_BSD_TUN
uint32_t family; uint32_t family;
@@ -214,6 +209,7 @@ tun_write(int fd, const void *data, size_t size)
family = htonl(AF_INET6); family = htonl(AF_INET6);
break; break;
default: default:
errno = EINVAL;
return -1; return -1;
} }
@@ -229,27 +225,16 @@ tun_write(int fd, const void *data, size_t size)
}; };
ssize_t ret = writev(fd, iov, 2); ssize_t ret = writev(fd, iov, 2);
#else
ssize_t ret = write(fd, data, size);
#endif
if (ret == -1) { if (ret <= (ssize_t)0)
if (errno == EAGAIN || errno == EINTR) return ret;
return -1;
if (errno) if (ret <= (ssize_t)sizeof(family))
perror("tun write");
return 0;
}
#ifdef GT_BSD_TUN
if (ret < (ssize_t)sizeof(family))
return 0; return 0;
return ret - sizeof(family); return ret - sizeof(family);
#else #else
return ret; return write(fd, data, size);
#endif #endif
} }