circlecloud/proxychains-ng
1
0
Fork 0
mirror of https://github.com/rofl0r/proxychains-ng.git synced 2024-12-22 04:08:47 +00:00
Code Issues Projects Releases Wiki Activity

allocator_thread.c: handle EINTR case when reading/writing pipe data

Browse Source 
addressing #163
This commit is contained in:
rofl0r 2017-02-23 01:08:03 +00:00
parent 7a233fb1f0
commit bb3df1e440
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/allocator_thread.c
View File

@ -176,24 +176,61 @@ static int wait_data(int readfd) {
return 1; return 1;
} }
static int trywrite(int fd, void* buf, size_t bytes) {
ssize_t ret;
unsigned char *out = buf;
again:
ret = write(fd, out, bytes);
switch(ret) {
case -1:
if(errno == EINTR) goto again;
case 0:
return 0;
default:
if(ret == bytes || !bytes) return 1;
out += ret;
bytes -= ret;
goto again;
}
}
static int sendmessage(enum at_direction dir, struct at_msghdr *hdr, void* data) { static int sendmessage(enum at_direction dir, struct at_msghdr *hdr, void* data) {
static int* destfd[ATD_MAX] = { [ATD_SERVER] = &req_pipefd[1], [ATD_CLIENT] = &resp_pipefd[1] }; static int* destfd[ATD_MAX] = { [ATD_SERVER] = &req_pipefd[1], [ATD_CLIENT] = &resp_pipefd[1] };
int ret = write(*destfd[dir], hdr, sizeof *hdr) == sizeof *hdr; int ret = trywrite(*destfd[dir], hdr, sizeof *hdr);
if(ret && hdr->datalen) { if(ret && hdr->datalen) {
assert(hdr->datalen <= MSG_LEN_MAX); assert(hdr->datalen <= MSG_LEN_MAX);
ret = write(*destfd[dir], data, hdr->datalen) == hdr->datalen; ret = trywrite(*destfd[dir], data, hdr->datalen);
} }
return ret; return ret;
} }
static int tryread(int fd, void* buf, size_t bytes) {
ssize_t ret;
unsigned char *out = buf;
again:
ret = read(fd, out, bytes);
switch(ret) {
case -1:
if(errno == EINTR) goto again;
case 0:
return 0;
default:
if(ret == bytes || !bytes) return 1;
out += ret;
bytes -= ret;
goto again;
}
}
static int getmessage(enum at_direction dir, struct at_msghdr *hdr, void* data) { static int getmessage(enum at_direction dir, struct at_msghdr *hdr, void* data) {
static int* readfd[ATD_MAX] = { [ATD_SERVER] = &req_pipefd[0], [ATD_CLIENT] = &resp_pipefd[0] }; static int* readfd[ATD_MAX] = { [ATD_SERVER] = &req_pipefd[0], [ATD_CLIENT] = &resp_pipefd[0] };
int ret; ssize_t ret;
if((ret = wait_data(*readfd[dir]))) { if((ret = wait_data(*readfd[dir]))) {
ret = read(*readfd[dir], hdr, sizeof *hdr) == sizeof(*hdr); if(!tryread(*readfd[dir], hdr, sizeof *hdr))
return 0;
assert(hdr->datalen <= MSG_LEN_MAX); assert(hdr->datalen <= MSG_LEN_MAX);
if(ret && hdr->datalen) { if(hdr->datalen) {
ret = read(*readfd[dir], data, hdr->datalen) == hdr->datalen; ret = tryread(*readfd[dir], data, hdr->datalen);
} }
} }
return ret; return ret;