nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-07 07:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed console spam regarding invalid_socket on computers with no ipx support.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1295 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-09-08 02:05:36 +00:00
parent f1fb6ee26b
commit 220edfabf3
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
engine/client/cl_main.c
View file

@ -2063,7 +2063,7 @@ void CL_ReadPackets (void)
continue; continue;
} }
if (net_message.cursize < 8 && cls.demoplayback != DPB_MVD) //MVDs don't have the whole sequence header thing going on if (net_message.cursize < 6 && cls.demoplayback != DPB_MVD) //MVDs don't have the whole sequence header thing going on
{ {
Con_TPrintf (TL_RUNTPACKET,NET_AdrToString(net_from)); Con_TPrintf (TL_RUNTPACKET,NET_AdrToString(net_from));
continue; continue;
@ -2962,6 +2962,8 @@ void Host_Init (quakeparms_t *parms)
Plug_Init(); Plug_Init();
#endif #endif
Masker_SetupSockets();
// Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); // Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
Con_TPrintf (TL_HEAPSIZE, parms->memsize/ (1024*1024.0)); Con_TPrintf (TL_HEAPSIZE, parms->memsize/ (1024*1024.0));
@ -2983,6 +2985,8 @@ void Host_Init (quakeparms_t *parms)
Cbuf_AddText ("bind ~ toggleconsole\n", RESTRICT_LOCAL); //we expect default.cfg to not exist. :( Cbuf_AddText ("bind ~ toggleconsole\n", RESTRICT_LOCAL); //we expect default.cfg to not exist. :(
Cbuf_AddText ("exec default.cfg\n", RESTRICT_LOCAL); Cbuf_AddText ("exec default.cfg\n", RESTRICT_LOCAL);
Cbuf_AddText ("exec config.cfg\n", RESTRICT_LOCAL); Cbuf_AddText ("exec config.cfg\n", RESTRICT_LOCAL);
if (COM_FCheckExists ("q3config.cfg"))
Cbuf_AddText ("exec q3config.cfg\n", RESTRICT_LOCAL);
Cbuf_AddText ("exec autoexec.cfg\n", RESTRICT_LOCAL); Cbuf_AddText ("exec autoexec.cfg\n", RESTRICT_LOCAL);
} }
Cbuf_AddText ("exec fte.cfg\n", RESTRICT_LOCAL); Cbuf_AddText ("exec fte.cfg\n", RESTRICT_LOCAL);
@ -3001,6 +3005,7 @@ void Host_Init (quakeparms_t *parms)
Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to
//assuming they didn't use any waits in thier config (fools) //assuming they didn't use any waits in thier config (fools)
//the configs should be fully loaded. //the configs should be fully loaded.
//so convert the backwards compable commandline parameters in cvar sets. //so convert the backwards compable commandline parameters in cvar sets.

23
engine/client/net_master.c
View file

@ -90,7 +90,9 @@ char slist_keyname[SLIST_MAXKEYS][MAX_INFO_KEY];
int slist_customkeys; int slist_customkeys;
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
#endif
#define POLLUDPSOCKETS 64 //it's big so we can have lots of messages when behind a firewall. Basically if a firewall only allows replys, and only remembers 3 servers per socket, we need this big cos it can take a while for a packet to find a fast optimised route and we might be waiting for a few secs for a reply the first time around. #define POLLUDPSOCKETS 64 //it's big so we can have lots of messages when behind a firewall. Basically if a firewall only allows replys, and only remembers 3 servers per socket, we need this big cos it can take a while for a packet to find a fast optimised route and we might be waiting for a few secs for a reply the first time around.
@ -105,6 +107,15 @@ int lastpollsockIPX;
#define POLLIPXSOCKETS 0 #define POLLIPXSOCKETS 0
#endif #endif
void Masker_SetupSockets(void)
{
int i;
for (i = 0; i < POLLUDPSOCKETS; i++)
pollsocketsUDP[i] = INVALID_SOCKET;
for (i = 0; i < POLLIPXSOCKETS; i++)
pollsocketsIPX[i] = INVALID_SOCKET;
}
void NetadrToSockadr (netadr_t *a, struct sockaddr_qstorage *s); void NetadrToSockadr (netadr_t *a, struct sockaddr_qstorage *s);
@ -671,9 +682,9 @@ void NET_SendPollPacket(int len, void *data, netadr_t to)
lastpollsockIPX++; lastpollsockIPX++;
if (lastpollsockIPX>=POLLIPXSOCKETS) if (lastpollsockIPX>=POLLIPXSOCKETS)
lastpollsockIPX=0; lastpollsockIPX=0;
if (!pollsocketsIPX[lastpollsockIPX]) if (pollsocketsIPX[lastpollsockIPX]==INVALID_SOCKET)
pollsocketsIPX[lastpollsockIPX] = IPX_OpenSocket(PORT_ANY, true); pollsocketsIPX[lastpollsockIPX] = IPX_OpenSocket(PORT_ANY, true);
if (!pollsocketsIPX[lastpollsockIPX]) if (pollsocketsIPX[lastpollsockIPX]==INVALID_SOCKET)
return; //bother return; //bother
ret = sendto (pollsocketsIPX[lastpollsockIPX], data, len, 0, (struct sockaddr *)&addr, sizeof(addr) ); ret = sendto (pollsocketsIPX[lastpollsockIPX], data, len, 0, (struct sockaddr *)&addr, sizeof(addr) );
} }
@ -683,9 +694,9 @@ void NET_SendPollPacket(int len, void *data, netadr_t to)
lastpollsockUDP++; lastpollsockUDP++;
if (lastpollsockUDP>=POLLUDPSOCKETS) if (lastpollsockUDP>=POLLUDPSOCKETS)
lastpollsockUDP=0; lastpollsockUDP=0;
if (!pollsocketsUDP[lastpollsockUDP]) if (pollsocketsUDP[lastpollsockUDP]==INVALID_SOCKET)
pollsocketsUDP[lastpollsockUDP] = UDP_OpenSocket(PORT_ANY, true); pollsocketsUDP[lastpollsockUDP] = UDP_OpenSocket(PORT_ANY, true);
if (!pollsocketsUDP[lastpollsockUDP]) if (pollsocketsUDP[lastpollsockUDP]==INVALID_SOCKET)
return; //bother return; //bother
ret = sendto (pollsocketsUDP[lastpollsockUDP], data, len, 0, (struct sockaddr *)&addr, sizeof(addr) ); ret = sendto (pollsocketsUDP[lastpollsockUDP], data, len, 0, (struct sockaddr *)&addr, sizeof(addr) );
} }
@ -725,7 +736,7 @@ int NET_CheckPollSockets(void)
#endif #endif
usesocket = pollsocketsUDP[sock]; usesocket = pollsocketsUDP[sock];
if (!usesocket) if (usesocket == INVALID_SOCKET)
continue; continue;
fromlen = sizeof(from); fromlen = sizeof(from);
ret = recvfrom (usesocket, (char *)net_message_buffer, sizeof(net_message_buffer), 0, (struct sockaddr *)&from, &fromlen); ret = recvfrom (usesocket, (char *)net_message_buffer, sizeof(net_message_buffer), 0, (struct sockaddr *)&from, &fromlen);