diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index bffbcebd729077018f5b1ad41ef34148cd80fdc7..2541dfd37de2abcb9969a41fb9dace000ab37f71 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
NET_MSG_RES_REQUEST = 203;
NET_MSG_RES_RESPONSE = 204;
+ // chunked file transfers
+ // it goes this way:
+ // client requests file (FILE_REQUEST)
+ // server sends file header info (FILE_HEADER)
+ // client acks chunk -1 (CHUNK_ACK) to initiate transfer, or cancels (FILE_CANCEL)
+ // server start sending data chunks (one at a time, waiting for an ACK for each one)
+ // when client acks the last chunk, transfer is complete
+ // this scheme sux, of course; we can do better by spamming with unreliable unsequenced packets,
+ // and use client acks to drive server sends, but meh... let's do it this way first, and
+ // we can improve it later.
+
+ // client: request a file
+ NET_MSG_FILE_REQUEST = 210;
+ // server: file info response
+ NET_MSG_FILE_HEADER = 211;
+ // client: request transfer cancellation
+ // server: something went wrong, transfer cancelled, bomb out
+ NET_MSG_FILE_CANCEL = 212;
+ // server: file chunk data
+ NET_MSG_FILE_CHUNK_DATA = 213;
+ // client: file chunk ack
+ NET_MSG_FILE_CHUNK_ACK = 214;
+
+
NET_CHAT_SYSTEM = 0;
NET_CHAT_PLAYER = 1;
NET_CHAT_TEAM = 2;
procedure MC_SEND_MapRequest();
procedure MC_SEND_ResRequest(const resName: AnsiString);
+
type
TExternalResourceInfo = record
Name: string[255];
function MapDataFromMsgStream(msgStream: TMemoryStream):TMapDataMsg;
function ResDataFromMsgStream(msgStream: TMemoryStream):TResDataMsg;
+function IsValidFileName(const S: String): Boolean;
+function IsValidFilePath(const S: String): Boolean;
+
implementation
uses
begin
MH_SEND_GameEvent(NET_EV_LMS_WARMUP, (gLMSRespawnTime - gTime) div 1000, 'N', ID);
end;
+
+ g_Net_Flush();
end;
procedure MH_SEND_Info(ID: Byte);
MPlaying := M.ReadByte() <> 0;
MPos := M.ReadLongWord();
MPaused := M.ReadByte() <> 0;
+ MPos := MPos+1; //k8: stfu, fpc!
if MPlaying then
begin
procedure MH_RECV_MapRequest(C: pTNetClient; var M: TMsg);
var
- payload: AByte;
peer: pENetPeer;
+ payload: AByte;
mapDataMsg: TMapDataMsg;
begin
e_WriteLog('NET: Received map request from ' +
DecodeIPV4(C^.Peer.address.host), TMsgType.Notify);
+ (*
+ omsg.Alloc(NET_BUFSIZE);
+ try
+ omsg.Clear();
+ dfn := findDiskWad(MapsDir+gGameSettings.WAD);
+ if (dfn = '') then dfn := '!wad_not_found!.wad'; //FIXME
+ md5 := MD5File(dfn);
+ st := openDiskFileRO(dfn);
+ if not assigned(st) then exit; //wtf?!
+ size := st.size;
+ st.Free;
+ // packet type
+ omsg.Write(Byte({NTF_SERVER_MAP_INFO}NET_MSG_MAP_RESPONSE));
+ // map wad name
+ omsg.Write(gGameSettings.WAD);
+ // map wad md5
+ omsg.Write(md5);
+ // map wad size
+ omsg.Write(size);
+ // number of external resources for map
+ omsg.Write(LongInt(gExternalResources.Count));
+ // external resource names
+ for f := 0 to gExternalResources.Count-1 do
+ begin
+ omsg.Write(ExtractFileName(gExternalResources[f])); // GameDir+'/wads/'+ResList.Strings[i]
+ end;
+ // send packet
+ pkt := enet_packet_create(omsg.Data, omsg.CurSize, ENET_PACKET_FLAG_RELIABLE);
+ if not Assigned(pkt) then exit;
+ peer := NetClients[C^.ID].Peer;
+ if (enet_peer_send(Peer, NET_CHAN_DOWNLOAD_EX, pkt) <> 0) then exit;
+ finally
+ omsg.Free();
+ end;
+ *)
mapDataMsg := CreateMapDataMsg(MapsDir + gGameSettings.WAD, gExternalResources);
peer := NetClients[C^.ID].Peer;
end;
end;
+
end.