ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a message and fix error code if __ws_getservbyname() and

Browse Source 
__ws_getservbyport() cannot find the requested service.
Fix WINSOCK_setsockopt() when called with optval pointing to 16 bit int.
This commit is contained in:
Rein Klazes 2000-03-07 12:23:51 +00:00 committed by Alexandre Julliard
parent 1e899dfa2e
commit 5d3f7a6885
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/winsock/socket.c
View File

@ -1638,6 +1638,7 @@ INT WINAPI WINSOCK_setsockopt(SOCKET16 s, INT level, INT optname,
{ {
struct linger linger; struct linger linger;
int fd = _get_sock_fd(s); int fd = _get_sock_fd(s);
int woptval;
if(optname == WS_SO_DONTLINGER) { if(optname == WS_SO_DONTLINGER) {
linger.l_onoff = *((int*)optval) ? 0: 1; linger.l_onoff = *((int*)optval) ? 0: 1;
@ -1655,6 +1656,10 @@ INT WINAPI WINSOCK_setsockopt(SOCKET16 s, INT level, INT optname,
is null?? */ is null?? */
optval = (char*)&linger; optval = (char*)&linger;
optlen = sizeof(struct linger); optlen = sizeof(struct linger);
} else if (optlen < sizeof(int)){
woptval= *((INT16 *) optval);
optval= (char*) &woptval;
optlen=sizeof(int);
} }
} }
if (setsockopt(fd, level, optname, optval, optlen) == 0) if (setsockopt(fd, level, optname, optval, optlen) == 0)
@ -1994,9 +1999,14 @@ struct WIN_servent* __ws_getservbyname(const char *name, const char *proto, int
if( WS_dup_se(pwsi, serv, dup_flag) ) if( WS_dup_se(pwsi, serv, dup_flag) )
return (struct WIN_servent*)(pwsi->se); return (struct WIN_servent*)(pwsi->se);
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
else SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno()); else {
MESSAGE("service %s protocol %s not found; maybe you have add "
"this to /etc/services\n", debugstr_a(pwsi->buffer),
debugstr_a(pwsi->buffer+i));
SetLastError(WSANO_DATA);
}
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
} } else SetLastError(WSANOTINITIALISED);
return NULL; return NULL;
} }
@ -2034,9 +2044,14 @@ static struct WIN_servent* __ws_getservbyport(int port, const char* proto, int d
if( WS_dup_se(pwsi, serv, dup_flag) ) if( WS_dup_se(pwsi, serv, dup_flag) )
return (struct WIN_servent*)(pwsi->se); return (struct WIN_servent*)(pwsi->se);
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
else SetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno()); else {
MESSAGE("service on port %d protocol %s not found; maybe you have "
"add this to /etc/services\n", ntohl(port),
debugstr_a(pwsi->buffer));
SetLastError(WSANO_DATA);
}
else SetLastError(WSAENOBUFS); else SetLastError(WSAENOBUFS);
} } else SetLastError(WSANOTINITIALISED);
return NULL; return NULL;
} }