aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-21 16:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/socket_close.c: remove obsolete comment.

Browse Source 
Put more inline comments, and also preserve errno properly from read.

Suggested-by: @cdecker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-12-29 13:56:43 +10:30
parent 4ef2367c04
commit 5aa8663c98
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/socket_close.c
View File

@@ -7,20 +7,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
/* /* makes read() return EINTR after 5 seconds */
Simplified (minus all the error checks):
shutdown(fd, SHUT_WR);
for (;;) {
char unused[64]
sys_res = read(fd, unused, 64);
if (sys_res == 0)
break;
}
close(fd);
*/
/* makes read() return EINTR */
static void break_read(int signum) static void break_read(int signum)
{ {
} }
@@ -29,8 +16,9 @@ bool socket_close(int fd)
{ {
char unused[64]; char unused[64];
struct sigaction act, old_act; struct sigaction act, old_act;
int sys_res; int sys_res, saved_errno;
/* We shutdown. Usually they then shutdown too, and read() gives 0 */
sys_res = shutdown(fd, SHUT_WR); sys_res = shutdown(fd, SHUT_WR);
if (sys_res < 0) { if (sys_res < 0) {
close_noerr(fd); close_noerr(fd);
@@ -45,12 +33,14 @@ bool socket_close(int fd)
alarm(5); alarm(5);
while ((sys_res = read(fd, unused, sizeof(unused))) > 0); while ((sys_res = read(fd, unused, sizeof(unused))) > 0);
saved_errno = errno;
alarm(0); alarm(0);
sigaction(SIGALRM, &old_act, NULL); sigaction(SIGALRM, &old_act, NULL);
if (sys_res < 0) { if (sys_res < 0) {
close_noerr(fd); close(fd);
errno = saved_errno;
return false; return false;
} }