dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix includes in source/network

Browse source 
Make include-what-you-use happy with files in source/network and
fix what needs to be fixed.

Ref: #8086
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2025-07-06 20:15:27 +02:00
parent 41c65b972b
commit 3c1a37985a
No known key found for this signature in database
35 changed files with 316 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/network/FSM.h
View file

@ -18,10 +18,10 @@
#ifndef FSM_H
#define FSM_H
#include <cstddef>
#include <limits>
#include <unordered_map>
constexpr unsigned int FSM_INVALID_STATE{std::numeric_limits<unsigned int>::max()};
/**

7
source/network/NMTCreator.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2020 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -16,7 +16,6 @@
*/
#include "Serialization.h"
#include <vector>
// If included from within the NMT Creation process, perform a pass
#ifdef CREATING_NMT
@ -47,6 +46,8 @@
#ifndef NMT_CREATOR_IMPLEMENT
#include <vector>
/*************************************************************************/
// Pass 1, class definition
#define NMT_CREATOR_PASS_CLASSDEF
@ -131,6 +132,8 @@ public: \
#include "StringConverters.h"
#include <vector>
/*************************************************************************/
// Pass 2, GetSerializedLength
#define NMT_CREATOR_PASS_GETLENGTH

38
source/network/NetClient.cpp
View file

@ -19,30 +19,42 @@
#include "NetClient.h"
#include "NetClientTurnManager.h"
#include "NetEnet.h"
#include "NetMessage.h"
#include "NetProtocol.h"
#include "NetSession.h"
#include "lib/byte_order.h"
#include "lib/debug.h"
#include "lib/external_libraries/enet.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/sysdep/sysdep.h"
#include "lib/status.h"
#include "lib/utf8.h"
#include "lobby/IXmppClient.h"
#include "ps/CConsole.h"
#include "network/NetClientTurnManager.h"
#include "network/NetEnet.h"
#include "network/NetFileTransfer.h"
#include "network/NetMessage.h"
#include "network/NetProtocol.h"
#include "network/NetSession.h"
#include "network/StunClient.h"
#include "ps/CLogger.h"
#include "ps/Compress.h"
#include "ps/CStr.h"
#include "ps/Compress.h"
#include "ps/Game.h"
#include "ps/Hashing.h"
#include "ps/Loader.h"
#include "ps/Profile.h"
#include "ps/Threading.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/JSON.h"
#include "scriptinterface/ScriptInterface.h"
#include "simulation2/Simulation2.h"
#include "network/StunClient.h"
#include "simulation2/system/TurnManager.h"
#include <SDL_timer.h>
#include <algorithm>
#include <functional>
#include <iterator>
#include <js/GCAPI.h>
#include <js/PropertyAndElement.h>
#include <js/TracingAPI.h>
#include <map>
#include <memory>
#include <sstream>
#include <type_traits>
/**
* Once ping goes above turn length * command delay,

15
source/network/NetClient.h
View file

@ -18,23 +18,30 @@
#ifndef NETCLIENT_H
#define NETCLIENT_H
#include "lib/code_annotation.h"
#include "lib/external_libraries/enet.h"
#include "lib/types.h"
#include "network/FSM.h"
#include "network/NetFileTransfer.h"
#include "network/NetHost.h"
#include "network/NetMessage.h"
#include "scriptinterface/Object.h"
#include "ps/CStr.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptRequest.h"
#include <ctime>
#include <deque>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <optional>
#include <string>
#include <thread>
#include <vector>
class CGame;
class CNetClientSession;
class CNetClientTurnManager;
class JSTracer;
class ScriptInterface;
typedef struct _ENetHost ENetHost;

16
source/network/NetClientTurnManager.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -17,17 +17,25 @@
#include "precompiled.h"
#include "NetClientTurnManager.h"
#include "NetClient.h"
#include "NetClientTurnManager.h"
#include "lib/debug.h"
#include "lib/os_path.h"
#include "lib/path.h"
#include "lib/utf8.h"
#include "network/NetMessage.h"
#include "ps/CLogger.h"
#include "ps/Profile.h"
#include "ps/Pyrogenesis.h"
#include "ps/Replay.h"
#include "ps/Profile.h"
#include "ps/Util.h"
#include "simulation2/Simulation2.h"
#include <cstddef>
#include <fstream>
#include <js/RootingAPI.h>
#include <sstream>
#include <string>
#if 0
#define NETCLIENTTURN_LOG(...) debug_printf(__VA_ARGS__)

12
source/network/NetClientTurnManager.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,10 +18,18 @@
#ifndef INCLUDED_NETCLIENTTURNMANAGER
#define INCLUDED_NETCLIENTTURNMANAGER
#include "lib/code_annotation.h"
#include "lib/types.h"
#include "network/NetMessage.h"
#include "ps/CStr.h"
#include "simulation2/system/TurnManager.h"
#include "NetMessage.h"
#include <js/TypeDecls.h>
#include <vector>
class CNetClient;
class CSimulation2;
class IReplayLogger;
/**
* Implementation of CTurnManager for network clients.

4
source/network/NetEnet.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -25,6 +25,8 @@
#include "lib/external_libraries/enet.h"
#include <cstddef>
namespace PS
{

8
source/network/NetFileTransfer.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -20,10 +20,16 @@
#include "NetFileTransfer.h"
#include "lib/alignment.h"
#include "lib/posix/posix_types.h"
#include "lib/timer.h"
#include "network/NetMessage.h"
#include "network/NetSession.h"
#include "ps/CLogger.h"
#include "ps/CStr.h"
#include <algorithm>
#include <memory>
#include <new>
Status CNetFileTransferer::HandleMessageReceive(const CNetMessage& message)
{

14
source/network/NetFileTransfer.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,15 +18,21 @@
#ifndef NETFILETRANSFER_H
#define NETFILETRANSFER_H
#include "lib/alignment.h"
#include "lib/status.h"
#include "lib/types.h"
#include <cstddef>
#include <functional>
#include <map>
#include <string>
#include <unordered_map>
#include <utility>
class CNetMessage;
class CFileTransferResponseMessage;
class CFileTransferDataMessage;
class CFileTransferAckMessage;
class CFileTransferDataMessage;
class CFileTransferResponseMessage;
class CNetMessage;
class INetSession;
// Assume this is sufficiently less than MTU that packets won't get

6
source/network/NetHost.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,10 +19,14 @@
#include "NetHost.h"
#include "lib/debug.h"
#include "lib/external_libraries/enet.h"
#include "network/NetMessage.h"
#include "ps/CLogger.h"
#include <cstddef>
#include <vector>
bool CNetHost::SendMessage(const CNetMessage* message, ENetPeer* peer, const char* peerName)
{
ENetPacket* packet = CreatePacket(message);

21
source/network/NetHost.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -15,22 +15,25 @@
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef NETHOST_H
#define NETHOST_H
#include "ps/CStr.h"
#include <map>
/**
* @file
* Various declarations shared by networking code.
*/
#ifndef NETHOST_H
#define NETHOST_H
#include "lib/external_libraries/enet.h"
#include "lib/types.h"
#include "ps/CStr.h"
#include <map>
class CNetMessage;
typedef struct _ENetPeer ENetPeer;
typedef struct _ENetPacket ENetPacket;
typedef struct _ENetHost ENetHost;
class CNetMessage;
struct PlayerAssignment
{

8
source/network/NetMessage.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -16,16 +16,16 @@
*/
#include "precompiled.h"
#include "NetMessage.h"
#include "ps/CLogger.h"
#include "ps/Game.h"
#include "simulation2/Simulation2.h"
#include <string>
#undef ALLNETMSGS_DONT_CREATE_NMTS
#define ALLNETMSGS_IMPLEMENT
#include "NetMessages.h"
#include "network/NetMessages.h"
CNetMessage::CNetMessage()
{

18
source/network/NetMessage.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,12 +18,22 @@
#ifndef NETMESSAGE_H
#define NETMESSAGE_H
#include "Serialization.h"
#include "lib/code_annotation.h"
#include "lib/types.h"
#include "network/Serialization.h"
#include "ps/CStr.h"
#include <cstddef>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
class ScriptInterface;
// We need the enum from NetMessages.h, but we can't create any classes in
// NetMessages.h, since they in turn require CNetMessage to be defined
#define ALLNETMSGS_DONT_CREATE_NMTS
#include "NetMessages.h"
#include "network/NetMessages.h" // IWYU pragma: keep
#undef ALLNETMSGS_DONT_CREATE_NMTS
/**
@ -155,6 +165,6 @@ private:
};
// This time, the classes are created
#include "NetMessages.h"
#include "network/NetMessages.h" // IWYU pragma: keep
#endif // NETMESSAGE_H

16
source/network/NetMessageSim.cpp
View file

@ -19,14 +19,24 @@
#include "NetMessage.h"
#include "lib/utf8.h"
#include "scriptinterface/ScriptRequest.h"
#include "lib/code_annotation.h"
#include "lib/types.h"
#include "network/NetMessage.h"
#include "ps/CStr.h"
#include "scriptinterface/JSON.h"
#include "scriptinterface/ScriptRequest.h"
#include "simulation2/serialization/BinarySerializer.h"
#include "simulation2/serialization/StdDeserializer.h"
#include "simulation2/serialization/StdSerializer.h" // for DEBUG_SERIALIZER_ANNOTATE
#include "simulation2/serialization/StdSerializer.h"
#include <cstring>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <sstream>
#include <string>
class ScriptInterface;
class CBufferBinarySerializerImpl
{

6
source/network/NetProtocol.cpp
View file

@ -19,6 +19,12 @@
#include "NetProtocol.h"
#include "ps/CStr.h"
#include <algorithm>
#include <cstdint>
#include <utility>
namespace
{
template <typename ModType>

6
source/network/NetProtocol.h
View file

@ -18,14 +18,14 @@
#ifndef NETPROTOCOL_H
#define NETPROTOCOL_H
#include "NetMessage.h"
#include "network/NetMessage.h"
#include "ps/Pyrogenesis.h"
#include "ps/Mod.h"
#include "ps/Pyrogenesis.h"
#include <optional>
#include <string>
#include <type_traits>
#include <vector>
struct HandshakeError
{
@ -62,4 +62,4 @@ Message CreateHandshake() {
std::optional<HandshakeError> CheckHandshake(const CSrvHandshakeMessage& serverMessage, const CCliHandshakeMessage& clientMessage);
#endif
#endif

46
source/network/NetServer.cpp
View file

@ -19,39 +19,57 @@
#include "NetServer.h"
#include "NetClient.h"
#include "NetEnet.h"
#include "NetMessage.h"
#include "NetSession.h"
#include "NetServerTurnManager.h"
#include "NetStats.h"
#include "NetProtocol.h"
#include "lib/code_generation.h"
#include "lib/debug.h"
#include "lib/external_libraries/enet.h"
#include "lib/secure_crt.h"
#include "lib/status.h"
#include "lib/types.h"
#include "lib/utf8.h"
#include "network/FSM.h"
#include "network/NetEnet.h"
#include "network/NetFileTransfer.h"
#include "network/NetHost.h"
#include "network/NetMessage.h"
#include "network/NetProtocol.h"
#include "network/NetServerTurnManager.h"
#include "network/NetSession.h"
#include "network/NetStats.h"
#include "network/StunClient.h"
#include "ps/algorithm.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"
#include "ps/GUID.h"
#include "ps/Hashing.h"
#include "ps/Profile.h"
#include "ps/ProfileViewer.h"
#include "ps/Profiler2.h"
#include "ps/Threading.h"
#include "ps/algorithm.h"
#include "scriptinterface/JSON.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptContext.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/JSON.h"
#include "simulation2/Simulation2.h"
#include "scriptinterface/ScriptRequest.h"
#include "simulation2/system/TurnManager.h"
#include <algorithm>
#include <cstring>
#include <functional>
#include <iterator>
#include <js/PropertyAndElement.h>
#include <memory>
#if CONFIG2_MINIUPNPC
#include <miniupnpc/miniwget.h>
#include <miniupnpc/igd_desc_parse.h>
#include <miniupnpc/miniupnpc.h>
#include <miniupnpc/upnpcommands.h>
#include <miniupnpc/upnpdev.h>
#include <miniupnpc/upnperrors.h>
#endif
#include <new>
#include <set>
#include <sstream>
#include <string>
#include <type_traits>
#include <utility>
/**
* Number of peers to allocate for the enet host.

22
source/network/NetServer.h
View file

@ -18,31 +18,35 @@
#ifndef NETSERVER_H
#define NETSERVER_H
#include "NetFileTransfer.h"
#include "NetHost.h"
#include "lib/code_annotation.h"
#include "lib/config2.h"
#include "lib/types.h"
#include "network/NetHost.h"
#include "ps/CStr.h"
#include "scriptinterface/ScriptTypes.h"
#include <ctime>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <mutex>
#include <optional>
#include <string>
#include <utility>
#include <unordered_map>
#include <vector>
#include <thread>
#include <unordered_map>
#include <utility>
#include <vector>
class CNetMessage;
class CNetServerSession;
class CNetServerTurnManager;
template <typename MessageType> class CFsmEvent;
class CPlayerAssignmentMessage;
class CNetServerWorker;
class CNetStatsTable;
class CPlayerAssignmentMessage;
class CSimulationMessage;
class ScriptInterface;
class ScriptRequest;
class CNetServerWorker;
template <typename MessageType> class CFsmEvent;
enum NetServerState
{

12
source/network/NetServerTurnManager.cpp
View file

@ -17,16 +17,22 @@
#include "precompiled.h"
#include "NetMessage.h"
#include "NetServerTurnManager.h"
#include "NetServer.h"
#include "NetSession.h"
#include "lib/debug.h"
#include "lib/utf8.h"
#include "network/NetHost.h"
#include "network/NetMessage.h"
#include "network/NetServer.h"
#include "network/NetSession.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"
#include "simulation2/system/TurnManager.h"
#include <limits>
#include <memory>
#include <new>
#if 0
#include "ps/Util.h"
#define NETSERVERTURN_LOG(...) debug_printf(__VA_ARGS__)

9
source/network/NetServerTurnManager.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,13 +18,18 @@
#ifndef INCLUDED_NETSERVERTURNMANAGER
#define INCLUDED_NETSERVERTURNMANAGER
#include "lib/code_annotation.h"
#include "lib/types.h"
#include "ps/CStr.h"
#include <map>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>
class CNetServerWorker;
class CNetServerSession;
class CNetServerWorker;
/**
* The server-side counterpart to CNetClientTurnManager.

18
source/network/NetSession.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -19,13 +19,17 @@
#include "NetSession.h"
#include "NetClient.h"
#include "NetEnet.h"
#include "NetMessage.h"
#include "NetServer.h"
#include "NetStats.h"
#include "lib/code_generation.h"
#include "lib/debug.h"
#include "network/NetClient.h"
#include "network/NetEnet.h"
#include "network/NetMessage.h"
#include "network/NetServer.h"
#include "network/NetStats.h"
#include "ps/CLogger.h"
#include "ps/Profile.h"
#include "ps/ProfileViewer.h"
#include <cstddef>
constexpr int NETCLIENT_POLL_TIMEOUT = 50;

16
source/network/NetSession.h
View file

@ -18,26 +18,28 @@
#ifndef NETSESSION_H
#define NETSESSION_H
#include "lib/code_annotation.h"
#include "lib/external_libraries/enet.h"
#include "lib/types.h"
#include "network/FSM.h"
#include "network/NetFileTransfer.h"
#include "network/NetHost.h"
#include "ps/CStr.h"
#include <boost/lockfree/queue.hpp>
#include <atomic>
#include <boost/lockfree/queue.hpp>
#include <utility>
class CNetClient;
class CNetMessage;
class CNetServerWorker;
class CNetStatsTable;
/**
* Report the peer if we didn't receive a packet after this time (milliseconds).
*/
inline constexpr u32 NETWORK_WARNING_TIMEOUT = 2000;
class CNetClient;
class CNetServerWorker;
class CNetStatsTable;
typedef struct _ENetHost ENetHost;
/**

2
source/network/NetStats.cpp
View file

@ -19,7 +19,7 @@
#include "NetStats.h"
#include "lib/external_libraries/enet.h"
#include <string>
enum
{

6
source/network/NetStats.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,8 +18,12 @@
#ifndef INCLUDED_NETSTATS
#define INCLUDED_NETSTATS
#include "lib/code_annotation.h"
#include "lib/external_libraries/enet.h"
#include "ps/CStr.h"
#include "ps/ProfileViewer.h"
#include <cstddef>
#include <mutex>
#include <vector>

8
source/network/Serialization.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -15,6 +15,12 @@
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/code_annotation.h"
#include "lib/code_generation.h"
#include "lib/types.h"
#include <cstddef>
#ifndef INCLUDED_NETWORK_SERIALIZATION
#define INCLUDED_NETWORK_SERIALIZATION

5
source/network/StringConverters.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,8 +18,11 @@
#ifndef INCLUDED_NETWORK_STRINGCONVERTERS
#define INCLUDED_NETWORK_STRINGCONVERTERS
#include "lib/types.h"
#include "ps/CStr.h"
#include <string>
static inline CStr NetMessageStringConvert(u32 arg)
{
return CStr::FromUInt(arg);

7
source/network/StunClient.cpp
View file

@ -21,14 +21,19 @@
#include "StunClient.h"
#include "lib/byte_order.h"
#include "lib/code_annotation.h"
#include "lib/external_libraries/enet.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"
#include "ps/CStr.h"
#include "ps/ConfigDB.h"
#include <cerrno>
#include <chrono>
#include <cstddef>
#include <cstdlib>
#include <cstring>
#include <thread>
#include <type_traits>
#include <vector>
namespace StunClient

7
source/network/StunClient.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* Copyright (C) 2013-2016 SuperTuxKart-Team.
* This file is part of 0 A.D.
*
@ -19,10 +19,13 @@
#ifndef STUNCLIENT_H
#define STUNCLIENT_H
#include "ps/CStrForward.h"
#include "lib/external_libraries/enet.h"
#include "lib/types.h"
#include <string>
class CStr8;
typedef struct _ENetHost ENetHost;
namespace StunClient

25
source/network/scripting/JSInterface_Network.cpp
View file

@ -19,30 +19,39 @@
#include "JSInterface_Network.h"
#include "lib/external_libraries/enet.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/code_generation.h"
#include "lib/debug.h"
#include "lib/types.h"
#include "lib/utf8.h"
#include "lobby/IXmppClient.h"
#include "network/NetClient.h"
#include "network/NetMessage.h"
#include "network/NetServer.h"
#include "network/StunClient.h"
#include "ps/CLogger.h"
#include "ps/CStr.h"
#include "ps/Game.h"
#include "ps/GUID.h"
#include "ps/Game.h"
#include "ps/Hashing.h"
#include "ps/Pyrogenesis.h"
#include "ps/SavedGame.h"
#include "ps/Util.h"
#include "scriptinterface/FunctionWrapper.h"
#include "scriptinterface/StructuredClone.h"
#include "scriptinterface/JSON.h"
#include "scriptinterface/ScriptConversions.h"
#include "scriptinterface/ScriptRequest.h"
#include "scriptinterface/StructuredClone.h"
#include "third_party/encryption/pkcs5_pbkdf2.h"
#include <fmt/format.h>
#include <js/PropertyAndElement.h>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <optional>
#include <stdexcept>
#include <string>
#include <utility>
#include <vector>
class ScriptInterface;
namespace JSI_Network
{

5
source/network/tests/test_FSM.h
View file

@ -20,6 +20,11 @@
#include "network/FSM.h"
#include <array>
#include <cstddef>
#include <memory>
#include <new>
#include <unordered_map>
#include <utility>
#include <variant>
class TestFSM : public CxxTest::TestSuite

6
source/network/tests/test_FileTransfer.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -21,6 +21,10 @@
#include "network/NetMessage.h"
#include "network/NetSession.h"
#include <cstddef>
#include <functional>
#include <initializer_list>
#include <string>
#include <utility>
#include <vector>

26
source/network/tests/test_Net.h
View file

@ -17,24 +17,36 @@
#include "lib/self_test.h"
#include "graphics/TerrainTextureManager.h"
#include "lib/debug.h"
#include "lib/external_libraries/enet.h"
#include "lib/external_libraries/libsdl.h"
#include "lib/tex/tex.h"
#include "network/NetServer.h"
#include "lib/file/file_system.h"
#include "lib/file/vfs/vfs.h"
#include "lib/path.h"
#include "lib/types.h"
#include "network/NetClient.h"
#include "network/NetMessage.h"
#include "network/NetMessages.h"
#include "network/NetServer.h"
#include "ps/CLogger.h"
#include "ps/Game.h"
#include "ps/CStr.h"
#include "ps/Filesystem.h"
#include "ps/Game.h"
#include "ps/Loader.h"
#include "ps/XML/Xeromyces.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptInterface.h"
#include "simulation2/Simulation2.h"
#include "scriptinterface/ScriptRequest.h"
#include "simulation2/system/TurnManager.h"
#include <SDL_timer.h>
#include <cstddef>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <memory>
#include <optional>
#include <string>
#include <utility>
#include <vector>
class TestNetComms : public CxxTest::TestSuite
{

13
source/network/tests/test_NetMessage.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -17,10 +17,17 @@
#include "lib/self_test.h"
#include "lib/types.h"
#include "network/NetMessage.h"
#include "scriptinterface/ScriptInterface.h"
#include "ps/CStr.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/ScriptRequest.h"
#include <cstddef>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
class TestNetMessage : public CxxTest::TestSuite
{

10
source/network/tests/test_StunClient.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2024 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -17,12 +17,14 @@
#include "lib/self_test.h"
#include "network/StunClient.h"
#include "lib/external_libraries/enet.h"
#include "lib/types.h"
#include "network/StunClient.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"
#include "ps/CStr.h"
#include "ps/ConfigDB.h"
#include <string>
class TestStunClient : public CxxTest::TestSuite
{

7
source/simulation2/system/TurnManager.h
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -18,16 +18,17 @@
#ifndef INCLUDED_TURNMANAGER
#define INCLUDED_TURNMANAGER
#include "lib/code_annotation.h"
#include "ps/CStr.h"
#include "simulation2/helpers/SimulationCommand.h"
#include <deque>
#include <list>
#include <map>
#include <vector>
#include <deque>
class CSimulationMessage;
class CSimulation2;
class CSimulationMessage;
class IReplayLogger;
/**