linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- changed select calls to newly indroduced uselect

Browse Source 
SKIPPED:
	psi/sinqhttpprot.c
This commit is contained in:
zolliker
2008-10-16 13:53:39 +00:00
parent 52a93e6cc3
commit 373063fab6
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
network.c
View File

@@ -51,6 +51,7 @@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include "uselect.h"
#define PORT 1
#define SOCKET 2
@@ -193,7 +194,7 @@ CreateSocketAdress(
{
return NULL; /* eof */
}
iRet = select( (self->sockid + 1),(fd_set *)&lMask, NULL, NULL,&tmo);
iRet = uselect( (self->sockid + 1),(fd_set *)&lMask, NULL, NULL,&tmo);
if( iRet <= 0)
{
/* failure, or no request */
@@ -335,7 +336,7 @@ CreateSocketAdress(
FD_ZERO(&rmask);
FD_SET(self->sockid, &wmask);
FD_SET(self->sockid, &rmask);
iret = select(self->sockid+1, &rmask, &wmask, NULL, &tmo);
iret = uselect(self->sockid+1, &rmask, &wmask, NULL, &tmo);
if (iret == 0) return 0; /* in progress */
if (iret > 0) {
/* the connection has either succeded or failed
@@ -480,7 +481,7 @@ CreateSocketAdress(
FD_SET(self->sockid,&lMask);
tmo.tv_usec = 0;
tmo.tv_sec = delta;
iRet = select( (self->sockid + 1),NULL, &lMask, NULL,&tmo);
iRet = uselect( (self->sockid + 1),NULL, &lMask, NULL,&tmo);
if (iRet < 0) {
/* failure, or no data */
self->iType = 0;
@@ -541,7 +542,7 @@ CreateSocketAdress(
{
return -1; /* eof */
}
iRet = select( (self->sockid + 1),&lMask, NULL, NULL,&tmo);
iRet = uselect( (self->sockid + 1),&lMask, NULL, NULL,&tmo);
if( iRet <= 0)
{
/* failure, or no data
@@ -589,7 +590,7 @@ CreateSocketAdress(
{
return -1; /* eof */
}
iRet = select( (self->sockid + 1),&lMask, NULL, NULL,&tmo);
iRet = uselect( (self->sockid + 1),&lMask, NULL, NULL,&tmo);
if( iRet < 0)
{
return -1;
@@ -760,7 +761,7 @@ int NETReconnectWithFlags(mkChannel* self, int flags)
FD_ZERO(&wmask);
FD_SET(self->sockid, &rmask);
FD_SET(self->sockid, &wmask);
iRet = select(self->sockid+1, &rmask, &wmask, NULL, &tmo);
iRet = uselect(self->sockid+1, &rmask, &wmask, NULL, &tmo);
if (iRet < 0) /* error */
iRet = -1;
else if (iRet == 0) /* timeout */
@@ -916,7 +917,7 @@ int NETReconnect(mkChannel* self)
tmo.tv_usec = (timeout % 1000) *1000;
tmo.tv_sec = timeout / 1000;
lMask = (1 << self->sockid);
iRet = select( (self->sockid + 1),(fd_set *)&lMask, NULL, NULL,&tmo);
iRet = uselect( (self->sockid + 1),(fd_set *)&lMask, NULL, NULL,&tmo);
if( iRet <= 0)
{
/* failure, or no data */