mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-01 06:58:22 +00:00
localsocket: fix issue with fd passing
This commit is contained in:
@@ -237,9 +237,11 @@ static int sendctrl(socket_t *socket, sockctrl_t *ctrl, size_t len, size_t datas
|
|||||||
// create a new barrier secion
|
// create a new barrier secion
|
||||||
__assert(peer->barrierwrite != peer->barriercurrent + BARRIER_SIZE);
|
__assert(peer->barrierwrite != peer->barriercurrent + BARRIER_SIZE);
|
||||||
|
|
||||||
|
if (peer->bytesremaining[peer->barrierwrite % BARRIER_SIZE])
|
||||||
|
++peer->barrierwrite;
|
||||||
|
|
||||||
peer->filesremaining[peer->barrierwrite % BARRIER_SIZE] = fdcount;
|
peer->filesremaining[peer->barrierwrite % BARRIER_SIZE] = fdcount;
|
||||||
peer->bytesremaining[peer->barrierwrite % BARRIER_SIZE] = datasent;
|
peer->bytesremaining[peer->barrierwrite % BARRIER_SIZE] = datasent;
|
||||||
++peer->barrierwrite;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ctrl = SOCK_CTRL_NEXT(ctrl);
|
ctrl = SOCK_CTRL_NEXT(ctrl);
|
||||||
@@ -466,7 +468,8 @@ static int localsock_recv(socket_t *socket, sockdesc_t *sockdesc) {
|
|||||||
|
|
||||||
// check if we should step forward from that barrier
|
// check if we should step forward from that barrier
|
||||||
localsocket->bytesremaining[localsocket->barriercurrent % BARRIER_SIZE] -= recvcount;
|
localsocket->bytesremaining[localsocket->barriercurrent % BARRIER_SIZE] -= recvcount;
|
||||||
if (localsocket->bytesremaining[localsocket->barriercurrent % BARRIER_SIZE] == 0)
|
if (localsocket->bytesremaining[localsocket->barriercurrent % BARRIER_SIZE] == 0 &&
|
||||||
|
localsocket->bytesremaining[(localsocket->barriercurrent + 1) % BARRIER_SIZE])
|
||||||
++localsocket->barriercurrent;
|
++localsocket->barriercurrent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user