markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Use MSG_WAITALL on reads to more reliably detect closed unix sockets

master
Con Kolivas 11 years ago
parent
b297a35632
commit
4121560bad
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/libckpool.c

10
src/libckpool.c
Unescape View File

@ -637,8 +637,8 @@ int read_length(int sockd, void *buf, int len)
return -1; return -1;
} }
while (len) { while (len) {
ret = read(sockd, buf + ofs, len); ret = recv(sockd, buf + ofs, len, MSG_WAITALL);
if (unlikely(ret < 0)) if (unlikely(ret < 1))
return -1; return -1;
ofs += ret; ofs += ret;
len -= ret; len -= ret;
@ -655,7 +655,7 @@ char *_recv_unix_msg(int sockd, const char *file, const char *func, const int li
uint32_t msglen; uint32_t msglen;
int ret; int ret;
ret = wait_read_select(sockd, 60); ret = wait_read_select(sockd, 5);
if (unlikely(ret < 1)) { if (unlikely(ret < 1)) {
LOGERR("Select1 failed in recv_unix_msg"); LOGERR("Select1 failed in recv_unix_msg");
goto out; goto out;
@ -673,13 +673,13 @@ char *_recv_unix_msg(int sockd, const char *file, const char *func, const int li
} }
buf = ckalloc(msglen + 1); buf = ckalloc(msglen + 1);
buf[msglen] = 0; buf[msglen] = 0;
ret = wait_read_select(sockd, 60); ret = wait_read_select(sockd, 5);
if (unlikely(ret < 1)) { if (unlikely(ret < 1)) {
LOGERR("Select2 failed in recv_unix_msg"); LOGERR("Select2 failed in recv_unix_msg");
goto out; goto out;
} }
ret = read_length(sockd, buf, msglen); ret = read_length(sockd, buf, msglen);
if (unlikely(ret < 0)) { if (unlikely(ret < (int)msglen)) {
LOGERR("Failed to read %d bytes in recv_unix_msg", msglen); LOGERR("Failed to read %d bytes in recv_unix_msg", msglen);
dealloc(buf); dealloc(buf);
} }

Write Preview
Loading…
Cancel
Save