fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-03 06:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

from uhexen2:

Browse source 
* net_dgrm.c (Datagram_Init): Datagram_Init() must return -1 if it couldn't
initialize any drivers.
* net_main.c (): dedicated servers must error out if no network drivers are
available.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@203 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-06-20 15:33:45 +00:00
parent 09c70daa38
commit c418e8e05f
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Quake/net_dgrm.c
View file

@ -792,8 +792,7 @@ JustDoIt:
int Datagram_Init (void) int Datagram_Init (void)
{ {
int i; int i, csock, num_inited;
int csock;
myDriverLevel = net_driverlevel; myDriverLevel = net_driverlevel;
Cmd_AddCommand ("net_stats", NET_Stats_f); Cmd_AddCommand ("net_stats", NET_Stats_f);
@ -801,6 +800,7 @@ int Datagram_Init (void)
if (COM_CheckParm("-nolan")) if (COM_CheckParm("-nolan"))
return -1; return -1;
num_inited = 0;
for (i = 0; i < net_numlandrivers; i++) for (i = 0; i < net_numlandrivers; i++)
{ {
csock = net_landrivers[i].Init (); csock = net_landrivers[i].Init ();
@ -808,8 +808,12 @@ int Datagram_Init (void)
continue; continue;
net_landrivers[i].initialized = true; net_landrivers[i].initialized = true;
net_landrivers[i].controlSock = csock; net_landrivers[i].controlSock = csock;
num_inited++;
} }
if (num_inited == 0)
return -1;
return 0; return 0;
} }

7
Quake/net_main.c
View file

@ -726,7 +726,6 @@ void NET_Init (void)
i = COM_CheckParm ("-udpport"); i = COM_CheckParm ("-udpport");
if (!i) if (!i)
i = COM_CheckParm ("-ipxport"); i = COM_CheckParm ("-ipxport");
if (i) if (i)
{ {
if (i < com_argc-1) if (i < com_argc-1)
@ -772,17 +771,21 @@ void NET_Init (void)
Cmd_AddCommand ("port", NET_Port_f); Cmd_AddCommand ("port", NET_Port_f);
// initialize all the drivers // initialize all the drivers
for (net_driverlevel=0 ; net_driverlevel<net_numdrivers ; net_driverlevel++) for (i = net_driverlevel = 0; net_driverlevel < net_numdrivers; net_driverlevel++)
{ {
controlSocket = net_drivers[net_driverlevel].Init(); controlSocket = net_drivers[net_driverlevel].Init();
if (controlSocket == -1) if (controlSocket == -1)
continue; continue;
i++;
net_drivers[net_driverlevel].initialized = true; net_drivers[net_driverlevel].initialized = true;
net_drivers[net_driverlevel].controlSock = controlSocket; net_drivers[net_driverlevel].controlSock = controlSocket;
if (listening) if (listening)
net_drivers[net_driverlevel].Listen (true); net_drivers[net_driverlevel].Listen (true);
} }
if (i == 0 && cls.state == ca_dedicated)
Sys_Error("Network not available!");
if (*my_ipx_address) if (*my_ipx_address)
Con_DPrintf("IPX address %s\n", my_ipx_address); Con_DPrintf("IPX address %s\n", my_ipx_address);
if (*my_tcpip_address) if (*my_tcpip_address)