system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-19 23:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixed up some semantic misunderstandings using the helpful advice of

Browse source 
Rein Klazes
- added SO_SNDTIMEO support
- added ifdef's for consistency with rest of socket.c
This commit is contained in:
Greg Turner 2002-09-26 03:21:54 +00:00 committed by Alexandre Julliard
parent 635eb3c2ae
commit e6d8fdb081
1 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
dlls/winsock/socket.c
View file

@ -2705,21 +2705,44 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
optval= (char*) &woptval;
optlen=sizeof(int);
}
if (level == SOL_SOCKET && optname == SO_RCVTIMEO && optlen < sizeof(struct timeval)) {
if (optlen == sizeof(time_t)) {
/* Apparently WinSock will accept a shortened struct timeval.
FIXME: should we do the same for SO_SNDTIMEO? */
WARN("Short struct timeval in SO_RCVTIMEO: assuming time_t\n");
tval.tv_sec = *(time_t*)optval;
tval.tv_usec = 0;
#ifdef SO_RCVTIMEO
if (level == SOL_SOCKET && optname == SO_RCVTIMEO) {
if (optlen == sizeof(UINT32)) {
/* WinSock passes miliseconds instead of struct timeval */
tval.tv_usec = *(PUINT32)optval % 1000;
tval.tv_sec = *(PUINT32)optval / 1000;
/* min of 500 milisec */
if (tval.tv_sec == 0 && tval.tv_usec < 500) tval.tv_usec = 500;
optlen = sizeof(struct timeval);
optval = (char*)&tval;
} else if (optlen == sizeof(struct timeval)) {
WARN("SO_RCVTIMEO for %d bytes: assuming unixism\n", optlen);
} else {
WARN("SO_RCVTIMEO for %d bytes is too small: ignored\n", optlen);
WARN("SO_RCVTIMEO for %d bytes is weird: ignored\n", optlen);
close(fd);
return 0;
}
}
#endif
#ifdef SO_SNDTIMEO
if (level == SOL_SOCKET && optname == SO_SNDTIMEO) {
if (optlen == sizeof(UINT32)) {
/* WinSock passes miliseconds instead of struct timeval */
tval.tv_usec = *(PUINT32)optval % 1000;
tval.tv_sec = *(PUINT32)optval / 1000;
/* min of 500 milisec */
if (tval.tv_sec == 0 && tval.tv_usec < 500) tval.tv_usec = 500;
optlen = sizeof(struct timeval);
optval = (char*)&tval;
} else if (optlen == sizeof(struct timeval)) {
WARN("SO_SNDTIMEO for %d bytes: assuming unixism\n", optlen);
} else {
WARN("SO_SNDTIMEO for %d bytes is weird: ignored\n", optlen);
close(fd);
return 0;
}
}
#endif
}
if(optname == SO_RCVBUF && *(int*)optval < 2048) {
WARN("SO_RCVBF for %d bytes is too small: ignored\n", *(int*)optval );