nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-26 13:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

I guess all of these are to be changed too, please confirm.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2779 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2007-11-04 08:21:19 +00:00
parent 93c94f2b61
commit 239f0c9d38
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
engine/server/sv_mvd.c
View file

@ -162,7 +162,7 @@ void SV_MVD_RunPendingConnections(void)
if (p->nextdest->error) if (p->nextdest->error)
{ {
np = p->nextdest->nextdest; np = p->nextdest->nextdest;
if (p->nextdest->socket != -1) if (p->nextdest->socket != INVALID_SOCKET)
closesocket(p->nextdest->socket); closesocket(p->nextdest->socket);
Z_Free(p->nextdest); Z_Free(p->nextdest);
p->nextdest = np; p->nextdest = np;
@ -465,7 +465,7 @@ void SV_MVD_RunPendingConnections(void)
else else
{ {
SV_MVD_Record(SV_InitStream(p->socket)); SV_MVD_Record(SV_InitStream(p->socket));
p->socket = -1; //so it's not cleared wrongly. p->socket = INVALID_SOCKET; //so it's not cleared wrongly.
} }
p->error = true; p->error = true;
} }
@ -482,7 +482,7 @@ void SV_MVD_RunPendingConnections(void)
dst = SV_InitStream(p->socket); dst = SV_InitStream(p->socket);
dst->droponmapchange = p->isreverse; dst->droponmapchange = p->isreverse;
SV_MVD_Record(dst); SV_MVD_Record(dst);
p->socket = -1; //so it's not cleared wrongly. p->socket = INVALID_SOCKET; //so it's not cleared wrongly.
} }
else else
{ {
@ -2089,27 +2089,27 @@ void SV_MVD_QTVReverse_f (void)
local.sin_addr.s_addr = INADDR_ANY; local.sin_addr.s_addr = INADDR_ANY;
local.sin_port = 0; local.sin_port = 0;
if ((sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) if ((sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET)
{ {
Con_Printf ("qtvreverse: socket: %s\n", strerror(qerrno)); Con_Printf ("qtvreverse: socket: %s\n", strerror(qerrno));
return; return;
} }
if( bind (sock, (void *)&local, sizeof(local)) == -1) if( bind (sock, (void *)&local, sizeof(local)) == INVALID_SOCKET)
{ {
closesocket(sock); closesocket(sock);
Con_Printf ("qtvreverse: bind: %s\n", strerror(qerrno)); Con_Printf ("qtvreverse: bind: %s\n", strerror(qerrno));
return; return;
} }
if (connect(sock, (void*)&remote, sizeof(remote)) == -1) if (connect(sock, (void*)&remote, sizeof(remote)) == INVALID_SOCKET)
{ {
closesocket(sock); closesocket(sock);
Con_Printf ("qtvreverse: connect: %s\n", strerror(qerrno)); Con_Printf ("qtvreverse: connect: %s\n", strerror(qerrno));
return; return;
} }
if (ioctlsocket (sock, FIONBIO, &nonblocking) == -1) if (ioctlsocket (sock, FIONBIO, &nonblocking) == INVALID_SOCKET)
{ {
closesocket(sock); closesocket(sock);
Con_Printf ("qtvreverse: ioctl FIONBIO: %s\n", strerror(qerrno)); Con_Printf ("qtvreverse: ioctl FIONBIO: %s\n", strerror(qerrno));
@ -2119,7 +2119,7 @@ void SV_MVD_QTVReverse_f (void)
data = "QTV\n" data = "QTV\n"
"REVERSE\n" "REVERSE\n"
"\n"; "\n";
if (send(sock, data, strlen(data), 0) == -1) if (send(sock, data, strlen(data), 0) == INVALID_SOCKET)
{ {
closesocket(sock); closesocket(sock);
Con_Printf ("qtvreverse: send: %s\n", strerror(qerrno)); Con_Printf ("qtvreverse: send: %s\n", strerror(qerrno));
@ -2357,17 +2357,17 @@ int MVD_StreamStartListening(int port)
if ((sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) if ((sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP)) == INVALID_SOCKET)
{ {
Sys_Error ("MVD_StreamStartListening: socket:", strerror(qerrno)); Sys_Error ("MVD_StreamStartListening: socket:", strerror(qerrno));
} }
if (ioctlsocket (sock, FIONBIO, &nonblocking) == -1) if (ioctlsocket (sock, FIONBIO, &nonblocking) == INVALID_SOCKET)
{ {
Sys_Error ("FTP_TCP_OpenSocket: ioctl FIONBIO:", strerror(qerrno)); Sys_Error ("FTP_TCP_OpenSocket: ioctl FIONBIO:", strerror(qerrno));
} }
if( bind (sock, (void *)&address, sizeof(address)) == -1) if( bind (sock, (void *)&address, sizeof(address)) == INVALID_SOCKET)
{ {
closesocket(sock); closesocket(sock);
return INVALID_SOCKET; return INVALID_SOCKET;