Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmake/MafiaNetPin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
# tree, so bumping the pin here and reconfiguring incrementally would silently
# keep the old release. This file is the single source of truth, and there is no
# reason to let -D override the wire format of the protocol.
set(MAFIANET_PIN_VERSION "0.22.1") # FileListTransfer reference push window; DirectoryDeltaTransfer compares AddFile uploads by hash and writes streamed downloads as they arrive (RAKNET_PROTOCOL_VERSION still 7, wire-compatible)
set(MAFIANET_PIN_VERSION "0.23.0") # A Shutdown() from inside receive dispatch no longer frees the packet or transfer receiver in use; snake_case header names (RAKNET_PROTOCOL_VERSION still 7, wire-compatible)

set(MAFIANET_PIN_SHA256_linux-x86_64 "fc554afe031a4c4b3b064d0beb96aa40c42b3b92337df87fcf0cbeb0f338626d")
set(MAFIANET_PIN_SHA256_macos-arm64 "a36e7ff318e117c34b84822ef54f9d8c3cdcf971945cb7ebe34582ca2636a35b")
set(MAFIANET_PIN_SHA256_macos-x86_64 "234cfca4c6bd4d88d2fa0a6f97dbd3ecadde6ac6eee93ced816fc9af06cef8a1")
set(MAFIANET_PIN_SHA256_windows-x64 "14c6317d6ddb2299de8fdff3c71373bb1c25fbab2b491187d28db4e8a7356e4e")
set(MAFIANET_PIN_SHA256_windows-x86 "b39568dabbf241d291a0f8e1ef2bde4f156edd6bad9f6cda282d4fed571e0c77")
set(MAFIANET_PIN_SHA256_linux-x86_64 "b81fcd58707273b25e6e6ac3ce927f3b51ff6d53742bc042aac22e59a71fb953")
set(MAFIANET_PIN_SHA256_macos-arm64 "0723adfa047ffd8cf89ce5c0b1ddb1ffc088313bbbf8f25b95a321bbd0301a2b")
set(MAFIANET_PIN_SHA256_macos-x86_64 "cbb3ccc389a2a8444bad223db2bb0fe8d7c4818b48b3b40e56f744200c584ff5")
set(MAFIANET_PIN_SHA256_windows-x64 "baefa6694fdd2985940f307256b1410ccbd3a7dbd21f12ebc809c80b5d813e6c")
set(MAFIANET_PIN_SHA256_windows-x86 "75f70eafec2245994aa3130a89727f6241732831ce14f6b38dcd4edb33416c3e")
2 changes: 1 addition & 1 deletion code/framework/src/integrations/client/instance.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "networking/rpc/server_resources.h"
#include "integrations/client/ui/chat_box.h"
#include "voice/client/voice_client.h"
#include <mafianet/FileListTransferCBInterface.h>
#include <mafianet/file_list_transfer_cb_interface.h>

#include <cstdint>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <networking/rpc/rpc_identifier.h>

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>
#include <mafianet/string.h>

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/connection.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>
#include <mafianet/types.h>
#include <function2/function2.hpp>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/network_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <logging/logger.h>

#include <mafianet/MessageIdentifiers.h>
#include <mafianet/message_identifiers.h>
#include <mafianet/defines.h>

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/network_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <utils/result.h>

#include <mafianet/types.h>
#include <mafianet/peerinterface.h>
#include <mafianet/peer_interface.h>
#include <string>
#include <string_view>
#include <unordered_map>
Expand Down
20 changes: 10 additions & 10 deletions code/framework/src/networking/network_peer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
#include "connection.h"
#include "rpc/rpc.h"

#include <mafianet/MessageIdentifiers.h>
#include <mafianet/PacketPriority.h>
#include <mafianet/peerinterface.h>
#include <mafianet/FileListTransfer.h>
#include <mafianet/DirectoryDeltaTransfer.h>
#include <mafianet/RPC4Plugin.h>
#include <mafianet/ReadyEvent.h>
#include <mafianet/StatisticsHistory.h>
#include <mafianet/TwoWayAuthentication.h>
#include <mafianet/NetworkIDManager.h>
#include <mafianet/message_identifiers.h>
#include <mafianet/packet_priority.h>
#include <mafianet/peer_interface.h>
#include <mafianet/file_list_transfer.h>
#include <mafianet/directory_delta_transfer.h>
#include <mafianet/rpc4_plugin.h>
#include <mafianet/ready_event.h>
#include <mafianet/statistics_history.h>
#include <mafianet/two_way_authentication.h>
#include <mafianet/network_id_manager.h>
#include <logging/logger.h>
#include <utils/lifecycle.h>
#include <utils/version.h>
Expand Down
4 changes: 2 additions & 2 deletions code/framework/src/networking/network_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "channels.h"
#include "replication/replication_manager.h"

#include <mafianet/BitStream.h>
#include <mafianet/MessageIdentifiers.h>
#include <mafianet/bit_stream.h>
#include <mafianet/message_identifiers.h>
#include <mafianet/defines.h>
#include <mafianet/guid_util.h>
#include <logging/logger.h>
Expand Down
4 changes: 2 additions & 2 deletions code/framework/src/networking/network_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <utils/error.h>
#include <utils/result.h>

#include <mafianet/IncrementalReadInterface.h>
#include <mafianet/incremental_read_interface.h>
#include <mafianet/types.h>
#include <mafianet/peerinterface.h>
#include <mafianet/peer_interface.h>
#include <optional>
#include <string>
#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/replication/delegation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <logging/logger.h>

#include <mafianet/VirtualWorld.h>
#include <mafianet/virtual_world.h>

#include <limits>

Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/replication/delegation.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "network_entity.h"

#include <mafianet/GetTime.h>
#include <mafianet/get_time.h>
#include <mafianet/types.h>

#include <function2/function2.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "interest_grid.h"

#include <logging/logger.h>
#include <mafianet/DS_List.h>
#include <mafianet/ds_list.h>

#include <algorithm>
#include <limits>
Expand Down
4 changes: 2 additions & 2 deletions code/framework/src/networking/replication/interest_grid.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include "network_entity.h"

#include <mafianet/DS_List.h>
#include <mafianet/GridSectorizer.h>
#include <mafianet/ds_list.h>
#include <mafianet/grid_sectorizer.h>

#include <glm/glm.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "../channels.h"
#include "replication_manager.h"

#include <mafianet/GetTime.h>
#include <mafianet/get_time.h>
#include <utils/time.h>

#include <cstring>
Expand Down
6 changes: 3 additions & 3 deletions code/framework/src/networking/replication/network_entity.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#include "state_bag.h"

#include <mafianet/ReplicaManager3.h>
#include <mafianet/VariableDeltaSerializer.h>
#include <mafianet/VirtualWorldReplica3.h>
#include <mafianet/replica_manager3.h>
#include <mafianet/variable_delta_serializer.h>
#include <mafianet/virtual_world_replica3.h>

#include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "network_entity.h"
#include "replication_manager.h"

#include <mafianet/GetTime.h>
#include <mafianet/get_time.h>

#include <algorithm>
#include <cstring>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "interest_refresh.h"
#include "transform_batch.h"

#include <mafianet/ReplicaManager3.h>
#include <mafianet/replica_manager3.h>

#include <cstdint>
#include <unordered_map>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
#include "interest_grid.h"
#include "network_entity.h"

#include <mafianet/NetworkIDManager.h>
#include <mafianet/RPC4Plugin.h>
#include <mafianet/ReplicaManager3.h>
#include <mafianet/peerinterface.h>
#include <mafianet/network_id_manager.h>
#include <mafianet/rpc4_plugin.h>
#include <mafianet/replica_manager3.h>
#include <mafianet/peer_interface.h>

#include <function2/function2.hpp>
#include <glm/glm.hpp>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/replication/state_bag.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>

#include <cstddef>
#include <cstdint>
Expand Down
4 changes: 2 additions & 2 deletions code/framework/src/networking/replication/transform_batch.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#pragma once

#include <function2/function2.hpp>
#include <mafianet/MessageIdentifiers.h>
#include <mafianet/ReplicaManager3.h>
#include <mafianet/message_identifiers.h>
#include <mafianet/replica_manager3.h>

#include <array>
#include <cstddef>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/rpc/client_identity.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// included -- and would land on ours while BitStream is still half-declared.
#include "rpc.h"

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>

#include <cstddef>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/rpc/rpc.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "rpc_identifier.h"

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>

#include <concepts>

Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/networking/rpc/state_bag_sync.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "../replication/state_bag.h"
#include "rpc.h"

#include <mafianet/NetworkIDManager.h>
#include <mafianet/network_id_manager.h>

#include <algorithm>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/scripting/builtins/chat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <v8pp/class.hpp>
#include <v8pp/convert.hpp>

#include <mafianet/PacketPriority.h>
#include <mafianet/packet_priority.h>
#include <mafianet/types.h>

#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/utils/snapshot_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <cmath>
#include <glm/ext.hpp>
#include <mafianet/GetTime.h>
#include <mafianet/get_time.h>
#include <utils/time.h>

namespace Framework::Utils {
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/voice/client/voice_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "voice/voice_config.h"
#include "voice_activity_gate.h"

#include <mafianet/RakVoice.h>
#include <mafianet/voice.h>

#include <array>
#include <atomic>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/voice/server/voice_router.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "voice/voice_config.h"

#include <glm/glm.hpp>
#include <mafianet/VirtualWorld.h>
#include <mafianet/virtual_world.h>

#include <cstdint>
#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/voice/server/voice_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "voice/voice_config.h"

#include <logging/logger.h>
#include <mafianet/MessageIdentifiers.h>
#include <mafianet/message_identifiers.h>
#include <networking/channels.h>
#include <networking/network_server.h>
#include <networking/replication/network_entity.h>
Expand Down
2 changes: 1 addition & 1 deletion code/framework/src/voice/server/voice_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "voice_router.h"

#include <mafianet/RakVoice.h>
#include <mafianet/voice.h>
#include <networking/rpc/voice_settings.h>

#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion code/tests/modules/asset_transfer_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "networking/network_client.h"

#include <mafianet/FileListTransferCBInterface.h>
#include <mafianet/file_list_transfer_cb_interface.h>

namespace AssetTransferTest {
// Counts how often the transfer lets go of it.
Expand Down
2 changes: 1 addition & 1 deletion code/tests/modules/delegation_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "networking/replication/delegation.h"

#include <glm/glm.hpp>
#include <mafianet/VirtualWorld.h>
#include <mafianet/virtual_world.h>
#include <mafianet/types.h>

#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions code/tests/modules/nametag_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include "networking/replication/replication_manager.h"
#include "scripting/builtins/player.h"

#include <mafianet/BitStream.h>
#include <mafianet/ReplicaManager3.h>
#include <mafianet/bit_stream.h>
#include <mafianet/replica_manager3.h>
#include <mafianet/types.h>

#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion code/tests/modules/network_packets_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "networking/rpc/client_identity.h"
#include "networking/rpc/server_resources.h"

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>

#include <cstdint>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions code/tests/modules/replication_authority_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "networking/replication/network_entity.h"
#include "networking/replication/replication_manager.h"

#include <mafianet/BitStream.h>
#include <mafianet/ReplicaManager3.h>
#include <mafianet/bit_stream.h>
#include <mafianet/replica_manager3.h>
#include <mafianet/types.h>

// Server authority over entity destruction. The base ReplicaManager3 destruction dispatch resolves
Expand Down
4 changes: 2 additions & 2 deletions code/tests/modules/replication_rate_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "networking/replication/network_entity.h"
#include "networking/replication/replication_manager.h"

#include <mafianet/BitStream.h>
#include <mafianet/ReplicaManager3.h>
#include <mafianet/bit_stream.h>
#include <mafianet/replica_manager3.h>

// Transform channel rate rules: distance bands, idle refresh, and per-entity ordering.
MODULE(replication_rate, {
Expand Down
4 changes: 2 additions & 2 deletions code/tests/modules/rpc_identifier_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "networking/rpc/server_resources.h"
#include "networking/rpc/voice_settings.h"

#include <mafianet/BitStream.h>
#include <mafianet/StringCompressor.h>
#include <mafianet/bit_stream.h>
#include <mafianet/string_compressor.h>

#include <array>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion code/tests/modules/state_bag_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "networking/replication/state_bag.h"
#include "networking/rpc/state_bag_sync.h"

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>
#include <mafianet/types.h>

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion code/tests/modules/streamed_assets_ut.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "utils/streamed_assets/pak_archive.h"
#include "utils/streamed_assets/policy.h"

#include <mafianet/BitStream.h>
#include <mafianet/bit_stream.h>

#include <cctype>
#include <chrono>
Expand Down
Loading
Loading