lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Add sock_splice_all()

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-01-23 12:55:41 +01:00
parent 8b63d2cf32
commit 32ea03079b
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/sock.c
View File

@ -182,11 +182,31 @@ long sock_splice(sock *dst, sock *src, void *buf, unsigned long buf_len, unsigne
return send_len; return send_len;
} }
long sock_splice_all(sock *dst, sock *src, void *buf, unsigned long buf_len) {
long send_len = 0;
for (long ret;; send_len += ret) {
if ((ret = sock_recv(src, buf, buf_len, 0)) <= 0) {
if (errno == EINTR) {
errno = 0, ret = 0;
continue;
} else if (ret == 0) {
break;
} else {
return -1;
}
}
if (sock_send_x(dst, buf, ret, 0) == -1)
return -1;
}
return send_len;
}
long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len, int flags) { long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len, int flags) {
long ret; long ret;
unsigned long send_len = 0, next_len; unsigned long send_len = 0, next_len;
while (!(flags & SOCK_SINGLE_CHUNK)) { do {
ret = sock_get_chunk_header(src); ret = sock_get_chunk_header(src);
if (ret < 0) { if (ret < 0) {
errno = EPROTO; errno = EPROTO;
@ -200,9 +220,6 @@ long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len,
return -1; return -1;
} }
if (next_len == 0)
break;
if ((ret = sock_splice(dst, src, buf, buf_len, next_len)) < 0) if ((ret = sock_splice(dst, src, buf, buf_len, next_len)) < 0)
return ret; return ret;
@ -219,7 +236,7 @@ long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len,
errno = EPROTO; errno = EPROTO;
return -2; return -2;
} }
} } while (!(flags & SOCK_SINGLE_CHUNK) && next_len != 0);
return (long) send_len; return (long) send_len;
} }
@ -263,7 +280,7 @@ long sock_parse_chunk_header(const char *buf, long len, long *ret_len) {
} }
long sock_get_chunk_header(sock *s) { long sock_get_chunk_header(sock *s) {
long ret, len; long ret, len = 0;
char buf[16]; char buf[16];
do { do {

2
src/lib/sock.h
View File

@ -51,6 +51,8 @@ long sock_recv_x(sock *s, void *buf, unsigned long len, int flags);
long sock_splice(sock *dst, sock *src, void *buf, unsigned long buf_len, unsigned long len); long sock_splice(sock *dst, sock *src, void *buf, unsigned long buf_len, unsigned long len);
long sock_splice_all(sock *dst, sock *src, void *buf, unsigned long buf_len);
long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len, int flags); long sock_splice_chunked(sock *dst, sock *src, void *buf, unsigned long buf_len, int flags);
int sock_close(sock *s); int sock_close(sock *s);