bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-23 07:52:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xio-socket.c: adapted xiopoll() messages for struct timeval

Browse source
This commit is contained in:
Gerhard Rieger 2008-10-14 22:23:01 +02:00
parent 29d3f9438b
commit 180a28b608
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xio-socket.c
View file

@ -852,8 +852,8 @@ int _xioopen_connect(struct single *xfd, struct sockaddr *us, size_t uslen,
writefd.events = (POLLIN|POLLHUP|POLLERR); writefd.events = (POLLIN|POLLHUP|POLLERR);
result = xiopoll(&writefd, 1, &timeout); result = xiopoll(&writefd, 1, &timeout);
if (result < 0) { if (result < 0) {
Msg3(level, "poll({%d,POLLIN|POLLHUP|POLLER},,%d): %s", Msg4(level, "xiopoll({%d,POLLIN|POLLHUP|POLLER},,{"F_tv_sec"."F_tv_usec"): %s",
xfd->fd, timeout, strerror(errno)); xfd->fd, timeout.tv_sec, timeout.tv_usec, strerror(errno));
return STAT_RETRYLATER; return STAT_RETRYLATER;
} }
if (result == 0) { if (result == 0) {
@ -1277,7 +1277,7 @@ int _xioopen_dgram_recvfrom(struct single *xfd, int xioflags,
#if HAVE_STRUCT_SIGACTION_SA_SIGACTION && defined(SA_SIGINFO) #if HAVE_STRUCT_SIGACTION_SA_SIGACTION && defined(SA_SIGINFO)
act.sa_sigaction = xiosigaction_hasread; act.sa_sigaction = xiosigaction_hasread;
#else /* Linux 2.0(.33) does not have sigaction.sa_sigaction */ #else /* Linux 2.0(.33) does not have sigaction.sa_sigaction */
act.sa_handler = xiosighandler_hasread; act.sa_handler = xiosigaction_hasread;
#endif #endif
if (Sigaction(SIGUSR1, &act, NULL) < 0) { if (Sigaction(SIGUSR1, &act, NULL) < 0) {
/*! Linux man does not explicitely say that errno is defined */ /*! Linux man does not explicitely say that errno is defined */