sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

tsocket: Use iov_advance

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2015-02-16 13:50:25 +00:00 committed by Jeremy Allison
parent 6e94f695c4
commit d6f70d3346
2 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/tsocket/tsocket_bsd.c
View File

@ -26,6 +26,7 @@
#include "system/network.h"
#include "tsocket.h"
#include "tsocket_internal.h"
#include "lib/util/iov_buf.h"
static int tsocket_bsd_error_from_errno(int ret,
int sys_errno,
@ -1747,7 +1748,8 @@ static void tstream_bsd_readv_handler(void *private_data)
struct tstream_bsd *bsds = tstream_context_data(stream, struct tstream_bsd);
int ret;
int err;
bool retry;
int _count;
bool ok, retry;
ret = readv(bsds->fd, state->vector, state->count);
if (ret == 0) {
@ -1766,31 +1768,13 @@ static void tstream_bsd_readv_handler(void *private_data)
state->ret += ret;
while (ret > 0) {
if (ret < state->vector[0].iov_len) {
uint8_t *base;
base = (uint8_t *)state->vector[0].iov_base;
base += ret;
state->vector[0].iov_base = (void *)base;
state->vector[0].iov_len -= ret;
break;
}
ret -= state->vector[0].iov_len;
state->vector += 1;
state->count -= 1;
}
_count = state->count; /* tstream has size_t count, readv has int */
ok = iov_advance(&state->vector, &_count, ret);
state->count = _count;
/*
* there're maybe some empty vectors at the end
* which we need to skip, otherwise we would get
* ret == 0 from the readv() call and return EPIPE
*/
while (state->count > 0) {
if (state->vector[0].iov_len > 0) {
break;
}
state->vector += 1;
state->count -= 1;
if (!ok) {
tevent_req_error(req, EINVAL);
return;
}
if (state->count > 0) {
@ -1907,7 +1891,8 @@ static void tstream_bsd_writev_handler(void *private_data)
struct tstream_bsd *bsds = tstream_context_data(stream, struct tstream_bsd);
ssize_t ret;
int err;
bool retry;
int _count;
bool ok, retry;
ret = writev(bsds->fd, state->vector, state->count);
if (ret == 0) {
@ -1926,31 +1911,13 @@ static void tstream_bsd_writev_handler(void *private_data)
state->ret += ret;
while (ret > 0) {
if (ret < state->vector[0].iov_len) {
uint8_t *base;
base = (uint8_t *)state->vector[0].iov_base;
base += ret;
state->vector[0].iov_base = (void *)base;
state->vector[0].iov_len -= ret;
break;
}
ret -= state->vector[0].iov_len;
state->vector += 1;
state->count -= 1;
}
_count = state->count; /* tstream has size_t count, writev has int */
ok = iov_advance(&state->vector, &_count, ret);
state->count = _count;
/*
* there're maybe some empty vectors at the end
* which we need to skip, otherwise we would get
* ret == 0 from the writev() call and return EPIPE
*/
while (state->count > 0) {
if (state->vector[0].iov_len > 0) {
break;
}
state->vector += 1;
state->count -= 1;
if (!ok) {
tevent_req_error(req, EINVAL);
return;
}
if (state->count > 0) {

2
lib/tsocket/wscript_build
View File

@ -3,7 +3,7 @@
bld.SAMBA_SUBSYSTEM('LIBTSOCKET',
source='tsocket.c tsocket_helpers.c tsocket_bsd.c',
public_deps='talloc tevent',
public_deps='talloc tevent iov_buf',
public_headers='tsocket.h tsocket_internal.h',
)