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

Do not use writev() for now

Browse Source
This commit is contained in:
angt
2015-10-29 18:18:52 +01:00
parent 0957a0c341
commit c9dca9269f
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
glorytun.c
View File

@@ -239,6 +239,7 @@ static ssize_t fd_write (int fd, const void *data, size_t size)
return ret; return ret;
} }
/*
static ssize_t fd_writev (int fd, const struct iovec *iov, int count) static ssize_t fd_writev (int fd, const struct iovec *iov, int count)
{ {
if (!count) if (!count)
@@ -256,6 +257,7 @@ static ssize_t fd_writev (int fd, const struct iovec *iov, int count)
return ret; return ret;
} }
*/
enum option_type { enum option_type {
option_flag, option_flag,
@@ -471,14 +473,9 @@ int main (int argc, char **argv)
if (fds[0].revents & POLLOUT) if (fds[0].revents & POLLOUT)
fds[0].events = POLLIN; fds[0].events = POLLIN;
struct iovec iov[16]; while (1) {
size_t count; size_t size = buffer_read_size(&sock.recv);
ssize_t ip_size = get_ip_size(sock.recv.read, size);
uint8_t *data = sock.recv.read;
for (count=0; count<COUNT(iov); count++) {
size_t size = sock.recv.write-data;
ssize_t ip_size = get_ip_size(data, size);
if (!ip_size) if (!ip_size)
goto restart; goto restart;
@@ -486,14 +483,7 @@ int main (int argc, char **argv)
if (ip_size<0 || (size_t)ip_size>size) if (ip_size<0 || (size_t)ip_size>size)
break; break;
iov[count].iov_base = data; ssize_t r = fd_write(fds[0].fd, sock.recv.read, ip_size);
iov[count].iov_len = ip_size;
data += ip_size;
}
if (count) {
ssize_t r = fd_writev(fds[0].fd, iov, count);
if (!r) if (!r)
return 2; return 2;
@@ -501,8 +491,10 @@ int main (int argc, char **argv)
if (r==-1) if (r==-1)
fds[0].events = POLLIN|POLLOUT; fds[0].events = POLLIN|POLLOUT;
if (r>0) if (r<0)
sock.recv.read += r; break;
sock.recv.read += r;
} }
} }