eddy/eddys_snippets
1
0
Fork 0
mirror of https://github.com/eddyem/eddys_snippets.git synced 2025-12-06 10:45:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove doubled waittoread from sersock.c

Browse Source
This commit is contained in:
Edward Emelianov 2022-01-24 11:12:04 +03:00
parent 6e19298249
commit 830716fd1c
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
serialsock/sersock.c
View File

@ -26,37 +26,6 @@
#include "cmdlnopts.h" #include "cmdlnopts.h"
#include "sersock.h" #include "sersock.h"
/**
* wait for answer from socket
* @param sock - socket fd
* @return 0 in case of error or timeout, 1 in case of socket ready
*/
static int waittoread(int sock){
fd_set fds;
struct timeval timeout;
int rc;
timeout.tv_sec = 0;
timeout.tv_usec = 100;
FD_ZERO(&fds);
FD_SET(sock, &fds);
do{
rc = select(sock+1, &fds, NULL, NULL, &timeout);
if(rc < 0){
if(errno != EINTR){
WARN("select()");
return 0;
}
continue;
}
break;
}while(1);
if(FD_ISSET(sock, &fds)){
//DBG("FD_ISSET");
return 1;
}
return 0;
}
// work with single client, return FALSE if disconnected // work with single client, return FALSE if disconnected
static int handle_socket(int sock, TTY_descr *d){ static int handle_socket(int sock, TTY_descr *d){
char buff[BUFLEN]; char buff[BUFLEN];
@ -305,7 +274,7 @@ static void client_(int sock){
if(msg[L-1] == '\n') msg[L-1] = 0; if(msg[L-1] == '\n') msg[L-1] = 0;
LOGMSG("TERMINAL: %s", msg); LOGMSG("TERMINAL: %s", msg);
} }
if(!waittoread(sock)) continue; if(1 != canberead(sock)) continue;
int n = read(sock, recvBuff, Bufsiz-1); int n = read(sock, recvBuff, Bufsiz-1);
if(n == 0){ if(n == 0){
WARNX("Server disconnected"); WARNX("Server disconnected");