team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

It had better work a bit better this time. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2423 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-10-22 17:34:19 +00:00
parent 4006d79532
commit 9f183d7b6f
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fteqtv/forward.c
View File

@ -144,8 +144,11 @@ void Net_TryFlushProxyBuffer(cluster_t *cluster, oproxy_t *prox)
prox->drop = true;
break;
case -1:
if (qerrno != EWOULDBLOCK) //not a problem, so long as we can flush it later.
if (qerrno != EWOULDBLOCK && qerrno != EAGAIN) //not a problem, so long as we can flush it later.
{
Sys_Printf(cluster, "oversize flush\n");
prox->drop = true; //drop them if we get any errors
}
break;
default:
prox->bufferpos += length;

26
fteqtv/source.c
View File

@ -359,7 +359,7 @@ qboolean Net_ConnectToTCPServer(sv_t *qtv, char *ip)
if (connect(qtv->sourcesock, (struct sockaddr *)&qtv->serveraddress, sizeof(qtv->serveraddress)) == INVALID_SOCKET)
{
err = qerrno;
if (err != EINPROGRESS && err != EWOULDBLOCK) //bsd sockets are meant to return EINPROGRESS, but some winsock drivers use EWOULDBLOCK instead. *sigh*...
if (err != EINPROGRESS && err != EAGAIN && err != EWOULDBLOCK) //bsd sockets are meant to return EINPROGRESS, but some winsock drivers use EWOULDBLOCK instead. *sigh*...
{
closesocket(qtv->sourcesock);
qtv->sourcesock = INVALID_SOCKET;
@ -448,6 +448,7 @@ void Net_QueueUpstream(sv_t *qtv, int size, char *buffer)
if (qtv->upstreambuffersize + size > sizeof(qtv->upstreambuffer))
{
Sys_Printf(qtv->cluster, "Upstream queue overflowed for %s\n", qtv->server);
qtv->drop = true;
return;
}
@ -467,8 +468,16 @@ qboolean Net_WriteUpStream(sv_t *qtv)
if (len < 0)
{
int err = qerrno;
if (err != EWOULDBLOCK && err != ENOTCONN)
if (err != EWOULDBLOCK && err != EAGAIN && err != ENOTCONN)
{
int err;
err = qerrno;
if (qerrno)
Sys_Printf(qtv->cluster, "Error: source socket error %i\n", qerrno);
else
Sys_Printf(qtv->cluster, "Error: server disconnected\n");
qtv->drop = true;
}
return false;
}
qtv->upstreambuffersize -= len;
@ -571,7 +580,10 @@ qboolean Net_ReadStream(sv_t *qtv)
}
else
{
err = qerrno;
if (read == 0)
err = 0;
else
err = qerrno;
if (read == 0 || (err != EWOULDBLOCK && err != EAGAIN && err != ENOTCONN)) //ENOTCONN can be returned whilst waiting for a connect to finish.
{
if (qtv->file)
@ -582,8 +594,6 @@ qboolean Net_ReadStream(sv_t *qtv)
Sys_Printf(qtv->cluster, "Error: server disconnected\n");
if (qtv->sourcesock != INVALID_SOCKET)
{
int err;
err = qerrno;
closesocket(qtv->sourcesock);
qtv->sourcesock = INVALID_SOCKET;
}
@ -782,12 +792,6 @@ void QTV_Shutdown(sv_t *qtv)
if (qtv->sourcesock != INVALID_SOCKET)
{
int err;
err = qerrno;
if (qerrno)
Sys_Printf(qtv->cluster, "Error: source socket error %i\n", qerrno);
else
Sys_Printf(qtv->cluster, "Error: server disconnected\n");
closesocket(qtv->sourcesock);
qtv->sourcesock = INVALID_SOCKET;
}