Progress on file transfers (class for receiving files, FileSender can transfer multiple files to the same recipient simultaneously)
This commit is contained in:
@@ -45,6 +45,8 @@ namespace Barotrauma.Networking
|
||||
|
||||
private ServerEntityEventManager entityEventManager;
|
||||
|
||||
private FileSender fileSender;
|
||||
|
||||
public override List<Client> ConnectedClients
|
||||
{
|
||||
get
|
||||
@@ -132,6 +134,8 @@ namespace Barotrauma.Networking
|
||||
|
||||
entityEventManager = new ServerEntityEventManager(this);
|
||||
|
||||
fileSender = new FileSender(this);
|
||||
|
||||
whitelist = new WhiteList();
|
||||
banList = new BanList();
|
||||
|
||||
@@ -341,7 +345,6 @@ namespace Barotrauma.Networking
|
||||
if (settingsFrame != null) settingsFrame.Update(deltaTime);
|
||||
if (log.LogFrame != null) log.LogFrame.Update(deltaTime);
|
||||
|
||||
|
||||
if (!started) return;
|
||||
|
||||
base.Update(deltaTime);
|
||||
@@ -355,7 +358,9 @@ namespace Barotrauma.Networking
|
||||
}
|
||||
}
|
||||
|
||||
unauthenticatedClients.RemoveAll(uc => uc.AuthTimer <= 0.0f);
|
||||
unauthenticatedClients.RemoveAll(uc => uc.AuthTimer <= 0.0f);
|
||||
|
||||
fileSender.Update(deltaTime);
|
||||
|
||||
if (gameStarted)
|
||||
{
|
||||
@@ -550,6 +555,12 @@ namespace Barotrauma.Networking
|
||||
case ClientPacketHeader.SERVER_COMMAND:
|
||||
ClientReadServerCommand(inc);
|
||||
break;
|
||||
case ClientPacketHeader.FILE_REQUEST:
|
||||
if (AllowFileTransfers)
|
||||
{
|
||||
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1902,7 +1913,7 @@ namespace Barotrauma.Networking
|
||||
Log("Shutting down server...", Color.Cyan);
|
||||
log.Save();
|
||||
}
|
||||
|
||||
|
||||
server.Shutdown("The server has been shut down");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user