cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwTcpSocket.cpp : Changed select_receive() to use p->fdH when available.

Browse Source
This commit is contained in:
kpl 2020-03-23 16:46:04 -04:00
parent d0eccbd6be
commit 8c685cb517
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cwTcpSocket.cpp
View File

@ -574,9 +574,11 @@ cw::rc_t cw::net::socket::select_receive(handle_t h, char* buf, unsigned bufByte
fd_set rdSet; fd_set rdSet;
struct timeval timeOut; struct timeval timeOut;
int fd = p->fdH != cwSOCKET_NULL_SOCK ? p->fdH : p->sockH;
// setup the select() call // setup the select() call
FD_ZERO(&rdSet); FD_ZERO(&rdSet);
FD_SET(p->sockH, &rdSet ); FD_SET(fd, &rdSet );
timeOut.tv_sec = timeOutMs/1000; timeOut.tv_sec = timeOutMs/1000;
timeOut.tv_usec = (timeOutMs - (timeOut.tv_sec * 1000)) * 1000; timeOut.tv_usec = (timeOutMs - (timeOut.tv_sec * 1000)) * 1000;
@ -586,7 +588,7 @@ cw::rc_t cw::net::socket::select_receive(handle_t h, char* buf, unsigned bufByte
// NOTE; select() takes the highest socket value plus one of all the sockets in all the sets. // NOTE; select() takes the highest socket value plus one of all the sockets in all the sets.
switch( select(p->sockH+1,&rdSet,NULL,NULL,&timeOut) ) switch( select(fd+1,&rdSet,NULL,NULL,&timeOut) )
{ {
case -1: // error case -1: // error
if( errno != EINTR ) if( errno != EINTR )
@ -598,7 +600,7 @@ cw::rc_t cw::net::socket::select_receive(handle_t h, char* buf, unsigned bufByte
break; break;
case 1: // (> 0) count of ready descripters case 1: // (> 0) count of ready descripters
if( FD_ISSET(p->sockH,&rdSet) ) if( FD_ISSET(fd,&rdSet) )
{ {
socklen_t addrByteCnt = fromAddr==nullptr ? 0 : sizeof(*fromAddr); socklen_t addrByteCnt = fromAddr==nullptr ? 0 : sizeof(*fromAddr);
ssize_t retByteCnt; ssize_t retByteCnt;
@ -606,7 +608,7 @@ cw::rc_t cw::net::socket::select_receive(handle_t h, char* buf, unsigned bufByte
errno = 0; errno = 0;
// recv the incoming msg into buf[] // recv the incoming msg into buf[]
if(( retByteCnt = recvfrom( p->sockH, buf, bufByteCnt, 0, (struct sockaddr*)fromAddr, &addrByteCnt )) == cwSOCKET_SYS_ERR ) if(( retByteCnt = recvfrom( fd, buf, bufByteCnt, 0, (struct sockaddr*)fromAddr, &addrByteCnt )) == cwSOCKET_SYS_ERR )
{ {
switch( errno ) switch( errno )
{ {