index e24bed7accc9c70301965d3614103043016e528e..393c4e572fc5191271ce324832860541376bfb79 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
TMasterHost = record
public
hostName: AnsiString;
- hostPort: Word;
public
peer: pENetPeer;
slMOTD: AnsiString;
slUrgent: AnsiString;
slReadUrgent: Boolean;
+ // temporary mark
+ justAdded: Boolean;
private
netmsg: TMsg;
public
- constructor Create (hostandport: AnsiString);
+ constructor Create (var ea: ENetAddress);
procedure clear ();
- function setAddress (hostandport: AnsiString): Boolean;
-
- function isSameAddress (hostandport: AnsiString): Boolean;
+ function setAddress (var ea: ENetAddress; hostStr: AnsiString): Boolean;
function isValid (): Boolean;
function isAlive (): Boolean; // not disconnected
slUrgent: AnsiString = '';
-procedure g_Net_Slist_Set (IP: AnsiString; Port: Word);
+procedure g_Net_Slist_Set (IP: AnsiString; Port: Word; list: AnsiString='');
function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean;
// make this server private
// this server renamed (or password mode changed, or other params changed)
procedure g_Net_Slist_ServerRenamed ();
+// non-zero timeout ignores current status (used to fetch server list)
procedure g_Net_Slist_Pulse (timeout: Integer=0);
procedure g_Net_Slist_ShutdownAll ();
uses
e_input, e_graphics, e_log, g_window, g_net, g_console,
g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic,
- wadreader, g_system, utils;
+ wadreader, g_system, utils, hashtable;
+
// ////////////////////////////////////////////////////////////////////////// //
var
Inc(activeCount);
if (mlist[f].isConnected() and mlist[f].updateSent) then
begin
- writeln('unregistering from ', f);
+ writeln('unregistering from [', mlist[f].hostName, ']');
mlist[f].remove();
end;
//mlist[f].disconnect(false);
// DisconnectAll
//
//==========================================================================
-procedure DisconnectAll ();
+procedure DisconnectAll (forced: Boolean=false);
var
f: Integer;
begin
for f := 0 to High(mlist) do
begin
- if (mlist[f].isAlive()) then mlist[f].disconnect(false);
+ if (mlist[f].isAlive()) then mlist[f].disconnect(forced);
end;
end;
// TMasterHost.Create
//
//==========================================================================
-constructor TMasterHost.Create (hostandport: AnsiString);
+constructor TMasterHost.Create (var ea: ENetAddress);
begin
peer := nil;
NetHostConnected := false;
updateSent := false;
lastUpdateTime := 0;
hostName := '';
- hostPort := 25665;
+ ZeroMemory(@enetAddr, sizeof(enetAddr));
SetLength(srvAnswer, 0);
srvAnswered := 0;
slMOTD := '';
slUrgent := '';
slReadUrgent := true;
netmsg.Alloc(NET_BUFSIZE);
- setAddress(hostandport);
+ setAddress(ea, '');
end;
updateSent := false; // do not send 'remove'
disconnect(true);
hostName := '';
- hostPort := 25665;
netmsg.Free();
SetLength(srvAnswer, 0);
srvAnswered := 0;
slMOTD := '';
slUrgent := '';
slReadUrgent := true;
-end;
-
-
-//==========================================================================
-//
-// TMasterHost.isSameAddress
-//
-//==========================================================================
-function TMasterHost.isSameAddress (hostandport: AnsiString): Boolean;
-var
- cp, pp: Integer;
- hn: AnsiString;
-begin
- result := false;
- if not isValid() then exit;
- hostandport := Trim(hostandport);
- if (length(hostandport) = 0) then exit;
- hn := hostandport;
- cp := Pos(':', hostandport);
- if (cp > 0) then
- begin
- hn := Copy(hostandport, 1, cp-1);
- Delete(hostandport, 1, cp);
- if (length(hostandport) > 0) then
- begin
- try
- pp := StrToInt(hostandport);
- except
- pp := -1;
- end;
- end;
- end
- else
- begin
- pp := 25665;
- end;
- result := strEquCI1251(hn, hostName) and (hostPort = pp);
+ ZeroMemory(@enetAddr, sizeof(enetAddr));
end;
// TMasterHost.setAddress
//
//==========================================================================
-function TMasterHost.setAddress (hostandport: AnsiString): Boolean;
-var
- cp, pp: Integer;
+function TMasterHost.setAddress (var ea: ENetAddress; hostStr: AnsiString): Boolean;
begin
result := false;
SetLength(srvAnswer, 0);
updateSent := false; // do not send 'remove'
disconnect(true);
hostName := '';
- hostPort := 25665;
if (not g_Net_IsNetworkAvailable()) then exit;
- hostandport := Trim(hostandport);
- if (length(hostandport) > 0) then
- begin
- hostName := hostandport;
- cp := Pos(':', hostandport);
- if (cp > 0) then
- begin
- hostName := Copy(hostandport, 1, cp-1);
- Delete(hostandport, 1, cp);
- if (length(hostandport) > 0) then
- begin
- try
- pp := StrToInt(hostandport);
- except
- pp := -1;
- end;
- if (pp > 0) and (pp < 65536) then hostPort := pp else hostPort := 0;
- end;
- end;
- end;
+ enetAddr := ea;
+ if (enetAddr.host = 0) or (enetAddr.port = 0) then exit;
- if not isValid() then exit;
-
- if (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then
- begin
- writeln('SHIT!');
- hostName := '';
- hostPort := 0;
- end;
- enetAddr.Port := hostPort;
+ if (length(hostStr) > 0) then hostName := hostStr else hostName := IntToStr(enetAddr.host)+':'+IntToStr(ea.port);
result := isValid();
- //writeln('*********************: ', hostandport, ' [', hostName, ':', hostPort, '] ', result);
end;
//==========================================================================
function TMasterHost.isValid (): Boolean;
begin
- result := (length(hostName) > 0) and (hostPort > 0);
+ result := (enetAddr.host <> 0) and (enetAddr.port <> 0);
end;
if not isAlive() then exit;
if NetHostConnected then exit;
NetHostConnected := true;
- e_LogWritefln('connected to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+ e_LogWritefln('connected to master at [%s]', [hostName], TMsgType.Notify);
+ //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN], [mlist[f].hostName]));
end;
procedure TMasterHost.disconnectedEvent ();
begin
if not isAlive() then exit;
- e_LogWritefln('disconnected from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+ e_LogWritefln('disconnected from master at [%s]', [hostName], TMsgType.Notify);
disconnect(true);
- //if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
+ //if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName]));
end;
f: Integer;
s: AnsiString;
begin
- e_LogWritefln('received packed from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+ e_LogWritefln('received packed from master at [%s]', [hostName], TMsgType.Notify);
if not msg.Init(pkt^.data, pkt^.dataLength, True) then exit;
// packet type
MID := msg.ReadByte();
if (MID <> NET_MMSG_GET) then exit;
- e_LogWritefln('received list packet from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+ e_LogWritefln('received list packet from master at [%s]', [hostName], TMsgType.Notify);
SetLength(srvAnswer, 0);
if (srvAnswered > 0) then Inc(srvAnswered);
slMOTD := '';
slReadUrgent := true;
// number of items
Cnt := msg.ReadByte();
- g_Console_Add(_lc[I_NET_MSG]+Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True);
+ //g_Console_Add(_lc[I_NET_MSG]+Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt, hostName]), True);
+ e_LogWritefln('got %u server(s) from master at [%s]', [Cnt, hostName], TMsgType.Notify);
if (Cnt > 0) then
begin
SetLength(srvAnswer, Cnt);
if (msg.ReadCount < msg.CurSize) then
begin
slMOTD := b_Text_Format(msg.ReadString());
+ if (slMOTD <> '') then e_LogWritefln('got MOTD from master at [%s]: %s', [hostName, slMOTD], TMsgType.Notify);
s := b_Text_Format(msg.ReadString());
// check if the message has updated and the user has to read it again
if (slUrgent <> s) then slReadUrgent := false;
slUrgent := s;
+ if (s <> '') then e_LogWritefln('got urgent from master at [%s]: %s', [hostName, s], TMsgType.Notify);
end;
end;
end;
begin
if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then
begin
- e_LogWritefln('failed to connect to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+ e_LogWritefln('failed to connect to master at [%s]', [hostName], TMsgType.Notify);
// do not spam with error messages, it looks like the master is down
//g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
enet_peer_disconnect(peer, 0);
// main pulse will take care of the rest
+ NetHostConReqTime := -1;
end;
exit;
end;
//updateSent := false;
lastUpdateTime := 0;
//lastConnectTime := 0;
- //if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
+ //if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName]));
end;
end;
NetHostConReqTime := lastConnectTime;
- e_LogWritefln('connecting to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+ e_LogWritefln('connecting to master at [%s]', [hostName], TMsgType.Notify);
end;
try
netmsg.Write(Byte(NET_MMSG_UPD));
netmsg.Write(NetAddr.port);
+ //writeln(formatstrf('%08x', [NetAddr.host]), ' : ', NetAddr.host);
writeInfo(netmsg);
begin
if (enet_peer_send(peer, NET_MCHAN_UPD, pkt) = 0) then
begin
- e_LogWritefln('sent update to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+ e_LogWritefln('sent update to master at [%s]', [hostName], TMsgType.Notify);
NetUpdatePending := false;
updateSent := true;
end;
// other functions
//
//**************************************************************************
+type
+ THashStrDWord = specialize THashBase<AnsiString, LongWord, THashKeyStrAnsiCI>;
-procedure g_Net_Slist_Set (IP: AnsiString; Port: Word);
+var
+ knownHosts: THashStrDWord = nil;
+
+
+//==========================================================================
+//
+// parseAddressPort
+//
+//==========================================================================
+function parseAddressPort (var ea: ENetAddress; hostandport: AnsiString): Boolean;
+var
+ cp, port: Integer;
+ hostName: AnsiString;
+ ip: LongWord;
+begin
+ result := false;
+ if (not g_Net_IsNetworkAvailable()) then exit;
+
+ hostandport := Trim(hostandport);
+ if (length(hostandport) = 0) then exit;
+
+ hostName := hostandport;
+ port := 25665;
+
+ cp := Pos(':', hostandport);
+ if (cp > 0) then
+ begin
+ hostName := Trim(Copy(hostandport, 1, cp-1));
+ Delete(hostandport, 1, cp);
+ hostandport := Trim(hostandport);
+ if (length(hostandport) > 0) then
+ begin
+ try
+ port := StrToInt(hostandport);
+ except
+ port := -1;
+ end;
+ end;
+ end;
+
+ if (length(hostName) = 0) then exit;
+ if (port < 1) or (port > 65535) then exit;
+
+ if not assigned(knownHosts) then knownHosts := THashStrDWord.Create();
+
+ if knownHosts.get(hostName, ip) then
+ begin
+ ea.host := ip;
+ end
+ else
+ begin
+ if (enet_address_set_host(@ea, PChar(Addr(hostName[1]))) <> 0) then
+ begin
+ knownHosts.put(hostName, 0);
+ exit;
+ end;
+ knownHosts.put(hostName, ea.host);
+ end;
+ ea.Port := port;
+ result := true;
+end;
+
+
+//==========================================================================
+//
+// addMasterRecord
+//
+//==========================================================================
+procedure addMasterRecord (var ea: ENetAddress; sa: AnsiString);
var
f: Integer;
+ freeIdx: Integer;
+begin
+ freeIdx := -1;
+ for f := 0 to High(mlist) do
+ begin
+ if (mlist[f].enetAddr.host = ea.host) and (mlist[f].enetAddr.port = ea.port) then
+ begin
+ mlist[f].justAdded := true;
+ exit;
+ end;
+ if (freeIdx < 0) and (not mlist[f].isValid()) then freeIdx := f;
+ end;
+ if (freeIdx < 0) then
+ begin
+ freeIdx := length(mlist);
+ SetLength(mlist, freeIdx+1);
+ mlist[freeIdx].Create(ea);
+ end;
+ mlist[freeIdx].justAdded := true;
+ mlist[freeIdx].setAddress(ea, sa);
+ e_LogWritefln('added masterserver with address [%s]', [sa], TMsgType.Notify);
+end;
+
+
+//==========================================================================
+//
+// g_Net_Slist_Set
+//
+//==========================================================================
+procedure g_Net_Slist_Set (IP: AnsiString; Port: Word; list: AnsiString='');
+var
+ f, dest: Integer;
sa: AnsiString;
+ ea: ENetAddress;
+ pp: Integer;
begin
if (not g_Net_IsNetworkAvailable()) then exit;
+
+ for f := 0 to High(mlist) do mlist[f].justAdded := false;
+
IP := Trim(IP);
- if (length(IP) = 0) or (Port = 0) then exit;
- sa := IP+':'+IntToStr(Port);
- for f := 0 to High(mlist) do if (mlist[f].isSameAddress(sa)) then exit;
- SetLength(mlist, length(mlist)+1);
- mlist[High(mlist)].Create(sa);
- mlist[High(mlist)].setAddress(sa);
- e_LogWritefln('Masterserver address set to [%s:%u]', [IP, Port], TMsgType.Notify);
+ if (length(IP) > 0) and (Port > 0) then
+ begin
+ sa := IP+':'+IntToStr(Port);
+ if parseAddressPort(ea, sa) then addMasterRecord(ea, sa);
+ end;
+
+ list := Trim(list);
+ //writeln('list=[', list, ']');
+ while (length(list) > 0) do
+ begin
+ pp := Pos(',', list);
+ if (pp < 1) then pp := length(list)+1;
+ sa := Trim(Copy(list, 1, pp-1));
+ Delete(list, 1, pp);
+ //writeln(' sa=[', sa, ']');
+ if (length(sa) > 0) and parseAddressPort(ea, sa) then addMasterRecord(ea, sa);
+ end;
+
+ // remove unknown master servers
+ dest := 0;
+ for f := 0 to High(mlist) do
+ begin
+ if (not mlist[f].justAdded) then mlist[f].clear();
+ if (mlist[f].isValid()) then
+ begin
+ if (dest <> f) then mlist[dest] := mlist[f];
+ Inc(dest);
+ end;
+ end;
+ if (dest <> length(mlist)) then SetLength(mlist, dest);
end;
// main pulse
//
//**************************************************************************
+
+//==========================================================================
+//
+// g_Net_Slist_Pulse
+//
+// non-zero timeout ignores current status (used to fetch server list)
+//
+//==========================================================================
procedure g_Net_Slist_Pulse (timeout: Integer=0);
var
f: Integer;
if (NetMHost = nil) then
begin
- NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0);
+ NetMHost := enet_host_create(nil, 64, NET_MCHANS, 1024*1024, 1024*1024);
if (NetMHost = nil) then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True);
if (not mlist[f].isValid()) then continue;
if (not mlist[f].isAlive()) then
begin
- if reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster then
+ if (timeout > 0) or (reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster) then
begin
if (mlist[f].lastConnectTime = 0) or (ct < mlist[f].lastConnectTime) or (ct-mlist[f].lastConnectTime >= 1000*60*5) then
begin
+ e_LogWritefln('reconnecting to master [%s]', [mlist[f].hostName], TMsgType.Notify);
mlist[f].connect();
end;
end;
end
else
begin
- if not reportsEnabled or not g_Game_IsServer() or not g_Game_IsNet() or not NetUseMaster then
+ if (timeout = 0) and (not reportsEnabled or not g_Game_IsServer() or not g_Game_IsNet() or not NetUseMaster) then
begin
- if (mlist[f].isConnected()) and (mlist[f].updateSent) then mlist[f].remove();
+ if (mlist[f].isConnected()) and (mlist[f].updateSent) then
+ begin
+ e_LogWritefln('removing from master [%s]', [mlist[f].hostName], TMsgType.Notify);
+ mlist[f].remove();
+ end;
+ //e_LogWritefln('disconnecting from master [%s]', [mlist[f].hostName], TMsgType.Notify);
mlist[f].disconnect(false);
end;
end;
mlist[f].pulse();
end;
- while true do
+ sres := enet_host_service(NetMHost, @NetMEvent, timeout);
+ while (sres <> 0) do
begin
- sres := enet_host_service(NetMHost, @NetMEvent, timeout);
if (sres < 0) then
begin
g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True);
exit;
end;
- if (sres = 0) then break;
idx := findByPeer(NetMEvent.peer);
if (idx < 0) then
begin
e_LogWriteln('network event from unknown master host. ignored.', TMsgType.Warning);
if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(NetMEvent.packet);
- continue;
- end;
-
- if (NetMEvent.kind = ENET_EVENT_TYPE_CONNECT) then
- begin
- mlist[idx].connectedEvent();
- end
- else if (NetMEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then
- begin
- mlist[idx].disconnectedEvent();
end
- else if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
+ else
begin
- mlist[idx].receivedEvent(NetMEvent.packet);
- enet_packet_destroy(NetMEvent.packet);
+ if (NetMEvent.kind = ENET_EVENT_TYPE_CONNECT) then
+ begin
+ mlist[idx].connectedEvent();
+ end
+ else if (NetMEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then
+ begin
+ mlist[idx].disconnectedEvent();
+ end
+ else if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
+ begin
+ mlist[idx].receivedEvent(NetMEvent.packet);
+ enet_packet_destroy(NetMEvent.packet);
+ end;
end;
+ sres := enet_host_service(NetMHost, @NetMEvent, 0);
end;
end;
g_Net_Slist_Pulse(); // this will create mhost
+ DisconnectAll(true); // forced disconnect
+
NetOut.Clear();
NetOut.Write(Byte(NET_MMSG_GET));
try
e_WriteLog('Fetching serverlist...', TMsgType.Notify);
- g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]);
+ g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_FETCH]);
// wait until all servers connected and answered
stt := GetTimerMS();
while true do
begin
- g_Net_Slist_Pulse(300);
aliveCount := 0;
hasUnanswered := false;
for f := 0 to High(mlist) do
begin
{
- e_LogWritefln(' master #%d: [%s:%u] valid=%d; alive=%d; connected=%d; connecting=%d',
- [f, mlist[f].hostName, mlist[f].hostPort, Integer(mlist[f].isValid()), Integer(mlist[f].isAlive()),
+ e_LogWritefln(' master #%d: [%s] valid=%d; alive=%d; connected=%d; connecting=%d',
+ [f, mlist[f].hostName, Integer(mlist[f].isValid()), Integer(mlist[f].isAlive()),
Integer(mlist[f].isConnected()), Integer(mlist[f].isConnecting())], TMsgType.Notify);
}
if (not mlist[f].isValid()) then continue;
mlist[f].connect();
if (mlist[f].isAlive()) then
begin
+ //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_WCONN], [mlist[f].hostName]));
hasUnanswered := true;
stt := GetTimerMS();
end;
end
else if (mlist[f].isConnected()) then
begin
+ //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN], [mlist[f].hostName]));
if (mlist[f].srvAnswered = 0) then
begin
pkt := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE));
// check for timeout
ct := GetTimerMS();
if (ct < stt) or (ct-stt > 4000) then break;
+ g_Net_Slist_Pulse(300);
end;
if (aliveCount = 0) then