diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index eaf35fad6aadc41d2be339ff12a22c1a9c06a0c1..2e00600ae3ffea0f7dc03ddbe2655724718bba28 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
BANLIST_FILENAME = 'banlist.txt';
NETDUMP_FILENAME = 'netdump';
- {$IFDEF FREEBSD}
+ {$IF DEFINED(FREEBSD) OR DEFINED(DARWIN)}
NilThreadId = nil;
{$ELSE}
NilThreadId = 0;
NetPongSock: ENetSocket = ENET_SOCKET_NULL;
NetUseMaster: Boolean = True;
- NetSlistAddr: ENetAddress;
NetSlistIP: string = 'mpms.doom2d.org';
NetSlistPort: Word = 25665;
+ NetSlistList: string = 'deadsoftware.ru:25665';
NetClientIP: string = '127.0.0.1';
NetClientPort: Word = 25666;
@@ -244,12 +244,22 @@ function g_Net_RequestResFileInfo (resIndex: LongInt; out tf: TNetFileTransfer):
function g_Net_AbortResTransfer (var tf: TNetFileTransfer): Boolean;
function g_Net_ReceiveResourceFile (resIndex: LongInt; var tf: TNetFileTransfer; strm: TStream): Integer;
+function g_Net_IsNetworkAvailable (): Boolean;
+procedure g_Net_InitLowLevel ();
+procedure g_Net_DeinitLowLevel ();
+
implementation
+// *enet_host_service()*
+// fuck! https://www.mail-archive.com/enet-discuss@cubik.org/msg00852.html
+// tl;dr: on shitdows, we can get -1 sometimes, and it is *NOT* a failure.
+// thank you, enet. let's ignore failures altogether then.
+
uses
SysUtils,
- e_input, g_nethandler, g_netmsg, g_netmaster, g_player, g_window, g_console,
+ e_input, e_res,
+ g_nethandler, g_netmsg, g_netmaster, g_player, g_window, g_console,
g_main, g_game, g_language, g_weapons, utils, ctypes, g_system,
g_map;
FILE_CHUNK_SIZE = 8192;
var
+ enet_init_success: Boolean = false;
g_Net_DownloadTimeout: Single;
trans_omsg: TMsg;
+function g_Net_IsNetworkAvailable (): Boolean;
+begin
+ result := enet_init_success;
+end;
+
+procedure g_Net_InitLowLevel ();
+begin
+ if enet_init_success then raise Exception.Create('wuta?!');
+ enet_init_success := (enet_initialize() = 0);
+end;
+
+procedure g_Net_DeinitLowLevel ();
+begin
+ if enet_init_success then
+ begin
+ enet_deinitialize();
+ enet_init_success := false;
+ end;
+end;
+
+
//**************************************************************************
//
// SERVICE FUNCTIONS
e_LogWritefln('disconnected client #%d due to file transfer error', [nc.ID], TMsgType.Warning);
enet_peer_disconnect(nc.Peer, NET_DISC_FILE_TIMEOUT);
clearNetClientTransfers(nc);
+ g_Net_Slist_ServerPlayerLeaves();
end;
killClientByFT(nc^);
exit;
end;
- if (ridx < 0) then fname := MapsDir+gGameSettings.WAD else fname := {GameDir+'/wads/'+}gExternalResources[ridx].diskName;
+ if (ridx < 0) then fname := gGameSettings.WAD else fname := gExternalResources[ridx].diskName;
if (length(fname) = 0) then
begin
e_WriteLog('Invalid filename: '+fname, TMsgType.Warning);
exit;
end;
tf.diskName := findDiskWad(fname);
- //if (length(tf.diskName) = 0) then tf.diskName := findDiskWad(GameDir+'/wads/'+fname);
if (length(tf.diskName) = 0) then
begin
e_LogWritefln('NETWORK: file "%s" not found!', [fname], TMsgType.Fatal);
begin
e_LogWritefln('client #%d requested map info', [nc.ID]);
trans_omsg.Clear();
- dfn := findDiskWad(MapsDir+gGameSettings.WAD);
+ dfn := findDiskWad(gGameSettings.WAD);
if (dfn = '') then dfn := '!wad_not_found!.wad'; //FIXME
//md5 := MD5File(dfn);
md5 := gWADHash;
ett := getNewTimeoutEnd();
repeat
status := enet_host_service(NetHost, @ev, 300);
+ {
if (status < 0) then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CONN] + ' network error', True);
Result := -1;
exit;
end;
- if (status = 0) then
+ }
+ if (status <= 0) then
begin
// check for timeout
ct := GetTimerMS();
ett := getNewTimeoutEnd();
repeat
status := enet_host_service(NetHost, @ev, 300);
+ {
if (status < 0) then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CONN] + ' network error', True);
Result := -1;
exit;
end;
- if (status = 0) then
+ }
+ if (status <= 0) then
begin
// check for timeout
ct := GetTimerMS();
repeat
//stx := -GetTimerMS();
status := enet_host_service(NetHost, @ev, 300);
+ {
if (status < 0) then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CONN] + ' network error', True);
Result := -1;
exit;
end;
- if (status = 0) then
+ }
+ if (status <= 0) then
begin
// check for timeout
ct := GetTimerMS();
Result := N;
end;
+
function g_Net_Init(): Boolean;
var
F: TextFile;
IPstr: string;
IP: LongWord;
+ path: AnsiString;
begin
NetIn.Clear();
NetOut.Clear();
NetPlrUID2 := -1;
NetAddr.port := 25666;
SetLength(NetBannedHosts, 0);
- if FileExists(DataDir + BANLIST_FILENAME) then
+ path := BANLIST_FILENAME;
+ if e_FindResource(DataDirs, path) = true then
begin
- Assign(F, DataDir + BANLIST_FILENAME);
+ Assign(F, path);
Reset(F);
while not EOF(F) do
begin
g_Net_SaveBanList();
end;
- Result := (enet_initialize() = 0);
+ //Result := (enet_initialize() = 0);
+ Result := enet_init_success;
end;
procedure g_Net_Flush();
NetPeer := nil;
NetHost := nil;
- g_Net_Slist_Disconnect(false); // do not spam console
+ g_Net_Slist_ServerClosed();
NetMyID := -1;
NetPlrUID1 := -1;
NetPlrUID2 := -1;
begin
g_Net_Cleanup();
- enet_deinitialize();
+ //enet_deinitialize();
NetInitDone := False;
end;
end;
clearNetClients(false); // don't clear array
- if (g_Net_Slist_IsConnectionActive) then g_Net_Slist_Disconnect;
+ g_Net_Slist_ServerClosed();
if NetPongSock <> ENET_SOCKET_NULL then
enet_socket_destroy(NetPongSock);
NetOut.Write(Byte(Ord('F')));
NetOut.Write(NetPort);
NetOut.Write(ClTime);
- g_Net_Slist_WriteInfo();
+ TMasterHost.writeInfo(NetOut);
NPl := 0;
if gPlayer1 <> nil then Inc(NPl);
if gPlayer2 <> nil then Inc(NPl);
IP := '';
Result := 0;
- if NetUseMaster then g_Net_Slist_Check;
- g_Net_Host_CheckPings;
+ if NetUseMaster then g_Net_Slist_Pulse();
+ g_Net_Host_CheckPings();
while (enet_host_service(NetHost, @NetEvent, 0) > 0) do
begin
g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_MSG_HOST_DISC], [ID]));
Dec(NetClientCount);
- if NetUseMaster then g_Net_Slist_Update;
+ if NetUseMaster then g_Net_Slist_ServerPlayerLeaves();
end;
end;
end;
var
F: TextFile;
I: Integer;
+ path: AnsiString;
begin
- Assign(F, DataDir + BANLIST_FILENAME);
- Rewrite(F);
- if NetBannedHosts <> nil then
- for I := 0 to High(NetBannedHosts) do
- if NetBannedHosts[I].Perm and (NetBannedHosts[I].IP > 0) then
- Writeln(F, IpToStr(NetBannedHosts[I].IP));
- CloseFile(F);
+ path := e_GetWriteableDir(DataDirs);
+ if path <> '' then
+ begin
+ path := e_CatPath(path, BANLIST_FILENAME);
+ Assign(F, path);
+ Rewrite(F);
+ if NetBannedHosts <> nil then
+ for I := 0 to High(NetBannedHosts) do
+ if NetBannedHosts[I].Perm and (NetBannedHosts[I].IP > 0) then
+ Writeln(F, IpToStr(NetBannedHosts[I].IP));
+ CloseFile(F)
+ end
end;
procedure g_Net_DumpStart();
begin
if NetMode = NET_SERVER then
- NetDumpFile := createDiskFile(NETDUMP_FILENAME + '_server')
+ NetDumpFile := e_CreateResource(LogDirs, NETDUMP_FILENAME + '_server')
else
- NetDumpFile := createDiskFile(NETDUMP_FILENAME + '_client');
+ NetDumpFile := e_CreateResource(LogDirs, NETDUMP_FILENAME + '_client');
end;
procedure g_Net_DumpSendBuffer();