diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-06 19:17:10 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-06 19:17:10 +0000 |
| commit | e2624db29918127932afcb1c5e767531eeefa288 (patch) | |
| tree | 2c1985594d2f61cb7c9e9bb89ad385d9253614ff /src | |
| parent | 678fa94b3ab7995f01cd7c38feaba2cdb048e761 (diff) | |
| download | skalibs-e2624db29918127932afcb1c5e767531eeefa288.tar.xz | |
Ditch diuints in unixmessage_receiver_fill, revert recvmsg() interpretation
Diffstat (limited to 'src')
| -rw-r--r-- | src/libunixonacid/unixmessage_receive.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/libunixonacid/unixmessage_receive.c b/src/libunixonacid/unixmessage_receive.c index 5ff81bf..ccf4633 100644 --- a/src/libunixonacid/unixmessage_receive.c +++ b/src/libunixonacid/unixmessage_receive.c @@ -7,7 +7,6 @@ #include <sys/socket.h> #include <sys/uio.h> #include <skalibs/uint.h> -#include <skalibs/diuint.h> #include <skalibs/cbuffer.h> #include <skalibs/djbunix.h> #include <skalibs/error.h> @@ -16,7 +15,7 @@ #include <skalibs/siovec.h> #include <skalibs/unixmessage.h> -static int unixmessage_receiver_fill (unixmessage_receiver_t *b, diuint *d) +static int unixmessage_receiver_fill (unixmessage_receiver_t *b) { char ancilbuf[CMSG_SPACE(b->auxb.a - 1)] ; struct iovec iov[2] ; @@ -62,11 +61,8 @@ static int unixmessage_receiver_fill (unixmessage_receiver_t *b, diuint *d) if (msghdr.msg_flags & MSG_CTRUNC) return (errno = EPROTO, -1) ; if (cbuffer_put(&b->auxb, (char *)CMSG_DATA(c), auxlen) < auxlen) return (errno = ENOBUFS, -1) ; - d->right = auxlen / sizeof(int) ; - r -= msghdr.msg_controllen ; } } - d->left = cbuffer_WSEEK(&b->mainb, r) ; return 1 ; } @@ -77,8 +73,7 @@ int unixmessage_receive (unixmessage_receiver_t *b, unixmessage_t *m) char pack[sizeof(unsigned int) << 1] ; if (cbuffer_len(&b->mainb) < sizeof(unsigned int) << 1) { - diuint d ; - register int r = sanitize_read(unixmessage_receiver_fill(b, &d)) ; + register int r = sanitize_read(unixmessage_receiver_fill(b)) ; if (r <= 0) return r ; if (cbuffer_len(&b->mainb) < sizeof(unsigned int) << 1) return (errno = EWOULDBLOCK, 0) ; @@ -95,12 +90,11 @@ int unixmessage_receive (unixmessage_receiver_t *b, unixmessage_t *m) for (;;) { - diuint d ; register int r ; b->maindata.len += cbuffer_get(&b->mainb, b->maindata.s + b->maindata.len, cbuffer_len(&b->mainb)) ; b->auxdata.len += cbuffer_get(&b->auxb, b->auxdata.s + b->auxdata.len, cbuffer_len(&b->auxb)) ; if (b->maindata.len == b->mainlen && b->auxdata.len == b->auxlen) break ; - r = sanitize_read(unixmessage_receiver_fill(b, &d)) ; + r = sanitize_read(unixmessage_receiver_fill(b)) ; if (r <= 0) return r ; } |