diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a3640412..89f715612 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,20 @@ name: Build & Test +# Runs on pull requests only. Pushes to master do not build or test: master is +# only ever changed by merging a PR that already passed this workflow, and a +# release tag (vX.Y.Z) triggers release.yml, which packages without testing. +# workflow_dispatch allows a manual run on any branch. on: - push: - branches: [master] pull_request: - branches: [master] + workflow_dispatch: + +# A new push to the same PR cancels the run still in flight for it. +concurrency: + group: build-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +permissions: + contents: read jobs: # Linux: Build and test in Docker container (full network access). @@ -63,11 +73,25 @@ jobs: - name: Install OpenSSL run: sudo apt-get update && sudo apt-get install -y libssl-dev + # File names under Source/ are snake_case, and library headers include each + # other only as "mafianet/.h". A bare #include "string.h" inside + # include/mafianet/ would resolve to the library's own string.h instead of + # the C header, so both rules are enforced here. + - name: Check file naming and include style + run: | + bad=$(find Source/include Source/src -type f \( -name '*.h' -o -name '*.cpp' \) | grep -E '/[^/]*[A-Z][^/]*$' || true) + if [ -n "$bad" ]; then echo "Non-snake_case file names:"; echo "$bad"; exit 1; fi + bad=$(grep -rnE '^\s*#include "[a-z0-9_]+\.h"' Source/include/mafianet | while IFS=: read -r f l rest; do + n=$(echo "$rest" | sed -E 's/.*"([^"]+)".*/\1/') + [ -e "Source/include/mafianet/$n" ] && echo "$f:$l: $rest"; done || true) + if [ -n "$bad" ]; then echo "Bare includes of library headers (use \"mafianet/.h\"):"; echo "$bad"; exit 1; fi + - name: Configure CMake run: | cmake -B build \ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ - -DMAFIANET_BUILD_TESTS=ON + -DMAFIANET_BUILD_TESTS=ON \ + -DMAFIANET_BUILD_EXTRAS=ON - name: Build run: cmake --build build --parallel 4 @@ -99,6 +123,34 @@ jobs: path: build/junit-*.xml if-no-files-found: ignore + # Minimal configuration: every optional plugin compiled out through + # MAFIANET_MINIMAL (see docs/getting-started/building.rst, "Minimal builds"). + # Proves the core transport builds without the plugins and that no plugin + # header leaks into the core. The test suites use the plugins, so this job + # builds both library targets and nothing else. + linux-minimal: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Install OpenSSL + run: sudo apt-get update && sudo apt-get install -y libssl-dev + + - name: Configure CMake (minimal) + run: | + cmake -B build \ + -DCMAKE_BUILD_TYPE=Release \ + -DMAFIANET_MINIMAL=ON + + - name: Build + run: cmake --build build --parallel 4 + + - name: Report library size + run: ls -l build/Source/libMafiaNetStatic.a build/Source/libmafianet.so* + # macOS: Build and run both suites (unit + integration). macos: runs-on: macos-latest diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 128b3369b..c424bea6b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,12 +1,11 @@ name: Deploy Documentation +# Published documentation follows releases: it is rebuilt when a release tag +# (vX.Y.Z) is pushed, never on ordinary pushes to master. workflow_dispatch +# allows a manual rebuild. on: push: - branches: [master] - paths: - - 'docs/**' - - 'Source/include/**' - - '.github/workflows/docs.yml' + tags: ["v*"] workflow_dispatch: permissions: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e659962f..dc5d0f2b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,8 @@ name: Release # Builds precompiled MafiaNet packages for every supported platform when a # release tag (vX.Y.Z) is pushed, then creates/updates the GitHub release for -# that tag with the archives attached. +# that tag with the archives attached. No tests run here: the commit being +# tagged reached master through a pull request that already ran build.yml. # # Each archive is a full install tree (cmake --install): shared + static # libraries, the bundled opus/rnnoise static libs, all public headers, and the diff --git a/CLAUDE.md b/CLAUDE.md index 1c9709880..b72aa8abf 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1,263 +1,281 @@ -# CLAUDE.md - -This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. - -## Project Overview - -MafiaNet is a cross-platform network engine written in C++ for multiplayer games. It's a fork of SLikeNet, which itself continued RakNet. The project provides reliable UDP messaging, NAT traversal, peer-to-peer networking, and various game-specific networking features. - -## Build Commands - -### Linux / macOS - -```bash -# Configure (from repository root) -mkdir build && cd build -cmake .. - -# Build -cmake --build . # All platforms -cmake --build . --config Release # Release build - -# Build with samples and tests -cmake -DMAFIANET_BUILD_SAMPLES=ON .. - -# Quick rebuild after changes (from repository root) -cmake --build build -j$(nproc) # Linux -cmake --build build -j$(sysctl -n hw.ncpu) # macOS - -# Build options -cmake -DMAFIANET_BUILD_SHARED=ON .. # Build shared library (default: ON) -cmake -DMAFIANET_BUILD_STATIC=ON .. # Build static library (default: ON) -cmake -DMAFIANET_BUILD_TESTS=ON .. # Build test suite -``` - -### Windows (Visual Studio) - -CMake generates Visual Studio solutions automatically. No pre-built `.sln` or `.vcxproj` files are included in the repository. - -```powershell -# Generate Visual Studio 2022 solution -cmake -G "Visual Studio 17 2022" -A x64 -B build - -# Generate Visual Studio 2019 solution -cmake -G "Visual Studio 16 2019" -A x64 -B build - -# Build from command line -cmake --build build --config Release - -# Or open build/MafiaNet.sln in Visual Studio -``` - -Available generators (run `cmake --help` for full list): -- `"Visual Studio 17 2022"` - VS 2022 -- `"Visual Studio 16 2019"` - VS 2019 -- `"Ninja"` - Fast builds with Ninja - -### Build Options - -| Option | Default | Description | -|--------|---------|-------------| -| `MAFIANET_BUILD_SHARED` | ON | Build shared library (.dll/.so/.dylib) | -| `MAFIANET_BUILD_STATIC` | ON | Build static library (.lib/.a) | -| `MAFIANET_BUILD_SAMPLES` | OFF | Build sample applications | -| `MAFIANET_BUILD_TESTS` | OFF | Build test suite | - -### Batched Datagram I/O (recvmmsg / sendmmsg) - -Always on where the syscalls exist. **There is no build option and no macro** — the -paths are guarded by a plain `#if defined(__linux__)`. Do not reintroduce a flag or a -capability macro for this; a CMake option here was removed deliberately because it -left the shipping path uncompiled on most machines. - -The portable helpers in `MmsgBatch.h` (`DriveBatchedSend`, `ClassifySendmmsgErrno`, -`SockaddrToSystemAddress`, `CompactRecvSlots`, `RNS2SendBatch`) compile and are unit -tested on **every** platform; only the syscall glue is gated. Keep it that way — new -logic belongs in a portable helper with a unit test, not inside the `#if`. - -When changing `Source/src/MmsgBatch.cpp`, `RakNetSocket2*.cpp`, or the send path in -`ReliabilityLayer.cpp`, a macOS/Windows build proves nothing about the batched paths. -Verify on Linux, in **both** `Debug` and `Release` (`RakAssert` only fires in Debug; -Release is what ships and exercises the backstops the asserts hide): - -```bash -docker run --rm -v "$PWD":/src:ro ubuntu:24.04 bash -c ' - apt-get update -qq && apt-get install -y -qq build-essential cmake libssl-dev git ca-certificates - cp -r /src /work && cd /work - for cfg in Debug Release; do - cmake -B /b-$cfg -S . -DCMAKE_BUILD_TYPE=$cfg -DMAFIANET_BUILD_TESTS=ON - cmake --build /b-$cfg --parallel "$(nproc)" - ctest --test-dir /b-$cfg --output-on-failure --timeout 600 || exit 1 - done' -``` - -`Tests/Integration/MmsgBatchLiveTests.cpp` is the suite that actually fills batches -(the rest of the suite sends ~1 datagram per tick and never crosses `MMSG_BATCH_MAX`). -Keep its message counts above `MMSG_BATCH_MAX` or that coverage silently disappears. - -**Requirements:** -- CMake 3.21+ -- C++17 compiler -- OpenSSL 3.0+ -- Platform libs: ws2_32 (Windows), pthread (Unix) -- Internet connection (first configure fetches dependencies via FetchContent) - -## Running Tests - -All tests are GoogleTest, built with `MAFIANET_BUILD_TESTS=ON` (requires `MAFIANET_BUILD_STATIC=ON`) and driven by CTest. Two binaries under `Tests/`: - -- **`UnitTests`** (`Tests/Unit/`, label `unit`): hermetic and deterministic — no loopback networking, no wall-clock timing. A started-but-unconnected peer with synchronous assertions is acceptable. New tests for pure logic go here. -- **`IntegrationTests`** (`Tests/Integration/`, label `integration`): real UDP over loopback. Discovered tests get `RUN_SERIAL` (several bind fixed ports) and a 600s timeout. Shared polling/connect helpers live in `Tests/Support/`. - -Under ctest, every `TEST()` runs in its own process — never write tests that depend on state from a previous `TEST()`. Long sequential networking scenarios belong in a single `TEST_F`. - -```bash -cmake -B build -DMAFIANET_BUILD_TESTS=ON -cmake --build build - -ctest --test-dir build --output-on-failure # everything -ctest --test-dir build -L unit # hermetic unit suite only -ctest --test-dir build -L integration # loopback integration suite only -ctest --test-dir build -R "DispatcherLive" # by name pattern -``` - -For debugging, run a binary directly with a filter: `./build/Tests/IntegrationTests --gtest_filter='DispatcherLive.*'`; reproduce flakes with `--gtest_repeat=100 --gtest_break_on_failure`. - -## Writing Tests - -**Every change to library code in `Source/` needs tests, written in the new paradigm.** Do not create new test harnesses, `main()` functions, standalone test executables, or sample apps that act as tests — add GoogleTest cases to the existing suites. New `.cpp` files under `Tests/Unit/` and `Tests/Integration/` are picked up automatically by the build (glob); no CMake edits are needed unless you add a new directory. - -**Default to Unit; escalate to Integration only when the behavior under test genuinely requires traffic.** Ask: can this be tested by calling the API synchronously? Serialization, containers, builders, dispatch tables, ID assignment, string/GUID utilities, replica-visibility queries — all Unit. Only reliability, connection lifecycle, and anything that must cross the network thread belongs in Integration. - -**Unit tests** (`Tests/Unit/Tests.cpp`): -- Hermetic and deterministic: no `Connect()`, no `RakSleep`-with-deadline polling, no dependence on wall-clock time or packet arrival. A started-but-unconnected peer with purely synchronous assertions is acceptable (see `GuidUtilTests.cpp`, `VirtualWorldTests.cpp`). -- Split independent checks into separate `TEST()`/`TEST_F()` cases with descriptive names (`TEST(Dispatcher, AutoAssignedIdsFollowRegistrationOrder)`) — under ctest each case is reported, filtered, and retried individually. See `PointGridSectorizerTests.cpp` for the pattern. -- Deterministic pseudo-randomness is fine and encouraged for stress tests (fixed-seed LCG differential testing against a reference model). - -**Integration tests** (`Tests/Integration/Tests.cpp`): -- One `TEST_F` per sequential scenario. Never split phases that share connection state into separate `TEST`s — each `TEST` runs in its own process under ctest. -- Ports: use OS-assigned ephemeral ports (`SocketDescriptor(0, "127.0.0.1")`, then `peer->GetInternalID().GetPort()`), never a new fixed port. (Some ported legacy tests still bind fixed ports; that is why the suite is `RUN_SERIAL` — do not add to the problem.) -- Waiting: always poll for a condition with a deadline (`while (GetTimeMS() - start < N && !condition) { pump; RakSleep(30); }`), never assert immediately after a state change — packets surface asynchronously from each peer's network thread, and both sides of a handshake must be pumped until *each* has observed the event. -- Never use a bare `RakSleep(N)` as a synchronization primitive; sleep only as the polling interval inside a deadline loop. -- Cleanup must survive a failed `ASSERT_`: destroy peers in fixture `TearDown()` (`Shutdown(100)` then `DestroyInstance` for every peer created) or use RAII `Peer`/`PacketPtr` handles from `mafianet/PeerHandle.h`. Never rely on code after the assertions to clean up. -- Write correctness assertions so a real regression fails on every attempt: CI retries transient integration failures (`ctest --repeat until-pass:3`), which must only absorb timing misses, never actual bugs. Do not add retry loops inside tests. -- Reusable connect/wait helpers live in `Tests/Support/` (`CommonFunctions.h`, `TestHelpers.h`); extend those rather than duplicating polling loops. - -**Before claiming a change is done**, build with `-DMAFIANET_BUILD_TESTS=ON` and run at minimum `ctest --test-dir build -L unit` plus the integration tests touching the changed subsystem (`ctest -R `); run the full suite for changes to the reliability layer, peer lifecycle, or message routing. For a new integration test, prove it is not flaky: `./build/Tests/IntegrationTests --gtest_filter='.*' --gtest_repeat=10 --gtest_break_on_failure`. - -## Architecture - -### Namespaces -- Primary namespace: `MafiaNet` (e.g., `MafiaNet::RakPeerInterface`, `MafiaNet::BitStream`) — used exclusively throughout the library -- Short-hand alias: the `MNet` preprocessor macro (defined in `mafianet/defines.h`) expands to `MafiaNet` as a convenience shorthand - -### Key Components - -**Networking Core** (`Source/include/mafianet/`): -- `RakPeerInterface` - Main entry point. Use `MafiaNet::RakPeerInterface::GetInstance()` to create -- `BitStream` - Binary serialization for packets -- `Packet` - Received network data container -- `SystemAddress` - Network endpoint identifier -- `MessageIdentifiers.h` - Packet type IDs (extend with `ID_USER_PACKET_ENUM`) - -**Plugin System** (`PluginInterface2`): -- Extend functionality by attaching plugins to RakPeerInterface -- Examples: `FileListTransfer`, `FullyConnectedMesh2`, `NatPunchthroughClient` - -**Data Structures** (`DS_*` headers): -- Custom containers: `DS_List`, `DS_Queue`, `DS_Map`, `DS_OrderedList` -- Memory pools: `DS_MemoryPool` - -### Directory Structure - -``` -Source/ -├── include/mafianet/ # Public API headers (include as "mafianet/...") -└── src/ # Implementation files - -Samples/ # 80+ examples demonstrating features -DependentExtensions/ # Optional integrations (database, voice, patching) -cmake/ # CMake modules including FetchDependencies.cmake -``` - -### DependentExtensions - -Optional integrations built when `MAFIANET_BUILD_SAMPLES=ON`: -- **Database**: `MySQLInterface`, `PostgreSQLInterface` - Database connectivity -- **Autopatcher**: Delta patching system for game updates (uses bzip2) -- **RakVoice**: Voice compression and transmission (uses Opus, RNNoise) -- **Lobby2**: Matchmaking and lobby system - -Dependencies (bzip2, miniupnpc, Opus, RNNoise) are automatically fetched via CMake FetchContent at configure time. - -### Basic Usage Pattern - -```cpp -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" - -// Create peer -MafiaNet::RakPeerInterface* peer = MafiaNet::RakPeerInterface::GetInstance(); - -// Start (server) -MafiaNet::SocketDescriptor sd(60000, 0); -peer->Startup(maxConnections, &sd, 1); -peer->SetMaximumIncomingConnections(maxConnections); - -// Or connect (client) -peer->Connect("127.0.0.1", 60000, nullptr, 0); - -// Process packets -MafiaNet::Packet* packet; -while ((packet = peer->Receive()) != nullptr) { - switch (packet->data[0]) { - case ID_NEW_INCOMING_CONNECTION: - // Handle new connection - break; - // ... handle other message types - } - peer->DeallocatePacket(packet); -} - -// Cleanup -MafiaNet::RakPeerInterface::DestroyInstance(peer); -``` - -## Key Samples - -- `Samples/Ping/` - Basic UDP ping (beginner) -- `Samples/ChatExample/` - Simple chat application -- `Samples/ReplicaManager3/` - Object replication system -- `Samples/NATCompleteServer/` - NAT traversal demonstration -- `Tests/` - GoogleTest suites (`Unit/`, `Integration/`, shared helpers in `Support/`) - -## Releasing (Version Bump Procedure) - -MafiaNet uses [Semantic Versioning](https://semver.org/) (`MAJOR.MINOR.PATCH`). -The version string lives in **several** places that must all be kept in sync. When -cutting a release, bump **every** location below to the new version: - -| File | What to change | -|------|----------------| -| `CMakeLists.txt` | `project(MafiaNet VERSION X.Y.Z ...)` — the canonical source of truth | -| `Source/include/mafianet/version.h` | `MAFIANET_VERSION`, `MAFIANET_VERSION_NUMBER_INT`, and the `MAJOR`/`MINOR`/`PATCH` defines (leave the deprecated `RAKNET_*` / `SLIKENET_*` defines untouched) | -| `docs/conf.py` | `version` and `release` | -| `docs/Doxyfile` | `PROJECT_NUMBER` | -| `docs/changelog.rst` | Add a new `Version X.Y.Z` section at the top | -| `README.md` | Add a new `### Version X.Y.Z (Latest)` entry under Changelog and drop `(Latest)` from the previous one | - -### Steps - -1. Determine the previous release boundary (e.g. `git log --reverse ..HEAD`, - or the last `Version` entry in `docs/changelog.rst` if no tag exists). -2. Summarize the changes since then from the commit history and write changelog - entries in `docs/changelog.rst` and `README.md`. -3. Bump the version in **all** files in the table above. -4. Commit: `git commit -am "chore(release): vX.Y.Z"`. -5. Tag: `git tag -a vX.Y.Z -m "MafiaNet vX.Y.Z"`. -6. Push: `git push origin --follow-tags`. -7. Create the GitHub release: `gh release create vX.Y.Z --title "vX.Y.Z" --notes "..."`. - -> Note: releases are tagged `vX.Y.Z` (with the `v` prefix); the in-code/CMake -> version strings are `X.Y.Z` (no prefix). +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Project Overview + +MafiaNet is a cross-platform network engine written in C++ for multiplayer games. It's a fork of SLikeNet, which itself continued RakNet. The project provides reliable UDP messaging, NAT traversal, peer-to-peer networking, and various game-specific networking features. + +## Build Commands + +### Linux / macOS + +```bash +# Configure (from repository root) +mkdir build && cd build +cmake .. + +# Build +cmake --build . # All platforms +cmake --build . --config Release # Release build + +# Build with samples and tests +cmake -DMAFIANET_BUILD_SAMPLES=ON .. + +# Quick rebuild after changes (from repository root) +cmake --build build -j$(nproc) # Linux +cmake --build build -j$(sysctl -n hw.ncpu) # macOS + +# Build options +cmake -DMAFIANET_BUILD_SHARED=ON .. # Build shared library (default: ON) +cmake -DMAFIANET_BUILD_STATIC=ON .. # Build static library (default: ON) +cmake -DMAFIANET_BUILD_TESTS=ON .. # Build test suite +``` + +### Windows (Visual Studio) + +CMake generates Visual Studio solutions automatically. No pre-built `.sln` or `.vcxproj` files are included in the repository. + +```powershell +# Generate Visual Studio 2022 solution +cmake -G "Visual Studio 17 2022" -A x64 -B build + +# Generate Visual Studio 2019 solution +cmake -G "Visual Studio 16 2019" -A x64 -B build + +# Build from command line +cmake --build build --config Release + +# Or open build/MafiaNet.sln in Visual Studio +``` + +Available generators (run `cmake --help` for full list): +- `"Visual Studio 17 2022"` - VS 2022 +- `"Visual Studio 16 2019"` - VS 2019 +- `"Ninja"` - Fast builds with Ninja + +### Build Options + +| Option | Default | Description | +|--------|---------|-------------| +| `MAFIANET_BUILD_SHARED` | ON | Build shared library (.dll/.so/.dylib) | +| `MAFIANET_BUILD_STATIC` | ON | Build static library (.lib/.a) | +| `MAFIANET_BUILD_SAMPLES` | OFF | Build sample applications | +| `MAFIANET_BUILD_TESTS` | OFF | Build test suite | +| `MAFIANET_BUILD_EXTRAS` | OFF | Build `MafiaNetExtras` (EmailSender, HTTPConnection*, Telnet/RakNet transports, ConsoleServer, command parsers, PacketConsoleLogger); forced ON by `MAFIANET_BUILD_SAMPLES` | +| `MAFIANET_DISABLED_FEATURES` | (empty) | Semicolon list of plugins to compile out (`_RAKNET_SUPPORT_=0`); names validated against `MAFIANET_OPTIONAL_FEATURES` in `Source/CMakeLists.txt` | +| `MAFIANET_MINIMAL` | OFF | Compile out every optional plugin (core transport only); built by the `linux-minimal` CI job | + +When adding or removing a plugin guarded by a `_RAKNET_SUPPORT_` flag, update +`MAFIANET_OPTIONAL_FEATURES` in `Source/CMakeLists.txt` as well, or the CMake +plugin selection silently drifts from `native_feature_includes.h`. + +File names under `Source/` are lowercase `snake_case` (`bit_stream.h`, `peer_interface.h`, +`reliability_layer.cpp`) with no `Rak`/`RakNet` prefix; this is MafiaNet. Class names keep +their historical spelling. Inside `Source/include/mafianet/`, include sibling headers only +as `"mafianet/.h"`, never as a bare `".h"`: several library headers share a name +with a C header (`string.h`, `time.h`, `assert.h`) and a bare quoted include would shadow +it. CI greps for this. Do not add PascalCase or shim headers. + +Dead platforms (Xbox 360, PS3, PS4, Vita, Native Client) were removed on purpose. +Do not reintroduce `__native_client__`, `_PS3`, `_PS4`, `SN_TARGET_*` or Xbox +preprocessor islands; MafiaNet targets Windows, Linux, macOS and the BSDs. + +### Batched Datagram I/O (recvmmsg / sendmmsg) + +Always on where the syscalls exist. **There is no build option and no macro** — the +paths are guarded by a plain `#if defined(__linux__)`. Do not reintroduce a flag or a +capability macro for this; a CMake option here was removed deliberately because it +left the shipping path uncompiled on most machines. + +The portable helpers in `mmsg_batch.h` (`DriveBatchedSend`, `ClassifySendmmsgErrno`, +`SockaddrToSystemAddress`, `CompactRecvSlots`, `RNS2SendBatch`) compile and are unit +tested on **every** platform; only the syscall glue is gated. Keep it that way — new +logic belongs in a portable helper with a unit test, not inside the `#if`. + +When changing `Source/src/mmsg_batch.cpp`, `RakNetSocket2*.cpp`, or the send path in +`reliability_layer.cpp`, a macOS/Windows build proves nothing about the batched paths. +Verify on Linux, in **both** `Debug` and `Release` (`RakAssert` only fires in Debug; +Release is what ships and exercises the backstops the asserts hide): + +```bash +docker run --rm -v "$PWD":/src:ro ubuntu:24.04 bash -c ' + apt-get update -qq && apt-get install -y -qq build-essential cmake libssl-dev git ca-certificates + cp -r /src /work && cd /work + for cfg in Debug Release; do + cmake -B /b-$cfg -S . -DCMAKE_BUILD_TYPE=$cfg -DMAFIANET_BUILD_TESTS=ON + cmake --build /b-$cfg --parallel "$(nproc)" + ctest --test-dir /b-$cfg --output-on-failure --timeout 600 || exit 1 + done' +``` + +`Tests/Integration/MmsgBatchLiveTests.cpp` is the suite that actually fills batches +(the rest of the suite sends ~1 datagram per tick and never crosses `MMSG_BATCH_MAX`). +Keep its message counts above `MMSG_BATCH_MAX` or that coverage silently disappears. + +**Requirements:** +- CMake 3.21+ +- C++17 compiler +- OpenSSL 3.0+ +- Platform libs: ws2_32 (Windows), pthread (Unix) +- Internet connection (first configure fetches dependencies via FetchContent) + +## Running Tests + +All tests are GoogleTest, built with `MAFIANET_BUILD_TESTS=ON` (requires `MAFIANET_BUILD_STATIC=ON`) and driven by CTest. Two binaries under `Tests/`: + +- **`UnitTests`** (`Tests/Unit/`, label `unit`): hermetic and deterministic — no loopback networking, no wall-clock timing. A started-but-unconnected peer with synchronous assertions is acceptable. New tests for pure logic go here. +- **`IntegrationTests`** (`Tests/Integration/`, label `integration`): real UDP over loopback. Discovered tests get `RUN_SERIAL` (several bind fixed ports) and a 600s timeout. Shared polling/connect helpers live in `Tests/Support/`. + +Under ctest, every `TEST()` runs in its own process — never write tests that depend on state from a previous `TEST()`. Long sequential networking scenarios belong in a single `TEST_F`. + +```bash +cmake -B build -DMAFIANET_BUILD_TESTS=ON +cmake --build build + +ctest --test-dir build --output-on-failure # everything +ctest --test-dir build -L unit # hermetic unit suite only +ctest --test-dir build -L integration # loopback integration suite only +ctest --test-dir build -R "DispatcherLive" # by name pattern +``` + +For debugging, run a binary directly with a filter: `./build/Tests/IntegrationTests --gtest_filter='DispatcherLive.*'`; reproduce flakes with `--gtest_repeat=100 --gtest_break_on_failure`. + +## Writing Tests + +**Every change to library code in `Source/` needs tests, written in the new paradigm.** Do not create new test harnesses, `main()` functions, standalone test executables, or sample apps that act as tests — add GoogleTest cases to the existing suites. New `.cpp` files under `Tests/Unit/` and `Tests/Integration/` are picked up automatically by the build (glob); no CMake edits are needed unless you add a new directory. + +**Default to Unit; escalate to Integration only when the behavior under test genuinely requires traffic.** Ask: can this be tested by calling the API synchronously? Serialization, containers, builders, dispatch tables, ID assignment, string/GUID utilities, replica-visibility queries — all Unit. Only reliability, connection lifecycle, and anything that must cross the network thread belongs in Integration. + +**Unit tests** (`Tests/Unit/Tests.cpp`): +- Hermetic and deterministic: no `Connect()`, no `RakSleep`-with-deadline polling, no dependence on wall-clock time or packet arrival. A started-but-unconnected peer with purely synchronous assertions is acceptable (see `GuidUtilTests.cpp`, `VirtualWorldTests.cpp`). +- Split independent checks into separate `TEST()`/`TEST_F()` cases with descriptive names (`TEST(Dispatcher, AutoAssignedIdsFollowRegistrationOrder)`) — under ctest each case is reported, filtered, and retried individually. See `PointGridSectorizerTests.cpp` for the pattern. +- Deterministic pseudo-randomness is fine and encouraged for stress tests (fixed-seed LCG differential testing against a reference model). + +**Integration tests** (`Tests/Integration/Tests.cpp`): +- One `TEST_F` per sequential scenario. Never split phases that share connection state into separate `TEST`s — each `TEST` runs in its own process under ctest. +- Ports: use OS-assigned ephemeral ports (`SocketDescriptor(0, "127.0.0.1")`, then `peer->GetInternalID().GetPort()`), never a new fixed port. (Some ported legacy tests still bind fixed ports; that is why the suite is `RUN_SERIAL` — do not add to the problem.) +- Waiting: always poll for a condition with a deadline (`while (GetTimeMS() - start < N && !condition) { pump; RakSleep(30); }`), never assert immediately after a state change — packets surface asynchronously from each peer's network thread, and both sides of a handshake must be pumped until *each* has observed the event. +- Never use a bare `RakSleep(N)` as a synchronization primitive; sleep only as the polling interval inside a deadline loop. +- Cleanup must survive a failed `ASSERT_`: destroy peers in fixture `TearDown()` (`Shutdown(100)` then `DestroyInstance` for every peer created) or use RAII `Peer`/`PacketPtr` handles from `mafianet/peer_handle.h`. Never rely on code after the assertions to clean up. +- Write correctness assertions so a real regression fails on every attempt: CI retries transient integration failures (`ctest --repeat until-pass:3`), which must only absorb timing misses, never actual bugs. Do not add retry loops inside tests. +- Reusable connect/wait helpers live in `Tests/Support/` (`CommonFunctions.h`, `TestHelpers.h`); extend those rather than duplicating polling loops. + +**Before claiming a change is done**, build with `-DMAFIANET_BUILD_TESTS=ON` and run at minimum `ctest --test-dir build -L unit` plus the integration tests touching the changed subsystem (`ctest -R `); run the full suite for changes to the reliability layer, peer lifecycle, or message routing. For a new integration test, prove it is not flaky: `./build/Tests/IntegrationTests --gtest_filter='.*' --gtest_repeat=10 --gtest_break_on_failure`. + +## Architecture + +### Namespaces +- Primary namespace: `MafiaNet` (e.g., `MafiaNet::RakPeerInterface`, `MafiaNet::BitStream`) — used exclusively throughout the library +- Short-hand alias: the `MNet` preprocessor macro (defined in `mafianet/defines.h`) expands to `MafiaNet` as a convenience shorthand + +### Key Components + +**Networking Core** (`Source/include/mafianet/`): +- `RakPeerInterface` - Main entry point. Use `MafiaNet::RakPeerInterface::GetInstance()` to create +- `BitStream` - Binary serialization for packets +- `Packet` - Received network data container +- `SystemAddress` - Network endpoint identifier +- `message_identifiers.h` - Packet type IDs (extend with `ID_USER_PACKET_ENUM`) + +**Plugin System** (`PluginInterface2`): +- Extend functionality by attaching plugins to RakPeerInterface +- Examples: `FileListTransfer`, `FullyConnectedMesh2`, `NatPunchthroughClient` + +**Data Structures** (`DS_*` headers): +- Custom containers: `DS_List`, `DS_Queue`, `DS_Map`, `DS_OrderedList` +- Memory pools: `DS_MemoryPool` + +### Directory Structure + +``` +Source/ +├── include/mafianet/ # Public API headers (include as "mafianet/...") +└── src/ # Implementation files + +Samples/ # 80+ examples demonstrating features +DependentExtensions/ # Optional integrations (database, voice, patching) +cmake/ # CMake modules including FetchDependencies.cmake +``` + +### DependentExtensions + +Optional integrations built when `MAFIANET_BUILD_SAMPLES=ON`: +- **Database**: `MySQLInterface`, `PostgreSQLInterface` - Database connectivity +- **Autopatcher**: Delta patching system for game updates (uses bzip2) +- **RakVoice**: Voice compression and transmission (uses Opus, RNNoise) +- **Lobby2**: Matchmaking and lobby system + +Dependencies (bzip2, miniupnpc, Opus, RNNoise) are automatically fetched via CMake FetchContent at configure time. + +### Basic Usage Pattern + +```cpp +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" + +// Create peer +MafiaNet::RakPeerInterface* peer = MafiaNet::RakPeerInterface::GetInstance(); + +// Start (server) +MafiaNet::SocketDescriptor sd(60000, 0); +peer->Startup(maxConnections, &sd, 1); +peer->SetMaximumIncomingConnections(maxConnections); + +// Or connect (client) +peer->Connect("127.0.0.1", 60000, nullptr, 0); + +// Process packets +MafiaNet::Packet* packet; +while ((packet = peer->Receive()) != nullptr) { + switch (packet->data[0]) { + case ID_NEW_INCOMING_CONNECTION: + // Handle new connection + break; + // ... handle other message types + } + peer->DeallocatePacket(packet); +} + +// Cleanup +MafiaNet::RakPeerInterface::DestroyInstance(peer); +``` + +## Key Samples + +- `Samples/Ping/` - Basic UDP ping (beginner) +- `Samples/ChatExample/` - Simple chat application +- `Samples/ReplicaManager3/` - Object replication system +- `Samples/NATCompleteServer/` - NAT traversal demonstration +- `Tests/` - GoogleTest suites (`Unit/`, `Integration/`, shared helpers in `Support/`) + +## Releasing (Version Bump Procedure) + +MafiaNet uses [Semantic Versioning](https://semver.org/) (`MAJOR.MINOR.PATCH`). +The version string lives in **several** places that must all be kept in sync. When +cutting a release, bump **every** location below to the new version: + +| File | What to change | +|------|----------------| +| `CMakeLists.txt` | `project(MafiaNet VERSION X.Y.Z ...)` — the canonical source of truth | +| `Source/include/mafianet/version.h` | `MAFIANET_VERSION`, `MAFIANET_VERSION_NUMBER_INT`, and the `MAJOR`/`MINOR`/`PATCH` defines (leave the deprecated `RAKNET_*` / `SLIKENET_*` defines untouched) | +| `docs/conf.py` | `version` and `release` | +| `docs/Doxyfile` | `PROJECT_NUMBER` | +| `docs/changelog.rst` | Add a new `Version X.Y.Z` section at the top | +| `README.md` | Add a new `### Version X.Y.Z (Latest)` entry under Changelog and drop `(Latest)` from the previous one | + +### Steps + +1. Determine the previous release boundary (e.g. `git log --reverse ..HEAD`, + or the last `Version` entry in `docs/changelog.rst` if no tag exists). +2. Summarize the changes since then from the commit history and write changelog + entries in `docs/changelog.rst` and `README.md`. +3. Bump the version in **all** files in the table above. +4. Commit: `git commit -am "chore(release): vX.Y.Z"`. +5. Tag: `git tag -a vX.Y.Z -m "MafiaNet vX.Y.Z"`. +6. Push: `git push origin --follow-tags`. +7. Create the GitHub release: `gh release create vX.Y.Z --title "vX.Y.Z" --notes "..."`. + +> Note: releases are tagged `vX.Y.Z` (with the `v` prefix); the in-code/CMake +> version strings are `X.Y.Z` (no prefix). diff --git a/CMakeLists.txt b/CMakeLists.txt index aaa1d3148..b249e263e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,28 @@ option(MAFIANET_BUILD_SHARED "Build shared library" ON) option(MAFIANET_BUILD_STATIC "Build static library" ON) option(MAFIANET_BUILD_SAMPLES "Build sample applications" OFF) option(MAFIANET_BUILD_TESTS "Build test suite" OFF) +# Non-networking utilities (EmailSender, HTTPConnection/HTTPConnection2, +# TelnetTransport, RakNetTransport2, ConsoleServer, LogCommandParser, +# RakNetCommandParser, PacketConsoleLogger) live in the separate MafiaNetExtras +# target. Off by default; several samples use them, so MAFIANET_BUILD_SAMPLES +# turns it on. +option(MAFIANET_BUILD_EXTRAS "Build the MafiaNetExtras library (SMTP, HTTP, telnet/console transports)" OFF) +if(MAFIANET_BUILD_SAMPLES AND NOT MAFIANET_BUILD_EXTRAS) + message(STATUS "MafiaNet: MAFIANET_BUILD_SAMPLES requires the extras library; enabling MAFIANET_BUILD_EXTRAS") + set(MAFIANET_BUILD_EXTRAS ON CACHE BOOL "Build the MafiaNetExtras library (SMTP, HTTP, telnet/console transports)" FORCE) +endif() + +# Plugin selection. Every optional plugin in the core library is guarded by a +# _RAKNET_SUPPORT_ flag from native_feature_includes.h. These two settings +# are the supported way to compile plugins out without editing that header: +# -DMAFIANET_DISABLED_FEATURES="ReplicaManager3;RPC4Plugin" drop specific plugins +# -DMAFIANET_MINIMAL=ON drop every optional plugin +# The resulting defines are PUBLIC on the library targets, so consumers see the +# same header configuration the library was built with. See +# docs/getting-started/building.rst ("Minimal builds") and Source/CMakeLists.txt. +set(MAFIANET_DISABLED_FEATURES "" CACHE STRING + "Semicolon-separated plugin names to compile out (see MAFIANET_OPTIONAL_FEATURES in Source/CMakeLists.txt)") +option(MAFIANET_MINIMAL "Compile out every optional plugin (core transport only)" OFF) # Ensure at least one library type is built if(NOT MAFIANET_BUILD_SHARED AND NOT MAFIANET_BUILD_STATIC) diff --git a/DependentExtensions/Autopatcher/AutopatcherClient.cpp b/DependentExtensions/Autopatcher/AutopatcherClient.cpp index 6d25d2433..7a8cf06c8 100644 --- a/DependentExtensions/Autopatcher/AutopatcherClient.cpp +++ b/DependentExtensions/Autopatcher/AutopatcherClient.cpp @@ -14,28 +14,28 @@ */ #include "AutopatcherClient.h" -#include "mafianet/DirectoryDeltaTransfer.h" -#include "mafianet/FileList.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/peerinterface.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/AutopatcherPatchContext.h" +#include "mafianet/directory_delta_transfer.h" +#include "mafianet/file_list.h" +#include "mafianet/string_compressor.h" +#include "mafianet/peer_interface.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/autopatcher_patch_context.h" #include "ApplyPatch.h" -#include "mafianet/FileOperations.h" -//#include "mafianet/DR_SHA1.h" +#include "mafianet/file_operations.h" +//#include "mafianet/dr_sha1.h" #include -#include "mafianet/FileOperations.h" +#include "mafianet/file_operations.h" #include "mafianet/assert.h" -#include "mafianet/ThreadPool.h" +#include "mafianet/thread_pool.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" using namespace MafiaNet; -#include "mafianet/SuperFastHash.h" +#include "mafianet/super_fast_hash.h" static const unsigned HASH_LENGTH=4; #define COPY_ON_RESTART_EXTENSION ".patched.tmp" diff --git a/DependentExtensions/Autopatcher/AutopatcherClient.h b/DependentExtensions/Autopatcher/AutopatcherClient.h index a39b986a7..e8d9a63c1 100644 --- a/DependentExtensions/Autopatcher/AutopatcherClient.h +++ b/DependentExtensions/Autopatcher/AutopatcherClient.h @@ -21,13 +21,13 @@ #define __AUTOPATCHER_CLIENT_H #include "mafianet/types.h" -#include "mafianet/Export.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/FileList.h" -#include "mafianet/SimpleMutex.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/AutopatcherPatchContext.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/file_list.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/autopatcher_patch_context.h" namespace MafiaNet { diff --git a/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.cpp b/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.cpp index 1f819d83b..3b1d337a8 100644 --- a/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.cpp +++ b/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.cpp @@ -15,10 +15,10 @@ #include "mafianet/string.h" #include "AutopatcherMySQLRepository.h" -#include "mafianet/AutopatcherPatchContext.h" -#include "mafianet/FileList.h" +#include "mafianet/autopatcher_patch_context.h" +#include "mafianet/file_list.h" #include "mafianet/assert.h" -#include "mafianet/DS_List.h" +#include "mafianet/ds_list.h" // ntohl #ifdef _WIN32 #include @@ -29,10 +29,10 @@ // If you get fatal error C1083: Cannot open include file: 'mysql.h' then you need to install MySQL. See readme.txt in this sample directory. #include "mysql.h" #include "CreatePatch.h" -#include "mafianet/AutopatcherPatchContext.h" -// #include "mafianet/DR_SHA1.h" +#include "mafianet/autopatcher_patch_context.h" +// #include "mafianet/dr_sha1.h" #include -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.h b/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.h index b3d149cd1..540f06647 100644 --- a/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.h +++ b/DependentExtensions/Autopatcher/AutopatcherMySQLRepository/AutopatcherMySQLRepository.h @@ -22,9 +22,9 @@ #ifndef __MYSQL_REPOSITORY_H #define __MYSQL_REPOSITORY_H -#include "mafianet/AutopatcherRepositoryInterface.h" +#include "mafianet/autopatcher_repository_interface.h" #include "MySQLInterface.h" -#include "mafianet/Export.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.cpp b/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.cpp index b091c23f6..1e6a51b00 100644 --- a/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.cpp +++ b/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.cpp @@ -18,15 +18,15 @@ #include "AutopatcherPostgreRepository.h" -#include "mafianet/AutopatcherPatchContext.h" -#include "mafianet/FileList.h" +#include "mafianet/autopatcher_patch_context.h" +#include "mafianet/file_list.h" // libpq-fe.h is part of PostgreSQL which must be installed on this computer to use the PostgreRepository #include "libpq-fe.h" #include "CreatePatch.h" -#include "mafianet/AutopatcherPatchContext.h" -// #include "mafianet/DR_SHA1.h" +#include "mafianet/autopatcher_patch_context.h" +// #include "mafianet/dr_sha1.h" #include -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" // localtime diff --git a/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.h b/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.h index eb706b9f6..acc9e3728 100644 --- a/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.h +++ b/DependentExtensions/Autopatcher/AutopatcherPostgreRepository/AutopatcherPostgreRepository.h @@ -20,9 +20,9 @@ #define _USE_POSTGRE_REPOSITORY #ifdef _USE_POSTGRE_REPOSITORY -#include "mafianet/AutopatcherRepositoryInterface.h" +#include "mafianet/autopatcher_repository_interface.h" #include "PostgreSQLInterface.h" -#include "mafianet/Export.h" +#include "mafianet/export.h" struct pg_conn; typedef struct pg_conn PGconn; diff --git a/DependentExtensions/Autopatcher/AutopatcherServer.cpp b/DependentExtensions/Autopatcher/AutopatcherServer.cpp index c029cc77a..e28467855 100644 --- a/DependentExtensions/Autopatcher/AutopatcherServer.cpp +++ b/DependentExtensions/Autopatcher/AutopatcherServer.cpp @@ -18,17 +18,17 @@ #include "AutopatcherServer.h" -#include "mafianet/DirectoryDeltaTransfer.h" -#include "mafianet/FileList.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/peerinterface.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/AutopatcherRepositoryInterface.h" +#include "mafianet/directory_delta_transfer.h" +#include "mafianet/file_list.h" +#include "mafianet/string_compressor.h" +#include "mafianet/peer_interface.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/autopatcher_repository_interface.h" #include "mafianet/assert.h" -#include "mafianet/AutopatcherPatchContext.h" +#include "mafianet/autopatcher_patch_context.h" #include #include diff --git a/DependentExtensions/Autopatcher/AutopatcherServer.h b/DependentExtensions/Autopatcher/AutopatcherServer.h index 27e9e1317..233b21676 100644 --- a/DependentExtensions/Autopatcher/AutopatcherServer.h +++ b/DependentExtensions/Autopatcher/AutopatcherServer.h @@ -31,14 +31,14 @@ #define __AUTOPATCHER_SERVER_H #include "mafianet/types.h" -#include "mafianet/Export.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/ThreadPool.h" -#include "mafianet/BitStream.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/thread_pool.h" +#include "mafianet/bit_stream.h" #include "mafianet/string.h" -#include "mafianet/FileList.h" -#include "mafianet/IncrementalReadInterface.h" +#include "mafianet/file_list.h" +#include "mafianet/incremental_read_interface.h" namespace MafiaNet { diff --git a/DependentExtensions/Lobby2/.DS_Store b/DependentExtensions/Lobby2/.DS_Store new file mode 100644 index 000000000..31d2b0bc0 Binary files /dev/null and b/DependentExtensions/Lobby2/.DS_Store differ diff --git a/DependentExtensions/Lobby2/LibVoice/LibVoice.h b/DependentExtensions/Lobby2/LibVoice/LibVoice.h index 4fad14ac9..8e889fea6 100644 --- a/DependentExtensions/Lobby2/LibVoice/LibVoice.h +++ b/DependentExtensions/Lobby2/LibVoice/LibVoice.h @@ -13,7 +13,7 @@ /// -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" diff --git a/DependentExtensions/Lobby2/Lobby2Client.cpp b/DependentExtensions/Lobby2/Lobby2Client.cpp index f0119795f..dda646670 100644 --- a/DependentExtensions/Lobby2/Lobby2Client.cpp +++ b/DependentExtensions/Lobby2/Lobby2Client.cpp @@ -15,7 +15,7 @@ #include "Lobby2Client.h" #include "mafianet/assert.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" using namespace MafiaNet; diff --git a/DependentExtensions/Lobby2/Lobby2Client.h b/DependentExtensions/Lobby2/Lobby2Client.h index 580c612bc..ce4c86c16 100644 --- a/DependentExtensions/Lobby2/Lobby2Client.h +++ b/DependentExtensions/Lobby2/Lobby2Client.h @@ -17,7 +17,7 @@ #define __LOBBY_2_CLIENT_H #include "Lobby2Plugin.h" -#include "mafianet/DS_OrderedList.h" +#include "mafianet/ds_ordered_list.h" namespace MafiaNet { diff --git a/DependentExtensions/Lobby2/Lobby2Message.h b/DependentExtensions/Lobby2/Lobby2Message.h index f9654e0d4..e0c46863c 100644 --- a/DependentExtensions/Lobby2/Lobby2Message.h +++ b/DependentExtensions/Lobby2/Lobby2Message.h @@ -16,12 +16,12 @@ #ifndef __LOBBY_2_MESSAGE_H #define __LOBBY_2_MESSAGE_H -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "Lobby2ResultCode.h" #include "mafianet/string.h" #include "mafianet/assert.h" -#include "mafianet/smartptr.h" -#include "mafianet/SimpleMutex.h" +#include "mafianet/smart_ptr.h" +#include "mafianet/simple_mutex.h" #include "Lobby2Presence.h" diff --git a/DependentExtensions/Lobby2/Lobby2Plugin.h b/DependentExtensions/Lobby2/Lobby2Plugin.h index 2639bab63..5a41f0224 100644 --- a/DependentExtensions/Lobby2/Lobby2Plugin.h +++ b/DependentExtensions/Lobby2/Lobby2Plugin.h @@ -17,9 +17,9 @@ #define __LOBBY_2_PLUGIN_H #include "Lobby2Message.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/peerinterface.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/peer_interface.h" /// \defgroup LOBBY_2_GROUP Lobby2Plugin /// \brief SQL based lobby system, with support for users, friends, clans, emails, ranking, and a message board diff --git a/DependentExtensions/Lobby2/Lobby2Presence.cpp b/DependentExtensions/Lobby2/Lobby2Presence.cpp index 6173bb536..f7949c451 100644 --- a/DependentExtensions/Lobby2/Lobby2Presence.cpp +++ b/DependentExtensions/Lobby2/Lobby2Presence.cpp @@ -14,7 +14,7 @@ */ #include "Lobby2Presence.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; diff --git a/DependentExtensions/Lobby2/Lobby2Server.cpp b/DependentExtensions/Lobby2/Lobby2Server.cpp index 0bc74f091..448ca5f75 100644 --- a/DependentExtensions/Lobby2/Lobby2Server.cpp +++ b/DependentExtensions/Lobby2/Lobby2Server.cpp @@ -15,7 +15,7 @@ #include "Lobby2Server.h" #include "mafianet/assert.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" //#define __INTEGRATE_LOBBY2_WITH_ROOMS_PLUGIN diff --git a/DependentExtensions/Lobby2/Lobby2Server.h b/DependentExtensions/Lobby2/Lobby2Server.h index f7c7ce26d..cf2ec63aa 100644 --- a/DependentExtensions/Lobby2/Lobby2Server.h +++ b/DependentExtensions/Lobby2/Lobby2Server.h @@ -16,11 +16,11 @@ #ifndef __LOBBY_2_SERVER_H #define __LOBBY_2_SERVER_H -#include "mafianet/Export.h" +#include "mafianet/export.h" #include "mafianet/types.h" #include "Lobby2Plugin.h" -#include "mafianet/DS_OrderedList.h" -#include "mafianet/ThreadPool.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/thread_pool.h" #include "Lobby2Presence.h" //class PostgreSQLInterface; diff --git a/DependentExtensions/Lobby2/PGSQL/Lobby2Message_PGSQL.h b/DependentExtensions/Lobby2/PGSQL/Lobby2Message_PGSQL.h index 24844b076..bbc4fe2aa 100644 --- a/DependentExtensions/Lobby2/PGSQL/Lobby2Message_PGSQL.h +++ b/DependentExtensions/Lobby2/PGSQL/Lobby2Message_PGSQL.h @@ -18,7 +18,7 @@ // libpq-fe.h is part of PostgreSQL which must be installed on this computer to use the PostgreRepository #include "libpq-fe.h" #include "PostgreSQLInterface.h" -#include "mafianet/EpochTimeToString.h" +#include "mafianet/epoch_time_to_string.h" #ifndef __LOBBY_2_MESSAGE_PGSQL_H #define __LOBBY_2_MESSAGE_PGSQL_H diff --git a/DependentExtensions/Lobby2/Rooms/ProfanityFilter.cpp b/DependentExtensions/Lobby2/Rooms/ProfanityFilter.cpp index 5e82a29fb..7691b02c6 100644 --- a/DependentExtensions/Lobby2/Rooms/ProfanityFilter.cpp +++ b/DependentExtensions/Lobby2/Rooms/ProfanityFilter.cpp @@ -14,9 +14,9 @@ */ #include "ProfanityFilter.h" -#include "mafianet/Rand.h" +#include "mafianet/rand.h" #include "mafianet/assert.h" -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/DependentExtensions/Lobby2/Rooms/ProfanityFilter.h b/DependentExtensions/Lobby2/Rooms/ProfanityFilter.h index 26f0e7c97..01d6fdeba 100644 --- a/DependentExtensions/Lobby2/Rooms/ProfanityFilter.h +++ b/DependentExtensions/Lobby2/Rooms/ProfanityFilter.h @@ -16,7 +16,7 @@ #ifndef __PROFANITY_FILTER__H__ #define __PROFANITY_FILTER__H__ -#include "mafianet/DS_List.h" +#include "mafianet/ds_list.h" #include "mafianet/string.h" namespace MafiaNet { diff --git a/DependentExtensions/Lobby2/Rooms/RoomTypes.h b/DependentExtensions/Lobby2/Rooms/RoomTypes.h index 1583afca4..12e367dd2 100644 --- a/DependentExtensions/Lobby2/Rooms/RoomTypes.h +++ b/DependentExtensions/Lobby2/Rooms/RoomTypes.h @@ -12,7 +12,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/DS_Table.h" +#include "mafianet/ds_table.h" #ifndef __ROOM_TYPES_H #define __ROOM_TYPES_H diff --git a/DependentExtensions/Lobby2/Rooms/RoomsContainer.cpp b/DependentExtensions/Lobby2/Rooms/RoomsContainer.cpp index 42d9c2828..0865d3168 100644 --- a/DependentExtensions/Lobby2/Rooms/RoomsContainer.cpp +++ b/DependentExtensions/Lobby2/Rooms/RoomsContainer.cpp @@ -16,9 +16,9 @@ #include "RoomsContainer.h" #include "ProfanityFilter.h" #include "mafianet/assert.h" -#include "mafianet/GetTime.h" -#include "mafianet/BitStream.h" -#include "mafianet/TableSerializer.h" +#include "mafianet/get_time.h" +#include "mafianet/bit_stream.h" +#include "mafianet/table_serializer.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/DependentExtensions/Lobby2/Rooms/RoomsContainer.h b/DependentExtensions/Lobby2/Rooms/RoomsContainer.h index 7e3465982..c7fef6e63 100644 --- a/DependentExtensions/Lobby2/Rooms/RoomsContainer.h +++ b/DependentExtensions/Lobby2/Rooms/RoomsContainer.h @@ -16,10 +16,10 @@ #ifndef __LOBBY_ROOM_H #define __LOBBY_ROOM_H -#include "mafianet/DS_Map.h" -#include "mafianet/DS_Table.h" +#include "mafianet/ds_map.h" +#include "mafianet/ds_table.h" #include "RoomsErrorCodes.h" -#include "mafianet/DS_List.h" +#include "mafianet/ds_list.h" #include "mafianet/types.h" #include "IntervalTimer.h" #include "RoomTypes.h" diff --git a/DependentExtensions/Lobby2/Rooms/RoomsPlugin.cpp b/DependentExtensions/Lobby2/Rooms/RoomsPlugin.cpp index f2c844084..0ecac29df 100644 --- a/DependentExtensions/Lobby2/Rooms/RoomsPlugin.cpp +++ b/DependentExtensions/Lobby2/Rooms/RoomsPlugin.cpp @@ -14,14 +14,14 @@ */ #include "RoomsPlugin.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "RoomsErrorCodes.h" -#include "mafianet/TableSerializer.h" +#include "mafianet/table_serializer.h" #include "mafianet/assert.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" #include "ProfanityFilter.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/DependentExtensions/Lobby2/Rooms/RoomsPlugin.h b/DependentExtensions/Lobby2/Rooms/RoomsPlugin.h index 6b63d8ea1..fce79f4a8 100644 --- a/DependentExtensions/Lobby2/Rooms/RoomsPlugin.h +++ b/DependentExtensions/Lobby2/Rooms/RoomsPlugin.h @@ -23,12 +23,12 @@ #define __ROOMS_PLUGIN_H #include "mafianet/types.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/DS_OrderedList.h" -#include "mafianet/Export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/export.h" #include "RoomsContainer.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/BitStream.h" +#include "mafianet/packet_priority.h" +#include "mafianet/bit_stream.h" /// \defgroup ROOMS_GROUP RoomsPlugin /// \brief Networked implementation of a rooms system, where members join and leave rooms. diff --git a/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam.h b/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam.h index 826e34658..87053ba02 100644 --- a/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam.h +++ b/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam.h @@ -17,7 +17,7 @@ #define __LOBBY_2_CLIENT_STEAM_H #include "Lobby2Plugin.h" -#include "mafianet/DS_OrderedList.h" +#include "mafianet/ds_ordered_list.h" #include "mafianet/types.h" namespace MafiaNet diff --git a/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.cpp b/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.cpp index 962fb9143..06d6daa8e 100644 --- a/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.cpp +++ b/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.cpp @@ -16,8 +16,8 @@ #include "Lobby2Client_Steam_Impl.h" #include "Lobby2Message_Steam.h" #include -#include "mafianet/NativeTypes.h" -#include "mafianet/MTUSize.h" +#include "mafianet/native_types.h" +#include "mafianet/mtu_size.h" #include using namespace MafiaNet; diff --git a/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.h b/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.h index fe9d1b8ea..205a1b610 100644 --- a/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.h +++ b/DependentExtensions/Lobby2/Steam/Lobby2Client_Steam_Impl.h @@ -21,9 +21,9 @@ #include "steam_api.h" #pragma warning( pop ) #include "Lobby2Client_Steam.h" -#include "mafianet/DS_Multilist.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/DS_OrderedList.h" +#include "mafianet/ds_multilist.h" +#include "mafianet/socket_layer.h" +#include "mafianet/ds_ordered_list.h" namespace MafiaNet { diff --git a/DependentExtensions/Lobby2/Steam/Lobby2Message_Steam.h b/DependentExtensions/Lobby2/Steam/Lobby2Message_Steam.h index c07f9dd70..607cb5169 100644 --- a/DependentExtensions/Lobby2/Steam/Lobby2Message_Steam.h +++ b/DependentExtensions/Lobby2/Steam/Lobby2Message_Steam.h @@ -17,7 +17,7 @@ #define __LOBBY_2_MESSAGE_STEAM_H #include "Lobby2Message.h" -#include "mafianet/DS_Multilist.h" +#include "mafianet/ds_multilist.h" #include "Lobby2Client_Steam.h" namespace MafiaNet diff --git a/DependentExtensions/MySQLInterface/MySQLInterface.cpp b/DependentExtensions/MySQLInterface/MySQLInterface.cpp index 7607665b6..380c42fe1 100644 --- a/DependentExtensions/MySQLInterface/MySQLInterface.cpp +++ b/DependentExtensions/MySQLInterface/MySQLInterface.cpp @@ -15,17 +15,15 @@ #include "MySQLInterface.h" #include "mafianet/assert.h" -#include "mafianet/BitStream.h" -#include "mafianet/FormatString.h" -#include "mafianet/LinuxStrings.h" +#include "mafianet/bit_stream.h" +#include "mafianet/format_string.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include #ifdef _WIN32 -#elif defined(_PS3) || defined(__PS3__) || defined(SN_TARGET_PS3) - #else #include //atoi #endif diff --git a/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.cpp b/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.cpp index 51df6fa7d..feed5b623 100644 --- a/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.cpp +++ b/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.cpp @@ -14,7 +14,7 @@ */ #include "PostgreSQLInterface.h" -#include "mafianet/VariadicSQLParser.h" +#include "mafianet/variadic_sql_parser.h" // libpq-fe.h is part of PostgreSQL which must be installed on this computer to use the PostgreRepository #include "libpq-fe.h" @@ -39,9 +39,9 @@ #include "mafianet/string.h" #include "mafianet/assert.h" -#include "mafianet/BitStream.h" -#include "mafianet/FormatString.h" -#include "mafianet/LinuxStrings.h" +#include "mafianet/bit_stream.h" +#include "mafianet/format_string.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.h b/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.h index b3ac5a5ea..687b6a8e5 100644 --- a/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.h +++ b/DependentExtensions/PostgreSQLInterface/PostgreSQLInterface.h @@ -23,7 +23,7 @@ struct pg_result; typedef struct pg_result PGresult; #include "mafianet/string.h" -#include "mafianet/DS_OrderedList.h" +#include "mafianet/ds_ordered_list.h" class PostgreSQLInterface { diff --git a/DependentExtensions/RPC3/RPC3.cpp b/DependentExtensions/RPC3/RPC3.cpp index 32d8f0ff3..a518e2a5a 100644 --- a/DependentExtensions/RPC3/RPC3.cpp +++ b/DependentExtensions/RPC3/RPC3.cpp @@ -14,13 +14,13 @@ */ #include "RPC3.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" #include "mafianet/assert.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/BitStream.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/NetworkIDManager.h" +#include "mafianet/string_compressor.h" +#include "mafianet/bit_stream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/network_id_manager.h" #include using namespace MafiaNet; diff --git a/DependentExtensions/RPC3/RPC3.h b/DependentExtensions/RPC3/RPC3.h index 27045dba0..bdf003923 100644 --- a/DependentExtensions/RPC3/RPC3.h +++ b/DependentExtensions/RPC3/RPC3.h @@ -22,14 +22,14 @@ // Most of the internals of the boost code to make this work #include "RPC3_Boost.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" #include "mafianet/types.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "mafianet/string.h" -#include "mafianet/NetworkIDObject.h" -#include "mafianet/DS_Hash.h" -#include "mafianet/DS_OrderedList.h" +#include "mafianet/network_id_object.h" +#include "mafianet/ds_hash.h" +#include "mafianet/ds_ordered_list.h" /// \defgroup RPC_3_GROUP RPC3 /// \brief Remote procedure calls, powered by the 3rd party library Boost diff --git a/DependentExtensions/RPC3/RPC3_Boost.h b/DependentExtensions/RPC3/RPC3_Boost.h index 73a9f094e..eb40fec89 100644 --- a/DependentExtensions/RPC3/RPC3_Boost.h +++ b/DependentExtensions/RPC3/RPC3_Boost.h @@ -45,9 +45,9 @@ // Not needed? //#include -#include "mafianet/NetworkIDManager.h" -#include "mafianet/NetworkIDObject.h" -#include "mafianet/BitStream.h" +#include "mafianet/network_id_manager.h" +#include "mafianet/network_id_object.h" +#include "mafianet/bit_stream.h" namespace MafiaNet { diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.cpp b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.cpp index 29dd31dca..1e8822548 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.cpp @@ -10,9 +10,9 @@ #include "SQLiteClientLogger_PacketLogger.h" #include "SQLiteClientLoggerPlugin.h" -#include "mafianet/peerinterface.h" -#include "mafianet/InternalPacket.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/internal_packet.h" +#include "mafianet/message_identifiers.h" using namespace MafiaNet; diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.h b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.h index 0d5a0c1c2..c166b22f6 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.h +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_PacketLogger.h @@ -22,7 +22,7 @@ #ifndef __SQL_LITE_CLIENT_LOGGER_PACKET_LOGGER_H_ #define __SQL_LITE_CLIENT_LOGGER_PACKET_LOGGER_H_ -#include "mafianet/PacketLogger.h" +#include "mafianet/packet_logger.h" namespace MafiaNet { diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.cpp b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.cpp index 77c6362c8..556f861c0 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.cpp @@ -10,9 +10,9 @@ #include "SQLiteClientLogger_RNSLogger.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/statistics.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "SQLiteClientLoggerPlugin.h" using namespace MafiaNet; diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.h b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.h index 9e69b30f4..65d506890 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.h +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Optional/SQLiteClientLogger_RNSLogger.h @@ -22,7 +22,7 @@ #ifndef __SQL_LITE_CLIENT_LOGGER_RAKNET_STATISTICS_H_ #define __SQL_LITE_CLIENT_LOGGER_RAKNET_STATISTICS_H_ -#include "mafianet/PluginInterface2.h" +#include "mafianet/plugin_interface2.h" namespace MafiaNet { diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/SQLiteClientLoggerPlugin.cpp b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/SQLiteClientLoggerPlugin.cpp index 3c83f8c1a..b2706d16d 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/SQLiteClientLoggerPlugin.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/SQLiteClientLoggerPlugin.cpp @@ -9,9 +9,9 @@ */ #include "SQLiteClientLoggerPlugin.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/PacketizedTCP.h" -#include "mafianet/GetTime.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/get_time.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/D3D9/Matrices.cpp b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/D3D9/Matrices.cpp index 903f5d2fb..070d5e900 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/D3D9/Matrices.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/D3D9/Matrices.cpp @@ -36,7 +36,7 @@ // RakNet: Logger includes. Include before Windows.h #include "SQLiteClientLoggerPlugin.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/packetized_tcp.h" #include "DX9_BackbufferGrabber.h" #include diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Ogre3D/BspCollision.cpp b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Ogre3D/BspCollision.cpp index e53c59a95..db31916c5 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Ogre3D/BspCollision.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Ogre3D/BspCollision.cpp @@ -44,10 +44,10 @@ static const int num_rows = 3; // RakNet: Logger includes. #include "SQLiteClientLoggerPlugin.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/packetized_tcp.h" #include "Ogre3D_DX9_BackbufferGrabber.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" // Event handler to add ability to alter curvature class BspCollisionListener : public ExampleRefAppFrameListener diff --git a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Simple/SQLiteClientLoggerSample.cpp b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Simple/SQLiteClientLoggerSample.cpp index 6536cc4eb..2ebcdf95d 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Simple/SQLiteClientLoggerSample.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ClientOnly/Samples/Simple/SQLiteClientLoggerSample.cpp @@ -8,14 +8,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "SQLiteClientLoggerPlugin.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/Kbhit.h" -#include "mafianet/GetTime.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/kbhit.h" +#include "mafianet/get_time.h" +#include "mafianet/packetized_tcp.h" #include "mafianet/types.h" #include "mafianet/rand.h" #define M_PI 3.14159265358979323846 diff --git a/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.cpp b/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.cpp index cda36f80b..498812c6c 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.cpp @@ -9,7 +9,7 @@ */ #include "SQLiteLoggerCommon.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.h b/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.h index af2046ab5..d4ec312fa 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.h +++ b/DependentExtensions/SQLite3Plugin/Logger/SQLiteLoggerCommon.h @@ -13,7 +13,7 @@ #include #include "mafianet/defines.h" -#include "mafianet/NativeTypes.h" +#include "mafianet/native_types.h" namespace MafiaNet { diff --git a/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerPlugin.cpp b/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerPlugin.cpp index 29fe1fc46..2c55669d1 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerPlugin.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerPlugin.cpp @@ -9,14 +9,14 @@ */ #include "SQLiteServerLoggerPlugin.h" -#include "mafianet/peerinterface.h" -#include "mafianet/PacketizedTCP.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/message_identifiers.h" #include "SQLiteLoggerCommon.h" #include "jpeglib.h" #include "jpeg_memory_dest.h" -#include "mafianet/FileOperations.h" -#include "mafianet/GetTime.h" +#include "mafianet/file_operations.h" +#include "mafianet/get_time.h" #include #include #include diff --git a/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerSample.cpp b/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerSample.cpp index c415421a1..21f3514d4 100644 --- a/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerSample.cpp +++ b/DependentExtensions/SQLite3Plugin/Logger/ServerOnly/SQLiteServerLoggerSample.cpp @@ -8,14 +8,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "SQLiteServerLoggerPlugin.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/Kbhit.h" -#include "mafianet/GetTime.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/kbhit.h" +#include "mafianet/get_time.h" +#include "mafianet/packetized_tcp.h" int main(void) diff --git a/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.cpp b/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.cpp index 031abae21..8e7c2af2c 100644 --- a/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.cpp +++ b/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.cpp @@ -9,8 +9,8 @@ */ #include "SQLite3ClientPlugin.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; diff --git a/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.h b/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.h index ed2e33373..e1b6ef7cb 100644 --- a/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.h +++ b/DependentExtensions/SQLite3Plugin/SQLite3ClientPlugin.h @@ -23,11 +23,11 @@ #define ___SQLITE_3_CLIENT_PLUGIN_H #include "mafianet/types.h" -#include "mafianet/Export.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/SocketIncludes.h" -#include "mafianet/DS_Multilist.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/socket_includes.h" +#include "mafianet/ds_multilist.h" #include "mafianet/string.h" #include "SQLite3PluginCommon.h" diff --git a/DependentExtensions/SQLite3Plugin/SQLite3PluginCommon.h b/DependentExtensions/SQLite3Plugin/SQLite3PluginCommon.h index ded68ef31..9423936ee 100644 --- a/DependentExtensions/SQLite3Plugin/SQLite3PluginCommon.h +++ b/DependentExtensions/SQLite3Plugin/SQLite3PluginCommon.h @@ -16,9 +16,9 @@ #ifndef __SQL_LITE_3_PLUGIN_COMMON_H #define __SQL_LITE_3_PLUGIN_COMMON_H -#include "mafianet/DS_Multilist.h" +#include "mafianet/ds_multilist.h" #include "mafianet/string.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" /// \defgroup SQL_LITE_3_PLUGIN SQLite3Plugin /// \brief Code to transmit SQLite3 commands across the network diff --git a/DependentExtensions/SQLite3Plugin/SQLite3Sample.cpp b/DependentExtensions/SQLite3Plugin/SQLite3Sample.cpp index 93d421f99..8068088d0 100644 --- a/DependentExtensions/SQLite3Plugin/SQLite3Sample.cpp +++ b/DependentExtensions/SQLite3Plugin/SQLite3Sample.cpp @@ -17,14 +17,14 @@ /// \brief A sample for the SQLite3Plugin, that creates a table to track connections on the server /// The SQLite3Plugin is used with SQLite version 3 to transmit over the network calls to sqlite3_exec -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "SQLite3ServerPlugin.h" #include "SQLite3ClientPlugin.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/Gets.h" -#include "mafianet/Kbhit.h" -#include "mafianet/GetTime.h" +#include "mafianet/gets.h" +#include "mafianet/kbhit.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.cpp b/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.cpp index 23f08257d..fca6ea6af 100644 --- a/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.cpp +++ b/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.cpp @@ -14,9 +14,9 @@ */ #include "SQLite3ServerPlugin.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/GetTime.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.h b/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.h index 141677db5..06869e63b 100644 --- a/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.h +++ b/DependentExtensions/SQLite3Plugin/SQLite3ServerPlugin.h @@ -28,17 +28,17 @@ #define SQLite3_STATEMENT_EXECUTE_THREADED #include "mafianet/types.h" -#include "mafianet/Export.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/SocketIncludes.h" -#include "mafianet/DS_Multilist.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/socket_includes.h" +#include "mafianet/ds_multilist.h" #include "mafianet/string.h" #include "sqlite3.h" #include "SQLite3PluginCommon.h" #ifdef SQLite3_STATEMENT_EXECUTE_THREADED -#include "mafianet/ThreadPool.h" +#include "mafianet/thread_pool.h" #endif class RakPeerInterface; diff --git a/README.md b/README.md index dce7edc12..af47682a7 100644 --- a/README.md +++ b/README.md @@ -110,14 +110,14 @@ strace -f -c -e trace=sendmmsg,sendto,recvmmsg,recvfrom \ ``` The per-datagram column is what every non-Linux platform runs; to reproduce it on -Linux, flip the `#if defined(__linux__)` batching guards in `RakNetSocket2.cpp`, -`RakNetSocket2_Berkley.cpp`, `ReliabilityLayer.cpp` and `socket2.h` to `#if 0`. +Linux, flip the `#if defined(__linux__)` batching guards in `socket2.cpp`, +`socket2_berkley.cpp`, `reliability_layer.cpp` and `socket2.h` to `#if 0`. ### Basic Usage ```cpp -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" // Create a peer MafiaNet::RakPeerInterface* peer = MafiaNet::RakPeerInterface::GetInstance(); @@ -268,7 +268,7 @@ MafiaNet/ ├── DependentExtensions/ # Optional integrations │ ├── Autopatcher/ # Delta patching system │ ├── Lobby2/ # Matchmaking and lobbies -│ ├── RakVoice.cpp/h # Voice communication +│ ├── voice.cpp/h # Voice communication │ ├── MySQLInterface/ # MySQL connectivity │ ├── PostgreSQLInterface/# PostgreSQL connectivity │ ├── SQLite3Plugin/ # SQLite integration @@ -400,16 +400,16 @@ To debug a single test, run the binary directly with a filter: ### Version 0.11.0 - **Range-based receive `Peer::incoming()`**: drains the receive queue with a range-`for`; each iteration yields a fresh `PacketPtr` freed at end of scope, and `pkt.id()` returns the `ID_TIMESTAMP`-aware identifier - **Startup builders `Peer::server()` / `Peer::client()`**: fluent chain folding `SocketDescriptor` + `Startup` + result check + `SetMaximumIncomingConnections` / `Connect` into one call; `start()` returns a move-only `Result` whose error preserves the underlying `StartupResult` / `ConnectionAttemptResult` (tagged by `PeerStage`) instead of collapsing to a bool. Security stays opt-in (`secure()` / `public_key()`) -- **Serialization archives** (`mafianet/Archive.h`): one `serialize(Ar&)` member template describes a type's wire format for both directions; `WriteArchive` / `ReadArchive` adapt a `BitStream`, recursing into nested `serialize()` types and falling through to `operator<<`/`operator>>` (incl. per-type specializations) for everything else -- **Typed message dispatcher** (`mafianet/Dispatcher.h`): `on(handler)` auto-assigns ids from `ID_USER_PACKET_ENUM` in registration order (documented wire contract; `on(id, handler)` pins explicit ids), `on(id, handler)` covers system messages, `dispatch()` skips `ID_TIMESTAMP` prefixes and hands handlers a deserialized `T` plus a `Sender` (`guid()`/`peer_guid()`/`address()`/`guid_string()`); `encode()` is the symmetric write path. Opt-in — the raw `switch` stays fully usable +- **Serialization archives** (`mafianet/archive.h`): one `serialize(Ar&)` member template describes a type's wire format for both directions; `WriteArchive` / `ReadArchive` adapt a `BitStream`, recursing into nested `serialize()` types and falling through to `operator<<`/`operator>>` (incl. per-type specializations) for everything else +- **Typed message dispatcher** (`mafianet/dispatcher.h`): `on(handler)` auto-assigns ids from `ID_USER_PACKET_ENUM` in registration order (documented wire contract; `on(id, handler)` pins explicit ids), `on(id, handler)` covers system messages, `dispatch()` skips `ID_TIMESTAMP` prefixes and hands handlers a deserialized `T` plus a `Sender` (`guid()`/`peer_guid()`/`address()`/`guid_string()`); `encode()` is the symmetric write path. Opt-in — the raw `switch` stays fully usable - **Typed `Peer::send` / `Peer::broadcast`**: serialize-and-send a registered message in one call via the dispatcher registry, with overridable defaults (`Priority::High`, `Reliability::ReliableOrdered`, channel 0); destination accepts `SystemAddress` or `RakNetGUID`; raw `Send()` untouched -- **RakVoice built into the core library**: header now `mafianet/RakVoice.h`; Opus and RNNoise are fetched and linked into the core automatically — no separate extension build +- **RakVoice built into the core library**: header now `mafianet/voice.h`; Opus and RNNoise are fetched and linked into the core automatically — no separate extension build - **Full GoogleTest migration**: all 29 legacy tests ported, the `Samples/Tests` `TestInterface` harness deleted; hermetic `UnitTests` + loopback `IntegrationTests` under `Tests/`, one process per test via CTest, `MAFIANET_BUILD_TESTS` builds everything test-related (requires `MAFIANET_BUILD_STATIC`); CI runs ctest with JUnit artifacts on all platforms ### Version 0.10.0 - **Umbrella header `mafianet/mafianet.h`**: aggregates the core public headers (`RakPeerInterface`, types, message IDs, `PacketPriority`, `BitStream`, `GetTime`, `Statistics`) so the common path only needs `#include "mafianet/mafianet.h"`. Additive — granular headers remain; encryption headers are intentionally omitted (security stays opt-in via `InitializeSecurity()`) - **Canonical type aliases** (`mafianet/aliases.h`): `PeerInterface` (`RakPeerInterface`), `Guid` (`RakNetGUID`), `Statistics` (`RakNetStatistics`), `UnassignedGuid`. `using` aliases denoting the same types, so old and new names interoperate; legacy names left untouched -- **RAII handles `Peer` & `PacketPtr`** (`mafianet/PeerHandle.h`): own a `RakPeerInterface` / received `Packet` and clean up on scope exit, removing manual `DestroyInstance` / `DeallocatePacket` bookkeeping. ChatExample client rewritten to use them +- **RAII handles `Peer` & `PacketPtr`** (`mafianet/peer_handle.h`): own a `RakPeerInterface` / received `Packet` and clean up on scope exit, removing manual `DestroyInstance` / `DeallocatePacket` bookkeeping. ChatExample client rewritten to use them - **Thread-safe GUID value accessors** (`mafianet/guid_util.h`): `MafiaNet::to_string(const RakNetGUID&)` owns its buffer; `connected_address(...)` returns `std::optional` (sentinel → `nullopt`) - **`PointGridSectorizer`**: uniform point grid with O(1) `RemoveEntry`/`MoveEntry` via per-entry hash + swap-remove (early-out on same-cell moves), upsert add/move semantics, duplicate-free `GetEntries`, and edge-cell clamping. `GridSectorizer` left untouched - **Breaking — scoped enum classes**: the global `PacketPriority` / `PacketReliability` C enums are removed in favour of scoped `MafiaNet::Priority` / `MafiaNet::Reliability`. Enumerator order (and the wire field) is preserved, but call sites must update (`HIGH_PRIORITY` → `MafiaNet::Priority::High`, `RELIABLE_ORDERED` → `MafiaNet::Reliability::ReliableOrdered`); `NUMBER_OF_*` sentinels are now `constexpr` counts in `MafiaNet` diff --git a/Samples/AutoPatcherServer_MySQL/AutopatcherServerTest_MySQL.cpp b/Samples/AutoPatcherServer_MySQL/AutopatcherServerTest_MySQL.cpp index 66f11ca6b..2fe3bdca0 100644 --- a/Samples/AutoPatcherServer_MySQL/AutopatcherServerTest_MySQL.cpp +++ b/Samples/AutoPatcherServer_MySQL/AutopatcherServerTest_MySQL.cpp @@ -16,24 +16,24 @@ // Common includes #include #include -#include "mafianet/Kbhit.h" - -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileList.h" // FLP_Printf +#include "mafianet/kbhit.h" + +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list.h" // FLP_Printf #include "AutopatcherServer.h" #include "AutopatcherMySQLRepository.h" -#include "mafianet/PacketizedTCP.h" -#include "mafianet/Gets.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #endif diff --git a/Samples/AutopatcherClient/AutopatcherClientTest.cpp b/Samples/AutopatcherClient/AutopatcherClientTest.cpp index 3e2a9eca5..585426367 100644 --- a/Samples/AutopatcherClient/AutopatcherClientTest.cpp +++ b/Samples/AutopatcherClient/AutopatcherClientTest.cpp @@ -17,7 +17,7 @@ #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" // Platform-specific includes for path constants and process execution #ifdef _WIN32 @@ -37,19 +37,19 @@ #define _unlink unlink #endif -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/packetized_tcp.h" // Client only includes -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/FileListTransfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/file_list_transfer.h" #include "AutopatcherClient.h" -#include "mafianet/AutopatcherPatchContext.h" -#include "mafianet/Gets.h" +#include "mafianet/autopatcher_patch_context.h" +#include "mafianet/gets.h" #include "mafianet/sleep.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/AutopatcherClientGFx3.0/AutopatcherClientGFx3Impl.cpp b/Samples/AutopatcherClientGFx3.0/AutopatcherClientGFx3Impl.cpp index 7d7882607..5ddbfc401 100644 --- a/Samples/AutopatcherClientGFx3.0/AutopatcherClientGFx3Impl.cpp +++ b/Samples/AutopatcherClientGFx3.0/AutopatcherClientGFx3Impl.cpp @@ -16,20 +16,20 @@ // Common includes #include #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/packetized_tcp.h" // Client only includes -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/FileListTransfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/file_list_transfer.h" #include "AutopatcherClient.h" -#include "mafianet/AutopatcherPatchContext.h" +#include "mafianet/autopatcher_patch_context.h" #include "mafianet/sleep.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/AutopatcherClientRestarter/main.cpp b/Samples/AutopatcherClientRestarter/main.cpp index 450c2230d..b107dd963 100644 --- a/Samples/AutopatcherClientRestarter/main.cpp +++ b/Samples/AutopatcherClientRestarter/main.cpp @@ -15,7 +15,7 @@ #include #if defined(_WIN32) -#include "mafianet/WindowsIncludes.h" // Sleep and CreateProcess +#include "mafianet/windows_includes.h" // Sleep and CreateProcess #include // system #else #include // usleep @@ -26,7 +26,7 @@ #include #endif -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/AutopatcherClient_SelfScaling/AutopatcherClientTest.cpp b/Samples/AutopatcherClient_SelfScaling/AutopatcherClientTest.cpp index 43e83652e..e2c3cd3c2 100644 --- a/Samples/AutopatcherClient_SelfScaling/AutopatcherClientTest.cpp +++ b/Samples/AutopatcherClient_SelfScaling/AutopatcherClientTest.cpp @@ -25,24 +25,24 @@ #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" - -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/kbhit.h" + +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/packetized_tcp.h" #include "mafianet/socket2.h" // Client only includes -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/FileListTransfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/file_list_transfer.h" #include "AutopatcherClient.h" -#include "mafianet/AutopatcherPatchContext.h" -#include "mafianet/Gets.h" +#include "mafianet/autopatcher_patch_context.h" +#include "mafianet/gets.h" #include "mafianet/sleep.h" -#include "mafianet/CloudClient.h" +#include "mafianet/cloud_client.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/AutopatcherServer/AutopatcherServerTest.cpp b/Samples/AutopatcherServer/AutopatcherServerTest.cpp index fe29100ad..94f639ffc 100644 --- a/Samples/AutopatcherServer/AutopatcherServerTest.cpp +++ b/Samples/AutopatcherServer/AutopatcherServerTest.cpp @@ -18,11 +18,11 @@ #include #ifdef _WIN32 -// Pull in winsock2.h (via WindowsIncludes.h) BEFORE windows.h. Including +// Pull in winsock2.h (via windows_includes.h) BEFORE windows.h. Including // directly drags in the legacy Winsock 1 header, which then // clashes with the winsock2.h pulled in later, causing struct redefinition // errors (sockaddr, fd_set, ...) under MSVC. -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #include #else #include @@ -32,17 +32,17 @@ #endif #endif -#include "mafianet/Kbhit.h" - -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileList.h" // FLP_Printf -#include "mafianet/PacketizedTCP.h" -#include "mafianet/Gets.h" +#include "mafianet/kbhit.h" + +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list.h" // FLP_Printf +#include "mafianet/packetized_tcp.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -52,7 +52,7 @@ #include "AutopatcherPostgreRepository.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #endif diff --git a/Samples/AutopatcherServer_SelfScaling/main.cpp b/Samples/AutopatcherServer_SelfScaling/main.cpp index f8436cac0..9bbb6e465 100644 --- a/Samples/AutopatcherServer_SelfScaling/main.cpp +++ b/Samples/AutopatcherServer_SelfScaling/main.cpp @@ -28,29 +28,29 @@ #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" - -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileList.h" // FLP_Printf -#include "mafianet/PacketizedTCP.h" -#include "mafianet/Gets.h" +#include "mafianet/kbhit.h" + +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list.h" // FLP_Printf +#include "mafianet/packetized_tcp.h" +#include "mafianet/gets.h" #include "CloudServerHelper.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/TwoWayAuthentication.h" -#include "mafianet/CloudClient.h" -#include "mafianet/DynDNS.h" -#include "mafianet/peerinterface.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/two_way_authentication.h" +#include "mafianet/cloud_client.h" +#include "mafianet/dyn_dns.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/connection_graph2.h" #include "CloudServerHelper.h" -#include "mafianet/HTTPConnection2.h" +#include "mafianet/http_connection2.h" #include "Rackspace2.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" // See http://www.digip.org/jansson/doc/2.4/ @@ -63,7 +63,7 @@ #include "AutopatcherPostgreRepository.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #endif diff --git a/Samples/BigPacketTest/BigPacketTest.cpp b/Samples/BigPacketTest/BigPacketTest.cpp index e7719b4f5..391dfdb71 100644 --- a/Samples/BigPacketTest/BigPacketTest.cpp +++ b/Samples/BigPacketTest/BigPacketTest.cpp @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" #include // For atoi #include // For strlen #include "mafianet/statistics.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/MTUSize.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/mtu_size.h" #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -201,7 +201,7 @@ int main(void) unsigned int total; unsigned int partLength; - // Disable endian swapping on reading this, as it's generated locally in ReliabilityLayer.cpp + // Disable endian swapping on reading this, as it's generated locally in reliability_layer.cpp progressBS.ReadBits( (unsigned char* ) &progress, BYTES_TO_BITS(sizeof(progress)), true ); progressBS.ReadBits( (unsigned char* ) &total, BYTES_TO_BITS(sizeof(total)), true ); progressBS.ReadBits( (unsigned char* ) &partLength, BYTES_TO_BITS(sizeof(partLength)), true ); diff --git a/Samples/BurstTest/BurstTest.cpp b/Samples/BurstTest/BurstTest.cpp index 618b62d64..949ded614 100644 --- a/Samples/BurstTest/BurstTest.cpp +++ b/Samples/BurstTest/BurstTest.cpp @@ -13,22 +13,22 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include #include #include #include -#include "mafianet/Rand.h" +#include "mafianet/rand.h" #include "mafianet/statistics.h" #include "mafianet/sleep.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" #include #include // used for std::numeric_limits -#include "mafianet/Gets.h" -#include "mafianet/Kbhit.h" +#include "mafianet/gets.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/CMakeLists.txt b/Samples/CMakeLists.txt index 53eae0985..1ba11201d 100644 --- a/Samples/CMakeLists.txt +++ b/Samples/CMakeLists.txt @@ -75,7 +75,7 @@ add_subdirectory(RakVoice) # specific third-party dependencies, platforms, or special configuration: # # - AutopatcherClientGFx3.0 (requires Scaleform GFx) -# - Encryption (requires LIBCAT_SECURITY=1 in NativeFeatureIncludesOverrides.h) +# - Encryption (requires LIBCAT_SECURITY=1 in native_feature_includes_overrides.h) # - AutoPatcherServer_MySQL (requires MySQL) # - CrashRelauncher (Windows-specific) # - iOS (requires iOS SDK) @@ -85,7 +85,6 @@ add_subdirectory(RakVoice) # - LobbyDB_PostgreSQL (requires PostgreSQL) # - LoopbackPerformanceTest (specialized) # - Marmalade (requires Marmalade SDK) -# - nacl_sdk (requires Native Client SDK) # - RakVoiceDSound (requires DirectSound) # - RakVoiceFMOD (requires FMOD) # - RakVoiceFMODAsDLL (requires FMOD) diff --git a/Samples/ChatExample/Client/Chat Example Client.cpp b/Samples/ChatExample/Client/Chat Example Client.cpp index d04119404..dbf482b6d 100644 --- a/Samples/ChatExample/Client/Chat Example Client.cpp +++ b/Samples/ChatExample/Client/Chat Example Client.cpp @@ -19,33 +19,33 @@ // Very basic chat engine example // ---------------------------------------------------------------------- -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/PeerHandle.h" +#include "mafianet/peer_interface.h" +#include "mafianet/peer_handle.h" #include "mafianet/statistics.h" #include "mafianet/types.h" -#include "mafianet/BitStream.h" -#include "mafianet/PacketLogger.h" +#include "mafianet/bit_stream.h" +#include "mafianet/packet_logger.h" #include #include #include #include #include // used for std::numeric_limits #include "mafianet/types.h" -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #endif -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include "mafianet/guid_util.h" #if LIBCAT_SECURITY==1 -#include "mafianet/SecureHandshake.h" // Include header for secure handshake +#include "mafianet/secure_handshake.h" // Include header for secure handshake #endif int main(void) diff --git a/Samples/ChatExample/Server/Chat Example Server.cpp b/Samples/ChatExample/Server/Chat Example Server.cpp index 5c424f8ba..84d43295e 100644 --- a/Samples/ChatExample/Server/Chat Example Server.cpp +++ b/Samples/ChatExample/Server/Chat Example Server.cpp @@ -19,29 +19,29 @@ // Very basic chat engine example // ---------------------------------------------------------------------- -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/statistics.h" #include "mafianet/types.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/PacketLogger.h" +#include "mafianet/packet_logger.h" #include #include #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include #include -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include "mafianet/guid_util.h" #if LIBCAT_SECURITY==1 -#include "mafianet/SecureHandshake.h" // Include header for secure handshake +#include "mafianet/secure_handshake.h" // Include header for secure handshake #endif #if defined(_CONSOLE_2) diff --git a/Samples/CloudClient/CloudClientSample.cpp b/Samples/CloudClient/CloudClientSample.cpp index 0eb8fe4d3..f6e51982f 100644 --- a/Samples/CloudClient/CloudClientSample.cpp +++ b/Samples/CloudClient/CloudClientSample.cpp @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/CloudClient.h" -#include "mafianet/peerinterface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/cloud_client.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" #include #include // used for std::numeric_limits diff --git a/Samples/CloudServer/CloudServerHelper.cpp b/Samples/CloudServer/CloudServerHelper.cpp index 1ee331a67..1b41230fd 100644 --- a/Samples/CloudServer/CloudServerHelper.cpp +++ b/Samples/CloudServer/CloudServerHelper.cpp @@ -16,16 +16,16 @@ #include "CloudServerHelper.h" #include "mafianet/sleep.h" -#include "mafianet/Gets.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/TwoWayAuthentication.h" -#include "mafianet/CloudClient.h" -#include "mafianet/DynDNS.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/peerinterface.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/gets.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/two_way_authentication.h" +#include "mafianet/cloud_client.h" +#include "mafianet/dyn_dns.h" +#include "mafianet/socket_layer.h" +#include "mafianet/peer_interface.h" +#include "mafianet/connection_graph2.h" #include #include // used for std::numeric_limits #include "mafianet/linux_adapter.h" diff --git a/Samples/CloudServer/CloudServerHelper.h b/Samples/CloudServer/CloudServerHelper.h index 2e932823d..130637e71 100644 --- a/Samples/CloudServer/CloudServerHelper.h +++ b/Samples/CloudServer/CloudServerHelper.h @@ -16,7 +16,7 @@ #ifndef __CLOUD_SERVER_HELPER_H #define __CLOUD_SERVER_HELPER_H -#include "mafianet/CloudServer.h" +#include "mafianet/cloud_server.h" namespace MafiaNet { diff --git a/Samples/CloudServer/CloudServerSample.cpp b/Samples/CloudServer/CloudServerSample.cpp index cbff08835..11952f87b 100644 --- a/Samples/CloudServer/CloudServerSample.cpp +++ b/Samples/CloudServer/CloudServerSample.cpp @@ -14,15 +14,15 @@ */ #include "CloudServerHelper.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/TwoWayAuthentication.h" -#include "mafianet/CloudClient.h" -#include "mafianet/DynDNS.h" -#include "mafianet/peerinterface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/two_way_authentication.h" +#include "mafianet/cloud_client.h" +#include "mafianet/dyn_dns.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/connection_graph2.h" int main(int argc, char **argv) { diff --git a/Samples/CloudTest/CloudTest.cpp b/Samples/CloudTest/CloudTest.cpp index e86db3f7f..99032d55e 100644 --- a/Samples/CloudTest/CloudTest.cpp +++ b/Samples/CloudTest/CloudTest.cpp @@ -13,15 +13,15 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/GetTime.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/get_time.h" #include "mafianet/sleep.h" -#include "mafianet/Gets.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/CloudServer.h" -#include "mafianet/CloudClient.h" -#include "mafianet/Kbhit.h" +#include "mafianet/gets.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/cloud_server.h" +#include "mafianet/cloud_client.h" +#include "mafianet/kbhit.h" enum { diff --git a/Samples/CommandConsoleClient/main.cpp b/Samples/CommandConsoleClient/main.cpp index 6ab352aab..2472104b0 100644 --- a/Samples/CommandConsoleClient/main.cpp +++ b/Samples/CommandConsoleClient/main.cpp @@ -13,29 +13,29 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #include #include "mafianet/linux_adapter.h" -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/osx_adapter.h" //linux doesn't have stricmp but strcasecmp is same functionality #define stricmp strcasecmp #endif -#include "mafianet/Gets.h" +#include "mafianet/gets.h" int main() diff --git a/Samples/CommandConsoleServer/main.cpp b/Samples/CommandConsoleServer/main.cpp index 58d542848..d04524366 100644 --- a/Samples/CommandConsoleServer/main.cpp +++ b/Samples/CommandConsoleServer/main.cpp @@ -17,16 +17,16 @@ /// \brief Test the command console implementations -#include "mafianet/TCPInterface.h" -#include "mafianet/ConsoleServer.h" -#include "mafianet/commandparser.h" -#include "mafianet/TelnetTransport.h" +#include "mafianet/tcp_interface.h" +#include "mafianet/console_server.h" +#include "mafianet/command_parser.h" +#include "mafianet/telnet_transport.h" -#include "mafianet/peerinterface.h" -#include "mafianet/LogCommandParser.h" -#include "mafianet/GetTime.h" +#include "mafianet/peer_interface.h" +#include "mafianet/log_command_parser.h" +#include "mafianet/get_time.h" #include "mafianet/transport2.h" -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include diff --git a/Samples/ComprehensivePCGame/ComprehensivePCGame.cpp b/Samples/ComprehensivePCGame/ComprehensivePCGame.cpp index 1a45af720..469c85f15 100644 --- a/Samples/ComprehensivePCGame/ComprehensivePCGame.cpp +++ b/Samples/ComprehensivePCGame/ComprehensivePCGame.cpp @@ -17,34 +17,34 @@ #include #include #include // used for std::numeric_limits -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/TeamManager.h" -#include "mafianet/Kbhit.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/team_manager.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" #include "mafianet/types.h" -#include "mafianet/BitStream.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/ReplicaManager3.h" -#include "mafianet/NetworkIDManager.h" -#include "mafianet/Gets.h" -#include "mafianet/Itoa.h" -#include "mafianet/NatPunchthroughClient.h" -#include "mafianet/NatTypeDetectionClient.h" +#include "mafianet/bit_stream.h" +#include "mafianet/socket_layer.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/network_id_manager.h" +#include "mafianet/gets.h" +#include "mafianet/itoa.h" +#include "mafianet/nat_punchthrough_client.h" +#include "mafianet/nat_type_detection_client.h" #include "miniupnpc.h" #include "upnpcommands.h" #include "upnperrors.h" -#include "mafianet/TCPInterface.h" -#include "mafianet/ReadyEvent.h" -#include "mafianet/PacketLogger.h" -#include "mafianet/RPC4Plugin.h" -#include "mafianet/HTTPConnection2.h" +#include "mafianet/tcp_interface.h" +#include "mafianet/ready_event.h" +#include "mafianet/packet_logger.h" +#include "mafianet/rpc4_plugin.h" +#include "mafianet/http_connection2.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/guid_util.h" // See http://www.digip.org/jansson/doc/2.4/ // This is used to make it easier to parse the JSON returned from the master server diff --git a/Samples/ComprehensiveTest/ComprehensiveTest.cpp b/Samples/ComprehensiveTest/ComprehensiveTest.cpp index 60fabf9b8..e371e61e6 100644 --- a/Samples/ComprehensiveTest/ComprehensiveTest.cpp +++ b/Samples/ComprehensiveTest/ComprehensiveTest.cpp @@ -13,22 +13,22 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include // For atoi #include // For strlen -#include "mafianet/Rand.h" +#include "mafianet/rand.h" #include "mafianet/statistics.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" #include -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" using namespace MafiaNet; #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #include diff --git a/Samples/CrashReporter/CrashReporter.cpp b/Samples/CrashReporter/CrashReporter.cpp index 193f4a54d..75aebc1a4 100644 --- a/Samples/CrashReporter/CrashReporter.cpp +++ b/Samples/CrashReporter/CrashReporter.cpp @@ -18,7 +18,7 @@ #ifdef WIN32 #include -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #pragma warning(push) // disable warning 4091 (triggers for enum typedefs in DbgHelp.h in Windows SDK 7.1 and Windows SDK 8.1) #pragma warning(disable:4091) @@ -28,10 +28,10 @@ #include #include "SendFileTo.h" #include "CrashReporter.h" -#include "mafianet/EmailSender.h" -#include "mafianet/FileList.h" -#include "mafianet/FileOperations.h" -#include "mafianet/SimpleMutex.h" +#include "mafianet/email_sender.h" +#include "mafianet/file_list.h" +#include "mafianet/file_operations.h" +#include "mafianet/simple_mutex.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/CrashReporter/SendFileTo.cpp b/Samples/CrashReporter/SendFileTo.cpp index 25cf445ae..1e45c6980 100644 --- a/Samples/CrashReporter/SendFileTo.cpp +++ b/Samples/CrashReporter/SendFileTo.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #include "SendFileTo.h" #include #include diff --git a/Samples/CrashReporter/SendFileTo.h b/Samples/CrashReporter/SendFileTo.h index 13e1b624c..6364d25bf 100644 --- a/Samples/CrashReporter/SendFileTo.h +++ b/Samples/CrashReporter/SendFileTo.h @@ -18,7 +18,7 @@ #ifndef __SENDFILETO_H__ #define __SENDFILETO_H__ -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #include diff --git a/Samples/CrashReporter/main.cpp b/Samples/CrashReporter/main.cpp index 442f6ca71..c88728780 100644 --- a/Samples/CrashReporter/main.cpp +++ b/Samples/CrashReporter/main.cpp @@ -40,17 +40,17 @@ // The third way is save build labels or branches in source control and get that version (you only need source code + .exe + .pdb) before debugging. // After debugging, restore your previous work. -#include "mafianet/SocketLayer.h" +#include "mafianet/socket_layer.h" #include "CrashReporter.h" // This is the only required file for the crash reporter. You must link in Dbghelp.lib #include // Printf, for the sample code -#include "mafianet/Kbhit.h" // getch, for the sample code +#include "mafianet/kbhit.h" // getch, for the sample code #pragma warning(push) // disable warning 4091 (triggers for enum typedefs in DbgHelp.h in Windows SDK 7.1 and Windows SDK 8.1) #pragma warning(disable:4091) #include #pragma warning(pop) -#include "mafianet/Gets.h" +#include "mafianet/gets.h" void function1(int a) { @@ -74,7 +74,7 @@ void RunGame(void) // If you don't plan to debug the crash reporter itself, you can remove _DEBUG_CRASH_REPORTER #ifdef _DEBUG_CRASH_REPORTER -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" extern void DumpMiniDump(PEXCEPTION_POINTERS excpInfo); #endif diff --git a/Samples/CrossConnectionTest/CrossConnectionTest.cpp b/Samples/CrossConnectionTest/CrossConnectionTest.cpp index 9c0278d60..59074e6a7 100644 --- a/Samples/CrossConnectionTest/CrossConnectionTest.cpp +++ b/Samples/CrossConnectionTest/CrossConnectionTest.cpp @@ -17,16 +17,16 @@ /// \brief Tests connecting two peers at the same time with the internet simulator running. -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/PacketLogger.h" -#include "mafianet/Rand.h" -#include "mafianet/Kbhit.h" +#include "mafianet/packet_logger.h" +#include "mafianet/rand.h" +#include "mafianet/kbhit.h" #include // Printf #include "mafianet/sleep.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/GetTime.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransfer.cpp b/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransfer.cpp index 58e992c03..677b307b0 100644 --- a/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransfer.cpp +++ b/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransfer.cpp @@ -13,16 +13,16 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/statistics.h" -#include "mafianet/DirectoryDeltaTransfer.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileList.h" -#include "mafianet/DataCompressor.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/Gets.h" +#include "mafianet/directory_delta_transfer.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list.h" +#include "mafianet/data_compressor.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/gets.h" #include #include #include @@ -32,7 +32,7 @@ #include #else #include // usleep -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #endif using namespace MafiaNet; diff --git a/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransferTest.cpp b/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransferTest.cpp index b168c90c1..dd722bff0 100644 --- a/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransferTest.cpp +++ b/Samples/DirectoryDeltaTransfer/DirectoryDeltaTransferTest.cpp @@ -13,28 +13,28 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/statistics.h" -#include "mafianet/DirectoryDeltaTransfer.h" -#include "mafianet/FileListTransfer.h" +#include "mafianet/directory_delta_transfer.h" +#include "mafianet/file_list_transfer.h" #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" -#include "mafianet/FileList.h" -#include "mafianet/DataCompressor.h" -#include "mafianet/FileListTransferCBInterface.h" +#include "mafianet/kbhit.h" +#include "mafianet/file_list.h" +#include "mafianet/data_compressor.h" +#include "mafianet/file_list_transfer_cb_interface.h" #include "mafianet/sleep.h" -#include "mafianet/IncrementalReadInterface.h" -#include "mafianet/PacketizedTCP.h" -#include "mafianet/Gets.h" +#include "mafianet/incremental_read_interface.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #endif diff --git a/Samples/DroppedConnectionTest/DroppedConnectionTest.cpp b/Samples/DroppedConnectionTest/DroppedConnectionTest.cpp index 7bd6b8f6d..9f2b96c38 100644 --- a/Samples/DroppedConnectionTest/DroppedConnectionTest.cpp +++ b/Samples/DroppedConnectionTest/DroppedConnectionTest.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/Rand.h" // randomMT -#include "mafianet/MessageIdentifiers.h" // Enumerations +#include "mafianet/peer_interface.h" +#include "mafianet/rand.h" // randomMT +#include "mafianet/message_identifiers.h" // Enumerations #include "mafianet/types.h" // SystemAddress -#include "mafianet/Kbhit.h" -#include "mafianet/Gets.h" +#include "mafianet/kbhit.h" +#include "mafianet/gets.h" #include using namespace MafiaNet; #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include #include diff --git a/Samples/Encryption/Encryption.cpp b/Samples/Encryption/Encryption.cpp index ba24b3b95..19c93b4e7 100644 --- a/Samples/Encryption/Encryption.cpp +++ b/Samples/Encryption/Encryption.cpp @@ -16,25 +16,25 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/Rand.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/types.h" -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #include #include "mafianet/sleep.h" -#include "mafianet/BitStream.h" -#include "mafianet/SecureHandshake.h" // Include header for secure handshake -#include "mafianet/Gets.h" +#include "mafianet/bit_stream.h" +#include "mafianet/secure_handshake.h" // Include header for secure handshake +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" using namespace MafiaNet; #if LIBCAT_SECURITY!=1 -#error "Define LIBCAT_SECURITY 1 in NativeFeatureIncludesOverrides.h to enable Encryption" +#error "Define LIBCAT_SECURITY 1 in native_feature_includes_overrides.h to enable Encryption" #endif void PrintOptions(void) @@ -340,7 +340,7 @@ int main(void) peer1GotMessage=true; printf("Host got: "); PrintPacketHeader(packet); -#if defined(_DEBUG) && !defined(__native_client__) +#if defined(_DEBUG) if (doTwoWayAuthentication) { char client_public_key_copy[cat::EasyHandshake::PUBLIC_KEY_BYTES]; @@ -355,7 +355,7 @@ int main(void) peer2GotMessage=true; printf("Connecting system got: "); PrintPacketHeader(packet); -#if defined(_DEBUG) && !defined(__native_client__) +#if defined(_DEBUG) if (doTwoWayAuthentication) { char client_public_key_copy[cat::EasyHandshake::PUBLIC_KEY_BYTES]; diff --git a/Samples/FCMHost/FCM2HostTest.cpp b/Samples/FCMHost/FCM2HostTest.cpp index 142a8a861..5b794ebe0 100644 --- a/Samples/FCMHost/FCM2HostTest.cpp +++ b/Samples/FCMHost/FCM2HostTest.cpp @@ -16,18 +16,18 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/types.h" #include "mafianet/sleep.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/connection_graph2.h" #include -#include "mafianet/SocketLayer.h" -#include "mafianet/Kbhit.h" -#include "mafianet/PacketLogger.h" -#include "mafianet/BitStream.h" +#include "mafianet/socket_layer.h" +#include "mafianet/kbhit.h" +#include "mafianet/packet_logger.h" +#include "mafianet/bit_stream.h" #include "mafianet/guid_util.h" using namespace MafiaNet; diff --git a/Samples/FCMHostSimultaneous/FCM2HostSimultaneousTest.cpp b/Samples/FCMHostSimultaneous/FCM2HostSimultaneousTest.cpp index 5907e5b01..64bdcfb01 100644 --- a/Samples/FCMHostSimultaneous/FCM2HostSimultaneousTest.cpp +++ b/Samples/FCMHostSimultaneous/FCM2HostSimultaneousTest.cpp @@ -16,19 +16,19 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/types.h" #include "mafianet/sleep.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/connection_graph2.h" #include -#include "mafianet/SocketLayer.h" -#include "mafianet/Kbhit.h" -#include "mafianet/PacketLogger.h" -#include "mafianet/Gets.h" +#include "mafianet/socket_layer.h" +#include "mafianet/kbhit.h" +#include "mafianet/packet_logger.h" +#include "mafianet/gets.h" #include "mafianet/guid_util.h" using namespace MafiaNet; diff --git a/Samples/FCMVerifiedJoinSimultaneous/FCM2VerifiedJoinSimultaneousTest.cpp b/Samples/FCMVerifiedJoinSimultaneous/FCM2VerifiedJoinSimultaneousTest.cpp index b2c1f0d00..5bc4ef3f5 100644 --- a/Samples/FCMVerifiedJoinSimultaneous/FCM2VerifiedJoinSimultaneousTest.cpp +++ b/Samples/FCMVerifiedJoinSimultaneous/FCM2VerifiedJoinSimultaneousTest.cpp @@ -16,19 +16,19 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/types.h" #include "mafianet/sleep.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/connection_graph2.h" #include -#include "mafianet/SocketLayer.h" -#include "mafianet/Kbhit.h" -#include "mafianet/PacketLogger.h" -#include "mafianet/Gets.h" -#include "mafianet/BitStream.h" +#include "mafianet/socket_layer.h" +#include "mafianet/kbhit.h" +#include "mafianet/packet_logger.h" +#include "mafianet/gets.h" +#include "mafianet/bit_stream.h" #include "mafianet/guid_util.h" using namespace MafiaNet; diff --git a/Samples/FileListTransfer/main.cpp b/Samples/FileListTransfer/main.cpp index 7a8ff1531..ce94f0090 100644 --- a/Samples/FileListTransfer/main.cpp +++ b/Samples/FileListTransfer/main.cpp @@ -13,21 +13,21 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/FileListTransfer.h" +#include "mafianet/peer_interface.h" +#include "mafianet/file_list_transfer.h" #include "mafianet/sleep.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/FileOperations.h" -#include "mafianet/SuperFastHash.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/file_operations.h" +#include "mafianet/super_fast_hash.h" #include "mafianet/assert.h" -#include "mafianet/BitStream.h" -#include "mafianet/IncrementalReadInterface.h" -#include "mafianet/PacketizedTCP.h" -#include "mafianet/SocketLayer.h" +#include "mafianet/bit_stream.h" +#include "mafianet/incremental_read_interface.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/socket_layer.h" #include -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/FlowControlTest/FlowControlTest.cpp b/Samples/FlowControlTest/FlowControlTest.cpp index 446a51d28..03306635a 100644 --- a/Samples/FlowControlTest/FlowControlTest.cpp +++ b/Samples/FlowControlTest/FlowControlTest.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" #include "mafianet/statistics.h" #include #include #include #include #include // used for std::numeric_limits -#include "mafianet/Gets.h" -#include "mafianet/Kbhit.h" +#include "mafianet/gets.h" +#include "mafianet/kbhit.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/FullyConnectedMesh/FCMTest.cpp b/Samples/FullyConnectedMesh/FCMTest.cpp index 6e382fc96..d25d16810 100644 --- a/Samples/FullyConnectedMesh/FCMTest.cpp +++ b/Samples/FullyConnectedMesh/FCMTest.cpp @@ -16,15 +16,15 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/connection_graph2.h" #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" static const unsigned short NUM_PEERS=8; diff --git a/Samples/LANServerDiscovery/LANServerDiscovery.cpp b/Samples/LANServerDiscovery/LANServerDiscovery.cpp index be0bbba1e..fe07d6b8f 100644 --- a/Samples/LANServerDiscovery/LANServerDiscovery.cpp +++ b/Samples/LANServerDiscovery/LANServerDiscovery.cpp @@ -18,20 +18,20 @@ // Filename ChatExample.cpp // Very basic chat engine example // ---------------------------------------------------------------------- -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" +#include "mafianet/peer_interface.h" #include "mafianet/types.h" -#include "mafianet/GetTime.h" -#include "mafianet/BitStream.h" +#include "mafianet/get_time.h" +#include "mafianet/bit_stream.h" #include #include #include #include #include // used for std::numeric_limits #include "mafianet/sleep.h" -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include "mafianet/guid_util.h" diff --git a/Samples/Lobby2Client/Lobby2ClientSample.cpp b/Samples/Lobby2Client/Lobby2ClientSample.cpp index 8aaacd313..604ae4b36 100644 --- a/Samples/Lobby2Client/Lobby2ClientSample.cpp +++ b/Samples/Lobby2Client/Lobby2ClientSample.cpp @@ -14,19 +14,19 @@ */ #include "Lobby2Message.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" #include "Lobby2Client.h" -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" #include "RoomsErrorCodes.h" -#include "mafianet/DS_Queue.h" +#include "mafianet/ds_queue.h" #include #include #include // used for std::numeric_limits -#include "mafianet/LinuxStrings.h" -#include "mafianet/Gets.h" +#include "mafianet/linux_strings.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.cpp b/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.cpp index 79146f6cc..e2097eb3b 100644 --- a/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.cpp +++ b/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.cpp @@ -17,10 +17,10 @@ #include #include -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "Lobby2ClientGFx3Impl.h" #include "Lobby2Client.h" diff --git a/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.h b/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.h index 0a7ce10cb..907c6d581 100644 --- a/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.h +++ b/Samples/Lobby2ClientGFx3.0/Lobby2ClientGFx3Impl.h @@ -16,11 +16,11 @@ #ifndef __LOBBY_2_CLIENT_GFX3_IMPL_H #define __LOBBY_2_CLIENT_GFX3_IMPL_H -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #include "mafianet/types.h" #include "FxGameDelegate.h" #include "Lobby2Message.h" -#include "mafianet/PluginInterface2.h" +#include "mafianet/plugin_interface2.h" #define ACTIONSCRIPT_CALLABLE_HEADER(functionName) virtual void functionName(const FxDelegateArgs& pparams); #define ACTIONSCRIPT_CALLABLE_FUNCTION(className, functionName) \ diff --git a/Samples/Lobby2Server_PGSQL/Lobby2ServerSample_PGSQL.cpp b/Samples/Lobby2Server_PGSQL/Lobby2ServerSample_PGSQL.cpp index bd2d48481..006f00391 100644 --- a/Samples/Lobby2Server_PGSQL/Lobby2ServerSample_PGSQL.cpp +++ b/Samples/Lobby2Server_PGSQL/Lobby2ServerSample_PGSQL.cpp @@ -14,10 +14,10 @@ */ #include "Lobby2Message.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Kbhit.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" #include "Lobby2Server_PGSQL.h" #include "Lobby2Message_PGSQL.h" @@ -25,7 +25,7 @@ #include #include #include // used for std::numeric_limits -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -35,11 +35,11 @@ #endif //#define _ALSO_ACT_AS_NAT_PUNCH_SERVER -#include "mafianet/NatPunchthroughServer.h" -#include "mafianet/UDPProxyCoordinator.h" -#include "mafianet/UDPProxyServer.h" -#include "mafianet/NatTypeDetectionServer.h" -#include "mafianet/SocketLayer.h" +#include "mafianet/nat_punchthrough_server.h" +#include "mafianet/udp_proxy_coordinator.h" +#include "mafianet/udp_proxy_server.h" +#include "mafianet/nat_type_detection_server.h" +#include "mafianet/socket_layer.h" static const char *COORDINATOR_PASSWORD="Dummy Coordinator Password"; void main(void) diff --git a/Samples/Lobby3/main.cpp b/Samples/Lobby3/main.cpp index 73ab0456e..2efddd79d 100644 --- a/Samples/Lobby3/main.cpp +++ b/Samples/Lobby3/main.cpp @@ -17,17 +17,17 @@ #include #include #include -#include "mafianet/Gets.h" +#include "mafianet/gets.h" -#include "mafianet/TCPInterface.h" +#include "mafianet/tcp_interface.h" #include "mafianet/string.h" #include "mafianet/sleep.h" -#include "mafianet/DR_SHA1.h" -#include "mafianet/BitStream.h" +#include "mafianet/dr_sha1.h" +#include "mafianet/bit_stream.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" -#include "mafianet/Base64Encoder.h" +#include "mafianet/base64_encoder.h" // See http://www.digip.org/jansson/doc/2.4/ // This is used to make it easier to parse the JSON returned from the master server diff --git a/Samples/LobbyDB_PostgreSQL/LobbyDB_PostgreSQLTest.cpp b/Samples/LobbyDB_PostgreSQL/LobbyDB_PostgreSQLTest.cpp index bc05a5b0d..322f84377 100644 --- a/Samples/LobbyDB_PostgreSQL/LobbyDB_PostgreSQLTest.cpp +++ b/Samples/LobbyDB_PostgreSQL/LobbyDB_PostgreSQLTest.cpp @@ -11,11 +11,11 @@ // Common includes #include #include -#include "mafianet/Kbhit.h" -#include "mafianet/GetTime.h" +#include "mafianet/kbhit.h" +#include "mafianet/get_time.h" #include "FunctionThread.h" #include "LobbyDB_PostgreSQL.h" -#include "mafianet/EpochTimeToString.h" +#include "mafianet/epoch_time_to_string.h" #ifdef _WIN32 #include // Sleep diff --git a/Samples/LoopbackPerformanceTest/LoopbackPerformanceTest.cpp b/Samples/LoopbackPerformanceTest/LoopbackPerformanceTest.cpp index 08a21992d..63f0b6e19 100644 --- a/Samples/LoopbackPerformanceTest/LoopbackPerformanceTest.cpp +++ b/Samples/LoopbackPerformanceTest/LoopbackPerformanceTest.cpp @@ -13,16 +13,16 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" // Enumerations -#include "mafianet/GetTime.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" // Enumerations +#include "mafianet/get_time.h" #include "mafianet/statistics.h" #include #include -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #define SLEEP(arg) ( Sleep( (arg) ) ) #else #include // usleep diff --git a/Samples/MasterServer/MasterClient.cpp b/Samples/MasterServer/MasterClient.cpp index be8a0c4fe..d7d996240 100644 --- a/Samples/MasterServer/MasterClient.cpp +++ b/Samples/MasterServer/MasterClient.cpp @@ -15,11 +15,11 @@ #include "MasterClient.h" #include "MasterServerMessageIDs.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/GetTime.h" -#include "mafianet/PacketPriority.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/string_compressor.h" +#include "mafianet/get_time.h" +#include "mafianet/packet_priority.h" #include using namespace MafiaNet; diff --git a/Samples/MasterServer/MasterClient.h b/Samples/MasterServer/MasterClient.h index 00940d60d..a44f5fca0 100644 --- a/Samples/MasterServer/MasterClient.h +++ b/Samples/MasterServer/MasterClient.h @@ -23,7 +23,7 @@ #define __MASTER_CLIENT_H #include "MasterCommon.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" /// \ingroup MasterServer /// \brief implements the master client diff --git a/Samples/MasterServer/MasterClientMain.cpp b/Samples/MasterServer/MasterClientMain.cpp index 21b773ed1..f12dd9671 100644 --- a/Samples/MasterServer/MasterClientMain.cpp +++ b/Samples/MasterServer/MasterClientMain.cpp @@ -18,11 +18,11 @@ #include "MasterCommon.h" #include "MasterClient.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/BitStream.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Gets.h" +#include "mafianet/string_compressor.h" +#include "mafianet/bit_stream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/gets.h" #include #include diff --git a/Samples/MasterServer/MasterCommon.h b/Samples/MasterServer/MasterCommon.h index 304c7b1a0..319783503 100644 --- a/Samples/MasterServer/MasterCommon.h +++ b/Samples/MasterServer/MasterCommon.h @@ -18,10 +18,10 @@ #ifndef __MASTER_COMMON_H #define __MASTER_COMMON_H -#include "mafianet/DS_List.h" +#include "mafianet/ds_list.h" #include "mafianet/types.h" -#include "mafianet/BitStream.h" -#include "mafianet/PluginInterface2.h" +#include "mafianet/bit_stream.h" +#include "mafianet/plugin_interface2.h" using namespace MafiaNet; // IP, Port, Ping - case sensitive! diff --git a/Samples/MasterServer/MasterServer.cpp b/Samples/MasterServer/MasterServer.cpp index 62b29f0e1..798b73f72 100644 --- a/Samples/MasterServer/MasterServer.cpp +++ b/Samples/MasterServer/MasterServer.cpp @@ -15,13 +15,13 @@ #include "MasterServer.h" #include "MasterServerMessageIDs.h" -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/GetTime.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/string_compressor.h" +#include "mafianet/get_time.h" #include "mafianet/statistics.h" -#include "mafianet/PacketPriority.h" +#include "mafianet/packet_priority.h" using namespace MafiaNet; // Uncomment this define for debugging printfs diff --git a/Samples/MasterServer/MasterServerMain.cpp b/Samples/MasterServer/MasterServerMain.cpp index 58e7cb9f8..cd9febf11 100644 --- a/Samples/MasterServer/MasterServerMain.cpp +++ b/Samples/MasterServer/MasterServerMain.cpp @@ -17,8 +17,8 @@ #include "MasterCommon.h" #include "MasterServer.h" -#include "mafianet/peerinterface.h" -#include "mafianet/Gets.h" +#include "mafianet/peer_interface.h" +#include "mafianet/gets.h" #include #include #ifdef WIN32 diff --git a/Samples/MasterServer/MasterServerMessageIDs.h b/Samples/MasterServer/MasterServerMessageIDs.h index c9fd382d3..468cb9a68 100644 --- a/Samples/MasterServer/MasterServerMessageIDs.h +++ b/Samples/MasterServer/MasterServerMessageIDs.h @@ -20,7 +20,7 @@ #ifndef __MASTER_SERVER_MESSAGE_IDS_H #define __MASTER_SERVER_MESSAGE_IDS_H -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" /// Master Server message IDs - these were removed from core MafiaNet /// and are now sample-specific. They start at ID_USER_PACKET_ENUM. diff --git a/Samples/MasterServer/mastercommon.cpp b/Samples/MasterServer/mastercommon.cpp index 4fa16e982..1209b6c09 100644 --- a/Samples/MasterServer/mastercommon.cpp +++ b/Samples/MasterServer/mastercommon.cpp @@ -14,12 +14,12 @@ */ #include "MasterCommon.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/defines.h" #include -#include "mafianet/GetTime.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/BitStream.h" +#include "mafianet/get_time.h" +#include "mafianet/string_compressor.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; // For debugging diff --git a/Samples/MasterServer2/main.cpp b/Samples/MasterServer2/main.cpp index 965281c7c..c63202ed0 100644 --- a/Samples/MasterServer2/main.cpp +++ b/Samples/MasterServer2/main.cpp @@ -61,11 +61,11 @@ void main_sockets(void) printf(outputBuffer); } -#include "mafianet/TCPInterface.h" +#include "mafianet/tcp_interface.h" #include "mafianet/string.h" #include "mafianet/sleep.h" #include "jansson.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #define MASTER_SERVER_ADDRESS "masterserver2.raknet.com" #define MASTER_SERVER_PORT 80 @@ -112,7 +112,7 @@ void main_RakNet_Post(void) tcp->Stop(); } -#include "mafianet/HTTPConnection2.h" +#include "mafianet/http_connection2.h" void main_RakNet_Get(void) { HTTPConnection2 *httpConnection2; diff --git a/Samples/MessageFilter/MessageFilterTest.cpp b/Samples/MessageFilter/MessageFilterTest.cpp index 7b9db6b44..dd5fdfeb9 100644 --- a/Samples/MessageFilter/MessageFilterTest.cpp +++ b/Samples/MessageFilter/MessageFilterTest.cpp @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/MessageFilter.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_filter.h" +#include "mafianet/message_identifiers.h" #include "mafianet/sleep.h" #include diff --git a/Samples/MessageSizeTest/MessageSizeTest.cpp b/Samples/MessageSizeTest/MessageSizeTest.cpp index 36a8965fa..6959a60c3 100644 --- a/Samples/MessageSizeTest/MessageSizeTest.cpp +++ b/Samples/MessageSizeTest/MessageSizeTest.cpp @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include #include #include #include -#include "mafianet/Rand.h" +#include "mafianet/rand.h" #include "mafianet/statistics.h" #include "mafianet/sleep.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" using namespace MafiaNet; diff --git a/Samples/NATCompleteClient/main.cpp b/Samples/NATCompleteClient/main.cpp index f987a5bb0..e40721ff8 100644 --- a/Samples/NATCompleteClient/main.cpp +++ b/Samples/NATCompleteClient/main.cpp @@ -13,24 +13,24 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" #include #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/kbhit.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/NatPunchthroughClient.h" -#include "mafianet/NatTypeDetectionClient.h" -#include "mafianet/Getche.h" -#include "mafianet/GetTime.h" -#include "mafianet/Router2.h" -#include "mafianet/UDPProxyClient.h" -#include "mafianet/Gets.h" -#include "mafianet/Itoa.h" +#include "mafianet/nat_punchthrough_client.h" +#include "mafianet/nat_type_detection_client.h" +#include "mafianet/getche.h" +#include "mafianet/get_time.h" +#include "mafianet/router2.h" +#include "mafianet/udp_proxy_client.h" +#include "mafianet/gets.h" +#include "mafianet/itoa.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include "mafianet/guid_util.h" diff --git a/Samples/NATCompleteServer/main.cpp b/Samples/NATCompleteServer/main.cpp index e7c34b051..9501f961e 100644 --- a/Samples/NATCompleteServer/main.cpp +++ b/Samples/NATCompleteServer/main.cpp @@ -13,27 +13,27 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" #include #include #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/kbhit.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/UDPProxyServer.h" -#include "mafianet/UDPProxyCoordinator.h" -#include "mafianet/NatPunchthroughServer.h" -#include "mafianet/NatTypeDetectionServer.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/Getche.h" -#include "mafianet/Gets.h" +#include "mafianet/udp_proxy_server.h" +#include "mafianet/udp_proxy_coordinator.h" +#include "mafianet/nat_punchthrough_server.h" +#include "mafianet/nat_type_detection_server.h" +#include "mafianet/socket_layer.h" +#include "mafianet/getche.h" +#include "mafianet/gets.h" #include "CloudServerHelper.h" -#include "mafianet/CloudClient.h" +#include "mafianet/cloud_client.h" #include "mafianet/statistics.h" -#include "mafianet/RelayPlugin.h" +#include "mafianet/relay_plugin.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/OfflineMessagesTest/OfflineMessagesTest.cpp b/Samples/OfflineMessagesTest/OfflineMessagesTest.cpp index 056a47563..d655ef751 100644 --- a/Samples/OfflineMessagesTest/OfflineMessagesTest.cpp +++ b/Samples/OfflineMessagesTest/OfflineMessagesTest.cpp @@ -13,19 +13,19 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include // For atoi #include // For strlen #include -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/GetTime.h" -#include "mafianet/Gets.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/gets.h" #include "mafianet/guid_util.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #include diff --git a/Samples/PHPDirectoryServer2/PHPDirectoryServer2.cpp b/Samples/PHPDirectoryServer2/PHPDirectoryServer2.cpp index 2382b5526..329906082 100644 --- a/Samples/PHPDirectoryServer2/PHPDirectoryServer2.cpp +++ b/Samples/PHPDirectoryServer2/PHPDirectoryServer2.cpp @@ -26,16 +26,16 @@ /// License as published by the Free Software Foundation #include "PHPDirectoryServer2.h" -#include "mafianet/HTTPConnection.h" +#include "mafianet/http_connection.h" #include "mafianet/sleep.h" #include "mafianet/string.h" #include "mafianet/types.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/assert.h" #include #include #include -#include "mafianet/Itoa.h" +#include "mafianet/itoa.h" // Column with this header contains the name of the game, passed to UploadTable() static const char *GAME_NAME_COMMAND="__GAME_NAME"; diff --git a/Samples/PHPDirectoryServer2/PHPDirectoryServer2.h b/Samples/PHPDirectoryServer2/PHPDirectoryServer2.h index efda21fd2..dd114851f 100644 --- a/Samples/PHPDirectoryServer2/PHPDirectoryServer2.h +++ b/Samples/PHPDirectoryServer2/PHPDirectoryServer2.h @@ -30,13 +30,13 @@ #ifndef __PHP_DIRECTORY_SERVER_2 #define __PHP_DIRECTORY_SERVER_2 -#include "mafianet/Export.h" +#include "mafianet/export.h" #include "mafianet/string.h" -#include "mafianet/HTTPConnection.h" +#include "mafianet/http_connection.h" #include "mafianet/types.h" -#include "mafianet/DS_Queue.h" -#include "mafianet/DS_Table.h" -#include "mafianet/DS_Map.h" +#include "mafianet/ds_queue.h" +#include "mafianet/ds_table.h" +#include "mafianet/ds_map.h" namespace MafiaNet { diff --git a/Samples/PHPDirectoryServer2/main.cpp b/Samples/PHPDirectoryServer2/main.cpp index 4a7fa04b1..ae5b478bb 100644 --- a/Samples/PHPDirectoryServer2/main.cpp +++ b/Samples/PHPDirectoryServer2/main.cpp @@ -17,18 +17,18 @@ /// \brief This file is a sample for using HTTPConnection and PHPDirectoryServer2 -#include "mafianet/TCPInterface.h" -#include "mafianet/HTTPConnection.h" +#include "mafianet/tcp_interface.h" +#include "mafianet/http_connection.h" #include "PHPDirectoryServer2.h" #include "mafianet/sleep.h" #include "mafianet/string.h" -#include "mafianet/GetTime.h" -#include "mafianet/DS_Table.h" +#include "mafianet/get_time.h" +#include "mafianet/ds_table.h" #include #include #include -#include "mafianet/Gets.h" -#include "mafianet/Getche.h" +#include "mafianet/gets.h" +#include "mafianet/getche.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/PacketConsoleLogger/main.cpp b/Samples/PacketConsoleLogger/main.cpp index e82b150b8..4901ee05d 100644 --- a/Samples/PacketConsoleLogger/main.cpp +++ b/Samples/PacketConsoleLogger/main.cpp @@ -13,16 +13,16 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/TelnetTransport.h" -#include "mafianet/ConsoleServer.h" -#include "mafianet/LogCommandParser.h" -#include "mafianet/PacketConsoleLogger.h" -#include "mafianet/peerinterface.h" +#include "mafianet/telnet_transport.h" +#include "mafianet/console_server.h" +#include "mafianet/log_command_parser.h" +#include "mafianet/packet_console_logger.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" #include -#include "mafianet/Getche.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Kbhit.h" +#include "mafianet/getche.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/kbhit.h" using namespace MafiaNet; diff --git a/Samples/PacketLogger/PacketLoggerTest.cpp b/Samples/PacketLogger/PacketLoggerTest.cpp index 7e71a2888..ef581a63a 100644 --- a/Samples/PacketLogger/PacketLoggerTest.cpp +++ b/Samples/PacketLogger/PacketLoggerTest.cpp @@ -16,17 +16,17 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Gets.h" -#include "mafianet/PacketLogger.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/gets.h" +#include "mafianet/packet_logger.h" #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #endif diff --git a/Samples/Ping/Ping.cpp b/Samples/Ping/Ping.cpp index ab2008f38..6045c907f 100644 --- a/Samples/Ping/Ping.cpp +++ b/Samples/Ping/Ping.cpp @@ -18,20 +18,20 @@ // Filename Ping.cpp // Very basic chat engine example // ---------------------------------------------------------------------- -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" +#include "mafianet/peer_interface.h" #include "mafianet/types.h" -#include "mafianet/GetTime.h" -#include "mafianet/BitStream.h" +#include "mafianet/get_time.h" +#include "mafianet/bit_stream.h" #include #include #include #include #include // used for std::numeric_limits -#include "mafianet/Gets.h" -#include "mafianet/Kbhit.h" +#include "mafianet/gets.h" +#include "mafianet/kbhit.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/RPC3/RPC3Sample.cpp b/Samples/RPC3/RPC3Sample.cpp index 2c603bda2..ef5c4c4cc 100644 --- a/Samples/RPC3/RPC3Sample.cpp +++ b/Samples/RPC3/RPC3Sample.cpp @@ -14,20 +14,20 @@ */ #include "RPC3.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include #include -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/StringCompressor.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/string_compressor.h" #include "mafianet/sleep.h" -#include "mafianet/NetworkIDObject.h" -#include "mafianet/NetworkIDManager.h" -#include "mafianet/GetTime.h" -#include "mafianet/Gets.h" +#include "mafianet/network_id_object.h" +#include "mafianet/network_id_manager.h" +#include "mafianet/get_time.h" +#include "mafianet/gets.h" // This has to be a pointer, because it uses UNASSIGNED_NETWORK_ID, initialized globally MafiaNet::RPC3 *rpc3Inst; @@ -39,7 +39,7 @@ struct NormalizedVector float x,y,z; }; -// Shift operators have to be in the namespace MafiaNet or they might use the default one in BitStream.h instead. Error occurs with std::string +// Shift operators have to be in the namespace MafiaNet or they might use the default one in bit_stream.h instead. Error occurs with std::string namespace MafiaNet { // Specialize the << and >> operator to serialize each element of NormalizedVector individually diff --git a/Samples/RPC4/RPC4Sample.cpp b/Samples/RPC4/RPC4Sample.cpp index 6076c83cc..4d8fc46c8 100644 --- a/Samples/RPC4/RPC4Sample.cpp +++ b/Samples/RPC4/RPC4Sample.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/RPC4Plugin.h" -#include "mafianet/peerinterface.h" +#include "mafianet/rpc4_plugin.h" +#include "mafianet/peer_interface.h" #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include #include #include // used for std::numeric_limits #include "mafianet/sleep.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Gets.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/RackspaceConsole/main.cpp b/Samples/RackspaceConsole/main.cpp index b70472d29..e19a4d024 100644 --- a/Samples/RackspaceConsole/main.cpp +++ b/Samples/RackspaceConsole/main.cpp @@ -13,12 +13,12 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/Rackspace.h" +#include "mafianet/rackspace.h" #include -#include "mafianet/Gets.h" -#include "mafianet/Rackspace.h" -#include "mafianet/TCPInterface.h" -#include "mafianet/Kbhit.h" +#include "mafianet/gets.h" +#include "mafianet/rackspace.h" +#include "mafianet/tcp_interface.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/RakVoice/main.cpp b/Samples/RakVoice/main.cpp index e04af508e..f8c187309 100644 --- a/Samples/RakVoice/main.cpp +++ b/Samples/RakVoice/main.cpp @@ -18,21 +18,21 @@ #include #include // used for std::numeric_limits #include "portaudio.h" -#include "mafianet/Kbhit.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/kbhit.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" -#include "mafianet/RakVoice.h" +#include "mafianet/voice.h" #include "mafianet/statistics.h" -#include "mafianet/NatPunchthroughClient.h" -#include "mafianet/BitStream.h" -#include "mafianet/Getche.h" -#include "mafianet/Gets.h" +#include "mafianet/nat_punchthrough_client.h" +#include "mafianet/bit_stream.h" +#include "mafianet/getche.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include "mafianet/guid_util.h" -/// To test sending to myself. Also uncomment in RakVoice.cpp +/// To test sending to myself. Also uncomment in voice.cpp //#define _TEST_LOOPBACK // RakVoice only works with 16-bits sound data diff --git a/Samples/RakVoiceDSound/DSoundVoiceAdapter.cpp b/Samples/RakVoiceDSound/DSoundVoiceAdapter.cpp index 736867ba6..1c264234b 100644 --- a/Samples/RakVoiceDSound/DSoundVoiceAdapter.cpp +++ b/Samples/RakVoiceDSound/DSoundVoiceAdapter.cpp @@ -15,7 +15,7 @@ #include "DSoundVoiceAdapter.h" #include "mafianet/assert.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include /// To test sending to myself diff --git a/Samples/RakVoiceDSound/DSoundVoiceAdapter.h b/Samples/RakVoiceDSound/DSoundVoiceAdapter.h index 04713dbbc..fd662b922 100644 --- a/Samples/RakVoiceDSound/DSoundVoiceAdapter.h +++ b/Samples/RakVoiceDSound/DSoundVoiceAdapter.h @@ -31,7 +31,7 @@ of each frame. #ifndef __DSOUNDVOICEADAPTER_H #define __DSOUNDVOICEADAPTER_H -#include "mafianet/RakVoice.h" +#include "mafianet/voice.h" // If you get: // Error 1 fatal error C1083: Cannot open include file: 'dsound.h': No such file or directory diff --git a/Samples/RakVoiceDSound/main.cpp b/Samples/RakVoiceDSound/main.cpp index 54076ca2d..6e08bfb47 100644 --- a/Samples/RakVoiceDSound/main.cpp +++ b/Samples/RakVoiceDSound/main.cpp @@ -16,22 +16,22 @@ #define INTERACTIVE #if defined(INTERACTIVE) -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #endif #include #include #include #include // used for std::numeric_limits -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/sleep.h" -#include "mafianet/RakVoice.h" +#include "mafianet/voice.h" #include "mafianet/statistics.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/assert.h" -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "DSoundVoiceAdapter.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/RakVoiceFMOD/FMODVoiceAdapter.cpp b/Samples/RakVoiceFMOD/FMODVoiceAdapter.cpp index 3e40949c8..1839f2cf7 100644 --- a/Samples/RakVoiceFMOD/FMODVoiceAdapter.cpp +++ b/Samples/RakVoiceFMOD/FMODVoiceAdapter.cpp @@ -16,8 +16,8 @@ #include #include #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "FMODVoiceAdapter.h" #include "fmod_errors.h" diff --git a/Samples/RakVoiceFMOD/FMODVoiceAdapter.h b/Samples/RakVoiceFMOD/FMODVoiceAdapter.h index 2723a2544..f6bace49d 100644 --- a/Samples/RakVoiceFMOD/FMODVoiceAdapter.h +++ b/Samples/RakVoiceFMOD/FMODVoiceAdapter.h @@ -20,7 +20,7 @@ #ifndef __FMODVOICEBRIDGE_H #define __FMODVOICEBRIDGE_H -#include "mafianet/RakVoice.h" +#include "mafianet/voice.h" // If you get: // Error 1 fatal error C1083: Cannot open include file: 'fmod.hpp': No such file or directory c:\raknet\samples\rakvoicefmod\fmodvoiceadapter.h 9 diff --git a/Samples/RakVoiceFMOD/main.cpp b/Samples/RakVoiceFMOD/main.cpp index a25702a73..ca2591f51 100644 --- a/Samples/RakVoiceFMOD/main.cpp +++ b/Samples/RakVoiceFMOD/main.cpp @@ -16,20 +16,20 @@ #define INTERACTIVE #if defined(INTERACTIVE) -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #endif #include #include #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Gets.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/gets.h" #include "mafianet/sleep.h" -#include "mafianet/RakVoice.h" +#include "mafianet/voice.h" #include "mafianet/statistics.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/assert.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -39,10 +39,6 @@ #include "FMODVoiceAdapter.h" -#if defined(_PS3) || defined(__PS3__) -#include "Console2Includes.h" -#include "fmodps3.h" -#endif // Reads and writes per second of the sound data diff --git a/Samples/RankingServerDB/RankingServerDBTest.cpp b/Samples/RankingServerDB/RankingServerDBTest.cpp index 3908fc50f..bb55db05d 100644 --- a/Samples/RankingServerDB/RankingServerDBTest.cpp +++ b/Samples/RankingServerDB/RankingServerDBTest.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "FunctionThread.h" #include "RankingServer_PostgreSQL.h" diff --git a/Samples/RankingServerDBTest/RankingServerDBTest.cpp b/Samples/RankingServerDBTest/RankingServerDBTest.cpp index eef87ba76..29635fa9d 100644 --- a/Samples/RankingServerDBTest/RankingServerDBTest.cpp +++ b/Samples/RankingServerDBTest/RankingServerDBTest.cpp @@ -11,8 +11,8 @@ // Common includes #include #include -#include "mafianet/Kbhit.h" -#include "mafianet/GetTime.h" +#include "mafianet/kbhit.h" +#include "mafianet/get_time.h" #include "FunctionThread.h" #include "RankingServer_PostgreSQL.h" diff --git a/Samples/ReadyEvent/ReadyEventSample.cpp b/Samples/ReadyEvent/ReadyEventSample.cpp index e53493838..f30050831 100644 --- a/Samples/ReadyEvent/ReadyEventSample.cpp +++ b/Samples/ReadyEvent/ReadyEventSample.cpp @@ -16,21 +16,21 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/ReadyEvent.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/ready_event.h" #include #include // used for std::numeric_limits -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/ConnectionGraph2.h" +#include "mafianet/socket_layer.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/connection_graph2.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/guid_util.h" void PrintConnections(); diff --git a/Samples/RelayPluginTest/main.cpp b/Samples/RelayPluginTest/main.cpp index 118646ee7..161b1fdeb 100644 --- a/Samples/RelayPluginTest/main.cpp +++ b/Samples/RelayPluginTest/main.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" -#include "mafianet/RelayPlugin.h" -#include "mafianet/Gets.h" -#include "mafianet/Kbhit.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/relay_plugin.h" +#include "mafianet/gets.h" +#include "mafianet/kbhit.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include // used for std::numeric_limits diff --git a/Samples/ReliableOrderedTest/ReliableOrderedTest.cpp b/Samples/ReliableOrderedTest/ReliableOrderedTest.cpp index 0273d1c67..c18571ed4 100644 --- a/Samples/ReliableOrderedTest/ReliableOrderedTest.cpp +++ b/Samples/ReliableOrderedTest/ReliableOrderedTest.cpp @@ -13,29 +13,29 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include #include #include #include -#include "mafianet/Rand.h" +#include "mafianet/rand.h" #include "mafianet/statistics.h" #include "mafianet/sleep.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" #include #include // used for std::numeric_limits -#include "mafianet/Gets.h" -#include "mafianet/Kbhit.h" +#include "mafianet/gets.h" +#include "mafianet/kbhit.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" using namespace MafiaNet; #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep #else #include // usleep #endif diff --git a/Samples/ReplicaManager3/main.cpp b/Samples/ReplicaManager3/main.cpp index e211f0a35..5f7d1342d 100644 --- a/Samples/ReplicaManager3/main.cpp +++ b/Samples/ReplicaManager3/main.cpp @@ -15,25 +15,25 @@ // Demonstrates ReplicaManager 3: A system to automatically create, destroy, and serialize objects -#include "mafianet/StringTable.h" -#include "mafianet/peerinterface.h" +#include "mafianet/string_table.h" +#include "mafianet/peer_interface.h" #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/ReplicaManager3.h" -#include "mafianet/NetworkIDManager.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/network_id_manager.h" #include "mafianet/sleep.h" -#include "mafianet/FormatString.h" +#include "mafianet/format_string.h" #include "mafianet/string.h" -#include "mafianet/GetTime.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/Getche.h" -#include "mafianet/Rand.h" -#include "mafianet/VariableDeltaSerializer.h" -#include "mafianet/Gets.h" +#include "mafianet/get_time.h" +#include "mafianet/socket_layer.h" +#include "mafianet/getche.h" +#include "mafianet/rand.h" +#include "mafianet/variable_delta_serializer.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include "mafianet/guid_util.h" diff --git a/Samples/ReplicatedLogin/ReplicatedLogin.cpp b/Samples/ReplicatedLogin/ReplicatedLogin.cpp index a6d2f63d3..8e35d89ae 100644 --- a/Samples/ReplicatedLogin/ReplicatedLogin.cpp +++ b/Samples/ReplicatedLogin/ReplicatedLogin.cpp @@ -13,16 +13,16 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/GetTime.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/get_time.h" #include "mafianet/sleep.h" -#include "mafianet/Gets.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Kbhit.h" -#include "mafianet/ReplicaManager3.h" -#include "mafianet/peerinterface.h" -#include "mafianet/NetworkIDManager.h" +#include "mafianet/gets.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/kbhit.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/peer_interface.h" +#include "mafianet/network_id_manager.h" #include "mafianet/guid_util.h" using namespace MafiaNet; diff --git a/Samples/Rooms/RoomsSample.cpp b/Samples/Rooms/RoomsSample.cpp index 468dca295..c054ddd17 100644 --- a/Samples/Rooms/RoomsSample.cpp +++ b/Samples/Rooms/RoomsSample.cpp @@ -14,13 +14,13 @@ */ #include "RoomsPlugin.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "ProfanityFilter.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Kbhit.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/kbhit.h" #include -#include "mafianet/Gets.h" +#include "mafianet/gets.h" struct SampleCallbacks : public MafiaNet::RoomsCallback { diff --git a/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.cpp b/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.cpp index 8fd7cb152..e947ea683 100644 --- a/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.cpp +++ b/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.cpp @@ -16,9 +16,9 @@ #include "RoomsBrowserGFx3_RakNet.h" #include "Lobby2Client.h" #include "XMLParser.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" #include "RoomTypes.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.h b/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.h index 0349d4e27..847af84df 100644 --- a/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.h +++ b/Samples/RoomsBrowserGFx3/RakNet/RoomsBrowserGFx3_RakNet.h @@ -16,10 +16,10 @@ #ifndef __ROOMS_BROWSER_GFX3_RAKNET #define __ROOMS_BROWSER_GFX3_RAKNET -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #include "mafianet/types.h" #include "Lobby2Message.h" -#include "mafianet/PluginInterface2.h" +#include "mafianet/plugin_interface2.h" #include "RoomsBrowserGFx3.h" #include "RoomsPlugin.h" diff --git a/Samples/RoomsBrowserGFx3/RoomsBrowserGFx3.h b/Samples/RoomsBrowserGFx3/RoomsBrowserGFx3.h index d4b79b8d7..cc1ba5829 100644 --- a/Samples/RoomsBrowserGFx3/RoomsBrowserGFx3.h +++ b/Samples/RoomsBrowserGFx3/RoomsBrowserGFx3.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #include "FxGameDelegate.h" #include "mafianet/string.h" diff --git a/Samples/Router2/Router2Sample.cpp b/Samples/Router2/Router2Sample.cpp index ad87df28c..edbd81e8c 100644 --- a/Samples/Router2/Router2Sample.cpp +++ b/Samples/Router2/Router2Sample.cpp @@ -13,22 +13,22 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include -#include "mafianet/Kbhit.h" +#include "mafianet/kbhit.h" #include #include #include // used for std::numeric_limits -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Router2.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/router2.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" #include "mafianet/assert.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/Getche.h" -#include "mafianet/Gets.h" +#include "mafianet/socket_layer.h" +#include "mafianet/getche.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #include "mafianet/guid_util.h" diff --git a/Samples/SendEmail/main.cpp b/Samples/SendEmail/main.cpp index 6df8bb2d8..86002888d 100644 --- a/Samples/SendEmail/main.cpp +++ b/Samples/SendEmail/main.cpp @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/EmailSender.h" -#include "mafianet/FileList.h" +#include "mafianet/email_sender.h" +#include "mafianet/file_list.h" #include -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/ServerClientTest2/ServerClientTest2.cpp b/Samples/ServerClientTest2/ServerClientTest2.cpp index 9b8fc409b..22f874f21 100644 --- a/Samples/ServerClientTest2/ServerClientTest2.cpp +++ b/Samples/ServerClientTest2/ServerClientTest2.cpp @@ -13,31 +13,31 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include // For atoi #include // For strlen -#include "mafianet/Rand.h" +#include "mafianet/rand.h" #include "mafianet/statistics.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" #include -#include "mafianet/Kbhit.h" -#include "mafianet/GetTime.h" +#include "mafianet/kbhit.h" +#include "mafianet/get_time.h" #include "mafianet/assert.h" #include "mafianet/sleep.h" -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" using namespace MafiaNet; #ifdef _WIN32 -#include "mafianet/WindowsIncludes.h" // Sleep64 +#include "mafianet/windows_includes.h" // Sleep64 #else #include // usleep #include -#include "mafianet/Getche.h" +#include "mafianet/getche.h" #endif static const int NUM_CLIENTS=100; diff --git a/Samples/StatisticsHistoryTest/StatisticsHistoryTest.cpp b/Samples/StatisticsHistoryTest/StatisticsHistoryTest.cpp index 0f54a2ee1..e3e03b523 100644 --- a/Samples/StatisticsHistoryTest/StatisticsHistoryTest.cpp +++ b/Samples/StatisticsHistoryTest/StatisticsHistoryTest.cpp @@ -19,10 +19,10 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/StatisticsHistory.h" +#include "mafianet/get_time.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/statistics_history.h" #include #include "mafianet/sleep.h" diff --git a/Samples/SteamLobby/main.cpp b/Samples/SteamLobby/main.cpp index 426c2b359..0c1bd5d57 100644 --- a/Samples/SteamLobby/main.cpp +++ b/Samples/SteamLobby/main.cpp @@ -15,18 +15,18 @@ #include #include -#include "Lobby2Client_Steam.h" // If Lobby2Client_Steam.h is included before SocketLayer.h, then it will use the steam send functions +#include "Lobby2Client_Steam.h" // If Lobby2Client_Steam.h is included before socket_layer.h, then it will use the steam send functions #include "Lobby2Message_Steam.h" #include "mafianet/time.h" #include "mafianet/sleep.h" #include "mafianet/types.h" -#include "mafianet/peerinterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" #include -#include -#include "mafianet/Gets.h" -#include "mafianet/FullyConnectedMesh2.h" +#include +#include "mafianet/gets.h" +#include "mafianet/fully_connected_mesh2.h" #include "mafianet/guid_util.h" #pragma warning( push ) #pragma warning(disable:4127) // conditional expression is constant (with Steamworks 1.23a) diff --git a/Samples/TeamManager/TeamManagerTest.cpp b/Samples/TeamManager/TeamManagerTest.cpp index 11a9e62ed..2378a34e8 100644 --- a/Samples/TeamManager/TeamManagerTest.cpp +++ b/Samples/TeamManager/TeamManagerTest.cpp @@ -16,21 +16,21 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/TeamManager.h" -#include "mafianet/Kbhit.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/team_manager.h" +#include "mafianet/kbhit.h" #include "mafianet/sleep.h" #include "mafianet/types.h" -#include "mafianet/BitStream.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/ReplicaManager3.h" -#include "mafianet/NetworkIDManager.h" +#include "mafianet/bit_stream.h" +#include "mafianet/socket_layer.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/network_id_manager.h" #include "mafianet/osx_adapter.h" -#include "mafianet/Gets.h" +#include "mafianet/gets.h" #include "mafianet/guid_util.h" using namespace MafiaNet; diff --git a/Samples/TestDLL/main.cpp b/Samples/TestDLL/main.cpp index a8917a930..74ca13c2e 100644 --- a/Samples/TestDLL/main.cpp +++ b/Samples/TestDLL/main.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" -#include "mafianet/FileOperations.h" -#include "mafianet/memoryoverride.h" -#include "mafianet/ConsoleServer.h" -#include "mafianet/LogCommandParser.h" -#include "mafianet/commandparser.h" -#include "mafianet/PacketLogger.h" -#include "mafianet/DS_List.h" -#include "mafianet/SocketLayer.h" +#include "mafianet/peer_interface.h" +#include "mafianet/file_operations.h" +#include "mafianet/memory_override.h" +#include "mafianet/console_server.h" +#include "mafianet/log_command_parser.h" +#include "mafianet/command_parser.h" +#include "mafianet/packet_logger.h" +#include "mafianet/ds_list.h" +#include "mafianet/socket_layer.h" #include "mafianet/sleep.h" -#include "mafianet/TCPInterface.h" +#include "mafianet/tcp_interface.h" using namespace MafiaNet; diff --git a/Samples/ThreadTest/ThreadTest.cpp b/Samples/ThreadTest/ThreadTest.cpp index d6adaa1ca..0ca3c0284 100644 --- a/Samples/ThreadTest/ThreadTest.cpp +++ b/Samples/ThreadTest/ThreadTest.cpp @@ -17,14 +17,14 @@ /// \brief Tests multiple readers and writers on the same instance of RakPeer. -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/statistics.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Kbhit.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/kbhit.h" #include // Printf -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep //#include #include "mafianet/thread.h" #include "mafianet/sleep.h" diff --git a/Samples/Timestamping/Timestamping.cpp b/Samples/Timestamping/Timestamping.cpp index 7b248fab2..3b62da5c1 100644 --- a/Samples/Timestamping/Timestamping.cpp +++ b/Samples/Timestamping/Timestamping.cpp @@ -13,19 +13,19 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/GetTime.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/get_time.h" #include "mafianet/sleep.h" using namespace MafiaNet; #include #include #include -#include "mafianet/Gets.h" -#include "mafianet/Kbhit.h" +#include "mafianet/gets.h" +#include "mafianet/kbhit.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Samples/TitleValidationDB_PostgreSQL/TitleValidationDB_PostgreSQLTest.cpp b/Samples/TitleValidationDB_PostgreSQL/TitleValidationDB_PostgreSQLTest.cpp index 02e825c26..41dfd6aff 100644 --- a/Samples/TitleValidationDB_PostgreSQL/TitleValidationDB_PostgreSQLTest.cpp +++ b/Samples/TitleValidationDB_PostgreSQL/TitleValidationDB_PostgreSQLTest.cpp @@ -11,11 +11,11 @@ // Common includes #include #include -#include "mafianet/Kbhit.h" -#include "mafianet/GetTime.h" +#include "mafianet/kbhit.h" +#include "mafianet/get_time.h" #include "FunctionThread.h" #include "TitleValidationDB_PostgreSQL.h" -#include "mafianet/EpochTimeToString.h" +#include "mafianet/epoch_time_to_string.h" #ifdef _WIN32 #include // Sleep diff --git a/Samples/TwoWayAuthentication/TwoWayAuthenticationTest.cpp b/Samples/TwoWayAuthentication/TwoWayAuthenticationTest.cpp index 803500119..7e9972535 100644 --- a/Samples/TwoWayAuthentication/TwoWayAuthenticationTest.cpp +++ b/Samples/TwoWayAuthentication/TwoWayAuthenticationTest.cpp @@ -16,12 +16,12 @@ #include #include #include -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/TwoWayAuthentication.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/two_way_authentication.h" #include "mafianet/sleep.h" static const int NUM_PEERS=2; diff --git a/Samples/UDPForwarder/main.cpp b/Samples/UDPForwarder/main.cpp index 9b1df5279..8702445bb 100644 --- a/Samples/UDPForwarder/main.cpp +++ b/Samples/UDPForwarder/main.cpp @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/sleep.h" #include #include #include -#include "mafianet/Kbhit.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/kbhit.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/UDPForwarder.h" -#include "mafianet/SocketLayer.h" +#include "mafianet/udp_forwarder.h" +#include "mafianet/socket_layer.h" int main() { diff --git a/Samples/VirtualWorld/main.cpp b/Samples/VirtualWorld/main.cpp index 3011a96b6..3972f0a85 100644 --- a/Samples/VirtualWorld/main.cpp +++ b/Samples/VirtualWorld/main.cpp @@ -8,8 +8,8 @@ // Virtual World (dimension) sample. // // Demonstrates scoping player visibility at runtime with the virtual world -// feature layered on ReplicaManager3 (see mafianet/VirtualWorld.h and -// mafianet/VirtualWorldReplica3.h). This is the SA-MP SetPlayerVirtualWorld / +// feature layered on ReplicaManager3 (see mafianet/virtual_world.h and +// mafianet/virtual_world_replica3.h). This is the SA-MP SetPlayerVirtualWorld / // routing-bucket model: a player dropped into a dimension only sees players in // that same dimension, switchable on the fly with no reconnect. // @@ -27,13 +27,13 @@ // The sample is non-interactive: it drives the peers, prints what each client // sees at each step, and returns 0 only if visibility matched expectations. -#include "mafianet/peerinterface.h" -#include "mafianet/ReplicaManager3.h" -#include "mafianet/VirtualWorld.h" -#include "mafianet/VirtualWorldReplica3.h" -#include "mafianet/NetworkIDManager.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/virtual_world.h" +#include "mafianet/virtual_world_replica3.h" +#include "mafianet/network_id_manager.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" #include "mafianet/sleep.h" #include diff --git a/Samples/iOS/ChatClient/ChatClient.xcodeproj/project.pbxproj b/Samples/iOS/ChatClient/ChatClient.xcodeproj/project.pbxproj index db49a17a9..eed0243b8 100644 --- a/Samples/iOS/ChatClient/ChatClient.xcodeproj/project.pbxproj +++ b/Samples/iOS/ChatClient/ChatClient.xcodeproj/project.pbxproj @@ -7,104 +7,103 @@ objects = { /* Begin PBXBuildFile section */ - B23EA3C3147F5A43002B8C06 /* _FindFirst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2CE147F5A43002B8C06 /* _FindFirst.cpp */; }; - B23EA3C4147F5A43002B8C06 /* BitStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D2147F5A43002B8C06 /* BitStream.cpp */; }; - B23EA3C5147F5A43002B8C06 /* CCRakNetSlidingWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D4147F5A43002B8C06 /* CCRakNetSlidingWindow.cpp */; }; - B23EA3C6147F5A43002B8C06 /* CCRakNetUDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D6147F5A43002B8C06 /* CCRakNetUDT.cpp */; }; - B23EA3C7147F5A43002B8C06 /* CheckSum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D8147F5A43002B8C06 /* CheckSum.cpp */; }; - B23EA3C8147F5A43002B8C06 /* CloudClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2DA147F5A43002B8C06 /* CloudClient.cpp */; }; - B23EA3C9147F5A43002B8C06 /* CloudCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2DC147F5A43002B8C06 /* CloudCommon.cpp */; }; - B23EA3CA147F5A43002B8C06 /* CloudServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2DE147F5A43002B8C06 /* CloudServer.cpp */; }; + B23EA3C3147F5A43002B8C06 /* find_first.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2CE147F5A43002B8C06 /* find_first.cpp */; }; + B23EA3C4147F5A43002B8C06 /* bit_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D2147F5A43002B8C06 /* bit_stream.cpp */; }; + B23EA3C5147F5A43002B8C06 /* cc_sliding_window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D4147F5A43002B8C06 /* cc_sliding_window.cpp */; }; + B23EA3C6147F5A43002B8C06 /* cc_udt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D6147F5A43002B8C06 /* cc_udt.cpp */; }; + B23EA3C7147F5A43002B8C06 /* check_sum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2D8147F5A43002B8C06 /* check_sum.cpp */; }; + B23EA3C8147F5A43002B8C06 /* cloud_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2DA147F5A43002B8C06 /* cloud_client.cpp */; }; + B23EA3C9147F5A43002B8C06 /* cloud_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2DC147F5A43002B8C06 /* cloud_common.cpp */; }; + B23EA3CA147F5A43002B8C06 /* cloud_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2DE147F5A43002B8C06 /* cloud_server.cpp */; }; B23EA3CB147F5A43002B8C06 /* CMakeLists.txt in Resources */ = {isa = PBXBuildFile; fileRef = B23EA2E0147F5A43002B8C06 /* CMakeLists.txt */; }; - B23EA3CC147F5A43002B8C06 /* CommandParserInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E1147F5A43002B8C06 /* CommandParserInterface.cpp */; }; - B23EA3CD147F5A43002B8C06 /* ConnectionGraph2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E3147F5A43002B8C06 /* ConnectionGraph2.cpp */; }; - B23EA3CE147F5A43002B8C06 /* ConsoleServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E5147F5A43002B8C06 /* ConsoleServer.cpp */; }; - B23EA3CF147F5A43002B8C06 /* DataCompressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E7147F5A43002B8C06 /* DataCompressor.cpp */; }; - B23EA3D0147F5A43002B8C06 /* DirectoryDeltaTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E9147F5A43002B8C06 /* DirectoryDeltaTransfer.cpp */; }; - B23EA3D1147F5A43002B8C06 /* DS_BytePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2ED147F5A43002B8C06 /* DS_BytePool.cpp */; }; - B23EA3D2147F5A43002B8C06 /* DS_ByteQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2EF147F5A43002B8C06 /* DS_ByteQueue.cpp */; }; - B23EA3D3147F5A43002B8C06 /* DS_HuffmanEncodingTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2F3147F5A43002B8C06 /* DS_HuffmanEncodingTree.cpp */; }; - B23EA3D4147F5A43002B8C06 /* DS_Table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA301147F5A43002B8C06 /* DS_Table.cpp */; }; - B23EA3D5147F5A43002B8C06 /* DynDNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA306147F5A43002B8C06 /* DynDNS.cpp */; }; - B23EA3D6147F5A43002B8C06 /* EmailSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA308147F5A43002B8C06 /* EmailSender.cpp */; }; + B23EA3CC147F5A43002B8C06 /* command_parser_interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E1147F5A43002B8C06 /* command_parser_interface.cpp */; }; + B23EA3CD147F5A43002B8C06 /* connection_graph2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E3147F5A43002B8C06 /* connection_graph2.cpp */; }; + B23EA3CE147F5A43002B8C06 /* console_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E5147F5A43002B8C06 /* console_server.cpp */; }; + B23EA3CF147F5A43002B8C06 /* data_compressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E7147F5A43002B8C06 /* data_compressor.cpp */; }; + B23EA3D0147F5A43002B8C06 /* directory_delta_transfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2E9147F5A43002B8C06 /* directory_delta_transfer.cpp */; }; + B23EA3D1147F5A43002B8C06 /* ds_byte_pool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2ED147F5A43002B8C06 /* ds_byte_pool.cpp */; }; + B23EA3D2147F5A43002B8C06 /* ds_byte_queue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2EF147F5A43002B8C06 /* ds_byte_queue.cpp */; }; + B23EA3D3147F5A43002B8C06 /* ds_huffman_encoding_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA2F3147F5A43002B8C06 /* ds_huffman_encoding_tree.cpp */; }; + B23EA3D4147F5A43002B8C06 /* ds_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA301147F5A43002B8C06 /* ds_table.cpp */; }; + B23EA3D5147F5A43002B8C06 /* dyn_dns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA306147F5A43002B8C06 /* dyn_dns.cpp */; }; + B23EA3D6147F5A43002B8C06 /* email_sender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA308147F5A43002B8C06 /* email_sender.cpp */; }; B23EA3D7147F5A43002B8C06 /* EncodeClassName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA30A147F5A43002B8C06 /* EncodeClassName.cpp */; }; - B23EA3D8147F5A43002B8C06 /* EpochTimeToString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA30B147F5A43002B8C06 /* EpochTimeToString.cpp */; }; - B23EA3D9147F5A43002B8C06 /* FileList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA30E147F5A43002B8C06 /* FileList.cpp */; }; - B23EA3DA147F5A43002B8C06 /* FileListTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA311147F5A43002B8C06 /* FileListTransfer.cpp */; }; - B23EA3DB147F5A43002B8C06 /* FileOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA314147F5A43002B8C06 /* FileOperations.cpp */; }; - B23EA3DC147F5A43002B8C06 /* FormatString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA316147F5A43002B8C06 /* FormatString.cpp */; }; - B23EA3DD147F5A43002B8C06 /* FullyConnectedMesh2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA318147F5A43002B8C06 /* FullyConnectedMesh2.cpp */; }; - B23EA3DE147F5A43002B8C06 /* Getche.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA31A147F5A43002B8C06 /* Getche.cpp */; }; - B23EA3DF147F5A43002B8C06 /* Gets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA31C147F5A43002B8C06 /* Gets.cpp */; }; - B23EA3E0147F5A43002B8C06 /* GetTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA31E147F5A43002B8C06 /* GetTime.cpp */; }; - B23EA3E1147F5A43002B8C06 /* gettimeofday.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA320147F5A43002B8C06 /* gettimeofday.cpp */; }; - B23EA3E2147F5A43002B8C06 /* GridSectorizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA322147F5A43002B8C06 /* GridSectorizer.cpp */; }; - B23EA3E3147F5A43002B8C06 /* HTTPConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA324147F5A43002B8C06 /* HTTPConnection.cpp */; }; - B23EA3E4147F5A43002B8C06 /* IncrementalReadInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA326147F5A43002B8C06 /* IncrementalReadInterface.cpp */; }; - B23EA3E5147F5A43002B8C06 /* Itoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA329147F5A43002B8C06 /* Itoa.cpp */; }; - B23EA3E6147F5A43002B8C06 /* LinuxStrings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA32C147F5A43002B8C06 /* LinuxStrings.cpp */; }; - B23EA3E7147F5A43002B8C06 /* LocklessTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA32E147F5A43002B8C06 /* LocklessTypes.cpp */; }; - B23EA3E8147F5A43002B8C06 /* LogCommandParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA330147F5A43002B8C06 /* LogCommandParser.cpp */; }; - B23EA3E9147F5A43002B8C06 /* MessageFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA332147F5A43002B8C06 /* MessageFilter.cpp */; }; - B23EA3EA147F5A43002B8C06 /* NatPunchthroughClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA339147F5A43002B8C06 /* NatPunchthroughClient.cpp */; }; - B23EA3EB147F5A43002B8C06 /* NatPunchthroughServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA33B147F5A43002B8C06 /* NatPunchthroughServer.cpp */; }; - B23EA3EC147F5A43002B8C06 /* NatTypeDetectionClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA33D147F5A43002B8C06 /* NatTypeDetectionClient.cpp */; }; - B23EA3ED147F5A43002B8C06 /* NatTypeDetectionCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA33F147F5A43002B8C06 /* NatTypeDetectionCommon.cpp */; }; - B23EA3EE147F5A43002B8C06 /* NatTypeDetectionServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA341147F5A43002B8C06 /* NatTypeDetectionServer.cpp */; }; - B23EA3EF147F5A43002B8C06 /* NetworkIDManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA343147F5A43002B8C06 /* NetworkIDManager.cpp */; }; - B23EA3F0147F5A43002B8C06 /* NetworkIDObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA345147F5A43002B8C06 /* NetworkIDObject.cpp */; }; - B23EA3F1147F5A43002B8C06 /* PacketConsoleLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA347147F5A43002B8C06 /* PacketConsoleLogger.cpp */; }; - B23EA3F2147F5A43002B8C06 /* PacketFileLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA349147F5A43002B8C06 /* PacketFileLogger.cpp */; }; - B23EA3F3147F5A43002B8C06 /* PacketizedTCP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA34B147F5A43002B8C06 /* PacketizedTCP.cpp */; }; - B23EA3F4147F5A43002B8C06 /* PacketLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA34D147F5A43002B8C06 /* PacketLogger.cpp */; }; - B23EA3F5147F5A43002B8C06 /* PacketOutputWindowLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA34F147F5A43002B8C06 /* PacketOutputWindowLogger.cpp */; }; - B23EA3F6147F5A43002B8C06 /* PluginInterface2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA353147F5A43002B8C06 /* PluginInterface2.cpp */; }; - B23EA3F7147F5A43002B8C06 /* Rackspace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA356147F5A43002B8C06 /* Rackspace.cpp */; }; - B23EA3F8147F5A43002B8C06 /* RakMemoryOverride.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA35A147F5A43002B8C06 /* RakMemoryOverride.cpp */; }; + B23EA3D8147F5A43002B8C06 /* epoch_time_to_string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA30B147F5A43002B8C06 /* epoch_time_to_string.cpp */; }; + B23EA3D9147F5A43002B8C06 /* file_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA30E147F5A43002B8C06 /* file_list.cpp */; }; + B23EA3DA147F5A43002B8C06 /* file_list_transfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA311147F5A43002B8C06 /* file_list_transfer.cpp */; }; + B23EA3DB147F5A43002B8C06 /* file_operations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA314147F5A43002B8C06 /* file_operations.cpp */; }; + B23EA3DC147F5A43002B8C06 /* format_string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA316147F5A43002B8C06 /* format_string.cpp */; }; + B23EA3DD147F5A43002B8C06 /* fully_connected_mesh2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA318147F5A43002B8C06 /* fully_connected_mesh2.cpp */; }; + B23EA3DE147F5A43002B8C06 /* getche.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA31A147F5A43002B8C06 /* getche.cpp */; }; + B23EA3DF147F5A43002B8C06 /* gets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA31C147F5A43002B8C06 /* gets.cpp */; }; + B23EA3E0147F5A43002B8C06 /* get_time.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA31E147F5A43002B8C06 /* get_time.cpp */; }; + B23EA3E1147F5A43002B8C06 /* get_time_of_day.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA320147F5A43002B8C06 /* get_time_of_day.cpp */; }; + B23EA3E2147F5A43002B8C06 /* grid_sectorizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA322147F5A43002B8C06 /* grid_sectorizer.cpp */; }; + B23EA3E3147F5A43002B8C06 /* http_connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA324147F5A43002B8C06 /* http_connection.cpp */; }; + B23EA3E4147F5A43002B8C06 /* incremental_read_interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA326147F5A43002B8C06 /* incremental_read_interface.cpp */; }; + B23EA3E5147F5A43002B8C06 /* itoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA329147F5A43002B8C06 /* itoa.cpp */; }; + B23EA3E6147F5A43002B8C06 /* linux_strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA32C147F5A43002B8C06 /* linux_strings.cpp */; }; + B23EA3E7147F5A43002B8C06 /* lockless_types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA32E147F5A43002B8C06 /* lockless_types.cpp */; }; + B23EA3E8147F5A43002B8C06 /* log_command_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA330147F5A43002B8C06 /* log_command_parser.cpp */; }; + B23EA3E9147F5A43002B8C06 /* message_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA332147F5A43002B8C06 /* message_filter.cpp */; }; + B23EA3EA147F5A43002B8C06 /* nat_punchthrough_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA339147F5A43002B8C06 /* nat_punchthrough_client.cpp */; }; + B23EA3EB147F5A43002B8C06 /* nat_punchthrough_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA33B147F5A43002B8C06 /* nat_punchthrough_server.cpp */; }; + B23EA3EC147F5A43002B8C06 /* nat_type_detection_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA33D147F5A43002B8C06 /* nat_type_detection_client.cpp */; }; + B23EA3ED147F5A43002B8C06 /* nat_type_detection_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA33F147F5A43002B8C06 /* nat_type_detection_common.cpp */; }; + B23EA3EE147F5A43002B8C06 /* nat_type_detection_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA341147F5A43002B8C06 /* nat_type_detection_server.cpp */; }; + B23EA3EF147F5A43002B8C06 /* network_id_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA343147F5A43002B8C06 /* network_id_manager.cpp */; }; + B23EA3F0147F5A43002B8C06 /* network_id_object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA345147F5A43002B8C06 /* network_id_object.cpp */; }; + B23EA3F1147F5A43002B8C06 /* packet_console_logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA347147F5A43002B8C06 /* packet_console_logger.cpp */; }; + B23EA3F2147F5A43002B8C06 /* packet_file_logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA349147F5A43002B8C06 /* packet_file_logger.cpp */; }; + B23EA3F3147F5A43002B8C06 /* packetized_tcp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA34B147F5A43002B8C06 /* packetized_tcp.cpp */; }; + B23EA3F4147F5A43002B8C06 /* packet_logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA34D147F5A43002B8C06 /* packet_logger.cpp */; }; + B23EA3F5147F5A43002B8C06 /* packet_output_window_logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA34F147F5A43002B8C06 /* packet_output_window_logger.cpp */; }; + B23EA3F6147F5A43002B8C06 /* plugin_interface2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA353147F5A43002B8C06 /* plugin_interface2.cpp */; }; + B23EA3F7147F5A43002B8C06 /* rackspace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA356147F5A43002B8C06 /* rackspace.cpp */; }; + B23EA3F8147F5A43002B8C06 /* memory_override.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA35A147F5A43002B8C06 /* memory_override.cpp */; }; B23EA3F9147F5A43002B8C06 /* RakNet_vc8.vcproj in Resources */ = {isa = PBXBuildFile; fileRef = B23EA35C147F5A43002B8C06 /* RakNet_vc8.vcproj */; }; B23EA3FA147F5A43002B8C06 /* RakNet_vc9.vcproj in Resources */ = {isa = PBXBuildFile; fileRef = B23EA35D147F5A43002B8C06 /* RakNet_vc9.vcproj */; }; B23EA3FB147F5A43002B8C06 /* RakNet.vcproj in Resources */ = {isa = PBXBuildFile; fileRef = B23EA35E147F5A43002B8C06 /* RakNet.vcproj */; }; - B23EA3FC147F5A43002B8C06 /* RakNetCommandParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA35F147F5A43002B8C06 /* RakNetCommandParser.cpp */; }; + B23EA3FC147F5A43002B8C06 /* command_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA35F147F5A43002B8C06 /* command_parser.cpp */; }; B23EA3FD147F5A43002B8C06 /* RakNetSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA364147F5A43002B8C06 /* RakNetSocket.cpp */; }; - B23EA3FE147F5A43002B8C06 /* RakNetStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA366147F5A43002B8C06 /* RakNetStatistics.cpp */; }; - B23EA3FF147F5A43002B8C06 /* RakNetTransport2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA369147F5A43002B8C06 /* RakNetTransport2.cpp */; }; - B23EA400147F5A43002B8C06 /* RakNetTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA36B147F5A43002B8C06 /* RakNetTypes.cpp */; }; - B23EA401147F5A43002B8C06 /* RakPeer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA36E147F5A43002B8C06 /* RakPeer.cpp */; }; - B23EA402147F5A43002B8C06 /* RakSleep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA371147F5A43002B8C06 /* RakSleep.cpp */; }; - B23EA403147F5A43002B8C06 /* RakString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA373147F5A43002B8C06 /* RakString.cpp */; }; - B23EA404147F5A43002B8C06 /* RakThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA375147F5A43002B8C06 /* RakThread.cpp */; }; - B23EA405147F5A43002B8C06 /* RakWString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA377147F5A43002B8C06 /* RakWString.cpp */; }; - B23EA406147F5A43002B8C06 /* Rand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA379147F5A43002B8C06 /* Rand.cpp */; }; + B23EA3FE147F5A43002B8C06 /* statistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA366147F5A43002B8C06 /* statistics.cpp */; }; + B23EA3FF147F5A43002B8C06 /* transport2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA369147F5A43002B8C06 /* transport2.cpp */; }; + B23EA400147F5A43002B8C06 /* types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA36B147F5A43002B8C06 /* types.cpp */; }; + B23EA401147F5A43002B8C06 /* peer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA36E147F5A43002B8C06 /* peer.cpp */; }; + B23EA402147F5A43002B8C06 /* sleep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA371147F5A43002B8C06 /* sleep.cpp */; }; + B23EA403147F5A43002B8C06 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA373147F5A43002B8C06 /* string.cpp */; }; + B23EA404147F5A43002B8C06 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA375147F5A43002B8C06 /* thread.cpp */; }; + B23EA405147F5A43002B8C06 /* wstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA377147F5A43002B8C06 /* wstring.cpp */; }; + B23EA406147F5A43002B8C06 /* rand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA379147F5A43002B8C06 /* rand.cpp */; }; B23EA407147F5A43002B8C06 /* rdlmalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA37C147F5A43002B8C06 /* rdlmalloc.cpp */; }; - B23EA408147F5A43002B8C06 /* ReadyEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA37E147F5A43002B8C06 /* ReadyEvent.cpp */; }; - B23EA409147F5A43002B8C06 /* ReliabilityLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA381147F5A43002B8C06 /* ReliabilityLayer.cpp */; }; - B23EA40A147F5A43002B8C06 /* ReplicaManager3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA384147F5A43002B8C06 /* ReplicaManager3.cpp */; }; - B23EA40B147F5A43002B8C06 /* Router2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA386147F5A43002B8C06 /* Router2.cpp */; }; - B23EA40C147F5A43002B8C06 /* RPC4Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA388147F5A43002B8C06 /* RPC4Plugin.cpp */; }; - B23EA40D147F5A43002B8C06 /* SecureHandshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA38A147F5A43002B8C06 /* SecureHandshake.cpp */; }; - B23EA40E147F5A43002B8C06 /* SendToThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA38C147F5A43002B8C06 /* SendToThread.cpp */; }; + B23EA408147F5A43002B8C06 /* ready_event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA37E147F5A43002B8C06 /* ready_event.cpp */; }; + B23EA409147F5A43002B8C06 /* reliability_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA381147F5A43002B8C06 /* reliability_layer.cpp */; }; + B23EA40A147F5A43002B8C06 /* replica_manager3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA384147F5A43002B8C06 /* replica_manager3.cpp */; }; + B23EA40B147F5A43002B8C06 /* router2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA386147F5A43002B8C06 /* router2.cpp */; }; + B23EA40C147F5A43002B8C06 /* rpc4_plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA388147F5A43002B8C06 /* rpc4_plugin.cpp */; }; + B23EA40D147F5A43002B8C06 /* secure_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA38A147F5A43002B8C06 /* secure_handshake.cpp */; }; + B23EA40E147F5A43002B8C06 /* send_to_thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA38C147F5A43002B8C06 /* send_to_thread.cpp */; }; B23EA40F147F5A43002B8C06 /* SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA38E147F5A43002B8C06 /* SHA1.cpp */; }; - B23EA410147F5A43002B8C06 /* SignaledEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA390147F5A43002B8C06 /* SignaledEvent.cpp */; }; - B23EA411147F5A43002B8C06 /* SimpleMutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA392147F5A43002B8C06 /* SimpleMutex.cpp */; }; - B23EA412147F5A43002B8C06 /* SocketLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA398147F5A43002B8C06 /* SocketLayer.cpp */; }; - B23EA413147F5A43002B8C06 /* StringCompressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA39A147F5A43002B8C06 /* StringCompressor.cpp */; }; - B23EA414147F5A43002B8C06 /* StringTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA39C147F5A43002B8C06 /* StringTable.cpp */; }; - B23EA415147F5A43002B8C06 /* SuperFastHash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA39E147F5A43002B8C06 /* SuperFastHash.cpp */; }; - B23EA416147F5A43002B8C06 /* TableSerializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A0147F5A43002B8C06 /* TableSerializer.cpp */; }; - B23EA417147F5A43002B8C06 /* TCPInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A2147F5A43002B8C06 /* TCPInterface.cpp */; }; - B23EA418147F5A43002B8C06 /* TeamBalancer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A4147F5A43002B8C06 /* TeamBalancer.cpp */; }; - B23EA419147F5A43002B8C06 /* TelnetTransport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A6147F5A43002B8C06 /* TelnetTransport.cpp */; }; - B23EA41A147F5A43002B8C06 /* ThreadsafePacketLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A9147F5A43002B8C06 /* ThreadsafePacketLogger.cpp */; }; - B23EA41B147F5A43002B8C06 /* TwoWayAuthentication.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3AC147F5A43002B8C06 /* TwoWayAuthentication.cpp */; }; - B23EA41C147F5A43002B8C06 /* UDPForwarder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3AE147F5A43002B8C06 /* UDPForwarder.cpp */; }; - B23EA41D147F5A43002B8C06 /* UDPProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B0147F5A43002B8C06 /* UDPProxyClient.cpp */; }; - B23EA41E147F5A43002B8C06 /* UDPProxyCoordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B3147F5A43002B8C06 /* UDPProxyCoordinator.cpp */; }; - B23EA41F147F5A43002B8C06 /* UDPProxyServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B5147F5A43002B8C06 /* UDPProxyServer.cpp */; }; - B23EA420147F5A43002B8C06 /* VariableDeltaSerializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B7147F5A43002B8C06 /* VariableDeltaSerializer.cpp */; }; - B23EA421147F5A43002B8C06 /* VariableListDeltaTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B9147F5A43002B8C06 /* VariableListDeltaTracker.cpp */; }; - B23EA422147F5A43002B8C06 /* VariadicSQLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3BB147F5A43002B8C06 /* VariadicSQLParser.cpp */; }; - B23EA423147F5A43002B8C06 /* VitaIncludes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3BD147F5A43002B8C06 /* VitaIncludes.cpp */; }; - B23EA424147F5A43002B8C06 /* WSAStartupSingleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3C0147F5A43002B8C06 /* WSAStartupSingleton.cpp */; }; + B23EA410147F5A43002B8C06 /* signaled_event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA390147F5A43002B8C06 /* signaled_event.cpp */; }; + B23EA411147F5A43002B8C06 /* simple_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA392147F5A43002B8C06 /* simple_mutex.cpp */; }; + B23EA412147F5A43002B8C06 /* socket_layer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA398147F5A43002B8C06 /* socket_layer.cpp */; }; + B23EA413147F5A43002B8C06 /* string_compressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA39A147F5A43002B8C06 /* string_compressor.cpp */; }; + B23EA414147F5A43002B8C06 /* string_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA39C147F5A43002B8C06 /* string_table.cpp */; }; + B23EA415147F5A43002B8C06 /* super_fast_hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA39E147F5A43002B8C06 /* super_fast_hash.cpp */; }; + B23EA416147F5A43002B8C06 /* table_serializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A0147F5A43002B8C06 /* table_serializer.cpp */; }; + B23EA417147F5A43002B8C06 /* tcp_interface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A2147F5A43002B8C06 /* tcp_interface.cpp */; }; + B23EA418147F5A43002B8C06 /* team_balancer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A4147F5A43002B8C06 /* team_balancer.cpp */; }; + B23EA419147F5A43002B8C06 /* telnet_transport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A6147F5A43002B8C06 /* telnet_transport.cpp */; }; + B23EA41A147F5A43002B8C06 /* threadsafe_packet_logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3A9147F5A43002B8C06 /* threadsafe_packet_logger.cpp */; }; + B23EA41B147F5A43002B8C06 /* two_way_authentication.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3AC147F5A43002B8C06 /* two_way_authentication.cpp */; }; + B23EA41C147F5A43002B8C06 /* udp_forwarder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3AE147F5A43002B8C06 /* udp_forwarder.cpp */; }; + B23EA41D147F5A43002B8C06 /* udp_proxy_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B0147F5A43002B8C06 /* udp_proxy_client.cpp */; }; + B23EA41E147F5A43002B8C06 /* udp_proxy_coordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B3147F5A43002B8C06 /* udp_proxy_coordinator.cpp */; }; + B23EA41F147F5A43002B8C06 /* udp_proxy_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B5147F5A43002B8C06 /* udp_proxy_server.cpp */; }; + B23EA420147F5A43002B8C06 /* variable_delta_serializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B7147F5A43002B8C06 /* variable_delta_serializer.cpp */; }; + B23EA421147F5A43002B8C06 /* variable_list_delta_tracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3B9147F5A43002B8C06 /* variable_list_delta_tracker.cpp */; }; + B23EA422147F5A43002B8C06 /* variadic_sql_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3BB147F5A43002B8C06 /* variadic_sql_parser.cpp */; }; + B23EA424147F5A43002B8C06 /* wsa_startup_singleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B23EA3C0147F5A43002B8C06 /* wsa_startup_singleton.cpp */; }; B24A1D60147EDC330029E45E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24A1D5F147EDC330029E45E /* UIKit.framework */; }; B24A1D62147EDC330029E45E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24A1D61147EDC330029E45E /* Foundation.framework */; }; B24A1D64147EDC330029E45E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24A1D63147EDC330029E45E /* CoreGraphics.framework */; }; @@ -118,251 +117,247 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - B23EA2CE147F5A43002B8C06 /* _FindFirst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = _FindFirst.cpp; path = ../../../Source/_FindFirst.cpp; sourceTree = ""; }; - B23EA2CF147F5A43002B8C06 /* _FindFirst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = _FindFirst.h; path = ../../../Source/_FindFirst.h; sourceTree = ""; }; - B23EA2D0147F5A43002B8C06 /* AutopatcherPatchContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutopatcherPatchContext.h; path = ../../../Source/AutopatcherPatchContext.h; sourceTree = ""; }; - B23EA2D1147F5A43002B8C06 /* AutopatcherRepositoryInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutopatcherRepositoryInterface.h; path = ../../../Source/AutopatcherRepositoryInterface.h; sourceTree = ""; }; - B23EA2D2147F5A43002B8C06 /* BitStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BitStream.cpp; path = ../../../Source/BitStream.cpp; sourceTree = ""; }; - B23EA2D3147F5A43002B8C06 /* BitStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BitStream.h; path = ../../../Source/BitStream.h; sourceTree = ""; }; - B23EA2D4147F5A43002B8C06 /* CCRakNetSlidingWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCRakNetSlidingWindow.cpp; path = ../../../Source/CCRakNetSlidingWindow.cpp; sourceTree = ""; }; - B23EA2D5147F5A43002B8C06 /* CCRakNetSlidingWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRakNetSlidingWindow.h; path = ../../../Source/CCRakNetSlidingWindow.h; sourceTree = ""; }; - B23EA2D6147F5A43002B8C06 /* CCRakNetUDT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCRakNetUDT.cpp; path = ../../../Source/CCRakNetUDT.cpp; sourceTree = ""; }; - B23EA2D7147F5A43002B8C06 /* CCRakNetUDT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRakNetUDT.h; path = ../../../Source/CCRakNetUDT.h; sourceTree = ""; }; - B23EA2D8147F5A43002B8C06 /* CheckSum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CheckSum.cpp; path = ../../../Source/CheckSum.cpp; sourceTree = ""; }; - B23EA2D9147F5A43002B8C06 /* CheckSum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CheckSum.h; path = ../../../Source/CheckSum.h; sourceTree = ""; }; - B23EA2DA147F5A43002B8C06 /* CloudClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CloudClient.cpp; path = ../../../Source/CloudClient.cpp; sourceTree = ""; }; - B23EA2DB147F5A43002B8C06 /* CloudClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CloudClient.h; path = ../../../Source/CloudClient.h; sourceTree = ""; }; - B23EA2DC147F5A43002B8C06 /* CloudCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CloudCommon.cpp; path = ../../../Source/CloudCommon.cpp; sourceTree = ""; }; - B23EA2DD147F5A43002B8C06 /* CloudCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CloudCommon.h; path = ../../../Source/CloudCommon.h; sourceTree = ""; }; - B23EA2DE147F5A43002B8C06 /* CloudServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CloudServer.cpp; path = ../../../Source/CloudServer.cpp; sourceTree = ""; }; - B23EA2DF147F5A43002B8C06 /* CloudServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CloudServer.h; path = ../../../Source/CloudServer.h; sourceTree = ""; }; + B23EA2CE147F5A43002B8C06 /* find_first.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = find_first.cpp; path = ../../../Source/find_first.cpp; sourceTree = ""; }; + B23EA2CF147F5A43002B8C06 /* find_first.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = find_first.h; path = ../../../Source/find_first.h; sourceTree = ""; }; + B23EA2D0147F5A43002B8C06 /* autopatcher_patch_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = autopatcher_patch_context.h; path = ../../../Source/autopatcher_patch_context.h; sourceTree = ""; }; + B23EA2D1147F5A43002B8C06 /* autopatcher_repository_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = autopatcher_repository_interface.h; path = ../../../Source/autopatcher_repository_interface.h; sourceTree = ""; }; + B23EA2D2147F5A43002B8C06 /* bit_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bit_stream.cpp; path = ../../../Source/bit_stream.cpp; sourceTree = ""; }; + B23EA2D3147F5A43002B8C06 /* bit_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bit_stream.h; path = ../../../Source/bit_stream.h; sourceTree = ""; }; + B23EA2D4147F5A43002B8C06 /* cc_sliding_window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cc_sliding_window.cpp; path = ../../../Source/cc_sliding_window.cpp; sourceTree = ""; }; + B23EA2D5147F5A43002B8C06 /* cc_sliding_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cc_sliding_window.h; path = ../../../Source/cc_sliding_window.h; sourceTree = ""; }; + B23EA2D6147F5A43002B8C06 /* cc_udt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cc_udt.cpp; path = ../../../Source/cc_udt.cpp; sourceTree = ""; }; + B23EA2D7147F5A43002B8C06 /* cc_udt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cc_udt.h; path = ../../../Source/cc_udt.h; sourceTree = ""; }; + B23EA2D8147F5A43002B8C06 /* check_sum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = check_sum.cpp; path = ../../../Source/check_sum.cpp; sourceTree = ""; }; + B23EA2D9147F5A43002B8C06 /* check_sum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = check_sum.h; path = ../../../Source/check_sum.h; sourceTree = ""; }; + B23EA2DA147F5A43002B8C06 /* cloud_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cloud_client.cpp; path = ../../../Source/cloud_client.cpp; sourceTree = ""; }; + B23EA2DB147F5A43002B8C06 /* cloud_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cloud_client.h; path = ../../../Source/cloud_client.h; sourceTree = ""; }; + B23EA2DC147F5A43002B8C06 /* cloud_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cloud_common.cpp; path = ../../../Source/cloud_common.cpp; sourceTree = ""; }; + B23EA2DD147F5A43002B8C06 /* cloud_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cloud_common.h; path = ../../../Source/cloud_common.h; sourceTree = ""; }; + B23EA2DE147F5A43002B8C06 /* cloud_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cloud_server.cpp; path = ../../../Source/cloud_server.cpp; sourceTree = ""; }; + B23EA2DF147F5A43002B8C06 /* cloud_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cloud_server.h; path = ../../../Source/cloud_server.h; sourceTree = ""; }; B23EA2E0147F5A43002B8C06 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../../Source/CMakeLists.txt; sourceTree = ""; }; - B23EA2E1147F5A43002B8C06 /* CommandParserInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandParserInterface.cpp; path = ../../../Source/CommandParserInterface.cpp; sourceTree = ""; }; - B23EA2E2147F5A43002B8C06 /* CommandParserInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandParserInterface.h; path = ../../../Source/CommandParserInterface.h; sourceTree = ""; }; - B23EA2E3147F5A43002B8C06 /* ConnectionGraph2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConnectionGraph2.cpp; path = ../../../Source/ConnectionGraph2.cpp; sourceTree = ""; }; - B23EA2E4147F5A43002B8C06 /* ConnectionGraph2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConnectionGraph2.h; path = ../../../Source/ConnectionGraph2.h; sourceTree = ""; }; - B23EA2E5147F5A43002B8C06 /* ConsoleServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConsoleServer.cpp; path = ../../../Source/ConsoleServer.cpp; sourceTree = ""; }; - B23EA2E6147F5A43002B8C06 /* ConsoleServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConsoleServer.h; path = ../../../Source/ConsoleServer.h; sourceTree = ""; }; - B23EA2E7147F5A43002B8C06 /* DataCompressor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DataCompressor.cpp; path = ../../../Source/DataCompressor.cpp; sourceTree = ""; }; - B23EA2E8147F5A43002B8C06 /* DataCompressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataCompressor.h; path = ../../../Source/DataCompressor.h; sourceTree = ""; }; - B23EA2E9147F5A43002B8C06 /* DirectoryDeltaTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryDeltaTransfer.cpp; path = ../../../Source/DirectoryDeltaTransfer.cpp; sourceTree = ""; }; - B23EA2EA147F5A43002B8C06 /* DirectoryDeltaTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryDeltaTransfer.h; path = ../../../Source/DirectoryDeltaTransfer.h; sourceTree = ""; }; - B23EA2EB147F5A43002B8C06 /* DS_BinarySearchTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_BinarySearchTree.h; path = ../../../Source/DS_BinarySearchTree.h; sourceTree = ""; }; - B23EA2EC147F5A43002B8C06 /* DS_BPlusTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_BPlusTree.h; path = ../../../Source/DS_BPlusTree.h; sourceTree = ""; }; - B23EA2ED147F5A43002B8C06 /* DS_BytePool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DS_BytePool.cpp; path = ../../../Source/DS_BytePool.cpp; sourceTree = ""; }; - B23EA2EE147F5A43002B8C06 /* DS_BytePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_BytePool.h; path = ../../../Source/DS_BytePool.h; sourceTree = ""; }; - B23EA2EF147F5A43002B8C06 /* DS_ByteQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DS_ByteQueue.cpp; path = ../../../Source/DS_ByteQueue.cpp; sourceTree = ""; }; - B23EA2F0147F5A43002B8C06 /* DS_ByteQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_ByteQueue.h; path = ../../../Source/DS_ByteQueue.h; sourceTree = ""; }; - B23EA2F1147F5A43002B8C06 /* DS_Hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_Hash.h; path = ../../../Source/DS_Hash.h; sourceTree = ""; }; - B23EA2F2147F5A43002B8C06 /* DS_Heap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_Heap.h; path = ../../../Source/DS_Heap.h; sourceTree = ""; }; - B23EA2F3147F5A43002B8C06 /* DS_HuffmanEncodingTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DS_HuffmanEncodingTree.cpp; path = ../../../Source/DS_HuffmanEncodingTree.cpp; sourceTree = ""; }; - B23EA2F4147F5A43002B8C06 /* DS_HuffmanEncodingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_HuffmanEncodingTree.h; path = ../../../Source/DS_HuffmanEncodingTree.h; sourceTree = ""; }; - B23EA2F5147F5A43002B8C06 /* DS_HuffmanEncodingTreeFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_HuffmanEncodingTreeFactory.h; path = ../../../Source/DS_HuffmanEncodingTreeFactory.h; sourceTree = ""; }; - B23EA2F6147F5A43002B8C06 /* DS_HuffmanEncodingTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_HuffmanEncodingTreeNode.h; path = ../../../Source/DS_HuffmanEncodingTreeNode.h; sourceTree = ""; }; - B23EA2F7147F5A43002B8C06 /* DS_LinkedList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_LinkedList.h; path = ../../../Source/DS_LinkedList.h; sourceTree = ""; }; - B23EA2F8147F5A43002B8C06 /* DS_List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_List.h; path = ../../../Source/DS_List.h; sourceTree = ""; }; - B23EA2F9147F5A43002B8C06 /* DS_Map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_Map.h; path = ../../../Source/DS_Map.h; sourceTree = ""; }; - B23EA2FA147F5A43002B8C06 /* DS_MemoryPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_MemoryPool.h; path = ../../../Source/DS_MemoryPool.h; sourceTree = ""; }; - B23EA2FB147F5A43002B8C06 /* DS_Multilist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_Multilist.h; path = ../../../Source/DS_Multilist.h; sourceTree = ""; }; - B23EA2FC147F5A43002B8C06 /* DS_OrderedChannelHeap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_OrderedChannelHeap.h; path = ../../../Source/DS_OrderedChannelHeap.h; sourceTree = ""; }; - B23EA2FD147F5A43002B8C06 /* DS_OrderedList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_OrderedList.h; path = ../../../Source/DS_OrderedList.h; sourceTree = ""; }; - B23EA2FE147F5A43002B8C06 /* DS_Queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_Queue.h; path = ../../../Source/DS_Queue.h; sourceTree = ""; }; - B23EA2FF147F5A43002B8C06 /* DS_QueueLinkedList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_QueueLinkedList.h; path = ../../../Source/DS_QueueLinkedList.h; sourceTree = ""; }; - B23EA300147F5A43002B8C06 /* DS_RangeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_RangeList.h; path = ../../../Source/DS_RangeList.h; sourceTree = ""; }; - B23EA301147F5A43002B8C06 /* DS_Table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DS_Table.cpp; path = ../../../Source/DS_Table.cpp; sourceTree = ""; }; - B23EA302147F5A43002B8C06 /* DS_Table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_Table.h; path = ../../../Source/DS_Table.h; sourceTree = ""; }; - B23EA303147F5A43002B8C06 /* DS_ThreadsafeAllocatingQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_ThreadsafeAllocatingQueue.h; path = ../../../Source/DS_ThreadsafeAllocatingQueue.h; sourceTree = ""; }; - B23EA304147F5A43002B8C06 /* DS_Tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_Tree.h; path = ../../../Source/DS_Tree.h; sourceTree = ""; }; - B23EA305147F5A43002B8C06 /* DS_WeightedGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DS_WeightedGraph.h; path = ../../../Source/DS_WeightedGraph.h; sourceTree = ""; }; - B23EA306147F5A43002B8C06 /* DynDNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DynDNS.cpp; path = ../../../Source/DynDNS.cpp; sourceTree = ""; }; - B23EA307147F5A43002B8C06 /* DynDNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DynDNS.h; path = ../../../Source/DynDNS.h; sourceTree = ""; }; - B23EA308147F5A43002B8C06 /* EmailSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmailSender.cpp; path = ../../../Source/EmailSender.cpp; sourceTree = ""; }; - B23EA309147F5A43002B8C06 /* EmailSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmailSender.h; path = ../../../Source/EmailSender.h; sourceTree = ""; }; + B23EA2E1147F5A43002B8C06 /* command_parser_interface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = command_parser_interface.cpp; path = ../../../Source/command_parser_interface.cpp; sourceTree = ""; }; + B23EA2E2147F5A43002B8C06 /* command_parser_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = command_parser_interface.h; path = ../../../Source/command_parser_interface.h; sourceTree = ""; }; + B23EA2E3147F5A43002B8C06 /* connection_graph2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = connection_graph2.cpp; path = ../../../Source/connection_graph2.cpp; sourceTree = ""; }; + B23EA2E4147F5A43002B8C06 /* connection_graph2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = connection_graph2.h; path = ../../../Source/connection_graph2.h; sourceTree = ""; }; + B23EA2E5147F5A43002B8C06 /* console_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = console_server.cpp; path = ../../../Source/console_server.cpp; sourceTree = ""; }; + B23EA2E6147F5A43002B8C06 /* console_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = console_server.h; path = ../../../Source/console_server.h; sourceTree = ""; }; + B23EA2E7147F5A43002B8C06 /* data_compressor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = data_compressor.cpp; path = ../../../Source/data_compressor.cpp; sourceTree = ""; }; + B23EA2E8147F5A43002B8C06 /* data_compressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = data_compressor.h; path = ../../../Source/data_compressor.h; sourceTree = ""; }; + B23EA2E9147F5A43002B8C06 /* directory_delta_transfer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = directory_delta_transfer.cpp; path = ../../../Source/directory_delta_transfer.cpp; sourceTree = ""; }; + B23EA2EA147F5A43002B8C06 /* directory_delta_transfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = directory_delta_transfer.h; path = ../../../Source/directory_delta_transfer.h; sourceTree = ""; }; + B23EA2EB147F5A43002B8C06 /* ds_binary_search_tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_binary_search_tree.h; path = ../../../Source/ds_binary_search_tree.h; sourceTree = ""; }; + B23EA2EC147F5A43002B8C06 /* ds_bplus_tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_bplus_tree.h; path = ../../../Source/ds_bplus_tree.h; sourceTree = ""; }; + B23EA2ED147F5A43002B8C06 /* ds_byte_pool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ds_byte_pool.cpp; path = ../../../Source/ds_byte_pool.cpp; sourceTree = ""; }; + B23EA2EE147F5A43002B8C06 /* ds_byte_pool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_byte_pool.h; path = ../../../Source/ds_byte_pool.h; sourceTree = ""; }; + B23EA2EF147F5A43002B8C06 /* ds_byte_queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ds_byte_queue.cpp; path = ../../../Source/ds_byte_queue.cpp; sourceTree = ""; }; + B23EA2F0147F5A43002B8C06 /* ds_byte_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_byte_queue.h; path = ../../../Source/ds_byte_queue.h; sourceTree = ""; }; + B23EA2F1147F5A43002B8C06 /* ds_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_hash.h; path = ../../../Source/ds_hash.h; sourceTree = ""; }; + B23EA2F2147F5A43002B8C06 /* ds_heap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_heap.h; path = ../../../Source/ds_heap.h; sourceTree = ""; }; + B23EA2F3147F5A43002B8C06 /* ds_huffman_encoding_tree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ds_huffman_encoding_tree.cpp; path = ../../../Source/ds_huffman_encoding_tree.cpp; sourceTree = ""; }; + B23EA2F4147F5A43002B8C06 /* ds_huffman_encoding_tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_huffman_encoding_tree.h; path = ../../../Source/ds_huffman_encoding_tree.h; sourceTree = ""; }; + B23EA2F5147F5A43002B8C06 /* ds_huffman_encoding_tree_factory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_huffman_encoding_tree_factory.h; path = ../../../Source/ds_huffman_encoding_tree_factory.h; sourceTree = ""; }; + B23EA2F6147F5A43002B8C06 /* ds_huffman_encoding_tree_node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_huffman_encoding_tree_node.h; path = ../../../Source/ds_huffman_encoding_tree_node.h; sourceTree = ""; }; + B23EA2F7147F5A43002B8C06 /* ds_linked_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_linked_list.h; path = ../../../Source/ds_linked_list.h; sourceTree = ""; }; + B23EA2F8147F5A43002B8C06 /* ds_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_list.h; path = ../../../Source/ds_list.h; sourceTree = ""; }; + B23EA2F9147F5A43002B8C06 /* ds_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_map.h; path = ../../../Source/ds_map.h; sourceTree = ""; }; + B23EA2FA147F5A43002B8C06 /* ds_memory_pool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_memory_pool.h; path = ../../../Source/ds_memory_pool.h; sourceTree = ""; }; + B23EA2FB147F5A43002B8C06 /* ds_multilist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_multilist.h; path = ../../../Source/ds_multilist.h; sourceTree = ""; }; + B23EA2FC147F5A43002B8C06 /* ds_ordered_channel_heap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_ordered_channel_heap.h; path = ../../../Source/ds_ordered_channel_heap.h; sourceTree = ""; }; + B23EA2FD147F5A43002B8C06 /* ds_ordered_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_ordered_list.h; path = ../../../Source/ds_ordered_list.h; sourceTree = ""; }; + B23EA2FE147F5A43002B8C06 /* ds_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_queue.h; path = ../../../Source/ds_queue.h; sourceTree = ""; }; + B23EA2FF147F5A43002B8C06 /* ds_queue_linked_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_queue_linked_list.h; path = ../../../Source/ds_queue_linked_list.h; sourceTree = ""; }; + B23EA300147F5A43002B8C06 /* ds_range_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_range_list.h; path = ../../../Source/ds_range_list.h; sourceTree = ""; }; + B23EA301147F5A43002B8C06 /* ds_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ds_table.cpp; path = ../../../Source/ds_table.cpp; sourceTree = ""; }; + B23EA302147F5A43002B8C06 /* ds_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_table.h; path = ../../../Source/ds_table.h; sourceTree = ""; }; + B23EA303147F5A43002B8C06 /* ds_threadsafe_allocating_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_threadsafe_allocating_queue.h; path = ../../../Source/ds_threadsafe_allocating_queue.h; sourceTree = ""; }; + B23EA304147F5A43002B8C06 /* ds_tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_tree.h; path = ../../../Source/ds_tree.h; sourceTree = ""; }; + B23EA305147F5A43002B8C06 /* ds_weighted_graph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ds_weighted_graph.h; path = ../../../Source/ds_weighted_graph.h; sourceTree = ""; }; + B23EA306147F5A43002B8C06 /* dyn_dns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dyn_dns.cpp; path = ../../../Source/dyn_dns.cpp; sourceTree = ""; }; + B23EA307147F5A43002B8C06 /* dyn_dns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dyn_dns.h; path = ../../../Source/dyn_dns.h; sourceTree = ""; }; + B23EA308147F5A43002B8C06 /* email_sender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = email_sender.cpp; path = ../../../Source/email_sender.cpp; sourceTree = ""; }; + B23EA309147F5A43002B8C06 /* email_sender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = email_sender.h; path = ../../../Source/email_sender.h; sourceTree = ""; }; B23EA30A147F5A43002B8C06 /* EncodeClassName.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EncodeClassName.cpp; path = ../../../Source/EncodeClassName.cpp; sourceTree = ""; }; - B23EA30B147F5A43002B8C06 /* EpochTimeToString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EpochTimeToString.cpp; path = ../../../Source/EpochTimeToString.cpp; sourceTree = ""; }; - B23EA30C147F5A43002B8C06 /* EpochTimeToString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EpochTimeToString.h; path = ../../../Source/EpochTimeToString.h; sourceTree = ""; }; - B23EA30D147F5A43002B8C06 /* Export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Export.h; path = ../../../Source/Export.h; sourceTree = ""; }; - B23EA30E147F5A43002B8C06 /* FileList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileList.cpp; path = ../../../Source/FileList.cpp; sourceTree = ""; }; - B23EA30F147F5A43002B8C06 /* FileList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileList.h; path = ../../../Source/FileList.h; sourceTree = ""; }; - B23EA310147F5A43002B8C06 /* FileListNodeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileListNodeContext.h; path = ../../../Source/FileListNodeContext.h; sourceTree = ""; }; - B23EA311147F5A43002B8C06 /* FileListTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileListTransfer.cpp; path = ../../../Source/FileListTransfer.cpp; sourceTree = ""; }; - B23EA312147F5A43002B8C06 /* FileListTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileListTransfer.h; path = ../../../Source/FileListTransfer.h; sourceTree = ""; }; - B23EA313147F5A43002B8C06 /* FileListTransferCBInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileListTransferCBInterface.h; path = ../../../Source/FileListTransferCBInterface.h; sourceTree = ""; }; - B23EA314147F5A43002B8C06 /* FileOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileOperations.cpp; path = ../../../Source/FileOperations.cpp; sourceTree = ""; }; - B23EA315147F5A43002B8C06 /* FileOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileOperations.h; path = ../../../Source/FileOperations.h; sourceTree = ""; }; - B23EA316147F5A43002B8C06 /* FormatString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FormatString.cpp; path = ../../../Source/FormatString.cpp; sourceTree = ""; }; - B23EA317147F5A43002B8C06 /* FormatString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FormatString.h; path = ../../../Source/FormatString.h; sourceTree = ""; }; - B23EA318147F5A43002B8C06 /* FullyConnectedMesh2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FullyConnectedMesh2.cpp; path = ../../../Source/FullyConnectedMesh2.cpp; sourceTree = ""; }; - B23EA319147F5A43002B8C06 /* FullyConnectedMesh2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FullyConnectedMesh2.h; path = ../../../Source/FullyConnectedMesh2.h; sourceTree = ""; }; - B23EA31A147F5A43002B8C06 /* Getche.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Getche.cpp; path = ../../../Source/Getche.cpp; sourceTree = ""; }; - B23EA31B147F5A43002B8C06 /* Getche.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Getche.h; path = ../../../Source/Getche.h; sourceTree = ""; }; - B23EA31C147F5A43002B8C06 /* Gets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Gets.cpp; path = ../../../Source/Gets.cpp; sourceTree = ""; }; - B23EA31D147F5A43002B8C06 /* Gets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Gets.h; path = ../../../Source/Gets.h; sourceTree = ""; }; - B23EA31E147F5A43002B8C06 /* GetTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GetTime.cpp; path = ../../../Source/GetTime.cpp; sourceTree = ""; }; - B23EA31F147F5A43002B8C06 /* GetTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GetTime.h; path = ../../../Source/GetTime.h; sourceTree = ""; }; - B23EA320147F5A43002B8C06 /* gettimeofday.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gettimeofday.cpp; path = ../../../Source/gettimeofday.cpp; sourceTree = ""; }; + B23EA30B147F5A43002B8C06 /* epoch_time_to_string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = epoch_time_to_string.cpp; path = ../../../Source/epoch_time_to_string.cpp; sourceTree = ""; }; + B23EA30C147F5A43002B8C06 /* epoch_time_to_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = epoch_time_to_string.h; path = ../../../Source/epoch_time_to_string.h; sourceTree = ""; }; + B23EA30D147F5A43002B8C06 /* export.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = export.h; path = ../../../Source/export.h; sourceTree = ""; }; + B23EA30E147F5A43002B8C06 /* file_list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = file_list.cpp; path = ../../../Source/file_list.cpp; sourceTree = ""; }; + B23EA30F147F5A43002B8C06 /* file_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_list.h; path = ../../../Source/file_list.h; sourceTree = ""; }; + B23EA310147F5A43002B8C06 /* file_list_node_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_list_node_context.h; path = ../../../Source/file_list_node_context.h; sourceTree = ""; }; + B23EA311147F5A43002B8C06 /* file_list_transfer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = file_list_transfer.cpp; path = ../../../Source/file_list_transfer.cpp; sourceTree = ""; }; + B23EA312147F5A43002B8C06 /* file_list_transfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_list_transfer.h; path = ../../../Source/file_list_transfer.h; sourceTree = ""; }; + B23EA313147F5A43002B8C06 /* file_list_transfer_cb_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_list_transfer_cb_interface.h; path = ../../../Source/file_list_transfer_cb_interface.h; sourceTree = ""; }; + B23EA314147F5A43002B8C06 /* file_operations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = file_operations.cpp; path = ../../../Source/file_operations.cpp; sourceTree = ""; }; + B23EA315147F5A43002B8C06 /* file_operations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file_operations.h; path = ../../../Source/file_operations.h; sourceTree = ""; }; + B23EA316147F5A43002B8C06 /* format_string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = format_string.cpp; path = ../../../Source/format_string.cpp; sourceTree = ""; }; + B23EA317147F5A43002B8C06 /* format_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = format_string.h; path = ../../../Source/format_string.h; sourceTree = ""; }; + B23EA318147F5A43002B8C06 /* fully_connected_mesh2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fully_connected_mesh2.cpp; path = ../../../Source/fully_connected_mesh2.cpp; sourceTree = ""; }; + B23EA319147F5A43002B8C06 /* fully_connected_mesh2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fully_connected_mesh2.h; path = ../../../Source/fully_connected_mesh2.h; sourceTree = ""; }; + B23EA31A147F5A43002B8C06 /* getche.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = getche.cpp; path = ../../../Source/getche.cpp; sourceTree = ""; }; + B23EA31B147F5A43002B8C06 /* getche.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = getche.h; path = ../../../Source/getche.h; sourceTree = ""; }; + B23EA31C147F5A43002B8C06 /* gets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = gets.cpp; path = ../../../Source/gets.cpp; sourceTree = ""; }; + B23EA31D147F5A43002B8C06 /* gets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gets.h; path = ../../../Source/gets.h; sourceTree = ""; }; + B23EA31E147F5A43002B8C06 /* get_time.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = get_time.cpp; path = ../../../Source/get_time.cpp; sourceTree = ""; }; + B23EA31F147F5A43002B8C06 /* get_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = get_time.h; path = ../../../Source/get_time.h; sourceTree = ""; }; + B23EA320147F5A43002B8C06 /* get_time_of_day.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = get_time_of_day.cpp; path = ../../../Source/get_time_of_day.cpp; sourceTree = ""; }; B23EA321147F5A43002B8C06 /* gettimeofday.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gettimeofday.h; path = ../../../Source/gettimeofday.h; sourceTree = ""; }; - B23EA322147F5A43002B8C06 /* GridSectorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GridSectorizer.cpp; path = ../../../Source/GridSectorizer.cpp; sourceTree = ""; }; - B23EA323147F5A43002B8C06 /* GridSectorizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridSectorizer.h; path = ../../../Source/GridSectorizer.h; sourceTree = ""; }; - B23EA324147F5A43002B8C06 /* HTTPConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTTPConnection.cpp; path = ../../../Source/HTTPConnection.cpp; sourceTree = ""; }; - B23EA325147F5A43002B8C06 /* HTTPConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPConnection.h; path = ../../../Source/HTTPConnection.h; sourceTree = ""; }; - B23EA326147F5A43002B8C06 /* IncrementalReadInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IncrementalReadInterface.cpp; path = ../../../Source/IncrementalReadInterface.cpp; sourceTree = ""; }; - B23EA327147F5A43002B8C06 /* IncrementalReadInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IncrementalReadInterface.h; path = ../../../Source/IncrementalReadInterface.h; sourceTree = ""; }; - B23EA328147F5A43002B8C06 /* InternalPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InternalPacket.h; path = ../../../Source/InternalPacket.h; sourceTree = ""; }; - B23EA329147F5A43002B8C06 /* Itoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Itoa.cpp; path = ../../../Source/Itoa.cpp; sourceTree = ""; }; - B23EA32A147F5A43002B8C06 /* Itoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Itoa.h; path = ../../../Source/Itoa.h; sourceTree = ""; }; - B23EA32B147F5A43002B8C06 /* Kbhit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Kbhit.h; path = ../../../Source/Kbhit.h; sourceTree = ""; }; - B23EA32C147F5A43002B8C06 /* LinuxStrings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LinuxStrings.cpp; path = ../../../Source/LinuxStrings.cpp; sourceTree = ""; }; - B23EA32D147F5A43002B8C06 /* LinuxStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LinuxStrings.h; path = ../../../Source/LinuxStrings.h; sourceTree = ""; }; - B23EA32E147F5A43002B8C06 /* LocklessTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LocklessTypes.cpp; path = ../../../Source/LocklessTypes.cpp; sourceTree = ""; }; - B23EA32F147F5A43002B8C06 /* LocklessTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LocklessTypes.h; path = ../../../Source/LocklessTypes.h; sourceTree = ""; }; - B23EA330147F5A43002B8C06 /* LogCommandParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LogCommandParser.cpp; path = ../../../Source/LogCommandParser.cpp; sourceTree = ""; }; - B23EA331147F5A43002B8C06 /* LogCommandParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LogCommandParser.h; path = ../../../Source/LogCommandParser.h; sourceTree = ""; }; - B23EA332147F5A43002B8C06 /* MessageFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MessageFilter.cpp; path = ../../../Source/MessageFilter.cpp; sourceTree = ""; }; - B23EA333147F5A43002B8C06 /* MessageFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MessageFilter.h; path = ../../../Source/MessageFilter.h; sourceTree = ""; }; - B23EA334147F5A43002B8C06 /* MessageIdentifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MessageIdentifiers.h; path = ../../../Source/MessageIdentifiers.h; sourceTree = ""; }; - B23EA335147F5A43002B8C06 /* MTUSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MTUSize.h; path = ../../../Source/MTUSize.h; sourceTree = ""; }; - B23EA336147F5A43002B8C06 /* NativeFeatureIncludes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeFeatureIncludes.h; path = ../../../Source/NativeFeatureIncludes.h; sourceTree = ""; }; - B23EA337147F5A43002B8C06 /* NativeFeatureIncludesOverrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeFeatureIncludesOverrides.h; path = ../../../Source/NativeFeatureIncludesOverrides.h; sourceTree = ""; }; - B23EA338147F5A43002B8C06 /* NativeTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeTypes.h; path = ../../../Source/NativeTypes.h; sourceTree = ""; }; - B23EA339147F5A43002B8C06 /* NatPunchthroughClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NatPunchthroughClient.cpp; path = ../../../Source/NatPunchthroughClient.cpp; sourceTree = ""; }; - B23EA33A147F5A43002B8C06 /* NatPunchthroughClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NatPunchthroughClient.h; path = ../../../Source/NatPunchthroughClient.h; sourceTree = ""; }; - B23EA33B147F5A43002B8C06 /* NatPunchthroughServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NatPunchthroughServer.cpp; path = ../../../Source/NatPunchthroughServer.cpp; sourceTree = ""; }; - B23EA33C147F5A43002B8C06 /* NatPunchthroughServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NatPunchthroughServer.h; path = ../../../Source/NatPunchthroughServer.h; sourceTree = ""; }; - B23EA33D147F5A43002B8C06 /* NatTypeDetectionClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NatTypeDetectionClient.cpp; path = ../../../Source/NatTypeDetectionClient.cpp; sourceTree = ""; }; - B23EA33E147F5A43002B8C06 /* NatTypeDetectionClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NatTypeDetectionClient.h; path = ../../../Source/NatTypeDetectionClient.h; sourceTree = ""; }; - B23EA33F147F5A43002B8C06 /* NatTypeDetectionCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NatTypeDetectionCommon.cpp; path = ../../../Source/NatTypeDetectionCommon.cpp; sourceTree = ""; }; - B23EA340147F5A43002B8C06 /* NatTypeDetectionCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NatTypeDetectionCommon.h; path = ../../../Source/NatTypeDetectionCommon.h; sourceTree = ""; }; - B23EA341147F5A43002B8C06 /* NatTypeDetectionServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NatTypeDetectionServer.cpp; path = ../../../Source/NatTypeDetectionServer.cpp; sourceTree = ""; }; - B23EA342147F5A43002B8C06 /* NatTypeDetectionServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NatTypeDetectionServer.h; path = ../../../Source/NatTypeDetectionServer.h; sourceTree = ""; }; - B23EA343147F5A43002B8C06 /* NetworkIDManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkIDManager.cpp; path = ../../../Source/NetworkIDManager.cpp; sourceTree = ""; }; - B23EA344147F5A43002B8C06 /* NetworkIDManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkIDManager.h; path = ../../../Source/NetworkIDManager.h; sourceTree = ""; }; - B23EA345147F5A43002B8C06 /* NetworkIDObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkIDObject.cpp; path = ../../../Source/NetworkIDObject.cpp; sourceTree = ""; }; - B23EA346147F5A43002B8C06 /* NetworkIDObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkIDObject.h; path = ../../../Source/NetworkIDObject.h; sourceTree = ""; }; - B23EA347147F5A43002B8C06 /* PacketConsoleLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PacketConsoleLogger.cpp; path = ../../../Source/PacketConsoleLogger.cpp; sourceTree = ""; }; - B23EA348147F5A43002B8C06 /* PacketConsoleLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketConsoleLogger.h; path = ../../../Source/PacketConsoleLogger.h; sourceTree = ""; }; - B23EA349147F5A43002B8C06 /* PacketFileLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PacketFileLogger.cpp; path = ../../../Source/PacketFileLogger.cpp; sourceTree = ""; }; - B23EA34A147F5A43002B8C06 /* PacketFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketFileLogger.h; path = ../../../Source/PacketFileLogger.h; sourceTree = ""; }; - B23EA34B147F5A43002B8C06 /* PacketizedTCP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PacketizedTCP.cpp; path = ../../../Source/PacketizedTCP.cpp; sourceTree = ""; }; - B23EA34C147F5A43002B8C06 /* PacketizedTCP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketizedTCP.h; path = ../../../Source/PacketizedTCP.h; sourceTree = ""; }; - B23EA34D147F5A43002B8C06 /* PacketLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PacketLogger.cpp; path = ../../../Source/PacketLogger.cpp; sourceTree = ""; }; - B23EA34E147F5A43002B8C06 /* PacketLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketLogger.h; path = ../../../Source/PacketLogger.h; sourceTree = ""; }; - B23EA34F147F5A43002B8C06 /* PacketOutputWindowLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PacketOutputWindowLogger.cpp; path = ../../../Source/PacketOutputWindowLogger.cpp; sourceTree = ""; }; - B23EA350147F5A43002B8C06 /* PacketOutputWindowLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketOutputWindowLogger.h; path = ../../../Source/PacketOutputWindowLogger.h; sourceTree = ""; }; - B23EA351147F5A43002B8C06 /* PacketPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketPool.h; path = ../../../Source/PacketPool.h; sourceTree = ""; }; - B23EA352147F5A43002B8C06 /* PacketPriority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketPriority.h; path = ../../../Source/PacketPriority.h; sourceTree = ""; }; - B23EA353147F5A43002B8C06 /* PluginInterface2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginInterface2.cpp; path = ../../../Source/PluginInterface2.cpp; sourceTree = ""; }; - B23EA354147F5A43002B8C06 /* PluginInterface2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginInterface2.h; path = ../../../Source/PluginInterface2.h; sourceTree = ""; }; - B23EA355147F5A43002B8C06 /* PS3Includes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PS3Includes.h; path = ../../../Source/PS3Includes.h; sourceTree = ""; }; - B23EA356147F5A43002B8C06 /* Rackspace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rackspace.cpp; path = ../../../Source/Rackspace.cpp; sourceTree = ""; }; - B23EA357147F5A43002B8C06 /* Rackspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rackspace.h; path = ../../../Source/Rackspace.h; sourceTree = ""; }; + B23EA322147F5A43002B8C06 /* grid_sectorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = grid_sectorizer.cpp; path = ../../../Source/grid_sectorizer.cpp; sourceTree = ""; }; + B23EA323147F5A43002B8C06 /* grid_sectorizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = grid_sectorizer.h; path = ../../../Source/grid_sectorizer.h; sourceTree = ""; }; + B23EA324147F5A43002B8C06 /* http_connection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = http_connection.cpp; path = ../../../Source/http_connection.cpp; sourceTree = ""; }; + B23EA325147F5A43002B8C06 /* http_connection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = http_connection.h; path = ../../../Source/http_connection.h; sourceTree = ""; }; + B23EA326147F5A43002B8C06 /* incremental_read_interface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = incremental_read_interface.cpp; path = ../../../Source/incremental_read_interface.cpp; sourceTree = ""; }; + B23EA327147F5A43002B8C06 /* incremental_read_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = incremental_read_interface.h; path = ../../../Source/incremental_read_interface.h; sourceTree = ""; }; + B23EA328147F5A43002B8C06 /* internal_packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = internal_packet.h; path = ../../../Source/internal_packet.h; sourceTree = ""; }; + B23EA329147F5A43002B8C06 /* itoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = itoa.cpp; path = ../../../Source/itoa.cpp; sourceTree = ""; }; + B23EA32A147F5A43002B8C06 /* itoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itoa.h; path = ../../../Source/itoa.h; sourceTree = ""; }; + B23EA32B147F5A43002B8C06 /* kbhit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kbhit.h; path = ../../../Source/kbhit.h; sourceTree = ""; }; + B23EA32C147F5A43002B8C06 /* linux_strings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = linux_strings.cpp; path = ../../../Source/linux_strings.cpp; sourceTree = ""; }; + B23EA32D147F5A43002B8C06 /* linux_strings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = linux_strings.h; path = ../../../Source/linux_strings.h; sourceTree = ""; }; + B23EA32E147F5A43002B8C06 /* lockless_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lockless_types.cpp; path = ../../../Source/lockless_types.cpp; sourceTree = ""; }; + B23EA32F147F5A43002B8C06 /* lockless_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lockless_types.h; path = ../../../Source/lockless_types.h; sourceTree = ""; }; + B23EA330147F5A43002B8C06 /* log_command_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = log_command_parser.cpp; path = ../../../Source/log_command_parser.cpp; sourceTree = ""; }; + B23EA331147F5A43002B8C06 /* log_command_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log_command_parser.h; path = ../../../Source/log_command_parser.h; sourceTree = ""; }; + B23EA332147F5A43002B8C06 /* message_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = message_filter.cpp; path = ../../../Source/message_filter.cpp; sourceTree = ""; }; + B23EA333147F5A43002B8C06 /* message_filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = message_filter.h; path = ../../../Source/message_filter.h; sourceTree = ""; }; + B23EA334147F5A43002B8C06 /* message_identifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = message_identifiers.h; path = ../../../Source/message_identifiers.h; sourceTree = ""; }; + B23EA335147F5A43002B8C06 /* mtu_size.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mtu_size.h; path = ../../../Source/mtu_size.h; sourceTree = ""; }; + B23EA336147F5A43002B8C06 /* native_feature_includes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = native_feature_includes.h; path = ../../../Source/native_feature_includes.h; sourceTree = ""; }; + B23EA337147F5A43002B8C06 /* native_feature_includes_overrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = native_feature_includes_overrides.h; path = ../../../Source/native_feature_includes_overrides.h; sourceTree = ""; }; + B23EA338147F5A43002B8C06 /* native_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = native_types.h; path = ../../../Source/native_types.h; sourceTree = ""; }; + B23EA339147F5A43002B8C06 /* nat_punchthrough_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nat_punchthrough_client.cpp; path = ../../../Source/nat_punchthrough_client.cpp; sourceTree = ""; }; + B23EA33A147F5A43002B8C06 /* nat_punchthrough_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nat_punchthrough_client.h; path = ../../../Source/nat_punchthrough_client.h; sourceTree = ""; }; + B23EA33B147F5A43002B8C06 /* nat_punchthrough_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nat_punchthrough_server.cpp; path = ../../../Source/nat_punchthrough_server.cpp; sourceTree = ""; }; + B23EA33C147F5A43002B8C06 /* nat_punchthrough_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nat_punchthrough_server.h; path = ../../../Source/nat_punchthrough_server.h; sourceTree = ""; }; + B23EA33D147F5A43002B8C06 /* nat_type_detection_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nat_type_detection_client.cpp; path = ../../../Source/nat_type_detection_client.cpp; sourceTree = ""; }; + B23EA33E147F5A43002B8C06 /* nat_type_detection_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nat_type_detection_client.h; path = ../../../Source/nat_type_detection_client.h; sourceTree = ""; }; + B23EA33F147F5A43002B8C06 /* nat_type_detection_common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nat_type_detection_common.cpp; path = ../../../Source/nat_type_detection_common.cpp; sourceTree = ""; }; + B23EA340147F5A43002B8C06 /* nat_type_detection_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nat_type_detection_common.h; path = ../../../Source/nat_type_detection_common.h; sourceTree = ""; }; + B23EA341147F5A43002B8C06 /* nat_type_detection_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nat_type_detection_server.cpp; path = ../../../Source/nat_type_detection_server.cpp; sourceTree = ""; }; + B23EA342147F5A43002B8C06 /* nat_type_detection_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nat_type_detection_server.h; path = ../../../Source/nat_type_detection_server.h; sourceTree = ""; }; + B23EA343147F5A43002B8C06 /* network_id_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = network_id_manager.cpp; path = ../../../Source/network_id_manager.cpp; sourceTree = ""; }; + B23EA344147F5A43002B8C06 /* network_id_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = network_id_manager.h; path = ../../../Source/network_id_manager.h; sourceTree = ""; }; + B23EA345147F5A43002B8C06 /* network_id_object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = network_id_object.cpp; path = ../../../Source/network_id_object.cpp; sourceTree = ""; }; + B23EA346147F5A43002B8C06 /* network_id_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = network_id_object.h; path = ../../../Source/network_id_object.h; sourceTree = ""; }; + B23EA347147F5A43002B8C06 /* packet_console_logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = packet_console_logger.cpp; path = ../../../Source/packet_console_logger.cpp; sourceTree = ""; }; + B23EA348147F5A43002B8C06 /* packet_console_logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_console_logger.h; path = ../../../Source/packet_console_logger.h; sourceTree = ""; }; + B23EA349147F5A43002B8C06 /* packet_file_logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = packet_file_logger.cpp; path = ../../../Source/packet_file_logger.cpp; sourceTree = ""; }; + B23EA34A147F5A43002B8C06 /* packet_file_logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_file_logger.h; path = ../../../Source/packet_file_logger.h; sourceTree = ""; }; + B23EA34B147F5A43002B8C06 /* packetized_tcp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = packetized_tcp.cpp; path = ../../../Source/packetized_tcp.cpp; sourceTree = ""; }; + B23EA34C147F5A43002B8C06 /* packetized_tcp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packetized_tcp.h; path = ../../../Source/packetized_tcp.h; sourceTree = ""; }; + B23EA34D147F5A43002B8C06 /* packet_logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = packet_logger.cpp; path = ../../../Source/packet_logger.cpp; sourceTree = ""; }; + B23EA34E147F5A43002B8C06 /* packet_logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_logger.h; path = ../../../Source/packet_logger.h; sourceTree = ""; }; + B23EA34F147F5A43002B8C06 /* packet_output_window_logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = packet_output_window_logger.cpp; path = ../../../Source/packet_output_window_logger.cpp; sourceTree = ""; }; + B23EA350147F5A43002B8C06 /* packet_output_window_logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_output_window_logger.h; path = ../../../Source/packet_output_window_logger.h; sourceTree = ""; }; + B23EA351147F5A43002B8C06 /* packet_pool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_pool.h; path = ../../../Source/packet_pool.h; sourceTree = ""; }; + B23EA352147F5A43002B8C06 /* packet_priority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_priority.h; path = ../../../Source/packet_priority.h; sourceTree = ""; }; + B23EA353147F5A43002B8C06 /* plugin_interface2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = plugin_interface2.cpp; path = ../../../Source/plugin_interface2.cpp; sourceTree = ""; }; + B23EA354147F5A43002B8C06 /* plugin_interface2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugin_interface2.h; path = ../../../Source/plugin_interface2.h; sourceTree = ""; }; + B23EA356147F5A43002B8C06 /* rackspace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rackspace.cpp; path = ../../../Source/rackspace.cpp; sourceTree = ""; }; + B23EA357147F5A43002B8C06 /* rackspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rackspace.h; path = ../../../Source/rackspace.h; sourceTree = ""; }; B23EA358147F5A43002B8C06 /* RakAlloca.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakAlloca.h; path = ../../../Source/RakAlloca.h; sourceTree = ""; }; B23EA359147F5A43002B8C06 /* RakAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakAssert.h; path = ../../../Source/RakAssert.h; sourceTree = ""; }; - B23EA35A147F5A43002B8C06 /* RakMemoryOverride.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakMemoryOverride.cpp; path = ../../../Source/RakMemoryOverride.cpp; sourceTree = ""; }; + B23EA35A147F5A43002B8C06 /* memory_override.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = memory_override.cpp; path = ../../../Source/memory_override.cpp; sourceTree = ""; }; B23EA35B147F5A43002B8C06 /* RakMemoryOverride.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakMemoryOverride.h; path = ../../../Source/RakMemoryOverride.h; sourceTree = ""; }; B23EA35C147F5A43002B8C06 /* RakNet_vc8.vcproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = RakNet_vc8.vcproj; path = ../../../Source/RakNet_vc8.vcproj; sourceTree = ""; }; B23EA35D147F5A43002B8C06 /* RakNet_vc9.vcproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = RakNet_vc9.vcproj; path = ../../../Source/RakNet_vc9.vcproj; sourceTree = ""; }; B23EA35E147F5A43002B8C06 /* RakNet.vcproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = RakNet.vcproj; path = ../../../Source/RakNet.vcproj; sourceTree = ""; }; - B23EA35F147F5A43002B8C06 /* RakNetCommandParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakNetCommandParser.cpp; path = ../../../Source/RakNetCommandParser.cpp; sourceTree = ""; }; + B23EA35F147F5A43002B8C06 /* command_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = command_parser.cpp; path = ../../../Source/command_parser.cpp; sourceTree = ""; }; B23EA360147F5A43002B8C06 /* RakNetCommandParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetCommandParser.h; path = ../../../Source/RakNetCommandParser.h; sourceTree = ""; }; B23EA361147F5A43002B8C06 /* RakNetDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetDefines.h; path = ../../../Source/RakNetDefines.h; sourceTree = ""; }; B23EA362147F5A43002B8C06 /* RakNetDefinesOverrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetDefinesOverrides.h; path = ../../../Source/RakNetDefinesOverrides.h; sourceTree = ""; }; B23EA363147F5A43002B8C06 /* RakNetSmartPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetSmartPtr.h; path = ../../../Source/RakNetSmartPtr.h; sourceTree = ""; }; B23EA364147F5A43002B8C06 /* RakNetSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakNetSocket.cpp; path = ../../../Source/RakNetSocket.cpp; sourceTree = ""; }; B23EA365147F5A43002B8C06 /* RakNetSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetSocket.h; path = ../../../Source/RakNetSocket.h; sourceTree = ""; }; - B23EA366147F5A43002B8C06 /* RakNetStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakNetStatistics.cpp; path = ../../../Source/RakNetStatistics.cpp; sourceTree = ""; }; + B23EA366147F5A43002B8C06 /* statistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = statistics.cpp; path = ../../../Source/statistics.cpp; sourceTree = ""; }; B23EA367147F5A43002B8C06 /* RakNetStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetStatistics.h; path = ../../../Source/RakNetStatistics.h; sourceTree = ""; }; B23EA368147F5A43002B8C06 /* RakNetTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetTime.h; path = ../../../Source/RakNetTime.h; sourceTree = ""; }; - B23EA369147F5A43002B8C06 /* RakNetTransport2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakNetTransport2.cpp; path = ../../../Source/RakNetTransport2.cpp; sourceTree = ""; }; + B23EA369147F5A43002B8C06 /* transport2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = transport2.cpp; path = ../../../Source/transport2.cpp; sourceTree = ""; }; B23EA36A147F5A43002B8C06 /* RakNetTransport2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetTransport2.h; path = ../../../Source/RakNetTransport2.h; sourceTree = ""; }; - B23EA36B147F5A43002B8C06 /* RakNetTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakNetTypes.cpp; path = ../../../Source/RakNetTypes.cpp; sourceTree = ""; }; + B23EA36B147F5A43002B8C06 /* types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = types.cpp; path = ../../../Source/types.cpp; sourceTree = ""; }; B23EA36C147F5A43002B8C06 /* RakNetTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetTypes.h; path = ../../../Source/RakNetTypes.h; sourceTree = ""; }; B23EA36D147F5A43002B8C06 /* RakNetVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakNetVersion.h; path = ../../../Source/RakNetVersion.h; sourceTree = ""; }; - B23EA36E147F5A43002B8C06 /* RakPeer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakPeer.cpp; path = ../../../Source/RakPeer.cpp; sourceTree = ""; }; + B23EA36E147F5A43002B8C06 /* peer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = peer.cpp; path = ../../../Source/peer.cpp; sourceTree = ""; }; B23EA36F147F5A43002B8C06 /* RakPeer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakPeer.h; path = ../../../Source/RakPeer.h; sourceTree = ""; }; B23EA370147F5A43002B8C06 /* RakPeerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakPeerInterface.h; path = ../../../Source/RakPeerInterface.h; sourceTree = ""; }; - B23EA371147F5A43002B8C06 /* RakSleep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakSleep.cpp; path = ../../../Source/RakSleep.cpp; sourceTree = ""; }; + B23EA371147F5A43002B8C06 /* sleep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sleep.cpp; path = ../../../Source/sleep.cpp; sourceTree = ""; }; B23EA372147F5A43002B8C06 /* RakSleep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakSleep.h; path = ../../../Source/RakSleep.h; sourceTree = ""; }; - B23EA373147F5A43002B8C06 /* RakString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakString.cpp; path = ../../../Source/RakString.cpp; sourceTree = ""; }; + B23EA373147F5A43002B8C06 /* string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = string.cpp; path = ../../../Source/string.cpp; sourceTree = ""; }; B23EA374147F5A43002B8C06 /* RakString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakString.h; path = ../../../Source/RakString.h; sourceTree = ""; }; - B23EA375147F5A43002B8C06 /* RakThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakThread.cpp; path = ../../../Source/RakThread.cpp; sourceTree = ""; }; + B23EA375147F5A43002B8C06 /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = thread.cpp; path = ../../../Source/thread.cpp; sourceTree = ""; }; B23EA376147F5A43002B8C06 /* RakThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakThread.h; path = ../../../Source/RakThread.h; sourceTree = ""; }; - B23EA377147F5A43002B8C06 /* RakWString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RakWString.cpp; path = ../../../Source/RakWString.cpp; sourceTree = ""; }; + B23EA377147F5A43002B8C06 /* wstring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wstring.cpp; path = ../../../Source/wstring.cpp; sourceTree = ""; }; B23EA378147F5A43002B8C06 /* RakWString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RakWString.h; path = ../../../Source/RakWString.h; sourceTree = ""; }; - B23EA379147F5A43002B8C06 /* Rand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rand.cpp; path = ../../../Source/Rand.cpp; sourceTree = ""; }; - B23EA37A147F5A43002B8C06 /* Rand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rand.h; path = ../../../Source/Rand.h; sourceTree = ""; }; + B23EA379147F5A43002B8C06 /* rand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rand.cpp; path = ../../../Source/rand.cpp; sourceTree = ""; }; + B23EA37A147F5A43002B8C06 /* rand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rand.h; path = ../../../Source/rand.h; sourceTree = ""; }; B23EA37B147F5A43002B8C06 /* rdlmalloc-options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "rdlmalloc-options.h"; path = "../../../Source/rdlmalloc-options.h"; sourceTree = ""; }; B23EA37C147F5A43002B8C06 /* rdlmalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rdlmalloc.cpp; path = ../../../Source/rdlmalloc.cpp; sourceTree = ""; }; B23EA37D147F5A43002B8C06 /* rdlmalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rdlmalloc.h; path = ../../../Source/rdlmalloc.h; sourceTree = ""; }; - B23EA37E147F5A43002B8C06 /* ReadyEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ReadyEvent.cpp; path = ../../../Source/ReadyEvent.cpp; sourceTree = ""; }; - B23EA37F147F5A43002B8C06 /* ReadyEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReadyEvent.h; path = ../../../Source/ReadyEvent.h; sourceTree = ""; }; - B23EA380147F5A43002B8C06 /* RefCountedObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RefCountedObj.h; path = ../../../Source/RefCountedObj.h; sourceTree = ""; }; - B23EA381147F5A43002B8C06 /* ReliabilityLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ReliabilityLayer.cpp; path = ../../../Source/ReliabilityLayer.cpp; sourceTree = ""; }; - B23EA382147F5A43002B8C06 /* ReliabilityLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReliabilityLayer.h; path = ../../../Source/ReliabilityLayer.h; sourceTree = ""; }; - B23EA383147F5A43002B8C06 /* ReplicaEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReplicaEnums.h; path = ../../../Source/ReplicaEnums.h; sourceTree = ""; }; - B23EA384147F5A43002B8C06 /* ReplicaManager3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ReplicaManager3.cpp; path = ../../../Source/ReplicaManager3.cpp; sourceTree = ""; }; - B23EA385147F5A43002B8C06 /* ReplicaManager3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReplicaManager3.h; path = ../../../Source/ReplicaManager3.h; sourceTree = ""; }; - B23EA386147F5A43002B8C06 /* Router2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Router2.cpp; path = ../../../Source/Router2.cpp; sourceTree = ""; }; - B23EA387147F5A43002B8C06 /* Router2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Router2.h; path = ../../../Source/Router2.h; sourceTree = ""; }; - B23EA388147F5A43002B8C06 /* RPC4Plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RPC4Plugin.cpp; path = ../../../Source/RPC4Plugin.cpp; sourceTree = ""; }; - B23EA389147F5A43002B8C06 /* RPC4Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RPC4Plugin.h; path = ../../../Source/RPC4Plugin.h; sourceTree = ""; }; - B23EA38A147F5A43002B8C06 /* SecureHandshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SecureHandshake.cpp; path = ../../../Source/SecureHandshake.cpp; sourceTree = ""; }; - B23EA38B147F5A43002B8C06 /* SecureHandshake.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureHandshake.h; path = ../../../Source/SecureHandshake.h; sourceTree = ""; }; - B23EA38C147F5A43002B8C06 /* SendToThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SendToThread.cpp; path = ../../../Source/SendToThread.cpp; sourceTree = ""; }; - B23EA38D147F5A43002B8C06 /* SendToThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SendToThread.h; path = ../../../Source/SendToThread.h; sourceTree = ""; }; + B23EA37E147F5A43002B8C06 /* ready_event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ready_event.cpp; path = ../../../Source/ready_event.cpp; sourceTree = ""; }; + B23EA37F147F5A43002B8C06 /* ready_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ready_event.h; path = ../../../Source/ready_event.h; sourceTree = ""; }; + B23EA380147F5A43002B8C06 /* ref_counted_obj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ref_counted_obj.h; path = ../../../Source/ref_counted_obj.h; sourceTree = ""; }; + B23EA381147F5A43002B8C06 /* reliability_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = reliability_layer.cpp; path = ../../../Source/reliability_layer.cpp; sourceTree = ""; }; + B23EA382147F5A43002B8C06 /* reliability_layer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = reliability_layer.h; path = ../../../Source/reliability_layer.h; sourceTree = ""; }; + B23EA383147F5A43002B8C06 /* replica_enums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = replica_enums.h; path = ../../../Source/replica_enums.h; sourceTree = ""; }; + B23EA384147F5A43002B8C06 /* replica_manager3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = replica_manager3.cpp; path = ../../../Source/replica_manager3.cpp; sourceTree = ""; }; + B23EA385147F5A43002B8C06 /* replica_manager3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = replica_manager3.h; path = ../../../Source/replica_manager3.h; sourceTree = ""; }; + B23EA386147F5A43002B8C06 /* router2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = router2.cpp; path = ../../../Source/router2.cpp; sourceTree = ""; }; + B23EA387147F5A43002B8C06 /* router2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = router2.h; path = ../../../Source/router2.h; sourceTree = ""; }; + B23EA388147F5A43002B8C06 /* rpc4_plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rpc4_plugin.cpp; path = ../../../Source/rpc4_plugin.cpp; sourceTree = ""; }; + B23EA389147F5A43002B8C06 /* rpc4_plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rpc4_plugin.h; path = ../../../Source/rpc4_plugin.h; sourceTree = ""; }; + B23EA38A147F5A43002B8C06 /* secure_handshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = secure_handshake.cpp; path = ../../../Source/secure_handshake.cpp; sourceTree = ""; }; + B23EA38B147F5A43002B8C06 /* secure_handshake.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secure_handshake.h; path = ../../../Source/secure_handshake.h; sourceTree = ""; }; + B23EA38C147F5A43002B8C06 /* send_to_thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = send_to_thread.cpp; path = ../../../Source/send_to_thread.cpp; sourceTree = ""; }; + B23EA38D147F5A43002B8C06 /* send_to_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = send_to_thread.h; path = ../../../Source/send_to_thread.h; sourceTree = ""; }; B23EA38E147F5A43002B8C06 /* SHA1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SHA1.cpp; path = ../../../Source/SHA1.cpp; sourceTree = ""; }; B23EA38F147F5A43002B8C06 /* SHA1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHA1.h; path = ../../../Source/SHA1.h; sourceTree = ""; }; - B23EA390147F5A43002B8C06 /* SignaledEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SignaledEvent.cpp; path = ../../../Source/SignaledEvent.cpp; sourceTree = ""; }; - B23EA391147F5A43002B8C06 /* SignaledEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignaledEvent.h; path = ../../../Source/SignaledEvent.h; sourceTree = ""; }; - B23EA392147F5A43002B8C06 /* SimpleMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SimpleMutex.cpp; path = ../../../Source/SimpleMutex.cpp; sourceTree = ""; }; - B23EA393147F5A43002B8C06 /* SimpleMutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SimpleMutex.h; path = ../../../Source/SimpleMutex.h; sourceTree = ""; }; - B23EA394147F5A43002B8C06 /* SimpleTCPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SimpleTCPServer.h; path = ../../../Source/SimpleTCPServer.h; sourceTree = ""; }; - B23EA395147F5A43002B8C06 /* SingleProducerConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SingleProducerConsumer.h; path = ../../../Source/SingleProducerConsumer.h; sourceTree = ""; }; - B23EA396147F5A43002B8C06 /* SocketDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SocketDefines.h; path = ../../../Source/SocketDefines.h; sourceTree = ""; }; - B23EA397147F5A43002B8C06 /* SocketIncludes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SocketIncludes.h; path = ../../../Source/SocketIncludes.h; sourceTree = ""; }; - B23EA398147F5A43002B8C06 /* SocketLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SocketLayer.cpp; path = ../../../Source/SocketLayer.cpp; sourceTree = ""; }; - B23EA399147F5A43002B8C06 /* SocketLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SocketLayer.h; path = ../../../Source/SocketLayer.h; sourceTree = ""; }; - B23EA39A147F5A43002B8C06 /* StringCompressor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringCompressor.cpp; path = ../../../Source/StringCompressor.cpp; sourceTree = ""; }; - B23EA39B147F5A43002B8C06 /* StringCompressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringCompressor.h; path = ../../../Source/StringCompressor.h; sourceTree = ""; }; - B23EA39C147F5A43002B8C06 /* StringTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringTable.cpp; path = ../../../Source/StringTable.cpp; sourceTree = ""; }; - B23EA39D147F5A43002B8C06 /* StringTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringTable.h; path = ../../../Source/StringTable.h; sourceTree = ""; }; - B23EA39E147F5A43002B8C06 /* SuperFastHash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SuperFastHash.cpp; path = ../../../Source/SuperFastHash.cpp; sourceTree = ""; }; - B23EA39F147F5A43002B8C06 /* SuperFastHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SuperFastHash.h; path = ../../../Source/SuperFastHash.h; sourceTree = ""; }; - B23EA3A0147F5A43002B8C06 /* TableSerializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TableSerializer.cpp; path = ../../../Source/TableSerializer.cpp; sourceTree = ""; }; - B23EA3A1147F5A43002B8C06 /* TableSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableSerializer.h; path = ../../../Source/TableSerializer.h; sourceTree = ""; }; - B23EA3A2147F5A43002B8C06 /* TCPInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TCPInterface.cpp; path = ../../../Source/TCPInterface.cpp; sourceTree = ""; }; - B23EA3A3147F5A43002B8C06 /* TCPInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TCPInterface.h; path = ../../../Source/TCPInterface.h; sourceTree = ""; }; - B23EA3A4147F5A43002B8C06 /* TeamBalancer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TeamBalancer.cpp; path = ../../../Source/TeamBalancer.cpp; sourceTree = ""; }; - B23EA3A5147F5A43002B8C06 /* TeamBalancer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TeamBalancer.h; path = ../../../Source/TeamBalancer.h; sourceTree = ""; }; - B23EA3A6147F5A43002B8C06 /* TelnetTransport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TelnetTransport.cpp; path = ../../../Source/TelnetTransport.cpp; sourceTree = ""; }; - B23EA3A7147F5A43002B8C06 /* TelnetTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TelnetTransport.h; path = ../../../Source/TelnetTransport.h; sourceTree = ""; }; - B23EA3A8147F5A43002B8C06 /* ThreadPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadPool.h; path = ../../../Source/ThreadPool.h; sourceTree = ""; }; - B23EA3A9147F5A43002B8C06 /* ThreadsafePacketLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadsafePacketLogger.cpp; path = ../../../Source/ThreadsafePacketLogger.cpp; sourceTree = ""; }; - B23EA3AA147F5A43002B8C06 /* ThreadsafePacketLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadsafePacketLogger.h; path = ../../../Source/ThreadsafePacketLogger.h; sourceTree = ""; }; - B23EA3AB147F5A43002B8C06 /* TransportInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TransportInterface.h; path = ../../../Source/TransportInterface.h; sourceTree = ""; }; - B23EA3AC147F5A43002B8C06 /* TwoWayAuthentication.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TwoWayAuthentication.cpp; path = ../../../Source/TwoWayAuthentication.cpp; sourceTree = ""; }; - B23EA3AD147F5A43002B8C06 /* TwoWayAuthentication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TwoWayAuthentication.h; path = ../../../Source/TwoWayAuthentication.h; sourceTree = ""; }; - B23EA3AE147F5A43002B8C06 /* UDPForwarder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UDPForwarder.cpp; path = ../../../Source/UDPForwarder.cpp; sourceTree = ""; }; - B23EA3AF147F5A43002B8C06 /* UDPForwarder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UDPForwarder.h; path = ../../../Source/UDPForwarder.h; sourceTree = ""; }; - B23EA3B0147F5A43002B8C06 /* UDPProxyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UDPProxyClient.cpp; path = ../../../Source/UDPProxyClient.cpp; sourceTree = ""; }; - B23EA3B1147F5A43002B8C06 /* UDPProxyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UDPProxyClient.h; path = ../../../Source/UDPProxyClient.h; sourceTree = ""; }; - B23EA3B2147F5A43002B8C06 /* UDPProxyCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UDPProxyCommon.h; path = ../../../Source/UDPProxyCommon.h; sourceTree = ""; }; - B23EA3B3147F5A43002B8C06 /* UDPProxyCoordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UDPProxyCoordinator.cpp; path = ../../../Source/UDPProxyCoordinator.cpp; sourceTree = ""; }; - B23EA3B4147F5A43002B8C06 /* UDPProxyCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UDPProxyCoordinator.h; path = ../../../Source/UDPProxyCoordinator.h; sourceTree = ""; }; - B23EA3B5147F5A43002B8C06 /* UDPProxyServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UDPProxyServer.cpp; path = ../../../Source/UDPProxyServer.cpp; sourceTree = ""; }; - B23EA3B6147F5A43002B8C06 /* UDPProxyServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UDPProxyServer.h; path = ../../../Source/UDPProxyServer.h; sourceTree = ""; }; - B23EA3B7147F5A43002B8C06 /* VariableDeltaSerializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VariableDeltaSerializer.cpp; path = ../../../Source/VariableDeltaSerializer.cpp; sourceTree = ""; }; - B23EA3B8147F5A43002B8C06 /* VariableDeltaSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VariableDeltaSerializer.h; path = ../../../Source/VariableDeltaSerializer.h; sourceTree = ""; }; - B23EA3B9147F5A43002B8C06 /* VariableListDeltaTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VariableListDeltaTracker.cpp; path = ../../../Source/VariableListDeltaTracker.cpp; sourceTree = ""; }; - B23EA3BA147F5A43002B8C06 /* VariableListDeltaTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VariableListDeltaTracker.h; path = ../../../Source/VariableListDeltaTracker.h; sourceTree = ""; }; - B23EA3BB147F5A43002B8C06 /* VariadicSQLParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VariadicSQLParser.cpp; path = ../../../Source/VariadicSQLParser.cpp; sourceTree = ""; }; - B23EA3BC147F5A43002B8C06 /* VariadicSQLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VariadicSQLParser.h; path = ../../../Source/VariadicSQLParser.h; sourceTree = ""; }; - B23EA3BD147F5A43002B8C06 /* VitaIncludes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VitaIncludes.cpp; path = ../../../Source/VitaIncludes.cpp; sourceTree = ""; }; - B23EA3BE147F5A43002B8C06 /* VitaIncludes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VitaIncludes.h; path = ../../../Source/VitaIncludes.h; sourceTree = ""; }; - B23EA3BF147F5A43002B8C06 /* WindowsIncludes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowsIncludes.h; path = ../../../Source/WindowsIncludes.h; sourceTree = ""; }; - B23EA3C0147F5A43002B8C06 /* WSAStartupSingleton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WSAStartupSingleton.cpp; path = ../../../Source/WSAStartupSingleton.cpp; sourceTree = ""; }; - B23EA3C1147F5A43002B8C06 /* WSAStartupSingleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WSAStartupSingleton.h; path = ../../../Source/WSAStartupSingleton.h; sourceTree = ""; }; - B23EA3C2147F5A43002B8C06 /* XBox360Includes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XBox360Includes.h; path = ../../../Source/XBox360Includes.h; sourceTree = ""; }; + B23EA390147F5A43002B8C06 /* signaled_event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = signaled_event.cpp; path = ../../../Source/signaled_event.cpp; sourceTree = ""; }; + B23EA391147F5A43002B8C06 /* signaled_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = signaled_event.h; path = ../../../Source/signaled_event.h; sourceTree = ""; }; + B23EA392147F5A43002B8C06 /* simple_mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = simple_mutex.cpp; path = ../../../Source/simple_mutex.cpp; sourceTree = ""; }; + B23EA393147F5A43002B8C06 /* simple_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_mutex.h; path = ../../../Source/simple_mutex.h; sourceTree = ""; }; + B23EA394147F5A43002B8C06 /* simple_tcp_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_tcp_server.h; path = ../../../Source/simple_tcp_server.h; sourceTree = ""; }; + B23EA395147F5A43002B8C06 /* single_producer_consumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = single_producer_consumer.h; path = ../../../Source/single_producer_consumer.h; sourceTree = ""; }; + B23EA396147F5A43002B8C06 /* socket_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_defines.h; path = ../../../Source/socket_defines.h; sourceTree = ""; }; + B23EA397147F5A43002B8C06 /* socket_includes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_includes.h; path = ../../../Source/socket_includes.h; sourceTree = ""; }; + B23EA398147F5A43002B8C06 /* socket_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = socket_layer.cpp; path = ../../../Source/socket_layer.cpp; sourceTree = ""; }; + B23EA399147F5A43002B8C06 /* socket_layer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket_layer.h; path = ../../../Source/socket_layer.h; sourceTree = ""; }; + B23EA39A147F5A43002B8C06 /* string_compressor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = string_compressor.cpp; path = ../../../Source/string_compressor.cpp; sourceTree = ""; }; + B23EA39B147F5A43002B8C06 /* string_compressor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = string_compressor.h; path = ../../../Source/string_compressor.h; sourceTree = ""; }; + B23EA39C147F5A43002B8C06 /* string_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = string_table.cpp; path = ../../../Source/string_table.cpp; sourceTree = ""; }; + B23EA39D147F5A43002B8C06 /* string_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = string_table.h; path = ../../../Source/string_table.h; sourceTree = ""; }; + B23EA39E147F5A43002B8C06 /* super_fast_hash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = super_fast_hash.cpp; path = ../../../Source/super_fast_hash.cpp; sourceTree = ""; }; + B23EA39F147F5A43002B8C06 /* super_fast_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = super_fast_hash.h; path = ../../../Source/super_fast_hash.h; sourceTree = ""; }; + B23EA3A0147F5A43002B8C06 /* table_serializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = table_serializer.cpp; path = ../../../Source/table_serializer.cpp; sourceTree = ""; }; + B23EA3A1147F5A43002B8C06 /* table_serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = table_serializer.h; path = ../../../Source/table_serializer.h; sourceTree = ""; }; + B23EA3A2147F5A43002B8C06 /* tcp_interface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tcp_interface.cpp; path = ../../../Source/tcp_interface.cpp; sourceTree = ""; }; + B23EA3A3147F5A43002B8C06 /* tcp_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tcp_interface.h; path = ../../../Source/tcp_interface.h; sourceTree = ""; }; + B23EA3A4147F5A43002B8C06 /* team_balancer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = team_balancer.cpp; path = ../../../Source/team_balancer.cpp; sourceTree = ""; }; + B23EA3A5147F5A43002B8C06 /* team_balancer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = team_balancer.h; path = ../../../Source/team_balancer.h; sourceTree = ""; }; + B23EA3A6147F5A43002B8C06 /* telnet_transport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = telnet_transport.cpp; path = ../../../Source/telnet_transport.cpp; sourceTree = ""; }; + B23EA3A7147F5A43002B8C06 /* telnet_transport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = telnet_transport.h; path = ../../../Source/telnet_transport.h; sourceTree = ""; }; + B23EA3A8147F5A43002B8C06 /* thread_pool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = thread_pool.h; path = ../../../Source/thread_pool.h; sourceTree = ""; }; + B23EA3A9147F5A43002B8C06 /* threadsafe_packet_logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = threadsafe_packet_logger.cpp; path = ../../../Source/threadsafe_packet_logger.cpp; sourceTree = ""; }; + B23EA3AA147F5A43002B8C06 /* threadsafe_packet_logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = threadsafe_packet_logger.h; path = ../../../Source/threadsafe_packet_logger.h; sourceTree = ""; }; + B23EA3AB147F5A43002B8C06 /* transport_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = transport_interface.h; path = ../../../Source/transport_interface.h; sourceTree = ""; }; + B23EA3AC147F5A43002B8C06 /* two_way_authentication.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = two_way_authentication.cpp; path = ../../../Source/two_way_authentication.cpp; sourceTree = ""; }; + B23EA3AD147F5A43002B8C06 /* two_way_authentication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = two_way_authentication.h; path = ../../../Source/two_way_authentication.h; sourceTree = ""; }; + B23EA3AE147F5A43002B8C06 /* udp_forwarder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = udp_forwarder.cpp; path = ../../../Source/udp_forwarder.cpp; sourceTree = ""; }; + B23EA3AF147F5A43002B8C06 /* udp_forwarder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = udp_forwarder.h; path = ../../../Source/udp_forwarder.h; sourceTree = ""; }; + B23EA3B0147F5A43002B8C06 /* udp_proxy_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = udp_proxy_client.cpp; path = ../../../Source/udp_proxy_client.cpp; sourceTree = ""; }; + B23EA3B1147F5A43002B8C06 /* udp_proxy_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = udp_proxy_client.h; path = ../../../Source/udp_proxy_client.h; sourceTree = ""; }; + B23EA3B2147F5A43002B8C06 /* udp_proxy_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = udp_proxy_common.h; path = ../../../Source/udp_proxy_common.h; sourceTree = ""; }; + B23EA3B3147F5A43002B8C06 /* udp_proxy_coordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = udp_proxy_coordinator.cpp; path = ../../../Source/udp_proxy_coordinator.cpp; sourceTree = ""; }; + B23EA3B4147F5A43002B8C06 /* udp_proxy_coordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = udp_proxy_coordinator.h; path = ../../../Source/udp_proxy_coordinator.h; sourceTree = ""; }; + B23EA3B5147F5A43002B8C06 /* udp_proxy_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = udp_proxy_server.cpp; path = ../../../Source/udp_proxy_server.cpp; sourceTree = ""; }; + B23EA3B6147F5A43002B8C06 /* udp_proxy_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = udp_proxy_server.h; path = ../../../Source/udp_proxy_server.h; sourceTree = ""; }; + B23EA3B7147F5A43002B8C06 /* variable_delta_serializer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variable_delta_serializer.cpp; path = ../../../Source/variable_delta_serializer.cpp; sourceTree = ""; }; + B23EA3B8147F5A43002B8C06 /* variable_delta_serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = variable_delta_serializer.h; path = ../../../Source/variable_delta_serializer.h; sourceTree = ""; }; + B23EA3B9147F5A43002B8C06 /* variable_list_delta_tracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variable_list_delta_tracker.cpp; path = ../../../Source/variable_list_delta_tracker.cpp; sourceTree = ""; }; + B23EA3BA147F5A43002B8C06 /* variable_list_delta_tracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = variable_list_delta_tracker.h; path = ../../../Source/variable_list_delta_tracker.h; sourceTree = ""; }; + B23EA3BB147F5A43002B8C06 /* variadic_sql_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variadic_sql_parser.cpp; path = ../../../Source/variadic_sql_parser.cpp; sourceTree = ""; }; + B23EA3BC147F5A43002B8C06 /* variadic_sql_parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = variadic_sql_parser.h; path = ../../../Source/variadic_sql_parser.h; sourceTree = ""; }; + B23EA3BF147F5A43002B8C06 /* windows_includes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = windows_includes.h; path = ../../../Source/windows_includes.h; sourceTree = ""; }; + B23EA3C0147F5A43002B8C06 /* wsa_startup_singleton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wsa_startup_singleton.cpp; path = ../../../Source/wsa_startup_singleton.cpp; sourceTree = ""; }; + B23EA3C1147F5A43002B8C06 /* wsa_startup_singleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wsa_startup_singleton.h; path = ../../../Source/wsa_startup_singleton.h; sourceTree = ""; }; B24A1D5B147EDC330029E45E /* ChatClient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChatClient.app; sourceTree = BUILT_PRODUCTS_DIR; }; B24A1D5F147EDC330029E45E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; B24A1D61147EDC330029E45E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -455,251 +450,247 @@ B24A1D7F147EDC580029E45E /* RakNet */ = { isa = PBXGroup; children = ( - B23EA2CE147F5A43002B8C06 /* _FindFirst.cpp */, - B23EA2CF147F5A43002B8C06 /* _FindFirst.h */, - B23EA2D0147F5A43002B8C06 /* AutopatcherPatchContext.h */, - B23EA2D1147F5A43002B8C06 /* AutopatcherRepositoryInterface.h */, - B23EA2D2147F5A43002B8C06 /* BitStream.cpp */, - B23EA2D3147F5A43002B8C06 /* BitStream.h */, - B23EA2D4147F5A43002B8C06 /* CCRakNetSlidingWindow.cpp */, - B23EA2D5147F5A43002B8C06 /* CCRakNetSlidingWindow.h */, - B23EA2D6147F5A43002B8C06 /* CCRakNetUDT.cpp */, - B23EA2D7147F5A43002B8C06 /* CCRakNetUDT.h */, - B23EA2D8147F5A43002B8C06 /* CheckSum.cpp */, - B23EA2D9147F5A43002B8C06 /* CheckSum.h */, - B23EA2DA147F5A43002B8C06 /* CloudClient.cpp */, - B23EA2DB147F5A43002B8C06 /* CloudClient.h */, - B23EA2DC147F5A43002B8C06 /* CloudCommon.cpp */, - B23EA2DD147F5A43002B8C06 /* CloudCommon.h */, - B23EA2DE147F5A43002B8C06 /* CloudServer.cpp */, - B23EA2DF147F5A43002B8C06 /* CloudServer.h */, + B23EA2CE147F5A43002B8C06 /* find_first.cpp */, + B23EA2CF147F5A43002B8C06 /* find_first.h */, + B23EA2D0147F5A43002B8C06 /* autopatcher_patch_context.h */, + B23EA2D1147F5A43002B8C06 /* autopatcher_repository_interface.h */, + B23EA2D2147F5A43002B8C06 /* bit_stream.cpp */, + B23EA2D3147F5A43002B8C06 /* bit_stream.h */, + B23EA2D4147F5A43002B8C06 /* cc_sliding_window.cpp */, + B23EA2D5147F5A43002B8C06 /* cc_sliding_window.h */, + B23EA2D6147F5A43002B8C06 /* cc_udt.cpp */, + B23EA2D7147F5A43002B8C06 /* cc_udt.h */, + B23EA2D8147F5A43002B8C06 /* check_sum.cpp */, + B23EA2D9147F5A43002B8C06 /* check_sum.h */, + B23EA2DA147F5A43002B8C06 /* cloud_client.cpp */, + B23EA2DB147F5A43002B8C06 /* cloud_client.h */, + B23EA2DC147F5A43002B8C06 /* cloud_common.cpp */, + B23EA2DD147F5A43002B8C06 /* cloud_common.h */, + B23EA2DE147F5A43002B8C06 /* cloud_server.cpp */, + B23EA2DF147F5A43002B8C06 /* cloud_server.h */, B23EA2E0147F5A43002B8C06 /* CMakeLists.txt */, - B23EA2E1147F5A43002B8C06 /* CommandParserInterface.cpp */, - B23EA2E2147F5A43002B8C06 /* CommandParserInterface.h */, - B23EA2E3147F5A43002B8C06 /* ConnectionGraph2.cpp */, - B23EA2E4147F5A43002B8C06 /* ConnectionGraph2.h */, - B23EA2E5147F5A43002B8C06 /* ConsoleServer.cpp */, - B23EA2E6147F5A43002B8C06 /* ConsoleServer.h */, - B23EA2E7147F5A43002B8C06 /* DataCompressor.cpp */, - B23EA2E8147F5A43002B8C06 /* DataCompressor.h */, - B23EA2E9147F5A43002B8C06 /* DirectoryDeltaTransfer.cpp */, - B23EA2EA147F5A43002B8C06 /* DirectoryDeltaTransfer.h */, - B23EA2EB147F5A43002B8C06 /* DS_BinarySearchTree.h */, - B23EA2EC147F5A43002B8C06 /* DS_BPlusTree.h */, - B23EA2ED147F5A43002B8C06 /* DS_BytePool.cpp */, - B23EA2EE147F5A43002B8C06 /* DS_BytePool.h */, - B23EA2EF147F5A43002B8C06 /* DS_ByteQueue.cpp */, - B23EA2F0147F5A43002B8C06 /* DS_ByteQueue.h */, - B23EA2F1147F5A43002B8C06 /* DS_Hash.h */, - B23EA2F2147F5A43002B8C06 /* DS_Heap.h */, - B23EA2F3147F5A43002B8C06 /* DS_HuffmanEncodingTree.cpp */, - B23EA2F4147F5A43002B8C06 /* DS_HuffmanEncodingTree.h */, - B23EA2F5147F5A43002B8C06 /* DS_HuffmanEncodingTreeFactory.h */, - B23EA2F6147F5A43002B8C06 /* DS_HuffmanEncodingTreeNode.h */, - B23EA2F7147F5A43002B8C06 /* DS_LinkedList.h */, - B23EA2F8147F5A43002B8C06 /* DS_List.h */, - B23EA2F9147F5A43002B8C06 /* DS_Map.h */, - B23EA2FA147F5A43002B8C06 /* DS_MemoryPool.h */, - B23EA2FB147F5A43002B8C06 /* DS_Multilist.h */, - B23EA2FC147F5A43002B8C06 /* DS_OrderedChannelHeap.h */, - B23EA2FD147F5A43002B8C06 /* DS_OrderedList.h */, - B23EA2FE147F5A43002B8C06 /* DS_Queue.h */, - B23EA2FF147F5A43002B8C06 /* DS_QueueLinkedList.h */, - B23EA300147F5A43002B8C06 /* DS_RangeList.h */, - B23EA301147F5A43002B8C06 /* DS_Table.cpp */, - B23EA302147F5A43002B8C06 /* DS_Table.h */, - B23EA303147F5A43002B8C06 /* DS_ThreadsafeAllocatingQueue.h */, - B23EA304147F5A43002B8C06 /* DS_Tree.h */, - B23EA305147F5A43002B8C06 /* DS_WeightedGraph.h */, - B23EA306147F5A43002B8C06 /* DynDNS.cpp */, - B23EA307147F5A43002B8C06 /* DynDNS.h */, - B23EA308147F5A43002B8C06 /* EmailSender.cpp */, - B23EA309147F5A43002B8C06 /* EmailSender.h */, + B23EA2E1147F5A43002B8C06 /* command_parser_interface.cpp */, + B23EA2E2147F5A43002B8C06 /* command_parser_interface.h */, + B23EA2E3147F5A43002B8C06 /* connection_graph2.cpp */, + B23EA2E4147F5A43002B8C06 /* connection_graph2.h */, + B23EA2E5147F5A43002B8C06 /* console_server.cpp */, + B23EA2E6147F5A43002B8C06 /* console_server.h */, + B23EA2E7147F5A43002B8C06 /* data_compressor.cpp */, + B23EA2E8147F5A43002B8C06 /* data_compressor.h */, + B23EA2E9147F5A43002B8C06 /* directory_delta_transfer.cpp */, + B23EA2EA147F5A43002B8C06 /* directory_delta_transfer.h */, + B23EA2EB147F5A43002B8C06 /* ds_binary_search_tree.h */, + B23EA2EC147F5A43002B8C06 /* ds_bplus_tree.h */, + B23EA2ED147F5A43002B8C06 /* ds_byte_pool.cpp */, + B23EA2EE147F5A43002B8C06 /* ds_byte_pool.h */, + B23EA2EF147F5A43002B8C06 /* ds_byte_queue.cpp */, + B23EA2F0147F5A43002B8C06 /* ds_byte_queue.h */, + B23EA2F1147F5A43002B8C06 /* ds_hash.h */, + B23EA2F2147F5A43002B8C06 /* ds_heap.h */, + B23EA2F3147F5A43002B8C06 /* ds_huffman_encoding_tree.cpp */, + B23EA2F4147F5A43002B8C06 /* ds_huffman_encoding_tree.h */, + B23EA2F5147F5A43002B8C06 /* ds_huffman_encoding_tree_factory.h */, + B23EA2F6147F5A43002B8C06 /* ds_huffman_encoding_tree_node.h */, + B23EA2F7147F5A43002B8C06 /* ds_linked_list.h */, + B23EA2F8147F5A43002B8C06 /* ds_list.h */, + B23EA2F9147F5A43002B8C06 /* ds_map.h */, + B23EA2FA147F5A43002B8C06 /* ds_memory_pool.h */, + B23EA2FB147F5A43002B8C06 /* ds_multilist.h */, + B23EA2FC147F5A43002B8C06 /* ds_ordered_channel_heap.h */, + B23EA2FD147F5A43002B8C06 /* ds_ordered_list.h */, + B23EA2FE147F5A43002B8C06 /* ds_queue.h */, + B23EA2FF147F5A43002B8C06 /* ds_queue_linked_list.h */, + B23EA300147F5A43002B8C06 /* ds_range_list.h */, + B23EA301147F5A43002B8C06 /* ds_table.cpp */, + B23EA302147F5A43002B8C06 /* ds_table.h */, + B23EA303147F5A43002B8C06 /* ds_threadsafe_allocating_queue.h */, + B23EA304147F5A43002B8C06 /* ds_tree.h */, + B23EA305147F5A43002B8C06 /* ds_weighted_graph.h */, + B23EA306147F5A43002B8C06 /* dyn_dns.cpp */, + B23EA307147F5A43002B8C06 /* dyn_dns.h */, + B23EA308147F5A43002B8C06 /* email_sender.cpp */, + B23EA309147F5A43002B8C06 /* email_sender.h */, B23EA30A147F5A43002B8C06 /* EncodeClassName.cpp */, - B23EA30B147F5A43002B8C06 /* EpochTimeToString.cpp */, - B23EA30C147F5A43002B8C06 /* EpochTimeToString.h */, - B23EA30D147F5A43002B8C06 /* Export.h */, - B23EA30E147F5A43002B8C06 /* FileList.cpp */, - B23EA30F147F5A43002B8C06 /* FileList.h */, - B23EA310147F5A43002B8C06 /* FileListNodeContext.h */, - B23EA311147F5A43002B8C06 /* FileListTransfer.cpp */, - B23EA312147F5A43002B8C06 /* FileListTransfer.h */, - B23EA313147F5A43002B8C06 /* FileListTransferCBInterface.h */, - B23EA314147F5A43002B8C06 /* FileOperations.cpp */, - B23EA315147F5A43002B8C06 /* FileOperations.h */, - B23EA316147F5A43002B8C06 /* FormatString.cpp */, - B23EA317147F5A43002B8C06 /* FormatString.h */, - B23EA318147F5A43002B8C06 /* FullyConnectedMesh2.cpp */, - B23EA319147F5A43002B8C06 /* FullyConnectedMesh2.h */, - B23EA31A147F5A43002B8C06 /* Getche.cpp */, - B23EA31B147F5A43002B8C06 /* Getche.h */, - B23EA31C147F5A43002B8C06 /* Gets.cpp */, - B23EA31D147F5A43002B8C06 /* Gets.h */, - B23EA31E147F5A43002B8C06 /* GetTime.cpp */, - B23EA31F147F5A43002B8C06 /* GetTime.h */, - B23EA320147F5A43002B8C06 /* gettimeofday.cpp */, + B23EA30B147F5A43002B8C06 /* epoch_time_to_string.cpp */, + B23EA30C147F5A43002B8C06 /* epoch_time_to_string.h */, + B23EA30D147F5A43002B8C06 /* export.h */, + B23EA30E147F5A43002B8C06 /* file_list.cpp */, + B23EA30F147F5A43002B8C06 /* file_list.h */, + B23EA310147F5A43002B8C06 /* file_list_node_context.h */, + B23EA311147F5A43002B8C06 /* file_list_transfer.cpp */, + B23EA312147F5A43002B8C06 /* file_list_transfer.h */, + B23EA313147F5A43002B8C06 /* file_list_transfer_cb_interface.h */, + B23EA314147F5A43002B8C06 /* file_operations.cpp */, + B23EA315147F5A43002B8C06 /* file_operations.h */, + B23EA316147F5A43002B8C06 /* format_string.cpp */, + B23EA317147F5A43002B8C06 /* format_string.h */, + B23EA318147F5A43002B8C06 /* fully_connected_mesh2.cpp */, + B23EA319147F5A43002B8C06 /* fully_connected_mesh2.h */, + B23EA31A147F5A43002B8C06 /* getche.cpp */, + B23EA31B147F5A43002B8C06 /* getche.h */, + B23EA31C147F5A43002B8C06 /* gets.cpp */, + B23EA31D147F5A43002B8C06 /* gets.h */, + B23EA31E147F5A43002B8C06 /* get_time.cpp */, + B23EA31F147F5A43002B8C06 /* get_time.h */, + B23EA320147F5A43002B8C06 /* get_time_of_day.cpp */, B23EA321147F5A43002B8C06 /* gettimeofday.h */, - B23EA322147F5A43002B8C06 /* GridSectorizer.cpp */, - B23EA323147F5A43002B8C06 /* GridSectorizer.h */, - B23EA324147F5A43002B8C06 /* HTTPConnection.cpp */, - B23EA325147F5A43002B8C06 /* HTTPConnection.h */, - B23EA326147F5A43002B8C06 /* IncrementalReadInterface.cpp */, - B23EA327147F5A43002B8C06 /* IncrementalReadInterface.h */, - B23EA328147F5A43002B8C06 /* InternalPacket.h */, - B23EA329147F5A43002B8C06 /* Itoa.cpp */, - B23EA32A147F5A43002B8C06 /* Itoa.h */, - B23EA32B147F5A43002B8C06 /* Kbhit.h */, - B23EA32C147F5A43002B8C06 /* LinuxStrings.cpp */, - B23EA32D147F5A43002B8C06 /* LinuxStrings.h */, - B23EA32E147F5A43002B8C06 /* LocklessTypes.cpp */, - B23EA32F147F5A43002B8C06 /* LocklessTypes.h */, - B23EA330147F5A43002B8C06 /* LogCommandParser.cpp */, - B23EA331147F5A43002B8C06 /* LogCommandParser.h */, - B23EA332147F5A43002B8C06 /* MessageFilter.cpp */, - B23EA333147F5A43002B8C06 /* MessageFilter.h */, - B23EA334147F5A43002B8C06 /* MessageIdentifiers.h */, - B23EA335147F5A43002B8C06 /* MTUSize.h */, - B23EA336147F5A43002B8C06 /* NativeFeatureIncludes.h */, - B23EA337147F5A43002B8C06 /* NativeFeatureIncludesOverrides.h */, - B23EA338147F5A43002B8C06 /* NativeTypes.h */, - B23EA339147F5A43002B8C06 /* NatPunchthroughClient.cpp */, - B23EA33A147F5A43002B8C06 /* NatPunchthroughClient.h */, - B23EA33B147F5A43002B8C06 /* NatPunchthroughServer.cpp */, - B23EA33C147F5A43002B8C06 /* NatPunchthroughServer.h */, - B23EA33D147F5A43002B8C06 /* NatTypeDetectionClient.cpp */, - B23EA33E147F5A43002B8C06 /* NatTypeDetectionClient.h */, - B23EA33F147F5A43002B8C06 /* NatTypeDetectionCommon.cpp */, - B23EA340147F5A43002B8C06 /* NatTypeDetectionCommon.h */, - B23EA341147F5A43002B8C06 /* NatTypeDetectionServer.cpp */, - B23EA342147F5A43002B8C06 /* NatTypeDetectionServer.h */, - B23EA343147F5A43002B8C06 /* NetworkIDManager.cpp */, - B23EA344147F5A43002B8C06 /* NetworkIDManager.h */, - B23EA345147F5A43002B8C06 /* NetworkIDObject.cpp */, - B23EA346147F5A43002B8C06 /* NetworkIDObject.h */, - B23EA347147F5A43002B8C06 /* PacketConsoleLogger.cpp */, - B23EA348147F5A43002B8C06 /* PacketConsoleLogger.h */, - B23EA349147F5A43002B8C06 /* PacketFileLogger.cpp */, - B23EA34A147F5A43002B8C06 /* PacketFileLogger.h */, - B23EA34B147F5A43002B8C06 /* PacketizedTCP.cpp */, - B23EA34C147F5A43002B8C06 /* PacketizedTCP.h */, - B23EA34D147F5A43002B8C06 /* PacketLogger.cpp */, - B23EA34E147F5A43002B8C06 /* PacketLogger.h */, - B23EA34F147F5A43002B8C06 /* PacketOutputWindowLogger.cpp */, - B23EA350147F5A43002B8C06 /* PacketOutputWindowLogger.h */, - B23EA351147F5A43002B8C06 /* PacketPool.h */, - B23EA352147F5A43002B8C06 /* PacketPriority.h */, - B23EA353147F5A43002B8C06 /* PluginInterface2.cpp */, - B23EA354147F5A43002B8C06 /* PluginInterface2.h */, - B23EA355147F5A43002B8C06 /* PS3Includes.h */, - B23EA356147F5A43002B8C06 /* Rackspace.cpp */, - B23EA357147F5A43002B8C06 /* Rackspace.h */, + B23EA322147F5A43002B8C06 /* grid_sectorizer.cpp */, + B23EA323147F5A43002B8C06 /* grid_sectorizer.h */, + B23EA324147F5A43002B8C06 /* http_connection.cpp */, + B23EA325147F5A43002B8C06 /* http_connection.h */, + B23EA326147F5A43002B8C06 /* incremental_read_interface.cpp */, + B23EA327147F5A43002B8C06 /* incremental_read_interface.h */, + B23EA328147F5A43002B8C06 /* internal_packet.h */, + B23EA329147F5A43002B8C06 /* itoa.cpp */, + B23EA32A147F5A43002B8C06 /* itoa.h */, + B23EA32B147F5A43002B8C06 /* kbhit.h */, + B23EA32C147F5A43002B8C06 /* linux_strings.cpp */, + B23EA32D147F5A43002B8C06 /* linux_strings.h */, + B23EA32E147F5A43002B8C06 /* lockless_types.cpp */, + B23EA32F147F5A43002B8C06 /* lockless_types.h */, + B23EA330147F5A43002B8C06 /* log_command_parser.cpp */, + B23EA331147F5A43002B8C06 /* log_command_parser.h */, + B23EA332147F5A43002B8C06 /* message_filter.cpp */, + B23EA333147F5A43002B8C06 /* message_filter.h */, + B23EA334147F5A43002B8C06 /* message_identifiers.h */, + B23EA335147F5A43002B8C06 /* mtu_size.h */, + B23EA336147F5A43002B8C06 /* native_feature_includes.h */, + B23EA337147F5A43002B8C06 /* native_feature_includes_overrides.h */, + B23EA338147F5A43002B8C06 /* native_types.h */, + B23EA339147F5A43002B8C06 /* nat_punchthrough_client.cpp */, + B23EA33A147F5A43002B8C06 /* nat_punchthrough_client.h */, + B23EA33B147F5A43002B8C06 /* nat_punchthrough_server.cpp */, + B23EA33C147F5A43002B8C06 /* nat_punchthrough_server.h */, + B23EA33D147F5A43002B8C06 /* nat_type_detection_client.cpp */, + B23EA33E147F5A43002B8C06 /* nat_type_detection_client.h */, + B23EA33F147F5A43002B8C06 /* nat_type_detection_common.cpp */, + B23EA340147F5A43002B8C06 /* nat_type_detection_common.h */, + B23EA341147F5A43002B8C06 /* nat_type_detection_server.cpp */, + B23EA342147F5A43002B8C06 /* nat_type_detection_server.h */, + B23EA343147F5A43002B8C06 /* network_id_manager.cpp */, + B23EA344147F5A43002B8C06 /* network_id_manager.h */, + B23EA345147F5A43002B8C06 /* network_id_object.cpp */, + B23EA346147F5A43002B8C06 /* network_id_object.h */, + B23EA347147F5A43002B8C06 /* packet_console_logger.cpp */, + B23EA348147F5A43002B8C06 /* packet_console_logger.h */, + B23EA349147F5A43002B8C06 /* packet_file_logger.cpp */, + B23EA34A147F5A43002B8C06 /* packet_file_logger.h */, + B23EA34B147F5A43002B8C06 /* packetized_tcp.cpp */, + B23EA34C147F5A43002B8C06 /* packetized_tcp.h */, + B23EA34D147F5A43002B8C06 /* packet_logger.cpp */, + B23EA34E147F5A43002B8C06 /* packet_logger.h */, + B23EA34F147F5A43002B8C06 /* packet_output_window_logger.cpp */, + B23EA350147F5A43002B8C06 /* packet_output_window_logger.h */, + B23EA351147F5A43002B8C06 /* packet_pool.h */, + B23EA352147F5A43002B8C06 /* packet_priority.h */, + B23EA353147F5A43002B8C06 /* plugin_interface2.cpp */, + B23EA354147F5A43002B8C06 /* plugin_interface2.h */, + B23EA356147F5A43002B8C06 /* rackspace.cpp */, + B23EA357147F5A43002B8C06 /* rackspace.h */, B23EA358147F5A43002B8C06 /* RakAlloca.h */, B23EA359147F5A43002B8C06 /* RakAssert.h */, - B23EA35A147F5A43002B8C06 /* RakMemoryOverride.cpp */, + B23EA35A147F5A43002B8C06 /* memory_override.cpp */, B23EA35B147F5A43002B8C06 /* RakMemoryOverride.h */, B23EA35C147F5A43002B8C06 /* RakNet_vc8.vcproj */, B23EA35D147F5A43002B8C06 /* RakNet_vc9.vcproj */, B23EA35E147F5A43002B8C06 /* RakNet.vcproj */, - B23EA35F147F5A43002B8C06 /* RakNetCommandParser.cpp */, + B23EA35F147F5A43002B8C06 /* command_parser.cpp */, B23EA360147F5A43002B8C06 /* RakNetCommandParser.h */, B23EA361147F5A43002B8C06 /* RakNetDefines.h */, B23EA362147F5A43002B8C06 /* RakNetDefinesOverrides.h */, B23EA363147F5A43002B8C06 /* RakNetSmartPtr.h */, B23EA364147F5A43002B8C06 /* RakNetSocket.cpp */, B23EA365147F5A43002B8C06 /* RakNetSocket.h */, - B23EA366147F5A43002B8C06 /* RakNetStatistics.cpp */, + B23EA366147F5A43002B8C06 /* statistics.cpp */, B23EA367147F5A43002B8C06 /* RakNetStatistics.h */, B23EA368147F5A43002B8C06 /* RakNetTime.h */, - B23EA369147F5A43002B8C06 /* RakNetTransport2.cpp */, + B23EA369147F5A43002B8C06 /* transport2.cpp */, B23EA36A147F5A43002B8C06 /* RakNetTransport2.h */, - B23EA36B147F5A43002B8C06 /* RakNetTypes.cpp */, + B23EA36B147F5A43002B8C06 /* types.cpp */, B23EA36C147F5A43002B8C06 /* RakNetTypes.h */, B23EA36D147F5A43002B8C06 /* RakNetVersion.h */, - B23EA36E147F5A43002B8C06 /* RakPeer.cpp */, + B23EA36E147F5A43002B8C06 /* peer.cpp */, B23EA36F147F5A43002B8C06 /* RakPeer.h */, B23EA370147F5A43002B8C06 /* RakPeerInterface.h */, - B23EA371147F5A43002B8C06 /* RakSleep.cpp */, + B23EA371147F5A43002B8C06 /* sleep.cpp */, B23EA372147F5A43002B8C06 /* RakSleep.h */, - B23EA373147F5A43002B8C06 /* RakString.cpp */, + B23EA373147F5A43002B8C06 /* string.cpp */, B23EA374147F5A43002B8C06 /* RakString.h */, - B23EA375147F5A43002B8C06 /* RakThread.cpp */, + B23EA375147F5A43002B8C06 /* thread.cpp */, B23EA376147F5A43002B8C06 /* RakThread.h */, - B23EA377147F5A43002B8C06 /* RakWString.cpp */, + B23EA377147F5A43002B8C06 /* wstring.cpp */, B23EA378147F5A43002B8C06 /* RakWString.h */, - B23EA379147F5A43002B8C06 /* Rand.cpp */, - B23EA37A147F5A43002B8C06 /* Rand.h */, + B23EA379147F5A43002B8C06 /* rand.cpp */, + B23EA37A147F5A43002B8C06 /* rand.h */, B23EA37B147F5A43002B8C06 /* rdlmalloc-options.h */, B23EA37C147F5A43002B8C06 /* rdlmalloc.cpp */, B23EA37D147F5A43002B8C06 /* rdlmalloc.h */, - B23EA37E147F5A43002B8C06 /* ReadyEvent.cpp */, - B23EA37F147F5A43002B8C06 /* ReadyEvent.h */, - B23EA380147F5A43002B8C06 /* RefCountedObj.h */, - B23EA381147F5A43002B8C06 /* ReliabilityLayer.cpp */, - B23EA382147F5A43002B8C06 /* ReliabilityLayer.h */, - B23EA383147F5A43002B8C06 /* ReplicaEnums.h */, - B23EA384147F5A43002B8C06 /* ReplicaManager3.cpp */, - B23EA385147F5A43002B8C06 /* ReplicaManager3.h */, - B23EA386147F5A43002B8C06 /* Router2.cpp */, - B23EA387147F5A43002B8C06 /* Router2.h */, - B23EA388147F5A43002B8C06 /* RPC4Plugin.cpp */, - B23EA389147F5A43002B8C06 /* RPC4Plugin.h */, - B23EA38A147F5A43002B8C06 /* SecureHandshake.cpp */, - B23EA38B147F5A43002B8C06 /* SecureHandshake.h */, - B23EA38C147F5A43002B8C06 /* SendToThread.cpp */, - B23EA38D147F5A43002B8C06 /* SendToThread.h */, + B23EA37E147F5A43002B8C06 /* ready_event.cpp */, + B23EA37F147F5A43002B8C06 /* ready_event.h */, + B23EA380147F5A43002B8C06 /* ref_counted_obj.h */, + B23EA381147F5A43002B8C06 /* reliability_layer.cpp */, + B23EA382147F5A43002B8C06 /* reliability_layer.h */, + B23EA383147F5A43002B8C06 /* replica_enums.h */, + B23EA384147F5A43002B8C06 /* replica_manager3.cpp */, + B23EA385147F5A43002B8C06 /* replica_manager3.h */, + B23EA386147F5A43002B8C06 /* router2.cpp */, + B23EA387147F5A43002B8C06 /* router2.h */, + B23EA388147F5A43002B8C06 /* rpc4_plugin.cpp */, + B23EA389147F5A43002B8C06 /* rpc4_plugin.h */, + B23EA38A147F5A43002B8C06 /* secure_handshake.cpp */, + B23EA38B147F5A43002B8C06 /* secure_handshake.h */, + B23EA38C147F5A43002B8C06 /* send_to_thread.cpp */, + B23EA38D147F5A43002B8C06 /* send_to_thread.h */, B23EA38E147F5A43002B8C06 /* SHA1.cpp */, B23EA38F147F5A43002B8C06 /* SHA1.h */, - B23EA390147F5A43002B8C06 /* SignaledEvent.cpp */, - B23EA391147F5A43002B8C06 /* SignaledEvent.h */, - B23EA392147F5A43002B8C06 /* SimpleMutex.cpp */, - B23EA393147F5A43002B8C06 /* SimpleMutex.h */, - B23EA394147F5A43002B8C06 /* SimpleTCPServer.h */, - B23EA395147F5A43002B8C06 /* SingleProducerConsumer.h */, - B23EA396147F5A43002B8C06 /* SocketDefines.h */, - B23EA397147F5A43002B8C06 /* SocketIncludes.h */, - B23EA398147F5A43002B8C06 /* SocketLayer.cpp */, - B23EA399147F5A43002B8C06 /* SocketLayer.h */, - B23EA39A147F5A43002B8C06 /* StringCompressor.cpp */, - B23EA39B147F5A43002B8C06 /* StringCompressor.h */, - B23EA39C147F5A43002B8C06 /* StringTable.cpp */, - B23EA39D147F5A43002B8C06 /* StringTable.h */, - B23EA39E147F5A43002B8C06 /* SuperFastHash.cpp */, - B23EA39F147F5A43002B8C06 /* SuperFastHash.h */, - B23EA3A0147F5A43002B8C06 /* TableSerializer.cpp */, - B23EA3A1147F5A43002B8C06 /* TableSerializer.h */, - B23EA3A2147F5A43002B8C06 /* TCPInterface.cpp */, - B23EA3A3147F5A43002B8C06 /* TCPInterface.h */, - B23EA3A4147F5A43002B8C06 /* TeamBalancer.cpp */, - B23EA3A5147F5A43002B8C06 /* TeamBalancer.h */, - B23EA3A6147F5A43002B8C06 /* TelnetTransport.cpp */, - B23EA3A7147F5A43002B8C06 /* TelnetTransport.h */, - B23EA3A8147F5A43002B8C06 /* ThreadPool.h */, - B23EA3A9147F5A43002B8C06 /* ThreadsafePacketLogger.cpp */, - B23EA3AA147F5A43002B8C06 /* ThreadsafePacketLogger.h */, - B23EA3AB147F5A43002B8C06 /* TransportInterface.h */, - B23EA3AC147F5A43002B8C06 /* TwoWayAuthentication.cpp */, - B23EA3AD147F5A43002B8C06 /* TwoWayAuthentication.h */, - B23EA3AE147F5A43002B8C06 /* UDPForwarder.cpp */, - B23EA3AF147F5A43002B8C06 /* UDPForwarder.h */, - B23EA3B0147F5A43002B8C06 /* UDPProxyClient.cpp */, - B23EA3B1147F5A43002B8C06 /* UDPProxyClient.h */, - B23EA3B2147F5A43002B8C06 /* UDPProxyCommon.h */, - B23EA3B3147F5A43002B8C06 /* UDPProxyCoordinator.cpp */, - B23EA3B4147F5A43002B8C06 /* UDPProxyCoordinator.h */, - B23EA3B5147F5A43002B8C06 /* UDPProxyServer.cpp */, - B23EA3B6147F5A43002B8C06 /* UDPProxyServer.h */, - B23EA3B7147F5A43002B8C06 /* VariableDeltaSerializer.cpp */, - B23EA3B8147F5A43002B8C06 /* VariableDeltaSerializer.h */, - B23EA3B9147F5A43002B8C06 /* VariableListDeltaTracker.cpp */, - B23EA3BA147F5A43002B8C06 /* VariableListDeltaTracker.h */, - B23EA3BB147F5A43002B8C06 /* VariadicSQLParser.cpp */, - B23EA3BC147F5A43002B8C06 /* VariadicSQLParser.h */, - B23EA3BD147F5A43002B8C06 /* VitaIncludes.cpp */, - B23EA3BE147F5A43002B8C06 /* VitaIncludes.h */, - B23EA3BF147F5A43002B8C06 /* WindowsIncludes.h */, - B23EA3C0147F5A43002B8C06 /* WSAStartupSingleton.cpp */, - B23EA3C1147F5A43002B8C06 /* WSAStartupSingleton.h */, - B23EA3C2147F5A43002B8C06 /* XBox360Includes.h */, + B23EA390147F5A43002B8C06 /* signaled_event.cpp */, + B23EA391147F5A43002B8C06 /* signaled_event.h */, + B23EA392147F5A43002B8C06 /* simple_mutex.cpp */, + B23EA393147F5A43002B8C06 /* simple_mutex.h */, + B23EA394147F5A43002B8C06 /* simple_tcp_server.h */, + B23EA395147F5A43002B8C06 /* single_producer_consumer.h */, + B23EA396147F5A43002B8C06 /* socket_defines.h */, + B23EA397147F5A43002B8C06 /* socket_includes.h */, + B23EA398147F5A43002B8C06 /* socket_layer.cpp */, + B23EA399147F5A43002B8C06 /* socket_layer.h */, + B23EA39A147F5A43002B8C06 /* string_compressor.cpp */, + B23EA39B147F5A43002B8C06 /* string_compressor.h */, + B23EA39C147F5A43002B8C06 /* string_table.cpp */, + B23EA39D147F5A43002B8C06 /* string_table.h */, + B23EA39E147F5A43002B8C06 /* super_fast_hash.cpp */, + B23EA39F147F5A43002B8C06 /* super_fast_hash.h */, + B23EA3A0147F5A43002B8C06 /* table_serializer.cpp */, + B23EA3A1147F5A43002B8C06 /* table_serializer.h */, + B23EA3A2147F5A43002B8C06 /* tcp_interface.cpp */, + B23EA3A3147F5A43002B8C06 /* tcp_interface.h */, + B23EA3A4147F5A43002B8C06 /* team_balancer.cpp */, + B23EA3A5147F5A43002B8C06 /* team_balancer.h */, + B23EA3A6147F5A43002B8C06 /* telnet_transport.cpp */, + B23EA3A7147F5A43002B8C06 /* telnet_transport.h */, + B23EA3A8147F5A43002B8C06 /* thread_pool.h */, + B23EA3A9147F5A43002B8C06 /* threadsafe_packet_logger.cpp */, + B23EA3AA147F5A43002B8C06 /* threadsafe_packet_logger.h */, + B23EA3AB147F5A43002B8C06 /* transport_interface.h */, + B23EA3AC147F5A43002B8C06 /* two_way_authentication.cpp */, + B23EA3AD147F5A43002B8C06 /* two_way_authentication.h */, + B23EA3AE147F5A43002B8C06 /* udp_forwarder.cpp */, + B23EA3AF147F5A43002B8C06 /* udp_forwarder.h */, + B23EA3B0147F5A43002B8C06 /* udp_proxy_client.cpp */, + B23EA3B1147F5A43002B8C06 /* udp_proxy_client.h */, + B23EA3B2147F5A43002B8C06 /* udp_proxy_common.h */, + B23EA3B3147F5A43002B8C06 /* udp_proxy_coordinator.cpp */, + B23EA3B4147F5A43002B8C06 /* udp_proxy_coordinator.h */, + B23EA3B5147F5A43002B8C06 /* udp_proxy_server.cpp */, + B23EA3B6147F5A43002B8C06 /* udp_proxy_server.h */, + B23EA3B7147F5A43002B8C06 /* variable_delta_serializer.cpp */, + B23EA3B8147F5A43002B8C06 /* variable_delta_serializer.h */, + B23EA3B9147F5A43002B8C06 /* variable_list_delta_tracker.cpp */, + B23EA3BA147F5A43002B8C06 /* variable_list_delta_tracker.h */, + B23EA3BB147F5A43002B8C06 /* variadic_sql_parser.cpp */, + B23EA3BC147F5A43002B8C06 /* variadic_sql_parser.h */, + B23EA3BF147F5A43002B8C06 /* windows_includes.h */, + B23EA3C0147F5A43002B8C06 /* wsa_startup_singleton.cpp */, + B23EA3C1147F5A43002B8C06 /* wsa_startup_singleton.h */, ); name = RakNet; sourceTree = ""; @@ -775,100 +766,99 @@ B24A1D70147EDC330029E45E /* AppDelegate.mm in Sources */, B24A1D73147EDC330029E45E /* ViewController.mm in Sources */, B24A1F26147F1C640029E45E /* ServerDetailsViewController.m in Sources */, - B23EA3C3147F5A43002B8C06 /* _FindFirst.cpp in Sources */, - B23EA3C4147F5A43002B8C06 /* BitStream.cpp in Sources */, - B23EA3C5147F5A43002B8C06 /* CCRakNetSlidingWindow.cpp in Sources */, - B23EA3C6147F5A43002B8C06 /* CCRakNetUDT.cpp in Sources */, - B23EA3C7147F5A43002B8C06 /* CheckSum.cpp in Sources */, - B23EA3C8147F5A43002B8C06 /* CloudClient.cpp in Sources */, - B23EA3C9147F5A43002B8C06 /* CloudCommon.cpp in Sources */, - B23EA3CA147F5A43002B8C06 /* CloudServer.cpp in Sources */, - B23EA3CC147F5A43002B8C06 /* CommandParserInterface.cpp in Sources */, - B23EA3CD147F5A43002B8C06 /* ConnectionGraph2.cpp in Sources */, - B23EA3CE147F5A43002B8C06 /* ConsoleServer.cpp in Sources */, - B23EA3CF147F5A43002B8C06 /* DataCompressor.cpp in Sources */, - B23EA3D0147F5A43002B8C06 /* DirectoryDeltaTransfer.cpp in Sources */, - B23EA3D1147F5A43002B8C06 /* DS_BytePool.cpp in Sources */, - B23EA3D2147F5A43002B8C06 /* DS_ByteQueue.cpp in Sources */, - B23EA3D3147F5A43002B8C06 /* DS_HuffmanEncodingTree.cpp in Sources */, - B23EA3D4147F5A43002B8C06 /* DS_Table.cpp in Sources */, - B23EA3D5147F5A43002B8C06 /* DynDNS.cpp in Sources */, - B23EA3D6147F5A43002B8C06 /* EmailSender.cpp in Sources */, + B23EA3C3147F5A43002B8C06 /* find_first.cpp in Sources */, + B23EA3C4147F5A43002B8C06 /* bit_stream.cpp in Sources */, + B23EA3C5147F5A43002B8C06 /* cc_sliding_window.cpp in Sources */, + B23EA3C6147F5A43002B8C06 /* cc_udt.cpp in Sources */, + B23EA3C7147F5A43002B8C06 /* check_sum.cpp in Sources */, + B23EA3C8147F5A43002B8C06 /* cloud_client.cpp in Sources */, + B23EA3C9147F5A43002B8C06 /* cloud_common.cpp in Sources */, + B23EA3CA147F5A43002B8C06 /* cloud_server.cpp in Sources */, + B23EA3CC147F5A43002B8C06 /* command_parser_interface.cpp in Sources */, + B23EA3CD147F5A43002B8C06 /* connection_graph2.cpp in Sources */, + B23EA3CE147F5A43002B8C06 /* console_server.cpp in Sources */, + B23EA3CF147F5A43002B8C06 /* data_compressor.cpp in Sources */, + B23EA3D0147F5A43002B8C06 /* directory_delta_transfer.cpp in Sources */, + B23EA3D1147F5A43002B8C06 /* ds_byte_pool.cpp in Sources */, + B23EA3D2147F5A43002B8C06 /* ds_byte_queue.cpp in Sources */, + B23EA3D3147F5A43002B8C06 /* ds_huffman_encoding_tree.cpp in Sources */, + B23EA3D4147F5A43002B8C06 /* ds_table.cpp in Sources */, + B23EA3D5147F5A43002B8C06 /* dyn_dns.cpp in Sources */, + B23EA3D6147F5A43002B8C06 /* email_sender.cpp in Sources */, B23EA3D7147F5A43002B8C06 /* EncodeClassName.cpp in Sources */, - B23EA3D8147F5A43002B8C06 /* EpochTimeToString.cpp in Sources */, - B23EA3D9147F5A43002B8C06 /* FileList.cpp in Sources */, - B23EA3DA147F5A43002B8C06 /* FileListTransfer.cpp in Sources */, - B23EA3DB147F5A43002B8C06 /* FileOperations.cpp in Sources */, - B23EA3DC147F5A43002B8C06 /* FormatString.cpp in Sources */, - B23EA3DD147F5A43002B8C06 /* FullyConnectedMesh2.cpp in Sources */, - B23EA3DE147F5A43002B8C06 /* Getche.cpp in Sources */, - B23EA3DF147F5A43002B8C06 /* Gets.cpp in Sources */, - B23EA3E0147F5A43002B8C06 /* GetTime.cpp in Sources */, - B23EA3E1147F5A43002B8C06 /* gettimeofday.cpp in Sources */, - B23EA3E2147F5A43002B8C06 /* GridSectorizer.cpp in Sources */, - B23EA3E3147F5A43002B8C06 /* HTTPConnection.cpp in Sources */, - B23EA3E4147F5A43002B8C06 /* IncrementalReadInterface.cpp in Sources */, - B23EA3E5147F5A43002B8C06 /* Itoa.cpp in Sources */, - B23EA3E6147F5A43002B8C06 /* LinuxStrings.cpp in Sources */, - B23EA3E7147F5A43002B8C06 /* LocklessTypes.cpp in Sources */, - B23EA3E8147F5A43002B8C06 /* LogCommandParser.cpp in Sources */, - B23EA3E9147F5A43002B8C06 /* MessageFilter.cpp in Sources */, - B23EA3EA147F5A43002B8C06 /* NatPunchthroughClient.cpp in Sources */, - B23EA3EB147F5A43002B8C06 /* NatPunchthroughServer.cpp in Sources */, - B23EA3EC147F5A43002B8C06 /* NatTypeDetectionClient.cpp in Sources */, - B23EA3ED147F5A43002B8C06 /* NatTypeDetectionCommon.cpp in Sources */, - B23EA3EE147F5A43002B8C06 /* NatTypeDetectionServer.cpp in Sources */, - B23EA3EF147F5A43002B8C06 /* NetworkIDManager.cpp in Sources */, - B23EA3F0147F5A43002B8C06 /* NetworkIDObject.cpp in Sources */, - B23EA3F1147F5A43002B8C06 /* PacketConsoleLogger.cpp in Sources */, - B23EA3F2147F5A43002B8C06 /* PacketFileLogger.cpp in Sources */, - B23EA3F3147F5A43002B8C06 /* PacketizedTCP.cpp in Sources */, - B23EA3F4147F5A43002B8C06 /* PacketLogger.cpp in Sources */, - B23EA3F5147F5A43002B8C06 /* PacketOutputWindowLogger.cpp in Sources */, - B23EA3F6147F5A43002B8C06 /* PluginInterface2.cpp in Sources */, - B23EA3F7147F5A43002B8C06 /* Rackspace.cpp in Sources */, - B23EA3F8147F5A43002B8C06 /* RakMemoryOverride.cpp in Sources */, - B23EA3FC147F5A43002B8C06 /* RakNetCommandParser.cpp in Sources */, + B23EA3D8147F5A43002B8C06 /* epoch_time_to_string.cpp in Sources */, + B23EA3D9147F5A43002B8C06 /* file_list.cpp in Sources */, + B23EA3DA147F5A43002B8C06 /* file_list_transfer.cpp in Sources */, + B23EA3DB147F5A43002B8C06 /* file_operations.cpp in Sources */, + B23EA3DC147F5A43002B8C06 /* format_string.cpp in Sources */, + B23EA3DD147F5A43002B8C06 /* fully_connected_mesh2.cpp in Sources */, + B23EA3DE147F5A43002B8C06 /* getche.cpp in Sources */, + B23EA3DF147F5A43002B8C06 /* gets.cpp in Sources */, + B23EA3E0147F5A43002B8C06 /* get_time.cpp in Sources */, + B23EA3E1147F5A43002B8C06 /* get_time_of_day.cpp in Sources */, + B23EA3E2147F5A43002B8C06 /* grid_sectorizer.cpp in Sources */, + B23EA3E3147F5A43002B8C06 /* http_connection.cpp in Sources */, + B23EA3E4147F5A43002B8C06 /* incremental_read_interface.cpp in Sources */, + B23EA3E5147F5A43002B8C06 /* itoa.cpp in Sources */, + B23EA3E6147F5A43002B8C06 /* linux_strings.cpp in Sources */, + B23EA3E7147F5A43002B8C06 /* lockless_types.cpp in Sources */, + B23EA3E8147F5A43002B8C06 /* log_command_parser.cpp in Sources */, + B23EA3E9147F5A43002B8C06 /* message_filter.cpp in Sources */, + B23EA3EA147F5A43002B8C06 /* nat_punchthrough_client.cpp in Sources */, + B23EA3EB147F5A43002B8C06 /* nat_punchthrough_server.cpp in Sources */, + B23EA3EC147F5A43002B8C06 /* nat_type_detection_client.cpp in Sources */, + B23EA3ED147F5A43002B8C06 /* nat_type_detection_common.cpp in Sources */, + B23EA3EE147F5A43002B8C06 /* nat_type_detection_server.cpp in Sources */, + B23EA3EF147F5A43002B8C06 /* network_id_manager.cpp in Sources */, + B23EA3F0147F5A43002B8C06 /* network_id_object.cpp in Sources */, + B23EA3F1147F5A43002B8C06 /* packet_console_logger.cpp in Sources */, + B23EA3F2147F5A43002B8C06 /* packet_file_logger.cpp in Sources */, + B23EA3F3147F5A43002B8C06 /* packetized_tcp.cpp in Sources */, + B23EA3F4147F5A43002B8C06 /* packet_logger.cpp in Sources */, + B23EA3F5147F5A43002B8C06 /* packet_output_window_logger.cpp in Sources */, + B23EA3F6147F5A43002B8C06 /* plugin_interface2.cpp in Sources */, + B23EA3F7147F5A43002B8C06 /* rackspace.cpp in Sources */, + B23EA3F8147F5A43002B8C06 /* memory_override.cpp in Sources */, + B23EA3FC147F5A43002B8C06 /* command_parser.cpp in Sources */, B23EA3FD147F5A43002B8C06 /* RakNetSocket.cpp in Sources */, - B23EA3FE147F5A43002B8C06 /* RakNetStatistics.cpp in Sources */, - B23EA3FF147F5A43002B8C06 /* RakNetTransport2.cpp in Sources */, - B23EA400147F5A43002B8C06 /* RakNetTypes.cpp in Sources */, - B23EA401147F5A43002B8C06 /* RakPeer.cpp in Sources */, - B23EA402147F5A43002B8C06 /* RakSleep.cpp in Sources */, - B23EA403147F5A43002B8C06 /* RakString.cpp in Sources */, - B23EA404147F5A43002B8C06 /* RakThread.cpp in Sources */, - B23EA405147F5A43002B8C06 /* RakWString.cpp in Sources */, - B23EA406147F5A43002B8C06 /* Rand.cpp in Sources */, + B23EA3FE147F5A43002B8C06 /* statistics.cpp in Sources */, + B23EA3FF147F5A43002B8C06 /* transport2.cpp in Sources */, + B23EA400147F5A43002B8C06 /* types.cpp in Sources */, + B23EA401147F5A43002B8C06 /* peer.cpp in Sources */, + B23EA402147F5A43002B8C06 /* sleep.cpp in Sources */, + B23EA403147F5A43002B8C06 /* string.cpp in Sources */, + B23EA404147F5A43002B8C06 /* thread.cpp in Sources */, + B23EA405147F5A43002B8C06 /* wstring.cpp in Sources */, + B23EA406147F5A43002B8C06 /* rand.cpp in Sources */, B23EA407147F5A43002B8C06 /* rdlmalloc.cpp in Sources */, - B23EA408147F5A43002B8C06 /* ReadyEvent.cpp in Sources */, - B23EA409147F5A43002B8C06 /* ReliabilityLayer.cpp in Sources */, - B23EA40A147F5A43002B8C06 /* ReplicaManager3.cpp in Sources */, - B23EA40B147F5A43002B8C06 /* Router2.cpp in Sources */, - B23EA40C147F5A43002B8C06 /* RPC4Plugin.cpp in Sources */, - B23EA40D147F5A43002B8C06 /* SecureHandshake.cpp in Sources */, - B23EA40E147F5A43002B8C06 /* SendToThread.cpp in Sources */, + B23EA408147F5A43002B8C06 /* ready_event.cpp in Sources */, + B23EA409147F5A43002B8C06 /* reliability_layer.cpp in Sources */, + B23EA40A147F5A43002B8C06 /* replica_manager3.cpp in Sources */, + B23EA40B147F5A43002B8C06 /* router2.cpp in Sources */, + B23EA40C147F5A43002B8C06 /* rpc4_plugin.cpp in Sources */, + B23EA40D147F5A43002B8C06 /* secure_handshake.cpp in Sources */, + B23EA40E147F5A43002B8C06 /* send_to_thread.cpp in Sources */, B23EA40F147F5A43002B8C06 /* SHA1.cpp in Sources */, - B23EA410147F5A43002B8C06 /* SignaledEvent.cpp in Sources */, - B23EA411147F5A43002B8C06 /* SimpleMutex.cpp in Sources */, - B23EA412147F5A43002B8C06 /* SocketLayer.cpp in Sources */, - B23EA413147F5A43002B8C06 /* StringCompressor.cpp in Sources */, - B23EA414147F5A43002B8C06 /* StringTable.cpp in Sources */, - B23EA415147F5A43002B8C06 /* SuperFastHash.cpp in Sources */, - B23EA416147F5A43002B8C06 /* TableSerializer.cpp in Sources */, - B23EA417147F5A43002B8C06 /* TCPInterface.cpp in Sources */, - B23EA418147F5A43002B8C06 /* TeamBalancer.cpp in Sources */, - B23EA419147F5A43002B8C06 /* TelnetTransport.cpp in Sources */, - B23EA41A147F5A43002B8C06 /* ThreadsafePacketLogger.cpp in Sources */, - B23EA41B147F5A43002B8C06 /* TwoWayAuthentication.cpp in Sources */, - B23EA41C147F5A43002B8C06 /* UDPForwarder.cpp in Sources */, - B23EA41D147F5A43002B8C06 /* UDPProxyClient.cpp in Sources */, - B23EA41E147F5A43002B8C06 /* UDPProxyCoordinator.cpp in Sources */, - B23EA41F147F5A43002B8C06 /* UDPProxyServer.cpp in Sources */, - B23EA420147F5A43002B8C06 /* VariableDeltaSerializer.cpp in Sources */, - B23EA421147F5A43002B8C06 /* VariableListDeltaTracker.cpp in Sources */, - B23EA422147F5A43002B8C06 /* VariadicSQLParser.cpp in Sources */, - B23EA423147F5A43002B8C06 /* VitaIncludes.cpp in Sources */, - B23EA424147F5A43002B8C06 /* WSAStartupSingleton.cpp in Sources */, + B23EA410147F5A43002B8C06 /* signaled_event.cpp in Sources */, + B23EA411147F5A43002B8C06 /* simple_mutex.cpp in Sources */, + B23EA412147F5A43002B8C06 /* socket_layer.cpp in Sources */, + B23EA413147F5A43002B8C06 /* string_compressor.cpp in Sources */, + B23EA414147F5A43002B8C06 /* string_table.cpp in Sources */, + B23EA415147F5A43002B8C06 /* super_fast_hash.cpp in Sources */, + B23EA416147F5A43002B8C06 /* table_serializer.cpp in Sources */, + B23EA417147F5A43002B8C06 /* tcp_interface.cpp in Sources */, + B23EA418147F5A43002B8C06 /* team_balancer.cpp in Sources */, + B23EA419147F5A43002B8C06 /* telnet_transport.cpp in Sources */, + B23EA41A147F5A43002B8C06 /* threadsafe_packet_logger.cpp in Sources */, + B23EA41B147F5A43002B8C06 /* two_way_authentication.cpp in Sources */, + B23EA41C147F5A43002B8C06 /* udp_forwarder.cpp in Sources */, + B23EA41D147F5A43002B8C06 /* udp_proxy_client.cpp in Sources */, + B23EA41E147F5A43002B8C06 /* udp_proxy_coordinator.cpp in Sources */, + B23EA41F147F5A43002B8C06 /* udp_proxy_server.cpp in Sources */, + B23EA420147F5A43002B8C06 /* variable_delta_serializer.cpp in Sources */, + B23EA421147F5A43002B8C06 /* variable_list_delta_tracker.cpp in Sources */, + B23EA422147F5A43002B8C06 /* variadic_sql_parser.cpp in Sources */, + B23EA424147F5A43002B8C06 /* wsa_startup_singleton.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Samples/iOS/ChatClient/ChatClient/ViewController.h b/Samples/iOS/ChatClient/ChatClient/ViewController.h index e95ff314e..a83e69278 100644 --- a/Samples/iOS/ChatClient/ChatClient/ViewController.h +++ b/Samples/iOS/ChatClient/ChatClient/ViewController.h @@ -15,12 +15,12 @@ #import // RakNet headers -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" #include "mafianet/statistics.h" #include "mafianet/types.h" -#include "mafianet/BitStream.h" -#include "mafianet/PacketLogger.h" +#include "mafianet/bit_stream.h" +#include "mafianet/packet_logger.h" #include #include #include diff --git a/Samples/nacl_sdk/RakNet_NativeClient/HowToSetup.txt b/Samples/nacl_sdk/RakNet_NativeClient/HowToSetup.txt deleted file mode 100644 index 474b37ae0..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/HowToSetup.txt +++ /dev/null @@ -1,36 +0,0 @@ -1. Download the native client SDK and Python if you need it. -https://developers.google.com/native-client/sdk/download -Get pepper_canary, not the recommended versions. -D:\nacl_sdk>naclsdk update pepper_canary - -2. Download chromium -2A. First, get the source tarball as described in "Bootstrap using the tarball" -http://dev.chromium.org/developers/how-tos/get-the-code -2B. Download the depot_tools -http://dev.chromium.org/developers/how-tos/install-depot-tools -2C. After downloading the gclient / depot tools, be sure to start a new command prompt so the addition to your PATH takes effect. -Exectute the section on "Check out the sources" - -3. Copy the private headers from the chromium repo into the SDK repo -mkdir D:\nacl_sdk\pepper_canary\include\ppapi\c\private -mkdir D:\nacl_sdk\pepper_canary\include\ppapi\cpp\private -copy D:\chromiumtrunk\src\ppapi\c\private\*.h D:\nacl_sdk\pepper_canary\include\ppapi\c\private -copy D:\chromiumtrunk\src\ppapi\cpp\private\*.h D:\nacl_sdk\pepper_canary\include\ppapi\cpp\private - -4) Enable the experimental UDP apis in Chrome -go to about:flags and enable "NaCl Socket API" - -5. Install the visual studio update -http://mainroach.blogspot.com/2012/10/official-nacl-vs2010-add-in-available.html -D:\nacl_sdk>naclsdk install vs_addin -D:\nacl_sdk>cd vs_addin -D:\nacl_sdk\vs_addin>install.bat - -Set the enviroment variable NACL_SDK_ROOT to D:\nacl_sdk\pepper_canary -Then see https://developers.google.com/native-client/dev/devguide/devcycle/vs-addin#add-platforms - -6. Build as in make.bat - -7. Run httpd.py - -8. Press F5 to debug. There are these instructions, but I don't believe they are relevant:http://www.chromium.org/nativeclient/how-tos/debugging-documentation/debugging-with-debug-stub-recommended/debugging-nacl-apps-in-visual-studio-with-wingdb-using-debug-stub-experimental \ No newline at end of file diff --git a/Samples/nacl_sdk/RakNet_NativeClient/blob.nmf b/Samples/nacl_sdk/RakNet_NativeClient/blob.nmf deleted file mode 100644 index 2f5a9a851..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/blob.nmf +++ /dev/null @@ -1,32 +0,0 @@ -{ - "program": { - "x86-64": {"url": "lib64/runnable-ld.so"}, - "x86-32": {"url": "lib32/runnable-ld.so"} - }, - "files": { - "libc.so.a9de5678" : { - "x86-64": {"url": "lib64/libc.so.a9de5678"}, - "x86-32": {"url": "lib32/libc.so.a9de5678"} - }, - "libgcc_s.so.1" : { - "x86-64": {"url": "lib64/libgcc_s.so.1"}, - "x86-32": {"url": "lib32/libgcc_s.so.1"} - }, - "libm.so.a9de5678" : { - "x86-64": {"url": "lib64/libm.so.a9de5678"}, - "x86-32": {"url": "lib32/libm.so.a9de5678"} - }, - "libpthread.so.a9de5678" : { - "x86-64": {"url": "lib64/libpthread.so.a9de5678"}, - "x86-32": {"url": "lib32/libpthread.so.a9de5678"} - }, - "libstdc++.so.6" : { - "x86-64": {"url": "lib64/libstdc++.so.6"}, - "x86-32": {"url": "lib32/libstdc++.so.6"} - }, - "main.nexe" : { - "x86-64": {"url": "chatexampleclient_x86_64_Debug.nexe"}, - "x86-32": {"url": "chatexampleclient_x86_32_Debug.nexe"} - } - } -} \ No newline at end of file diff --git a/Samples/nacl_sdk/RakNet_NativeClient/httpd.py b/Samples/nacl_sdk/RakNet_NativeClient/httpd.py deleted file mode 100644 index 8735e490d..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/httpd.py +++ /dev/null @@ -1,305 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import BaseHTTPServer -import imp -import logging -import multiprocessing -import optparse -import os -import SimpleHTTPServer # pylint: disable=W0611 -import socket -import sys -import time -import urlparse - - -SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) -NACL_SDK_ROOT = os.path.dirname(SCRIPT_DIR) - - -# We only run from the examples directory so that not too much is exposed -# via this HTTP server. Everything in the directory is served, so there should -# never be anything potentially sensitive in the serving directory, especially -# if the machine might be a multi-user machine and not all users are trusted. -# We only serve via the loopback interface. -def SanityCheckDirectory(dirname): - abs_serve_dir = os.path.abspath(dirname) - - # Verify we don't serve anywhere above NACL_SDK_ROOT. - if abs_serve_dir[:len(NACL_SDK_ROOT)] == NACL_SDK_ROOT: - return - logging.error('For security, httpd.py should only be run from within the') - logging.error('example directory tree.') - logging.error('Attempting to serve from %s.' % abs_serve_dir) - logging.error('Run with --no_dir_check to bypass this check.') - sys.exit(1) - - -class PluggableHTTPServer(BaseHTTPServer.HTTPServer): - def __init__(self, *args, **kwargs): - BaseHTTPServer.HTTPServer.__init__(self, *args) - self.serve_dir = kwargs.get('serve_dir', '.') - self.test_mode = kwargs.get('test_mode', False) - self.delegate_map = {} - self.running = True - self.result = 0 - - def Shutdown(self, result=0): - self.running = False - self.result = result - - -class PluggableHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): - def _FindDelegateAtPath(self, dirname): - # First check the cache... - logging.debug('Looking for cached delegate in %s...' % dirname) - handler_script = os.path.join(dirname, 'handler.py') - - if dirname in self.server.delegate_map: - result = self.server.delegate_map[dirname] - if result is None: - logging.debug('Found None.') - else: - logging.debug('Found delegate.') - return result - - # Don't have one yet, look for one. - delegate = None - logging.debug('Testing file %s for existence...' % handler_script) - if os.path.exists(handler_script): - logging.debug( - 'File %s exists, looking for HTTPRequestHandlerDelegate.' % - handler_script) - - module = imp.load_source('handler', handler_script) - delegate_class = getattr(module, 'HTTPRequestHandlerDelegate', None) - delegate = delegate_class() - if not delegate: - logging.warn( - 'Unable to find symbol HTTPRequestHandlerDelegate in module %s.' % - handler_script) - - return delegate - - def _FindDelegateForURLRecurse(self, cur_dir, abs_root): - delegate = self._FindDelegateAtPath(cur_dir) - if not delegate: - # Didn't find it, try the parent directory, but stop if this is the server - # root. - if cur_dir != abs_root: - parent_dir = os.path.dirname(cur_dir) - delegate = self._FindDelegateForURLRecurse(parent_dir, abs_root) - - logging.debug('Adding delegate to cache for %s.' % cur_dir) - self.server.delegate_map[cur_dir] = delegate - return delegate - - def _FindDelegateForURL(self, url_path): - path = self.translate_path(url_path) - if os.path.isdir(path): - dirname = path - else: - dirname = os.path.dirname(path) - - abs_serve_dir = os.path.abspath(self.server.serve_dir) - delegate = self._FindDelegateForURLRecurse(dirname, abs_serve_dir) - if not delegate: - logging.info('No handler found for path %s. Using default.' % url_path) - return delegate - - def _SendNothingAndDie(self, result=0): - self.send_response(200, 'OK') - self.send_header('Content-type', 'text/html') - self.send_header('Content-length', '0') - self.end_headers() - self.server.Shutdown(result) - - def send_head(self): - delegate = self._FindDelegateForURL(self.path) - if delegate: - return delegate.send_head(self) - return self.base_send_head() - - def base_send_head(self): - return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self) - - def do_GET(self): - # TODO(binji): pyauto tests use the ?quit=1 method to kill the server. - # Remove this when we kill the pyauto tests. - _, _, _, query, _ = urlparse.urlsplit(self.path) - if query: - params = urlparse.parse_qs(query) - if '1' in params.get('quit', None): - self._SendNothingAndDie() - return - - delegate = self._FindDelegateForURL(self.path) - if delegate: - return delegate.do_GET(self) - return self.base_do_GET() - - def base_do_GET(self): - return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) - - def do_POST(self): - delegate = self._FindDelegateForURL(self.path) - if delegate: - return delegate.do_POST(self) - return self.base_do_POST() - - def base_do_POST(self): - if self.server.test_mode: - if self.path == '/ok': - self._SendNothingAndDie(0) - elif self.path == '/fail': - self._SendNothingAndDie(1) - - -class LocalHTTPServer(object): - """Class to start a local HTTP server as a child process.""" - - def __init__(self, dirname, port, test_mode): - parent_conn, child_conn = multiprocessing.Pipe() - self.process = multiprocessing.Process( - target=_HTTPServerProcess, - args=(child_conn, dirname, port, { - 'serve_dir': dirname, - 'test_mode': test_mode, - })) - self.process.start() - if parent_conn.poll(10): # wait 10 seconds - self.port = parent_conn.recv() - else: - raise Exception('Unable to launch HTTP server.') - - self.conn = parent_conn - - def ServeForever(self): - """Serve until the child HTTP process tells us to stop. - - Returns: - The result from the child (as an errorcode), or 0 if the server was - killed not by the child (by KeyboardInterrupt for example). - """ - child_result = 0 - try: - # Block on this pipe, waiting for a response from the child process. - child_result = self.conn.recv() - except KeyboardInterrupt: - pass - finally: - self.Shutdown() - return child_result - - def ServeUntilSubprocessDies(self, process): - """Serve until the child HTTP process tells us to stop or |subprocess| dies. - - Returns: - The result from the child (as an errorcode), or 0 if |subprocess| died, - or the server was killed some other way (by KeyboardInterrupt for - example). - """ - child_result = 0 - try: - while True: - if process.poll() is not None: - child_result = 0 - break - if self.conn.poll(): - child_result = self.conn.recv() - break - time.sleep(0) - except KeyboardInterrupt: - pass - finally: - self.Shutdown() - return child_result - - def Shutdown(self): - """Send a message to the child HTTP server process and wait for it to - finish.""" - self.conn.send(False) - self.process.join() - - def GetURL(self, rel_url): - """Get the full url for a file on the local HTTP server. - - Args: - rel_url: A URL fragment to convert to a full URL. For example, - GetURL('foobar.baz') -> 'http://localhost:1234/foobar.baz' - """ - return 'http://localhost:%d/%s' % (self.port, rel_url) - - -def _HTTPServerProcess(conn, dirname, port, server_kwargs): - """Run a local httpserver with the given port or an ephemeral port. - - This function assumes it is run as a child process using multiprocessing. - - Args: - conn: A connection to the parent process. The child process sends - the local port, and waits for a message from the parent to - stop serving. It also sends a "result" back to the parent -- this can - be used to allow a client-side test to notify the server of results. - dirname: The directory to serve. All files are accessible through - http://localhost:/path/to/filename. - port: The port to serve on. If 0, an ephemeral port will be chosen. - server_kwargs: A dict that will be passed as kwargs to the server. - """ - try: - os.chdir(dirname) - httpd = PluggableHTTPServer(('', port), PluggableHTTPRequestHandler, - **server_kwargs) - except socket.error as e: - sys.stderr.write('Error creating HTTPServer: %s\n' % e) - sys.exit(1) - - try: - conn.send(httpd.server_address[1]) # the chosen port number - httpd.timeout = 0.5 # seconds - while httpd.running: - # Flush output for MSVS Add-In. - sys.stdout.flush() - sys.stderr.flush() - httpd.handle_request() - if conn.poll(): - httpd.running = conn.recv() - except KeyboardInterrupt: - pass - finally: - conn.send(httpd.result) - conn.close() - - -def main(args): - parser = optparse.OptionParser() - parser.add_option('-C', '--serve-dir', - help='Serve files out of this directory.', - dest='serve_dir', default=os.path.abspath('.')) - parser.add_option('-p', '--port', - help='Run server on this port.', - dest='port', default=5103) - parser.add_option('--no_dir_check', - help='No check to ensure serving from safe directory.', - dest='do_safe_check', action='store_false', default=True) - parser.add_option('--test-mode', - help='Listen for posts to /ok or /fail and shut down the server with ' - ' errorcodes 0 and 1 respectively.', - dest='test_mode', action='store_true') - options, args = parser.parse_args(args) - if options.do_safe_check: - SanityCheckDirectory(options.serve_dir) - - server = LocalHTTPServer(options.serve_dir, int(options.port), - options.test_mode) - - # Serve until the client tells us to stop. When it does, it will give us an - # errorcode. - print 'Serving %s on %s...' % (options.serve_dir, server.GetURL('')) - return server.ServeForever() - -if __name__ == '__main__': - sys.exit(main(sys.argv[1:])) diff --git a/Samples/nacl_sdk/RakNet_NativeClient/icon_128.png b/Samples/nacl_sdk/RakNet_NativeClient/icon_128.png deleted file mode 100644 index 3171a7392..000000000 Binary files a/Samples/nacl_sdk/RakNet_NativeClient/icon_128.png and /dev/null differ diff --git a/Samples/nacl_sdk/RakNet_NativeClient/icon_16.png b/Samples/nacl_sdk/RakNet_NativeClient/icon_16.png deleted file mode 100644 index 7cb038275..000000000 Binary files a/Samples/nacl_sdk/RakNet_NativeClient/icon_16.png and /dev/null differ diff --git a/Samples/nacl_sdk/RakNet_NativeClient/icon_32.png b/Samples/nacl_sdk/RakNet_NativeClient/icon_32.png deleted file mode 100644 index 94110c8c6..000000000 Binary files a/Samples/nacl_sdk/RakNet_NativeClient/icon_32.png and /dev/null differ diff --git a/Samples/nacl_sdk/RakNet_NativeClient/index.htm b/Samples/nacl_sdk/RakNet_NativeClient/index.htm deleted file mode 100644 index 8c964c800..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/index.htm +++ /dev/null @@ -1,33 +0,0 @@ - - - - Hello, World! - - - - -

Native Client UDP Example

- -
- -
- -
- - - - - - -
- -

Status

-
NO-STATUS
- - - - diff --git a/Samples/nacl_sdk/RakNet_NativeClient/js1.js b/Samples/nacl_sdk/RakNet_NativeClient/js1.js deleted file mode 100644 index ae2878620..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/js1.js +++ /dev/null @@ -1,65 +0,0 @@ - -// Check for the various File API support. -if (window.File && window.FileReader && window.FileList && window.Blob) { - // Great success! All the File APIs are supported. -} else { - alert('The File APIs are not fully supported in this browser.'); -} - -helloWorldModule = null; // Global application object. -statusText = 'NO-STATUS'; - -// Indicate success when the NaCl module has loaded. -function moduleDidLoad() { - helloWorldModule = document.getElementById('udp_example'); - updateStatus('moduleDidLoad SUCCESS'); -} - -// Handle a message coming from the NaCl module. -function handleMessage(message_event) -{ - console.log("Got handleMessage"); - console.log(message_event.data); -} - -// If the page loads before the Native Client module loads, then set the -// status message indicating that the module is still loading. Otherwise, -// do not change the status message. -function pageDidLoad() { -if (helloWorldModule == null) { - updateStatus('LOADING...'); -} else { - // It's possible that the Native Client module onload event fired - // before the page's onload event. In this case, the status message - // will reflect 'SUCCESS', but won't be displayed. This call will - // display the current message. - updateStatus(); -} -} - -// Set the global status message. If the element with id 'statusField' -// exists, then set its HTML to the status message as well. -// opt_message The message test. If this is null or undefined, then -// attempt to set the element with id 'statusField' to the value of -// |statusText|. -function updateStatus(opt_message) { - if (opt_message) - statusText = opt_message; - var statusField = document.getElementById('statusField'); - if (statusField) { - statusField.innerHTML = statusText; - } -} - -// Indicate success when the NaCl module has loaded. -function clikedConnect() { - helloWorldModule = document.getElementById('udp_example'); - if (helloWorldModule == null) { - updateStatus('helloWorldModule == null'); - } - else - { - updateStatus('Calling postMessage'); - helloWorldModule.postMessage('connect'); - } -} diff --git a/Samples/nacl_sdk/RakNet_NativeClient/js2.js b/Samples/nacl_sdk/RakNet_NativeClient/js2.js deleted file mode 100644 index ba749c9ef..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/js2.js +++ /dev/null @@ -1,12 +0,0 @@ - -var listener = document.getElementById('listener'); -listener.addEventListener('load', moduleDidLoad, true); -listener.addEventListener('message', handleMessage, true); - -var connectButton = document.getElementById('connectButton'); -connectButton.addEventListener('click', clikedConnect, true); - -// Add event listeners once the DOM has fully loaded by listening for the -// `DOMContentLoaded` event on the document, and adding your listeners to -// specific elements when it triggers. -document.body.addEventListener('load', pageDidLoad ); \ No newline at end of file diff --git a/Samples/nacl_sdk/RakNet_NativeClient/main_ppapi.cpp b/Samples/nacl_sdk/RakNet_NativeClient/main_ppapi.cpp deleted file mode 100644 index 914a0139e..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/main_ppapi.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2014, Oculus VR, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * RakNet License.txt file in the licenses directory of this source tree. An additional grant - * of patent rights can be found in the RakNet Patents.txt file in the same directory. - * - * - * Modified work: Copyright (c) 2017, SLikeSoft UG (haftungsbeschränkt) - * - * This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style - * license found in the license.txt file in the root directory of this source tree. - */ - -#include -#include -#include "ppapi/cpp/instance.h" -#include "ppapi/cpp/module.h" -#include "ppapi/cpp/var.h" - -// KMJ -#include "ppapi/c/private/ppb_udp_socket_private.h" -#include "mafianet/peerinterface.h" -#include "mafianet/types.h" -#include "mafianet/sleep.h" -using namespace MafiaNet; - -/// The Instance class. One of these exists for each instance of your NaCl -/// module on the web page. The browser will ask the Module object to create -/// a new Instance for each occurence of the tag that has these -/// attributes: -/// type="application/x-nacl" -/// src="hello_tutorial.nmf" -/// To communicate with the browser, you must override HandleMessage() for -/// receiving messages from the browser, and use PostMessage() to send messages -/// back to the browser. Note that this interface is asynchronous. -class ConnectivityTestInstance : public pp::Instance { - RakPeerInterface *rakPeer; - public: - /// The constructor creates the plugin-side instance. - /// @param[in] instance the handle to the browser-side plugin instance. - explicit ConnectivityTestInstance(PP_Instance instance) : pp::Instance(instance) - { - // PostMessage(pp::Var("ConnectivityTestInstance constructor")); - /* - MafiaNet::ConnectionAttemptResult car = rakPeer->Connect("127.0.0.1", 1234, "Rumpelstiltskin", (int) strlen("Rumpelstiltskin")); - RakAssert(car==MafiaNet::CONNECTION_ATTEMPT_STARTED); - RakSleep(100); - MafiaNet::Packet* p; - for (p=rakPeer->Receive(); p; rakPeer->DeallocatePacket(p), p=rakPeer->Receive()) - {} - */ - } - virtual ~ConnectivityTestInstance() {} - - /// Handler for messages coming in from the browser via postMessage(). The - /// @a var_message can contain anything: a JSON string; a string that encodes - /// method names and arguments; etc. For example, you could use - /// JSON.stringify in the browser to create a message that contains a method - /// name and some parameters, something like this: - /// var json_message = JSON.stringify({ "myMethod" : "3.14159" }); - /// nacl_module.postMessage(json_message); - /// On receipt of this message in @a var_message, you could parse the JSON to - /// retrieve the method name, match it to a function call, and then call it - /// with the parameter. - /// @param[in] var_message The message posted by the browser. - virtual void HandleMessage(const pp::Var& var_message) { - /* - if (!var_message.is_string()) - return; - std::string message = var_message.AsString(); - pp::Var var_reply; - if (message == kHelloString) { - var_reply = pp::Var(kReplyString); - PostMessage(var_reply); - } - */ - // Just some do nothing code so I can set a breakpoint; - rakPeer=0; - - /* - rakPeer=MafiaNet::RakPeerInterface::GetInstance(); - MafiaNet::SocketDescriptor socketDescriptor(0,0); - socketDescriptor.socketFamily=AF_INET; - StartupResult sr = rakPeer->Startup(8,&socketDescriptor, 1); - if (sr==MafiaNet::RAKNET_STARTED) - { - PostMessage(pp::Var("RAKNET_STARTED")); - } - else - { - PostMessage(pp::Var("RakNet did not start")); - } - - MafiaNet::ConnectionAttemptResult car = rakPeer->Connect("127.0.0.1", 1234, "Rumpelstiltskin", (int) strlen("Rumpelstiltskin")); - RakAssert(car==MafiaNet::CONNECTION_ATTEMPT_STARTED); - RakSleep(0); - MafiaNet::Packet* p; - for (p=rakPeer->Receive(); p; rakPeer->DeallocatePacket(p), p=rakPeer->Receive()) - {} - */ - } -}; - -/// The Module class. The browser calls the CreateInstance() method to create -/// an instance of your NaCl module on the web page. The browser creates a new -/// instance for each tag with type="application/x-nacl". -class ConnectivityTestModule : public pp::Module { - public: - ConnectivityTestModule() : pp::Module() {} - virtual ~ConnectivityTestModule() {} - - /// Create and return a ConnectivityTestInstance object. - /// @param[in] instance The browser-side instance. - /// @return the plugin-side instance. - virtual pp::Instance* CreateInstance(PP_Instance instance) { - return new ConnectivityTestInstance(instance); - } -}; - -namespace pp { -/// Factory function called by the browser when the module is first loaded. -/// The browser keeps a singleton of this module. It calls the -/// CreateInstance() method on the object you return to make instances. There -/// is one instance per tag on the page. This is the main binding -/// point for your NaCl module with the browser. -Module* CreateModule() { - return new ConnectivityTestModule(); -} -} // namespace pp diff --git a/Samples/nacl_sdk/RakNet_NativeClient/manifest.json b/Samples/nacl_sdk/RakNet_NativeClient/manifest.json deleted file mode 100644 index fc6fc67b7..000000000 --- a/Samples/nacl_sdk/RakNet_NativeClient/manifest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "NaCl Chat Example Client", - "version": "0.5", - "manifest_version" : 2, - - "description": "NaCl Chat Example Client", - "icons": { - "16": "icon_16.png", - "32": "icon_32.png", - "128": "icon_128.png" - }, - - "app": { - "launch": { - "local_path": "index.htm" - } - } - -} \ No newline at end of file diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 0648a8965..5ddd97d52 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -9,117 +9,120 @@ # Source files (explicit list, no GLOB) set(MAFIANET_SOURCES - src/_FindFirst.cpp - src/Base64Encoder.cpp - src/BitStream.cpp - src/CCRakNetSlidingWindow.cpp - src/CCRakNetUDT.cpp - src/CheckSum.cpp - src/CloudClient.cpp - src/CloudCommon.cpp - src/CloudServer.cpp - src/CommandParserInterface.cpp - src/ConnectionGraph2.cpp - src/ConsoleServer.cpp - src/DataCompressor.cpp - src/DirectoryDeltaTransfer.cpp - src/DR_SHA1.cpp - src/DS_BytePool.cpp - src/DS_ByteQueue.cpp - src/DS_HuffmanEncodingTree.cpp - src/DS_Table.cpp - src/DynDNS.cpp - src/EmailSender.cpp - src/EpochTimeToString.cpp - src/FileList.cpp - src/FileListTransfer.cpp - src/FileOperations.cpp - src/FormatString.cpp - src/FullyConnectedMesh2.cpp - src/Getche.cpp - src/Gets.cpp - src/GetTime.cpp - src/gettimeofday.cpp - src/GridSectorizer.cpp + src/find_first.cpp + src/base64_encoder.cpp + src/bit_stream.cpp + src/cc_sliding_window.cpp + src/cc_udt.cpp + src/check_sum.cpp + src/cloud_client.cpp + src/cloud_common.cpp + src/cloud_server.cpp + src/connection_graph2.cpp + src/data_compressor.cpp + src/directory_delta_transfer.cpp + src/dr_sha1.cpp + src/ds_byte_pool.cpp + src/ds_byte_queue.cpp + src/ds_huffman_encoding_tree.cpp + src/ds_table.cpp + src/dyn_dns.cpp + src/epoch_time_to_string.cpp + src/file_list.cpp + src/file_list_transfer.cpp + src/file_operations.cpp + src/format_string.cpp + src/fully_connected_mesh2.cpp + src/getche.cpp + src/gets.cpp + src/get_time.cpp + src/get_time_of_day.cpp + src/grid_sectorizer.cpp src/guid_util.cpp - src/HTTPConnection.cpp - src/HTTPConnection2.cpp - src/IncrementalReadInterface.cpp - src/Itoa.cpp + src/incremental_read_interface.cpp + src/itoa.cpp src/linux_adapter.cpp - src/LinuxStrings.cpp - src/LocklessTypes.cpp - src/LogCommandParser.cpp - src/MessageFilter.cpp - src/MmsgBatch.cpp - src/MtuBlackHole.cpp - src/NatPunchthroughClient.cpp - src/NatPunchthroughServer.cpp - src/NatTypeDetectionClient.cpp - src/NatTypeDetectionCommon.cpp - src/NatTypeDetectionServer.cpp - src/NetworkIDManager.cpp - src/NetworkIDObject.cpp + src/linux_strings.cpp + src/lockless_types.cpp + src/message_filter.cpp + src/mmsg_batch.cpp + src/mtu_black_hole.cpp + src/nat_punchthrough_client.cpp + src/nat_punchthrough_server.cpp + src/nat_type_detection_client.cpp + src/nat_type_detection_common.cpp + src/nat_type_detection_server.cpp + src/network_id_manager.cpp + src/network_id_object.cpp src/osx_adapter.cpp - src/PacketConsoleLogger.cpp - src/PacketFileLogger.cpp - src/PacketizedTCP.cpp - src/PacketLogger.cpp - src/PacketOutputWindowLogger.cpp - src/PeerHandle.cpp - src/PluginInterface2.cpp - src/PointGridSectorizer.cpp - src/PS4Includes.cpp - src/Rackspace.cpp - src/RakMemoryOverride.cpp - src/RakNetCommandParser.cpp - src/RakNetSocket.cpp - src/RakNetSocket2.cpp - src/RakNetSocket2_Berkley.cpp - src/RakNetSocket2_Windows_Linux.cpp - src/RakNetSocket2_Windows_Linux_360.cpp - src/RakNetStatistics.cpp - src/RakNetTransport2.cpp - src/RakNetTypes.cpp - src/RakPeer.cpp - src/RakSleep.cpp - src/RakString.cpp - src/RakThread.cpp - src/RakVoice.cpp - src/RakWString.cpp - src/Rand.cpp - src/RandSync.cpp - src/ReadyEvent.cpp - src/RelayPlugin.cpp - src/ReliabilityLayer.cpp - src/ReplicaManager3.cpp - src/Router2.cpp - src/RPC4Plugin.cpp - src/SecureHandshake.cpp - src/SendToThread.cpp - src/SignaledEvent.cpp - src/SimpleMutex.cpp - src/SocketLayer.cpp - src/StatisticsHistory.cpp - src/StringCompressor.cpp - src/StringTable.cpp - src/SuperFastHash.cpp - src/TableSerializer.cpp - src/TCPInterface.cpp - src/TeamBalancer.cpp - src/TeamManager.cpp - src/TelnetTransport.cpp - src/ThreadsafePacketLogger.cpp - src/TwoWayAuthentication.cpp - src/UDPForwarder.cpp - src/UDPProxyClient.cpp - src/UDPProxyCoordinator.cpp - src/UDPProxyServer.cpp - src/VariableDeltaSerializer.cpp - src/VariableListDeltaTracker.cpp - src/VariadicSQLParser.cpp - src/VitaIncludes.cpp - src/WSAStartupSingleton.cpp + src/packet_file_logger.cpp + src/packetized_tcp.cpp + src/packet_logger.cpp + src/packet_output_window_logger.cpp + src/peer_handle.cpp + src/plugin_interface2.cpp + src/point_grid_sectorizer.cpp + src/rackspace.cpp + src/memory_override.cpp + src/socket2.cpp + src/socket2_berkley.cpp + src/socket2_windows_linux.cpp + src/statistics.cpp + src/types.cpp + src/peer.cpp + src/sleep.cpp + src/string.cpp + src/thread.cpp + src/voice.cpp + src/wstring.cpp + src/rand.cpp + src/rand_sync.cpp + src/ready_event.cpp + src/relay_plugin.cpp + src/reliability_layer.cpp + src/replica_manager3.cpp + src/router2.cpp + src/rpc4_plugin.cpp + src/secure_handshake.cpp + src/send_to_thread.cpp + src/signaled_event.cpp + src/simple_mutex.cpp + src/socket_layer.cpp + src/statistics_history.cpp + src/string_compressor.cpp + src/string_table.cpp + src/super_fast_hash.cpp + src/table_serializer.cpp + src/tcp_interface.cpp + src/team_balancer.cpp + src/team_manager.cpp + src/threadsafe_packet_logger.cpp + src/two_way_authentication.cpp + src/udp_forwarder.cpp + src/udp_proxy_client.cpp + src/udp_proxy_coordinator.cpp + src/udp_proxy_server.cpp + src/variable_delta_serializer.cpp + src/variable_list_delta_tracker.cpp + src/variadic_sql_parser.cpp + src/wsa_startup_singleton.cpp +) + +# Extras: utilities that are not game networking (SMTP, HTTP client, telnet and +# console command transports, console packet logger). Built into the separate +# MafiaNetExtras target when MAFIANET_BUILD_EXTRAS is ON; their headers stay in +# include/mafianet/ so include paths are unchanged. See issue #50, stage 2. +set(MAFIANET_EXTRAS_SOURCES + src/command_parser_interface.cpp + src/console_server.cpp + src/email_sender.cpp + src/http_connection.cpp + src/http_connection2.cpp + src/log_command_parser.cpp + src/packet_console_logger.cpp + src/command_parser.cpp + src/transport2.cpp + src/telnet_transport.cpp ) set(MAFIANET_CRYPTO_SOURCES @@ -130,171 +133,166 @@ set(MAFIANET_CRYPTO_SOURCES ) set(MAFIANET_HEADERS - include/mafianet/_FindFirst.h + include/mafianet/find_first.h include/mafianet/alloca.h include/mafianet/assert.h - include/mafianet/AutopatcherPatchContext.h - include/mafianet/AutopatcherRepositoryInterface.h - include/mafianet/Base64Encoder.h - include/mafianet/BitStream.h - include/mafianet/CCRakNetSlidingWindow.h - include/mafianet/CCRakNetUDT.h - include/mafianet/CheckSum.h - include/mafianet/CloudClient.h - include/mafianet/CloudCommon.h - include/mafianet/CloudServer.h - include/mafianet/commandparser.h - include/mafianet/CommandParserInterface.h - include/mafianet/ConnectionGraph2.h - include/mafianet/ConsoleServer.h - include/mafianet/DataCompressor.h - include/mafianet/defineoverrides.h + include/mafianet/autopatcher_patch_context.h + include/mafianet/autopatcher_repository_interface.h + include/mafianet/base64_encoder.h + include/mafianet/bit_stream.h + include/mafianet/cc_sliding_window.h + include/mafianet/cc_udt.h + include/mafianet/check_sum.h + include/mafianet/cloud_client.h + include/mafianet/cloud_common.h + include/mafianet/cloud_server.h + include/mafianet/command_parser.h + include/mafianet/command_parser_interface.h + include/mafianet/connection_graph2.h + include/mafianet/console_server.h + include/mafianet/data_compressor.h + include/mafianet/define_overrides.h include/mafianet/defines.h - include/mafianet/DirectoryDeltaTransfer.h - include/mafianet/DR_SHA1.h - include/mafianet/DS_BinarySearchTree.h - include/mafianet/DS_BPlusTree.h - include/mafianet/DS_BytePool.h - include/mafianet/DS_ByteQueue.h - include/mafianet/DS_Hash.h - include/mafianet/DS_Heap.h - include/mafianet/DS_HuffmanEncodingTree.h - include/mafianet/DS_HuffmanEncodingTreeFactory.h - include/mafianet/DS_HuffmanEncodingTreeNode.h - include/mafianet/DS_LinkedList.h - include/mafianet/DS_List.h - include/mafianet/DS_Map.h - include/mafianet/DS_MemoryPool.h - include/mafianet/DS_Multilist.h - include/mafianet/DS_OrderedChannelHeap.h - include/mafianet/DS_OrderedList.h - include/mafianet/DS_Queue.h - include/mafianet/DS_QueueLinkedList.h - include/mafianet/DS_RangeList.h - include/mafianet/DS_Table.h - include/mafianet/DS_ThreadsafeAllocatingQueue.h - include/mafianet/DS_Tree.h - include/mafianet/DS_WeightedGraph.h - include/mafianet/DynDNS.h - include/mafianet/EmailSender.h - include/mafianet/EmptyHeader.h - include/mafianet/EpochTimeToString.h - include/mafianet/Export.h - include/mafianet/FileList.h - include/mafianet/FileListNodeContext.h - include/mafianet/FileListTransfer.h - include/mafianet/FileListTransferCBInterface.h - include/mafianet/FileOperations.h - include/mafianet/FormatString.h - include/mafianet/FullyConnectedMesh2.h - include/mafianet/Getche.h - include/mafianet/Gets.h - include/mafianet/GetTime.h - include/mafianet/gettimeofday.h - include/mafianet/GridSectorizer.h + include/mafianet/directory_delta_transfer.h + include/mafianet/dr_sha1.h + include/mafianet/ds_binary_search_tree.h + include/mafianet/ds_bplus_tree.h + include/mafianet/ds_byte_pool.h + include/mafianet/ds_byte_queue.h + include/mafianet/ds_hash.h + include/mafianet/ds_heap.h + include/mafianet/ds_huffman_encoding_tree.h + include/mafianet/ds_huffman_encoding_tree_factory.h + include/mafianet/ds_huffman_encoding_tree_node.h + include/mafianet/ds_linked_list.h + include/mafianet/ds_list.h + include/mafianet/ds_map.h + include/mafianet/ds_memory_pool.h + include/mafianet/ds_multilist.h + include/mafianet/ds_ordered_channel_heap.h + include/mafianet/ds_ordered_list.h + include/mafianet/ds_queue.h + include/mafianet/ds_queue_linked_list.h + include/mafianet/ds_range_list.h + include/mafianet/ds_table.h + include/mafianet/ds_threadsafe_allocating_queue.h + include/mafianet/ds_tree.h + include/mafianet/ds_weighted_graph.h + include/mafianet/dyn_dns.h + include/mafianet/email_sender.h + include/mafianet/empty_header.h + include/mafianet/epoch_time_to_string.h + include/mafianet/export.h + include/mafianet/file_list.h + include/mafianet/file_list_node_context.h + include/mafianet/file_list_transfer.h + include/mafianet/file_list_transfer_cb_interface.h + include/mafianet/file_operations.h + include/mafianet/format_string.h + include/mafianet/fully_connected_mesh2.h + include/mafianet/getche.h + include/mafianet/gets.h + include/mafianet/get_time.h + include/mafianet/get_time_of_day.h + include/mafianet/grid_sectorizer.h include/mafianet/guid_util.h - include/mafianet/HTTPConnection.h - include/mafianet/HTTPConnection2.h - include/mafianet/IncrementalReadInterface.h - include/mafianet/InternalPacket.h - include/mafianet/Itoa.h - include/mafianet/Kbhit.h + include/mafianet/http_connection.h + include/mafianet/http_connection2.h + include/mafianet/incremental_read_interface.h + include/mafianet/internal_packet.h + include/mafianet/itoa.h + include/mafianet/kbhit.h include/mafianet/linux_adapter.h - include/mafianet/LinuxStrings.h - include/mafianet/LocklessTypes.h - include/mafianet/LogCommandParser.h - include/mafianet/memoryoverride.h - include/mafianet/MessageFilter.h - include/mafianet/MessageIdentifiers.h - include/mafianet/MmsgBatch.h - include/mafianet/MtuBlackHole.h - include/mafianet/MTUSize.h - include/mafianet/NativeFeatureIncludes.h - include/mafianet/NativeFeatureIncludesOverrides.h - include/mafianet/NativeTypes.h - include/mafianet/NatPunchthroughClient.h - include/mafianet/NatPunchthroughServer.h - include/mafianet/NatTypeDetectionClient.h - include/mafianet/NatTypeDetectionCommon.h - include/mafianet/NatTypeDetectionServer.h - include/mafianet/NetworkIDManager.h - include/mafianet/NetworkIDObject.h + include/mafianet/linux_strings.h + include/mafianet/lockless_types.h + include/mafianet/log_command_parser.h + include/mafianet/memory_override.h + include/mafianet/message_filter.h + include/mafianet/message_identifiers.h + include/mafianet/mmsg_batch.h + include/mafianet/mtu_black_hole.h + include/mafianet/mtu_size.h + include/mafianet/native_feature_includes.h + include/mafianet/native_feature_includes_overrides.h + include/mafianet/native_types.h + include/mafianet/nat_punchthrough_client.h + include/mafianet/nat_punchthrough_server.h + include/mafianet/nat_type_detection_client.h + include/mafianet/nat_type_detection_common.h + include/mafianet/nat_type_detection_server.h + include/mafianet/network_id_manager.h + include/mafianet/network_id_object.h include/mafianet/osx_adapter.h - include/mafianet/PacketConsoleLogger.h - include/mafianet/PacketFileLogger.h - include/mafianet/PacketizedTCP.h - include/mafianet/PacketLogger.h - include/mafianet/PacketOutputWindowLogger.h - include/mafianet/PacketPool.h - include/mafianet/PacketPriority.h - include/mafianet/PeerHandle.h + include/mafianet/packet_console_logger.h + include/mafianet/packet_file_logger.h + include/mafianet/packetized_tcp.h + include/mafianet/packet_logger.h + include/mafianet/packet_output_window_logger.h + include/mafianet/packet_pool.h + include/mafianet/packet_priority.h + include/mafianet/peer_handle.h include/mafianet/peer.h - include/mafianet/peerinterface.h - include/mafianet/PluginInterface2.h - include/mafianet/PointGridSectorizer.h - include/mafianet/PS3Includes.h - include/mafianet/PS4Includes.h - include/mafianet/Rackspace.h - include/mafianet/RakVoice.h - include/mafianet/Rand.h - include/mafianet/RandSync.h - include/mafianet/ReadyEvent.h - include/mafianet/RefCountedObj.h - include/mafianet/RelayPlugin.h - include/mafianet/ReliabilityLayer.h - include/mafianet/ReplicaEnums.h - include/mafianet/ReplicaManager3.h - include/mafianet/Router2.h - include/mafianet/RPC4Plugin.h - include/mafianet/SecureHandshake.h - include/mafianet/SendToThread.h - include/mafianet/SignaledEvent.h - include/mafianet/SimpleMutex.h - include/mafianet/SimpleTCPServer.h - include/mafianet/SingleProducerConsumer.h + include/mafianet/peer_interface.h + include/mafianet/plugin_interface2.h + include/mafianet/point_grid_sectorizer.h + include/mafianet/rackspace.h + include/mafianet/voice.h + include/mafianet/rand.h + include/mafianet/rand_sync.h + include/mafianet/ready_event.h + include/mafianet/ref_counted_obj.h + include/mafianet/relay_plugin.h + include/mafianet/reliability_layer.h + include/mafianet/replica_enums.h + include/mafianet/replica_manager3.h + include/mafianet/router2.h + include/mafianet/rpc4_plugin.h + include/mafianet/secure_handshake.h + include/mafianet/send_to_thread.h + include/mafianet/signaled_event.h + include/mafianet/simple_mutex.h + include/mafianet/simple_tcp_server.h + include/mafianet/single_producer_consumer.h include/mafianet/sleep.h include/mafianet/mafianet.h - include/mafianet/smartptr.h - include/mafianet/socket.h + include/mafianet/smart_ptr.h include/mafianet/socket2.h - include/mafianet/SocketDefines.h - include/mafianet/SocketIncludes.h - include/mafianet/SocketLayer.h + include/mafianet/socket_defines.h + include/mafianet/socket_includes.h + include/mafianet/socket_layer.h include/mafianet/statistics.h - include/mafianet/StatisticsHistory.h + include/mafianet/statistics_history.h include/mafianet/string.h - include/mafianet/StringCompressor.h - include/mafianet/StringTable.h - include/mafianet/SuperFastHash.h - include/mafianet/TableSerializer.h - include/mafianet/TCPInterface.h - include/mafianet/TeamBalancer.h - include/mafianet/TeamManager.h - include/mafianet/TelnetTransport.h + include/mafianet/string_compressor.h + include/mafianet/string_table.h + include/mafianet/super_fast_hash.h + include/mafianet/table_serializer.h + include/mafianet/tcp_interface.h + include/mafianet/team_balancer.h + include/mafianet/team_manager.h + include/mafianet/telnet_transport.h include/mafianet/thread.h - include/mafianet/ThreadPool.h - include/mafianet/ThreadsafePacketLogger.h + include/mafianet/thread_pool.h + include/mafianet/threadsafe_packet_logger.h include/mafianet/time.h include/mafianet/transport2.h - include/mafianet/TransportInterface.h - include/mafianet/TwoWayAuthentication.h + include/mafianet/transport_interface.h + include/mafianet/two_way_authentication.h include/mafianet/types.h - include/mafianet/UDPForwarder.h - include/mafianet/UDPProxyClient.h - include/mafianet/UDPProxyCommon.h - include/mafianet/UDPProxyCoordinator.h - include/mafianet/UDPProxyServer.h - include/mafianet/VariableDeltaSerializer.h - include/mafianet/VariableListDeltaTracker.h - include/mafianet/VariadicSQLParser.h + include/mafianet/udp_forwarder.h + include/mafianet/udp_proxy_client.h + include/mafianet/udp_proxy_common.h + include/mafianet/udp_proxy_coordinator.h + include/mafianet/udp_proxy_server.h + include/mafianet/variable_delta_serializer.h + include/mafianet/variable_list_delta_tracker.h + include/mafianet/variadic_sql_parser.h include/mafianet/version.h - include/mafianet/VirtualWorld.h - include/mafianet/VirtualWorldReplica3.h - include/mafianet/VitaIncludes.h - include/mafianet/WindowsIncludes.h - include/mafianet/WSAStartupSingleton.h + include/mafianet/virtual_world.h + include/mafianet/virtual_world_replica3.h + include/mafianet/windows_includes.h + include/mafianet/wsa_startup_singleton.h include/mafianet/wstring.h - include/mafianet/XBox360Includes.h ) set(MAFIANET_CRYPTO_HEADERS @@ -316,6 +314,74 @@ set(MAFIANET_ALL_HEADERS ${MAFIANET_CRYPTO_HEADERS} ) +# Optional plugins, one per _RAKNET_SUPPORT_ flag in native_feature_includes.h. +# Anything not in this list (BitStream, RakPeer, the reliability layer, the +# socket layer, RakVoice, ...) is the core and always builds. Keep this list in +# sync with the header when adding or removing a plugin. +set(MAFIANET_OPTIONAL_FEATURES + CloudClient + CloudServer + ConnectionGraph2 + ConsoleServer + DirectoryDeltaTransfer + DynDNS + EmailSender + FileListTransfer + FullyConnectedMesh2 + HTTPConnection + HTTPConnection2 + LogCommandParser + MessageFilter + NatPunchthroughClient + NatPunchthroughServer + NatTypeDetectionClient + NatTypeDetectionServer + PacketLogger + PacketizedTCP + Rackspace + RakNetCommandParser + RakNetTransport + ReadyEvent + RelayPlugin + ReplicaManager3 + Router2 + RPC4Plugin + StatisticsHistory + TCPInterface + TeamBalancer + TeamManager + TelnetTransport + TwoWayAuthentication + UDPForwarder + UDPProxyClient + UDPProxyCoordinator + UDPProxyServer +) + +# Resolve MAFIANET_MINIMAL / MAFIANET_DISABLED_FEATURES (set at the top level) +# into the list of _RAKNET_SUPPORT_=0 definitions applied to every +# library target. Unknown names are a configure error rather than a silent +# no-op, since a typo here would otherwise ship the plugin it meant to drop. +set(MAFIANET_FEATURE_DEFINITIONS "") +if(MAFIANET_MINIMAL) + set(_mafianet_disabled ${MAFIANET_OPTIONAL_FEATURES}) +else() + set(_mafianet_disabled ${MAFIANET_DISABLED_FEATURES}) +endif() +foreach(_feature IN LISTS _mafianet_disabled) + if(NOT _feature IN_LIST MAFIANET_OPTIONAL_FEATURES) + message(FATAL_ERROR + "MAFIANET_DISABLED_FEATURES: '${_feature}' is not an optional plugin. " + "Known names: ${MAFIANET_OPTIONAL_FEATURES}") + endif() + list(APPEND MAFIANET_FEATURE_DEFINITIONS "_RAKNET_SUPPORT_${_feature}=0") +endforeach() +if(MAFIANET_FEATURE_DEFINITIONS) + list(LENGTH _mafianet_disabled _mafianet_disabled_count) + message(STATUS "MafiaNet: compiling out ${_mafianet_disabled_count} optional plugin(s): ${_mafianet_disabled}") +endif() +unset(_mafianet_disabled) + # Common target setup function function(mafianet_configure_target target_name) target_include_directories(${target_name} @@ -345,6 +411,10 @@ function(mafianet_configure_target target_name) PRIVATE $<$:_DEBUG> $<$:NDEBUG> + PUBLIC + # Plugins compiled out of this build. PUBLIC so a consumer's view of + # native_feature_includes.h matches the library it links against. + ${MAFIANET_FEATURE_DEFINITIONS} ) set_target_properties(${target_name} PROPERTIES @@ -400,6 +470,29 @@ if(MAFIANET_BUILD_SHARED) endif() endif() +# Extras library (off by default). Links the core library PUBLIC so consumers +# get the core, its include directories and its feature definitions through +# this one target. +if(MAFIANET_BUILD_EXTRAS) + add_library(MafiaNetExtras STATIC ${MAFIANET_EXTRAS_SOURCES}) + add_library(MafiaNet::MafiaNetExtras ALIAS MafiaNetExtras) + + if(MAFIANET_BUILD_STATIC) + target_link_libraries(MafiaNetExtras PUBLIC MafiaNetStatic) + else() + target_link_libraries(MafiaNetExtras PUBLIC MafiaNet) + endif() + + target_include_directories(MafiaNetExtras PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) + target_compile_definitions(MafiaNetExtras + PRIVATE + $<$:_DEBUG> + $<$:NDEBUG> + ) + set_target_properties(MafiaNetExtras PROPERTIES FOLDER "Libraries") + source_group("Source Files" FILES ${MAFIANET_EXTRAS_SOURCES}) +endif() + # Installation include(GNUInstallDirs) include(CMakePackageConfigHelpers) @@ -412,6 +505,9 @@ endif() if(MAFIANET_BUILD_SHARED) list(APPEND MAFIANET_INSTALL_TARGETS MafiaNet) endif() +if(MAFIANET_BUILD_EXTRAS) + list(APPEND MAFIANET_INSTALL_TARGETS MafiaNetExtras) +endif() # Install targets install(TARGETS ${MAFIANET_INSTALL_TARGETS} diff --git a/Source/include/mafianet/PS3Includes.h b/Source/include/mafianet/PS3Includes.h deleted file mode 100644 index 8c10bf2a8..000000000 --- a/Source/include/mafianet/PS3Includes.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file was taken from RakNet 4.082 without any modifications. - * Please see licenses/RakNet license.txt for the underlying license and related copyright. - */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/include/mafianet/PS4Includes.h b/Source/include/mafianet/PS4Includes.h deleted file mode 100644 index 2fc42cc8c..000000000 --- a/Source/include/mafianet/PS4Includes.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file was taken from RakNet 4.082 without any modifications. - * Please see licenses/RakNet license.txt for the underlying license and related copyright. - */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/include/mafianet/VitaIncludes.h b/Source/include/mafianet/VitaIncludes.h deleted file mode 100644 index 60124ffcc..000000000 --- a/Source/include/mafianet/VitaIncludes.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file was taken from RakNet 4.082 without any modifications. - * Please see licenses/RakNet license.txt for the underlying license and related copyright. - */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/include/mafianet/XBox360Includes.h b/Source/include/mafianet/XBox360Includes.h deleted file mode 100644 index fbe8cce8f..000000000 --- a/Source/include/mafianet/XBox360Includes.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file was taken from RakNet 4.082 without any modifications. - * Please see licenses/RakNet license.txt for the underlying license and related copyright. - */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/include/mafianet/aliases.h b/Source/include/mafianet/aliases.h index af8a5322a..953c9953f 100644 --- a/Source/include/mafianet/aliases.h +++ b/Source/include/mafianet/aliases.h @@ -23,7 +23,7 @@ #pragma once -#include "mafianet/peerinterface.h" // RakPeerInterface +#include "mafianet/peer_interface.h" // RakPeerInterface #include "mafianet/types.h" // RakNetGUID, UNASSIGNED_RAKNET_GUID #include "mafianet/statistics.h" // RakNetStatistics diff --git a/Source/include/mafianet/Archive.h b/Source/include/mafianet/archive.h similarity index 98% rename from Source/include/mafianet/Archive.h rename to Source/include/mafianet/archive.h index f7f60469d..37ba6dcef 100644 --- a/Source/include/mafianet/Archive.h +++ b/Source/include/mafianet/archive.h @@ -5,7 +5,7 @@ * license.txt file in the root directory of this source tree. */ -/// \file Archive.h +/// \file archive.h /// \brief A single serialization convention over BitStream (issue #19). /// /// \details A user type describes its wire format once with a member template: @@ -42,7 +42,7 @@ #ifndef __MAFIANET_ARCHIVE_H #define __MAFIANET_ARCHIVE_H -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include #include diff --git a/Source/include/mafianet/assert.h b/Source/include/mafianet/assert.h index c495a013a..554eb6e26 100644 --- a/Source/include/mafianet/assert.h +++ b/Source/include/mafianet/assert.h @@ -14,4 +14,4 @@ */ #include -#include "defines.h" +#include "mafianet/defines.h" diff --git a/Source/include/mafianet/AutopatcherPatchContext.h b/Source/include/mafianet/autopatcher_patch_context.h similarity index 100% rename from Source/include/mafianet/AutopatcherPatchContext.h rename to Source/include/mafianet/autopatcher_patch_context.h diff --git a/Source/include/mafianet/AutopatcherRepositoryInterface.h b/Source/include/mafianet/autopatcher_repository_interface.h similarity index 95% rename from Source/include/mafianet/AutopatcherRepositoryInterface.h rename to Source/include/mafianet/autopatcher_repository_interface.h index 4b99cfd99..1632775be 100644 --- a/Source/include/mafianet/AutopatcherRepositoryInterface.h +++ b/Source/include/mafianet/autopatcher_repository_interface.h @@ -14,7 +14,7 @@ */ /// -/// \file AutopatcherRepositoryInterface.h +/// \file autopatcher_repository_interface.h /// \brief An interface used by AutopatcherServer to get the data necessary to run an autopatcher. /// @@ -22,8 +22,8 @@ #ifndef __AUTOPATCHER_REPOSITORY_INTERFACE_H #define __AUTOPATCHER_REPOSITORY_INTERFACE_H -#include "IncrementalReadInterface.h" -#include "SimpleMutex.h" +#include "mafianet/incremental_read_interface.h" +#include "mafianet/simple_mutex.h" namespace MafiaNet { diff --git a/Source/include/mafianet/Base64Encoder.h b/Source/include/mafianet/base64_encoder.h similarity index 92% rename from Source/include/mafianet/Base64Encoder.h rename to Source/include/mafianet/base64_encoder.h index 33d7f4a95..1a03097b8 100644 --- a/Source/include/mafianet/Base64Encoder.h +++ b/Source/include/mafianet/base64_encoder.h @@ -11,7 +11,7 @@ #ifndef __BASE_64_ENCODER_H #define __BASE_64_ENCODER_H -#include "Export.h" +#include "mafianet/export.h" extern "C" { /// \brief Returns how many bytes were written. diff --git a/Source/include/mafianet/BitStream.h b/Source/include/mafianet/bit_stream.h similarity index 97% rename from Source/include/mafianet/BitStream.h rename to Source/include/mafianet/bit_stream.h index 3b82db6b8..9edc3549f 100644 --- a/Source/include/mafianet/BitStream.h +++ b/Source/include/mafianet/bit_stream.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file BitStream.h +/// \file bit_stream.h /// \brief This class allows you to write and read native types as a string of bits. /// \details BitStream is used extensively throughout RakNet and is designed to be used by users as well. /// @@ -21,13 +21,13 @@ #ifndef __BITSTREAM_H #define __BITSTREAM_H -#include "memoryoverride.h" -#include "defines.h" -#include "Export.h" -#include "types.h" -#include "string.h" -#include "wstring.h" -#include "assert.h" +#include "mafianet/memory_override.h" +#include "mafianet/defines.h" +#include "mafianet/export.h" +#include "mafianet/types.h" +#include "mafianet/string.h" +#include "mafianet/wstring.h" +#include "mafianet/assert.h" #include #include #include diff --git a/Source/include/mafianet/CCRakNetSlidingWindow.h b/Source/include/mafianet/cc_sliding_window.h similarity index 95% rename from Source/include/mafianet/CCRakNetSlidingWindow.h rename to Source/include/mafianet/cc_sliding_window.h index bb6458a1a..27ba0e373 100644 --- a/Source/include/mafianet/CCRakNetSlidingWindow.h +++ b/Source/include/mafianet/cc_sliding_window.h @@ -40,17 +40,17 @@ else use congestion avoidance */ -#include "defines.h" +#include "mafianet/defines.h" #if USE_SLIDING_WINDOW_CONGESTION_CONTROL==1 #ifndef __CONGESTION_CONTROL_SLIDING_WINDOW_H #define __CONGESTION_CONTROL_SLIDING_WINDOW_H -#include "NativeTypes.h" -#include "time.h" -#include "types.h" -#include "DS_Queue.h" +#include "mafianet/native_types.h" +#include "mafianet/time.h" +#include "mafianet/types.h" +#include "mafianet/ds_queue.h" /// Sizeof an UDP header in byte #define UDP_HEADER_SIZE 28 diff --git a/Source/include/mafianet/CCRakNetUDT.h b/Source/include/mafianet/cc_udt.h similarity index 97% rename from Source/include/mafianet/CCRakNetUDT.h rename to Source/include/mafianet/cc_udt.h index 8e168a442..9c8431a4b 100644 --- a/Source/include/mafianet/CCRakNetUDT.h +++ b/Source/include/mafianet/cc_udt.h @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "defines.h" +#include "mafianet/defines.h" #if USE_SLIDING_WINDOW_CONGESTION_CONTROL!=1 #ifndef __CONGESTION_CONTROL_UDT_H #define __CONGESTION_CONTROL_UDT_H -#include "NativeTypes.h" -#include "time.h" -#include "types.h" -#include "DS_Queue.h" +#include "mafianet/native_types.h" +#include "mafianet/time.h" +#include "mafianet/types.h" +#include "mafianet/ds_queue.h" /// Set to 4 if you are using the iPod Touch TG. See http://www.jenkinssoftware.com/forum/index.php?topic=2717.0 #define CC_TIME_TYPE_BYTES 8 diff --git a/Source/include/mafianet/CheckSum.h b/Source/include/mafianet/check_sum.h similarity index 90% rename from Source/include/mafianet/CheckSum.h rename to Source/include/mafianet/check_sum.h index d4ab2f97f..7c2c9e769 100644 --- a/Source/include/mafianet/CheckSum.h +++ b/Source/include/mafianet/check_sum.h @@ -14,14 +14,14 @@ */ /// -/// \file CheckSum.cpp +/// \file check_sum.cpp /// \brief [Internal] CheckSum implementation from http://www.flounder.com/checksum.htm /// #ifndef __CHECKSUM_H #define __CHECKSUM_H -#include "memoryoverride.h" +#include "mafianet/memory_override.h" /// Generates and validates checksums class CheckSum diff --git a/Source/include/mafianet/CloudClient.h b/Source/include/mafianet/cloud_client.h similarity index 96% rename from Source/include/mafianet/CloudClient.h rename to Source/include/mafianet/cloud_client.h index 19f909eaa..083173e03 100644 --- a/Source/include/mafianet/CloudClient.h +++ b/Source/include/mafianet/cloud_client.h @@ -13,21 +13,21 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file CloudClient.h +/// \file cloud_client.h /// \brief Queries CloudMemoryServer to download data that other clients have uploaded /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_CloudClient==1 #ifndef __CLOUD_CLIENT_H #define __CLOUD_CLIENT_H -#include "PluginInterface2.h" -#include "CloudCommon.h" -#include "memoryoverride.h" -#include "DS_Hash.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/cloud_common.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_hash.h" namespace MafiaNet { diff --git a/Source/include/mafianet/CloudCommon.h b/Source/include/mafianet/cloud_common.h similarity index 95% rename from Source/include/mafianet/CloudCommon.h rename to Source/include/mafianet/cloud_common.h index 7ddb130e8..cfb862440 100644 --- a/Source/include/mafianet/CloudCommon.h +++ b/Source/include/mafianet/cloud_common.h @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_CloudClient==1 || _RAKNET_SUPPORT_CloudServer==1 #ifndef __CLOUD_COMMON_H #define __CLOUD_COMMON_H -#include "types.h" -#include "string.h" +#include "mafianet/types.h" +#include "mafianet/string.h" namespace MafiaNet { diff --git a/Source/include/mafianet/CloudServer.h b/Source/include/mafianet/cloud_server.h similarity index 96% rename from Source/include/mafianet/CloudServer.h rename to Source/include/mafianet/cloud_server.h index 75d7917bd..47855512e 100644 --- a/Source/include/mafianet/CloudServer.h +++ b/Source/include/mafianet/cloud_server.h @@ -13,25 +13,25 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file CloudServer.h +/// \file cloud_server.h /// \brief Stores client data, and allows cross-server communication to retrieve this data /// \details TODO /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_CloudServer==1 #ifndef __CLOUD_SERVER_H #define __CLOUD_SERVER_H -#include "PluginInterface2.h" -#include "memoryoverride.h" -#include "NativeTypes.h" -#include "string.h" -#include "DS_Hash.h" -#include "CloudCommon.h" -#include "DS_OrderedList.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" +#include "mafianet/string.h" +#include "mafianet/ds_hash.h" +#include "mafianet/cloud_common.h" +#include "mafianet/ds_ordered_list.h" /// If the data is smaller than this value, an allocation is avoid. However, this value exists for every row #define CLOUD_SERVER_DATA_STACK_SIZE 32 diff --git a/Source/include/mafianet/commandparser.h b/Source/include/mafianet/command_parser.h similarity index 93% rename from Source/include/mafianet/commandparser.h rename to Source/include/mafianet/command_parser.h index d54ba8ef0..fac6d814f 100644 --- a/Source/include/mafianet/commandparser.h +++ b/Source/include/mafianet/command_parser.h @@ -17,14 +17,14 @@ /// \brief Contains RakNetCommandParser , used to send commands to an instance of RakPeer /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_RakNetCommandParser==1 #ifndef __RAKNET_COMMAND_PARSER #define __RAKNET_COMMAND_PARSER -#include "CommandParserInterface.h" -#include "Export.h" +#include "mafianet/command_parser_interface.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/CommandParserInterface.h b/Source/include/mafianet/command_parser_interface.h similarity index 96% rename from Source/include/mafianet/CommandParserInterface.h rename to Source/include/mafianet/command_parser_interface.h index 17f9312c5..47503a3e4 100644 --- a/Source/include/mafianet/CommandParserInterface.h +++ b/Source/include/mafianet/command_parser_interface.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file CommandParserInterface.h +/// \file command_parser_interface.h /// \brief Contains CommandParserInterface , from which you derive custom command parsers /// @@ -21,10 +21,10 @@ #ifndef __COMMAND_PARSER_INTERFACE #define __COMMAND_PARSER_INTERFACE -#include "memoryoverride.h" -#include "types.h" -#include "DS_OrderedList.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/types.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/ConnectionGraph2.h b/Source/include/mafianet/connection_graph2.h similarity index 92% rename from Source/include/mafianet/ConnectionGraph2.h rename to Source/include/mafianet/connection_graph2.h index 42b61c927..65b6f0ef4 100644 --- a/Source/include/mafianet/ConnectionGraph2.h +++ b/Source/include/mafianet/connection_graph2.h @@ -13,24 +13,24 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file ConnectionGraph2.h +/// \file connection_graph2.h /// \brief Connection graph plugin, version 2. Tells new systems about existing and new connections /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ConnectionGraph2==1 #ifndef __CONNECTION_GRAPH_2_H #define __CONNECTION_GRAPH_2_H -#include "memoryoverride.h" -#include "types.h" -#include "PluginInterface2.h" -#include "DS_List.h" -#include "DS_WeightedGraph.h" -#include "GetTime.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/types.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_list.h" +#include "mafianet/ds_weighted_graph.h" +#include "mafianet/get_time.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/ConsoleServer.h b/Source/include/mafianet/console_server.h similarity index 91% rename from Source/include/mafianet/ConsoleServer.h rename to Source/include/mafianet/console_server.h index ed7ec1564..dce1806cc 100644 --- a/Source/include/mafianet/ConsoleServer.h +++ b/Source/include/mafianet/console_server.h @@ -13,21 +13,21 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file ConsoleServer.h +/// \file console_server.h /// \brief Contains ConsoleServer , used to plugin to your game to accept remote console-based connections /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ConsoleServer==1 #ifndef __CONSOLE_SERVER_H #define __CONSOLE_SERVER_H -#include "memoryoverride.h" -#include "DS_List.h" -#include "types.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_list.h" +#include "mafianet/types.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/crypto/factory.h b/Source/include/mafianet/crypto/factory.h index a708c58a5..ff421bdfd 100644 --- a/Source/include/mafianet/crypto/factory.h +++ b/Source/include/mafianet/crypto/factory.h @@ -6,8 +6,8 @@ */ #pragma once -#include "securestring.h" // used for MafiaNet::Crypto::CSecureString -#include "ifileencrypter.h" // used for MafiaNet::Crypto::IFileEncrypter +#include "mafianet/crypto/securestring.h" // used for MafiaNet::Crypto::CSecureString +#include "mafianet/crypto/ifileencrypter.h" // used for MafiaNet::Crypto::IFileEncrypter namespace MafiaNet { diff --git a/Source/include/mafianet/crypto/fileencrypter.h b/Source/include/mafianet/crypto/fileencrypter.h index f61ce1dfe..270def9a1 100644 --- a/Source/include/mafianet/crypto/fileencrypter.h +++ b/Source/include/mafianet/crypto/fileencrypter.h @@ -6,8 +6,8 @@ */ #pragma once -#include "ifileencrypter.h" // used for Crypto::IFileEncrypter -#include "securestring.h" // used for Crypto::CSecureString +#include "mafianet/crypto/ifileencrypter.h" // used for Crypto::IFileEncrypter +#include "mafianet/crypto/securestring.h" // used for Crypto::CSecureString #include // used for RSA namespace MafiaNet diff --git a/Source/include/mafianet/DataCompressor.h b/Source/include/mafianet/data_compressor.h similarity index 88% rename from Source/include/mafianet/DataCompressor.h rename to Source/include/mafianet/data_compressor.h index e81004f82..fadf14e14 100644 --- a/Source/include/mafianet/DataCompressor.h +++ b/Source/include/mafianet/data_compressor.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DataCompressor.h +/// \file data_compressor.h /// \brief DataCompressor does compression on a block of data. /// \details Not very good compression, but it's small and fast so is something you can use per-message at runtime. /// @@ -22,9 +22,9 @@ #ifndef __DATA_COMPRESSOR_H #define __DATA_COMPRESSOR_H -#include "memoryoverride.h" -#include "DS_HuffmanEncodingTree.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_huffman_encoding_tree.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/defineoverrides.h b/Source/include/mafianet/define_overrides.h similarity index 100% rename from Source/include/mafianet/defineoverrides.h rename to Source/include/mafianet/define_overrides.h diff --git a/Source/include/mafianet/defines.h b/Source/include/mafianet/defines.h index 00ae8b101..cb0ad1e94 100644 --- a/Source/include/mafianet/defines.h +++ b/Source/include/mafianet/defines.h @@ -23,7 +23,7 @@ // If you want to change these defines, put them in RakNetDefinesOverrides so your changes are not lost when updating RakNet // The user should not edit this file -#include "defineoverrides.h" +#include "mafianet/define_overrides.h" /// Define __GET_TIME_64BIT to have MafiaNet::TimeMS use a 64, rather than 32 bit value. A 32 bit value will overflow after about 5 weeks. /// However, this doubles the bandwidth use for sending times, so don't do it unless you have a reason to. @@ -113,18 +113,14 @@ #endif #ifndef RakAssert -#if defined(__native_client__) -#define RakAssert(x) -#else #if defined(_DEBUG) #define RakAssert(x) assert(x); #else #define RakAssert(x) #endif #endif -#endif -#if !defined(_DEBUG) || defined(__native_client__) +#if !defined(_DEBUG) #define SLNET_VERIFY(x) ((void)(x)) #else #define SLNET_VERIFY(x) RakAssert(x) @@ -189,10 +185,6 @@ #define RPC4_GLOBAL_REGISTRATION_MAX_FUNCTION_NAME_LENGTH 48 #endif -#ifndef XBOX_BYPASS_SECURITY -#define XBOX_BYPASS_SECURITY 1 -#endif - // Controls how many allocations occur at once for the memory pool of incoming datagrams waiting to be transferred between the recvfrom thread and the main update thread // Has large effect on memory usage, per instance of RakPeer. Approximately MAXIMUM_MTU_SIZE*BUFFERED_PACKETS_PAGE_SIZE bytes, once after calling RakPeer::Startup() #ifndef BUFFERED_PACKETS_PAGE_SIZE diff --git a/Source/include/mafianet/DirectoryDeltaTransfer.h b/Source/include/mafianet/directory_delta_transfer.h similarity index 95% rename from Source/include/mafianet/DirectoryDeltaTransfer.h rename to Source/include/mafianet/directory_delta_transfer.h index bcbe4258a..c0b91ebe0 100644 --- a/Source/include/mafianet/DirectoryDeltaTransfer.h +++ b/Source/include/mafianet/directory_delta_transfer.h @@ -13,24 +13,24 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DirectoryDeltaTransfer.h +/// \file directory_delta_transfer.h /// \brief Simple class to send changes between directories. /// \details In essence, a simple autopatcher that can be used for transmitting levels, skins, etc. /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_DirectoryDeltaTransfer==1 && _RAKNET_SUPPORT_FileOperations==1 #ifndef __DIRECTORY_DELTA_TRANSFER_H #define __DIRECTORY_DELTA_TRANSFER_H -#include "memoryoverride.h" -#include "types.h" -#include "Export.h" -#include "PluginInterface2.h" -#include "DS_Map.h" -#include "PacketPriority.h" +#include "mafianet/memory_override.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_map.h" +#include "mafianet/packet_priority.h" /// \defgroup DIRECTORY_DELTA_TRANSFER_GROUP DirectoryDeltaTransfer /// \brief Simple class to send changes between directories diff --git a/Source/include/mafianet/Dispatcher.h b/Source/include/mafianet/dispatcher.h similarity index 97% rename from Source/include/mafianet/Dispatcher.h rename to Source/include/mafianet/dispatcher.h index 63a93a7ce..208b7dc94 100644 --- a/Source/include/mafianet/Dispatcher.h +++ b/Source/include/mafianet/dispatcher.h @@ -5,7 +5,7 @@ * license.txt file in the root directory of this source tree. */ -/// \file Dispatcher.h +/// \file dispatcher.h /// \brief A typed message dispatcher over the receive iterator (issue #20). /// /// \details The classic RakNet receive loop is a giant `switch` on the first @@ -50,10 +50,10 @@ #include // std::type_index (T -> id registry) #include // handler / id tables -#include "mafianet/Archive.h" // ReadArchive / WriteArchive -#include "mafianet/BitStream.h" // BitStream over the packet body -#include "mafianet/MessageIdentifiers.h" // ID_TIMESTAMP, ID_USER_PACKET_ENUM -#include "mafianet/PeerHandle.h" // PacketPtr +#include "mafianet/archive.h" // ReadArchive / WriteArchive +#include "mafianet/bit_stream.h" // BitStream over the packet body +#include "mafianet/message_identifiers.h" // ID_TIMESTAMP, ID_USER_PACKET_ENUM +#include "mafianet/peer_handle.h" // PacketPtr #include "mafianet/guid_util.h" // MafiaNet::to_string (owning, thread-safe) #include "mafianet/time.h" // MafiaNet::Time (timestamp-prefix width) #include "mafianet/types.h" // Packet, MessageID, RakNetGUID, SystemAddress, PeerGuid diff --git a/Source/include/mafianet/DR_SHA1.h b/Source/include/mafianet/dr_sha1.h similarity index 95% rename from Source/include/mafianet/DR_SHA1.h rename to Source/include/mafianet/dr_sha1.h index beac1112c..64a4daece 100644 --- a/Source/include/mafianet/DR_SHA1.h +++ b/Source/include/mafianet/dr_sha1.h @@ -116,13 +116,13 @@ #define SHA1_H_A545E61D43E9404E8D736869AB3CBFE7 // KevinJ: -#include "memoryoverride.h" +#include "mafianet/memory_override.h" #include // Needed for file access #include // Needed for memset and memcpy #include // Needed for strcat and strcpy -#include "Export.h" +#include "mafianet/export.h" //#define MAX_FILE_READ_BUFFER 8000 #define SHA1_LENGTH 20 @@ -159,7 +159,7 @@ // You can define the endian mode in your files without modifying the SHA-1 // source files. Just #define SHA1_LITTLE_ENDIAN or #define SHA1_BIG_ENDIAN -// in your files, before including the DR_SHA1.h header file. If you don't +// in your files, before including the dr_sha1.h header file. If you don't // define anything, the class defaults to little endian. #if !defined(SHA1_LITTLE_ENDIAN) && !defined(SHA1_BIG_ENDIAN) #define SHA1_LITTLE_ENDIAN diff --git a/Source/include/mafianet/DS_BinarySearchTree.h b/Source/include/mafianet/ds_binary_search_tree.h similarity index 94% rename from Source/include/mafianet/DS_BinarySearchTree.h rename to Source/include/mafianet/ds_binary_search_tree.h index 650f023d7..ddef86337 100644 --- a/Source/include/mafianet/DS_BinarySearchTree.h +++ b/Source/include/mafianet/ds_binary_search_tree.h @@ -13,18 +13,25 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_BinarySearchTree.h +/// \file ds_binary_search_tree.h /// \internal /// \brief A binary search tree, and an AVL balanced BST derivation. /// +// Deprecated: ds_binary_search_tree.h has no consumer in the library and is scheduled for removal in the next +// minor release. Copy it into your project if you depend on it. +// Define MAFIANET_SILENCE_DEPRECATED_INCLUDES to suppress the message. +#ifndef MAFIANET_SILENCE_DEPRECATED_INCLUDES +#pragma message("mafianet/ds_binary_search_tree.h is deprecated and will be removed; copy it into your project if you use it") +#endif + #ifndef __BINARY_SEARCH_TREE_H #define __BINARY_SEARCH_TREE_H -#include "DS_QueueLinkedList.h" -#include "memoryoverride.h" -#include "Export.h" +#include "mafianet/ds_queue_linked_list.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures diff --git a/Source/include/mafianet/DS_BPlusTree.h b/Source/include/mafianet/ds_bplus_tree.h similarity index 96% rename from Source/include/mafianet/DS_BPlusTree.h rename to Source/include/mafianet/ds_bplus_tree.h index 8de09b3e2..ab37211ef 100644 --- a/Source/include/mafianet/DS_BPlusTree.h +++ b/Source/include/mafianet/ds_bplus_tree.h @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_BPlusTree.h +/// \file ds_bplus_tree.h /// #ifndef __B_PLUS_TREE_CPP #define __B_PLUS_TREE_CPP -#include "DS_MemoryPool.h" -#include "DS_Queue.h" +#include "mafianet/ds_memory_pool.h" +#include "mafianet/ds_queue.h" #include -#include "Export.h" +#include "mafianet/export.h" // Java // http://www.seanster.com/BplusTree/BplusTree.html @@ -38,7 +38,7 @@ #pragma warning( push ) #endif -#include "memoryoverride.h" +#include "mafianet/memory_override.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. @@ -1080,14 +1080,14 @@ namespace DataStructures // Code to test this hellish data structure. /* -#include "DS_BPlusTree.h" +#include "mafianet/ds_bplus_tree.h" #include // Handle underflow on root. If there is only one item left then I can go downwards. // Make sure I keep the leftmost pointer valid by traversing it // When I free a leaf, be sure to adjust the pointers around it. -#include "Rand.h" +#include "mafianet/rand.h" void main(void) { diff --git a/Source/include/mafianet/DS_BytePool.h b/Source/include/mafianet/ds_byte_pool.h similarity index 69% rename from Source/include/mafianet/DS_BytePool.h rename to Source/include/mafianet/ds_byte_pool.h index a8d8a8bc9..c7be27d67 100644 --- a/Source/include/mafianet/DS_BytePool.h +++ b/Source/include/mafianet/ds_byte_pool.h @@ -13,18 +13,25 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_BytePool.h +/// \file ds_byte_pool.h /// +// Deprecated: ds_byte_pool.h has no consumer in the library and is scheduled for removal in the next +// minor release. Copy it into your project if you depend on it. +// Define MAFIANET_SILENCE_DEPRECATED_INCLUDES to suppress the message. +#ifndef MAFIANET_SILENCE_DEPRECATED_INCLUDES +#pragma message("mafianet/ds_byte_pool.h is deprecated and will be removed; copy it into your project if you use it") +#endif + #ifndef __BYTE_POOL_H #define __BYTE_POOL_H -#include "memoryoverride.h" -#include "DS_MemoryPool.h" -#include "Export.h" -#include "SimpleMutex.h" -#include "assert.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_memory_pool.h" +#include "mafianet/export.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/assert.h" // #define _DISABLE_BYTE_POOL // #define _THREADSAFE_BYTE_POOL diff --git a/Source/include/mafianet/DS_ByteQueue.h b/Source/include/mafianet/ds_byte_queue.h similarity index 91% rename from Source/include/mafianet/DS_ByteQueue.h rename to Source/include/mafianet/ds_byte_queue.h index 263c4b299..f47528321 100644 --- a/Source/include/mafianet/DS_ByteQueue.h +++ b/Source/include/mafianet/ds_byte_queue.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_ByteQueue.h +/// \file ds_byte_queue.h /// \internal /// \brief Byte queue /// @@ -22,8 +22,8 @@ #ifndef __BYTE_QUEUE_H #define __BYTE_QUEUE_H -#include "memoryoverride.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/DS_Hash.h b/Source/include/mafianet/ds_hash.h similarity index 95% rename from Source/include/mafianet/DS_Hash.h rename to Source/include/mafianet/ds_hash.h index 7bf5be45b..f66ae529d 100644 --- a/Source/include/mafianet/DS_Hash.h +++ b/Source/include/mafianet/ds_hash.h @@ -21,11 +21,11 @@ #ifndef __HASH_H #define __HASH_H -#include "assert.h" +#include "mafianet/assert.h" #include // memmove -#include "Export.h" -#include "memoryoverride.h" -#include "string.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" +#include "mafianet/string.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/DS_Heap.h b/Source/include/mafianet/ds_heap.h similarity index 95% rename from Source/include/mafianet/DS_Heap.h rename to Source/include/mafianet/ds_heap.h index 3e08c51b6..65856085d 100644 --- a/Source/include/mafianet/DS_Heap.h +++ b/Source/include/mafianet/ds_heap.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_Heap.h +/// \file ds_heap.h /// \internal /// \brief Heap (Also serves as a priority queue) /// @@ -23,10 +23,10 @@ #ifndef __RAKNET_HEAP_H #define __RAKNET_HEAP_H -#include "memoryoverride.h" -#include "DS_List.h" -#include "Export.h" -#include "assert.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_list.h" +#include "mafianet/export.h" +#include "mafianet/assert.h" #ifdef _MSC_VER #pragma warning( push ) diff --git a/Source/include/mafianet/DS_HuffmanEncodingTree.h b/Source/include/mafianet/ds_huffman_encoding_tree.h similarity index 88% rename from Source/include/mafianet/DS_HuffmanEncodingTree.h rename to Source/include/mafianet/ds_huffman_encoding_tree.h index 4f362f937..1d8d4bd8e 100644 --- a/Source/include/mafianet/DS_HuffmanEncodingTree.h +++ b/Source/include/mafianet/ds_huffman_encoding_tree.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_HuffmanEncodingTree.h +/// \file ds_huffman_encoding_tree.h /// \brief \b [Internal] Generates a huffman encoding tree, used for string and global compression. /// @@ -21,11 +21,11 @@ #ifndef __HUFFMAN_ENCODING_TREE #define __HUFFMAN_ENCODING_TREE -#include "memoryoverride.h" -#include "DS_HuffmanEncodingTreeNode.h" -#include "BitStream.h" -#include "Export.h" -#include "DS_LinkedList.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_huffman_encoding_tree_node.h" +#include "mafianet/bit_stream.h" +#include "mafianet/export.h" +#include "mafianet/ds_linked_list.h" namespace MafiaNet { diff --git a/Source/include/mafianet/DS_HuffmanEncodingTreeFactory.h b/Source/include/mafianet/ds_huffman_encoding_tree_factory.h similarity index 78% rename from Source/include/mafianet/DS_HuffmanEncodingTreeFactory.h rename to Source/include/mafianet/ds_huffman_encoding_tree_factory.h index 8bc5f201e..25dd0da90 100644 --- a/Source/include/mafianet/DS_HuffmanEncodingTreeFactory.h +++ b/Source/include/mafianet/ds_huffman_encoding_tree_factory.h @@ -13,16 +13,23 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_HuffmanEncodingTreeFactory.h +/// \file ds_huffman_encoding_tree_factory.h /// \internal /// \brief Creates instances of the class HuffmanEncodingTree /// +// Deprecated: ds_huffman_encoding_tree_factory.h has no consumer in the library and is scheduled for removal in the next +// minor release. Copy it into your project if you depend on it. +// Define MAFIANET_SILENCE_DEPRECATED_INCLUDES to suppress the message. +#ifndef MAFIANET_SILENCE_DEPRECATED_INCLUDES +#pragma message("mafianet/ds_huffman_encoding_tree_factory.h is deprecated and will be removed; copy it into your project if you use it") +#endif + #ifndef __HUFFMAN_ENCODING_TREE_FACTORY #define __HUFFMAN_ENCODING_TREE_FACTORY -#include "memoryoverride.h" +#include "mafianet/memory_override.h" namespace MafiaNet { /// Forward declarations diff --git a/Source/include/mafianet/DS_HuffmanEncodingTreeNode.h b/Source/include/mafianet/ds_huffman_encoding_tree_node.h similarity index 100% rename from Source/include/mafianet/DS_HuffmanEncodingTreeNode.h rename to Source/include/mafianet/ds_huffman_encoding_tree_node.h diff --git a/Source/include/mafianet/DS_LinkedList.h b/Source/include/mafianet/ds_linked_list.h similarity index 96% rename from Source/include/mafianet/DS_LinkedList.h rename to Source/include/mafianet/ds_linked_list.h index c4ddc7529..72cfabf82 100644 --- a/Source/include/mafianet/DS_LinkedList.h +++ b/Source/include/mafianet/ds_linked_list.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_LinkedList.h +/// \file ds_linked_list.h /// \internal /// \brief Straightforward linked list data structure. /// @@ -22,8 +22,8 @@ #ifndef __LINKED_LIST_H #define __LINKED_LIST_H -#include "Export.h" -#include "memoryoverride.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/DS_List.h b/Source/include/mafianet/ds_list.h similarity index 95% rename from Source/include/mafianet/DS_List.h rename to Source/include/mafianet/ds_list.h index e4b893eba..c091bbb0a 100644 --- a/Source/include/mafianet/DS_List.h +++ b/Source/include/mafianet/ds_list.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_List.h +/// \file ds_list.h /// \internal /// \brief Array based list. /// \details Usually the Queue class is used instead, since it has all the same functionality and is only worse at random access. @@ -23,10 +23,10 @@ #ifndef __LIST_H #define __LIST_H -#include "assert.h" +#include "mafianet/assert.h" #include // memmove -#include "Export.h" -#include "memoryoverride.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" /// Maximum unsigned long static const unsigned int MAX_UNSIGNED_LONG = 4294967295U; diff --git a/Source/include/mafianet/DS_Map.h b/Source/include/mafianet/ds_map.h similarity index 95% rename from Source/include/mafianet/DS_Map.h rename to Source/include/mafianet/ds_map.h index 06581bb82..bc241791a 100644 --- a/Source/include/mafianet/DS_Map.h +++ b/Source/include/mafianet/ds_map.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_Map.h +/// \file ds_map.h /// \internal /// \brief Map /// @@ -22,10 +22,10 @@ #ifndef __RAKNET_MAP_H #define __RAKNET_MAP_H -#include "DS_OrderedList.h" -#include "Export.h" -#include "memoryoverride.h" -#include "assert.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" +#include "mafianet/assert.h" // If I want to change this to a red-black tree, this is a good site: http://www.cs.auckland.ac.nz/software/AlgAnim/red_black.html // This makes insertions and deletions faster. But then traversals are slow, while they are currently fast. diff --git a/Source/include/mafianet/DS_MemoryPool.h b/Source/include/mafianet/ds_memory_pool.h similarity index 94% rename from Source/include/mafianet/DS_MemoryPool.h rename to Source/include/mafianet/ds_memory_pool.h index 5b2e7c59b..2ae48a8dd 100644 --- a/Source/include/mafianet/DS_MemoryPool.h +++ b/Source/include/mafianet/ds_memory_pool.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_MemoryPool.h +/// \file ds_memory_pool.h /// @@ -24,10 +24,10 @@ // Use stdlib and not malloc for compatibility #include #endif -#include "assert.h" -#include "Export.h" +#include "mafianet/assert.h" +#include "mafianet/export.h" -#include "memoryoverride.h" +#include "mafianet/memory_override.h" // DS_MEMORY_POOL_MAX_FREE_PAGES must be > 1 #define DS_MEMORY_POOL_MAX_FREE_PAGES 4 @@ -304,8 +304,8 @@ namespace DataStructures #endif /* -#include "DS_MemoryPool.h" -#include "DS_List.h" +#include "mafianet/ds_memory_pool.h" +#include "mafianet/ds_list.h" struct TestMemoryPool { diff --git a/Source/include/mafianet/DS_Multilist.h b/Source/include/mafianet/ds_multilist.h similarity index 96% rename from Source/include/mafianet/DS_Multilist.h rename to Source/include/mafianet/ds_multilist.h index c7f1dda80..78f687f84 100644 --- a/Source/include/mafianet/DS_Multilist.h +++ b/Source/include/mafianet/ds_multilist.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_Multilist.h +/// \file ds_multilist.h /// \internal /// \brief ADT that can represent an unordered list, ordered list, stack, or queue with a common interface /// @@ -21,11 +21,11 @@ #ifndef __MULTILIST_H #define __MULTILIST_H -#include "assert.h" +#include "mafianet/assert.h" #include // memmove -#include "Export.h" -#include "memoryoverride.h" -#include "NativeTypes.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" /// What algorithm to use to store the data for the Multilist diff --git a/Source/include/mafianet/DS_OrderedChannelHeap.h b/Source/include/mafianet/ds_ordered_channel_heap.h similarity index 91% rename from Source/include/mafianet/DS_OrderedChannelHeap.h rename to Source/include/mafianet/ds_ordered_channel_heap.h index a967c7050..e745214fe 100644 --- a/Source/include/mafianet/DS_OrderedChannelHeap.h +++ b/Source/include/mafianet/ds_ordered_channel_heap.h @@ -13,21 +13,28 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_OrderedChannelHeap.h +/// \file ds_ordered_channel_heap.h /// \internal /// \brief Ordered Channel Heap . This is a heap where you add to it on multiple ordered channels, with each channel having a different weight. /// +// Deprecated: ds_ordered_channel_heap.h has no consumer in the library and is scheduled for removal in the next +// minor release. Copy it into your project if you depend on it. +// Define MAFIANET_SILENCE_DEPRECATED_INCLUDES to suppress the message. +#ifndef MAFIANET_SILENCE_DEPRECATED_INCLUDES +#pragma message("mafianet/ds_ordered_channel_heap.h is deprecated and will be removed; copy it into your project if you use it") +#endif + #ifndef __RAKNET_ORDERED_CHANNEL_HEAP_H #define __RAKNET_ORDERED_CHANNEL_HEAP_H -#include "DS_Heap.h" -#include "DS_Map.h" -#include "DS_Queue.h" -#include "Export.h" -#include "assert.h" -#include "Rand.h" +#include "mafianet/ds_heap.h" +#include "mafianet/ds_map.h" +#include "mafianet/ds_queue.h" +#include "mafianet/export.h" +#include "mafianet/assert.h" +#include "mafianet/rand.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/DS_OrderedList.h b/Source/include/mafianet/ds_ordered_list.h similarity index 96% rename from Source/include/mafianet/DS_OrderedList.h rename to Source/include/mafianet/ds_ordered_list.h index 8d5cfe775..729c40c10 100644 --- a/Source/include/mafianet/DS_OrderedList.h +++ b/Source/include/mafianet/ds_ordered_list.h @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_OrderedList.h +/// \file ds_ordered_list.h /// \internal /// \brief Quicksort ordered list. /// -#include "DS_List.h" -#include "memoryoverride.h" -#include "Export.h" +#include "mafianet/ds_list.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" #ifndef __ORDERED_LIST_H #define __ORDERED_LIST_H diff --git a/Source/include/mafianet/DS_Queue.h b/Source/include/mafianet/ds_queue.h similarity index 95% rename from Source/include/mafianet/DS_Queue.h rename to Source/include/mafianet/ds_queue.h index f222177e4..215afe91e 100644 --- a/Source/include/mafianet/DS_Queue.h +++ b/Source/include/mafianet/ds_queue.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_Queue.h +/// \file ds_queue.h /// \internal /// \brief A queue used by RakNet. /// @@ -23,9 +23,9 @@ #define __QUEUE_H // Template classes have to have all the code in the header file -#include "assert.h" -#include "Export.h" -#include "memoryoverride.h" +#include "mafianet/assert.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/DS_QueueLinkedList.h b/Source/include/mafianet/ds_queue_linked_list.h similarity index 79% rename from Source/include/mafianet/DS_QueueLinkedList.h rename to Source/include/mafianet/ds_queue_linked_list.h index b8f83c21d..47cb6888e 100644 --- a/Source/include/mafianet/DS_QueueLinkedList.h +++ b/Source/include/mafianet/ds_queue_linked_list.h @@ -13,18 +13,25 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_QueueLinkedList.h +/// \file ds_queue_linked_list.h /// \internal /// \brief A queue implemented as a linked list. /// +// Deprecated: ds_queue_linked_list.h has only used by the deprecated DS_BinarySearchTree and is scheduled for removal in the next +// minor release. Copy it into your project if you depend on it. +// Define MAFIANET_SILENCE_DEPRECATED_INCLUDES to suppress the message. +#ifndef MAFIANET_SILENCE_DEPRECATED_INCLUDES +#pragma message("mafianet/ds_queue_linked_list.h is deprecated and will be removed; copy it into your project if you use it") +#endif + #ifndef __QUEUE_LINKED_LIST_H #define __QUEUE_LINKED_LIST_H -#include "DS_LinkedList.h" -#include "Export.h" -#include "memoryoverride.h" +#include "mafianet/ds_linked_list.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/DS_RangeList.h b/Source/include/mafianet/ds_range_list.h similarity index 94% rename from Source/include/mafianet/DS_RangeList.h rename to Source/include/mafianet/ds_range_list.h index ca609c4a4..379c6aded 100644 --- a/Source/include/mafianet/DS_RangeList.h +++ b/Source/include/mafianet/ds_range_list.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_RangeList.h +/// \file ds_range_list.h /// \internal /// \brief A queue implemented as a linked list. /// @@ -22,10 +22,10 @@ #ifndef __RANGE_LIST_H #define __RANGE_LIST_H -#include "DS_OrderedList.h" -#include "BitStream.h" -#include "memoryoverride.h" -#include "assert.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/bit_stream.h" +#include "mafianet/memory_override.h" +#include "mafianet/assert.h" namespace DataStructures { diff --git a/Source/include/mafianet/DS_Table.h b/Source/include/mafianet/ds_table.h similarity index 96% rename from Source/include/mafianet/DS_Table.h rename to Source/include/mafianet/ds_table.h index 0b71890e4..6c786bc65 100644 --- a/Source/include/mafianet/DS_Table.h +++ b/Source/include/mafianet/ds_table.h @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_Table.h +/// \file ds_table.h /// #ifndef __TABLE_H #define __TABLE_H -#include "DS_List.h" -#include "DS_BPlusTree.h" -#include "memoryoverride.h" -#include "Export.h" -#include "string.h" +#include "mafianet/ds_list.h" +#include "mafianet/ds_bplus_tree.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" +#include "mafianet/string.h" #define _TABLE_BPLUS_TREE_ORDER 16 #define _TABLE_MAX_COLUMN_NAME_LENGTH 64 diff --git a/Source/include/mafianet/DS_ThreadsafeAllocatingQueue.h b/Source/include/mafianet/ds_threadsafe_allocating_queue.h similarity index 93% rename from Source/include/mafianet/DS_ThreadsafeAllocatingQueue.h rename to Source/include/mafianet/ds_threadsafe_allocating_queue.h index 7247f43bf..f86b53496 100644 --- a/Source/include/mafianet/DS_ThreadsafeAllocatingQueue.h +++ b/Source/include/mafianet/ds_threadsafe_allocating_queue.h @@ -13,16 +13,16 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_ThreadsafeAllocatingQueue.h +/// \file ds_threadsafe_allocating_queue.h /// \internal /// A threadsafe queue, that also uses a memory pool for allocation #ifndef __THREADSAFE_ALLOCATING_QUEUE #define __THREADSAFE_ALLOCATING_QUEUE -#include "DS_Queue.h" -#include "SimpleMutex.h" -#include "DS_MemoryPool.h" +#include "mafianet/ds_queue.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/ds_memory_pool.h" // #if defined(new) // #pragma push_macro("new") diff --git a/Source/include/mafianet/DS_Tree.h b/Source/include/mafianet/ds_tree.h similarity index 90% rename from Source/include/mafianet/DS_Tree.h rename to Source/include/mafianet/ds_tree.h index afcb7a7e5..03f88828a 100644 --- a/Source/include/mafianet/DS_Tree.h +++ b/Source/include/mafianet/ds_tree.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_Tree.h +/// \file ds_tree.h /// \internal /// \brief Just a regular tree /// @@ -23,10 +23,10 @@ #ifndef __DS_TREE_H #define __DS_TREE_H -#include "Export.h" -#include "DS_List.h" -#include "DS_Queue.h" -#include "memoryoverride.h" +#include "mafianet/export.h" +#include "mafianet/ds_list.h" +#include "mafianet/ds_queue.h" +#include "mafianet/memory_override.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/DS_WeightedGraph.h b/Source/include/mafianet/ds_weighted_graph.h similarity index 95% rename from Source/include/mafianet/DS_WeightedGraph.h rename to Source/include/mafianet/ds_weighted_graph.h index b77e5fcc4..2ead6ff4e 100644 --- a/Source/include/mafianet/DS_WeightedGraph.h +++ b/Source/include/mafianet/ds_weighted_graph.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DS_WeightedGraph.h +/// \file ds_weighted_graph.h /// \internal /// \brief Weighted graph. /// \details I'm assuming the indices are complex map types, rather than sequential numbers (which could be implemented much more efficiently). @@ -23,13 +23,13 @@ #ifndef __WEIGHTED_GRAPH_H #define __WEIGHTED_GRAPH_H -#include "DS_OrderedList.h" -#include "DS_Map.h" -#include "DS_Heap.h" -#include "DS_Queue.h" -#include "DS_Tree.h" -#include "assert.h" -#include "memoryoverride.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/ds_map.h" +#include "mafianet/ds_heap.h" +#include "mafianet/ds_queue.h" +#include "mafianet/ds_tree.h" +#include "mafianet/assert.h" +#include "mafianet/memory_override.h" #ifdef _DEBUG #include #endif diff --git a/Source/include/mafianet/DynDNS.h b/Source/include/mafianet/dyn_dns.h similarity index 94% rename from Source/include/mafianet/DynDNS.h rename to Source/include/mafianet/dyn_dns.h index 09dce0cd0..0f1316e2b 100644 --- a/Source/include/mafianet/DynDNS.h +++ b/Source/include/mafianet/dyn_dns.h @@ -13,19 +13,19 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file DynDNS.h +/// \file dyn_dns.h /// \brief Helper to class to update DynDNS /// This can be used to determine what permissions are should be allowed to the other system /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_DynDNS==1 && _RAKNET_SUPPORT_TCPInterface==1 #ifndef __DYN_DNS_H #define __DYN_DNS_H -#include "string.h" +#include "mafianet/string.h" namespace MafiaNet { diff --git a/Source/include/mafianet/EmailSender.h b/Source/include/mafianet/email_sender.h similarity index 89% rename from Source/include/mafianet/EmailSender.h rename to Source/include/mafianet/email_sender.h index 0501ce7e4..28c865db7 100644 --- a/Source/include/mafianet/EmailSender.h +++ b/Source/include/mafianet/email_sender.h @@ -13,21 +13,21 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file EmailSender.h +/// \file email_sender.h /// \brief Rudimentary class to send email from code. Don't expect anything fancy. /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_EmailSender==1 && _RAKNET_SUPPORT_TCPInterface==1 && _RAKNET_SUPPORT_FileOperations==1 #ifndef __EMAIL_SENDER_H #define __EMAIL_SENDER_H -#include "types.h" -#include "memoryoverride.h" -#include "Export.h" -#include "Rand.h" -#include "TCPInterface.h" +#include "mafianet/types.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" +#include "mafianet/rand.h" +#include "mafianet/tcp_interface.h" namespace MafiaNet { diff --git a/Source/include/mafianet/EmptyHeader.h b/Source/include/mafianet/empty_header.h similarity index 100% rename from Source/include/mafianet/EmptyHeader.h rename to Source/include/mafianet/empty_header.h diff --git a/Source/include/mafianet/EpochTimeToString.h b/Source/include/mafianet/epoch_time_to_string.h similarity index 84% rename from Source/include/mafianet/EpochTimeToString.h rename to Source/include/mafianet/epoch_time_to_string.h index 94043f135..d2a1266cc 100644 --- a/Source/include/mafianet/EpochTimeToString.h +++ b/Source/include/mafianet/epoch_time_to_string.h @@ -9,14 +9,14 @@ */ -/// \file EpochTimeToString.h +/// \file epoch_time_to_string.h /// #ifndef __EPOCH_TIME_TO_STRING_H #define __EPOCH_TIME_TO_STRING_H -#include "Export.h" +#include "mafianet/export.h" RAK_DLL_EXPORT char * EpochTimeToString(long long time); diff --git a/Source/include/mafianet/Export.h b/Source/include/mafianet/export.h similarity index 95% rename from Source/include/mafianet/Export.h rename to Source/include/mafianet/export.h index 3ae92b488..f149d6104 100644 --- a/Source/include/mafianet/Export.h +++ b/Source/include/mafianet/export.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "defines.h" +#include "mafianet/defines.h" #if defined(_WIN32) && !(defined(__GNUC__) || defined(__GCCXML__)) && !defined(_MAFIANET_LIB) && defined(_MAFIANET_DLL) #define RAK_DLL_EXPORT __declspec(dllexport) diff --git a/Source/include/mafianet/FileList.h b/Source/include/mafianet/file_list.h similarity index 95% rename from Source/include/mafianet/FileList.h rename to Source/include/mafianet/file_list.h index 58d342594..8bbe2bb07 100644 --- a/Source/include/mafianet/FileList.h +++ b/Source/include/mafianet/file_list.h @@ -13,22 +13,22 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file FileList.h +/// \file file_list.h /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_FileOperations==1 #ifndef __FILE_LIST #define __FILE_LIST -#include "Export.h" -#include "DS_List.h" -#include "memoryoverride.h" -#include "types.h" -#include "FileListNodeContext.h" -#include "string.h" +#include "mafianet/export.h" +#include "mafianet/ds_list.h" +#include "mafianet/memory_override.h" +#include "mafianet/types.h" +#include "mafianet/file_list_node_context.h" +#include "mafianet/string.h" namespace MafiaNet { diff --git a/Source/include/mafianet/FileListNodeContext.h b/Source/include/mafianet/file_list_node_context.h similarity index 92% rename from Source/include/mafianet/FileListNodeContext.h rename to Source/include/mafianet/file_list_node_context.h index 9061ae0aa..5f53e7a55 100644 --- a/Source/include/mafianet/FileListNodeContext.h +++ b/Source/include/mafianet/file_list_node_context.h @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file FileListNodeContext.h +/// \file file_list_node_context.h /// #ifndef __FILE_LIST_NODE_CONTEXT_H #define __FILE_LIST_NODE_CONTEXT_H -#include "BitStream.h" +#include "mafianet/bit_stream.h" struct FileListNodeContext { diff --git a/Source/include/mafianet/FileListTransfer.h b/Source/include/mafianet/file_list_transfer.h similarity index 93% rename from Source/include/mafianet/FileListTransfer.h rename to Source/include/mafianet/file_list_transfer.h index 1b6ad9869..5bd679450 100644 --- a/Source/include/mafianet/FileListTransfer.h +++ b/Source/include/mafianet/file_list_transfer.h @@ -13,28 +13,28 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file FileListTransfer.h +/// \file file_list_transfer.h /// \brief A plugin to provide a simple way to compress and incrementally send the files in the FileList structure. /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_FileListTransfer==1 && _RAKNET_SUPPORT_FileOperations==1 #ifndef __FILE_LIST_TRANFER_H #define __FILE_LIST_TRANFER_H -#include "types.h" -#include "Export.h" -#include "PluginInterface2.h" -#include "DS_Map.h" -#include "types.h" -#include "PacketPriority.h" -#include "memoryoverride.h" -#include "FileList.h" -#include "DS_Queue.h" -#include "SimpleMutex.h" -#include "ThreadPool.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_map.h" +#include "mafianet/types.h" +#include "mafianet/packet_priority.h" +#include "mafianet/memory_override.h" +#include "mafianet/file_list.h" +#include "mafianet/ds_queue.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/thread_pool.h" namespace MafiaNet { diff --git a/Source/include/mafianet/FileListTransferCBInterface.h b/Source/include/mafianet/file_list_transfer_cb_interface.h similarity index 96% rename from Source/include/mafianet/FileListTransferCBInterface.h rename to Source/include/mafianet/file_list_transfer_cb_interface.h index ade0309ac..cbc7db4f7 100644 --- a/Source/include/mafianet/FileListTransferCBInterface.h +++ b/Source/include/mafianet/file_list_transfer_cb_interface.h @@ -13,15 +13,15 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file FileListTransferCBInterface.h +/// \file file_list_transfer_cb_interface.h /// #ifndef __FILE_LIST_TRANSFER_CALLBACK_INTERFACE_H #define __FILE_LIST_TRANSFER_CALLBACK_INTERFACE_H -#include "memoryoverride.h" -#include "FileListNodeContext.h" +#include "mafianet/memory_override.h" +#include "mafianet/file_list_node_context.h" namespace MafiaNet { diff --git a/Source/include/mafianet/FileOperations.h b/Source/include/mafianet/file_operations.h similarity index 86% rename from Source/include/mafianet/FileOperations.h rename to Source/include/mafianet/file_operations.h index 901a73fc4..789370d5a 100644 --- a/Source/include/mafianet/FileOperations.h +++ b/Source/include/mafianet/file_operations.h @@ -8,17 +8,17 @@ * */ -/// \file FileOperations.h +/// \file file_operations.h /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_FileOperations==1 #ifndef __FILE_OPERATIONS_H #define __FILE_OPERATIONS_H -#include "Export.h" +#include "mafianet/export.h" bool RAK_DLL_EXPORT WriteFileWithDirectories( const char *path, char *data, unsigned dataLength ); bool RAK_DLL_EXPORT IsSlash(unsigned char c); diff --git a/Source/include/mafianet/_FindFirst.h b/Source/include/mafianet/find_first.h similarity index 95% rename from Source/include/mafianet/_FindFirst.h rename to Source/include/mafianet/find_first.h index b0dc9c88e..a5ea23b3c 100644 --- a/Source/include/mafianet/_FindFirst.h +++ b/Source/include/mafianet/find_first.h @@ -20,7 +20,7 @@ #include -#include "string.h" +#include "mafianet/string.h" #define _A_NORMAL 0x00 // Normal file #define _A_RDONLY 0x01 // Read-only file diff --git a/Source/include/mafianet/FormatString.h b/Source/include/mafianet/format_string.h similarity index 86% rename from Source/include/mafianet/FormatString.h rename to Source/include/mafianet/format_string.h index 952ecae3c..fd44c3c3e 100644 --- a/Source/include/mafianet/FormatString.h +++ b/Source/include/mafianet/format_string.h @@ -8,14 +8,14 @@ * */ -/// \file FormatString.h +/// \file format_string.h /// #ifndef __FORMAT_STRING_H #define __FORMAT_STRING_H -#include "Export.h" +#include "mafianet/export.h" extern "C" { char * FormatString(const char *format, ...); diff --git a/Source/include/mafianet/FullyConnectedMesh2.h b/Source/include/mafianet/fully_connected_mesh2.h similarity index 96% rename from Source/include/mafianet/FullyConnectedMesh2.h rename to Source/include/mafianet/fully_connected_mesh2.h index 6c81b49a0..255c681e2 100644 --- a/Source/include/mafianet/FullyConnectedMesh2.h +++ b/Source/include/mafianet/fully_connected_mesh2.h @@ -13,24 +13,24 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file FullyConnectedMesh2.h +/// \file fully_connected_mesh2.h /// \brief Fully connected mesh plugin, revision 2. /// \details This will connect RakPeer to all connecting peers, and all peers the connecting peer knows about. /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_FullyConnectedMesh2==1 #ifndef __FULLY_CONNECTED_MESH_2_H #define __FULLY_CONNECTED_MESH_2_H -#include "PluginInterface2.h" -#include "memoryoverride.h" -#include "NativeTypes.h" -#include "DS_List.h" -#include "string.h" -#include "BitStream.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" +#include "mafianet/ds_list.h" +#include "mafianet/string.h" +#include "mafianet/bit_stream.h" typedef int64_t FCM2Guid; diff --git a/Source/include/mafianet/GetTime.h b/Source/include/mafianet/get_time.h similarity index 92% rename from Source/include/mafianet/GetTime.h rename to Source/include/mafianet/get_time.h index d57243ef9..5fd21f39c 100644 --- a/Source/include/mafianet/GetTime.h +++ b/Source/include/mafianet/get_time.h @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file GetTime.h +/// \file get_time.h /// \brief Returns the value from QueryPerformanceCounter. This is the function RakNet uses to represent time. This time won't match the time returned by GetTimeCount(). See http://www.jenkinssoftware.com/forum/index.php?topic=2798.0 /// @@ -21,8 +21,8 @@ #ifndef __GET_TIME_H #define __GET_TIME_H -#include "Export.h" -#include "time.h" // For MafiaNet::TimeMS +#include "mafianet/export.h" +#include "mafianet/time.h" // For MafiaNet::TimeMS namespace MafiaNet { diff --git a/Source/include/mafianet/gettimeofday.h b/Source/include/mafianet/get_time_of_day.h similarity index 100% rename from Source/include/mafianet/gettimeofday.h rename to Source/include/mafianet/get_time_of_day.h diff --git a/Source/include/mafianet/Getche.h b/Source/include/mafianet/getche.h similarity index 100% rename from Source/include/mafianet/Getche.h rename to Source/include/mafianet/getche.h diff --git a/Source/include/mafianet/Gets.h b/Source/include/mafianet/gets.h similarity index 100% rename from Source/include/mafianet/Gets.h rename to Source/include/mafianet/gets.h diff --git a/Source/include/mafianet/GridSectorizer.h b/Source/include/mafianet/grid_sectorizer.h similarity index 93% rename from Source/include/mafianet/GridSectorizer.h rename to Source/include/mafianet/grid_sectorizer.h index 3890fcc02..e3535cab2 100644 --- a/Source/include/mafianet/GridSectorizer.h +++ b/Source/include/mafianet/grid_sectorizer.h @@ -18,12 +18,12 @@ //#define _USE_ORDERED_LIST -#include "memoryoverride.h" +#include "mafianet/memory_override.h" #ifdef _USE_ORDERED_LIST -#include "DS_OrderedList.h" +#include "mafianet/ds_ordered_list.h" #else -#include "DS_List.h" +#include "mafianet/ds_list.h" #endif class GridSectorizer diff --git a/Source/include/mafianet/guid_util.h b/Source/include/mafianet/guid_util.h index c1d47cd34..9625900ec 100644 --- a/Source/include/mafianet/guid_util.h +++ b/Source/include/mafianet/guid_util.h @@ -21,8 +21,8 @@ #include #include -#include "types.h" -#include "peerinterface.h" +#include "mafianet/types.h" +#include "mafianet/peer_interface.h" namespace MafiaNet { diff --git a/Source/include/mafianet/HTTPConnection.h b/Source/include/mafianet/http_connection.h similarity index 92% rename from Source/include/mafianet/HTTPConnection.h rename to Source/include/mafianet/http_connection.h index 52bae2b8f..6889a49c2 100644 --- a/Source/include/mafianet/HTTPConnection.h +++ b/Source/include/mafianet/http_connection.h @@ -13,22 +13,22 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file HTTPConnection.h +/// \file http_connection.h /// \brief Contains HTTPConnection, used to communicate with web servers /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_HTTPConnection==1 && _RAKNET_SUPPORT_TCPInterface==1 #ifndef __HTTP_CONNECTION #define __HTTP_CONNECTION -#include "Export.h" -#include "string.h" -#include "memoryoverride.h" -#include "types.h" -#include "DS_Queue.h" +#include "mafianet/export.h" +#include "mafianet/string.h" +#include "mafianet/memory_override.h" +#include "mafianet/types.h" +#include "mafianet/ds_queue.h" namespace MafiaNet { diff --git a/Source/include/mafianet/HTTPConnection2.h b/Source/include/mafianet/http_connection2.h similarity index 91% rename from Source/include/mafianet/HTTPConnection2.h rename to Source/include/mafianet/http_connection2.h index 9511de97b..a825caeb8 100644 --- a/Source/include/mafianet/HTTPConnection2.h +++ b/Source/include/mafianet/http_connection2.h @@ -13,26 +13,26 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file HTTPConnection2.h +/// \file http_connection2.h /// \brief Contains HTTPConnection2, used to communicate with web servers /// #include -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_HTTPConnection2==1 && _RAKNET_SUPPORT_TCPInterface==1 #ifndef __HTTP_CONNECTION_2 #define __HTTP_CONNECTION_2 -#include "Export.h" -#include "string.h" -#include "memoryoverride.h" -#include "types.h" -#include "DS_List.h" -#include "DS_Queue.h" -#include "PluginInterface2.h" -#include "SimpleMutex.h" +#include "mafianet/export.h" +#include "mafianet/string.h" +#include "mafianet/memory_override.h" +#include "mafianet/types.h" +#include "mafianet/ds_list.h" +#include "mafianet/ds_queue.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/simple_mutex.h" namespace MafiaNet { diff --git a/Source/include/mafianet/IncrementalReadInterface.h b/Source/include/mafianet/incremental_read_interface.h similarity index 92% rename from Source/include/mafianet/IncrementalReadInterface.h rename to Source/include/mafianet/incremental_read_interface.h index 6df7c7300..2b77a3fe3 100644 --- a/Source/include/mafianet/IncrementalReadInterface.h +++ b/Source/include/mafianet/incremental_read_interface.h @@ -16,8 +16,8 @@ #ifndef __INCREMENTAL_READ_INTERFACE_H #define __INCREMENTAL_READ_INTERFACE_H -#include "FileListNodeContext.h" -#include "Export.h" +#include "mafianet/file_list_node_context.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/InternalPacket.h b/Source/include/mafianet/internal_packet.h similarity index 93% rename from Source/include/mafianet/InternalPacket.h rename to Source/include/mafianet/internal_packet.h index db4ccc754..81249061a 100644 --- a/Source/include/mafianet/InternalPacket.h +++ b/Source/include/mafianet/internal_packet.h @@ -20,16 +20,16 @@ #ifndef __INTERNAL_PACKET_H #define __INTERNAL_PACKET_H -#include "PacketPriority.h" -#include "types.h" -#include "memoryoverride.h" -#include "defines.h" -#include "NativeTypes.h" -#include "defines.h" +#include "mafianet/packet_priority.h" +#include "mafianet/types.h" +#include "mafianet/memory_override.h" +#include "mafianet/defines.h" +#include "mafianet/native_types.h" +#include "mafianet/defines.h" #if USE_SLIDING_WINDOW_CONGESTION_CONTROL!=1 -#include "CCRakNetUDT.h" +#include "mafianet/cc_udt.h" #else -#include "CCRakNetSlidingWindow.h" +#include "mafianet/cc_sliding_window.h" #endif namespace MafiaNet { diff --git a/Source/include/mafianet/Itoa.h b/Source/include/mafianet/itoa.h similarity index 100% rename from Source/include/mafianet/Itoa.h rename to Source/include/mafianet/itoa.h diff --git a/Source/include/mafianet/Kbhit.h b/Source/include/mafianet/kbhit.h similarity index 100% rename from Source/include/mafianet/Kbhit.h rename to Source/include/mafianet/kbhit.h diff --git a/Source/include/mafianet/linux_adapter.h b/Source/include/mafianet/linux_adapter.h index ee83d384f..8e3d4fb8f 100644 --- a/Source/include/mafianet/linux_adapter.h +++ b/Source/include/mafianet/linux_adapter.h @@ -79,7 +79,7 @@ template int vsnprintf_s(char (&buffer)[BufferSize], size_t c // MS gets_s function adapter - wraps MafiaNet's Gets function // Note: Samples should include this header for gets_s support on Linux -#include "Gets.h" +#include "mafianet/gets.h" template char* gets_s(char (&buffer)[BufferSize]) { return Gets(buffer, static_cast(BufferSize)); diff --git a/Source/include/mafianet/LinuxStrings.h b/Source/include/mafianet/linux_strings.h similarity index 81% rename from Source/include/mafianet/LinuxStrings.h rename to Source/include/mafianet/linux_strings.h index c0fd72bee..09eea0820 100644 --- a/Source/include/mafianet/LinuxStrings.h +++ b/Source/include/mafianet/linux_strings.h @@ -16,13 +16,6 @@ #ifndef _GCC_WIN_STRINGS #define _GCC_WIN_STRINGS -#if defined(__native_client__) - #ifndef _stricmp - int _stricmp(const char* s1, const char* s2); - #endif - int _strnicmp(const char* s1, const char* s2, size_t n); - char *_strlwr(char * str ); -#else #if (defined(__GNUC__) || defined(__GCCXML__) || defined(__S3E__) ) && !defined(_WIN32) #ifndef _stricmp int _stricmp(const char* s1, const char* s2); @@ -36,6 +29,5 @@ #endif -#endif #endif // _GCC_WIN_STRINGS diff --git a/Source/include/mafianet/LocklessTypes.h b/Source/include/mafianet/lockless_types.h similarity index 87% rename from Source/include/mafianet/LocklessTypes.h rename to Source/include/mafianet/lockless_types.h index 89249ef73..680cf8496 100644 --- a/Source/include/mafianet/LocklessTypes.h +++ b/Source/include/mafianet/lockless_types.h @@ -16,12 +16,12 @@ #ifndef __LOCKLESS_TYPES_H #define __LOCKLESS_TYPES_H -#include "Export.h" -#include "NativeTypes.h" -#include "WindowsIncludes.h" +#include "mafianet/export.h" +#include "mafianet/native_types.h" +#include "mafianet/windows_includes.h" #if defined(ANDROID) || defined(__S3E__) || defined(__APPLE__) // __sync_fetch_and_add not supported apparently -#include "SimpleMutex.h" +#include "mafianet/simple_mutex.h" #endif namespace MafiaNet diff --git a/Source/include/mafianet/LogCommandParser.h b/Source/include/mafianet/log_command_parser.h similarity index 95% rename from Source/include/mafianet/LogCommandParser.h rename to Source/include/mafianet/log_command_parser.h index 422772d23..ba42465ed 100644 --- a/Source/include/mafianet/LogCommandParser.h +++ b/Source/include/mafianet/log_command_parser.h @@ -17,14 +17,14 @@ /// \brief Contains LogCommandParser , Used to send logs to connected consoles /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_LogCommandParser==1 #ifndef __LOG_COMMAND_PARSER #define __LOG_COMMAND_PARSER -#include "CommandParserInterface.h" -#include "Export.h" +#include "mafianet/command_parser_interface.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/mafianet.h b/Source/include/mafianet/mafianet.h index 6e4e4b58e..90c7388be 100644 --- a/Source/include/mafianet/mafianet.h +++ b/Source/include/mafianet/mafianet.h @@ -22,15 +22,15 @@ #pragma once -#include "mafianet/peerinterface.h" // RakPeerInterface — main entry point +#include "mafianet/peer_interface.h" // RakPeerInterface — main entry point #include "mafianet/types.h" // Packet, SystemAddress, RakNetGUID, enums -#include "mafianet/MessageIdentifiers.h" // ID_* message IDs + ID_USER_PACKET_ENUM -#include "mafianet/PacketPriority.h" // MafiaNet::Priority / MafiaNet::Reliability +#include "mafianet/message_identifiers.h" // ID_* message IDs + ID_USER_PACKET_ENUM +#include "mafianet/packet_priority.h" // MafiaNet::Priority / MafiaNet::Reliability #include "mafianet/statistics.h" // RakNetStatistics — return type of GetStatistics() -#include "mafianet/BitStream.h" // binary serialization -#include "mafianet/Archive.h" // serialize() convention over BitStream -#include "mafianet/GetTime.h" // MafiaNet::GetTime / TimeMS +#include "mafianet/bit_stream.h" // binary serialization +#include "mafianet/archive.h" // serialize() convention over BitStream +#include "mafianet/get_time.h" // MafiaNet::GetTime / TimeMS #include "mafianet/guid_util.h" // MafiaNet::to_string / connected_address #include "mafianet/aliases.h" // canonical aliases: PeerInterface, Guid, Statistics -#include "mafianet/PeerHandle.h" // RAII handles: Peer, PacketPtr -#include "mafianet/Dispatcher.h" // typed message dispatcher: Dispatcher, Sender +#include "mafianet/peer_handle.h" // RAII handles: Peer, PacketPtr +#include "mafianet/dispatcher.h" // typed message dispatcher: Dispatcher, Sender diff --git a/Source/include/mafianet/memoryoverride.h b/Source/include/mafianet/memory_override.h similarity index 95% rename from Source/include/mafianet/memoryoverride.h rename to Source/include/mafianet/memory_override.h index e8fb0dbd1..387e8491f 100644 --- a/Source/include/mafianet/memoryoverride.h +++ b/Source/include/mafianet/memory_override.h @@ -22,8 +22,8 @@ #ifndef __RAK_MEMORY_H #define __RAK_MEMORY_H -#include "Export.h" -#include "defines.h" +#include "mafianet/export.h" +#include "mafianet/defines.h" #include @@ -32,7 +32,7 @@ -#include "alloca.h" +#include "mafianet/alloca.h" // #if _USE_RAK_MEMORY_OVERRIDE==1 // #if defined(new) @@ -43,7 +43,7 @@ // #endif -// These pointers are statically and globally defined in RakMemoryOverride.cpp +// These pointers are statically and globally defined in memory_override.cpp // Change them to point to your own allocators if you want. // Use the functions for a DLL, or just reassign the variable if using source extern RAK_DLL_EXPORT void * (*rakMalloc) (size_t size); diff --git a/Source/include/mafianet/MessageFilter.h b/Source/include/mafianet/message_filter.h similarity index 96% rename from Source/include/mafianet/MessageFilter.h rename to Source/include/mafianet/message_filter.h index dd670b870..e43501c8d 100644 --- a/Source/include/mafianet/MessageFilter.h +++ b/Source/include/mafianet/message_filter.h @@ -17,17 +17,17 @@ /// \brief Message filter plugin. Assigns systems to FilterSets. Each FilterSet limits what messages are allowed. This is a security related plugin. /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_MessageFilter==1 #ifndef __MESSAGE_FILTER_PLUGIN_H #define __MESSAGE_FILTER_PLUGIN_H -#include "types.h" -#include "PluginInterface2.h" -#include "DS_OrderedList.h" -#include "DS_Hash.h" -#include "Export.h" +#include "mafianet/types.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/ds_hash.h" +#include "mafianet/export.h" /// MessageIdentifier (ID_*) values shoudln't go higher than this. Change it if you do. #define MESSAGE_FILTER_MAX_MESSAGE_ID 256 diff --git a/Source/include/mafianet/MessageIdentifiers.h b/Source/include/mafianet/message_identifiers.h similarity index 96% rename from Source/include/mafianet/MessageIdentifiers.h rename to Source/include/mafianet/message_identifiers.h index b364ec068..51a8ca400 100644 --- a/Source/include/mafianet/MessageIdentifiers.h +++ b/Source/include/mafianet/message_identifiers.h @@ -34,6 +34,8 @@ enum OutOfBandIdentifiers ID_ROUTER_2_REPLY_TO_SPECIFIED_PORT, ID_ROUTER_2_MINI_PUNCH_REPLY, ID_ROUTER_2_MINI_PUNCH_REPLY_BOUNCE, + // Reserved: formerly Xbox 360 integration. The identifiers stay so the + // wire values of everything after them do not shift. ID_XBOX_360_VOICE, ID_XBOX_360_GET_NETWORK_ROOM, ID_XBOX_360_RETURN_NETWORK_ROOM, @@ -41,7 +43,7 @@ enum OutOfBandIdentifiers ID_NAT_PONG, }; -/// You should not edit the file MessageIdentifiers.h as it is a part of RakNet static library +/// You should not edit the file message_identifiers.h as it is a part of RakNet static library /// To define your own message id, define an enum following the code example that follows. /// /// \code @@ -152,7 +154,7 @@ enum DefaultMessageIDTypes // RakPeer - Downloading a large message. Format is ID_DOWNLOAD_PROGRESS (MessageID), partCount (unsigned int), /// partTotal (unsigned int), /// partLength (unsigned int), first part data (length <= MAX_MTU_SIZE). See the three parameters partCount, partTotal - /// and partLength in OnFileProgress in FileListTransferCBInterface.h + /// and partLength in OnFileProgress in file_list_transfer_cb_interface.h ID_DOWNLOAD_PROGRESS, /// ConnectionGraph2 plugin - In a client/server environment, a client other than ourselves has disconnected gracefully. @@ -388,7 +390,7 @@ enum DefaultMessageIDTypes /// Gamebryo Lightspeed integration ID_LIGHTSPEED_INTEGRATION, - /// XBOX integration + /// Reserved: formerly Xbox integration. Kept so later wire values do not shift. ID_XBOX_LOBBY, /// The password we used to challenge the other system passed, meaning the other system has called TwoWayAuthentication::AddPassword() with the same password we passed to TwoWayAuthentication::Challenge() diff --git a/Source/include/mafianet/MmsgBatch.h b/Source/include/mafianet/mmsg_batch.h similarity index 98% rename from Source/include/mafianet/MmsgBatch.h rename to Source/include/mafianet/mmsg_batch.h index 9e33254c4..0c04a714d 100644 --- a/Source/include/mafianet/MmsgBatch.h +++ b/Source/include/mafianet/mmsg_batch.h @@ -5,12 +5,12 @@ * license.txt file in the root directory of this source tree. */ -/// \file MmsgBatch.h +/// \file mmsg_batch.h /// \brief Portable helpers for batched datagram I/O (recvmmsg / sendmmsg). /// /// Batching is always on where the syscalls exist; there is no build option to /// turn it on or off. The Linux-only -/// syscall glue lives in RakNetSocket2_Berkley.cpp and RakNetSocket2.cpp behind +/// syscall glue lives in socket2_berkley.cpp and socket2.cpp behind /// that single guard. /// /// Everything in this header is portable and compiled unconditionally -- @@ -24,7 +24,7 @@ #include "mafianet/socket2.h" #include "mafianet/assert.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" #include // memcpy #include // RAKNET_DEBUG_PRINTF defaults to printf @@ -320,7 +320,7 @@ class RNS2SendBatch // threads that never send a batch: it is allocated on this thread's first // Add() and released when the thread exits. // - // Defined in MmsgBatch.cpp, deliberately NOT inline here. Both hold + // Defined in mmsg_batch.cpp, deliberately NOT inline here. Both hold // thread_local state, and this is a public header, so a consumer could // instantiate RNS2SendBatch in its own translation unit. Inline definitions // would then give that consumer its own copy of the buffer block and of the diff --git a/Source/include/mafianet/MtuBlackHole.h b/Source/include/mafianet/mtu_black_hole.h similarity index 95% rename from Source/include/mafianet/MtuBlackHole.h rename to Source/include/mafianet/mtu_black_hole.h index f4207fece..7490429bd 100644 --- a/Source/include/mafianet/MtuBlackHole.h +++ b/Source/include/mafianet/mtu_black_hole.h @@ -9,7 +9,7 @@ /// \brief In-session MTU black-hole detection. /// /// The connection handshake probes the path MTU in one direction only -/// (RakPeer.cpp pads ID_OPEN_CONNECTION_REQUEST_1 down the ladder) and the +/// (peer.cpp pads ID_OPEN_CONNECTION_REQUEST_1 down the ladder) and the /// negotiated size is then applied to both directions for the life of the /// connection. A tunnel whose return path carries less than the probed /// direction -- OpenVPN and friends drop, rather than fragment, datagrams over @@ -27,12 +27,12 @@ #include -#include "mafianet/Export.h" +#include "mafianet/export.h" namespace MafiaNet { /// The MTU rung ladder, in bytes including UDP/IP headers, highest first. -/// The same rungs the connection handshake probes (mtuSizes in RakPeer.cpp); +/// The same rungs the connection handshake probes (mtuSizes in peer.cpp); /// MTU_LADDER[0] must equal MAXIMUM_MTU_SIZE so a step-down never lands on a /// rung the handshake could not have negotiated. const int MTU_LADDER_SIZE = 4; diff --git a/Source/include/mafianet/MTUSize.h b/Source/include/mafianet/mtu_size.h similarity index 94% rename from Source/include/mafianet/MTUSize.h rename to Source/include/mafianet/mtu_size.h index 7c55b6730..98772ec9e 100644 --- a/Source/include/mafianet/MTUSize.h +++ b/Source/include/mafianet/mtu_size.h @@ -34,12 +34,12 @@ /// /// This was 1492 (PPPoE) until it was found to black-hole tunnelled clients. /// The handshake probes the path in one direction only -- the connecting peer -/// pads ID_OPEN_CONNECTION_REQUEST_1 down the mtuSizes ladder in RakPeer.cpp and +/// pads ID_OPEN_CONNECTION_REQUEST_1 down the mtuSizes ladder in peer.cpp and /// the accepting peer echoes back whatever size arrived -- and the result is /// then applied to BOTH directions. A black hole the handshake missed (a tunnel /// dropping large datagrams on the return path only, or a path that shrinks /// mid-session) is caught later by the in-session step-down in -/// ReliabilityLayer/MtuBlackHole.h, which walks the same ladder downward and +/// ReliabilityLayer/mtu_black_hole.h, which walks the same ladder downward and /// re-splits queued messages -- but that detection costs several /// retransmission timeouts, so the top rung still has to be a size most /// tunnelled peers survive without discovering anything. 1400 clears WireGuard diff --git a/Source/include/mafianet/NatPunchthroughClient.h b/Source/include/mafianet/nat_punchthrough_client.h similarity index 95% rename from Source/include/mafianet/NatPunchthroughClient.h rename to Source/include/mafianet/nat_punchthrough_client.h index f6c1a2181..220f6ed55 100644 --- a/Source/include/mafianet/NatPunchthroughClient.h +++ b/Source/include/mafianet/nat_punchthrough_client.h @@ -17,20 +17,20 @@ /// \brief Contains the NAT-punchthrough plugin for the client. /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatPunchthroughClient==1 #ifndef __NAT_PUNCHTHROUGH_CLIENT_H #define __NAT_PUNCHTHROUGH_CLIENT_H -#include "types.h" -#include "Export.h" -#include "PluginInterface2.h" -#include "PacketPriority.h" -#include "SocketIncludes.h" -#include "DS_List.h" -#include "string.h" -#include "DS_Queue.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/socket_includes.h" +#include "mafianet/ds_list.h" +#include "mafianet/string.h" +#include "mafianet/ds_queue.h" // Trendnet TEW-632BRP sometimes starts at port 1024 and increments sequentially. // Zonnet zsr1134we. Replies go out on the net, but are always absorbed by the remote router?? diff --git a/Source/include/mafianet/NatPunchthroughServer.h b/Source/include/mafianet/nat_punchthrough_server.h similarity index 91% rename from Source/include/mafianet/NatPunchthroughServer.h rename to Source/include/mafianet/nat_punchthrough_server.h index 938e484d3..d4930688b 100644 --- a/Source/include/mafianet/NatPunchthroughServer.h +++ b/Source/include/mafianet/nat_punchthrough_server.h @@ -18,19 +18,19 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatPunchthroughServer==1 #ifndef __NAT_PUNCHTHROUGH_SERVER_H #define __NAT_PUNCHTHROUGH_SERVER_H -#include "types.h" -#include "Export.h" -#include "PluginInterface2.h" -#include "PacketPriority.h" -#include "SocketIncludes.h" -#include "DS_OrderedList.h" -#include "string.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/socket_includes.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/string.h" namespace MafiaNet { diff --git a/Source/include/mafianet/NatTypeDetectionClient.h b/Source/include/mafianet/nat_type_detection_client.h similarity index 85% rename from Source/include/mafianet/NatTypeDetectionClient.h rename to Source/include/mafianet/nat_type_detection_client.h index a834080fa..a02d90ca9 100644 --- a/Source/include/mafianet/NatTypeDetectionClient.h +++ b/Source/include/mafianet/nat_type_detection_client.h @@ -18,20 +18,20 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatTypeDetectionClient==1 #ifndef __NAT_TYPE_DETECTION_CLIENT_H #define __NAT_TYPE_DETECTION_CLIENT_H -#include "types.h" -#include "Export.h" -#include "PluginInterface2.h" -#include "PacketPriority.h" -#include "SocketIncludes.h" -#include "DS_OrderedList.h" -#include "string.h" -#include "NatTypeDetectionCommon.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/socket_includes.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/string.h" +#include "mafianet/nat_type_detection_common.h" namespace MafiaNet { @@ -40,7 +40,7 @@ class RakPeerInterface; struct Packet; /// \brief Client code for NatTypeDetection - /// \details See NatTypeDetectionServer.h for algorithm + /// \details See nat_type_detection_server.h for algorithm /// To use, just connect to the server, and call DetectNAT /// You will get back ID_NAT_TYPE_DETECTION_RESULT with one of the enumerated values of NATTypeDetectionResult found in NATTypeDetectionCommon.h /// See also http://www.jenkinssoftware.com/raknet/manual/natpunchthrough.html diff --git a/Source/include/mafianet/NatTypeDetectionCommon.h b/Source/include/mafianet/nat_type_detection_common.h similarity index 90% rename from Source/include/mafianet/NatTypeDetectionCommon.h rename to Source/include/mafianet/nat_type_detection_common.h index d92258f26..becb97426 100644 --- a/Source/include/mafianet/NatTypeDetectionCommon.h +++ b/Source/include/mafianet/nat_type_detection_common.h @@ -21,13 +21,13 @@ #ifndef __NAT_TYPE_DETECTION_COMMON_H #define __NAT_TYPE_DETECTION_COMMON_H -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatTypeDetectionServer==1 || _RAKNET_SUPPORT_NatTypeDetectionClient==1 -#include "SocketIncludes.h" -#include "types.h" -#include "socket2.h" +#include "mafianet/socket_includes.h" +#include "mafianet/types.h" +#include "mafianet/socket2.h" namespace MafiaNet { @@ -69,14 +69,9 @@ namespace MafiaNet /// \internal RAK_DLL_EXPORT RakNetSocket2* CreateNonblockingBoundSocket(const char *bindAddr -#ifdef __native_client__ - ,_PP_Instance_ chromeInstance -#endif , RNS2EventHandler *eventHandler ); - /// \internal - //int NatTypeRecvFrom(char *data, RakNetSocket2* socket, SystemAddress &sender, RNS2EventHandler *eventHandler); } #endif // #if _RAKNET_SUPPORT_NatTypeDetectionServer==1 || _RAKNET_SUPPORT_NatTypeDetectionClient==1 diff --git a/Source/include/mafianet/NatTypeDetectionServer.h b/Source/include/mafianet/nat_type_detection_server.h similarity index 90% rename from Source/include/mafianet/NatTypeDetectionServer.h rename to Source/include/mafianet/nat_type_detection_server.h index 3b7748037..46aa52032 100644 --- a/Source/include/mafianet/NatTypeDetectionServer.h +++ b/Source/include/mafianet/nat_type_detection_server.h @@ -17,20 +17,20 @@ /// \brief Contains the NAT-type detection code for the server /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatTypeDetectionServer==1 #ifndef __NAT_TYPE_DETECTION_SERVER_H #define __NAT_TYPE_DETECTION_SERVER_H -#include "types.h" -#include "Export.h" -#include "PluginInterface2.h" -#include "PacketPriority.h" -#include "SocketIncludes.h" -#include "DS_OrderedList.h" -#include "string.h" -#include "NatTypeDetectionCommon.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/socket_includes.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/string.h" +#include "mafianet/nat_type_detection_common.h" namespace MafiaNet @@ -78,9 +78,6 @@ class RAK_DLL_EXPORT NatTypeDetectionServer : public PluginInterface2, public RN const char *nonRakNetIP2, const char *nonRakNetIP3, const char *nonRakNetIP4 -#ifdef __native_client__ - ,_PP_Instance_ chromeInstance -#endif ); // Releases the sockets created in Startup(); diff --git a/Source/include/mafianet/NativeFeatureIncludes.h b/Source/include/mafianet/native_feature_includes.h similarity index 93% rename from Source/include/mafianet/NativeFeatureIncludes.h rename to Source/include/mafianet/native_feature_includes.h index ed965bd51..e417486df 100644 --- a/Source/include/mafianet/NativeFeatureIncludes.h +++ b/Source/include/mafianet/native_feature_includes.h @@ -10,12 +10,12 @@ // If you want to change these defines, put them in NativeFeatureIncludesOverrides so your changes are not lost when updating RakNet // The user should not edit this file -#include "NativeFeatureIncludesOverrides.h" +#include "mafianet/native_feature_includes_overrides.h" #ifndef __NATIVE_FEATURE_INCLDUES_H #define __NATIVE_FEATURE_INCLDUES_H -// Uncomment below defines, and paste to NativeFeatureIncludesOverrides.h, to exclude plugins that you do not want to build into the static library, or DLL +// Uncomment below defines, and paste to native_feature_includes_overrides.h, to exclude plugins that you do not want to build into the static library, or DLL // These are not all the plugins, only those that are in the core library // Other plugins are located in DependentExtensions // #define _RAKNET_SUPPORT_ConnectionGraph2 0 diff --git a/Source/include/mafianet/NativeFeatureIncludesOverrides.h b/Source/include/mafianet/native_feature_includes_overrides.h similarity index 90% rename from Source/include/mafianet/NativeFeatureIncludesOverrides.h rename to Source/include/mafianet/native_feature_includes_overrides.h index d0860857b..dae46bfc5 100644 --- a/Source/include/mafianet/NativeFeatureIncludesOverrides.h +++ b/Source/include/mafianet/native_feature_includes_overrides.h @@ -9,7 +9,7 @@ */ // USER EDITABLE FILE -// See NativeFeatureIncludes.h +// See native_feature_includes.h #ifndef __NATIVE_FEATURE_INCLDUES_OVERRIDES_H #define __NATIVE_FEATURE_INCLDUES_OVERRIDES_H diff --git a/Source/include/mafianet/NativeTypes.h b/Source/include/mafianet/native_types.h similarity index 100% rename from Source/include/mafianet/NativeTypes.h rename to Source/include/mafianet/native_types.h diff --git a/Source/include/mafianet/NetworkIDManager.h b/Source/include/mafianet/network_id_manager.h similarity index 90% rename from Source/include/mafianet/NetworkIDManager.h rename to Source/include/mafianet/network_id_manager.h index 24b99bb53..e13ddbded 100644 --- a/Source/include/mafianet/NetworkIDManager.h +++ b/Source/include/mafianet/network_id_manager.h @@ -20,11 +20,11 @@ #ifndef __NETWORK_ID_MANAGER_H #define __NETWORK_ID_MANAGER_H -#include "types.h" -#include "Export.h" -#include "memoryoverride.h" -#include "NetworkIDObject.h" -#include "Rand.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" +#include "mafianet/network_id_object.h" +#include "mafianet/rand.h" namespace MafiaNet { diff --git a/Source/include/mafianet/NetworkIDObject.h b/Source/include/mafianet/network_id_object.h similarity index 95% rename from Source/include/mafianet/NetworkIDObject.h rename to Source/include/mafianet/network_id_object.h index 9b48f5051..d4e2583fa 100644 --- a/Source/include/mafianet/NetworkIDObject.h +++ b/Source/include/mafianet/network_id_object.h @@ -21,9 +21,9 @@ #if !defined(__NETWORK_ID_GENERATOR) #define __NETWORK_ID_GENERATOR -#include "types.h" -#include "memoryoverride.h" -#include "Export.h" +#include "mafianet/types.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/osx_adapter.h b/Source/include/mafianet/osx_adapter.h index 1b0273b57..623323a21 100644 --- a/Source/include/mafianet/osx_adapter.h +++ b/Source/include/mafianet/osx_adapter.h @@ -82,7 +82,7 @@ template int vsnprintf_s(char (&buffer)[BufferSize], size_t c // MS gets_s function adapter - wraps MafiaNet's Gets function // Note: Samples should include this header for gets_s support on macOS -#include "Gets.h" +#include "mafianet/gets.h" template char* gets_s(char (&buffer)[BufferSize]) { return Gets(buffer, static_cast(BufferSize)); diff --git a/Source/include/mafianet/PacketConsoleLogger.h b/Source/include/mafianet/packet_console_logger.h similarity index 90% rename from Source/include/mafianet/PacketConsoleLogger.h rename to Source/include/mafianet/packet_console_logger.h index 11048e4a6..5a166c83e 100644 --- a/Source/include/mafianet/PacketConsoleLogger.h +++ b/Source/include/mafianet/packet_console_logger.h @@ -17,13 +17,13 @@ /// \brief This will write all incoming and outgoing network messages to the log command parser, which can be accessed through Telnet /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_LogCommandParser==1 && _RAKNET_SUPPORT_PacketLogger==1 #ifndef __PACKET_CONSOLE_LOGGER_H_ #define __PACKET_CONSOLE_LOGGER_H_ -#include "PacketLogger.h" +#include "mafianet/packet_logger.h" namespace MafiaNet { @@ -36,7 +36,7 @@ class RAK_DLL_EXPORT PacketConsoleLogger : public PacketLogger { public: PacketConsoleLogger(); - // Writes to the command parser used for logging, which is accessed through a secondary communication layer (such as Telnet or RakNet) - See ConsoleServer.h + // Writes to the command parser used for logging, which is accessed through a secondary communication layer (such as Telnet or RakNet) - See console_server.h virtual void SetLogCommandParser(LogCommandParser *lcp); virtual void WriteLog(const char *str); protected: diff --git a/Source/include/mafianet/PacketFileLogger.h b/Source/include/mafianet/packet_file_logger.h similarity index 90% rename from Source/include/mafianet/PacketFileLogger.h rename to Source/include/mafianet/packet_file_logger.h index a7b0e820c..ae1c90ad8 100644 --- a/Source/include/mafianet/PacketFileLogger.h +++ b/Source/include/mafianet/packet_file_logger.h @@ -18,13 +18,13 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 #ifndef __PACKET_FILE_LOGGER_H_ #define __PACKET_FILE_LOGGER_H_ -#include "PacketLogger.h" +#include "mafianet/packet_logger.h" #include namespace MafiaNet diff --git a/Source/include/mafianet/PacketLogger.h b/Source/include/mafianet/packet_logger.h similarity index 95% rename from Source/include/mafianet/PacketLogger.h rename to Source/include/mafianet/packet_logger.h index 638259038..c05a6eedb 100644 --- a/Source/include/mafianet/PacketLogger.h +++ b/Source/include/mafianet/packet_logger.h @@ -18,15 +18,15 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 #ifndef __PACKET_LOGGER_H #define __PACKET_LOGGER_H -#include "types.h" -#include "PluginInterface2.h" -#include "Export.h" +#include "mafianet/types.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/PacketOutputWindowLogger.h b/Source/include/mafianet/packet_output_window_logger.h similarity index 90% rename from Source/include/mafianet/PacketOutputWindowLogger.h rename to Source/include/mafianet/packet_output_window_logger.h index f36082090..c1b6b02a9 100644 --- a/Source/include/mafianet/PacketOutputWindowLogger.h +++ b/Source/include/mafianet/packet_output_window_logger.h @@ -18,13 +18,13 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 #ifndef __PACKET_OUTPUT_WINDOW_LOGGER_H_ #define __PACKET_OUTPUT_WINDOW_LOGGER_H_ -#include "PacketLogger.h" +#include "mafianet/packet_logger.h" namespace MafiaNet { diff --git a/Source/include/mafianet/PacketPool.h b/Source/include/mafianet/packet_pool.h similarity index 100% rename from Source/include/mafianet/PacketPool.h rename to Source/include/mafianet/packet_pool.h diff --git a/Source/include/mafianet/PacketPriority.h b/Source/include/mafianet/packet_priority.h similarity index 100% rename from Source/include/mafianet/PacketPriority.h rename to Source/include/mafianet/packet_priority.h diff --git a/Source/include/mafianet/PacketizedTCP.h b/Source/include/mafianet/packetized_tcp.h similarity index 92% rename from Source/include/mafianet/PacketizedTCP.h rename to Source/include/mafianet/packetized_tcp.h index f069a84f6..a67996dc4 100644 --- a/Source/include/mafianet/PacketizedTCP.h +++ b/Source/include/mafianet/packetized_tcp.h @@ -18,15 +18,15 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketizedTCP==1 && _RAKNET_SUPPORT_TCPInterface==1 #ifndef __PACKETIZED_TCP #define __PACKETIZED_TCP -#include "TCPInterface.h" -#include "DS_ByteQueue.h" -#include "DS_Map.h" +#include "mafianet/tcp_interface.h" +#include "mafianet/ds_byte_queue.h" +#include "mafianet/ds_map.h" namespace MafiaNet { diff --git a/Source/include/mafianet/peer.h b/Source/include/mafianet/peer.h index af41a5f0c..fe31cb18f 100644 --- a/Source/include/mafianet/peer.h +++ b/Source/include/mafianet/peer.h @@ -24,23 +24,23 @@ #ifndef __RAK_PEER_H #define __RAK_PEER_H -#include "ReliabilityLayer.h" -#include "peerinterface.h" -#include "BitStream.h" -#include "SingleProducerConsumer.h" -#include "SimpleMutex.h" -#include "DS_OrderedList.h" -#include "Export.h" -#include "string.h" -#include "thread.h" +#include "mafianet/reliability_layer.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/single_producer_consumer.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/export.h" +#include "mafianet/string.h" +#include "mafianet/thread.h" //#include "socket.h" -#include "smartptr.h" -#include "DS_ThreadsafeAllocatingQueue.h" -#include "SignaledEvent.h" -#include "NativeFeatureIncludes.h" -#include "SecureHandshake.h" -#include "LocklessTypes.h" -#include "DS_Queue.h" +#include "mafianet/smart_ptr.h" +#include "mafianet/ds_threadsafe_allocating_queue.h" +#include "mafianet/signaled_event.h" +#include "mafianet/native_feature_includes.h" +#include "mafianet/secure_handshake.h" +#include "mafianet/lockless_types.h" +#include "mafianet/ds_queue.h" namespace MafiaNet { /// Forward declarations @@ -76,7 +76,7 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler /// \note Call SetMaximumIncomingConnections if you want to accept incoming connections. /// \param[in] maxConnections Maximum number of connections between this instance of RakPeer and another instance of RakPeer. Required so that the network can preallocate and for thread safety. A pure client would set this to 1. A pure server would set it to the number of allowed clients.A hybrid would set it to the sum of both types of connections. /// \param[in] localPort The port to listen for connections on. On linux the system may be set up so thast ports under 1024 are restricted for everything but the root user. Use a higher port for maximum compatibility. - /// \param[in] socketDescriptors An array of SocketDescriptor structures to force RakNet to listen on a particular IP address or port (or both). Each SocketDescriptor will represent one unique socket. Do not pass redundant structures. To listen on a specific port, you can pass SocketDescriptor(myPort,0); such as for a server. For a client, it is usually OK to just pass SocketDescriptor(); However, on the XBOX be sure to use IPPROTO_VDP + /// \param[in] socketDescriptors An array of SocketDescriptor structures to force RakNet to listen on a particular IP address or port (or both). Each SocketDescriptor will represent one unique socket. Do not pass redundant structures. To listen on a specific port, you can pass SocketDescriptor(myPort,0); such as for a server. For a client, it is usually OK to just pass SocketDescriptor(); /// \param[in] socketDescriptorCount The size of the \a socketDescriptors array. Pass 1 if you are not sure what to pass. /// \param[in] threadPriority Passed to the thread creation routine. Use THREAD_PRIORITY_NORMAL for Windows. For Linux based systems, you MUST pass something reasonable based on the thread priorities for your application. /// \return RAKNET_STARTED on success, otherwise appropriate failure enumeration. @@ -87,7 +87,7 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler /// x64 builds require under 25% of the CPU time of other builds /// See the Encryption sample for example usage /// \pre Must be called while offline - /// \pre LIBCAT_SECURITY must be defined to 1 in NativeFeatureIncludes.h for this function to have any effect + /// \pre LIBCAT_SECURITY must be defined to 1 in native_feature_includes.h for this function to have any effect /// \param[in] publicKey A pointer to the public key for accepting new connections /// \param[in] privateKey A pointer to the private key for accepting new connections /// \param[in] bRequireClientKey: Should be set to false for most servers. Allows the server to accept a public key from connecting clients as a proof of identity but eats twice as much CPU time as a normal connection @@ -216,8 +216,8 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler /// \note The first byte should be a message identifier starting at ID_USER_PACKET_ENUM. /// \param[in] data Block of data to send. /// \param[in] length Size in bytes of the data to send. - /// \param[in] priority Priority level to send on. See PacketPriority.h - /// \param[in] reliability How reliably to send this data. See PacketPriority.h + /// \param[in] priority Priority level to send on. See packet_priority.h + /// \param[in] reliability How reliably to send this data. See packet_priority.h /// \param[in] orderingChannel When using ordered or sequenced messages, the channel to order these on. Messages are only ordered relative to other messages on the same stream. /// \param[in] systemIdentifier Who to send this packet to, or in the case of broadcasting who not to send it to. Pass either a SystemAddress structure or a RakNetGUID structure. Use UNASSIGNED_SYSTEM_ADDRESS or to specify none /// \param[in] broadcast True to send this packet to all connected systems. If true, then systemAddress specifies who not to send the packet to. @@ -237,8 +237,8 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler /// /// Same as the above version, but takes a BitStream as input. /// \param[in] bitStream Bitstream to send - /// \param[in] priority Priority level to send on. See PacketPriority.h - /// \param[in] reliability How reliably to send this data. See PacketPriority.h + /// \param[in] priority Priority level to send on. See packet_priority.h + /// \param[in] reliability How reliably to send this data. See packet_priority.h /// \param[in] orderingChannel Channel to order the messages on, when using ordered or sequenced messages. Messages are only ordered relative to other messages on the same stream. /// \param[in] systemIdentifier System Address or RakNetGUID to send this packet to, or in the case of broadcasting, the address not to send it to. Use UNASSIGNED_SYSTEM_ADDRESS to specify none. /// \param[in] broadcast True to send this packet to all connected systems. If true, then systemAddress specifies who not to send the packet to. @@ -260,8 +260,8 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler /// \param[in] data An array of pointers to blocks of data /// \param[in] lengths An array of integers indicating the length of each block of data /// \param[in] numParameters Length of the arrays data and lengths - /// \param[in] priority Priority level to send on. See PacketPriority.h - /// \param[in] reliability How reliably to send this data. See PacketPriority.h + /// \param[in] priority Priority level to send on. See packet_priority.h + /// \param[in] reliability How reliably to send this data. See packet_priority.h /// \param[in] orderingChannel Channel to order the messages on, when using ordered or sequenced messages. Messages are only ordered relative to other messages on the same stream. /// \param[in] systemIdentifier System Address or RakNetGUID to send this packet to, or in the case of broadcasting, the address not to send it to. Use UNASSIGNED_SYSTEM_ADDRESS to specify none. /// \param[in] broadcast True to send this packet to all connected systems. If true, then systemAddress specifies who not to send the packet to. @@ -460,7 +460,6 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler //--------------------------------------------------------------------------------------------Network Functions - Functions dealing with the network in general-------------------------------------------------------------------------------------------- /// \brief Returns the unique address identifier that represents you or another system on the the network - /// \note Not supported by the XBOX /// \param[in] systemAddress Use UNASSIGNED_SYSTEM_ADDRESS to get your behind-LAN address. Use a connected system to get their behind-LAN address. This does not return the port. /// \param[in] index When you have multiple internal IDs, which index to return? Currently limited to MAXIMUM_NUMBER_OF_INTERNAL_IDS (so the maximum value of this variable is MAXIMUM_NUMBER_OF_INTERNAL_IDS-1) /// \return Identifier of your system internally, which may not be how other systems see if you if you are behind a NAT or proxy. @@ -695,7 +694,7 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler /// \internal // Call manually if RAKPEER_USER_THREADED==1 at least every 30 milliseconds. // Call in a loop until returns false if the socket is non-blocking - // remotePortRakNetWasStartedOn_PS3 and extraSocketOptions are from SocketDescriptor when the socket was created + // extraSocketOptions is from SocketDescriptor when the socket was created // bool RunRecvFromOnce( RakNetSocket *s ); /// \internal @@ -994,7 +993,6 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler char *data; bool haveRakNetCloseSocket; unsigned connectionSocketIndex; - unsigned short remotePortRakNetWasStartedOn_PS3; unsigned int extraSocketOptions; RakNetSocket2* socket; unsigned short port; @@ -1173,9 +1171,6 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler /// Produce the connection packet that was withheld while the session handshake ran. void ProduceWithheldConnectionPacket(RemoteSystemStruct *remoteSystem, MessageID messageId); } -// #if defined(SN_TARGET_PSP2) -// __attribute__((aligned(8))) -// #endif ; } // namespace MafiaNet diff --git a/Source/include/mafianet/PeerHandle.h b/Source/include/mafianet/peer_handle.h similarity index 96% rename from Source/include/mafianet/PeerHandle.h rename to Source/include/mafianet/peer_handle.h index 779698c77..9667526f0 100644 --- a/Source/include/mafianet/PeerHandle.h +++ b/Source/include/mafianet/peer_handle.h @@ -5,7 +5,7 @@ * license.txt file in the root directory of this source tree. */ -/// \file PeerHandle.h +/// \file peer_handle.h /// \brief RAII handles for the two core MafiaNet resources. /// /// \ref MafiaNet::Peer owns a RakPeerInterface instance (GetInstance/DestroyInstance); @@ -19,11 +19,11 @@ #include // std::string (owned password / bind-address in the builders) #include // std::move -#include "mafianet/peerinterface.h" // RakPeerInterface, Send, Receive, DeallocatePacket, GetInstance, DestroyInstance +#include "mafianet/peer_interface.h" // RakPeerInterface, Send, Receive, DeallocatePacket, GetInstance, DestroyInstance #include "mafianet/types.h" // Packet, StartupResult, ConnectionAttemptResult, SocketDescriptor, PublicKey, AddressOrGUID -#include "mafianet/PacketPriority.h"// Priority, Reliability (scoped enums with the send defaults) -#include "mafianet/BitStream.h" // BitStream (the encode() scratch buffer for send/broadcast) -#include "mafianet/Export.h" // RAK_DLL_EXPORT +#include "mafianet/packet_priority.h"// Priority, Reliability (scoped enums with the send defaults) +#include "mafianet/bit_stream.h" // BitStream (the encode() scratch buffer for send/broadcast) +#include "mafianet/export.h" // RAK_DLL_EXPORT namespace MafiaNet { @@ -179,14 +179,14 @@ class RAK_DLL_EXPORT Peer { /// peer.send(dispatcher, ChatMessage{"hi", 0}, to, Reliability::Unreliable); /// \endcode /// \param[in] dispatcher A Dispatcher (or any type exposing encode(BitStream&, const T&)) T is registered with. - /// \param[in] message The value to serialize; T needs a serialize(Ar&) (see Archive.h). + /// \param[in] message The value to serialize; T needs a serialize(Ar&) (see archive.h). /// \param[in] to Destination — an AddressOrGUID, implicitly built from a SystemAddress or RakNetGUID. /// \param[in] reliability Delivery guarantee. Defaults to ReliableOrdered. /// \param[in] priority Send priority. Defaults to High. /// \param[in] orderingChannel Ordering channel for ordered/sequenced sends. Defaults to 0. /// \return The Send() receipt (0 on bad input; see RakPeerInterface::Send). - /// \note Templated on the dispatcher type so PeerHandle.h need not include - /// (and cyclically depend on) Dispatcher.h. + /// \note Templated on the dispatcher type so peer_handle.h need not include + /// (and cyclically depend on) dispatcher.h. template uint32_t send(const DispatcherT& dispatcher, const T& message, AddressOrGUID to, Reliability reliability = Reliability::ReliableOrdered, @@ -206,7 +206,7 @@ class RAK_DLL_EXPORT Peer { /// peer.broadcast(dispatcher, ChatMessage{"hi", 0}); /// \endcode /// \param[in] dispatcher A Dispatcher (or any type exposing encode(BitStream&, const T&)) T is registered with. - /// \param[in] message The value to serialize; T needs a serialize(Ar&) (see Archive.h). + /// \param[in] message The value to serialize; T needs a serialize(Ar&) (see archive.h). /// \param[in] reliability Delivery guarantee. Defaults to ReliableOrdered. /// \param[in] priority Send priority. Defaults to High. /// \param[in] orderingChannel Ordering channel for ordered/sequenced sends. Defaults to 0. diff --git a/Source/include/mafianet/peerinterface.h b/Source/include/mafianet/peer_interface.h similarity index 97% rename from Source/include/mafianet/peerinterface.h rename to Source/include/mafianet/peer_interface.h index e0727fd56..284902da5 100644 --- a/Source/include/mafianet/peerinterface.h +++ b/Source/include/mafianet/peer_interface.h @@ -22,13 +22,13 @@ #ifndef __RAK_PEER_INTERFACE_H #define __RAK_PEER_INTERFACE_H -#include "PacketPriority.h" -#include "types.h" -#include "memoryoverride.h" -#include "Export.h" -#include "DS_List.h" -#include "smartptr.h" -#include "socket2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/types.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" +#include "mafianet/ds_list.h" +#include "mafianet/smart_ptr.h" +#include "mafianet/socket2.h" namespace MafiaNet { @@ -62,7 +62,7 @@ class RAK_DLL_EXPORT RakPeerInterface /// \note Call SetMaximumIncomingConnections if you want to accept incoming connections /// \param[in] maxConnections The maximum number of connections between this instance of RakPeer and another instance of RakPeer. Required so the network can preallocate and for thread safety. A pure client would set this to 1. A pure server would set it to the number of allowed clients.- A hybrid would set it to the sum of both types of connections /// \param[in] localPort The port to listen for connections on. On linux the system may be set up so thast ports under 1024 are restricted for everything but the root user. Use a higher port for maximum compatibility. - /// \param[in] socketDescriptors An array of SocketDescriptor structures to force RakNet to listen on a particular IP address or port (or both). Each SocketDescriptor will represent one unique socket. Do not pass redundant structures. To listen on a specific port, you can pass SocketDescriptor(myPort,0); such as for a server. For a client, it is usually OK to just pass SocketDescriptor(); However, on the XBOX be sure to use IPPROTO_VDP + /// \param[in] socketDescriptors An array of SocketDescriptor structures to force RakNet to listen on a particular IP address or port (or both). Each SocketDescriptor will represent one unique socket. Do not pass redundant structures. To listen on a specific port, you can pass SocketDescriptor(myPort,0); such as for a server. For a client, it is usually OK to just pass SocketDescriptor(); /// \param[in] socketDescriptorCount The size of the \a socketDescriptors array. Pass 1 if you are not sure what to pass. /// \param[in] threadPriority Passed to the thread creation routine. Use THREAD_PRIORITY_NORMAL for Windows. For Linux based systems, you MUST pass something reasonable based on the thread priorities for your application. /// \return RAKNET_STARTED on success, otherwise appropriate failure enumeration. @@ -73,7 +73,7 @@ class RAK_DLL_EXPORT RakPeerInterface /// x64 builds require under 25% of the CPU time of other builds /// See the Encryption sample for example usage /// \pre Must be called while offline - /// \pre LIBCAT_SECURITY must be defined to 1 in NativeFeatureIncludes.h for this function to have any effect + /// \pre LIBCAT_SECURITY must be defined to 1 in native_feature_includes.h for this function to have any effect /// \param[in] publicKey A pointer to the public key for accepting new connections /// \param[in] privateKey A pointer to the private key for accepting new connections /// \param[in] bRequireClientKey: Should be set to false for most servers. Allows the server to accept a public key from connecting clients as a proof of identity but eats twice as much CPU time as a normal connection @@ -192,8 +192,8 @@ class RAK_DLL_EXPORT RakPeerInterface /// The first byte should be a message identifier starting at ID_USER_PACKET_ENUM /// \param[in] data The block of data to send /// \param[in] length The size in bytes of the data to send - /// \param[in] priority What priority level to send on. See PacketPriority.h - /// \param[in] reliability How reliability to send this data. See PacketPriority.h + /// \param[in] priority What priority level to send on. See packet_priority.h + /// \param[in] reliability How reliability to send this data. See packet_priority.h /// \param[in] orderingChannel When using ordered or sequenced messages, what channel to order these on. Messages are only ordered relative to other messages on the same stream /// \param[in] systemIdentifier Who to send this packet to, or in the case of broadcasting who not to send it to. Pass either a SystemAddress structure or a RakNetGUID structure. Use UNASSIGNED_SYSTEM_ADDRESS or to specify none /// \param[in] broadcast True to send this packet to all connected systems. If true, then systemAddress specifies who not to send the packet to. @@ -210,8 +210,8 @@ class RAK_DLL_EXPORT RakPeerInterface /// Sends a block of data to the specified system that you are connected to. Same as the above version, but takes a BitStream as input. /// \param[in] bitStream The bitstream to send - /// \param[in] priority What priority level to send on. See PacketPriority.h - /// \param[in] reliability How reliability to send this data. See PacketPriority.h + /// \param[in] priority What priority level to send on. See packet_priority.h + /// \param[in] reliability How reliability to send this data. See packet_priority.h /// \param[in] orderingChannel When using ordered or sequenced messages, what channel to order these on. Messages are only ordered relative to other messages on the same stream /// \param[in] systemIdentifier Who to send this packet to, or in the case of broadcasting who not to send it to. Pass either a SystemAddress structure or a RakNetGUID structure. Use UNASSIGNED_SYSTEM_ADDRESS or to specify none /// \param[in] broadcast True to send this packet to all connected systems. If true, then systemAddress specifies who not to send the packet to. @@ -233,8 +233,8 @@ class RAK_DLL_EXPORT RakPeerInterface /// \param[in] data An array of pointers to blocks of data /// \param[in] lengths An array of integers indicating the length of each block of data /// \param[in] numParameters Length of the arrays data and lengths - /// \param[in] priority What priority level to send on. See PacketPriority.h - /// \param[in] reliability How reliability to send this data. See PacketPriority.h + /// \param[in] priority What priority level to send on. See packet_priority.h + /// \param[in] reliability How reliability to send this data. See packet_priority.h /// \param[in] orderingChannel When using ordered or sequenced messages, what channel to order these on. Messages are only ordered relative to other messages on the same stream /// \param[in] systemIdentifier Who to send this packet to, or in the case of broadcasting who not to send it to. Pass either a SystemAddress structure or a RakNetGUID structure. Use UNASSIGNED_SYSTEM_ADDRESS or to specify none /// \param[in] broadcast True to send this packet to all connected systems. If true, then systemAddress specifies who not to send the packet to. @@ -460,7 +460,6 @@ class RAK_DLL_EXPORT RakPeerInterface //--------------------------------------------------------------------------------------------Network Functions - Functions dealing with the network in general-------------------------------------------------------------------------------------------- /// Return the unique address identifier that represents you or another system on the the network and is based on your local IP / port. - /// \note Not supported by the XBOX /// \param[in] systemAddress Use UNASSIGNED_SYSTEM_ADDRESS to get your behind-LAN address. Use a connected system to get their behind-LAN address /// \param[in] index When you have multiple internal IDs, which index to return? Currently limited to MAXIMUM_NUMBER_OF_INTERNAL_IDS (so the maximum value of this variable is MAXIMUM_NUMBER_OF_INTERNAL_IDS-1) /// \return the identifier of your system internally, which may not be how other systems see if you if you are behind a NAT or proxy @@ -692,9 +691,6 @@ class RAK_DLL_EXPORT RakPeerInterface virtual bool SendOutOfBand(const char *host, unsigned short remotePort, const char *data, BitSize_t dataLength, unsigned connectionSocketIndex=0 )=0; } -// #if defined(SN_TARGET_PSP2) -// __attribute__((aligned(8))) -// #endif ; } // namespace MafiaNet diff --git a/Source/include/mafianet/PluginInterface2.h b/Source/include/mafianet/plugin_interface2.h similarity index 96% rename from Source/include/mafianet/PluginInterface2.h rename to Source/include/mafianet/plugin_interface2.h index e07337556..6a14a5854 100644 --- a/Source/include/mafianet/PluginInterface2.h +++ b/Source/include/mafianet/plugin_interface2.h @@ -21,10 +21,10 @@ #ifndef __PLUGIN_INTERFACE_2_H #define __PLUGIN_INTERFACE_2_H -#include "NativeFeatureIncludes.h" -#include "types.h" -#include "Export.h" -#include "PacketPriority.h" +#include "mafianet/native_feature_includes.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/packet_priority.h" namespace MafiaNet { diff --git a/Source/include/mafianet/PointGridSectorizer.h b/Source/include/mafianet/point_grid_sectorizer.h similarity index 98% rename from Source/include/mafianet/PointGridSectorizer.h rename to Source/include/mafianet/point_grid_sectorizer.h index 386973d50..b9ee973ef 100644 --- a/Source/include/mafianet/PointGridSectorizer.h +++ b/Source/include/mafianet/point_grid_sectorizer.h @@ -21,9 +21,9 @@ #ifndef MAFIANET_POINT_GRID_SECTORIZER_H #define MAFIANET_POINT_GRID_SECTORIZER_H -#include "Export.h" -#include "memoryoverride.h" -#include "DS_List.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_list.h" namespace MafiaNet { diff --git a/Source/include/mafianet/Rackspace.h b/Source/include/mafianet/rackspace.h similarity index 97% rename from Source/include/mafianet/Rackspace.h rename to Source/include/mafianet/rackspace.h index aecadbdd1..c5783eeda 100644 --- a/Source/include/mafianet/Rackspace.h +++ b/Source/include/mafianet/rackspace.h @@ -13,20 +13,20 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file Rackspace.h +/// \file rackspace.h /// \brief Helper to class to manage Rackspace servers /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_Rackspace==1 && _RAKNET_SUPPORT_TCPInterface==1 -#include "Export.h" -#include "DS_List.h" -#include "types.h" -#include "DS_Queue.h" -#include "string.h" +#include "mafianet/export.h" +#include "mafianet/ds_list.h" +#include "mafianet/types.h" +#include "mafianet/ds_queue.h" +#include "mafianet/string.h" #ifndef __RACKSPACE_H #define __RACKSPACE_H @@ -362,7 +362,7 @@ namespace MafiaNet static const char * EventTypeToString(RackspaceEventType eventType); /// \brief Mostly for internal use, but you can use it to execute an operation with more complex xml if desired - /// See the Rackspace.cpp on how to use it + /// See the rackspace.cpp on how to use it void AddOperation(RackspaceOperationType type, MafiaNet::RakString httpCommand, MafiaNet::RakString operation, MafiaNet::RakString xml); protected: diff --git a/Source/include/mafianet/Rand.h b/Source/include/mafianet/rand.h similarity index 95% rename from Source/include/mafianet/Rand.h rename to Source/include/mafianet/rand.h index 4118b8219..436ba1222 100644 --- a/Source/include/mafianet/Rand.h +++ b/Source/include/mafianet/rand.h @@ -22,7 +22,7 @@ #ifndef __RAND_H #define __RAND_H -#include "Export.h" +#include "mafianet/export.h" /// Initialise seed for Random Generator /// \note not threadSafe, use an instance of RakNetRandom if necessary per thread diff --git a/Source/include/mafianet/RandSync.h b/Source/include/mafianet/rand_sync.h similarity index 89% rename from Source/include/mafianet/RandSync.h rename to Source/include/mafianet/rand_sync.h index 02891e63c..61a5bf11a 100644 --- a/Source/include/mafianet/RandSync.h +++ b/Source/include/mafianet/rand_sync.h @@ -22,10 +22,10 @@ #ifndef __RAND_SYNC_H #define __RAND_SYNC_H -#include "Export.h" -#include "Rand.h" -#include "DS_Queue.h" -#include "NativeTypes.h" +#include "mafianet/export.h" +#include "mafianet/rand.h" +#include "mafianet/ds_queue.h" +#include "mafianet/native_types.h" namespace MafiaNet { diff --git a/Source/include/mafianet/ReadyEvent.h b/Source/include/mafianet/ready_event.h similarity index 97% rename from Source/include/mafianet/ReadyEvent.h rename to Source/include/mafianet/ready_event.h index 66f340a7c..706a2a6cc 100644 --- a/Source/include/mafianet/ReadyEvent.h +++ b/Source/include/mafianet/ready_event.h @@ -18,14 +18,14 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ReadyEvent==1 #ifndef __READY_EVENT_H #define __READY_EVENT_H -#include "PluginInterface2.h" -#include "DS_OrderedList.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_ordered_list.h" namespace MafiaNet { diff --git a/Source/include/mafianet/RefCountedObj.h b/Source/include/mafianet/ref_counted_obj.h similarity index 93% rename from Source/include/mafianet/RefCountedObj.h rename to Source/include/mafianet/ref_counted_obj.h index 4d5ba7a42..26bd444ae 100644 --- a/Source/include/mafianet/RefCountedObj.h +++ b/Source/include/mafianet/ref_counted_obj.h @@ -22,7 +22,7 @@ #ifndef __REF_COUNTED_OBJ_H #define __REF_COUNTED_OBJ_H -#include "memoryoverride.h" +#include "mafianet/memory_override.h" /// World's simplest class :) class RefCountedObj diff --git a/Source/include/mafianet/RelayPlugin.h b/Source/include/mafianet/relay_plugin.h similarity index 95% rename from Source/include/mafianet/RelayPlugin.h rename to Source/include/mafianet/relay_plugin.h index 18fa910e8..53988440d 100644 --- a/Source/include/mafianet/RelayPlugin.h +++ b/Source/include/mafianet/relay_plugin.h @@ -18,15 +18,15 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_RelayPlugin==1 #ifndef __RELAY_PLUGIN_H #define __RELAY_PLUGIN_H -#include "PluginInterface2.h" -#include "string.h" -#include "DS_Hash.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/string.h" +#include "mafianet/ds_hash.h" /// \defgroup RELAY_PLUGIN_GROUP RelayPlugin /// \brief A simple class to relay messages from one system to another through an intermediary diff --git a/Source/include/mafianet/ReliabilityLayer.h b/Source/include/mafianet/reliability_layer.h similarity index 94% rename from Source/include/mafianet/ReliabilityLayer.h rename to Source/include/mafianet/reliability_layer.h index 7b1d1fff0..6ba63f15c 100644 --- a/Source/include/mafianet/ReliabilityLayer.h +++ b/Source/include/mafianet/reliability_layer.h @@ -21,35 +21,35 @@ #ifndef __RELIABILITY_LAYER_H #define __RELIABILITY_LAYER_H -#include "memoryoverride.h" -#include "MTUSize.h" -#include "DS_LinkedList.h" -#include "DS_List.h" -#include "SocketLayer.h" -#include "PacketPriority.h" -#include "DS_Queue.h" -#include "BitStream.h" -#include "InternalPacket.h" -#include "statistics.h" -#include "DR_SHA1.h" -#include "DS_OrderedList.h" -#include "DS_RangeList.h" -#include "DS_BPlusTree.h" -#include "DS_MemoryPool.h" -#include "defines.h" -#include "DS_Heap.h" -#include "BitStream.h" -#include "NativeFeatureIncludes.h" -#include "SecureHandshake.h" -#include "PluginInterface2.h" -#include "Rand.h" -#include "socket2.h" +#include "mafianet/memory_override.h" +#include "mafianet/mtu_size.h" +#include "mafianet/ds_linked_list.h" +#include "mafianet/ds_list.h" +#include "mafianet/socket_layer.h" +#include "mafianet/packet_priority.h" +#include "mafianet/ds_queue.h" +#include "mafianet/bit_stream.h" +#include "mafianet/internal_packet.h" +#include "mafianet/statistics.h" +#include "mafianet/dr_sha1.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/ds_range_list.h" +#include "mafianet/ds_bplus_tree.h" +#include "mafianet/ds_memory_pool.h" +#include "mafianet/defines.h" +#include "mafianet/ds_heap.h" +#include "mafianet/bit_stream.h" +#include "mafianet/native_feature_includes.h" +#include "mafianet/secure_handshake.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/rand.h" +#include "mafianet/socket2.h" #if USE_SLIDING_WINDOW_CONGESTION_CONTROL!=1 -#include "CCRakNetUDT.h" +#include "mafianet/cc_udt.h" #define INCLUDE_TIMESTAMP_WITH_DATAGRAMS 1 #else -#include "CCRakNetSlidingWindow.h" +#include "mafianet/cc_sliding_window.h" #define INCLUDE_TIMESTAMP_WITH_DATAGRAMS 0 #endif @@ -63,7 +63,7 @@ namespace MafiaNet { /// Forward declarations class PluginInterface2; class RakNetRandom; -class RNS2SendBatch; // MmsgBatch.h +class RNS2SendBatch; // mmsg_batch.h typedef uint64_t reliabilityHeapWeightType; // #med - consider a more suitable name for the class / maybe even make an internal class to SplitPacketChannel? @@ -179,7 +179,7 @@ class ReliabilityLayer// /// The connection's current MTU in bytes, including UDP/IP headers. Starts /// at the handshake-negotiated size passed to Reset() and steps down the - /// ladder in MtuBlackHole.h when an in-session path-MTU black hole is + /// ladder in mtu_black_hole.h when an in-session path-MTU black hole is /// detected. Never rises again for the life of the connection. int GetCurrentMtuBytes(void) const; @@ -331,7 +331,7 @@ class ReliabilityLayer// void SplitPacket( InternalPacket *internalPacket ); /// In-session path-MTU black-hole recovery: drop currentMtuBytes one rung - /// down the ladder in MtuBlackHole.h, shrink the congestion manager's + /// down the ladder in mtu_black_hole.h, shrink the congestion manager's /// datagram ceiling to match, and re-split every queued message that no /// longer fits. Called from Update() when a too-large reliable packet has /// burnt its resend budget without an ack (ShouldStepDownMtu). @@ -585,7 +585,6 @@ class ReliabilityLayer// unsigned int length; MafiaNet::TimeMS sendTime; // SystemAddress systemAddress; - unsigned short remotePortRakNetWasStartedOn_PS3; unsigned int extraSocketOptions; }; DataStructures::Queue delayList; diff --git a/Source/include/mafianet/ReplicaEnums.h b/Source/include/mafianet/replica_enums.h similarity index 100% rename from Source/include/mafianet/ReplicaEnums.h rename to Source/include/mafianet/replica_enums.h diff --git a/Source/include/mafianet/ReplicaManager3.h b/Source/include/mafianet/replica_manager3.h similarity index 97% rename from Source/include/mafianet/ReplicaManager3.h rename to Source/include/mafianet/replica_manager3.h index 6a187b7c5..3254f4e4f 100644 --- a/Source/include/mafianet/ReplicaManager3.h +++ b/Source/include/mafianet/replica_manager3.h @@ -18,22 +18,22 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ReplicaManager3==1 #ifndef __REPLICA_MANAGER_3 #define __REPLICA_MANAGER_3 -#include "types.h" -#include "time.h" -#include "BitStream.h" -#include "PacketPriority.h" -#include "PluginInterface2.h" -#include "NetworkIDObject.h" -#include "DS_OrderedList.h" -#include "DS_Queue.h" -#include "SimpleMutex.h" -#include "VirtualWorld.h" +#include "mafianet/types.h" +#include "mafianet/time.h" +#include "mafianet/bit_stream.h" +#include "mafianet/packet_priority.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/network_id_object.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/ds_queue.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/virtual_world.h" /// \defgroup REPLICA_MANAGER_GROUP3 ReplicaManager3 /// \brief Third implementation of object replication @@ -229,7 +229,7 @@ class RAK_DLL_EXPORT ReplicaManager3 : public PluginInterface2 /// \brief Return the connections (observers) currently in a given virtual world. /// \details Recipient-filter helper for scoping non-replica traffic (chat, RPC4, - /// raw Send) by virtual world. See VirtualWorld.h for the dimension model. + /// raw Send) by virtual world. See virtual_world.h for the dimension model. /// \param[in] virtualWorld The virtual world to match. See SetPlayerVirtualWorld() and Connection_RM3::SetVirtualWorld() /// \param[out] connectionsOut Populated with the matching connections (cleared first) /// \param[in] includeGlobal If true, also include observers in VIRTUAL_WORLD_GLOBAL @@ -526,7 +526,7 @@ class RAK_DLL_EXPORT Connection_RM3 /// \brief Set the virtual world (dimension) this observer perceives. /// \details Entities (VirtualWorldReplica3) are only constructed/serialized to this /// connection when they share this virtual world (or either side is VIRTUAL_WORLD_GLOBAL). - /// See VirtualWorld.h and ReplicaManager3::SetPlayerVirtualWorld(). + /// See virtual_world.h and ReplicaManager3::SetPlayerVirtualWorld(). void SetVirtualWorld(VirtualWorldId vw) {virtualWorld=vw;} /// \return The virtual world this observer perceives. Defaults to VIRTUAL_WORLD_DEFAULT. @@ -551,7 +551,7 @@ class RAK_DLL_EXPORT Connection_RM3 /// Do not call Replica3::QueryConstruction() or Replica3::QueryDestruction() /// Call Connection_RM3::QueryReplicaList() to determine which objects exist on remote systems /// This can be faster than QUERY_REPLICA_FOR_CONSTRUCTION and QUERY_REPLICA_FOR_CONSTRUCTION_AND_DESTRUCTION for large worlds - /// See GridSectorizer.h under /Source for code that can help with this + /// See grid_sectorizer.h under /Source for code that can help with this QUERY_CONNECTION_FOR_REPLICA_LIST }; @@ -651,7 +651,7 @@ class RAK_DLL_EXPORT Connection_RM3 SystemAddress systemAddress; RakNetGUID guid; - // The virtual world (dimension) this observer perceives. See VirtualWorld.h. + // The virtual world (dimension) this observer perceives. See virtual_world.h. VirtualWorldId virtualWorld; /* diff --git a/Source/include/mafianet/Router2.h b/Source/include/mafianet/router2.h similarity index 93% rename from Source/include/mafianet/Router2.h rename to Source/include/mafianet/router2.h index 879aa27a4..f2d5a21b9 100644 --- a/Source/include/mafianet/Router2.h +++ b/Source/include/mafianet/router2.h @@ -18,20 +18,20 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_Router2==1 && _RAKNET_SUPPORT_UDPForwarder==1 #ifndef __ROUTER_2_PLUGIN_H #define __ROUTER_2_PLUGIN_H -#include "types.h" -#include "PluginInterface2.h" -#include "PacketPriority.h" -#include "Export.h" -#include "UDPForwarder.h" -#include "MessageIdentifiers.h" -#include "DS_List.h" -#include "SimpleMutex.h" +#include "mafianet/types.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/export.h" +#include "mafianet/udp_forwarder.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/ds_list.h" +#include "mafianet/simple_mutex.h" namespace MafiaNet { diff --git a/Source/include/mafianet/RPC4Plugin.h b/Source/include/mafianet/rpc4_plugin.h similarity index 96% rename from Source/include/mafianet/RPC4Plugin.h rename to Source/include/mafianet/rpc4_plugin.h index 04dcfa08c..33c4c01f6 100644 --- a/Source/include/mafianet/RPC4Plugin.h +++ b/Source/include/mafianet/rpc4_plugin.h @@ -18,20 +18,20 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_RPC4Plugin==1 #ifndef __RPC_4_PLUGIN_H #define __RPC_4_PLUGIN_H -#include "PluginInterface2.h" -#include "PacketPriority.h" -#include "types.h" -#include "BitStream.h" -#include "string.h" -#include "NetworkIDObject.h" -#include "DS_Hash.h" -#include "DS_OrderedList.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/types.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string.h" +#include "mafianet/network_id_object.h" +#include "mafianet/ds_hash.h" +#include "mafianet/ds_ordered_list.h" /// \defgroup RPC_PLUGIN_GROUP RPC /// \brief Remote procedure calls, without external dependencies. diff --git a/Source/include/mafianet/SecureHandshake.h b/Source/include/mafianet/secure_handshake.h similarity index 91% rename from Source/include/mafianet/SecureHandshake.h rename to Source/include/mafianet/secure_handshake.h index 391b13f81..00a831b00 100644 --- a/Source/include/mafianet/SecureHandshake.h +++ b/Source/include/mafianet/secure_handshake.h @@ -15,7 +15,7 @@ #ifndef SECURE_HANDSHAKE_H #define SECURE_HANDSHAKE_H -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if LIBCAT_SECURITY==1 diff --git a/Source/include/mafianet/SendToThread.h b/Source/include/mafianet/send_to_thread.h similarity index 83% rename from Source/include/mafianet/SendToThread.h rename to Source/include/mafianet/send_to_thread.h index f097fb6ca..5f3642227 100644 --- a/Source/include/mafianet/SendToThread.h +++ b/Source/include/mafianet/send_to_thread.h @@ -16,14 +16,14 @@ #ifndef __SENDTO_THREAD #define __SENDTO_THREAD -#include "defines.h" +#include "mafianet/defines.h" #ifdef USE_THREADED_SEND -#include "InternalPacket.h" -#include "SocketLayer.h" -#include "DS_ThreadsafeAllocatingQueue.h" -#include "ThreadPool.h" +#include "mafianet/internal_packet.h" +#include "mafianet/socket_layer.h" +#include "mafianet/ds_threadsafe_allocating_queue.h" +#include "mafianet/thread_pool.h" namespace MafiaNet { @@ -37,7 +37,6 @@ class SendToThread { SOCKET s; SystemAddress systemAddress; - unsigned short remotePortRakNetWasStartedOn_PS3; unsigned int extraSocketOptions; char data[MAXIMUM_MTU_SIZE]; unsigned short dataWriteOffset; diff --git a/Source/include/mafianet/SessionAdmission.h b/Source/include/mafianet/session_admission.h similarity index 98% rename from Source/include/mafianet/SessionAdmission.h rename to Source/include/mafianet/session_admission.h index 802eabb31..bbee6a315 100644 --- a/Source/include/mafianet/SessionAdmission.h +++ b/Source/include/mafianet/session_admission.h @@ -5,7 +5,7 @@ * license.txt file in the root directory of this source tree. */ -/// \file SessionAdmission.h +/// \file session_admission.h /// \brief The slot accounting RakPeer applies to remote-initiated peers, as pure functions. /// /// Kept out of RakPeer so the rules are unit tested directly rather than only through loopback traffic. diff --git a/Source/include/mafianet/SignaledEvent.h b/Source/include/mafianet/signaled_event.h similarity index 87% rename from Source/include/mafianet/SignaledEvent.h rename to Source/include/mafianet/signaled_event.h index 75d88b0d3..bd0d8efa6 100644 --- a/Source/include/mafianet/SignaledEvent.h +++ b/Source/include/mafianet/signaled_event.h @@ -19,21 +19,21 @@ #if defined(_WIN32) -#include "WindowsIncludes.h" +#include "mafianet/windows_includes.h" #else #include #include - #include "SimpleMutex.h" + #include "mafianet/simple_mutex.h" #endif -#include "Export.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/SimpleMutex.h b/Source/include/mafianet/simple_mutex.h similarity index 90% rename from Source/include/mafianet/SimpleMutex.h rename to Source/include/mafianet/simple_mutex.h index ed3444f55..2f77f8337 100644 --- a/Source/include/mafianet/SimpleMutex.h +++ b/Source/include/mafianet/simple_mutex.h @@ -22,18 +22,18 @@ #ifndef __SIMPLE_MUTEX_H #define __SIMPLE_MUTEX_H -#include "memoryoverride.h" +#include "mafianet/memory_override.h" #if defined(_WIN32) -#include "WindowsIncludes.h" +#include "mafianet/windows_includes.h" #else #include #include #endif -#include "Export.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/SimpleTCPServer.h b/Source/include/mafianet/simple_tcp_server.h similarity index 100% rename from Source/include/mafianet/SimpleTCPServer.h rename to Source/include/mafianet/simple_tcp_server.h diff --git a/Source/include/mafianet/SingleProducerConsumer.h b/Source/include/mafianet/single_producer_consumer.h similarity index 96% rename from Source/include/mafianet/SingleProducerConsumer.h rename to Source/include/mafianet/single_producer_consumer.h index 094ebd2ab..69ee0e726 100644 --- a/Source/include/mafianet/SingleProducerConsumer.h +++ b/Source/include/mafianet/single_producer_consumer.h @@ -22,12 +22,12 @@ #ifndef __SINGLE_PRODUCER_CONSUMER_H #define __SINGLE_PRODUCER_CONSUMER_H -#include "assert.h" +#include "mafianet/assert.h" static const int MINIMUM_LIST_SIZE=8; -#include "memoryoverride.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" /// The namespace DataStructures was only added to avoid compiler errors for commonly named data structures /// As these data structures are stand-alone, you can use them outside of RakNet for your own projects if you wish. diff --git a/Source/include/mafianet/sleep.h b/Source/include/mafianet/sleep.h index 83f825787..7bb5348a4 100644 --- a/Source/include/mafianet/sleep.h +++ b/Source/include/mafianet/sleep.h @@ -11,7 +11,7 @@ #ifndef __RAK_SLEEP_H #define __RAK_SLEEP_H -#include "Export.h" +#include "mafianet/export.h" void RAK_DLL_EXPORT RakSleep(unsigned int ms); diff --git a/Source/include/mafianet/smartptr.h b/Source/include/mafianet/smart_ptr.h similarity index 94% rename from Source/include/mafianet/smartptr.h rename to Source/include/mafianet/smart_ptr.h index fd4e0f966..67c28b2a8 100644 --- a/Source/include/mafianet/smartptr.h +++ b/Source/include/mafianet/smart_ptr.h @@ -19,8 +19,8 @@ // From http://www.codeproject.com/KB/cpp/SmartPointers.aspx // with bugs fixed -#include "memoryoverride.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/export.h" //static int allocCount=0; //static int deallocCount=0; diff --git a/Source/include/mafianet/socket.h b/Source/include/mafianet/socket.h deleted file mode 100644 index f78b3b4dd..000000000 --- a/Source/include/mafianet/socket.h +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Original work: Copyright (c) 2014, Oculus VR, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * RakNet License.txt file in the licenses directory of this source tree. An additional grant - * of patent rights can be found in the RakNet Patents.txt file in the same directory. - * - * - * Modified work: Copyright (c) 2017, SLikeSoft UG (haftungsbeschränkt) - * - * This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style - * license found in the license.txt file in the root directory of this source tree. - */ - -/* -#ifndef __RAKNET_SOCKET_H -#define __RAKNET_SOCKET_H - -#include "types.h" -#include "defines.h" -#include "Export.h" -#include "SocketIncludes.h" -#include "assert.h" -#include "SocketDefines.h" -#include "MTUSize.h" - -namespace MafiaNet -{ - -struct RAK_DLL_EXPORT RakNetSocket -{ -public: - RakNetSocket(); - ~RakNetSocket(); - -// void Accept( -// struct sockaddr *addr, -// int *addrlen); - - inline int Connect( - const struct sockaddr *name, - int namelen) {return connect__(s,name,namelen);} - - static RakNetSocket* Create -#ifdef __native_client__ - (_PP_Instance_ _chromeInstance); -#else - (int af, - int type, - int protocol); -#endif - - int Bind( - const struct sockaddr *addr, - int namelen); - - inline int GetSockName( - struct sockaddr *name, - socklen_t * namelen) {return getsockname__(s,name,namelen);} - - inline int GetSockOpt ( - int level, - int optname, - char * optval, - socklen_t *optlen) {return getsockopt__(s,level,optname,optval,optlen);} - - - int IOCTLSocket( - long cmd, - unsigned long *argp); - - int Listen ( - int backlog); - - inline int Recv( - char * buf, - int len, - int flags) {return recv__(s,buf,len,flags);} - - inline int RecvFrom( - char * buf, - int len, - int flags, - struct sockaddr * from, - socklen_t * fromlen) {return recvfrom__(s,buf,len,flags,from,fromlen);} - -// inline int Select( -// int nfds, -// fd_set *readfds, -// fd_set *writefds, -// fd_set *exceptfds, -// struct timeval *timeout) {return select__(nfds,readfds,writefds,exceptfds,timeout);} - - inline int Send( - const char * buf, - int len, - int flags) {return send__(s,buf,len,flags);} - - inline int SendTo( - const char * buf, - int len, - int flags, - const struct sockaddr *to, - int tolen) {return sendto__(s,buf,len,flags,to,tolen);} - - #ifdef _WIN32 - #elif defined(_PS3) || defined(__PS3__) || defined(SN_TARGET_PS3) || defined(_PS4) || defined(SN_TARGET_PSP2) - #else - inline int Fcntl(int cmd, int arg) {return fcntl(s,cmd,arg);} - #endif - - -#if defined(_WIN32) - inline int _WSASendTo( - LPWSABUF lpBuffers, - DWORD dwBufferCount, - LPDWORD lpNumberOfBytesSent, - DWORD dwFlags, - const struct sockaddr FAR * lpTo, - int iTolen, - LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine - ) - { return WSASendTo(s,lpBuffers,dwBufferCount,lpNumberOfBytesSent,dwFlags,lpTo,iTolen,lpOverlapped,lpCompletionRoutine);} - -#endif - - int SetSockOpt( - int level, - int optname, - const char * optval, - int optlen); - - int Shutdown( - int how); - - - inline void SetRemotePortRakNetWasStartedOn(unsigned short i) {remotePortRakNetWasStartedOn_PS3_PSP2=i;} - inline void SetUserConnectionSocketIndex(unsigned int i) {userConnectionSocketIndex=i;} - inline void SetBoundAddress(SystemAddress i) {boundAddress=i;} - inline void SetSocketFamily(unsigned short i) {socketFamily=i;} - inline void SetBlockingSocket(bool i) {blockingSocket=i;} - inline void SetExtraSocketOptions(unsigned int i) {extraSocketOptions=i;} - inline void SetChromeInstance(_PP_Instance_ i) {chromeInstance=i;} - inline void SetBoundAddressToLoopback(unsigned char ipVersion) {boundAddress.SetToLoopback(ipVersion);} - - inline SystemAddress GetBoundAddress(void) const {return boundAddress;} - inline unsigned short GetRemotePortRakNetWasStartedOn(void) const {return remotePortRakNetWasStartedOn_PS3_PSP2;} - inline bool GetBlockingSocket(void) {return blockingSocket;} - inline unsigned int GetExtraSocketOptions(void) const {return extraSocketOptions;} - inline unsigned short GetSocketFamily(void) const {return socketFamily;} - inline _PP_Instance_ GetChromeInstance(void) const {return chromeInstance;} - inline unsigned int GetUserConnectionSocketIndex(void) const { - RakAssert(userConnectionSocketIndex!=(unsigned int)-1); - return userConnectionSocketIndex;} - - -#ifdef __native_client__ - // Flag indicating if a SendTo is currently in progress - bool sendInProgress; - - // Data for next queued packet to send, if nextSendSize > 0 - char nextSendBuffer[MAXIMUM_MTU_SIZE]; - - // Size of next queued packet to send, or 0 if no queued packet - int nextSendSize; - - // Destination address of queued packet - PP_NetAddress_Private nextSendAddr; -#endif - - __UDPSOCKET__ s; - -protected: - -#if defined (_WIN32) && defined(USE_WAIT_FOR_MULTIPLE_EVENTS) - void* recvEvent; -#endif - - #if defined(_PS3) || defined(__PS3__) || defined(SN_TARGET_PS3) || defined(_PS4) || defined(SN_TARGET_PSP2) - /// PS3: Set for the PS3, when using signaling. - /// PS3: Connect with the port returned by signaling. Set this to whatever port RakNet was actually started on - /// PSP2: Set non-zero to use SCE_NET_SOCK_DGRAM_P2P. This should be done for ad-hoc or with - #endif - - unsigned short remotePortRakNetWasStartedOn_PS3_PSP2; - unsigned int userConnectionSocketIndex; - SystemAddress boundAddress; - unsigned short socketFamily; - bool blockingSocket; - unsigned int extraSocketOptions; - _PP_Instance_ chromeInstance; -}; - -} // namespace MafiaNet - -#endif -*/ diff --git a/Source/include/mafianet/socket2.h b/Source/include/mafianet/socket2.h index 25ba6a494..f7cecf248 100644 --- a/Source/include/mafianet/socket2.h +++ b/Source/include/mafianet/socket2.h @@ -16,12 +16,12 @@ #ifndef __RAKNET_SOCKET_2_H #define __RAKNET_SOCKET_2_H -#include "types.h" -#include "MTUSize.h" -#include "LocklessTypes.h" -#include "thread.h" -#include "DS_ThreadsafeAllocatingQueue.h" -#include "Export.h" +#include "mafianet/types.h" +#include "mafianet/mtu_size.h" +#include "mafianet/lockless_types.h" +#include "mafianet/thread.h" +#include "mafianet/ds_threadsafe_allocating_queue.h" +#include "mafianet/export.h" // Batched datagram I/O (recvmmsg / sendmmsg) is guarded by a plain // `#if defined(__linux__)` wherever it appears. There is no macro and no build @@ -208,7 +208,6 @@ struct RNS2_BerkleyBindParameters int doNotFragment; int pollingThreadPriority; RNS2EventHandler *eventHandler; - unsigned short remotePortRakNetWasStartedOn_PS3_PS4_PSP2; }; // Berkeley sockets interface - base class for all platforms @@ -275,11 +274,11 @@ class RNS2_Berkley : public IRNS2_Berkley }; #if defined(_WIN32) || defined(__GNUC__) || defined(__GCCXML__) || defined(__S3E__) -class RNS2_Windows_Linux_360 +class RNS2_Windows_Linux { public: protected: - static RNS2SendResult Send_Windows_Linux_360NoVDP( RNS2Socket rns2Socket, RNS2_SendParameters *sendParameters, const char *file, unsigned int line ); + static RNS2SendResult Send_Windows_Linux( RNS2Socket rns2Socket, RNS2_SendParameters *sendParameters, const char *file, unsigned int line ); }; #endif @@ -299,7 +298,7 @@ class RAK_DLL_EXPORT SocketLayerOverride virtual int RakNetRecvFrom( char dataOut[ MAXIMUM_MTU_SIZE ], SystemAddress *senderOut, bool calledFromMainThread )=0; }; -class RNS2_Windows : public RNS2_Berkley, public RNS2_Windows_Linux_360 +class RNS2_Windows : public RNS2_Berkley, public RNS2_Windows_Linux { public: RNS2_Windows(); @@ -317,7 +316,7 @@ class RNS2_Windows : public RNS2_Berkley, public RNS2_Windows_Linux_360 }; #else -class RNS2_Linux : public RNS2_Berkley, public RNS2_Windows_Linux_360 +class RNS2_Linux : public RNS2_Berkley, public RNS2_Windows_Linux { public: RNS2BindResult Bind( RNS2_BerkleyBindParameters *bindParameters, const char *file, unsigned int line ); diff --git a/Source/include/mafianet/SocketDefines.h b/Source/include/mafianet/socket_defines.h similarity index 85% rename from Source/include/mafianet/SocketDefines.h rename to Source/include/mafianet/socket_defines.h index 18f09001c..b41e43b9b 100644 --- a/Source/include/mafianet/SocketDefines.h +++ b/Source/include/mafianet/socket_defines.h @@ -20,10 +20,6 @@ #if defined(_WIN32) #define closesocket__ closesocket #define select__ select - #elif defined(__native_client__) - // namespace MafiaNet { void CloseSocket(SOCKET s); } - // #define closesocket__ MafiaNet::CloseSocket - #define select__ select #else #define closesocket__ close #define select__ select diff --git a/Source/include/mafianet/SocketIncludes.h b/Source/include/mafianet/socket_includes.h similarity index 53% rename from Source/include/mafianet/SocketIncludes.h rename to Source/include/mafianet/socket_includes.h index 56ecc2469..c346d439a 100644 --- a/Source/include/mafianet/SocketIncludes.h +++ b/Source/include/mafianet/socket_includes.h @@ -13,31 +13,6 @@ // All this crap just to include type SOCKET -#ifdef __native_client__ -#define _PP_Instance_ PP_Instance -#else -#define _PP_Instance_ int -#endif - - - - - - - - - - - - - - - - - - - - #if defined(_WIN32) // IP_DONTFRAGMENT is different between winsock 1 and winsock 2. Therefore, Winsock2.h must be linked againt Ws2_32.lib // winsock.h must be linked against WSock32.lib. If these two are mixed up the flag won't work correctly @@ -57,42 +32,13 @@ #include #include - #ifdef __native_client__ - #include "ppapi/cpp/private/net_address_private.h" - #include "ppapi/c/pp_bool.h" - #include "ppapi/c/pp_errors.h" - #include "ppapi/cpp/completion_callback.h" - #include "ppapi/cpp/instance_handle.h" - #include "ppapi/cpp/module.h" - #include "ppapi/cpp/module_impl.h" - #include "ppapi/c/pp_errors.h" - #include "ppapi/c/pp_module.h" - #include "ppapi/c/pp_var.h" - #include "ppapi/c/pp_resource.h" - #include "ppapi/c/ppb.h" - #include "ppapi/c/ppb_instance.h" - #include "ppapi/c/ppb_messaging.h" - #include "ppapi/c/ppb_var.h" - #include "ppapi/c/ppp.h" - #include "ppapi/c/ppb_core.h" - #include "ppapi/c/ppp_instance.h" - #include "ppapi/c/ppp_messaging.h" - #include "ppapi/c/pp_input_event.h" - #include "ppapi/c/pp_completion_callback.h" - //UDP specific - the 'private' folder was copied from the chromium src/ppapi/c headers folder - #include "ppapi/c/private/ppb_udp_socket_private.h" - #include "ppapi/cpp/private/net_address_private.h" - typedef PP_Resource __UDPSOCKET__; - typedef PP_Resource __TCPSOCKET__; - #else - //#include "memoryoverride.h" + //#include "mafianet/memory_override.h" /// Unix/Linux uses ints for sockets typedef int __UDPSOCKET__; typedef int __TCPSOCKET__; /// Define SOCKET for cross-platform compatibility with Windows code typedef int SOCKET; #define INVALID_SOCKET -1 -#endif #endif diff --git a/Source/include/mafianet/SocketLayer.h b/Source/include/mafianet/socket_layer.h similarity index 72% rename from Source/include/mafianet/SocketLayer.h rename to Source/include/mafianet/socket_layer.h index 1ef88e71c..cf4df76b8 100644 --- a/Source/include/mafianet/SocketLayer.h +++ b/Source/include/mafianet/socket_layer.h @@ -23,13 +23,13 @@ #ifndef __SOCKET_LAYER_H #define __SOCKET_LAYER_H -#include "memoryoverride.h" -#include "types.h" -#include "smartptr.h" +#include "mafianet/memory_override.h" +#include "mafianet/types.h" +#include "mafianet/smart_ptr.h" //#include "socket.h" -#include "Export.h" -#include "MTUSize.h" -#include "string.h" +#include "mafianet/export.h" +#include "mafianet/mtu_size.h" +#include "mafianet/string.h" //#include "ClientContextStruct.h" @@ -66,20 +66,6 @@ class RAK_DLL_EXPORT SocketLayer // Destructor ~SocketLayer(); - /* - /// Creates a bound socket to listen for incoming connections on the specified port - /// \param[in] port the port number - /// \param[in] blockingSocket - /// \return A new socket used for accepting clients - static RakNetSocket* CreateBoundSocket( RakPeer *peer, unsigned short port, bool blockingSocket, const char *forceHostAddress, unsigned int sleepOn10048, unsigned int extraSocketOptions, unsigned short socketFamily, _PP_Instance_ chromeInstance ); - static RakNetSocket* CreateBoundSocket_IPV4( RakPeer *peer, unsigned short port, bool blockingSocket, const char *forceHostAddress, unsigned int sleepOn10048, unsigned int extraSocketOptions, _PP_Instance_ chromeInstance ); - #if RAKNET_SUPPORT_IPV6==1 - static RakNetSocket* CreateBoundSocket_SupportIPV4And6( RakPeer *peer, unsigned short port, bool blockingSocket, const char *forceHostAddress, unsigned int sleepOn10048, unsigned int extraSocketOptions, unsigned short socketFamily, _PP_Instance_ chromeInstance ); - #endif - static RakNetSocket* CreateBoundSocket_PS3Lobby( unsigned short port, bool blockingSocket, const char *forceHostAddress, unsigned short socketFamily ); - static RakNetSocket* CreateBoundSocket_PSP2( unsigned short port, bool blockingSocket, const char *forceHostAddress, unsigned short socketFamily ); - */ - /* /// Returns if this specified port is in use, for UDP /// \param[in] port the port number @@ -128,15 +114,6 @@ class RAK_DLL_EXPORT SocketLayer static void GetMyIP( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] ); - /// Call sendto (UDP obviously) - /// \param[in] s the socket - /// \param[in] data The byte buffer to send - /// \param[in] length The length of the \a data in bytes - /// \param[in] ip The address of the remote host in dotted notation. - /// \param[in] port The port number to send to. - /// \return 0 on success, nonzero on failure. -// static int SendTo( UDPSOCKET s, const char *data, int length, const char ip[ 16 ], unsigned short port, unsigned short remotePortRakNetWasStartedOn_PS3, unsigned int extraSocketOptions, const char *file, const long line ); - /// Call sendto' (UDP obviously) /// It won't reach the recipient, except on a LAN /// However, this is good for opening routers / firewalls @@ -168,9 +145,6 @@ class RAK_DLL_EXPORT SocketLayer // static void SetSocketLayerOverride(SocketLayerOverride *_slo); // static SocketLayerOverride* GetSocketLayerOverride(void) {return slo;} -// static int SendTo_PS3Lobby( RakNetSocket *s, const char *data, int length, const SystemAddress &systemAddress ); -// static int SendTo_PSP2( RakNetSocket *s, const char *data, int length, const SystemAddress &systemAddress ); -// static int SendTo_360( RakNetSocket *s, const char *data, int length, const char *voiceData, int voiceLength, const SystemAddress &systemAddress ); // static int SendTo_PC( RakNetSocket *s, const char *data, int length, const SystemAddress &systemAddress, const char *file, const long line ); // // static void SetDoNotFragment( RakNetSocket* listenSocket, int opt ); diff --git a/Source/include/mafianet/statistics.h b/Source/include/mafianet/statistics.h index d66fc930d..917f95773 100644 --- a/Source/include/mafianet/statistics.h +++ b/Source/include/mafianet/statistics.h @@ -22,9 +22,9 @@ #ifndef __RAK_NET_STATISTICS_H #define __RAK_NET_STATISTICS_H -#include "PacketPriority.h" -#include "Export.h" -#include "types.h" +#include "mafianet/packet_priority.h" +#include "mafianet/export.h" +#include "mafianet/types.h" namespace MafiaNet { diff --git a/Source/include/mafianet/StatisticsHistory.h b/Source/include/mafianet/statistics_history.h similarity index 93% rename from Source/include/mafianet/StatisticsHistory.h rename to Source/include/mafianet/statistics_history.h index 15bf38348..6fe964275 100644 --- a/Source/include/mafianet/StatisticsHistory.h +++ b/Source/include/mafianet/statistics_history.h @@ -13,25 +13,25 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file StatisticsHistory.h +/// \file statistics_history.h /// \brief Input numerical values over time. Get sum, average, highest, lowest, standard deviation on recent or all-time values -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_StatisticsHistory==1 #ifndef __STATISTICS_HISTORY_H #define __STATISTICS_HISTORY_H -#include "PluginInterface2.h" -#include "memoryoverride.h" -#include "NativeTypes.h" -#include "DS_List.h" -#include "types.h" -#include "DS_OrderedList.h" -#include "string.h" -#include "DS_Queue.h" -#include "DS_Hash.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" +#include "mafianet/ds_list.h" +#include "mafianet/types.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/string.h" +#include "mafianet/ds_queue.h" +#include "mafianet/ds_hash.h" #include namespace MafiaNet diff --git a/Source/include/mafianet/string.h b/Source/include/mafianet/string.h index e2325deec..47ad7e118 100644 --- a/Source/include/mafianet/string.h +++ b/Source/include/mafianet/string.h @@ -16,14 +16,14 @@ #ifndef __RAK_STRING_H #define __RAK_STRING_H -#include "Export.h" -#include "DS_List.h" -#include "types.h" // int64_t +#include "mafianet/export.h" +#include "mafianet/ds_list.h" +#include "mafianet/types.h" // int64_t #include -#include "stdarg.h" +#include #ifdef _WIN32 -#include "WindowsIncludes.h" +#include "mafianet/windows_includes.h" #endif namespace MafiaNet diff --git a/Source/include/mafianet/StringCompressor.h b/Source/include/mafianet/string_compressor.h similarity index 94% rename from Source/include/mafianet/StringCompressor.h rename to Source/include/mafianet/string_compressor.h index b9ecc80dc..e42aed18c 100644 --- a/Source/include/mafianet/StringCompressor.h +++ b/Source/include/mafianet/string_compressor.h @@ -22,10 +22,10 @@ #ifndef __STRING_COMPRESSOR_H #define __STRING_COMPRESSOR_H -#include "Export.h" -#include "DS_Map.h" -#include "memoryoverride.h" -#include "NativeTypes.h" +#include "mafianet/export.h" +#include "mafianet/ds_map.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" #ifdef _STD_STRING_COMPRESSOR #include diff --git a/Source/include/mafianet/StringTable.h b/Source/include/mafianet/string_table.h similarity index 95% rename from Source/include/mafianet/StringTable.h rename to Source/include/mafianet/string_table.h index 91a33fe9f..84fcfcd3b 100644 --- a/Source/include/mafianet/StringTable.h +++ b/Source/include/mafianet/string_table.h @@ -22,9 +22,9 @@ #ifndef __STRING_TABLE_H #define __STRING_TABLE_H -#include "DS_OrderedList.h" -#include "Export.h" -#include "memoryoverride.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" /// Forward declaration namespace MafiaNet diff --git a/Source/include/mafianet/SuperFastHash.h b/Source/include/mafianet/super_fast_hash.h similarity index 93% rename from Source/include/mafianet/SuperFastHash.h rename to Source/include/mafianet/super_fast_hash.h index 2b9690fed..de610a7c4 100644 --- a/Source/include/mafianet/SuperFastHash.h +++ b/Source/include/mafianet/super_fast_hash.h @@ -12,7 +12,7 @@ #define __SUPER_FAST_HASH_H #include -#include "NativeTypes.h" +#include "mafianet/native_types.h" // From http://www.azillionmonkeys.com/qed/hash.html // Author of main code is Paul Hsieh diff --git a/Source/include/mafianet/TableSerializer.h b/Source/include/mafianet/table_serializer.h similarity index 94% rename from Source/include/mafianet/TableSerializer.h rename to Source/include/mafianet/table_serializer.h index 2989f4b1c..589823be2 100644 --- a/Source/include/mafianet/TableSerializer.h +++ b/Source/include/mafianet/table_serializer.h @@ -16,9 +16,9 @@ #ifndef __TABLE_SERIALIZER_H #define __TABLE_SERIALIZER_H -#include "memoryoverride.h" -#include "DS_Table.h" -#include "Export.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_table.h" +#include "mafianet/export.h" namespace MafiaNet { @@ -59,10 +59,10 @@ class RAK_DLL_EXPORT TableSerializer /* #include "LightweightDatabaseServer.h" #include "LightweightDatabaseClient.h" -#include "TableSerializer.h" -#include "BitStream.h" -#include "StringCompressor.h" -#include "DS_Table.h" +#include "mafianet/table_serializer.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/ds_table.h" void main(void) { DataStructures::Table table; diff --git a/Source/include/mafianet/TCPInterface.h b/Source/include/mafianet/tcp_interface.h similarity index 91% rename from Source/include/mafianet/TCPInterface.h rename to Source/include/mafianet/tcp_interface.h index 3281358c1..34bda39e2 100644 --- a/Source/include/mafianet/TCPInterface.h +++ b/Source/include/mafianet/tcp_interface.h @@ -18,25 +18,25 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TCPInterface==1 #ifndef __SIMPLE_TCP_SERVER #define __SIMPLE_TCP_SERVER -#include "memoryoverride.h" -#include "DS_List.h" -#include "types.h" -#include "Export.h" -#include "thread.h" -#include "DS_Queue.h" -#include "SimpleMutex.h" -#include "defines.h" -#include "SocketIncludes.h" -#include "DS_ByteQueue.h" -#include "DS_ThreadsafeAllocatingQueue.h" -#include "LocklessTypes.h" -#include "PluginInterface2.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_list.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/thread.h" +#include "mafianet/ds_queue.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/defines.h" +#include "mafianet/socket_includes.h" +#include "mafianet/ds_byte_queue.h" +#include "mafianet/ds_threadsafe_allocating_queue.h" +#include "mafianet/lockless_types.h" +#include "mafianet/plugin_interface2.h" #if OPEN_SSL_CLIENT_SUPPORT==1 #include diff --git a/Source/include/mafianet/TeamBalancer.h b/Source/include/mafianet/team_balancer.h similarity index 96% rename from Source/include/mafianet/TeamBalancer.h rename to Source/include/mafianet/team_balancer.h index 0cd337f20..44c2969b3 100644 --- a/Source/include/mafianet/TeamBalancer.h +++ b/Source/include/mafianet/team_balancer.h @@ -13,24 +13,24 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file TeamBalancer.h +/// \file team_balancer.h /// \brief Set and network team selection (supports peer to peer or client/server) /// \details Automatically handles transmission and resolution of team selection, including team switching and balancing /// \deprecated Use TeamManager intead /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TeamBalancer==1 #ifndef __TEAM_BALANCER_H #define __TEAM_BALANCER_H -#include "PluginInterface2.h" -#include "memoryoverride.h" -#include "NativeTypes.h" -#include "DS_List.h" -#include "string.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" +#include "mafianet/ds_list.h" +#include "mafianet/string.h" namespace MafiaNet { diff --git a/Source/include/mafianet/TeamManager.h b/Source/include/mafianet/team_manager.h similarity index 97% rename from Source/include/mafianet/TeamManager.h rename to Source/include/mafianet/team_manager.h index 5867a116e..e86437fe0 100644 --- a/Source/include/mafianet/TeamManager.h +++ b/Source/include/mafianet/team_manager.h @@ -15,7 +15,7 @@ // TODO: optimize the list of teams and team members to be O(1). Store in hashes, use linked lists to get ordered traversal -/// \file TeamManager.h +/// \file team_manager.h /// \brief Automates networking and list management for teams /// \details TeamManager provides support for teams. A team is a list of team members. /// Teams contain properties including the number of team members per team, whether or not tagged teams must have equal numbers of members, and if a team is locked or not to certain entry conditions @@ -24,19 +24,19 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TeamManager==1 #ifndef __TEAM_MANAGER_H #define __TEAM_MANAGER_H -#include "PluginInterface2.h" -#include "memoryoverride.h" -#include "NativeTypes.h" -#include "DS_List.h" -#include "types.h" -#include "DS_Hash.h" -#include "DS_OrderedList.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" +#include "mafianet/ds_list.h" +#include "mafianet/types.h" +#include "mafianet/ds_hash.h" +#include "mafianet/ds_ordered_list.h" namespace MafiaNet { diff --git a/Source/include/mafianet/TelnetTransport.h b/Source/include/mafianet/telnet_transport.h similarity index 91% rename from Source/include/mafianet/TelnetTransport.h rename to Source/include/mafianet/telnet_transport.h index 24510fed4..7de0d70d1 100644 --- a/Source/include/mafianet/TelnetTransport.h +++ b/Source/include/mafianet/telnet_transport.h @@ -18,15 +18,15 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TelnetTransport==1 && _RAKNET_SUPPORT_TCPInterface==1 #ifndef __TELNET_TRANSPORT #define __TELNET_TRANSPORT -#include "TransportInterface.h" -#include "DS_List.h" -#include "Export.h" +#include "mafianet/transport_interface.h" +#include "mafianet/ds_list.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/thread.h b/Source/include/mafianet/thread.h index af0a3423f..92957b52e 100644 --- a/Source/include/mafianet/thread.h +++ b/Source/include/mafianet/thread.h @@ -16,7 +16,7 @@ #ifndef __RAK_THREAD_H #define __RAK_THREAD_H -#include "Export.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/ThreadPool.h b/Source/include/mafianet/thread_pool.h similarity index 94% rename from Source/include/mafianet/ThreadPool.h rename to Source/include/mafianet/thread_pool.h index e2f387b3f..448b82bba 100644 --- a/Source/include/mafianet/ThreadPool.h +++ b/Source/include/mafianet/thread_pool.h @@ -16,12 +16,12 @@ #ifndef __THREAD_POOL_H #define __THREAD_POOL_H -#include "memoryoverride.h" -#include "DS_Queue.h" -#include "SimpleMutex.h" -#include "Export.h" -#include "thread.h" -#include "SignaledEvent.h" +#include "mafianet/memory_override.h" +#include "mafianet/ds_queue.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/export.h" +#include "mafianet/thread.h" +#include "mafianet/signaled_event.h" class ThreadDataInterface { @@ -188,13 +188,10 @@ struct RAK_DLL_EXPORT ThreadPool MafiaNet::SignaledEvent quitAndIncomingDataEvents; -// #if defined(SN_TARGET_PSP2) -// MafiaNet::RakThread::UltUlThreadRuntime *runtime; -// #endif }; -#include "ThreadPool.h" -#include "sleep.h" +#include "mafianet/thread_pool.h" +#include "mafianet/sleep.h" #ifdef _WIN32 #else @@ -335,9 +332,6 @@ bool ThreadPool::StartThreads(int numThreads, int stackSi { (void) stackSize; -// #if defined(SN_TARGET_PSP2) -// runtime = MafiaNet::RakThread::AllocRuntime(numThreads); -// #endif runThreadsMutex.Lock(); if (runThreads==true) @@ -423,10 +417,6 @@ void ThreadPool::StopThreads(void) quitAndIncomingDataEvents.CloseEvent(); -// #if defined(SN_TARGET_PSP2) -// MafiaNet::RakThread::DeallocRuntime(runtime); -// runtime=0; -// #endif } template diff --git a/Source/include/mafianet/ThreadsafePacketLogger.h b/Source/include/mafianet/threadsafe_packet_logger.h similarity index 87% rename from Source/include/mafianet/ThreadsafePacketLogger.h rename to Source/include/mafianet/threadsafe_packet_logger.h index a191579dd..dd0aea89b 100644 --- a/Source/include/mafianet/ThreadsafePacketLogger.h +++ b/Source/include/mafianet/threadsafe_packet_logger.h @@ -18,14 +18,14 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 #ifndef __THREADSAFE_PACKET_LOGGER_H #define __THREADSAFE_PACKET_LOGGER_H -#include "PacketLogger.h" -#include "SingleProducerConsumer.h" +#include "mafianet/packet_logger.h" +#include "mafianet/single_producer_consumer.h" namespace MafiaNet { diff --git a/Source/include/mafianet/time.h b/Source/include/mafianet/time.h index 7b9ecb919..42f5b8b3d 100644 --- a/Source/include/mafianet/time.h +++ b/Source/include/mafianet/time.h @@ -16,8 +16,8 @@ #ifndef __RAKNET_TIME_H #define __RAKNET_TIME_H -#include "NativeTypes.h" -#include "defines.h" +#include "mafianet/native_types.h" +#include "mafianet/defines.h" namespace MafiaNet { diff --git a/Source/include/mafianet/transport2.h b/Source/include/mafianet/transport2.h index ea88bba9a..8d4f534df 100644 --- a/Source/include/mafianet/transport2.h +++ b/Source/include/mafianet/transport2.h @@ -18,17 +18,17 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TelnetTransport==1 #ifndef __RAKNET_TRANSPORT_2 #define __RAKNET_TRANSPORT_2 -#include "TransportInterface.h" -#include "DS_Queue.h" -#include "CommandParserInterface.h" -#include "PluginInterface2.h" -#include "Export.h" +#include "mafianet/transport_interface.h" +#include "mafianet/ds_queue.h" +#include "mafianet/command_parser_interface.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/export.h" namespace MafiaNet { diff --git a/Source/include/mafianet/TransportInterface.h b/Source/include/mafianet/transport_interface.h similarity index 95% rename from Source/include/mafianet/TransportInterface.h rename to Source/include/mafianet/transport_interface.h index af48fd0a6..7e2b624af 100644 --- a/Source/include/mafianet/TransportInterface.h +++ b/Source/include/mafianet/transport_interface.h @@ -22,9 +22,9 @@ #ifndef __TRANSPORT_INTERFACE_H #define __TRANSPORT_INTERFACE_H -#include "types.h" -#include "Export.h" -#include "memoryoverride.h" +#include "mafianet/types.h" +#include "mafianet/export.h" +#include "mafianet/memory_override.h" #define REMOTE_MAX_TEXT_INPUT 2048 diff --git a/Source/include/mafianet/TwoWayAuthentication.h b/Source/include/mafianet/two_way_authentication.h similarity index 93% rename from Source/include/mafianet/TwoWayAuthentication.h rename to Source/include/mafianet/two_way_authentication.h index 65dc1d5ae..86fb9df5d 100644 --- a/Source/include/mafianet/TwoWayAuthentication.h +++ b/Source/include/mafianet/two_way_authentication.h @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -/// \file TwoWayAuthentication.h +/// \file two_way_authentication.h /// \brief Implements two way authentication /// \details Given two systems, each of whom known a common password, verify the password without transmitting it /// This can be used to determine what permissions are should be allowed to the other system /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TwoWayAuthentication==1 #ifndef __TWO_WAY_AUTHENTICATION_H @@ -41,17 +41,17 @@ #define TWO_WAY_AUTHENTICATION_NONCE_LENGTH 32 #define HASHED_NONCE_AND_PW_LENGTH 32 #else -#include "DR_SHA1.h" +#include "mafianet/dr_sha1.h" #define TWO_WAY_AUTHENTICATION_NONCE_LENGTH 20 #define HASHED_NONCE_AND_PW_LENGTH SHA1_LENGTH #endif -#include "PluginInterface2.h" -#include "memoryoverride.h" -#include "NativeTypes.h" -#include "string.h" -#include "DS_Hash.h" -#include "DS_Queue.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/memory_override.h" +#include "mafianet/native_types.h" +#include "mafianet/string.h" +#include "mafianet/ds_hash.h" +#include "mafianet/ds_queue.h" typedef int64_t FCM2Guid; diff --git a/Source/include/mafianet/types.h b/Source/include/mafianet/types.h index 05f3a31ac..e7ca13314 100644 --- a/Source/include/mafianet/types.h +++ b/Source/include/mafianet/types.h @@ -19,13 +19,12 @@ #ifndef __NETWORK_TYPES_H #define __NETWORK_TYPES_H -#include "defines.h" -#include "NativeTypes.h" -#include "time.h" -#include "Export.h" -#include "WindowsIncludes.h" -#include "XBox360Includes.h" -#include "SocketIncludes.h" +#include "mafianet/defines.h" +#include "mafianet/native_types.h" +#include "mafianet/time.h" +#include "mafianet/export.h" +#include "mafianet/windows_includes.h" +#include "mafianet/socket_includes.h" namespace MafiaNet { /// Forward declarations @@ -83,7 +82,7 @@ enum ConnectionState #define BITS_TO_BYTES(x) (((x)+7)>>3) #define BYTES_TO_BITS(x) ((x)<<3) -/// \sa NetworkIDObject.h +/// \sa network_id_object.h typedef unsigned char UniqueIDType; typedef unsigned short SystemIndex; typedef unsigned char RPCIndex; @@ -155,15 +154,10 @@ struct RAK_DLL_EXPORT SocketDescriptor /// \pre RAKNET_SUPPORT_IPV6 must be set to 1 in RakNetDefines.h for AF_INET6 short socketFamily; - unsigned short remotePortRakNetWasStartedOn_PS3_PSP2; - - // Required for Google chrome - _PP_Instance_ chromeInstance; - // Set to true to use a blocking socket (default, do not change unless you have a reason to) bool blockingSocket; - /// XBOX only: set IPPROTO_VDP if you want to use VDP. If enabled, this socket does not support broadcast to 255.255.255.255 + /// Protocol argument passed to socket(). Leave 0 (the default) for plain UDP. unsigned int extraSocketOptions; }; diff --git a/Source/include/mafianet/UDPForwarder.h b/Source/include/mafianet/udp_forwarder.h similarity index 89% rename from Source/include/mafianet/UDPForwarder.h rename to Source/include/mafianet/udp_forwarder.h index 6e0914764..dd10d556f 100644 --- a/Source/include/mafianet/UDPForwarder.h +++ b/Source/include/mafianet/udp_forwarder.h @@ -19,23 +19,23 @@ -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_UDPForwarder==1 #ifndef __UDP_FORWARDER_H #define __UDP_FORWARDER_H -#include "Export.h" -#include "types.h" -#include "SocketIncludes.h" -#include "UDPProxyCommon.h" -#include "SimpleMutex.h" -#include "string.h" -#include "thread.h" -#include "DS_Queue.h" -#include "DS_OrderedList.h" -#include "LocklessTypes.h" -#include "DS_ThreadsafeAllocatingQueue.h" +#include "mafianet/export.h" +#include "mafianet/types.h" +#include "mafianet/socket_includes.h" +#include "mafianet/udp_proxy_common.h" +#include "mafianet/simple_mutex.h" +#include "mafianet/string.h" +#include "mafianet/thread.h" +#include "mafianet/ds_queue.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/lockless_types.h" +#include "mafianet/ds_threadsafe_allocating_queue.h" namespace MafiaNet { diff --git a/Source/include/mafianet/UDPProxyClient.h b/Source/include/mafianet/udp_proxy_client.h similarity index 97% rename from Source/include/mafianet/UDPProxyClient.h rename to Source/include/mafianet/udp_proxy_client.h index 7bd5b2cfc..91610e26c 100644 --- a/Source/include/mafianet/UDPProxyClient.h +++ b/Source/include/mafianet/udp_proxy_client.h @@ -17,16 +17,16 @@ /// \brief A RakNet plugin performing networking to communicate with UDPProxyCoordinator. Ultimately used to tell UDPProxyServer to forward UDP packets. -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_UDPProxyClient==1 #ifndef __UDP_PROXY_CLIENT_H #define __UDP_PROXY_CLIENT_H -#include "Export.h" -#include "types.h" -#include "PluginInterface2.h" -#include "DS_List.h" +#include "mafianet/export.h" +#include "mafianet/types.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_list.h" /// \defgroup UDP_PROXY_GROUP UDPProxy /// \brief Forwards UDP datagrams from one system to another. Protocol independent diff --git a/Source/include/mafianet/UDPProxyCommon.h b/Source/include/mafianet/udp_proxy_common.h similarity index 93% rename from Source/include/mafianet/UDPProxyCommon.h rename to Source/include/mafianet/udp_proxy_common.h index d1f7f1016..2266191fd 100644 --- a/Source/include/mafianet/UDPProxyCommon.h +++ b/Source/include/mafianet/udp_proxy_common.h @@ -40,7 +40,7 @@ UDPProxyClient */ // Stored in the second byte after ID_UDP_PROXY_GENERAL -// Otherwise MessageIdentifiers.h is too cluttered and will hit the limit on enumerations in a single byte +// Otherwise message_identifiers.h is too cluttered and will hit the limit on enumerations in a single byte enum UDPProxyMessages { ID_UDP_PROXY_FORWARDING_SUCCEEDED, diff --git a/Source/include/mafianet/UDPProxyCoordinator.h b/Source/include/mafianet/udp_proxy_coordinator.h similarity index 92% rename from Source/include/mafianet/UDPProxyCoordinator.h rename to Source/include/mafianet/udp_proxy_coordinator.h index 12148e710..b7b3130fc 100644 --- a/Source/include/mafianet/UDPProxyCoordinator.h +++ b/Source/include/mafianet/udp_proxy_coordinator.h @@ -18,19 +18,19 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_UDPProxyCoordinator==1 && _RAKNET_SUPPORT_UDPForwarder==1 #ifndef __UDP_PROXY_COORDINATOR_H #define __UDP_PROXY_COORDINATOR_H -#include "Export.h" -#include "types.h" -#include "PluginInterface2.h" -#include "string.h" -#include "BitStream.h" -#include "DS_Queue.h" -#include "DS_OrderedList.h" +#include "mafianet/export.h" +#include "mafianet/types.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/string.h" +#include "mafianet/bit_stream.h" +#include "mafianet/ds_queue.h" +#include "mafianet/ds_ordered_list.h" namespace MafiaNet { diff --git a/Source/include/mafianet/UDPProxyServer.h b/Source/include/mafianet/udp_proxy_server.h similarity index 94% rename from Source/include/mafianet/UDPProxyServer.h rename to Source/include/mafianet/udp_proxy_server.h index fbb70af87..5810ece50 100644 --- a/Source/include/mafianet/UDPProxyServer.h +++ b/Source/include/mafianet/udp_proxy_server.h @@ -18,17 +18,17 @@ /// -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_UDPProxyServer==1 && _RAKNET_SUPPORT_UDPForwarder==1 #ifndef __UDP_PROXY_SERVER_H #define __UDP_PROXY_SERVER_H -#include "Export.h" -#include "types.h" -#include "PluginInterface2.h" -#include "UDPForwarder.h" -#include "string.h" +#include "mafianet/export.h" +#include "mafianet/types.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/udp_forwarder.h" +#include "mafianet/string.h" namespace MafiaNet { diff --git a/Source/include/mafianet/VariableDeltaSerializer.h b/Source/include/mafianet/variable_delta_serializer.h similarity index 96% rename from Source/include/mafianet/VariableDeltaSerializer.h rename to Source/include/mafianet/variable_delta_serializer.h index d1823783d..64542bba5 100644 --- a/Source/include/mafianet/VariableDeltaSerializer.h +++ b/Source/include/mafianet/variable_delta_serializer.h @@ -16,12 +16,12 @@ #ifndef __VARIABLE_DELTA_SERIALIZER_H #define __VARIABLE_DELTA_SERIALIZER_H -#include "VariableListDeltaTracker.h" -#include "DS_MemoryPool.h" -#include "NativeTypes.h" -#include "BitStream.h" -#include "PacketPriority.h" -#include "DS_OrderedList.h" +#include "mafianet/variable_list_delta_tracker.h" +#include "mafianet/ds_memory_pool.h" +#include "mafianet/native_types.h" +#include "mafianet/bit_stream.h" +#include "mafianet/packet_priority.h" +#include "mafianet/ds_ordered_list.h" namespace MafiaNet { diff --git a/Source/include/mafianet/VariableListDeltaTracker.h b/Source/include/mafianet/variable_list_delta_tracker.h similarity index 94% rename from Source/include/mafianet/VariableListDeltaTracker.h rename to Source/include/mafianet/variable_list_delta_tracker.h index 0f466ee14..cc17d8f9c 100644 --- a/Source/include/mafianet/VariableListDeltaTracker.h +++ b/Source/include/mafianet/variable_list_delta_tracker.h @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "NativeTypes.h" -#include "DS_List.h" -#include "memoryoverride.h" -#include "BitStream.h" +#include "mafianet/native_types.h" +#include "mafianet/ds_list.h" +#include "mafianet/memory_override.h" +#include "mafianet/bit_stream.h" #ifndef __VARIABLE_LIST_DELTA_TRACKER #define __VARIABLE_LIST_DELTA_TRACKER diff --git a/Source/include/mafianet/VariadicSQLParser.h b/Source/include/mafianet/variadic_sql_parser.h similarity index 94% rename from Source/include/mafianet/VariadicSQLParser.h rename to Source/include/mafianet/variadic_sql_parser.h index 9118af5d6..3fe65d2f1 100644 --- a/Source/include/mafianet/VariadicSQLParser.h +++ b/Source/include/mafianet/variadic_sql_parser.h @@ -11,7 +11,7 @@ #ifndef __VARIADIC_SQL_PARSER_H #define __VARIADIC_SQL_PARSER_H -#include "DS_List.h" +#include "mafianet/ds_list.h" #include diff --git a/Source/include/mafianet/VirtualWorld.h b/Source/include/mafianet/virtual_world.h similarity index 100% rename from Source/include/mafianet/VirtualWorld.h rename to Source/include/mafianet/virtual_world.h diff --git a/Source/include/mafianet/VirtualWorldReplica3.h b/Source/include/mafianet/virtual_world_replica3.h similarity index 98% rename from Source/include/mafianet/VirtualWorldReplica3.h rename to Source/include/mafianet/virtual_world_replica3.h index 5b3431d1c..56d0656e7 100644 --- a/Source/include/mafianet/VirtualWorldReplica3.h +++ b/Source/include/mafianet/virtual_world_replica3.h @@ -8,14 +8,14 @@ /// \file /// \brief Replica3 base class that scopes visibility by virtual world. -#include "NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ReplicaManager3==1 #ifndef __VIRTUAL_WORLD_REPLICA_3_H #define __VIRTUAL_WORLD_REPLICA_3_H -#include "ReplicaManager3.h" -#include "VirtualWorld.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/virtual_world.h" namespace MafiaNet { diff --git a/Source/include/mafianet/RakVoice.h b/Source/include/mafianet/voice.h similarity index 97% rename from Source/include/mafianet/RakVoice.h rename to Source/include/mafianet/voice.h index e1d6aae44..f8e909319 100644 --- a/Source/include/mafianet/RakVoice.h +++ b/Source/include/mafianet/voice.h @@ -21,9 +21,9 @@ #define __RAK_VOICE_H #include "mafianet/types.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/DS_OrderedList.h" -#include "mafianet/NativeTypes.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/native_types.h" // Forward declarations for Opus and RNNoise struct OpusEncoder; @@ -39,7 +39,7 @@ class RakPeerInterface; #define FRAME_INCOMING_BUFFER_COUNT 100 // Largest Opus packet we will ever produce or accept for a single frame. -// Exposed here (rather than only in RakVoice.cpp) so a relay host can bound an +// Exposed here (rather than only in voice.cpp) so a relay host can bound an // inbound frame without duplicating the literal. constexpr unsigned RAKVOICE_MAX_OPUS_PACKET_SIZE = 4000; diff --git a/Source/include/mafianet/WindowsIncludes.h b/Source/include/mafianet/windows_includes.h similarity index 100% rename from Source/include/mafianet/WindowsIncludes.h rename to Source/include/mafianet/windows_includes.h diff --git a/Source/include/mafianet/WSAStartupSingleton.h b/Source/include/mafianet/wsa_startup_singleton.h similarity index 100% rename from Source/include/mafianet/WSAStartupSingleton.h rename to Source/include/mafianet/wsa_startup_singleton.h diff --git a/Source/include/mafianet/wstring.h b/Source/include/mafianet/wstring.h index bb5c9199d..08f94aba5 100644 --- a/Source/include/mafianet/wstring.h +++ b/Source/include/mafianet/wstring.h @@ -16,12 +16,12 @@ #ifndef __RAK_W_STRING_H #define __RAK_W_STRING_H -#include "Export.h" -#include "types.h" // int64_t -#include "string.h" +#include "mafianet/export.h" +#include "mafianet/types.h" // int64_t +#include "mafianet/string.h" #ifdef _WIN32 -#include "WindowsIncludes.h" +#include "mafianet/windows_includes.h" #endif namespace MafiaNet diff --git a/Source/src/PS4Includes.cpp b/Source/src/PS4Includes.cpp deleted file mode 100644 index 9a1add790..000000000 --- a/Source/src/PS4Includes.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file was taken from RakNet 4.082 without any modifications. - * Please see licenses/RakNet license.txt for the underlying license and related copyright. - */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/src/RakNetSocket.cpp b/Source/src/RakNetSocket.cpp deleted file mode 100644 index 378b6e612..000000000 --- a/Source/src/RakNetSocket.cpp +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Original work: Copyright (c) 2014, Oculus VR, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * RakNet License.txt file in the licenses directory of this source tree. An additional grant - * of patent rights can be found in the RakNet Patents.txt file in the same directory. - * - * - * Modified work: Copyright (c) 2017, SLikeSoft UG (haftungsbeschränkt) - * - * This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style - * license found in the license.txt file in the root directory of this source tree. - */ - -/* -#include "mafianet/socket.h" -#include "mafianet/memoryoverride.h" - -using namespace MafiaNet; - -#if defined(__native_client__) -using namespace pp; -#endif - -RakNetSocket::RakNetSocket() { - s = 0; - remotePortRakNetWasStartedOn_PS3_PSP2 = 0; - userConnectionSocketIndex = (unsigned int) -1; - socketFamily = 0; - blockingSocket = 0; - extraSocketOptions = 0; - chromeInstance = 0; - -#if defined (_WIN32) && defined(USE_WAIT_FOR_MULTIPLE_EVENTS) - recvEvent=INVALID_HANDLE_VALUE; -#endif - - #ifdef __native_client__ - s = 0; - sendInProgress = false; - nextSendSize = 0; - #endif -} -RakNetSocket::~RakNetSocket() -{ - #ifdef __native_client__ - if(s != 0) - ((PPB_UDPSocket_Private_0_4*) pp::Module::Get()->GetBrowserInterface(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4))->Close(s); - #else - if ((__UDPSOCKET__)s != 0) - closesocket__(s); - #endif - - -#if defined (_WIN32) && defined(USE_WAIT_FOR_MULTIPLE_EVENTS) - if (recvEvent!=INVALID_HANDLE_VALUE) - { - CloseHandle( recvEvent ); - recvEvent = INVALID_HANDLE_VALUE; - } -#endif -} -// -// void RakNetSocket::Accept( -// struct sockaddr *addr, -// int *addrlen) -// { -// accept__(s, addr, addrlen); -// } - -// -// void RakNetSocket::Close( void ) -// { -// closesocket__(s); -// } - -RakNetSocket* RakNetSocket::Create -#ifdef __native_client__ - (_PP_Instance_ _chromeInstance) -#else - (int af, - int type, - int protocol) -#endif -{ - __UDPSOCKET__ sock; - - #ifndef __native_client__ - RakAssert(type==SOCK_DGRAM); - #endif - - #ifdef __native_client__ - sock = ((PPB_UDPSocket_Private_0_4*) Module::Get()->GetBrowserInterface(PPB_UDPSOCKET_PRIVATE_INTERFACE_0_4))->Create(_chromeInstance); - #elif defined(SN_TARGET_PSP2) - sock = sceNetSocket( "RakNetSocket::Create", SCE_NET_AF_INET, SCE_NET_SOCK_DGRAM_P2P, 0 ); - #elif defined(_PS3) || defined(__PS3__) || defined(SN_TARGET_PS3) || defined(_PS4) - sock = socket__( AF_INET, SOCK_DGRAM_P2P, 0 ); - #else - sock = socket__(af, type, protocol); - #endif - - if (sock<0) - return 0; - RakNetSocket *rns = MafiaNet::OP_NEW(_FILE_AND_LINE_); - rns->s = sock; - #ifdef __native_client__ - rns->chromeInstance = _chromeInstance; - #endif - return rns; -} - -int RakNetSocket::Bind( - const struct sockaddr *addr, - int namelen) -{ - return bind__(s,addr,namelen); -} - -int RakNetSocket::IOCTLSocket( - long cmd, - unsigned long *argp) -{ - #if defined(_WIN32) - return ioctlsocket__(s,cmd,argp); - #else - return 0; - #endif -} - -int RakNetSocket::Listen ( - int backlog) -{ - return listen__(s,backlog); -} - -int RakNetSocket::SetSockOpt( - int level, - int optname, - const char * optval, - int optlen) -{ - return setsockopt__(s,level,optname,optval,optlen); -} - -int RakNetSocket::Shutdown( - int how) -{ - #ifndef SN_TARGET_PSP2 - return shutdown__(s,how); - #else - return 0; - #endif -} -*/ diff --git a/Source/src/RakNetSocket2_Windows_Linux_360.cpp b/Source/src/RakNetSocket2_Windows_Linux_360.cpp deleted file mode 100644 index 6850ab3b8..000000000 --- a/Source/src/RakNetSocket2_Windows_Linux_360.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2014, Oculus VR, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * RakNet License.txt file in the licenses directory of this source tree. An additional grant - * of patent rights can be found in the RakNet Patents.txt file in the same directory. - * - * - * Modified work: Copyright (c) 2017, SLikeSoft UG (haftungsbeschränkt) - * - * This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style - * license found in the license.txt file in the root directory of this source tree. - */ - -#include "mafianet/EmptyHeader.h" - -#ifdef RAKNET_SOCKET_2_INLINE_FUNCTIONS - -#ifndef RAKNETSOCKET2_WINDOWS_LINUX_360_CPP -#define RAKNETSOCKET2_WINDOWS_LINUX_360_CPP - -#if defined(_WIN32) || defined(__GNUC__) || defined(__GCCXML__) || defined(__S3E__) - -RNS2SendResult RNS2_Windows_Linux_360::Send_Windows_Linux_360NoVDP( RNS2Socket rns2Socket, RNS2_SendParameters *sendParameters, const char *file, unsigned int line ) { - - int len=0; - do - { - (void) file; - (void) line; - - - int oldTTL=-1; - if (sendParameters->ttl>0) - { - socklen_t opLen=sizeof(oldTTL); - // Get the current TTL - if (getsockopt__(rns2Socket, sendParameters->systemAddress.GetIPPROTO(), IP_TTL, ( char * ) & oldTTL, &opLen ) != -1) - { - int newTTL=sendParameters->ttl; - setsockopt__(rns2Socket, sendParameters->systemAddress.GetIPPROTO(), IP_TTL, ( char * ) & newTTL, sizeof ( newTTL ) ); - } - } - - - if (sendParameters->systemAddress.address.addr4.sin_family==AF_INET) - { - len = sendto__( rns2Socket, sendParameters->data, sendParameters->length, 0, ( const sockaddr* ) & sendParameters->systemAddress.address.addr4, sizeof( sockaddr_in ) ); - } - else - { -#if RAKNET_SUPPORT_IPV6==1 - len = sendto__( rns2Socket, sendParameters->data, sendParameters->length, 0, ( const sockaddr* ) & sendParameters->systemAddress.address.addr6, sizeof( sockaddr_in6 ) ); -#endif - } - - if (len<0) - { - RAKNET_DEBUG_PRINTF("sendto failed with code %i for char %i and length %i.\n", len, sendParameters->data[0], sendParameters->length); - } - - - if (oldTTL!=-1) - { - setsockopt__(rns2Socket, sendParameters->systemAddress.GetIPPROTO(), IP_TTL, ( char * ) & oldTTL, sizeof ( oldTTL ) ); - } - - } - while ( len == 0 ); - return len; -} - -#endif // Windows, Linux, 360 - -#endif // file header - -#endif // #ifdef RAKNET_SOCKET_2_INLINE_FUNCTIONS diff --git a/Source/src/VitaIncludes.cpp b/Source/src/VitaIncludes.cpp deleted file mode 100644 index 610dcab6c..000000000 --- a/Source/src/VitaIncludes.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/* - * This file was taken from RakNet 4.082. - * Please see licenses/RakNet license.txt for the underlying license and related copyright. - * - * Modified work: Copyright (c) 2017, SLikeSoft UG (haftungsbeschränkt) - * - * This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style - * license found in the license.txt file in the root directory of this source tree. - */ - -#include "mafianet/EmptyHeader.h" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/src/Base64Encoder.cpp b/Source/src/base64_encoder.cpp similarity index 96% rename from Source/src/Base64Encoder.cpp rename to Source/src/base64_encoder.cpp index 7808ffcdc..344e03ed6 100644 --- a/Source/src/Base64Encoder.cpp +++ b/Source/src/base64_encoder.cpp @@ -13,8 +13,8 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/Base64Encoder.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/base64_encoder.h" +#include "mafianet/memory_override.h" const char *Base64Map(void) {return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";} const char *base64Map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/Source/src/BitStream.cpp b/Source/src/bit_stream.cpp similarity index 96% rename from Source/src/BitStream.cpp rename to Source/src/bit_stream.cpp index bfb9c6fa0..62e3855ae 100644 --- a/Source/src/BitStream.cpp +++ b/Source/src/bit_stream.cpp @@ -15,7 +15,7 @@ /// \file /// -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include #include @@ -23,11 +23,11 @@ #include #include -#include "mafianet/SocketIncludes.h" +#include "mafianet/socket_includes.h" #include "mafianet/defines.h" #if defined(_WIN32) -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #include #else #include diff --git a/Source/src/CCRakNetSlidingWindow.cpp b/Source/src/cc_sliding_window.cpp similarity index 96% rename from Source/src/CCRakNetSlidingWindow.cpp rename to Source/src/cc_sliding_window.cpp index 6919254a4..c68aea059 100644 --- a/Source/src/CCRakNetSlidingWindow.cpp +++ b/Source/src/cc_sliding_window.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/CCRakNetSlidingWindow.h" +#include "mafianet/cc_sliding_window.h" #if USE_SLIDING_WINDOW_CONGESTION_CONTROL==1 @@ -25,7 +25,7 @@ static const CCTimeType SYN=10; static const CCTimeType SYN=10000; #endif -#include "mafianet/MTUSize.h" +#include "mafianet/mtu_size.h" #include #include #include diff --git a/Source/src/CCRakNetUDT.cpp b/Source/src/cc_udt.cpp similarity index 96% rename from Source/src/CCRakNetUDT.cpp rename to Source/src/cc_udt.cpp index a4c2181dd..24fc0ba21 100644 --- a/Source/src/CCRakNetUDT.cpp +++ b/Source/src/cc_udt.cpp @@ -13,12 +13,12 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/CCRakNetUDT.h" +#include "mafianet/cc_udt.h" #if USE_SLIDING_WINDOW_CONGESTION_CONTROL!=1 -#include "mafianet/Rand.h" -#include "mafianet/MTUSize.h" +#include "mafianet/rand.h" +#include "mafianet/mtu_size.h" #include #include #include diff --git a/Source/src/CheckSum.cpp b/Source/src/check_sum.cpp similarity index 95% rename from Source/src/CheckSum.cpp rename to Source/src/check_sum.cpp index 0a96355f9..52f431637 100644 --- a/Source/src/CheckSum.cpp +++ b/Source/src/check_sum.cpp @@ -18,7 +18,7 @@ * @brief CheckSum implementation from http://www.flounder.com/checksum.htm * */ -#include "mafianet/CheckSum.h" +#include "mafianet/check_sum.h" /**************************************************************************** * CheckSum::add diff --git a/Source/src/CloudClient.cpp b/Source/src/cloud_client.cpp similarity index 94% rename from Source/src/CloudClient.cpp rename to Source/src/cloud_client.cpp index df7e36ad1..1e8d2220e 100644 --- a/Source/src/CloudClient.cpp +++ b/Source/src/cloud_client.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_CloudClient==1 -#include "mafianet/CloudClient.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/peerinterface.h" +#include "mafianet/cloud_client.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/peer_interface.h" using namespace MafiaNet; diff --git a/Source/src/CloudCommon.cpp b/Source/src/cloud_common.cpp similarity index 94% rename from Source/src/CloudCommon.cpp rename to Source/src/cloud_common.cpp index a7935c879..186c331ce 100644 --- a/Source/src/CloudCommon.cpp +++ b/Source/src/cloud_common.cpp @@ -13,11 +13,11 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_CloudClient==1 || _RAKNET_SUPPORT_CloudServer==1 -#include "mafianet/CloudCommon.h" -#include "mafianet/BitStream.h" +#include "mafianet/cloud_common.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; diff --git a/Source/src/CloudServer.cpp b/Source/src/cloud_server.cpp similarity index 96% rename from Source/src/CloudServer.cpp rename to Source/src/cloud_server.cpp index a19954fed..2f8794e5e 100644 --- a/Source/src/CloudServer.cpp +++ b/Source/src/cloud_server.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_CloudServer==1 -#include "mafianet/CloudServer.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/peerinterface.h" +#include "mafianet/cloud_server.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/peer_interface.h" enum ServerToServerCommands { diff --git a/Source/src/RakNetCommandParser.cpp b/Source/src/command_parser.cpp similarity index 96% rename from Source/src/RakNetCommandParser.cpp rename to Source/src/command_parser.cpp index eeefae661..cbd2515c5 100644 --- a/Source/src/RakNetCommandParser.cpp +++ b/Source/src/command_parser.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_RakNetCommandParser==1 -#include "mafianet/commandparser.h" -#include "mafianet/TransportInterface.h" -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" +#include "mafianet/command_parser.h" +#include "mafianet/transport_interface.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" #include "mafianet/assert.h" #include #include diff --git a/Source/src/CommandParserInterface.cpp b/Source/src/command_parser_interface.cpp similarity index 94% rename from Source/src/CommandParserInterface.cpp rename to Source/src/command_parser_interface.cpp index 2076ff0b3..f1bbacba4 100644 --- a/Source/src/CommandParserInterface.cpp +++ b/Source/src/command_parser_interface.cpp @@ -13,8 +13,8 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/CommandParserInterface.h" -#include "mafianet/TransportInterface.h" +#include "mafianet/command_parser_interface.h" +#include "mafianet/transport_interface.h" #include #include "mafianet/assert.h" #include @@ -31,7 +31,7 @@ #include #endif -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" using namespace MafiaNet; diff --git a/Source/src/ConnectionGraph2.cpp b/Source/src/connection_graph2.cpp similarity index 94% rename from Source/src/ConnectionGraph2.cpp rename to Source/src/connection_graph2.cpp index a17bdbea4..ca13b8821 100644 --- a/Source/src/ConnectionGraph2.cpp +++ b/Source/src/connection_graph2.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ConnectionGraph2==1 -#include "mafianet/ConnectionGraph2.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/connection_graph2.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; diff --git a/Source/src/ConsoleServer.cpp b/Source/src/console_server.cpp similarity index 95% rename from Source/src/ConsoleServer.cpp rename to Source/src/console_server.cpp index 41805b561..2e0a0b27d 100644 --- a/Source/src/ConsoleServer.cpp +++ b/Source/src/console_server.cpp @@ -13,19 +13,19 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ConsoleServer==1 -#include "mafianet/ConsoleServer.h" -#include "mafianet/TransportInterface.h" -#include "mafianet/CommandParserInterface.h" +#include "mafianet/console_server.h" +#include "mafianet/transport_interface.h" +#include "mafianet/command_parser_interface.h" #include #include #define COMMAND_DELINATOR ' ' #define COMMAND_DELINATOR_TOGGLE '"' -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/crypto/securestring.cpp b/Source/src/crypto/securestring.cpp index a014df590..9646c6375 100644 --- a/Source/src/crypto/securestring.cpp +++ b/Source/src/crypto/securestring.cpp @@ -9,7 +9,7 @@ // #med - review the include order - defines.h defines SLNET_VERIFY but doesn't enforce including assert.h which it honestly should #include "mafianet/crypto/cryptomanager.h" // used for CCryptoManager #include "mafianet/assert.h" // used for assert() (via SLNET_VERIFY) -#include "mafianet/memoryoverride.h" // used for OP_NEW_ARRAY +#include "mafianet/memory_override.h" // used for OP_NEW_ARRAY #include // used for std::memcpy #include // used for std::numeric_limits diff --git a/Source/src/DataCompressor.cpp b/Source/src/data_compressor.cpp similarity index 94% rename from Source/src/DataCompressor.cpp rename to Source/src/data_compressor.cpp index 913f5b20f..fa8a90555 100644 --- a/Source/src/DataCompressor.cpp +++ b/Source/src/data_compressor.cpp @@ -13,8 +13,8 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/DataCompressor.h" -#include "mafianet/DS_HuffmanEncodingTree.h" +#include "mafianet/data_compressor.h" +#include "mafianet/ds_huffman_encoding_tree.h" #include "mafianet/assert.h" #include // Use string.h rather than memory.h for a console diff --git a/Source/src/DirectoryDeltaTransfer.cpp b/Source/src/directory_delta_transfer.cpp similarity index 93% rename from Source/src/DirectoryDeltaTransfer.cpp rename to Source/src/directory_delta_transfer.cpp index d094308b1..2ba49f34e 100644 --- a/Source/src/DirectoryDeltaTransfer.cpp +++ b/Source/src/directory_delta_transfer.cpp @@ -13,21 +13,21 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_DirectoryDeltaTransfer==1 && _RAKNET_SUPPORT_FileOperations==1 -#include "mafianet/DirectoryDeltaTransfer.h" -#include "mafianet/FileList.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/peerinterface.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/FileOperations.h" -#include "mafianet/DS_List.h" -#include "mafianet/SuperFastHash.h" -#include "mafianet/IncrementalReadInterface.h" +#include "mafianet/directory_delta_transfer.h" +#include "mafianet/file_list.h" +#include "mafianet/string_compressor.h" +#include "mafianet/peer_interface.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/file_operations.h" +#include "mafianet/ds_list.h" +#include "mafianet/super_fast_hash.h" +#include "mafianet/incremental_read_interface.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/DR_SHA1.cpp b/Source/src/dr_sha1.cpp similarity index 96% rename from Source/src/DR_SHA1.cpp rename to Source/src/dr_sha1.cpp index 9454a9c5c..6dfc2fe37 100644 --- a/Source/src/DR_SHA1.cpp +++ b/Source/src/dr_sha1.cpp @@ -17,7 +17,7 @@ // If compiling with MFC, you might want to add #include "StdAfx.h" #define _CRT_SECURE_NO_WARNINGS -#include "mafianet/DR_SHA1.h" +#include "mafianet/dr_sha1.h" #include #define SHA1_MAX_FILE_BUFFER (32 * 20 * 820) diff --git a/Source/src/DS_BytePool.cpp b/Source/src/ds_byte_pool.cpp similarity index 92% rename from Source/src/DS_BytePool.cpp rename to Source/src/ds_byte_pool.cpp index 2794fdc91..5529f8218 100644 --- a/Source/src/DS_BytePool.cpp +++ b/Source/src/ds_byte_pool.cpp @@ -13,7 +13,9 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/DS_BytePool.h" +// The header is deprecated; this is its own implementation file. +#define MAFIANET_SILENCE_DEPRECATED_INCLUDES +#include "mafianet/ds_byte_pool.h" #include "mafianet/assert.h" #ifndef __APPLE__ // Use stdlib and not malloc for compatibility diff --git a/Source/src/DS_ByteQueue.cpp b/Source/src/ds_byte_queue.cpp similarity index 95% rename from Source/src/DS_ByteQueue.cpp rename to Source/src/ds_byte_queue.cpp index 656803b61..5ec7bb4b8 100644 --- a/Source/src/DS_ByteQueue.cpp +++ b/Source/src/ds_byte_queue.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/DS_ByteQueue.h" +#include "mafianet/ds_byte_queue.h" #include // Memmove #include // realloc #include diff --git a/Source/src/DS_HuffmanEncodingTree.cpp b/Source/src/ds_huffman_encoding_tree.cpp similarity index 95% rename from Source/src/DS_HuffmanEncodingTree.cpp rename to Source/src/ds_huffman_encoding_tree.cpp index 93a87b57a..78528fe86 100644 --- a/Source/src/DS_HuffmanEncodingTree.cpp +++ b/Source/src/ds_huffman_encoding_tree.cpp @@ -13,9 +13,9 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/DS_HuffmanEncodingTree.h" -#include "mafianet/DS_Queue.h" -#include "mafianet/BitStream.h" +#include "mafianet/ds_huffman_encoding_tree.h" +#include "mafianet/ds_queue.h" +#include "mafianet/bit_stream.h" #include "mafianet/assert.h" using namespace MafiaNet; diff --git a/Source/src/DS_Table.cpp b/Source/src/ds_table.cpp similarity index 95% rename from Source/src/DS_Table.cpp rename to Source/src/ds_table.cpp index ff130ff95..e3c489d08 100644 --- a/Source/src/DS_Table.cpp +++ b/Source/src/ds_table.cpp @@ -13,12 +13,12 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/DS_Table.h" -#include "mafianet/DS_OrderedList.h" +#include "mafianet/ds_table.h" +#include "mafianet/ds_ordered_list.h" #include #include "mafianet/assert.h" #include "mafianet/assert.h" -#include "mafianet/Itoa.h" +#include "mafianet/itoa.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/DynDNS.cpp b/Source/src/dyn_dns.cpp similarity index 94% rename from Source/src/DynDNS.cpp rename to Source/src/dyn_dns.cpp index c5383eef1..9ce18682f 100644 --- a/Source/src/DynDNS.cpp +++ b/Source/src/dyn_dns.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_DynDNS==1 && _RAKNET_SUPPORT_TCPInterface==1 -#include "mafianet/TCPInterface.h" +#include "mafianet/tcp_interface.h" #include "mafianet/socket2.h" -#include "mafianet/DynDNS.h" -#include "mafianet/GetTime.h" -#include "mafianet/Base64Encoder.h" +#include "mafianet/dyn_dns.h" +#include "mafianet/get_time.h" +#include "mafianet/base64_encoder.h" using namespace MafiaNet; diff --git a/Source/src/EmailSender.cpp b/Source/src/email_sender.cpp similarity index 94% rename from Source/src/EmailSender.cpp rename to Source/src/email_sender.cpp index c4649157b..e14308ad7 100644 --- a/Source/src/EmailSender.cpp +++ b/Source/src/email_sender.cpp @@ -13,20 +13,20 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_EmailSender==1 && _RAKNET_SUPPORT_TCPInterface==1 && _RAKNET_SUPPORT_FileOperations==1 // Useful sites // http://www.faqs.org\rfcs\rfc2821.html // http://www2.rad.com\networks/1995/mime/examples.htm -#include "mafianet/EmailSender.h" -#include "mafianet/TCPInterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/FileList.h" -#include "mafianet/BitStream.h" -#include "mafianet/Base64Encoder.h" +#include "mafianet/email_sender.h" +#include "mafianet/tcp_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/file_list.h" +#include "mafianet/bit_stream.h" +#include "mafianet/base64_encoder.h" #include #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/EpochTimeToString.cpp b/Source/src/epoch_time_to_string.cpp similarity index 89% rename from Source/src/EpochTimeToString.cpp rename to Source/src/epoch_time_to_string.cpp index 3d02e4dc5..3da17d4ee 100644 --- a/Source/src/EpochTimeToString.cpp +++ b/Source/src/epoch_time_to_string.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/FormatString.h" -#include "mafianet/EpochTimeToString.h" +#include "mafianet/format_string.h" +#include "mafianet/epoch_time_to_string.h" #include #include #include // localtime #include -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/FileList.cpp b/Source/src/file_list.cpp similarity index 95% rename from Source/src/FileList.cpp rename to Source/src/file_list.cpp index 1ded75734..9a6a6098c 100644 --- a/Source/src/FileList.cpp +++ b/Source/src/file_list.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/FileList.h" +#include "mafianet/file_list.h" #if _RAKNET_SUPPORT_FileOperations==1 @@ -41,14 +41,14 @@ #include #endif -//#include "mafianet/DR_SHA1.h" -#include "mafianet/DS_Queue.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/BitStream.h" -#include "mafianet/FileOperations.h" -#include "mafianet/SuperFastHash.h" +//#include "mafianet/dr_sha1.h" +#include "mafianet/ds_queue.h" +#include "mafianet/string_compressor.h" +#include "mafianet/bit_stream.h" +#include "mafianet/file_operations.h" +#include "mafianet/super_fast_hash.h" #include "mafianet/assert.h" -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -70,7 +70,7 @@ using namespace MafiaNet; #include #include #include -#include "mafianet/_FindFirst.h" +#include "mafianet/find_first.h" #include //defines intptr_t #endif diff --git a/Source/src/FileListTransfer.cpp b/Source/src/file_list_transfer.cpp similarity index 95% rename from Source/src/FileListTransfer.cpp rename to Source/src/file_list_transfer.cpp index b4a6dff94..b6fb94bcb 100644 --- a/Source/src/FileListTransfer.cpp +++ b/Source/src/file_list_transfer.cpp @@ -13,20 +13,20 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_FileListTransfer==1 && _RAKNET_SUPPORT_FileOperations==1 -#include "mafianet/FileListTransfer.h" -#include "mafianet/DS_HuffmanEncodingTree.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/FileList.h" -#include "mafianet/DS_Queue.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/ds_huffman_encoding_tree.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/string_compressor.h" +#include "mafianet/file_list.h" +#include "mafianet/ds_queue.h" +#include "mafianet/message_identifiers.h" #include "mafianet/types.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/statistics.h" -#include "mafianet/IncrementalReadInterface.h" +#include "mafianet/incremental_read_interface.h" #include "mafianet/assert.h" #include "mafianet/alloca.h" @@ -372,7 +372,7 @@ bool FileListTransfer::DecodeFile(Packet *packet, bool isTheFullFile) onFileStruct.fileData=0; if (isTheFullFile==false) { - // Disable endian swapping on reading this, as it's generated locally in ReliabilityLayer.cpp + // Disable endian swapping on reading this, as it's generated locally in reliability_layer.cpp inBitStream.ReadBits( (unsigned char* ) &partCount, BYTES_TO_BITS(sizeof(partCount)), true ); inBitStream.ReadBits( (unsigned char* ) &partTotal, BYTES_TO_BITS(sizeof(partTotal)), true ); inBitStream.ReadBits( (unsigned char* ) &partLength, BYTES_TO_BITS(sizeof(partLength)), true ); @@ -710,7 +710,7 @@ void FileListTransfer::OnReferencePush(Packet *packet, bool isTheFullFile) onFileStruct.fileData=0; if (isTheFullFile==false) { - // Disable endian swapping on reading this, as it's generated locally in ReliabilityLayer.cpp + // Disable endian swapping on reading this, as it's generated locally in reliability_layer.cpp inBitStream.ReadBits( (unsigned char* ) &partCount, BYTES_TO_BITS(sizeof(partCount)), true ); inBitStream.ReadBits( (unsigned char* ) &partTotal, BYTES_TO_BITS(sizeof(partTotal)), true ); inBitStream.ReadBits( (unsigned char* ) &partLength, BYTES_TO_BITS(sizeof(partLength)), true ); diff --git a/Source/src/FileOperations.cpp b/Source/src/file_operations.cpp similarity index 90% rename from Source/src/FileOperations.cpp rename to Source/src/file_operations.cpp index 4c826391b..935f73038 100644 --- a/Source/src/FileOperations.cpp +++ b/Source/src/file_operations.cpp @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/FileOperations.h" +#include "mafianet/file_operations.h" #if _RAKNET_SUPPORT_FileOperations==1 -#include "mafianet/memoryoverride.h" -#include "mafianet/_FindFirst.h" // For linux +#include "mafianet/memory_override.h" +#include "mafianet/find_first.h" // For linux #include #include #ifdef _WIN32 @@ -26,7 +26,7 @@ #else #include #include -#include "mafianet/_FindFirst.h" +#include "mafianet/find_first.h" #endif #include "errno.h" #include "mafianet/linux_adapter.h" diff --git a/Source/src/_FindFirst.cpp b/Source/src/find_first.cpp similarity index 91% rename from Source/src/_FindFirst.cpp rename to Source/src/find_first.cpp index 569b989b1..d5a02e3b1 100644 --- a/Source/src/_FindFirst.cpp +++ b/Source/src/find_first.cpp @@ -13,8 +13,8 @@ * Should emulate windows finddata structure */ #if (defined(__GNUC__) || defined(__GCCXML__)) && !defined(_WIN32) -#include "mafianet/_FindFirst.h" -#include "mafianet/DS_List.h" +#include "mafianet/find_first.h" +#include "mafianet/ds_list.h" #include @@ -25,7 +25,7 @@ static DataStructures::List< _findinfo_t* > fileInfo; -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" #include "mafianet/assert.h" /** @@ -137,7 +137,7 @@ int _findnext(long h, _finddata_t *f) // are not supported. f->size = filestat.st_size; - strncpy_s(f->name, entry->d_name, STRING_BUFFER_SIZE); + strncpy_s(f->name, entry->d_name, _TRUNCATE); return 0; } diff --git a/Source/src/FormatString.cpp b/Source/src/format_string.cpp similarity index 91% rename from Source/src/FormatString.cpp rename to Source/src/format_string.cpp index afc5d60d2..589fde036 100644 --- a/Source/src/FormatString.cpp +++ b/Source/src/format_string.cpp @@ -13,11 +13,11 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/FormatString.h" +#include "mafianet/format_string.h" #include #include #include -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/FullyConnectedMesh2.cpp b/Source/src/fully_connected_mesh2.cpp similarity index 96% rename from Source/src/FullyConnectedMesh2.cpp rename to Source/src/fully_connected_mesh2.cpp index e22d1fe64..0f923480c 100644 --- a/Source/src/FullyConnectedMesh2.cpp +++ b/Source/src/fully_connected_mesh2.cpp @@ -17,17 +17,17 @@ /// -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_FullyConnectedMesh2==1 -#include "mafianet/FullyConnectedMesh2.h" -#include "mafianet/peerinterface.h" +#include "mafianet/fully_connected_mesh2.h" +#include "mafianet/peer_interface.h" #include "mafianet/guid_util.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/message_identifiers.h" #include "mafianet/assert.h" -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" -#include "mafianet/DS_OrderedList.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" +#include "mafianet/ds_ordered_list.h" using namespace MafiaNet; diff --git a/Source/src/GetTime.cpp b/Source/src/get_time.cpp similarity index 93% rename from Source/src/GetTime.cpp rename to Source/src/get_time.cpp index 772a733c6..810254599 100644 --- a/Source/src/GetTime.cpp +++ b/Source/src/get_time.cpp @@ -18,14 +18,14 @@ #if defined(_WIN32) -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" // To call timeGetTime // on Code::Blocks, this needs to be libwinmm.a instead #pragma comment(lib, "Winmm.lib") #endif -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" @@ -52,7 +52,7 @@ MafiaNet::TimeUS initialTime; static bool initialized=false; #if defined(GET_TIME_SPIKE_LIMIT) && GET_TIME_SPIKE_LIMIT>0 -#include "mafianet/SimpleMutex.h" +#include "mafianet/simple_mutex.h" MafiaNet::TimeUS lastNormalizedReturnedValue=0; MafiaNet::TimeUS lastNormalizedInputValue=0; /// This constraints timer forward jumps to 1 second, and does not let it jump backwards diff --git a/Source/src/gettimeofday.cpp b/Source/src/get_time_of_day.cpp similarity index 92% rename from Source/src/gettimeofday.cpp rename to Source/src/get_time_of_day.cpp index 324d283a1..1e06b53a0 100644 --- a/Source/src/gettimeofday.cpp +++ b/Source/src/get_time_of_day.cpp @@ -15,11 +15,11 @@ #if defined(_WIN32) && !defined(__GNUC__) &&!defined(__GCCXML__) -#include "mafianet/gettimeofday.h" +#include "mafianet/get_time_of_day.h" // From http://www.openasthra.com/c-tidbits/gettimeofday-function-for-windows/ -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 diff --git a/Source/src/Getche.cpp b/Source/src/getche.cpp similarity index 93% rename from Source/src/Getche.cpp rename to Source/src/getche.cpp index d53b165e2..803e79a4f 100644 --- a/Source/src/Getche.cpp +++ b/Source/src/getche.cpp @@ -19,7 +19,7 @@ #else -#include "mafianet/Getche.h" +#include "mafianet/getche.h" char _getche() { diff --git a/Source/src/Gets.cpp b/Source/src/gets.cpp similarity index 100% rename from Source/src/Gets.cpp rename to Source/src/gets.cpp diff --git a/Source/src/GridSectorizer.cpp b/Source/src/grid_sectorizer.cpp similarity index 96% rename from Source/src/GridSectorizer.cpp rename to Source/src/grid_sectorizer.cpp index 0080bc28b..f34d0a92a 100644 --- a/Source/src/GridSectorizer.cpp +++ b/Source/src/grid_sectorizer.cpp @@ -14,7 +14,7 @@ */ #include "mafianet/assert.h" -#include "mafianet/GridSectorizer.h" +#include "mafianet/grid_sectorizer.h" //#include #include diff --git a/Source/src/HTTPConnection.cpp b/Source/src/http_connection.cpp similarity index 94% rename from Source/src/HTTPConnection.cpp rename to Source/src/http_connection.cpp index 91748ee01..bff0dd416 100644 --- a/Source/src/HTTPConnection.cpp +++ b/Source/src/http_connection.cpp @@ -17,11 +17,11 @@ /// \brief Contains HTTPConnection, used to communicate with web servers /// -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_HTTPConnection==1 && _RAKNET_SUPPORT_TCPInterface==1 -#include "mafianet/TCPInterface.h" -#include "mafianet/HTTPConnection.h" +#include "mafianet/tcp_interface.h" +#include "mafianet/http_connection.h" #include "mafianet/sleep.h" #include "mafianet/string.h" #include "mafianet/assert.h" diff --git a/Source/src/HTTPConnection2.cpp b/Source/src/http_connection2.cpp similarity index 95% rename from Source/src/HTTPConnection2.cpp rename to Source/src/http_connection2.cpp index 5ac111a36..ec5d851ba 100644 --- a/Source/src/HTTPConnection2.cpp +++ b/Source/src/http_connection2.cpp @@ -13,11 +13,11 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_HTTPConnection2==1 && _RAKNET_SUPPORT_TCPInterface==1 -#include "mafianet/HTTPConnection2.h" -#include "mafianet/TCPInterface.h" +#include "mafianet/http_connection2.h" +#include "mafianet/tcp_interface.h" using namespace MafiaNet; diff --git a/Source/src/IncrementalReadInterface.cpp b/Source/src/incremental_read_interface.cpp similarity index 93% rename from Source/src/IncrementalReadInterface.cpp rename to Source/src/incremental_read_interface.cpp index 0bad8e857..6734dd76f 100644 --- a/Source/src/IncrementalReadInterface.cpp +++ b/Source/src/incremental_read_interface.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/IncrementalReadInterface.h" +#include "mafianet/incremental_read_interface.h" #include #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/Itoa.cpp b/Source/src/itoa.cpp similarity index 94% rename from Source/src/Itoa.cpp rename to Source/src/itoa.cpp index d4ac0916f..7a18ecba9 100644 --- a/Source/src/Itoa.cpp +++ b/Source/src/itoa.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/EmptyHeader.h" +#include "mafianet/empty_header.h" #ifdef __cplusplus extern "C" { diff --git a/Source/src/linux_adapter.cpp b/Source/src/linux_adapter.cpp index cdb054815..b0610f8e8 100644 --- a/Source/src/linux_adapter.cpp +++ b/Source/src/linux_adapter.cpp @@ -237,12 +237,16 @@ errno_t strncpy_s(char *strDest, size_t numberOfElements, const char *strSource, } } else { - // otherwise we use count, but have to check that the destination buffer is of sufficient size - if ((count > numberOfElements) || ((count == numberOfElements) && (strSource[count] != '\0'))) { + // Otherwise copy at most count characters. Only read as far as count: + // the source need not be terminated within reach (dirent::d_name is + // 256 bytes, callers pass larger counts), and reading past it is what + // made this shim return garbage on Linux. The copy plus its terminator + // must fit the destination, as with MSVC. + numChars = strnlen(strSource, count); + if (numChars >= numberOfElements) { strDest[0] = '\0'; // ensure trailing \0 is written return 34; // error: ERANGE } - numChars = count; } (void)strncpy(strDest, strSource, numChars); diff --git a/Source/src/LinuxStrings.cpp b/Source/src/linux_strings.cpp similarity index 100% rename from Source/src/LinuxStrings.cpp rename to Source/src/linux_strings.cpp diff --git a/Source/src/LocklessTypes.cpp b/Source/src/lockless_types.cpp similarity index 93% rename from Source/src/LocklessTypes.cpp rename to Source/src/lockless_types.cpp index 90db56dc2..0f109ff12 100644 --- a/Source/src/LocklessTypes.cpp +++ b/Source/src/lockless_types.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/LocklessTypes.h" +#include "mafianet/lockless_types.h" using namespace MafiaNet; diff --git a/Source/src/LogCommandParser.cpp b/Source/src/log_command_parser.cpp similarity index 94% rename from Source/src/LogCommandParser.cpp rename to Source/src/log_command_parser.cpp index fdec20a93..b2bea50f6 100644 --- a/Source/src/LogCommandParser.cpp +++ b/Source/src/log_command_parser.cpp @@ -13,11 +13,11 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_LogCommandParser==1 -#include "mafianet/LogCommandParser.h" -#include "mafianet/TransportInterface.h" +#include "mafianet/log_command_parser.h" +#include "mafianet/transport_interface.h" #include @@ -25,7 +25,7 @@ #include #include -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/RakMemoryOverride.cpp b/Source/src/memory_override.cpp similarity index 95% rename from Source/src/RakMemoryOverride.cpp rename to Source/src/memory_override.cpp index 0180a12ba..c183c78b6 100644 --- a/Source/src/RakMemoryOverride.cpp +++ b/Source/src/memory_override.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" #include "mafianet/assert.h" #include diff --git a/Source/src/MessageFilter.cpp b/Source/src/message_filter.cpp similarity index 95% rename from Source/src/MessageFilter.cpp rename to Source/src/message_filter.cpp index ee4e1db98..38dcec14a 100644 --- a/Source/src/MessageFilter.cpp +++ b/Source/src/message_filter.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_MessageFilter==1 -#include "mafianet/MessageFilter.h" +#include "mafianet/message_filter.h" #include "mafianet/assert.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" #include "mafianet/assert.h" -#include "mafianet/peerinterface.h" -#include "mafianet/PacketizedTCP.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; diff --git a/Source/src/MmsgBatch.cpp b/Source/src/mmsg_batch.cpp similarity index 97% rename from Source/src/MmsgBatch.cpp rename to Source/src/mmsg_batch.cpp index 4201f3599..da9f84be5 100644 --- a/Source/src/MmsgBatch.cpp +++ b/Source/src/mmsg_batch.cpp @@ -5,7 +5,7 @@ * license.txt file in the root directory of this source tree. */ -#include "mafianet/MmsgBatch.h" +#include "mafianet/mmsg_batch.h" #include @@ -31,7 +31,7 @@ void MarkMmsgUnavailable(void) } // One buffer block per thread that actually batches -- see the declaration in -// MmsgBatch.h for why these live here rather than inline in the header. +// mmsg_batch.h for why these live here rather than inline in the header. char *RNS2SendBatch::Slot(unsigned i) { struct Block diff --git a/Source/src/MtuBlackHole.cpp b/Source/src/mtu_black_hole.cpp similarity index 93% rename from Source/src/MtuBlackHole.cpp rename to Source/src/mtu_black_hole.cpp index 68b0365fa..2aae1360f 100644 --- a/Source/src/MtuBlackHole.cpp +++ b/Source/src/mtu_black_hole.cpp @@ -5,9 +5,9 @@ * license.txt file in the root directory of this source tree. */ -#include "mafianet/MtuBlackHole.h" +#include "mafianet/mtu_black_hole.h" -#include "mafianet/MTUSize.h" +#include "mafianet/mtu_size.h" namespace MafiaNet { diff --git a/Source/src/NatPunchthroughClient.cpp b/Source/src/nat_punchthrough_client.cpp similarity index 96% rename from Source/src/NatPunchthroughClient.cpp rename to Source/src/nat_punchthrough_client.cpp index bc917c4d4..ec9ab4f68 100644 --- a/Source/src/NatPunchthroughClient.cpp +++ b/Source/src/nat_punchthrough_client.cpp @@ -13,16 +13,16 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatPunchthroughClient==1 -#include "mafianet/NatPunchthroughClient.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/PacketLogger.h" -#include "mafianet/Itoa.h" +#include "mafianet/nat_punchthrough_client.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/packet_logger.h" +#include "mafianet/itoa.h" using namespace MafiaNet; diff --git a/Source/src/NatPunchthroughServer.cpp b/Source/src/nat_punchthrough_server.cpp similarity index 95% rename from Source/src/NatPunchthroughServer.cpp rename to Source/src/nat_punchthrough_server.cpp index 627ec6a85..2f3f6527d 100644 --- a/Source/src/NatPunchthroughServer.cpp +++ b/Source/src/nat_punchthrough_server.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatPunchthroughServer==1 -#include "mafianet/NatPunchthroughServer.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MTUSize.h" -#include "mafianet/GetTime.h" -#include "mafianet/PacketLogger.h" +#include "mafianet/nat_punchthrough_server.h" +#include "mafianet/socket_layer.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/mtu_size.h" +#include "mafianet/get_time.h" +#include "mafianet/packet_logger.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/NatTypeDetectionClient.cpp b/Source/src/nat_type_detection_client.cpp similarity index 90% rename from Source/src/NatTypeDetectionClient.cpp rename to Source/src/nat_type_detection_client.cpp index c650e17d0..977dd068b 100644 --- a/Source/src/NatTypeDetectionClient.cpp +++ b/Source/src/nat_type_detection_client.cpp @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatTypeDetectionClient==1 -#include "mafianet/NatTypeDetectionClient.h" -#include "mafianet/smartptr.h" -#include "mafianet/BitStream.h" -#include "mafianet/SocketIncludes.h" +#include "mafianet/nat_type_detection_client.h" +#include "mafianet/smart_ptr.h" +#include "mafianet/bit_stream.h" +#include "mafianet/socket_includes.h" #include "mafianet/string.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/SocketDefines.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/socket_layer.h" +#include "mafianet/socket_defines.h" using namespace MafiaNet; @@ -56,18 +56,13 @@ void NatTypeDetectionClient::DetectNATType(SystemAddress _serverAddress) //sockAddr.ToString(false,str); sockets[0]->GetBoundAddress().ToString(false,str,static_cast(64)); c2=CreateNonblockingBoundSocket(str -#ifdef __native_client__ - , sockets[0]->chromeInstance -#endif ,this ); //c2Port=SocketLayer::GetLocalPort(c2); } -#if !defined(__native_client__) if (c2->IsBerkleySocket()) ((RNS2_Berkley*) c2)->CreateRecvPollingThread(0); -#endif serverAddress=_serverAddress; @@ -214,10 +209,8 @@ void NatTypeDetectionClient::Shutdown(void) serverAddress=UNASSIGNED_SYSTEM_ADDRESS; if (c2!=0) { -#if !defined(__native_client__) if (c2->IsBerkleySocket()) ((RNS2_Berkley *)c2)->BlockOnStopRecvPollingThread(); -#endif MafiaNet::OP_DELETE(c2, _FILE_AND_LINE_); c2=0; diff --git a/Source/src/NatTypeDetectionCommon.cpp b/Source/src/nat_type_detection_common.cpp similarity index 67% rename from Source/src/NatTypeDetectionCommon.cpp rename to Source/src/nat_type_detection_common.cpp index 8685858ae..914c73e5d 100644 --- a/Source/src/NatTypeDetectionCommon.cpp +++ b/Source/src/nat_type_detection_common.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NatTypeDetectionCommon.h" +#include "mafianet/nat_type_detection_common.h" #if _RAKNET_SUPPORT_NatTypeDetectionServer==1 || _RAKNET_SUPPORT_NatTypeDetectionClient==1 -#include "mafianet/SocketLayer.h" -#include "mafianet/SocketIncludes.h" -#include "mafianet/SocketDefines.h" +#include "mafianet/socket_layer.h" +#include "mafianet/socket_includes.h" +#include "mafianet/socket_defines.h" using namespace MafiaNet; @@ -100,23 +100,10 @@ const char *MafiaNet::NATTypeDetectionResultToStringFriendly(NATTypeDetectionRes RakNetSocket2* MafiaNet::CreateNonblockingBoundSocket(const char *bindAddr -#ifdef __native_client__ - ,_PP_Instance_ chromeInstance -#endif , RNS2EventHandler *eventHandler ) { RakNetSocket2 *r2 = RakNetSocket2Allocator::AllocRNS2(); -#if defined(__native_client__) - NativeClientBindParameters ncbp; - RNS2_NativeClient * nativeClientSocket = (RNS2_NativeClient*) r2; - ncbp.eventHandler=eventHandler; - ncbp.forceHostAddress=(char*) bindAddr; - ncbp.is_ipv6=false; - ncbp.nativeClientInstance=chromeInstance; - ncbp.port=0; - nativeClientSocket->Bind(&ncbp, _FILE_AND_LINE_); -#else if (r2->IsBerkleySocket()) { RNS2_BerkleyBindParameters bbp; @@ -131,7 +118,6 @@ RakNetSocket2* MafiaNet::CreateNonblockingBoundSocket(const char *bindAddr bbp.doNotFragment=false; bbp.pollingThreadPriority=0; bbp.eventHandler=eventHandler; - bbp.remotePortRakNetWasStartedOn_PS3_PS4_PSP2=0; RNS2BindResult br = ((RNS2_Berkley*) r2)->Bind(&bbp, _FILE_AND_LINE_); if (br==BR_FAILED_TO_BIND_SOCKET) @@ -155,56 +141,8 @@ RakNetSocket2* MafiaNet::CreateNonblockingBoundSocket(const char *bindAddr { RakAssert("TODO" && 0); } -#endif return r2; - - /* - #ifdef __native_client__ - RakNetSocket2 *s = SocketLayer::CreateBoundSocket( 0, 0, false, bindAddr, true, 0, AF_INET, chromeInstance ); - #else - RakNetSocket2 *s = SocketLayer::CreateBoundSocket( 0, 0, false, bindAddr, true, 0, AF_INET, 0 ); - #endif - - #ifdef _WIN32 - unsigned long nonblocking = 1; - s->IOCTLSocket( FIONBIO, &nonblocking ); - #elif defined(_PS3) || defined(__PS3__) || defined(SN_TARGET_PS3) || defined(_PS4) || defined(SN_TARGET_PSP2) - int sock_opt=1; - s->SetSockOpt(SOL_SOCKET, SO_NBIO, ( char * ) & sock_opt, sizeof ( sock_opt ) ); - #elif defined(__native_client__) - // Nop - #else - s->Fcntl( F_SETFL, O_NONBLOCK ); - #endif - return s; - */ -} - -/* -int MafiaNet::NatTypeRecvFrom(char *data, RakNetSocket2* socket, SystemAddress &sender, RNS2EventHandler *eventHandler) -{ -#if defined(__native_client__) - RakAssert("TODO" && 0); -#else - if (socket->IsBerkleySocket()) - { - RNS2RecvStruct *recvFromStruct; - recvFromStruct=AllocRNS2RecvStruct(_FILE_AND_LINE_); - if (recvFromStruct != nullptr) - { - recvFromStruct->socket=this; - socket->RecvFromBlocking(recvFromStruct); - } - if (recvFromStruct->bytesRead>0) - { - sender = recvFromStruct->systemAddress; - } - return recvFromStruct->bytesRead; - } - return 0; -#endif } -*/ #endif // #if _RAKNET_SUPPORT_NatTypeDetectionServer==1 || _RAKNET_SUPPORT_NatTypeDetectionClient==1 diff --git a/Source/src/NatTypeDetectionServer.cpp b/Source/src/nat_type_detection_server.cpp similarity index 88% rename from Source/src/NatTypeDetectionServer.cpp rename to Source/src/nat_type_detection_server.cpp index 19465d324..448a8570b 100644 --- a/Source/src/NatTypeDetectionServer.cpp +++ b/Source/src/nat_type_detection_server.cpp @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_NatTypeDetectionServer==1 -#include "mafianet/NatTypeDetectionServer.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/smartptr.h" -#include "mafianet/SocketIncludes.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/GetTime.h" -#include "mafianet/BitStream.h" -#include "mafianet/SocketDefines.h" +#include "mafianet/nat_type_detection_server.h" +#include "mafianet/socket_layer.h" +#include "mafianet/smart_ptr.h" +#include "mafianet/socket_includes.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/get_time.h" +#include "mafianet/bit_stream.h" +#include "mafianet/socket_defines.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -46,9 +46,6 @@ void NatTypeDetectionServer::Startup( const char *nonRakNetIP2, const char *nonRakNetIP3, const char *nonRakNetIP4 -#ifdef __native_client__ - ,_PP_Instance_ chromeInstance -#endif ) { DataStructures::List sockets; @@ -57,40 +54,26 @@ void NatTypeDetectionServer::Startup( sockets[0]->GetBoundAddress().ToString(false,str,static_cast(64)); s1p2= CreateNonblockingBoundSocket(str, -#ifdef __native_client__ - chromeInstance, -#endif this); s2p3= CreateNonblockingBoundSocket(nonRakNetIP2, -#ifdef __native_client__ - chromeInstance, -#endif this); s3p4= CreateNonblockingBoundSocket(nonRakNetIP3, -#ifdef __native_client__ - chromeInstance, -#endif this); s4p5= CreateNonblockingBoundSocket(nonRakNetIP4, -#ifdef __native_client__ - chromeInstance, -#endif this); strcpy_s(s3p4Address, nonRakNetIP3); - #if !defined(__native_client__) if (s3p4->IsBerkleySocket()) ((RNS2_Berkley*) s3p4)->CreateRecvPollingThread(0); - #endif } void NatTypeDetectionServer::Shutdown() { @@ -106,10 +89,8 @@ void NatTypeDetectionServer::Shutdown() } if (s3p4!=0) { -#if !defined(__native_client__) if (s3p4->IsBerkleySocket()) ((RNS2_Berkley *)s3p4)->BlockOnStopRecvPollingThread(); -#endif MafiaNet::OP_DELETE(s3p4,_FILE_AND_LINE_); s3p4=0; @@ -182,12 +163,12 @@ void NatTypeDetectionServer::Update(void) } else { - // RakAssert("j==0 in Update when looking up GUID in NatTypeDetectionServer.cpp. Either a bug or a late resend" && 0); + // RakAssert("j==0 in Update when looking up GUID in nat_type_detection_server.cpp. Either a bug or a late resend" && 0); } } else { - // RakAssert("Didn't read GUID in Update in NatTypeDetectionServer.cpp. Message format error" && 0); + // RakAssert("Didn't read GUID in Update in nat_type_detection_server.cpp. Message format error" && 0); } } @@ -248,12 +229,12 @@ void NatTypeDetectionServer::Update(void) } else { - // RakAssert("i==0 in Update when looking up GUID in NatTypeDetectionServer.cpp. Either a bug or a late resend" && 0); + // RakAssert("i==0 in Update when looking up GUID in nat_type_detection_server.cpp. Either a bug or a late resend" && 0); } } else { - // RakAssert("Didn't read GUID in Update in NatTypeDetectionServer.cpp. Message format error" && 0); + // RakAssert("Didn't read GUID in Update in nat_type_detection_server.cpp. Message format error" && 0); } len=NatTypeRecvFrom(data, s3p4, senderAddr); diff --git a/Source/src/NetworkIDManager.cpp b/Source/src/network_id_manager.cpp similarity index 92% rename from Source/src/NetworkIDManager.cpp rename to Source/src/network_id_manager.cpp index 4b8f5e9a2..c9ae900a0 100644 --- a/Source/src/NetworkIDManager.cpp +++ b/Source/src/network_id_manager.cpp @@ -17,13 +17,13 @@ /// -#include "mafianet/NetworkIDManager.h" -#include "mafianet/NetworkIDObject.h" +#include "mafianet/network_id_manager.h" +#include "mafianet/network_id_object.h" #include "mafianet/assert.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/sleep.h" -#include "mafianet/SuperFastHash.h" -#include "mafianet/peerinterface.h" +#include "mafianet/super_fast_hash.h" +#include "mafianet/peer_interface.h" using namespace MafiaNet; diff --git a/Source/src/NetworkIDObject.cpp b/Source/src/network_id_object.cpp similarity index 92% rename from Source/src/NetworkIDObject.cpp rename to Source/src/network_id_object.cpp index 462f5ad31..9cb6ec6ae 100644 --- a/Source/src/NetworkIDObject.cpp +++ b/Source/src/network_id_object.cpp @@ -17,8 +17,8 @@ /// -#include "mafianet/NetworkIDObject.h" -#include "mafianet/NetworkIDManager.h" +#include "mafianet/network_id_object.h" +#include "mafianet/network_id_manager.h" #include "mafianet/assert.h" #include "mafianet/alloca.h" diff --git a/Source/src/osx_adapter.cpp b/Source/src/osx_adapter.cpp index ad52e429d..5b894781e 100644 --- a/Source/src/osx_adapter.cpp +++ b/Source/src/osx_adapter.cpp @@ -252,12 +252,16 @@ errno_t strncpy_s(char *strDest, size_t numberOfElements, const char *strSource, } } else { - // otherwise we use count, but have to check that the destination buffer is of sufficient size - if ((count > numberOfElements) || ((count == numberOfElements) && (strSource[count] != '\0'))) { + // Otherwise copy at most count characters. Only read as far as count: + // the source need not be terminated within reach (dirent::d_name is + // 256 bytes, callers pass larger counts), and reading past it is what + // made this shim return garbage on Linux. The copy plus its terminator + // must fit the destination, as with MSVC. + numChars = strnlen(strSource, count); + if (numChars >= numberOfElements) { strDest[0] = '\0'; // ensure trailing \0 is written return 34; // error: ERANGE } - numChars = count; } (void)strncpy(strDest, strSource, numChars); diff --git a/Source/src/PacketConsoleLogger.cpp b/Source/src/packet_console_logger.cpp similarity index 86% rename from Source/src/PacketConsoleLogger.cpp rename to Source/src/packet_console_logger.cpp index 88f2599f0..959f8bf97 100644 --- a/Source/src/PacketConsoleLogger.cpp +++ b/Source/src/packet_console_logger.cpp @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_LogCommandParser==1 && _RAKNET_SUPPORT_PacketLogger==1 -#include "mafianet/PacketConsoleLogger.h" -#include "mafianet/LogCommandParser.h" +#include "mafianet/packet_console_logger.h" +#include "mafianet/log_command_parser.h" #include using namespace MafiaNet; diff --git a/Source/src/PacketFileLogger.cpp b/Source/src/packet_file_logger.cpp similarity index 87% rename from Source/src/PacketFileLogger.cpp rename to Source/src/packet_file_logger.cpp index cd170f229..918d581a6 100644 --- a/Source/src/PacketFileLogger.cpp +++ b/Source/src/packet_file_logger.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 -#include "mafianet/PacketFileLogger.h" -#include "mafianet/GetTime.h" +#include "mafianet/packet_file_logger.h" +#include "mafianet/get_time.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" using namespace MafiaNet; diff --git a/Source/src/PacketLogger.cpp b/Source/src/packet_logger.cpp similarity index 94% rename from Source/src/PacketLogger.cpp rename to Source/src/packet_logger.cpp index cf6ae2b3b..97bd89672 100644 --- a/Source/src/PacketLogger.cpp +++ b/Source/src/packet_logger.cpp @@ -13,24 +13,24 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 -#include "mafianet/PacketLogger.h" -#include "mafianet/BitStream.h" -#include "mafianet/DS_List.h" -#include "mafianet/InternalPacket.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/GetTime.h" +#include "mafianet/packet_logger.h" +#include "mafianet/bit_stream.h" +#include "mafianet/ds_list.h" +#include "mafianet/internal_packet.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/string_compressor.h" +#include "mafianet/get_time.h" #include #include #include -#include "mafianet/Itoa.h" +#include "mafianet/itoa.h" #include -#include "mafianet/SocketIncludes.h" -#include "mafianet/gettimeofday.h" +#include "mafianet/socket_includes.h" +#include "mafianet/get_time_of_day.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/PacketOutputWindowLogger.cpp b/Source/src/packet_output_window_logger.cpp similarity index 81% rename from Source/src/PacketOutputWindowLogger.cpp rename to Source/src/packet_output_window_logger.cpp index 1f82014ea..79d024ac6 100644 --- a/Source/src/PacketOutputWindowLogger.cpp +++ b/Source/src/packet_output_window_logger.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 #if defined(UNICODE) #include "mafianet/wstring.h" #endif -#include "mafianet/PacketOutputWindowLogger.h" +#include "mafianet/packet_output_window_logger.h" #include "mafianet/string.h" #if defined(_WIN32) -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #endif using namespace MafiaNet; @@ -47,10 +47,6 @@ void PacketOutputWindowLogger::WriteLog(const char *str) str2+="\n"; OutputDebugString(str2.C_String()); #endif -// DS_APR -#elif defined(__native_client__) - fprintf(stderr, "%s\n", str); -// /DS_APR #endif } diff --git a/Source/src/PacketizedTCP.cpp b/Source/src/packetized_tcp.cpp similarity index 95% rename from Source/src/PacketizedTCP.cpp rename to Source/src/packetized_tcp.cpp index 665b10f70..a1ba1bcf7 100644 --- a/Source/src/PacketizedTCP.cpp +++ b/Source/src/packetized_tcp.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketizedTCP==1 && _RAKNET_SUPPORT_TCPInterface==1 #include // used for std::min -#include "mafianet/PacketizedTCP.h" -#include "mafianet/NativeTypes.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/native_types.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" #include "mafianet/alloca.h" using namespace MafiaNet; diff --git a/Source/src/RakPeer.cpp b/Source/src/peer.cpp similarity index 95% rename from Source/src/RakPeer.cpp rename to Source/src/peer.cpp index 430f6ae22..68456a88a 100644 --- a/Source/src/RakPeer.cpp +++ b/Source/src/peer.cpp @@ -22,7 +22,7 @@ #include "mafianet/defines.h" #include "mafianet/peer.h" -#include "mafianet/SessionAdmission.h" +#include "mafianet/session_admission.h" #include "mafianet/types.h" #ifdef _WIN32 @@ -40,33 +40,33 @@ #include #include // toupper #include -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include #include -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/MtuBlackHole.h" -#include "mafianet/DS_HuffmanEncodingTree.h" -#include "mafianet/Rand.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/StringTable.h" -#include "mafianet/NetworkIDObject.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/mtu_black_hole.h" +#include "mafianet/ds_huffman_encoding_tree.h" +#include "mafianet/rand.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/string_compressor.h" +#include "mafianet/string_table.h" +#include "mafianet/network_id_object.h" #include "mafianet/types.h" -#include "mafianet/DR_SHA1.h" +#include "mafianet/dr_sha1.h" #include "mafianet/sleep.h" #include "mafianet/assert.h" #include "mafianet/version.h" -#include "mafianet/NetworkIDManager.h" -#include "mafianet/gettimeofday.h" -#include "mafianet/SignaledEvent.h" -#include "mafianet/SuperFastHash.h" +#include "mafianet/network_id_manager.h" +#include "mafianet/get_time_of_day.h" +#include "mafianet/signaled_event.h" +#include "mafianet/super_fast_hash.h" #include "mafianet/alloca.h" -#include "mafianet/WSAStartupSingleton.h" +#include "mafianet/wsa_startup_singleton.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #ifdef USE_THREADED_SEND -#include "mafianet/SendToThread.h" +#include "mafianet/send_to_thread.h" #endif #ifdef CAT_AUDIT @@ -119,7 +119,7 @@ extern void Console2GetIPAndPort(unsigned int, char *, unsigned short *, unsigne // from MAXIMUM_MTU_SIZE straight to 1200 that used to sit here meant a peer one // byte over the top rung gave up ~20% of its payload capacity to find that out. // -// The ladder itself lives in MtuBlackHole.h: the in-session black-hole +// The ladder itself lives in mtu_black_hole.h: the in-session black-hole // step-down (ReliabilityLayer) walks the same rungs this handshake probes. static const int NUM_MTU_SIZES=MafiaNet::MTU_LADDER_SIZE; static const int *const mtuSizes=MafiaNet::MTU_LADDER; @@ -469,53 +469,8 @@ StartupResult RakPeer::Startup( unsigned int maxConnections, SocketDescriptor *s addrToBind=socketDescriptors[i].hostAddress; */ - - - - - - - - - /* -#if RAKNET_SUPPORT_IPV6==1 - if (SocketLayer::IsSocketFamilySupported(addrToBind, socketDescriptors[i].socketFamily)==false) - return SOCKET_FAMILY_NOT_SUPPORTED; -#endif - - if (socketDescriptors[i].port!=0 && SocketLayer::IsPortInUse(socketDescriptors[i].port, addrToBind, socketDescriptors[i].socketFamily)==true) - { - DerefAllSockets(); - return SOCKET_PORT_ALREADY_IN_USE; - } - - RakNetSocket* rns = 0; - if (socketDescriptors[i].remotePortRakNetWasStartedOn_PS3_PSP2==0) - { - rns = SocketLayer::CreateBoundSocket( this, socketDescriptors[i].port, socketDescriptors[i].blockingSocket, addrToBind, 100, socketDescriptors[i].extraSocketOptions, socketDescriptors[i].socketFamily, socketDescriptors[i].chromeInstance ); - } - else - { -#if defined(_PS3) || defined(__PS3__) || defined(SN_TARGET_PS3) || defined(_PS4) - rns = SocketLayer::CreateBoundSocket_PS3Lobby( socketDescriptors[i].port, socketDescriptors[i].blockingSocket, addrToBind, socketDescriptors[i].socketFamily ); -#elif defined(SN_TARGET_PSP2) - rns = SocketLayer::CreateBoundSocket_PSP2( socketDescriptors[i].port, socketDescriptors[i].blockingSocket, addrToBind, socketDescriptors[i].socketFamily ); -#endif - } - */ - RakNetSocket2 *r2 = RakNetSocket2Allocator::AllocRNS2(); r2->SetUserConnectionSocketIndex(i); - #if defined(__native_client__) - NativeClientBindParameters ncbp; - RNS2_NativeClient * nativeClientSocket = (RNS2_NativeClient*) r2; - ncbp.eventHandler=this; - ncbp.forceHostAddress=(char*) socketDescriptors[i].hostAddress; - ncbp.is_ipv6=socketDescriptors[i].socketFamily==AF_INET6; - ncbp.nativeClientInstance=socketDescriptors[i].chromeInstance; - ncbp.port=socketDescriptors[i].port; - nativeClientSocket->Bind(&ncbp, _FILE_AND_LINE_); - #else if (r2->IsBerkleySocket()) { RNS2_BerkleyBindParameters bbp; @@ -530,7 +485,6 @@ StartupResult RakPeer::Startup( unsigned int maxConnections, SocketDescriptor *s bbp.doNotFragment=false; bbp.pollingThreadPriority=threadPriority; bbp.eventHandler=this; - bbp.remotePortRakNetWasStartedOn_PS3_PS4_PSP2=socketDescriptors[i].remotePortRakNetWasStartedOn_PS3_PSP2; RNS2BindResult br = ((RNS2_Berkley*) r2)->Bind(&bbp, _FILE_AND_LINE_); if ( @@ -564,51 +518,21 @@ StartupResult RakPeer::Startup( unsigned int maxConnections, SocketDescriptor *s { RakAssert("TODO" && 0); } - #endif -/* - - SystemAddress saOut; - SocketLayer::GetSystemAddress( rns, &saOut ); - rns->SetBoundAddress(saOut); - rns->SetRemotePortRakNetWasStartedOn(socketDescriptors[i].remotePortRakNetWasStartedOn_PS3_PSP2); - rns->SetChromeInstance(socketDescriptors[i].chromeInstance); - rns->SetExtraSocketOptions(socketDescriptors[i].extraSocketOptions); - rns->SetUserConnectionSocketIndex(i); - rns->SetBlockingSocket(socketDescriptors[i].blockingSocket); - -#if RAKNET_SUPPORT_IPV6==0 - if (addrToBind==0) - rns->SetBoundAddressToLoopback(4); -#endif - - // GetBoundAddress is asynch, which isn't supported by this architecture -#if !defined(__native_client__) - int zero=0; - if (SocketLayer::SendTo(rns, (const char*) &zero,4, rns->GetBoundAddress(), _FILE_AND_LINE_)!=0) - { - DerefAllSockets(); - return SOCKET_FAILED_TEST_SEND; - } -#endif - */ socketList.Push(r2, _FILE_AND_LINE_ ); } -#if !defined(__native_client__) for (i=0; iIsBerkleySocket()) ((RNS2_Berkley*) socketList[i])->CreateRecvPollingThread(threadPriority); } -#endif for (i=0; i < MAXIMUM_NUMBER_OF_INTERNAL_IDS; i++) { if (ipList[i]==UNASSIGNED_SYSTEM_ADDRESS) break; -#if !defined(__native_client__) // #high - using the 1st socket here is flawed - in cases of having multiple sockets (f.e. different ports and different families (i.e. IPv4/IPv6) we must use the proper // socket for each IP address in the list if (socketList[0]->IsBerkleySocket()) @@ -617,8 +541,6 @@ StartupResult RakPeer::Startup( unsigned int maxConnections, SocketDescriptor *s ipList[i].SetPortHostOrder(port); } -#endif -// ipList[i].SetPort(((RNS2_360_720*)socketList[0])->GetBoundAddress().GetPort()); } if ( maximumNumberOfPeers == 0 ) @@ -724,13 +646,7 @@ StartupResult RakPeer::Startup( unsigned int maxConnections, SocketDescriptor *s #if RAKPEER_USER_THREADED!=1 - #if defined(SN_TARGET_PSP2) - sprintf_s(threadName, "RecvFromLoop_%p", this); - //errorCode = MafiaNet::RakThread::Create(RecvFromLoop, rpai, threadPriority, threadName, 1+i, runtime); - errorCode = MafiaNet::RakThread::Create(RecvFromLoop, rpai, threadPriority, threadName, 1024*1); - #else errorCode = MafiaNet::RakThread::Create(RecvFromLoop, rpai, threadPriority); - #endif if ( errorCode != 0 ) { @@ -1133,7 +1049,6 @@ void RakPeer::Shutdown( unsigned int blockDuration, unsigned char orderingChanne // MafiaNet::TimeMS timeout; #if RAKPEER_USER_THREADED!=1 -#if !defined(__native_client__) for (i=0; i < socketList.Size(); i++) { if (socketList[i]->IsBerkleySocket()) @@ -1141,7 +1056,6 @@ void RakPeer::Shutdown( unsigned int blockDuration, unsigned char orderingChanne ((RNS2_Berkley *)socketList[i])->SignalStopRecvPollingThread(); } } -#endif /* // Get recvfrom to unblock @@ -1173,7 +1087,6 @@ void RakPeer::Shutdown( unsigned int blockDuration, unsigned char orderingChanne } */ -#if !defined(__native_client__) for (i=0; i < socketList.Size(); i++) { if (socketList[i]->IsBerkleySocket()) @@ -1181,7 +1094,6 @@ void RakPeer::Shutdown( unsigned int blockDuration, unsigned char orderingChanne ((RNS2_Berkley *)socketList[i])->BlockOnStopRecvPollingThread(); } } -#endif #endif // RAKPEER_USER_THREADED!=1 @@ -1484,8 +1396,8 @@ uint32_t RakPeer::Send( const MafiaNet::BitStream * bitStream, MafiaNet::Priorit // \param[in] data An array of pointers to blocks of data // \param[in] lengths An array of integers indicating the length of each block of data // \param[in] numParameters Length of the arrays data and lengths -// \param[in] priority What priority level to send on. See PacketPriority.h -// \param[in] reliability How reliability to send this data. See PacketPriority.h +// \param[in] priority What priority level to send on. See packet_priority.h +// \param[in] reliability How reliability to send this data. See packet_priority.h // \param[in] orderingChannel When using ordered or sequenced messages, what channel to order these on. Messages are only ordered relative to other messages on the same stream // \param[in] systemIdentifier Who to send this packet to, or in the case of broadcasting who not to send it to. Pass either a SystemAddress structure or a RakNetGUID structure. Use UNASSIGNED_SYSTEM_ADDRESS or to specify none // \param[in] broadcast True to send this packet to all connected systems. If true, then systemAddress specifies who not to send the packet to. @@ -1558,11 +1470,9 @@ Packet* RakPeer::Receive( void ) { recvFromStruct=bufferedPackets.Allocate( _FILE_AND_LINE_ ); recvFromStruct->s=socketList[i]->s; - recvFromStruct->remotePortRakNetWasStartedOn_PS3=socketList[i]->remotePortRakNetWasStartedOn_PS3_PSP2; recvFromStruct->extraSocketOptions=socketList[i]->extraSocketOptions; SocketLayer::RecvFromBlocking( - recvFromStruct->s, this, recvFromStruct->remotePortRakNetWasStartedOn_PS3, - recvFromStruct->extraSocketOptions, recvFromStruct->data, &recvFromStruct->bytesRead, &recvFromStruct->systemAddress, &recvFromStruct->timeRead); + recvFromStruct->s, this, recvFromStruct->extraSocketOptions, recvFromStruct->data, &recvFromStruct->bytesRead, &recvFromStruct->systemAddress, &recvFromStruct->timeRead); if (recvFromStruct->bytesRead<=0) { bufferedPackets.Deallocate(recvFromStruct, _FILE_AND_LINE_); @@ -2925,7 +2835,6 @@ void RakPeer::SetUnreliableTimeout(MafiaNet::TimeMS timeoutMS) // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- void RakPeer::SendTTL( const char* host, unsigned short remotePort, int ttl, unsigned connectionSocketIndex ) { -#if !defined(__native_client__) char fakeData[2]; fakeData[0]=0; fakeData[1]=1; @@ -2943,7 +2852,6 @@ void RakPeer::SendTTL( const char* host, unsigned short remotePort, int ttl, uns pluginListNTS[i]->OnDirectSocketSend((const char*)bsp.data, BYTES_TO_BITS(bsp.length), bsp.systemAddress); socketList[realIndex]->Send(&bsp, _FILE_AND_LINE_); } -#endif } @@ -4063,58 +3971,6 @@ RakPeer::RemoteSystemStruct * RakPeer::AssignSystemAddressToRemoteSystemList( co //} //else //{ - /* - // Force binding - unsigned int socketListIndex; - for (socketListIndex=0; socketListIndex < socketList.Size(); socketListIndex++) - { - if (socketList[socketListIndex]->GetBoundAddress()==bindingAddress) - { - // Force binding with existing socket - remoteSystem->rakNetSocket=socketList[socketListIndex]; - break; - } - } - - if (socketListIndex==socketList.Size()) - { - char ipListFoundIndexStr[128]; - ipList[foundIndex].ToString(false,str); - - // Force binding with new socket - RakNetSocket* rns(MafiaNet::OP_NEW(_FILE_AND_LINE_)); - if (incomingRakNetSocket->GetRemotePortRakNetWasStartedOn()==0) - rns = SocketLayer::CreateBoundSocket( this, bindingAddress.GetPort(), incomingRakNetSocket->GetBlockingSocket(), ipListFoundIndexStr, 0, incomingRakNetSocket->GetExtraSocketOptions(), incomingRakNetSocket->GetSocketFamily(), incomingRakNetSocket->GetChromeInstance() ); - else - rns = SocketLayer::CreateBoundSocket_PS3Lobby( bindingAddress.GetPort(), incomingRakNetSocket->GetBlockingSocket(), ipListFoundIndexStr, incomingRakNetSocket->GetSocketFamily() ); - - - if (rns==0) - { - // Can't bind. Just use whatever socket it came in on - remoteSystem->rakNetSocket=incomingRakNetSocket; - } - else - { - rns->GetBoundAddress()=bindingAddress; - rns->SetUserConnectionSocketIndex((unsigned int)-1); - socketList.Push(rns, _FILE_AND_LINE_ ); - remoteSystem->rakNetSocket=rns; - - -#ifdef _WIN32 - int highPriority=THREAD_PRIORITY_ABOVE_NORMAL; -#else - int highPriority=-10; -#endif - - highPriority=0; - - - } - } - - */ //} } @@ -6314,10 +6170,8 @@ bool RakPeer::RunUpdateCycle(BitStream &updateBitStream ) socketToUse = rcs->socket; rcs->systemAddress.FixForIPVersion(socketToUse->GetBoundAddress()); -#if !defined(__native_client__) if (socketToUse->IsBerkleySocket()) ((RNS2_Berkley*)socketToUse)->SetDoNotFragment(1); -#endif // SocketLayer::SetDoNotFragment(socketToUse, 1); MafiaNet::Time sendToStart= MafiaNet::GetTime(); @@ -6359,10 +6213,8 @@ bool RakPeer::RunUpdateCycle(BitStream &updateBitStream ) } } // SocketLayer::SetDoNotFragment(socketToUse, 0); -#if !defined(__native_client__) if (socketToUse->IsBerkleySocket()) ((RNS2_Berkley*)socketToUse)->SetDoNotFragment(0); -#endif requestedConnectionQueueIndex++; } @@ -7046,37 +6898,6 @@ void RakPeer::OnRNS2Recv(RNS2RecvStruct *recvStruct) // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -/* -RAK_THREAD_DECLARATION(MafiaNet::RecvFromLoop) -{ -#if defined(SN_TARGET_PSP2) - RakPeerAndIndex *rpai = ( RakPeerAndIndex * ) RakThread::GetRealThreadArgument(callGetRealThreadArgument); -#else - RakPeerAndIndex *rpai = ( RakPeerAndIndex * ) arguments; -#endif - RakPeer * rakPeer = rpai->rakPeer; - RakNetSocket *s = rpai->s; - MafiaNet::OP_DELETE(rpai,_FILE_AND_LINE_); - - rakPeer->isRecvFromLoopThreadActive.Increment(); - - while ( rakPeer->endThreads == false ) - { - if (rakPeer->RunRecvFromOnce(s)==false && - s->GetBlockingSocket()==false) - RakSleep(0); - } - rakPeer->isRecvFromLoopThreadActive.Decrement(); - -#if defined(SN_TARGET_PSP2) - return sceKernelExitDeleteThread(0); -#else - return 0; -#endif -} -*/ - -// -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- RAK_THREAD_DECLARATION(MafiaNet::UpdateNetworkLoop) { diff --git a/Source/src/PeerHandle.cpp b/Source/src/peer_handle.cpp similarity index 96% rename from Source/src/PeerHandle.cpp rename to Source/src/peer_handle.cpp index a4acd2e6a..ea9212a7c 100644 --- a/Source/src/PeerHandle.cpp +++ b/Source/src/peer_handle.cpp @@ -5,11 +5,11 @@ * license.txt file in the root directory of this source tree. */ -#include "mafianet/PeerHandle.h" +#include "mafianet/peer_handle.h" #include -#include "mafianet/MessageIdentifiers.h" // ID_TIMESTAMP +#include "mafianet/message_identifiers.h" // ID_TIMESTAMP namespace MafiaNet { diff --git a/Source/src/PluginInterface2.cpp b/Source/src/plugin_interface2.cpp similarity index 94% rename from Source/src/PluginInterface2.cpp rename to Source/src/plugin_interface2.cpp index 451e30a9a..97acdf314 100644 --- a/Source/src/PluginInterface2.cpp +++ b/Source/src/plugin_interface2.cpp @@ -14,10 +14,10 @@ */ -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketizedTCP.h" -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packetized_tcp.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; diff --git a/Source/src/PointGridSectorizer.cpp b/Source/src/point_grid_sectorizer.cpp similarity index 99% rename from Source/src/PointGridSectorizer.cpp rename to Source/src/point_grid_sectorizer.cpp index ce618b453..658b66266 100644 --- a/Source/src/PointGridSectorizer.cpp +++ b/Source/src/point_grid_sectorizer.cpp @@ -5,7 +5,7 @@ * license.txt file in the root directory of this source tree. */ -#include "mafianet/PointGridSectorizer.h" +#include "mafianet/point_grid_sectorizer.h" #include #include diff --git a/Source/src/Rackspace.cpp b/Source/src/rackspace.cpp similarity index 96% rename from Source/src/Rackspace.cpp rename to Source/src/rackspace.cpp index 4d57b92c1..15d86f989 100644 --- a/Source/src/Rackspace.cpp +++ b/Source/src/rackspace.cpp @@ -13,12 +13,12 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_Rackspace==1 && _RAKNET_SUPPORT_TCPInterface==1 -#include "mafianet/Rackspace.h" +#include "mafianet/rackspace.h" #include "mafianet/string.h" -#include "mafianet/TCPInterface.h" +#include "mafianet/tcp_interface.h" using namespace MafiaNet; diff --git a/Source/src/Rand.cpp b/Source/src/rand.cpp similarity index 96% rename from Source/src/Rand.cpp rename to Source/src/rand.cpp index da4b4ffe5..b4a3d8383 100644 --- a/Source/src/Rand.cpp +++ b/Source/src/rand.cpp @@ -49,7 +49,7 @@ #include #include #include -#include "mafianet/Rand.h" +#include "mafianet/rand.h" // // uint32 must be an unsigned integer type capable of holding at least 32 diff --git a/Source/src/RandSync.cpp b/Source/src/rand_sync.cpp similarity index 95% rename from Source/src/RandSync.cpp rename to Source/src/rand_sync.cpp index 40478a862..cd5decdf9 100644 --- a/Source/src/RandSync.cpp +++ b/Source/src/rand_sync.cpp @@ -13,8 +13,8 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/RandSync.h" -#include "mafianet/BitStream.h" +#include "mafianet/rand_sync.h" +#include "mafianet/bit_stream.h" #include #include diff --git a/Source/src/ReadyEvent.cpp b/Source/src/ready_event.cpp similarity index 95% rename from Source/src/ReadyEvent.cpp rename to Source/src/ready_event.cpp index 73ae516e5..65eedba12 100644 --- a/Source/src/ReadyEvent.cpp +++ b/Source/src/ready_event.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ReadyEvent==1 -#include "mafianet/ReadyEvent.h" -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/ready_event.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" #include "mafianet/assert.h" using namespace MafiaNet; diff --git a/Source/src/RelayPlugin.cpp b/Source/src/relay_plugin.cpp similarity index 95% rename from Source/src/RelayPlugin.cpp rename to Source/src/relay_plugin.cpp index 82088248d..0a9be4ed4 100644 --- a/Source/src/RelayPlugin.cpp +++ b/Source/src/relay_plugin.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_RelayPlugin==1 -#include "mafianet/RelayPlugin.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" +#include "mafianet/relay_plugin.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" using namespace MafiaNet; diff --git a/Source/src/ReliabilityLayer.cpp b/Source/src/reliability_layer.cpp similarity index 97% rename from Source/src/ReliabilityLayer.cpp rename to Source/src/reliability_layer.cpp index 8298c4446..79343711e 100644 --- a/Source/src/ReliabilityLayer.cpp +++ b/Source/src/reliability_layer.cpp @@ -18,17 +18,17 @@ -#include "mafianet/ReliabilityLayer.h" -#include "mafianet/MmsgBatch.h" -#include "mafianet/MtuBlackHole.h" -#include "mafianet/GetTime.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/PluginInterface2.h" +#include "mafianet/reliability_layer.h" +#include "mafianet/mmsg_batch.h" +#include "mafianet/mtu_black_hole.h" +#include "mafianet/get_time.h" +#include "mafianet/socket_layer.h" +#include "mafianet/plugin_interface2.h" #include "mafianet/assert.h" -#include "mafianet/Rand.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/rand.h" +#include "mafianet/message_identifiers.h" #ifdef USE_THREADED_SEND -#include "mafianet/SendToThread.h" +#include "mafianet/send_to_thread.h" #endif #include #include "mafianet/linux_adapter.h" @@ -230,7 +230,7 @@ struct DatagramHeaderFormat #ifdef _WIN32 //#define _DEBUG_LOGGER #ifdef _DEBUG_LOGGER -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #endif #endif @@ -1070,7 +1070,7 @@ bool ReliabilityLayer::HandleSocketReceiveFromConnectedPlayer( } } else { // holeCount>=receivedPackets.Size() if (holeCount > (DatagramSequenceNumberType)1000000) { - RakAssert("Hole count too high. See ReliabilityLayer.h" && 0); + RakAssert("Hole count too high. See reliability_layer.h" && 0); for (unsigned int messageHandlerIndex = 0; messageHandlerIndex < messageHandlerList.Size(); messageHandlerIndex++) { messageHandlerList[messageHandlerIndex]->OnReliabilityLayerNotification("holeCount > 1000000", BYTES_TO_BITS(length), systemAddress, true); @@ -1151,7 +1151,7 @@ bool ReliabilityLayer::HandleSocketReceiveFromConnectedPlayer( // Sequenced internalPacket = BuildPacketFromSplitPacketList( internalPacket->splitPacketId, timeRead, - s, systemAddress, rnr, remotePortRakNetWasStartedOn_PS3, extraSocketOptions); + s, systemAddress, rnr, extraSocketOptions); if (internalPacket) { // Update our index to the newest packet @@ -1193,7 +1193,7 @@ bool ReliabilityLayer::HandleSocketReceiveFromConnectedPlayer( InsertIntoSplitPacketList( internalPacket, timeRead ); internalPacket = BuildPacketFromSplitPacketList( internalPacket->splitPacketId, timeRead, - s, systemAddress, rnr, remotePortRakNetWasStartedOn_PS3, extraSocketOptions); + s, systemAddress, rnr, extraSocketOptions); if ( internalPacket == 0 ) { @@ -2379,7 +2379,6 @@ void ReliabilityLayer::SendBitStream( RakNetSocket2 *s, SystemAddress &systemAdd dat->s=s; dat->length=length; dat->sendTime = 0; - dat->remotePortRakNetWasStartedOn_PS3=remotePortRakNetWasStartedOn_PS3; dat->extraSocketOptions=extraSocketOptions; delayList.PushAtHead(dat, 0, _FILE_AND_LINE_); #else @@ -2432,7 +2431,6 @@ void ReliabilityLayer::SendBitStream( RakNetSocket2 *s, SystemAddress &systemAdd memcpy(block->data, bitStream->GetData(), length); block->dataWriteOffset=length; block->extraSocketOptions=extraSocketOptions; - block->remotePortRakNetWasStartedOn_PS3=remotePortRakNetWasStartedOn_PS3; block->s=s; block->systemAddress=systemAddress; SendToThread::ProcessBlock(block); @@ -2916,7 +2914,7 @@ InternalPacket* ReliabilityLayer::CreateInternalPacketFromBitStream(MafiaNet::Bi if ( bitStreamSucceeded == false ) { - // If this hits, most likely the variable buff is too small in RunUpdateCycle in RakPeer.cpp + // If this hits, most likely the variable buff is too small in RunUpdateCycle in peer.cpp RakAssert("Couldn't read all the data" && 0); FreeInternalPacketData(internalPacket, _FILE_AND_LINE_ ); @@ -3161,7 +3159,7 @@ void ReliabilityLayer::SplitPacket( InternalPacket *internalPacket ) } //------------------------------------------------------------------------------------------------------- -// In-session path-MTU black-hole recovery. Documented in ReliabilityLayer.h. +// In-session path-MTU black-hole recovery. Documented in reliability_layer.h. //------------------------------------------------------------------------------------------------------- void ReliabilityLayer::StepDownMtuAfterBlackHole(void) { diff --git a/Source/src/ReplicaManager3.cpp b/Source/src/replica_manager3.cpp similarity index 97% rename from Source/src/ReplicaManager3.cpp rename to Source/src/replica_manager3.cpp index d57d717c7..fe72deaa3 100644 --- a/Source/src/ReplicaManager3.cpp +++ b/Source/src/replica_manager3.cpp @@ -13,15 +13,15 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_ReplicaManager3==1 -#include "mafianet/ReplicaManager3.h" -#include "mafianet/VirtualWorldReplica3.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/NetworkIDManager.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/virtual_world_replica3.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/network_id_manager.h" using namespace MafiaNet; @@ -497,7 +497,7 @@ void ReplicaManager3::GetConnectionsInVirtualWorld(VirtualWorldId virtualWorld, // lightweight per-connection tag we filter that list by. We are not switching // RM3 worlds here -- we look up the RM3 world only to get its connections, // then keep the ones whose virtual world matches. (Most setups only ever use - // the auto-created RM3 world 0.) See VirtualWorld.h. + // the auto-created RM3 world 0.) See virtual_world.h. RakAssert(worldsArray[worldId]!=0 && "World not in use"); RM3World *world = worldsArray[worldId]; diff --git a/Source/src/Router2.cpp b/Source/src/router2.cpp similarity index 96% rename from Source/src/Router2.cpp rename to Source/src/router2.cpp index 43772edf4..ceac79ba9 100644 --- a/Source/src/Router2.cpp +++ b/Source/src/router2.cpp @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_Router2==1 && _RAKNET_SUPPORT_UDPForwarder==1 -#include "mafianet/Router2.h" -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" +#include "mafianet/router2.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" -#include "mafianet/DS_OrderedList.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/FormatString.h" -#include "mafianet/SocketDefines.h" +#include "mafianet/get_time.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/socket_layer.h" +#include "mafianet/format_string.h" +#include "mafianet/socket_defines.h" using namespace MafiaNet; diff --git a/Source/src/RPC4Plugin.cpp b/Source/src/rpc4_plugin.cpp similarity index 96% rename from Source/src/RPC4Plugin.cpp rename to Source/src/rpc4_plugin.cpp index 09fa0cdb5..d521f8b37 100644 --- a/Source/src/RPC4Plugin.cpp +++ b/Source/src/rpc4_plugin.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_RPC4Plugin==1 -#include "mafianet/RPC4Plugin.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/PacketizedTCP.h" +#include "mafianet/rpc4_plugin.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/packetized_tcp.h" #include "mafianet/sleep.h" #include "mafianet/defines.h" -#include "mafianet/DS_Queue.h" -//#include "mafianet/GetTime.h" +#include "mafianet/ds_queue.h" +//#include "mafianet/get_time.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/SecureHandshake.cpp b/Source/src/secure_handshake.cpp similarity index 95% rename from Source/src/SecureHandshake.cpp rename to Source/src/secure_handshake.cpp index 54a04c816..dd64da695 100644 --- a/Source/src/SecureHandshake.cpp +++ b/Source/src/secure_handshake.cpp @@ -17,7 +17,7 @@ /// -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if LIBCAT_SECURITY==1 diff --git a/Source/src/SendToThread.cpp b/Source/src/send_to_thread.cpp similarity index 90% rename from Source/src/SendToThread.cpp rename to Source/src/send_to_thread.cpp index 12a5808ec..de4b055a2 100644 --- a/Source/src/SendToThread.cpp +++ b/Source/src/send_to_thread.cpp @@ -13,16 +13,16 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/SendToThread.h" +#include "mafianet/send_to_thread.h" #ifdef USE_THREADED_SEND #include "mafianet/thread.h" -#include "mafianet/InternalPacket.h" -#include "mafianet/GetTime.h" +#include "mafianet/internal_packet.h" +#include "mafianet/get_time.h" #if USE_SLIDING_WINDOW_CONGESTION_CONTROL!=1 -#include "mafianet/CCRakNetUDT.h" +#include "mafianet/cc_udt.h" #else -#include "mafianet/CCRakNetSlidingWindow.h" +#include "mafianet/cc_sliding_window.h" #endif using namespace MafiaNet; diff --git a/Source/src/SignaledEvent.cpp b/Source/src/signaled_event.cpp similarity index 93% rename from Source/src/SignaledEvent.cpp rename to Source/src/signaled_event.cpp index 5e4c2b9e2..cac22065f 100644 --- a/Source/src/SignaledEvent.cpp +++ b/Source/src/signaled_event.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/SignaledEvent.h" +#include "mafianet/signaled_event.h" #include "mafianet/assert.h" #include "mafianet/sleep.h" diff --git a/Source/src/SimpleMutex.cpp b/Source/src/simple_mutex.cpp similarity index 92% rename from Source/src/SimpleMutex.cpp rename to Source/src/simple_mutex.cpp index 063f7243e..f14755fa1 100644 --- a/Source/src/SimpleMutex.cpp +++ b/Source/src/simple_mutex.cpp @@ -18,7 +18,7 @@ -#include "mafianet/SimpleMutex.h" +#include "mafianet/simple_mutex.h" #include "mafianet/assert.h" using namespace MafiaNet; diff --git a/Source/src/RakSleep.cpp b/Source/src/sleep.cpp similarity index 93% rename from Source/src/RakSleep.cpp rename to Source/src/sleep.cpp index df28f9245..32f8d18cd 100644 --- a/Source/src/RakSleep.cpp +++ b/Source/src/sleep.cpp @@ -14,7 +14,7 @@ */ #if defined(_WIN32) -#include "mafianet/WindowsIncludes.h" // Sleep +#include "mafianet/windows_includes.h" // Sleep diff --git a/Source/src/RakNetSocket2.cpp b/Source/src/socket2.cpp similarity index 93% rename from Source/src/RakNetSocket2.cpp rename to Source/src/socket2.cpp index b94873bb7..1468c6134 100644 --- a/Source/src/RakNetSocket2.cpp +++ b/Source/src/socket2.cpp @@ -14,12 +14,12 @@ */ #include "mafianet/socket2.h" -#include "mafianet/MmsgBatch.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/mmsg_batch.h" +#include "mafianet/memory_override.h" #include "mafianet/assert.h" #include "mafianet/sleep.h" -#include "mafianet/SocketDefines.h" -#include "mafianet/GetTime.h" +#include "mafianet/socket_defines.h" +#include "mafianet/get_time.h" #include #include // memcpy #include // EMSGSIZE, classified by RNS2_IsDatagramTooLargeError @@ -43,9 +43,8 @@ using namespace MafiaNet; #endif #define RAKNET_SOCKET_2_INLINE_FUNCTIONS -#include "RakNetSocket2_Windows_Linux.cpp" -#include "RakNetSocket2_Windows_Linux_360.cpp" -#include "RakNetSocket2_Berkley.cpp" +#include "socket2_windows_linux.cpp" +#include "socket2_berkley.cpp" #undef RAKNET_SOCKET_2_INLINE_FUNCTIONS #ifndef INVALID_SOCKET @@ -139,7 +138,6 @@ void RakNetSocket2::DomainNameToIP( const char *domainName, char ip[65] ) { bool IRNS2_Berkley::IsPortInUse(unsigned short port, const char *hostAddress, unsigned short addressFamily, int type ) { RNS2_BerkleyBindParameters bbp; - bbp.remotePortRakNetWasStartedOn_PS3_PS4_PSP2=0; bbp.port=port; bbp.hostAddress=(char*) hostAddress; bbp.addressFamily=addressFamily; bbp.type=type; bbp.protocol=0; bbp.nonBlockingSocket=false; bbp.setBroadcast=false; bbp.doNotFragment=false; bbp.protocol=0; @@ -287,7 +285,7 @@ void RNS2_Berkley::BlockOnStopRecvPollingThread(void) } const RNS2_BerkleyBindParameters *RNS2_Berkley::GetBindings(void) const {return &binding;} RNS2Socket RNS2_Berkley::GetSocket(void) const {return rns2Socket;} -// See RakNetSocket2_Berkley.cpp for WriteSharedIPV4, BindSharedIPV4And6 and other implementations +// See socket2_berkley.cpp for WriteSharedIPV4, BindSharedIPV4And6 and other implementations #if defined(_WIN32) RNS2_Windows::RNS2_Windows() {slo=0;} @@ -310,14 +308,14 @@ RNS2SendResult RNS2_Windows::Send( RNS2_SendParameters *sendParameters, const ch if (len>=0) return len; } - return Send_Windows_Linux_360NoVDP(rns2Socket,sendParameters, file, line); + return Send_Windows_Linux(rns2Socket,sendParameters, file, line); } void RNS2_Windows::GetMyIP( SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_IDS] ) {return GetMyIP_Windows_Linux(addresses);} void RNS2_Windows::SetSocketLayerOverride(SocketLayerOverride *_slo) {slo = _slo;} SocketLayerOverride* RNS2_Windows::GetSocketLayerOverride(void) {return slo;} #else RNS2BindResult RNS2_Linux::Bind( RNS2_BerkleyBindParameters *bindParameters, const char *file, unsigned int line ) {return BindShared(bindParameters, file, line);} -RNS2SendResult RNS2_Linux::Send( RNS2_SendParameters *sendParameters, const char *file, unsigned int line ) {return Send_Windows_Linux_360NoVDP(rns2Socket,sendParameters, file, line);} +RNS2SendResult RNS2_Linux::Send( RNS2_SendParameters *sendParameters, const char *file, unsigned int line ) {return Send_Windows_Linux(rns2Socket,sendParameters, file, line);} // See the declaration in socket2.h for why __linux__ is required here and not // just the build flag. #if defined(__linux__) diff --git a/Source/src/RakNetSocket2_Berkley.cpp b/Source/src/socket2_berkley.cpp similarity index 95% rename from Source/src/RakNetSocket2_Berkley.cpp rename to Source/src/socket2_berkley.cpp index ff3217ebc..0d75988dc 100644 --- a/Source/src/RakNetSocket2_Berkley.cpp +++ b/Source/src/socket2_berkley.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/EmptyHeader.h" +#include "mafianet/empty_header.h" #ifdef RAKNET_SOCKET_2_INLINE_FUNCTIONS @@ -25,14 +25,14 @@ #ifdef _WIN32 #include // used for _tprintf() (via RAKNET_DEBUG_TPRINTF) #else -#include "mafianet/LinuxStrings.h" // used for _stricmp() +#include "mafianet/linux_strings.h" // used for _stricmp() #include // used for getaddrinfo() #include // used for getaddrinfo() #include // used for getaddrinfo() #endif -#include "mafianet/Itoa.h" -#include "mafianet/WSAStartupSingleton.h" +#include "mafianet/itoa.h" +#include "mafianet/wsa_startup_singleton.h" // Domain name resolution functions void DomainNameToIP_Berkley_IPV4And6( const char *domainName, char ip[65] ) @@ -122,7 +122,7 @@ void RNS2_Berkley::SetSocketOptions(void) RakAssert(r==0); // Immediate hard close. Don't linger the socket, or recreating the socket quickly on Vista fails. - // Fail with voice and xbox + // Fails on some platforms when the socket protocol is not plain UDP sock_opt=0; r = setsockopt__( rns2Socket, SOL_SOCKET, SO_LINGER, ( char * ) & sock_opt, sizeof ( sock_opt ) ); diff --git a/Source/src/RakNetSocket2_Windows_Linux.cpp b/Source/src/socket2_windows_linux.cpp similarity index 81% rename from Source/src/RakNetSocket2_Windows_Linux.cpp rename to Source/src/socket2_windows_linux.cpp index 1c5c74111..fc4d9cc9d 100644 --- a/Source/src/RakNetSocket2_Windows_Linux.cpp +++ b/Source/src/socket2_windows_linux.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/EmptyHeader.h" +#include "mafianet/empty_header.h" #ifdef RAKNET_SOCKET_2_INLINE_FUNCTIONS @@ -216,6 +216,56 @@ void GetMyIP_Windows_Linux(SystemAddress addresses[MAXIMUM_NUMBER_OF_INTERNAL_ID #endif // RAKNET_SUPPORT_IPV6 == 1 } + +RNS2SendResult RNS2_Windows_Linux::Send_Windows_Linux( RNS2Socket rns2Socket, RNS2_SendParameters *sendParameters, const char *file, unsigned int line ) { + + int len=0; + do + { + (void) file; + (void) line; + + + int oldTTL=-1; + if (sendParameters->ttl>0) + { + socklen_t opLen=sizeof(oldTTL); + // Get the current TTL + if (getsockopt__(rns2Socket, sendParameters->systemAddress.GetIPPROTO(), IP_TTL, ( char * ) & oldTTL, &opLen ) != -1) + { + int newTTL=sendParameters->ttl; + setsockopt__(rns2Socket, sendParameters->systemAddress.GetIPPROTO(), IP_TTL, ( char * ) & newTTL, sizeof ( newTTL ) ); + } + } + + + if (sendParameters->systemAddress.address.addr4.sin_family==AF_INET) + { + len = sendto__( rns2Socket, sendParameters->data, sendParameters->length, 0, ( const sockaddr* ) & sendParameters->systemAddress.address.addr4, sizeof( sockaddr_in ) ); + } + else + { +#if RAKNET_SUPPORT_IPV6==1 + len = sendto__( rns2Socket, sendParameters->data, sendParameters->length, 0, ( const sockaddr* ) & sendParameters->systemAddress.address.addr6, sizeof( sockaddr_in6 ) ); +#endif + } + + if (len<0) + { + RAKNET_DEBUG_PRINTF("sendto failed with code %i for char %i and length %i.\n", len, sendParameters->data[0], sendParameters->length); + } + + + if (oldTTL!=-1) + { + setsockopt__(rns2Socket, sendParameters->systemAddress.GetIPPROTO(), IP_TTL, ( char * ) & oldTTL, sizeof ( oldTTL ) ); + } + + } + while ( len == 0 ); + return len; +} + #endif // RAKNETSOCKET2_WINDOWS_LINUX_CPP #endif // RAKNET_SOCKET_2_INLINE_FUNCTIONS diff --git a/Source/src/SocketLayer.cpp b/Source/src/socket_layer.cpp similarity index 92% rename from Source/src/SocketLayer.cpp rename to Source/src/socket_layer.cpp index 44bd2d0eb..e4c089b60 100644 --- a/Source/src/SocketLayer.cpp +++ b/Source/src/socket_layer.cpp @@ -17,13 +17,13 @@ /// \brief SocketLayer class implementation /// -#include "mafianet/SocketLayer.h" +#include "mafianet/socket_layer.h" #include "mafianet/assert.h" #include "mafianet/types.h" #include "mafianet/peer.h" -#include "mafianet/GetTime.h" -#include "mafianet/LinuxStrings.h" -#include "mafianet/SocketDefines.h" +#include "mafianet/get_time.h" +#include "mafianet/linux_strings.h" +#include "mafianet/socket_defines.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" #if (defined(__GNUC__) || defined(__GCCXML__)) && !defined(__WIN32__) @@ -40,24 +40,18 @@ using namespace MafiaNet; -/* -#if defined(__native_client__) -using namespace pp; -#endif -*/ - #if USE_SLIDING_WINDOW_CONGESTION_CONTROL!=1 -#include "mafianet/CCRakNetUDT.h" +#include "mafianet/cc_udt.h" #else -#include "mafianet/CCRakNetSlidingWindow.h" +#include "mafianet/cc_sliding_window.h" #endif //SocketLayerOverride *SocketLayer::slo=0; #ifdef _WIN32 -#include "mafianet/WSAStartupSingleton.h" -#include "mafianet/WindowsIncludes.h" +#include "mafianet/wsa_startup_singleton.h" +#include "mafianet/windows_includes.h" #else @@ -80,7 +74,7 @@ using namespace pp; #include "mafianet/sleep.h" #include -#include "mafianet/Itoa.h" +#include "mafianet/itoa.h" namespace MafiaNet { @@ -102,9 +96,6 @@ void PrepareAddrInfoHints(addrinfo *hints) void SocketLayer::SetSocketOptions( __UDPSOCKET__ listenSocket, bool blockingSocket, bool setBroadcast) { -#ifdef __native_client__ - (void) listenSocket; -#else int sock_opt = 1; // This doubles the max throughput rate @@ -112,7 +103,7 @@ void SocketLayer::SetSocketOptions( __UDPSOCKET__ listenSocket, bool blockingSoc setsockopt__(listenSocket, SOL_SOCKET, SO_RCVBUF, ( char * ) & sock_opt, sizeof ( sock_opt ) ); // Immediate hard close. Don't linger the socket, or recreating the socket quickly on Vista fails. - // Fail with voice and xbox + // Fails on some platforms when the socket protocol is not plain UDP sock_opt=0; setsockopt__(listenSocket, SOL_SOCKET, SO_LINGER, ( char * ) & sock_opt, sizeof ( sock_opt ) ); @@ -133,7 +124,7 @@ void SocketLayer::SetSocketOptions( __UDPSOCKET__ listenSocket, bool blockingSoc } if (setBroadcast) { - // Note: Fails with VDP but not xbox + // Note: Fails when the socket protocol is not plain UDP // Set broadcast capable sock_opt=1; if ( setsockopt__(listenSocket, SOL_SOCKET, SO_BROADCAST, ( char * ) & sock_opt, sizeof( sock_opt ) ) == -1 ) @@ -155,7 +146,6 @@ void SocketLayer::SetSocketOptions( __UDPSOCKET__ listenSocket, bool blockingSoc #endif } } -#endif } MafiaNet::RakString SocketLayer::GetSubNetForSocketAndIp(__UDPSOCKET__ inSock, MafiaNet::RakString inIpString) @@ -355,9 +345,6 @@ unsigned short SocketLayer::GetLocalPort(__UDPSOCKET__ s) } void SocketLayer::GetSystemAddress_Old ( __UDPSOCKET__ s, SystemAddress *systemAddressOut ) { -#if defined(__native_client__) - *systemAddressOut = UNASSIGNED_SYSTEM_ADDRESS; -#else sockaddr_in sa; memset(&sa,0,sizeof(sockaddr_in)); socklen_t len = sizeof(sa); @@ -381,7 +368,6 @@ void SocketLayer::GetSystemAddress_Old ( __UDPSOCKET__ s, SystemAddress *systemA systemAddressOut->SetPortNetworkOrder(sa.sin_port); systemAddressOut->address.addr4.sin_addr.s_addr=sa.sin_addr.s_addr; -#endif } /* diff --git a/Source/src/RakNetStatistics.cpp b/Source/src/statistics.cpp similarity index 97% rename from Source/src/RakNetStatistics.cpp rename to Source/src/statistics.cpp index 4462a2a9f..22ca74927 100644 --- a/Source/src/RakNetStatistics.cpp +++ b/Source/src/statistics.cpp @@ -20,7 +20,7 @@ #include "mafianet/statistics.h" #include // sprintf -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "mafianet/string.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/StatisticsHistory.cpp b/Source/src/statistics_history.cpp similarity index 96% rename from Source/src/StatisticsHistory.cpp rename to Source/src/statistics_history.cpp index ee9327914..3ba358c6c 100644 --- a/Source/src/StatisticsHistory.cpp +++ b/Source/src/statistics_history.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_StatisticsHistory==1 -#include "mafianet/StatisticsHistory.h" -#include "mafianet/GetTime.h" +#include "mafianet/statistics_history.h" +#include "mafianet/get_time.h" #include "mafianet/statistics.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" using namespace MafiaNet; diff --git a/Source/src/RakString.cpp b/Source/src/string.cpp similarity index 95% rename from Source/src/RakString.cpp rename to Source/src/string.cpp index a887add35..a92399952 100644 --- a/Source/src/RakString.cpp +++ b/Source/src/string.cpp @@ -15,15 +15,15 @@ #include "mafianet/string.h" #include "mafianet/assert.h" -#include "mafianet/memoryoverride.h" -#include "mafianet/BitStream.h" +#include "mafianet/memory_override.h" +#include "mafianet/bit_stream.h" #include #include -#include "mafianet/LinuxStrings.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/SimpleMutex.h" +#include "mafianet/linux_strings.h" +#include "mafianet/string_compressor.h" +#include "mafianet/simple_mutex.h" #include -#include "mafianet/Itoa.h" +#include "mafianet/itoa.h" #include #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -1575,7 +1575,7 @@ void RakString::UnlockMutex(void) /* #include "mafianet/string.h" #include -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/Source/src/StringCompressor.cpp b/Source/src/string_compressor.cpp similarity index 92% rename from Source/src/StringCompressor.cpp rename to Source/src/string_compressor.cpp index 3153aae8a..a5c9ec60a 100644 --- a/Source/src/StringCompressor.cpp +++ b/Source/src/string_compressor.cpp @@ -18,9 +18,9 @@ -#include "mafianet/StringCompressor.h" -#include "mafianet/DS_HuffmanEncodingTree.h" -#include "mafianet/BitStream.h" +#include "mafianet/string_compressor.h" +#include "mafianet/ds_huffman_encoding_tree.h" +#include "mafianet/bit_stream.h" #include "mafianet/string.h" #include "mafianet/assert.h" #include diff --git a/Source/src/StringTable.cpp b/Source/src/string_table.cpp similarity index 93% rename from Source/src/StringTable.cpp rename to Source/src/string_table.cpp index 101ae1da7..5ad19849b 100644 --- a/Source/src/StringTable.cpp +++ b/Source/src/string_table.cpp @@ -13,12 +13,12 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/StringTable.h" +#include "mafianet/string_table.h" #include #include "mafianet/assert.h" #include -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" using namespace MafiaNet; diff --git a/Source/src/SuperFastHash.cpp b/Source/src/super_fast_hash.cpp similarity index 94% rename from Source/src/SuperFastHash.cpp rename to Source/src/super_fast_hash.cpp index 730b25244..636a3a4a5 100644 --- a/Source/src/SuperFastHash.cpp +++ b/Source/src/super_fast_hash.cpp @@ -13,8 +13,8 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/SuperFastHash.h" -#include "mafianet/NativeTypes.h" +#include "mafianet/super_fast_hash.h" +#include "mafianet/native_types.h" #include #if !defined(_WIN32) diff --git a/Source/src/TableSerializer.cpp b/Source/src/table_serializer.cpp similarity index 95% rename from Source/src/TableSerializer.cpp rename to Source/src/table_serializer.cpp index 62956f749..6f679cfdd 100644 --- a/Source/src/TableSerializer.cpp +++ b/Source/src/table_serializer.cpp @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/TableSerializer.h" -#include "mafianet/DS_Table.h" -#include "mafianet/BitStream.h" -#include "mafianet/StringCompressor.h" +#include "mafianet/table_serializer.h" +#include "mafianet/ds_table.h" +#include "mafianet/bit_stream.h" +#include "mafianet/string_compressor.h" #include "mafianet/assert.h" using namespace MafiaNet; diff --git a/Source/src/TCPInterface.cpp b/Source/src/tcp_interface.cpp similarity index 94% rename from Source/src/TCPInterface.cpp rename to Source/src/tcp_interface.cpp index eeb61bbe4..f1b2640e2 100644 --- a/Source/src/TCPInterface.cpp +++ b/Source/src/tcp_interface.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TCPInterface==1 /// \file @@ -22,7 +22,7 @@ -#include "mafianet/TCPInterface.h" +#include "mafianet/tcp_interface.h" #ifdef _WIN32 typedef int socklen_t; #else @@ -35,11 +35,11 @@ #include #include "mafianet/assert.h" #include "mafianet/sleep.h" -#include "mafianet/StringCompressor.h" -#include "mafianet/StringTable.h" -#include "mafianet/Itoa.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/SocketDefines.h" +#include "mafianet/string_compressor.h" +#include "mafianet/string_table.h" +#include "mafianet/itoa.h" +#include "mafianet/socket_layer.h" +#include "mafianet/socket_defines.h" #if (defined(__GNUC__) || defined(__GCCXML__)) && !defined(__WIN32__) #include #endif @@ -48,7 +48,7 @@ #endif #ifdef _WIN32 -#include "mafianet/WSAStartupSingleton.h" +#include "mafianet/wsa_startup_singleton.h" #endif namespace MafiaNet { @@ -174,9 +174,6 @@ bool TCPInterface::CreateListenSocket(unsigned short port, unsigned short maxInc bool TCPInterface::Start(unsigned short port, unsigned short maxIncomingConnections, unsigned short maxConnections, int _threadPriority, unsigned short socketFamily, const char *bindAddress) { -#ifdef __native_client__ - return false; -#else (void) socketFamily; if (isStarted.GetValue()>0) @@ -234,7 +231,6 @@ bool TCPInterface::Start(unsigned short port, unsigned short maxIncomingConnecti messageHandlerList[i]->OnRakPeerStartup(); return true; -#endif // __native_client__ } void TCPInterface::Stop(void) { @@ -242,7 +238,6 @@ void TCPInterface::Stop(void) for (i=0; i < messageHandlerList.Size(); i++) messageHandlerList[i]->OnRakPeerShutdown(); -#ifndef __native_client__ if (isStarted.GetValue()==0) return; @@ -324,7 +319,6 @@ void TCPInterface::Stop(void) -#endif // __native_client__ } SystemAddress TCPInterface::Connect(const char* host, unsigned short remotePort, bool block, unsigned short socketFamily, const char *bindAddress) { @@ -773,9 +767,6 @@ unsigned int TCPInterface::GetOutgoingDataBufferSize(SystemAddress systemAddress } __TCPSOCKET__ TCPInterface::SocketConnect(const char* host, unsigned short remotePort, unsigned short socketFamily, const char *bindAddress) { -#ifdef __native_client__ - return 0; -#else int connectResult; (void) connectResult; (void) socketFamily; @@ -880,7 +871,6 @@ __TCPSOCKET__ TCPInterface::SocketConnect(const char* host, unsigned short remot } return sockfd; -#endif // __native_client__ } RAK_THREAD_DECLARATION(MafiaNet::ConnectionAttemptLoop) @@ -1278,7 +1268,7 @@ void RemoteClient::SetActive(bool a) void RemoteClient::SendOrBuffer(const char **data, const unsigned int *lengths, const int numParameters) { // True can save memory and buffer copies, but gives worse performance overall - // Do not use true for the XBOX, as it just locks up + // Keep false unless sends from the user thread are known to be safe on the target const bool ALLOW_SEND_FROM_USER_THREAD=false; int parameterIndex; @@ -1417,19 +1407,11 @@ int RemoteClient::Recv(char *data, const int dataSize) #else int RemoteClient::Send(const char *data, unsigned int length) { -#ifdef __native_client__ - return -1; -#else return send__(socket, data, length, 0); -#endif } int RemoteClient::Recv(char *data, const int dataSize) { -#ifdef __native_client__ - return -1; -#else return recv__(socket, data, dataSize, 0); -#endif } #endif diff --git a/Source/src/TeamBalancer.cpp b/Source/src/team_balancer.cpp similarity index 95% rename from Source/src/TeamBalancer.cpp rename to Source/src/team_balancer.cpp index 31a08e0b1..c615292c5 100644 --- a/Source/src/TeamBalancer.cpp +++ b/Source/src/team_balancer.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TeamBalancer==1 -#include "mafianet/TeamBalancer.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/Rand.h" +#include "mafianet/team_balancer.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/rand.h" using namespace MafiaNet; diff --git a/Source/src/TeamManager.cpp b/Source/src/team_manager.cpp similarity index 97% rename from Source/src/TeamManager.cpp rename to Source/src/team_manager.cpp index d197a74c2..6480bf39b 100644 --- a/Source/src/TeamManager.cpp +++ b/Source/src/team_manager.cpp @@ -13,13 +13,13 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TeamManager==1 -#include "mafianet/TeamManager.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/GetTime.h" +#include "mafianet/team_manager.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/Source/src/TelnetTransport.cpp b/Source/src/telnet_transport.cpp similarity index 94% rename from Source/src/TelnetTransport.cpp rename to Source/src/telnet_transport.cpp index 1caea68e1..0ea791cfa 100644 --- a/Source/src/TelnetTransport.cpp +++ b/Source/src/telnet_transport.cpp @@ -13,15 +13,15 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TelnetTransport==1 && _RAKNET_SUPPORT_TCPInterface==1 -#include "mafianet/TelnetTransport.h" -#include "mafianet/TCPInterface.h" +#include "mafianet/telnet_transport.h" +#include "mafianet/tcp_interface.h" #include #include #include -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/RakThread.cpp b/Source/src/thread.cpp similarity index 86% rename from Source/src/RakThread.cpp rename to Source/src/thread.cpp index 77157e680..e9a5fbe29 100644 --- a/Source/src/RakThread.cpp +++ b/Source/src/thread.cpp @@ -17,12 +17,12 @@ #include "mafianet/assert.h" #include "mafianet/defines.h" #include "mafianet/sleep.h" -#include "mafianet/memoryoverride.h" +#include "mafianet/memory_override.h" using namespace MafiaNet; #if defined(_WIN32) - #include "mafianet/WindowsIncludes.h" + #include "mafianet/windows_includes.h" #include #include #else @@ -111,7 +111,7 @@ int RakThread::Create( void* start_address( void* ), void *arglist, int priority pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); int res = pthread_create( &threadHandle, &attr, start_address, arglist ); - RakAssert(res==0 && "pthread_create in RakThread.cpp failed.") + RakAssert(res==0 && "pthread_create in thread.cpp failed.") return res; #endif } diff --git a/Source/src/ThreadsafePacketLogger.cpp b/Source/src/threadsafe_packet_logger.cpp similarity index 90% rename from Source/src/ThreadsafePacketLogger.cpp rename to Source/src/threadsafe_packet_logger.cpp index f730d2165..2999ab72a 100644 --- a/Source/src/ThreadsafePacketLogger.cpp +++ b/Source/src/threadsafe_packet_logger.cpp @@ -13,10 +13,10 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_PacketLogger==1 -#include "mafianet/ThreadsafePacketLogger.h" +#include "mafianet/threadsafe_packet_logger.h" #include #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/RakNetTransport2.cpp b/Source/src/transport2.cpp similarity index 92% rename from Source/src/RakNetTransport2.cpp rename to Source/src/transport2.cpp index b29abf429..601c2d358 100644 --- a/Source/src/RakNetTransport2.cpp +++ b/Source/src/transport2.cpp @@ -13,18 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TelnetTransport==1 #include "mafianet/transport2.h" -#include "mafianet/peerinterface.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" #include #include #include -#include "mafianet/LinuxStrings.h" +#include "mafianet/linux_strings.h" #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" diff --git a/Source/src/TwoWayAuthentication.cpp b/Source/src/two_way_authentication.cpp similarity index 95% rename from Source/src/TwoWayAuthentication.cpp rename to Source/src/two_way_authentication.cpp index 317099c90..f6a949111 100644 --- a/Source/src/TwoWayAuthentication.cpp +++ b/Source/src/two_way_authentication.cpp @@ -13,15 +13,15 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_TwoWayAuthentication==1 -#include "mafianet/TwoWayAuthentication.h" -#include "mafianet/Rand.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/peerinterface.h" +#include "mafianet/two_way_authentication.h" +#include "mafianet/rand.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/peer_interface.h" #if LIBCAT_SECURITY==1 static const int HASH_BITS = 256; diff --git a/Source/src/RakNetTypes.cpp b/Source/src/types.cpp similarity index 94% rename from Source/src/RakNetTypes.cpp rename to Source/src/types.cpp index 46c94aead..5f95b0362 100644 --- a/Source/src/RakNetTypes.cpp +++ b/Source/src/types.cpp @@ -20,16 +20,16 @@ #include "mafianet/assert.h" #include #include -#include "mafianet/WindowsIncludes.h" -#include "mafianet/WSAStartupSingleton.h" -#include "mafianet/SocketDefines.h" +#include "mafianet/windows_includes.h" +#include "mafianet/wsa_startup_singleton.h" +#include "mafianet/socket_defines.h" #include "mafianet/socket2.h" #if defined(_WIN32) // extern __int64 _strtoui64(const char*, char**, int); // needed for Code::Blocks. Does not compile on Visual Studio 2010 // IP_DONTFRAGMENT is different between winsock 1 and winsock 2. Therefore, Winsock2.h must be linked againt Ws2_32.lib // winsock.h must be linked against WSock32.lib. If these two are mixed up the flag won't work correctly -#include "mafianet/WindowsIncludes.h" +#include "mafianet/windows_includes.h" #else #include // used for getnameinfo() @@ -38,9 +38,9 @@ #include #endif -#include "mafianet/Itoa.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/SuperFastHash.h" +#include "mafianet/itoa.h" +#include "mafianet/socket_layer.h" +#include "mafianet/super_fast_hash.h" #include #include "mafianet/linux_adapter.h" #include "mafianet/osx_adapter.h" @@ -107,25 +107,15 @@ bool MafiaNet::NonNumericHostString( const char *host ) } SocketDescriptor::SocketDescriptor() { -#ifdef __native_client__ - blockingSocket=false; -#else blockingSocket=true; -#endif port=0; hostAddress[0]=0; - remotePortRakNetWasStartedOn_PS3_PSP2=0; extraSocketOptions=0; socketFamily=AF_INET; } SocketDescriptor::SocketDescriptor(unsigned short _port, const char *_hostAddress) { - #ifdef __native_client__ - blockingSocket=false; - #else blockingSocket=true; - #endif - remotePortRakNetWasStartedOn_PS3_PSP2=0; port=_port; if (_hostAddress) strcpy_s(hostAddress, _hostAddress); diff --git a/Source/src/UDPForwarder.cpp b/Source/src/udp_forwarder.cpp similarity index 93% rename from Source/src/UDPForwarder.cpp rename to Source/src/udp_forwarder.cpp index 03dc1f08f..35104665a 100644 --- a/Source/src/UDPForwarder.cpp +++ b/Source/src/udp_forwarder.cpp @@ -13,19 +13,18 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/UDPForwarder.h" +#include "mafianet/udp_forwarder.h" #if _RAKNET_SUPPORT_UDPForwarder==1 -#include "mafianet/GetTime.h" -#include "mafianet/MTUSize.h" -#include "mafianet/SocketLayer.h" -#include "mafianet/WSAStartupSingleton.h" +#include "mafianet/get_time.h" +#include "mafianet/mtu_size.h" +#include "mafianet/socket_layer.h" +#include "mafianet/wsa_startup_singleton.h" #include "mafianet/sleep.h" -#include "mafianet/DS_OrderedList.h" -#include "mafianet/LinuxStrings.h" -#include "mafianet/SocketDefines.h" -#include "mafianet/VitaIncludes.h" +#include "mafianet/ds_ordered_list.h" +#include "mafianet/linux_strings.h" +#include "mafianet/socket_defines.h" #include "errno.h" #ifdef _WIN32 @@ -191,7 +190,6 @@ void UDPForwarder::StopForwarding(SystemAddress source, SystemAddress destinatio } void UDPForwarder::RecvFrom(MafiaNet::TimeMS curTime, ForwardEntry *forwardEntry) { -#ifndef __native_client__ char data[ MAXIMUM_MTU_SIZE ]; #if RAKNET_SUPPORT_IPV6==1 @@ -396,18 +394,9 @@ void UDPForwarder::RecvFrom(MafiaNet::TimeMS curTime, ForwardEntry *forwardEntry while ( len == 0 ); forwardEntry->timeLastDatagramForwarded=curTime; -#endif // __native_client__ } void UDPForwarder::UpdateUDPForwarder(void) { - /* -#if !defined(SN_TARGET_PSP2) - timeval tv; - tv.tv_sec=0; - tv.tv_usec=0; -#endif - */ - MafiaNet::TimeMS curTime = MafiaNet::GetTimeMS(); StartForwardingInputStruct *sfis; diff --git a/Source/src/UDPProxyClient.cpp b/Source/src/udp_proxy_client.cpp similarity index 95% rename from Source/src/UDPProxyClient.cpp rename to Source/src/udp_proxy_client.cpp index a65d73a24..abaceaee5 100644 --- a/Source/src/UDPProxyClient.cpp +++ b/Source/src/udp_proxy_client.cpp @@ -13,15 +13,15 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_UDPProxyClient==1 -#include "mafianet/UDPProxyClient.h" -#include "mafianet/BitStream.h" -#include "mafianet/UDPProxyCommon.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/GetTime.h" +#include "mafianet/udp_proxy_client.h" +#include "mafianet/bit_stream.h" +#include "mafianet/udp_proxy_common.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/get_time.h" using namespace MafiaNet; static const int DEFAULT_UNRESPONSIVE_PING_TIME_COORDINATOR=1000; diff --git a/Source/src/UDPProxyCoordinator.cpp b/Source/src/udp_proxy_coordinator.cpp similarity index 95% rename from Source/src/UDPProxyCoordinator.cpp rename to Source/src/udp_proxy_coordinator.cpp index dab4277b5..65d9362b9 100644 --- a/Source/src/UDPProxyCoordinator.cpp +++ b/Source/src/udp_proxy_coordinator.cpp @@ -13,17 +13,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_UDPProxyCoordinator==1 && _RAKNET_SUPPORT_UDPForwarder==1 -#include "mafianet/UDPProxyCoordinator.h" -#include "mafianet/BitStream.h" -#include "mafianet/UDPProxyCommon.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/Rand.h" -#include "mafianet/GetTime.h" -#include "mafianet/UDPForwarder.h" +#include "mafianet/udp_proxy_coordinator.h" +#include "mafianet/bit_stream.h" +#include "mafianet/udp_proxy_common.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/rand.h" +#include "mafianet/get_time.h" +#include "mafianet/udp_forwarder.h" // Larger than the client version static const int DEFAULT_CLIENT_UNRESPONSIVE_PING_TIME=2000; diff --git a/Source/src/UDPProxyServer.cpp b/Source/src/udp_proxy_server.cpp similarity index 93% rename from Source/src/UDPProxyServer.cpp rename to Source/src/udp_proxy_server.cpp index 28c8d0108..8be05cc55 100644 --- a/Source/src/UDPProxyServer.cpp +++ b/Source/src/udp_proxy_server.cpp @@ -13,14 +13,14 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/NativeFeatureIncludes.h" +#include "mafianet/native_feature_includes.h" #if _RAKNET_SUPPORT_UDPProxyServer==1 && _RAKNET_SUPPORT_UDPForwarder==1 -#include "mafianet/UDPProxyServer.h" -#include "mafianet/BitStream.h" -#include "mafianet/UDPProxyCommon.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/udp_proxy_server.h" +#include "mafianet/bit_stream.h" +#include "mafianet/udp_proxy_common.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" using namespace MafiaNet; diff --git a/Source/src/VariableDeltaSerializer.cpp b/Source/src/variable_delta_serializer.cpp similarity index 96% rename from Source/src/VariableDeltaSerializer.cpp rename to Source/src/variable_delta_serializer.cpp index d3781df3f..493d97d14 100644 --- a/Source/src/VariableDeltaSerializer.cpp +++ b/Source/src/variable_delta_serializer.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/VariableDeltaSerializer.h" +#include "mafianet/variable_delta_serializer.h" using namespace MafiaNet; diff --git a/Source/src/VariableListDeltaTracker.cpp b/Source/src/variable_list_delta_tracker.cpp similarity index 94% rename from Source/src/VariableListDeltaTracker.cpp rename to Source/src/variable_list_delta_tracker.cpp index 01f7412c5..6f7866a30 100644 --- a/Source/src/VariableListDeltaTracker.cpp +++ b/Source/src/variable_list_delta_tracker.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/VariableListDeltaTracker.h" +#include "mafianet/variable_list_delta_tracker.h" using namespace MafiaNet; diff --git a/Source/src/VariadicSQLParser.cpp b/Source/src/variadic_sql_parser.cpp similarity index 95% rename from Source/src/VariadicSQLParser.cpp rename to Source/src/variadic_sql_parser.cpp index 0b5348aa9..68b82a887 100644 --- a/Source/src/VariadicSQLParser.cpp +++ b/Source/src/variadic_sql_parser.cpp @@ -13,8 +13,8 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/VariadicSQLParser.h" -#include "mafianet/BitStream.h" +#include "mafianet/variadic_sql_parser.h" +#include "mafianet/bit_stream.h" #include using namespace VariadicSQLParser; diff --git a/Source/src/RakVoice.cpp b/Source/src/voice.cpp similarity index 96% rename from Source/src/RakVoice.cpp rename to Source/src/voice.cpp index 5535e84a1..e877879ed 100644 --- a/Source/src/RakVoice.cpp +++ b/Source/src/voice.cpp @@ -14,17 +14,17 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/RakVoice.h" +#include "mafianet/voice.h" #include #include -#include "mafianet/BitStream.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" -#include "mafianet/ReliabilityLayer.h" +#include "mafianet/bit_stream.h" +#include "mafianet/packet_priority.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/reliability_layer.h" #include #include -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #ifdef _DEBUG #include @@ -33,7 +33,7 @@ using namespace MafiaNet; #define SAMPLESIZE 2 -// Single definition lives in RakVoice.h so relay hosts can bound inbound frames. +// Single definition lives in voice.h so relay hosts can bound inbound frames. #define MAX_OPUS_PACKET_SIZE ((int)MafiaNet::RAKVOICE_MAX_OPUS_PACKET_SIZE) // RNNoise frame size is fixed at 480 samples (10ms at 48kHz) @@ -246,7 +246,7 @@ bool RakVoice::EvictIdlestRelaySpeaker(MafiaNet::TimeMS now) RakNetGUID RakVoice::ReadRelayOrigin(Packet *packet) { - // Offsets are derived in RakVoice.h, so this stays correct as the header grows. + // Offsets are derived in voice.h, so this stays correct as the header grows. if (packet == nullptr || packet->length < RAKVOICE_RELAY_OFFSET_ORIGIN + sizeof(uint64_t)) return UNASSIGNED_RAKNET_GUID; diff --git a/Source/src/WSAStartupSingleton.cpp b/Source/src/wsa_startup_singleton.cpp similarity index 92% rename from Source/src/WSAStartupSingleton.cpp rename to Source/src/wsa_startup_singleton.cpp index 586871474..de10bac34 100644 --- a/Source/src/WSAStartupSingleton.cpp +++ b/Source/src/wsa_startup_singleton.cpp @@ -13,7 +13,7 @@ * license found in the license.txt file in the root directory of this source tree. */ -#include "mafianet/WSAStartupSingleton.h" +#include "mafianet/wsa_startup_singleton.h" diff --git a/Source/src/RakWString.cpp b/Source/src/wstring.cpp similarity index 95% rename from Source/src/RakWString.cpp rename to Source/src/wstring.cpp index 4b11617b5..72e1a042f 100644 --- a/Source/src/RakWString.cpp +++ b/Source/src/wstring.cpp @@ -14,7 +14,7 @@ */ #include "mafianet/wstring.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include #include #include diff --git a/Tests/Integration/ComprehensiveConvertTests.cpp b/Tests/Integration/ComprehensiveConvertTests.cpp index 5073137fa..bb844e98a 100644 --- a/Tests/Integration/ComprehensiveConvertTests.cpp +++ b/Tests/Integration/ComprehensiveConvertTests.cpp @@ -7,11 +7,11 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" +#include "mafianet/get_time.h" +#include "mafianet/rand.h" #include "mafianet/statistics.h" #include "CommonFunctions.h" diff --git a/Tests/Integration/ConnectWithSocketTests.cpp b/Tests/Integration/ConnectWithSocketTests.cpp index 0cbb5123c..a3807d2a6 100644 --- a/Tests/Integration/ConnectWithSocketTests.cpp +++ b/Tests/Integration/ConnectWithSocketTests.cpp @@ -8,13 +8,13 @@ #include #include "mafianet/string.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "TestHelpers.h" #include "CommonFunctions.h" #include "RakTimer.h" diff --git a/Tests/Integration/CrossConnectionConvertTests.cpp b/Tests/Integration/CrossConnectionConvertTests.cpp index 7c48f0b71..5f98b96c7 100644 --- a/Tests/Integration/CrossConnectionConvertTests.cpp +++ b/Tests/Integration/CrossConnectionConvertTests.cpp @@ -7,11 +7,11 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include // For getenv #include diff --git a/Tests/Integration/DirectoryDeltaTransferStreamingLiveTests.cpp b/Tests/Integration/DirectoryDeltaTransferStreamingLiveTests.cpp index 647e49607..20f8b6854 100644 --- a/Tests/Integration/DirectoryDeltaTransferStreamingLiveTests.cpp +++ b/Tests/Integration/DirectoryDeltaTransferStreamingLiveTests.cpp @@ -15,14 +15,14 @@ #include #include "mafianet/peer.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/DirectoryDeltaTransfer.h" -#include "mafianet/IncrementalReadInterface.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/directory_delta_transfer.h" +#include "mafianet/incremental_read_interface.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/Tests/Integration/DisconnectReasonTests.cpp b/Tests/Integration/DisconnectReasonTests.cpp index 7d94007d8..55245a55b 100644 --- a/Tests/Integration/DisconnectReasonTests.cpp +++ b/Tests/Integration/DisconnectReasonTests.cpp @@ -7,9 +7,9 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" #include "CommonFunctions.h" diff --git a/Tests/Integration/DispatcherLiveTests.cpp b/Tests/Integration/DispatcherLiveTests.cpp index fc6f3f43c..7e91f0528 100644 --- a/Tests/Integration/DispatcherLiveTests.cpp +++ b/Tests/Integration/DispatcherLiveTests.cpp @@ -7,9 +7,9 @@ #include -#include "mafianet/Dispatcher.h" -#include "mafianet/PeerHandle.h" // Peer, PacketPtr (live round-trip) -#include "mafianet/GetTime.h" // GetTime, GetTimeMS +#include "mafianet/dispatcher.h" +#include "mafianet/peer_handle.h" // Peer, PacketPtr (live round-trip) +#include "mafianet/get_time.h" // GetTime, GetTimeMS #include "mafianet/sleep.h" // RakSleep #include diff --git a/Tests/Integration/DroppedConnectionConvertTests.cpp b/Tests/Integration/DroppedConnectionConvertTests.cpp index 493c55cc4..1c4bbef63 100644 --- a/Tests/Integration/DroppedConnectionConvertTests.cpp +++ b/Tests/Integration/DroppedConnectionConvertTests.cpp @@ -7,11 +7,11 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" -#include "mafianet/Rand.h" // randomMT +#include "mafianet/get_time.h" +#include "mafianet/rand.h" // randomMT #include "CommonFunctions.h" #include "RakTimer.h" diff --git a/Tests/Integration/EightPeerTests.cpp b/Tests/Integration/EightPeerTests.cpp index 14b8e18cb..0d8291442 100644 --- a/Tests/Integration/EightPeerTests.cpp +++ b/Tests/Integration/EightPeerTests.cpp @@ -7,13 +7,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include diff --git a/Tests/Integration/FileListTransferWindowLiveTests.cpp b/Tests/Integration/FileListTransferWindowLiveTests.cpp index a072d1161..cd5c437ad 100644 --- a/Tests/Integration/FileListTransferWindowLiveTests.cpp +++ b/Tests/Integration/FileListTransferWindowLiveTests.cpp @@ -15,14 +15,14 @@ #include #include "mafianet/peer.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/FileList.h" -#include "mafianet/FileListTransfer.h" -#include "mafianet/FileListTransferCBInterface.h" -#include "mafianet/IncrementalReadInterface.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/file_list.h" +#include "mafianet/file_list_transfer.h" +#include "mafianet/file_list_transfer_cb_interface.h" +#include "mafianet/incremental_read_interface.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/Tests/Integration/LocalIsConnectedTests.cpp b/Tests/Integration/LocalIsConnectedTests.cpp index 0577c93f2..883f331fe 100644 --- a/Tests/Integration/LocalIsConnectedTests.cpp +++ b/Tests/Integration/LocalIsConnectedTests.cpp @@ -8,13 +8,13 @@ #include #include "mafianet/string.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "CommonFunctions.h" #include diff --git a/Tests/Integration/MTUNegotiationTests.cpp b/Tests/Integration/MTUNegotiationTests.cpp index 22bce8d43..7b22900d0 100644 --- a/Tests/Integration/MTUNegotiationTests.cpp +++ b/Tests/Integration/MTUNegotiationTests.cpp @@ -11,12 +11,12 @@ #include #include "mafianet/peer.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/MTUSize.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/mtu_size.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #ifdef _WIN32 #include // inet_pton, htons (winsock2 pulled in via peer.h) @@ -158,7 +158,7 @@ namespace return false; } - // Mirrors the constant of the same name in RakPeer.cpp, which is file-static and so cannot be + // Mirrors the constant of the same name in peer.cpp, which is file-static and so cannot be // included. It is the marker that makes a receiving peer treat a datagram as an offline // (pre-connection) message rather than reliability-layer traffic. Duplicated deliberately: a // test for what an unconforming peer can put on the wire should pin the wire format itself. diff --git a/Tests/Integration/ManyClientsOneServerBlockingTests.cpp b/Tests/Integration/ManyClientsOneServerBlockingTests.cpp index cb23855ec..758153d1e 100644 --- a/Tests/Integration/ManyClientsOneServerBlockingTests.cpp +++ b/Tests/Integration/ManyClientsOneServerBlockingTests.cpp @@ -7,13 +7,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "CommonFunctions.h" diff --git a/Tests/Integration/ManyClientsOneServerDeallocateBlockingTests.cpp b/Tests/Integration/ManyClientsOneServerDeallocateBlockingTests.cpp index ccd12d15a..64db584c8 100644 --- a/Tests/Integration/ManyClientsOneServerDeallocateBlockingTests.cpp +++ b/Tests/Integration/ManyClientsOneServerDeallocateBlockingTests.cpp @@ -7,13 +7,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "CommonFunctions.h" diff --git a/Tests/Integration/ManyClientsOneServerNonBlockingTests.cpp b/Tests/Integration/ManyClientsOneServerNonBlockingTests.cpp index e79250bea..da98d3c3e 100644 --- a/Tests/Integration/ManyClientsOneServerNonBlockingTests.cpp +++ b/Tests/Integration/ManyClientsOneServerNonBlockingTests.cpp @@ -7,13 +7,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "CommonFunctions.h" diff --git a/Tests/Integration/MaximumConnectTests.cpp b/Tests/Integration/MaximumConnectTests.cpp index e38a2e59c..cba6b9e6a 100644 --- a/Tests/Integration/MaximumConnectTests.cpp +++ b/Tests/Integration/MaximumConnectTests.cpp @@ -7,13 +7,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include diff --git a/Tests/Integration/MmsgBatchLiveTests.cpp b/Tests/Integration/MmsgBatchLiveTests.cpp index dace14405..ac92514bb 100644 --- a/Tests/Integration/MmsgBatchLiveTests.cpp +++ b/Tests/Integration/MmsgBatchLiveTests.cpp @@ -22,13 +22,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/PeerHandle.h" // Peer, PacketPtr (RAII: survives a failed ASSERT) -#include "mafianet/GetTime.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/peer_handle.h" // Peer, PacketPtr (RAII: survives a failed ASSERT) +#include "mafianet/get_time.h" #include "mafianet/sleep.h" -#include "mafianet/MmsgBatch.h" // MMSG_BATCH_MAX +#include "mafianet/mmsg_batch.h" // MMSG_BATCH_MAX #include #include diff --git a/Tests/Integration/PacketAndLowLevelTests.cpp b/Tests/Integration/PacketAndLowLevelTests.cpp index 45a31e812..6945bef76 100644 --- a/Tests/Integration/PacketAndLowLevelTests.cpp +++ b/Tests/Integration/PacketAndLowLevelTests.cpp @@ -8,12 +8,12 @@ #include #include "mafianet/string.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "DebugTools.h" #include "CommonFunctions.h" #include "TestHelpers.h" diff --git a/Tests/Integration/PeerBuilderTests.cpp b/Tests/Integration/PeerBuilderTests.cpp index 219033d42..8a825a388 100644 --- a/Tests/Integration/PeerBuilderTests.cpp +++ b/Tests/Integration/PeerBuilderTests.cpp @@ -8,14 +8,14 @@ #include #include "mafianet/string.h" -#include "mafianet/DS_List.h" -#include "mafianet/peerinterface.h" -#include "mafianet/PeerHandle.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/ds_list.h" +#include "mafianet/peer_interface.h" +#include "mafianet/peer_handle.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include // std::move diff --git a/Tests/Integration/PeerConnectDisconnectTests.cpp b/Tests/Integration/PeerConnectDisconnectTests.cpp index e3dfe8c37..44f8c393b 100644 --- a/Tests/Integration/PeerConnectDisconnectTests.cpp +++ b/Tests/Integration/PeerConnectDisconnectTests.cpp @@ -7,13 +7,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "CommonFunctions.h" #include diff --git a/Tests/Integration/PeerConnectDisconnectWithCancelPendingTests.cpp b/Tests/Integration/PeerConnectDisconnectWithCancelPendingTests.cpp index b07f80d6f..89355049d 100644 --- a/Tests/Integration/PeerConnectDisconnectWithCancelPendingTests.cpp +++ b/Tests/Integration/PeerConnectDisconnectWithCancelPendingTests.cpp @@ -7,13 +7,13 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "CommonFunctions.h" #include diff --git a/Tests/Integration/PeerHandleTests.cpp b/Tests/Integration/PeerHandleTests.cpp index d058ba8b3..f23ce700e 100644 --- a/Tests/Integration/PeerHandleTests.cpp +++ b/Tests/Integration/PeerHandleTests.cpp @@ -8,14 +8,14 @@ #include #include "mafianet/string.h" -#include "mafianet/DS_List.h" -#include "mafianet/peerinterface.h" -#include "mafianet/PeerHandle.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/ds_list.h" +#include "mafianet/peer_interface.h" +#include "mafianet/peer_handle.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include // std::move diff --git a/Tests/Integration/RPC4ContextTests.cpp b/Tests/Integration/RPC4ContextTests.cpp index fff437f44..5e248877c 100644 --- a/Tests/Integration/RPC4ContextTests.cpp +++ b/Tests/Integration/RPC4ContextTests.cpp @@ -8,11 +8,11 @@ #include #include "mafianet/string.h" -#include "mafianet/DS_List.h" -#include "mafianet/peerinterface.h" -#include "mafianet/RPC4Plugin.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/ds_list.h" +#include "mafianet/peer_interface.h" +#include "mafianet/rpc4_plugin.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" #include diff --git a/Tests/Integration/ReliableOrderedConvertedTests.cpp b/Tests/Integration/ReliableOrderedConvertedTests.cpp index c226183d8..a3db4506f 100644 --- a/Tests/Integration/ReliableOrderedConvertedTests.cpp +++ b/Tests/Integration/ReliableOrderedConvertedTests.cpp @@ -7,11 +7,11 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/GetTime.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" -#include "mafianet/Rand.h" +#include "mafianet/peer_interface.h" +#include "mafianet/get_time.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" +#include "mafianet/rand.h" #include "mafianet/statistics.h" #include "mafianet/sleep.h" diff --git a/Tests/Integration/SecurityFunctionsTests.cpp b/Tests/Integration/SecurityFunctionsTests.cpp index 92eee4774..8c8251a9f 100644 --- a/Tests/Integration/SecurityFunctionsTests.cpp +++ b/Tests/Integration/SecurityFunctionsTests.cpp @@ -8,13 +8,13 @@ #include #include "mafianet/string.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "CommonFunctions.h" #include diff --git a/Tests/Integration/SessionConfigLiveTests.cpp b/Tests/Integration/SessionConfigLiveTests.cpp index 2d21e5dde..cba702eb2 100644 --- a/Tests/Integration/SessionConfigLiveTests.cpp +++ b/Tests/Integration/SessionConfigLiveTests.cpp @@ -12,11 +12,11 @@ #include #include "mafianet/peer.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/sleep.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" using namespace MafiaNet; diff --git a/Tests/Integration/TypedSendLiveTests.cpp b/Tests/Integration/TypedSendLiveTests.cpp index 5c44cd521..820f4a9ee 100644 --- a/Tests/Integration/TypedSendLiveTests.cpp +++ b/Tests/Integration/TypedSendLiveTests.cpp @@ -7,9 +7,9 @@ #include -#include "mafianet/Dispatcher.h" -#include "mafianet/PeerHandle.h" // Peer, PacketPtr, send()/broadcast() -#include "mafianet/GetTime.h" // GetTimeMS +#include "mafianet/dispatcher.h" +#include "mafianet/peer_handle.h" // Peer, PacketPtr, send()/broadcast() +#include "mafianet/get_time.h" // GetTimeMS #include "mafianet/sleep.h" // RakSleep #include diff --git a/Tests/Support/CommonFunctions.h b/Tests/Support/CommonFunctions.h index db527a5f8..f0f17241e 100644 --- a/Tests/Support/CommonFunctions.h +++ b/Tests/Support/CommonFunctions.h @@ -13,13 +13,13 @@ #include "mafianet/string.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" #include "DebugTools.h" #include "RakTimer.h" diff --git a/Tests/Support/PacketChangerPlugin.h b/Tests/Support/PacketChangerPlugin.h index f36ef7978..473bce6ac 100644 --- a/Tests/Support/PacketChangerPlugin.h +++ b/Tests/Support/PacketChangerPlugin.h @@ -11,10 +11,10 @@ #pragma once #include "mafianet/types.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/InternalPacket.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/internal_packet.h" using namespace MafiaNet; class PacketChangerPlugin: public PluginInterface2 diff --git a/Tests/Support/PacketDropPlugin.h b/Tests/Support/PacketDropPlugin.h index dfda99657..68f594ba1 100644 --- a/Tests/Support/PacketDropPlugin.h +++ b/Tests/Support/PacketDropPlugin.h @@ -12,10 +12,10 @@ #include "mafianet/types.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/InternalPacket.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/packet_priority.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/internal_packet.h" #include "RakTimer.h" using namespace MafiaNet; diff --git a/Tests/Support/RakTimer.h b/Tests/Support/RakTimer.h index 36799e90f..11e2b45db 100644 --- a/Tests/Support/RakTimer.h +++ b/Tests/Support/RakTimer.h @@ -12,7 +12,7 @@ #include "mafianet/time.h" -#include "mafianet/GetTime.h" +#include "mafianet/get_time.h" using namespace MafiaNet; class RakTimer diff --git a/Tests/Support/TestHelpers.h b/Tests/Support/TestHelpers.h index 5babbafd1..dd04f8054 100644 --- a/Tests/Support/TestHelpers.h +++ b/Tests/Support/TestHelpers.h @@ -13,9 +13,9 @@ #include "mafianet/string.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/BitStream.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/bit_stream.h" #include "mafianet/peer.h" #include "mafianet/sleep.h" #include "DebugTools.h" diff --git a/Tests/Unit/ArchiveTests.cpp b/Tests/Unit/ArchiveTests.cpp index 6c24dcf4a..273b1648e 100644 --- a/Tests/Unit/ArchiveTests.cpp +++ b/Tests/Unit/ArchiveTests.cpp @@ -8,8 +8,8 @@ #include #include "mafianet/string.h" -#include "mafianet/BitStream.h" -#include "mafianet/Archive.h" +#include "mafianet/bit_stream.h" +#include "mafianet/archive.h" #include diff --git a/Tests/Unit/BitStreamStringTests.cpp b/Tests/Unit/BitStreamStringTests.cpp index ace1c759e..e17bd0277 100644 --- a/Tests/Unit/BitStreamStringTests.cpp +++ b/Tests/Unit/BitStreamStringTests.cpp @@ -8,7 +8,7 @@ #include #include "mafianet/string.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include #include diff --git a/Tests/Unit/DispatcherTests.cpp b/Tests/Unit/DispatcherTests.cpp index 3e39720ec..cf544ff61 100644 --- a/Tests/Unit/DispatcherTests.cpp +++ b/Tests/Unit/DispatcherTests.cpp @@ -7,10 +7,10 @@ #include -#include "mafianet/Dispatcher.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/GetTime.h" +#include "mafianet/dispatcher.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/get_time.h" #include diff --git a/Tests/Unit/FileListDirectoryTests.cpp b/Tests/Unit/FileListDirectoryTests.cpp new file mode 100644 index 000000000..9b450ff7f --- /dev/null +++ b/Tests/Unit/FileListDirectoryTests.cpp @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2026, MafiaHub + * Licensed under MIT-style license + * + * FileList::AddFilesFromDirectory walks a directory tree through the _findfirst/_findnext + * emulation. On Linux that walk never terminated: the emulation copied each entry name with a + * count equal to the destination size, which the strncpy_s shim rejected after reading past the + * end of dirent::d_name, so every name came back empty, the "." and ".." filter never matched, + * and the walk recursed into "dir//" forever until the process ran out of memory. These tests + * pin the shim's bounds and the walk's termination. Hermetic: a temp directory, no networking. + */ + +#include + +#include "mafianet/file_list.h" +#include "mafianet/file_list_node_context.h" +#include "mafianet/linux_adapter.h" +#include "mafianet/osx_adapter.h" + +#include +#include +#include +#include +#include + +using namespace MafiaNet; + +namespace +{ + struct TempTree + { + std::filesystem::path root; + TempTree() + { + root = std::filesystem::temp_directory_path() / "mafianet_filelist_unit"; + std::filesystem::remove_all(root); + std::filesystem::create_directories(root / "sub" / "deeper"); + Write("a.bin", 10); + Write("sub/b.bin", 20); + Write("sub/deeper/c.bin", 30); + } + ~TempTree() { std::filesystem::remove_all(root); } + void Write(const char *rel, size_t size) + { + std::ofstream out(root / rel, std::ios::binary); + std::string bytes(size, 'x'); + out.write(bytes.data(), (std::streamsize)bytes.size()); + } + }; + + std::set Names(const FileList &list) + { + std::set names; + for (unsigned i = 0; i < list.fileList.Size(); ++i) + names.insert(list.fileList[i].filename.C_String()); + return names; + } +} // namespace + +TEST(FileListDirectory, RecursiveWalkFindsEveryFileAndTerminates) +{ + TempTree tree; + const std::string dir = tree.root.string() + "/"; + + FileList list; + list.AddFilesFromDirectory(dir.c_str(), nullptr, true, false, true, FileListNodeContext(0, 0, 0, 0)); + + EXPECT_EQ(Names(list), (std::set{"a.bin", "sub/b.bin", "sub/deeper/c.bin"})); +} + +TEST(FileListDirectory, NonRecursiveWalkStaysInTheTopDirectory) +{ + TempTree tree; + const std::string dir = tree.root.string() + "/"; + + FileList list; + list.AddFilesFromDirectory(dir.c_str(), nullptr, false, false, false, FileListNodeContext(0, 0, 0, 0)); + + EXPECT_EQ(Names(list), (std::set{"a.bin"})); + ASSERT_EQ(list.fileList.Size(), 1u); + EXPECT_EQ(list.fileList[0].fileLengthBytes, 10u); +} + +#ifndef _WIN32 +// The shim is only compiled on Linux and macOS; MSVC provides the real function. + +TEST(StrncpySShim, CountEqualToBufferSizeCopiesAShortSource) +{ + char dest[8]; + std::memset(dest, 'Z', sizeof(dest)); + EXPECT_EQ(strncpy_s(dest, sizeof(dest), "abc", sizeof(dest)), 0); + EXPECT_STREQ(dest, "abc"); +} + +TEST(StrncpySShim, SourceThatDoesNotFitIsRejectedWithoutOverflow) +{ + // A guard byte after the destination catches a write of the terminator at dest[size]. + char block[8 + 1]; + block[8] = 'G'; + EXPECT_EQ(strncpy_s(block, 8, "abcdefgh", 8), 34); // ERANGE: 8 chars need 9 bytes + EXPECT_STREQ(block, ""); + EXPECT_EQ(block[8], 'G'); +} + +TEST(StrncpySShim, OnlyCountCharactersOfTheSourceAreRead) +{ + // The source is not terminated within count bytes; the shim must not read past count. + const char source[4] = {'a', 'b', 'c', 'd'}; + char dest[8]; + EXPECT_EQ(strncpy_s(dest, sizeof(dest), source, 4), 0); + EXPECT_STREQ(dest, "abcd"); +} + +TEST(StrncpySShim, TruncateCopiesWhatFits) +{ + char dest[4]; + EXPECT_EQ(strncpy_s(dest, sizeof(dest), "abcdefgh", _TRUNCATE), 80); // STRUNCATE + EXPECT_STREQ(dest, "abc"); +} +#endif diff --git a/Tests/Unit/GuidUtilTests.cpp b/Tests/Unit/GuidUtilTests.cpp index 7d7e2f1b2..b0669cc1d 100644 --- a/Tests/Unit/GuidUtilTests.cpp +++ b/Tests/Unit/GuidUtilTests.cpp @@ -9,7 +9,7 @@ #include "mafianet/guid_util.h" #include "mafianet/types.h" -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include #include diff --git a/Tests/Unit/LocalAddressTests.cpp b/Tests/Unit/LocalAddressTests.cpp index 0f258bcf5..b2e22c852 100644 --- a/Tests/Unit/LocalAddressTests.cpp +++ b/Tests/Unit/LocalAddressTests.cpp @@ -7,7 +7,7 @@ #include -#include "mafianet/peerinterface.h" +#include "mafianet/peer_interface.h" #include "mafianet/types.h" #include diff --git a/Tests/Unit/MmsgBatchTests.cpp b/Tests/Unit/MmsgBatchTests.cpp index 0fb397325..4e22125d0 100644 --- a/Tests/Unit/MmsgBatchTests.cpp +++ b/Tests/Unit/MmsgBatchTests.cpp @@ -5,7 +5,7 @@ * license.txt file in the root directory of this source tree. * * Hermetic unit tests for the portable batched-datagram helpers in - * MmsgBatch.h. These exercise the logic that is genuinely bug-prone in a + * mmsg_batch.h. These exercise the logic that is genuinely bug-prone in a * recvmmsg/sendmmsg integration -- the sendmmsg partial-send resume loop, the * byte-order handling when decoding a raw sockaddr, and fanning a received * batch out to the event handler -- without touching any actual syscall, so @@ -14,7 +14,7 @@ #include -#include "mafianet/MmsgBatch.h" +#include "mafianet/mmsg_batch.h" #include "mafianet/socket2.h" #include "mafianet/types.h" diff --git a/Tests/Unit/MtuBlackHoleTests.cpp b/Tests/Unit/MtuBlackHoleTests.cpp index e537ba453..011e3e551 100644 --- a/Tests/Unit/MtuBlackHoleTests.cpp +++ b/Tests/Unit/MtuBlackHoleTests.cpp @@ -24,8 +24,8 @@ #include -#include "mafianet/MtuBlackHole.h" -#include "mafianet/MTUSize.h" +#include "mafianet/mtu_black_hole.h" +#include "mafianet/mtu_size.h" using namespace MafiaNet; diff --git a/Tests/Unit/PeerGuidTests.cpp b/Tests/Unit/PeerGuidTests.cpp index e3d4e6520..8732b06d1 100644 --- a/Tests/Unit/PeerGuidTests.cpp +++ b/Tests/Unit/PeerGuidTests.cpp @@ -8,7 +8,7 @@ #include #include "mafianet/types.h" -#include "mafianet/BitStream.h" +#include "mafianet/bit_stream.h" #include #include diff --git a/Tests/Unit/PointGridSectorizerTests.cpp b/Tests/Unit/PointGridSectorizerTests.cpp index 95b1a60ab..b37f9a1db 100644 --- a/Tests/Unit/PointGridSectorizerTests.cpp +++ b/Tests/Unit/PointGridSectorizerTests.cpp @@ -7,7 +7,7 @@ #include -#include "mafianet/PointGridSectorizer.h" +#include "mafianet/point_grid_sectorizer.h" #include #include diff --git a/Tests/Unit/RPC4GlobalRegistrationTests.cpp b/Tests/Unit/RPC4GlobalRegistrationTests.cpp index cea965d4b..53be8592e 100644 --- a/Tests/Unit/RPC4GlobalRegistrationTests.cpp +++ b/Tests/Unit/RPC4GlobalRegistrationTests.cpp @@ -7,8 +7,8 @@ #include -#include "mafianet/RPC4Plugin.h" -#include "mafianet/peerinterface.h" +#include "mafianet/rpc4_plugin.h" +#include "mafianet/peer_interface.h" #include diff --git a/Tests/Unit/RakVoiceRelayTests.cpp b/Tests/Unit/RakVoiceRelayTests.cpp index 7dac3ea22..59e11dcd2 100644 --- a/Tests/Unit/RakVoiceRelayTests.cpp +++ b/Tests/Unit/RakVoiceRelayTests.cpp @@ -15,8 +15,8 @@ #include -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/RakVoice.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/voice.h" #include "mafianet/types.h" #include diff --git a/Tests/Unit/ReliabilityLayerBlackHoleTests.cpp b/Tests/Unit/ReliabilityLayerBlackHoleTests.cpp index 2f69e9ba0..93a64b2da 100644 --- a/Tests/Unit/ReliabilityLayerBlackHoleTests.cpp +++ b/Tests/Unit/ReliabilityLayerBlackHoleTests.cpp @@ -22,16 +22,16 @@ #include #include -#include "mafianet/BitStream.h" -#include "mafianet/DS_List.h" -#include "mafianet/GetTime.h" -#include "mafianet/MTUSize.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/MtuBlackHole.h" -#include "mafianet/PacketPriority.h" -#include "mafianet/PluginInterface2.h" -#include "mafianet/Rand.h" -#include "mafianet/ReliabilityLayer.h" +#include "mafianet/bit_stream.h" +#include "mafianet/ds_list.h" +#include "mafianet/get_time.h" +#include "mafianet/mtu_size.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/mtu_black_hole.h" +#include "mafianet/packet_priority.h" +#include "mafianet/plugin_interface2.h" +#include "mafianet/rand.h" +#include "mafianet/reliability_layer.h" #include "mafianet/socket2.h" using namespace MafiaNet; diff --git a/Tests/Unit/ReplicaManager3SendSerializeTests.cpp b/Tests/Unit/ReplicaManager3SendSerializeTests.cpp index 65e2fcba2..0ecb3a645 100644 --- a/Tests/Unit/ReplicaManager3SendSerializeTests.cpp +++ b/Tests/Unit/ReplicaManager3SendSerializeTests.cpp @@ -7,11 +7,11 @@ #include -#include "mafianet/ReplicaManager3.h" -#include "mafianet/BitStream.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/NetworkIDManager.h" -#include "mafianet/peerinterface.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/bit_stream.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/network_id_manager.h" +#include "mafianet/peer_interface.h" #include diff --git a/Tests/Unit/ReplicaManager3WorldTests.cpp b/Tests/Unit/ReplicaManager3WorldTests.cpp index 25034973e..883243003 100644 --- a/Tests/Unit/ReplicaManager3WorldTests.cpp +++ b/Tests/Unit/ReplicaManager3WorldTests.cpp @@ -7,7 +7,7 @@ #include -#include "mafianet/ReplicaManager3.h" +#include "mafianet/replica_manager3.h" using namespace MafiaNet; diff --git a/Tests/Unit/SessionAdmissionTests.cpp b/Tests/Unit/SessionAdmissionTests.cpp index 857c0dcd0..5a7622b6b 100644 --- a/Tests/Unit/SessionAdmissionTests.cpp +++ b/Tests/Unit/SessionAdmissionTests.cpp @@ -9,9 +9,9 @@ #include -#include "mafianet/SessionAdmission.h" -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/session_admission.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/defines.h" using namespace MafiaNet; diff --git a/Tests/Unit/SessionConfigTests.cpp b/Tests/Unit/SessionConfigTests.cpp index 14d13f80a..4ae56656f 100644 --- a/Tests/Unit/SessionConfigTests.cpp +++ b/Tests/Unit/SessionConfigTests.cpp @@ -9,8 +9,8 @@ #include -#include "mafianet/peerinterface.h" -#include "mafianet/MessageIdentifiers.h" +#include "mafianet/peer_interface.h" +#include "mafianet/message_identifiers.h" #include "mafianet/defines.h" using namespace MafiaNet; diff --git a/Tests/Unit/SocketErrorTests.cpp b/Tests/Unit/SocketErrorTests.cpp index 4633ae3b2..d5032a10e 100644 --- a/Tests/Unit/SocketErrorTests.cpp +++ b/Tests/Unit/SocketErrorTests.cpp @@ -18,7 +18,7 @@ #include #include "mafianet/socket2.h" -#include "mafianet/MTUSize.h" +#include "mafianet/mtu_size.h" #include diff --git a/Tests/Unit/StatisticsHistorySamplingTests.cpp b/Tests/Unit/StatisticsHistorySamplingTests.cpp index 21fb21886..9e3685418 100644 --- a/Tests/Unit/StatisticsHistorySamplingTests.cpp +++ b/Tests/Unit/StatisticsHistorySamplingTests.cpp @@ -7,8 +7,8 @@ #include -#include "mafianet/StatisticsHistory.h" -#include "mafianet/peerinterface.h" +#include "mafianet/statistics_history.h" +#include "mafianet/peer_interface.h" using namespace MafiaNet; diff --git a/Tests/Unit/TwoWayAuthenticationTimeoutTests.cpp b/Tests/Unit/TwoWayAuthenticationTimeoutTests.cpp index 2be98c13f..2b9096f09 100644 --- a/Tests/Unit/TwoWayAuthenticationTimeoutTests.cpp +++ b/Tests/Unit/TwoWayAuthenticationTimeoutTests.cpp @@ -7,9 +7,9 @@ #include -#include "mafianet/TwoWayAuthentication.h" -#include "mafianet/MessageIdentifiers.h" -#include "mafianet/peerinterface.h" +#include "mafianet/two_way_authentication.h" +#include "mafianet/message_identifiers.h" +#include "mafianet/peer_interface.h" using namespace MafiaNet; diff --git a/Tests/Unit/VirtualWorldTests.cpp b/Tests/Unit/VirtualWorldTests.cpp index 215e49aaf..17e134305 100644 --- a/Tests/Unit/VirtualWorldTests.cpp +++ b/Tests/Unit/VirtualWorldTests.cpp @@ -7,11 +7,11 @@ #include -#include "mafianet/ReplicaManager3.h" -#include "mafianet/VirtualWorld.h" -#include "mafianet/VirtualWorldReplica3.h" -#include "mafianet/BitStream.h" -#include "mafianet/peerinterface.h" +#include "mafianet/replica_manager3.h" +#include "mafianet/virtual_world.h" +#include "mafianet/virtual_world_replica3.h" +#include "mafianet/bit_stream.h" +#include "mafianet/peer_interface.h" using namespace MafiaNet; diff --git a/cmake/FetchVoiceDependencies.cmake b/cmake/FetchVoiceDependencies.cmake index 05911d7e3..ceaa0eafc 100644 --- a/cmake/FetchVoiceDependencies.cmake +++ b/cmake/FetchVoiceDependencies.cmake @@ -87,7 +87,7 @@ if(NOT TARGET rnnoise) target_include_directories(rnnoise PUBLIC # Build-interface only: rnnoise is bundled into the MafiaNet export, - # but its headers are not installed (RakVoice.h forward-declares the + # but its headers are not installed (voice.h forward-declares the # RNNoise types), so this build-tree path must not leak into the # exported/installed interface. $ diff --git a/cmake/MafiaNetHelpers.cmake b/cmake/MafiaNetHelpers.cmake index 36687f865..92343c282 100644 --- a/cmake/MafiaNetHelpers.cmake +++ b/cmake/MafiaNetHelpers.cmake @@ -1,102 +1,105 @@ -# MafiaNet CMake Helper Functions -# -# Copyright (c) 2024, MafiaHub -# Licensed under MIT-style license - -include_guard(GLOBAL) - -# mafianet_add_sample( [FOLDER ] [SOURCES ] [LIBS ] [INCLUDES ]) -# -# Creates a sample executable linked against MafiaNet. -# If SOURCES is not provided, globs *.cpp and *.h from the current directory. -function(mafianet_add_sample) - cmake_parse_arguments(SAMPLE - "" # Boolean args - "NAME;FOLDER" # Single-value args - "SOURCES;LIBS;INCLUDES" # Multi-value args - ${ARGN} - ) - - if(NOT SAMPLE_NAME) - message(FATAL_ERROR "mafianet_add_sample: NAME is required") - endif() - - # Default: use all .cpp/.h in current directory - if(NOT SAMPLE_SOURCES) - file(GLOB SAMPLE_SOURCES - "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/*.c" - "${CMAKE_CURRENT_SOURCE_DIR}/*.h" - ) - endif() - - add_executable(${SAMPLE_NAME} ${SAMPLE_SOURCES}) - - target_link_libraries(${SAMPLE_NAME} PRIVATE - MafiaNet::MafiaNetStatic - ${SAMPLE_LIBS} - ) - - target_include_directories(${SAMPLE_NAME} PRIVATE - ${PROJECT_SOURCE_DIR}/Source/include # Public headers (mafianet/...) - ${PROJECT_SOURCE_DIR}/DependentExtensions - ) - - if(SAMPLE_INCLUDES) - target_include_directories(${SAMPLE_NAME} PRIVATE ${SAMPLE_INCLUDES}) - endif() - - # IDE folder organization - if(SAMPLE_FOLDER) - set_target_properties(${SAMPLE_NAME} PROPERTIES - FOLDER "Samples/${SAMPLE_FOLDER}" - ) - else() - set_target_properties(${SAMPLE_NAME} PROPERTIES - FOLDER "Samples" - ) - endif() -endfunction() - -# mafianet_add_extension( [SOURCES ] [LIBS ] [INCLUDES ]) -# -# Creates a static library extension for MafiaNet. -function(mafianet_add_extension) - cmake_parse_arguments(EXT - "" # Boolean args - "NAME" # Single-value args - "SOURCES;LIBS;INCLUDES" # Multi-value args - ${ARGN} - ) - - if(NOT EXT_NAME) - message(FATAL_ERROR "mafianet_add_extension: NAME is required") - endif() - - if(NOT EXT_SOURCES) - file(GLOB EXT_SOURCES - "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/*.c" - "${CMAKE_CURRENT_SOURCE_DIR}/*.h" - ) - endif() - - add_library(${EXT_NAME} STATIC ${EXT_SOURCES}) - - target_include_directories(${EXT_NAME} PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/Source/include - ) - - if(EXT_INCLUDES) - target_include_directories(${EXT_NAME} PUBLIC ${EXT_INCLUDES}) - endif() - - if(EXT_LIBS) - target_link_libraries(${EXT_NAME} PUBLIC ${EXT_LIBS}) - endif() - - set_target_properties(${EXT_NAME} PROPERTIES - FOLDER "Extensions" - ) -endfunction() +# MafiaNet CMake Helper Functions +# +# Copyright (c) 2024, MafiaHub +# Licensed under MIT-style license + +include_guard(GLOBAL) + +# mafianet_add_sample( [FOLDER ] [SOURCES ] [LIBS ] [INCLUDES ]) +# +# Creates a sample executable linked against MafiaNet. +# If SOURCES is not provided, globs *.cpp and *.h from the current directory. +function(mafianet_add_sample) + cmake_parse_arguments(SAMPLE + "" # Boolean args + "NAME;FOLDER" # Single-value args + "SOURCES;LIBS;INCLUDES" # Multi-value args + ${ARGN} + ) + + if(NOT SAMPLE_NAME) + message(FATAL_ERROR "mafianet_add_sample: NAME is required") + endif() + + # Default: use all .cpp/.h in current directory + if(NOT SAMPLE_SOURCES) + file(GLOB SAMPLE_SOURCES + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.c" + "${CMAKE_CURRENT_SOURCE_DIR}/*.h" + ) + endif() + + add_executable(${SAMPLE_NAME} ${SAMPLE_SOURCES}) + + # Several samples use the extras plugins (EmailSender, HTTPConnection, + # console transports); MAFIANET_BUILD_SAMPLES forces that target on. It + # links the core PUBLIC, so link one or the other, never both. + target_link_libraries(${SAMPLE_NAME} PRIVATE + $,MafiaNet::MafiaNetExtras,MafiaNet::MafiaNetStatic> + ${SAMPLE_LIBS} + ) + + target_include_directories(${SAMPLE_NAME} PRIVATE + ${PROJECT_SOURCE_DIR}/Source/include # Public headers (mafianet/...) + ${PROJECT_SOURCE_DIR}/DependentExtensions + ) + + if(SAMPLE_INCLUDES) + target_include_directories(${SAMPLE_NAME} PRIVATE ${SAMPLE_INCLUDES}) + endif() + + # IDE folder organization + if(SAMPLE_FOLDER) + set_target_properties(${SAMPLE_NAME} PROPERTIES + FOLDER "Samples/${SAMPLE_FOLDER}" + ) + else() + set_target_properties(${SAMPLE_NAME} PROPERTIES + FOLDER "Samples" + ) + endif() +endfunction() + +# mafianet_add_extension( [SOURCES ] [LIBS ] [INCLUDES ]) +# +# Creates a static library extension for MafiaNet. +function(mafianet_add_extension) + cmake_parse_arguments(EXT + "" # Boolean args + "NAME" # Single-value args + "SOURCES;LIBS;INCLUDES" # Multi-value args + ${ARGN} + ) + + if(NOT EXT_NAME) + message(FATAL_ERROR "mafianet_add_extension: NAME is required") + endif() + + if(NOT EXT_SOURCES) + file(GLOB EXT_SOURCES + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.c" + "${CMAKE_CURRENT_SOURCE_DIR}/*.h" + ) + endif() + + add_library(${EXT_NAME} STATIC ${EXT_SOURCES}) + + target_include_directories(${EXT_NAME} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/Source/include + ) + + if(EXT_INCLUDES) + target_include_directories(${EXT_NAME} PUBLIC ${EXT_INCLUDES}) + endif() + + if(EXT_LIBS) + target_link_libraries(${EXT_NAME} PUBLIC ${EXT_LIBS}) + endif() + + set_target_properties(${EXT_NAME} PROPERTIES + FOLDER "Extensions" + ) +endfunction() diff --git a/docs/advanced/congestion-control.rst b/docs/advanced/congestion-control.rst index 882e3d5ec..83e8b52d8 100644 --- a/docs/advanced/congestion-control.rst +++ b/docs/advanced/congestion-control.rst @@ -91,7 +91,7 @@ Tuning Parameters // There is no setter; read the result back with: peer->GetMTUSize(remoteAddress); - // The ceiling is compile-time. Lower MAXIMUM_MTU_SIZE (mafianet/MTUSize.h) if + // The ceiling is compile-time. Lower MAXIMUM_MTU_SIZE (mafianet/mtu_size.h) if // your peers sit behind tunnelling with more overhead than 1400 leaves room for. // Timeout settings diff --git a/docs/advanced/custom-memory-management.rst b/docs/advanced/custom-memory-management.rst index a45b9dc28..1642ca899 100644 --- a/docs/advanced/custom-memory-management.rst +++ b/docs/advanced/custom-memory-management.rst @@ -21,7 +21,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/memoryoverride.h" + #include "mafianet/memory_override.h" // Define custom allocation functions void* MyMalloc(size_t size) { @@ -72,7 +72,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/DS_MemoryPool.h" + #include "mafianet/ds_memory_pool.h" // Create a pool for fixed-size objects MafiaNet::DataStructures::MemoryPool packetPool; diff --git a/docs/advanced/debugging-disconnects.rst b/docs/advanced/debugging-disconnects.rst index b04150d0d..af6604d28 100644 --- a/docs/advanced/debugging-disconnects.rst +++ b/docs/advanced/debugging-disconnects.rst @@ -43,7 +43,7 @@ Diagnostic Tools .. code-block:: cpp - #include "mafianet/PacketLogger.h" + #include "mafianet/packet_logger.h" MafiaNet::PacketLogger logger; peer->AttachPlugin(&logger); diff --git a/docs/advanced/nat-traversal-architecture.rst b/docs/advanced/nat-traversal-architecture.rst index 176bfddc6..9692c58b0 100644 --- a/docs/advanced/nat-traversal-architecture.rst +++ b/docs/advanced/nat-traversal-architecture.rst @@ -40,8 +40,8 @@ Basic Usage .. code-block:: cpp - #include "mafianet/NatPunchthroughServer.h" - #include "mafianet/UDPProxyCoordinator.h" + #include "mafianet/nat_punchthrough_server.h" + #include "mafianet/udp_proxy_coordinator.h" MafiaNet::NatPunchthroughServer natServer; MafiaNet::UDPProxyCoordinator proxyCoord; @@ -53,7 +53,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/NatPunchthroughClient.h" + #include "mafianet/nat_punchthrough_client.h" MafiaNet::NatPunchthroughClient natClient; peer->AttachPlugin(&natClient); @@ -77,7 +77,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/NatPunchthroughClient.h" + #include "mafianet/nat_punchthrough_client.h" // Attempt UPnP port mapping first natClient.SetUPNP(true); diff --git a/docs/api/core.rst b/docs/api/core.rst index 2d833e97e..fdf9d02d1 100644 --- a/docs/api/core.rst +++ b/docs/api/core.rst @@ -75,9 +75,9 @@ Configuration for network sockets. Message Identifiers ------------------- -Built-in message types are defined in ``MessageIdentifiers.h``. +Built-in message types are defined in ``message_identifiers.h``. -.. doxygenfile:: MessageIdentifiers.h +.. doxygenfile:: message_identifiers.h :sections: enum Enumerations @@ -176,7 +176,7 @@ interoperate freely: RAII Handles (Peer / PacketPtr) ------------------------------- -``mafianet/PeerHandle.h`` (exported from the umbrella header) provides two RAII +``mafianet/peer_handle.h`` (exported from the umbrella header) provides two RAII owners that remove manual ``DestroyInstance`` / ``DeallocatePacket`` bookkeeping: @@ -264,7 +264,7 @@ returns. Serialization Archives (WriteArchive / ReadArchive) --------------------------------------------------- -``mafianet/Archive.h`` (pulled in by the umbrella header) provides a single +``mafianet/archive.h`` (pulled in by the umbrella header) provides a single serialization convention over ``BitStream``. A user type describes its wire format once with a member template, and the same ``serialize()`` serves both directions — no duplicated read/write field lists: @@ -304,7 +304,7 @@ are the :ref:`Dispatcher `'s job. Typed Message Dispatcher (Dispatcher / Sender) ---------------------------------------------- -``mafianet/Dispatcher.h`` (pulled in by the umbrella header) replaces the +``mafianet/dispatcher.h`` (pulled in by the umbrella header) replaces the classic giant ``switch`` on ``packet->data[0]`` — plus the hand-rolled ``ID_TIMESTAMP``-skipping helper — with typed handlers. It builds on the receive iterator, ``PacketPtr``, and the serialization archives: diff --git a/docs/basics/bitstreams.rst b/docs/basics/bitstreams.rst index 360dd5155..28dad7c04 100644 --- a/docs/basics/bitstreams.rst +++ b/docs/basics/bitstreams.rst @@ -18,7 +18,7 @@ BitStream is templated to accept any data type: .. code-block:: cpp - #include "mafianet/BitStream.h" + #include "mafianet/bit_stream.h" MafiaNet::BitStream bs; @@ -81,7 +81,7 @@ The serialize() Convention (Archives) Instead of writing both shift operators, a type can describe its wire format once with a member ``serialize()`` template and be read/written through the -``WriteArchive`` / ``ReadArchive`` adapters (``mafianet/Archive.h``): +``WriteArchive`` / ``ReadArchive`` adapters (``mafianet/archive.h``): .. code-block:: cpp diff --git a/docs/basics/data-compression.rst b/docs/basics/data-compression.rst index 748de9ca8..eed6a11e9 100644 --- a/docs/basics/data-compression.rst +++ b/docs/basics/data-compression.rst @@ -87,7 +87,7 @@ Use StringCompressor for repeated strings: .. code-block:: cpp - #include "mafianet/StringCompressor.h" + #include "mafianet/string_compressor.h" // Add common strings to table MafiaNet::StringCompressor::Instance()->AddReference( @@ -111,7 +111,7 @@ For larger data blocks: .. code-block:: cpp - #include "mafianet/DataCompressor.h" + #include "mafianet/data_compressor.h" // Compress unsigned compressedSize; diff --git a/docs/basics/network-id-object.rst b/docs/basics/network-id-object.rst index 168738459..cdf27b278 100644 --- a/docs/basics/network-id-object.rst +++ b/docs/basics/network-id-object.rst @@ -28,7 +28,7 @@ Inherit from NetworkIDObject .. code-block:: cpp - #include "mafianet/NetworkIDObject.h" + #include "mafianet/network_id_object.h" class Player : public MafiaNet::NetworkIDObject { public: diff --git a/docs/basics/network-messages.rst b/docs/basics/network-messages.rst index fe54bcdf3..6f4381bb8 100644 --- a/docs/basics/network-messages.rst +++ b/docs/basics/network-messages.rst @@ -6,7 +6,7 @@ MafiaNet uses message IDs to identify packet types. The first byte of every pack Built-in Message IDs -------------------- -MafiaNet reserves IDs 0-134 for internal use. These are defined in ``MessageIdentifiers.h``. +MafiaNet reserves IDs 0-134 for internal use. These are defined in ``message_identifiers.h``. Connection Messages ~~~~~~~~~~~~~~~~~~~ diff --git a/docs/basics/secure-connections.rst b/docs/basics/secure-connections.rst index 72ab6e691..3c15f9f62 100644 --- a/docs/basics/secure-connections.rst +++ b/docs/basics/secure-connections.rst @@ -94,7 +94,7 @@ For password-based authentication without exposing the password: .. code-block:: cpp - #include "mafianet/TwoWayAuthentication.h" + #include "mafianet/two_way_authentication.h" MafiaNet::TwoWayAuthentication* auth = MafiaNet::TwoWayAuthentication::GetInstance(); diff --git a/docs/basics/startup.rst b/docs/basics/startup.rst index 881aa8d6c..0ada70fa9 100644 --- a/docs/basics/startup.rst +++ b/docs/basics/startup.rst @@ -130,7 +130,7 @@ Example: Basic Server Startup .. code-block:: cpp - #include "mafianet/peerinterface.h" + #include "mafianet/peer_interface.h" MafiaNet::RakPeerInterface* server = MafiaNet::RakPeerInterface::GetInstance(); diff --git a/docs/basics/statistics.rst b/docs/basics/statistics.rst index 15df49d8a..bba6e2c1b 100644 --- a/docs/basics/statistics.rst +++ b/docs/basics/statistics.rst @@ -166,7 +166,7 @@ For tracking statistics over time, use the StatisticsHistory plugin: .. code-block:: cpp - #include "mafianet/StatisticsHistory.h" + #include "mafianet/statistics_history.h" MafiaNet::StatisticsHistoryPlugin* statsHistory = MafiaNet::StatisticsHistoryPlugin::GetInstance(); diff --git a/docs/changelog.rst b/docs/changelog.rst index 96757f3b5..0fb73ef16 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -3,6 +3,37 @@ Changelog All notable changes to MafiaNet are documented here. +Unreleased +---------- + +**FileList / DirectoryDeltaTransfer** + +* **Fix: directory walks never terminated on Linux.** ``FileList::AddFilesFromDirectory`` (and so every ``DirectoryDeltaTransfer`` download) looped forever on Linux, allocating until the process was killed. The ``_findnext`` emulation copied each entry name with a count equal to the destination size; the ``strncpy_s`` shim then read one byte past the end of ``dirent::d_name`` to decide whether the copy fit, saw garbage, returned ``ERANGE`` and an empty name. The empty name defeated the ``"."``/``".."`` filter and the walk recursed into ``dir//`` without end. macOS happened to read a zero byte there and never showed it. ``_findnext`` now copies with ``_TRUNCATE``, and the shim reads at most ``count`` bytes of the source and rejects a copy that would not fit, as MSVC does, instead of writing its terminator one byte past the destination. Unit tests cover the shim's bounds and the walk's termination. + +**Build** + +* **CI runs only where it is useful.** Build & Test runs on pull requests (and on demand); pushes to master no longer rebuild or retest, since master only changes through a PR that already passed. A release tag triggers the release packaging workflow and the documentation deploy, neither of which runs tests. A new push to a PR cancels that PR's run still in flight. + +* **New CMake options: ``MAFIANET_DISABLED_FEATURES`` and ``MAFIANET_MINIMAL``.** The ``_RAKNET_SUPPORT_`` plugin flags from ``native_feature_includes.h`` can now be set from CMake (``-DMAFIANET_DISABLED_FEATURES="ReplicaManager3;RPC4Plugin"`` or ``-DMAFIANET_MINIMAL=ON`` for the core transport alone). The definitions are ``PUBLIC`` on the library targets so consumers see the same configuration. Unknown names are a configure error. A ``linux-minimal`` CI job builds the ``MAFIANET_MINIMAL`` configuration. See :doc:`/getting-started/building`. + +**File names are snake_case.** Every header and source under ``Source/`` is now lowercase ``snake_case`` (``BitStream.h`` → ``bit_stream.h``, ``ReliabilityLayer.h`` → ``reliability_layer.h``, ``peerinterface.h`` → ``peer_interface.h``, ``DS_List.h`` → ``ds_list.h``, ``HTTPConnection2.h`` → ``http_connection2.h``), and the RakNet prefix is gone from file names (``RakVoice.h`` → ``voice.h``, ``RakPeer.cpp`` → ``peer.cpp``, ``CCRakNetUDT.h`` → ``cc_udt.h``). Class names are unchanged. The umbrella header stays ``mafianet/mafianet.h`` and the ``crypto/`` headers were already lowercase. Since almost every rename differs from the old name only by case, no forwarding headers are possible: on Windows and macOS the old spellings still resolve, on Linux every ``#include "mafianet/..."`` must be updated (a case-insensitive search-and-replace over the names above). Library headers now include each other only as ``"mafianet/.h"``; a CI check rejects bare quoted includes inside ``include/mafianet/`` so that ``string.h``, ``time.h`` and ``assert.h`` can never shadow the C headers. + +**Extras library.** ``EmailSender``, ``HTTPConnection``, ``HTTPConnection2``, ``TelnetTransport``, ``RakNetTransport2``, ``ConsoleServer``, ``CommandParserInterface``, ``RakNetCommandParser``, ``LogCommandParser`` and ``PacketConsoleLogger`` moved out of the core library into ``MafiaNetExtras`` (``MafiaNet::MafiaNetExtras``), built with ``MAFIANET_BUILD_EXTRAS=ON`` (forced on by ``MAFIANET_BUILD_SAMPLES``). Headers and include paths are unchanged; code using these classes must link the extras target. See :doc:`/getting-started/building`. + +**Deprecated containers.** ``ds_binary_search_tree.h``, ``ds_queue_linked_list.h``, ``ds_huffman_encoding_tree_factory.h``, ``ds_ordered_channel_heap.h`` and ``ds_byte_pool.h`` have no consumer in the library. They now emit a ``#pragma message`` on inclusion and will be removed in the next minor release; copy them into your project if you depend on them. + +**Removed: dead platform code.** Xbox 360, PlayStation 3, PlayStation 4, PlayStation Vita and Google Native Client could not be targeted for years; their remaining headers were already empty. Removed in this release: + +* ``XBox360Includes.h``, ``PS3Includes.h``, ``PS4Includes.h``, ``VitaIncludes.h`` and the matching empty source files, plus ``Samples/nacl_sdk``. +* ``socket.h`` / ``RakNetSocket.cpp``, the pre-``RakNetSocket2`` socket class, which had no remaining consumers and survived only as commented-out console code. +* Every ``__native_client__``, ``_PS3`` / ``__PS3__`` / ``SN_TARGET_PS3``, ``_PS4`` and ``SN_TARGET_PSP2`` preprocessor branch. +* ``SocketDescriptor::remotePortRakNetWasStartedOn_PS3_PSP2`` and ``SocketDescriptor::chromeInstance``, and ``RNS2_BerkleyBindParameters::remotePortRakNetWasStartedOn_PS3_PS4_PSP2``. These were only read by the removed console and Native Client paths. Code that initialised them must drop those lines; ``SocketDescriptor`` is now smaller, so code built against 0.22 must be rebuilt. +* The ``RNS2_Windows_Linux_360`` mix-in is now ``RNS2_Windows_Linux`` and its send function ``Send_Windows_Linux``; both are internal to the socket layer. + +The ``ID_XBOX_360_*`` and ``ID_XBOX_LOBBY`` message identifiers are kept as reserved values so the wire values that follow them do not shift. + +**Wire-compatible.** No message changes. + Version 0.22.1 -------------- @@ -45,7 +76,7 @@ Version 0.21.0 * **New: ``ID_SESSION_CONFIG_ABANDONED``.** An interactive server is told when a request it was holding goes away unanswered -- the client left, the transport dropped, or the session timeout passed -- so it can drop the decision it was working on. Sent once, never for a request the application answered. -* **New header: ``SessionAdmission.h``.** The slot accounting as pure functions, unit tested directly. +* **New header: ``session_admission.h``.** The slot accounting as pure functions, unit tested directly. * **New guide: Admission and Queues.** How the pool, the session timeout, status and abandonment fit together, with a complete queue. @@ -330,7 +361,7 @@ Version 0.11.0 failure — never collapsed to a bool. Security stays opt-in (``ServerBuilder::secure()``, ``ClientBuilder::public_key()``). -* **Serialization archives** in ``mafianet/Archive.h``. A single +* **Serialization archives** in ``mafianet/archive.h``. A single ``serialize()`` convention over ``BitStream``: a user type describes its wire format once (``template void serialize(Ar& ar) { ar & a & b; }``) and ``WriteArchive`` / ``ReadArchive`` run it in either direction. Fields @@ -338,7 +369,7 @@ Version 0.11.0 ``BitStream``'s ``operator<<`` / ``operator>>`` and its per-type specializations. Exported from the umbrella header. -* **Typed message dispatcher** in ``mafianet/Dispatcher.h``. +* **Typed message dispatcher** in ``mafianet/dispatcher.h``. ``MafiaNet::Dispatcher`` replaces the giant switch-on-first-byte receive loop: ``on(handler)`` registers a typed handler (auto-assigning identifiers from ``ID_USER_PACKET_ENUM`` in registration order — a documented @@ -359,8 +390,8 @@ Version 0.11.0 **Build** -* **RakVoice is built into the core library.** ``RakVoice.h`` moved to - ``mafianet/RakVoice.h`` and its codec dependencies (Opus, RNNoise) are +* **RakVoice is built into the core library.** ``voice.h`` moved to + ``mafianet/voice.h`` and its codec dependencies (Opus, RNNoise) are fetched and linked into the core library automatically — no separate extension build required. @@ -399,7 +430,7 @@ Version 0.10.0 declarations are left untouched and un-deprecated. Pulled into the umbrella header. -* **RAII handles** ``Peer`` and ``PacketPtr`` in ``mafianet/PeerHandle.h`` +* **RAII handles** ``Peer`` and ``PacketPtr`` in ``mafianet/peer_handle.h`` (exported from the umbrella header). ``Peer`` owns a ``RakPeerInterface`` instance and destroys it on scope exit; ``PacketPtr`` owns a received ``Packet`` and deallocates it automatically — removing manual @@ -515,13 +546,13 @@ Version 0.7.0 world (or the ``VIRTUAL_WORLD_GLOBAL`` sentinel), switchable on the fly with no reconnect, while staying on the same connection and the same RM3 ``WorldId``. Derive entities from the new ``VirtualWorldReplica3`` base - (``mafianet/VirtualWorldReplica3.h``); ``Connection_RM3`` gains + (``mafianet/virtual_world_replica3.h``); ``Connection_RM3`` gains ``Get/SetVirtualWorld``; ``ReplicaManager3`` gains ``GetConnectionsInVirtualWorld`` / ``GetGuidsInVirtualWorld`` (recipient-filter helpers for scoping non-replica traffic like chat and RPC) and ``SetPlayerVirtualWorld``. The filter is applied only by the authority for an (entity, connection) pair, so a downloaded copy never despawns the entity at - its owner. See ``mafianet/VirtualWorld.h`` and the ``Samples/VirtualWorld`` demo. + its owner. See ``mafianet/virtual_world.h`` and the ``Samples/VirtualWorld`` demo. **Documentation** diff --git a/docs/getting-started/building.rst b/docs/getting-started/building.rst index cea75dc77..f16365f2b 100644 --- a/docs/getting-started/building.rst +++ b/docs/getting-started/building.rst @@ -53,6 +53,15 @@ Configure build options with CMake: * - ``MAFIANET_BUILD_TESTS`` - OFF - Build GoogleTest suite (requires ``MAFIANET_BUILD_STATIC=ON``) + * - ``MAFIANET_BUILD_EXTRAS`` + - OFF + - Build ``MafiaNetExtras`` (SMTP, HTTP client, telnet/console transports). Forced ON by ``MAFIANET_BUILD_SAMPLES``. See `The extras library`_. + * - ``MAFIANET_DISABLED_FEATURES`` + - (empty) + - Semicolon-separated plugin names to compile out, e.g. ``"ReplicaManager3;RPC4Plugin"``. See `Minimal builds`_. + * - ``MAFIANET_MINIMAL`` + - OFF + - Compile out every optional plugin, leaving the core transport only. See `Minimal builds`_. Example with options: @@ -60,6 +69,68 @@ Example with options: cmake -DMAFIANET_BUILD_SAMPLES=ON -DMAFIANET_BUILD_TESTS=ON .. +Minimal builds +-------------- + +Every optional plugin in the core library (``ReplicaManager3``, ``RPC4Plugin``, +``FileListTransfer``, the NAT traversal plugins, ``TCPInterface`` and its +users, and so on) is guarded by a ``_RAKNET_SUPPORT_`` flag declared in +``mafianet/native_feature_includes.h``. The transport itself, ``BitStream``, +``RakPeer``, the reliability layer and ``RakVoice`` are always built. + +The supported way to compile plugins out is through CMake, not by editing the +header: + +.. code-block:: bash + + # Drop specific plugins + cmake -B build -DMAFIANET_DISABLED_FEATURES="ReplicaManager3;RPC4Plugin;TeamManager" + + # Core transport only: every optional plugin compiled out + cmake -B build -DMAFIANET_MINIMAL=ON + +The names accepted by ``MAFIANET_DISABLED_FEATURES`` are listed in +``MAFIANET_OPTIONAL_FEATURES`` in ``Source/CMakeLists.txt``; an unknown name +is a configure error. The resulting ``_RAKNET_SUPPORT_=0`` definitions +are ``PUBLIC`` on the library targets, so code that links ``MafiaNet::MafiaNet`` +or ``MafiaNet::MafiaNetStatic`` sees the same header configuration the library +was built with. Plugins that depend on one another are resolved by the header: +disabling ``FileListTransfer`` while keeping ``DirectoryDeltaTransfer`` keeps +``FileListTransfer`` enabled, for instance. + +A minimal build is exercised in CI (the ``linux-minimal`` job), which +configures with ``-DMAFIANET_MINIMAL=ON`` and builds both library targets. +The test suites need the plugins, so they are not built in that configuration. + +The extras library +------------------ + +Utilities that are not game networking live in a separate static library, +``MafiaNetExtras`` (``MafiaNet::MafiaNetExtras``), built only when +``MAFIANET_BUILD_EXTRAS=ON``: + +* ``EmailSender`` (SMTP client) +* ``HTTPConnection`` and ``HTTPConnection2`` (HTTP clients over ``TCPInterface``) +* ``TelnetTransport`` and ``RakNetTransport2`` (command transports) +* ``ConsoleServer``, ``CommandParserInterface``, ``RakNetCommandParser`` and ``LogCommandParser`` (remote console) +* ``PacketConsoleLogger`` (packet logger writing to a ``LogCommandParser``) + +Their headers stay under ``include/mafianet/``, so include paths are unchanged; +only the link line changes. The extras target links the core library +``PUBLIC``, so linking it alone is enough: + +.. code-block:: cmake + + find_package(MafiaNet REQUIRED) + target_link_libraries(my_tool PRIVATE MafiaNet::MafiaNetExtras) + +The classes still honour their ``_RAKNET_SUPPORT_`` flags, and +``MAFIANET_DISABLED_FEATURES`` applies to the extras target too. + +Using ``native_feature_includes_overrides.h`` to set the same flags still works, +but the CMake route keeps the configuration in the build system, where it is +visible to consumers through the exported targets. + Batched Datagram I/O -------------------- @@ -123,8 +194,8 @@ figures. Reproduce with: The per-datagram column is the code every non-Linux platform runs. To reproduce it on Linux, flip the ``#if defined(__linux__)`` batching guards in -``RakNetSocket2.cpp``, ``RakNetSocket2_Berkley.cpp``, ``ReliabilityLayer.cpp`` and -``socket2.h`` to ``#if 0``. +``socket2.cpp``, ``socket2_berkley.cpp``, ``reliability_layer.cpp`` and +``RakNetSocket2.h`` to ``#if 0``. Running Tests ------------- diff --git a/docs/getting-started/quickstart.rst b/docs/getting-started/quickstart.rst index d5837bb00..8f61c5b23 100644 --- a/docs/getting-started/quickstart.rst +++ b/docs/getting-started/quickstart.rst @@ -65,8 +65,8 @@ Basic Server .. code-block:: cpp - #include "mafianet/peerinterface.h" - #include "mafianet/MessageIdentifiers.h" + #include "mafianet/peer_interface.h" + #include "mafianet/message_identifiers.h" int main() { // Create the peer interface @@ -108,8 +108,8 @@ Basic Client .. code-block:: cpp - #include "mafianet/peerinterface.h" - #include "mafianet/MessageIdentifiers.h" + #include "mafianet/peer_interface.h" + #include "mafianet/message_identifiers.h" int main() { MafiaNet::RakPeerInterface* client = MafiaNet::RakPeerInterface::GetInstance(); @@ -159,7 +159,7 @@ Send a message using BitStream: .. code-block:: cpp - #include "mafianet/BitStream.h" + #include "mafianet/bit_stream.h" // Create message MafiaNet::BitStream bs; diff --git a/docs/getting-started/tutorial.rst b/docs/getting-started/tutorial.rst index f6a492589..725c9eddc 100644 --- a/docs/getting-started/tutorial.rst +++ b/docs/getting-started/tutorial.rst @@ -20,7 +20,7 @@ Create ``ChatCommon.h``: .. code-block:: cpp #pragma once - #include "mafianet/MessageIdentifiers.h" + #include "mafianet/message_identifiers.h" // Custom message types enum ChatMessages { @@ -38,8 +38,8 @@ Create ``ChatServer.cpp``: .. code-block:: cpp - #include "mafianet/peerinterface.h" - #include "mafianet/BitStream.h" + #include "mafianet/peer_interface.h" + #include "mafianet/bit_stream.h" #include "mafianet/string.h" #include "ChatCommon.h" #include @@ -112,10 +112,10 @@ Create ``ChatClient.cpp``: .. code-block:: cpp - #include "mafianet/peerinterface.h" - #include "mafianet/BitStream.h" + #include "mafianet/peer_interface.h" + #include "mafianet/bit_stream.h" #include "mafianet/string.h" - #include "mafianet/Gets.h" + #include "mafianet/gets.h" #include "ChatCommon.h" #include #include diff --git a/docs/guide/peer-to-peer.rst b/docs/guide/peer-to-peer.rst index dbe850dd8..bd0756516 100644 --- a/docs/guide/peer-to-peer.rst +++ b/docs/guide/peer-to-peer.rst @@ -10,7 +10,7 @@ The ``FullyConnectedMesh2`` plugin helps establish fully connected peer-to-peer .. code-block:: cpp - #include "mafianet/FullyConnectedMesh2.h" + #include "mafianet/fully_connected_mesh2.h" MafiaNet::FullyConnectedMesh2* fcm2 = MafiaNet::FullyConnectedMesh2::GetInstance(); peer->AttachPlugin(fcm2); @@ -27,7 +27,7 @@ For peers behind NAT, use the NAT punchthrough system. .. code-block:: cpp - #include "mafianet/NatPunchthroughServer.h" + #include "mafianet/nat_punchthrough_server.h" MafiaNet::NatPunchthroughServer* natServer = MafiaNet::NatPunchthroughServer::GetInstance(); @@ -37,7 +37,7 @@ For peers behind NAT, use the NAT punchthrough system. .. code-block:: cpp - #include "mafianet/NatPunchthroughClient.h" + #include "mafianet/nat_punchthrough_client.h" MafiaNet::NatPunchthroughClient* natClient = MafiaNet::NatPunchthroughClient::GetInstance(); diff --git a/docs/guide/plugins.rst b/docs/guide/plugins.rst index 9f99f0b75..84f414cd8 100644 --- a/docs/guide/plugins.rst +++ b/docs/guide/plugins.rst @@ -53,7 +53,7 @@ The ``ReplicaManager3`` plugin handles object replication: .. code-block:: cpp - #include "mafianet/ReplicaManager3.h" + #include "mafianet/replica_manager3.h" class MyReplica : public MafiaNet::Replica3 { public: @@ -82,7 +82,7 @@ Call functions on remote peers: .. code-block:: cpp - #include "mafianet/RPC4Plugin.h" + #include "mafianet/rpc4_plugin.h" MafiaNet::RPC4* rpc = MafiaNet::RPC4::GetInstance(); peer->AttachPlugin(rpc); diff --git a/docs/plugins/autopatcher.rst b/docs/plugins/autopatcher.rst index e0437476f..1875084d1 100644 --- a/docs/plugins/autopatcher.rst +++ b/docs/plugins/autopatcher.rst @@ -13,7 +13,7 @@ Basic Usage .. code-block:: cpp #include "AutopatcherServer.h" - #include "mafianet/AutopatcherRepositoryInterface.h" + #include "mafianet/autopatcher_repository_interface.h" // Use file-based or database repository MafiaNet::AutopatcherServer autopatcherServer; diff --git a/docs/plugins/cloud-computing.rst b/docs/plugins/cloud-computing.rst index 162c13018..0585af876 100644 --- a/docs/plugins/cloud-computing.rst +++ b/docs/plugins/cloud-computing.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/CloudServer.h" + #include "mafianet/cloud_server.h" MafiaNet::CloudServer cloudServer; peer->AttachPlugin(&cloudServer); @@ -25,7 +25,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/CloudClient.h" + #include "mafianet/cloud_client.h" MafiaNet::CloudClient cloudClient; peer->AttachPlugin(&cloudClient); diff --git a/docs/plugins/directory-delta-transfer.rst b/docs/plugins/directory-delta-transfer.rst index 9b1371a03..3679a2781 100644 --- a/docs/plugins/directory-delta-transfer.rst +++ b/docs/plugins/directory-delta-transfer.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/DirectoryDeltaTransfer.h" + #include "mafianet/directory_delta_transfer.h" MafiaNet::DirectoryDeltaTransfer ddt; MafiaNet::FileListTransfer flt; diff --git a/docs/plugins/file-list-transfer.rst b/docs/plugins/file-list-transfer.rst index 9a3bb98c0..9e9665789 100644 --- a/docs/plugins/file-list-transfer.rst +++ b/docs/plugins/file-list-transfer.rst @@ -12,8 +12,8 @@ Basic Usage .. code-block:: cpp - #include "mafianet/FileListTransfer.h" - #include "mafianet/FileList.h" + #include "mafianet/file_list_transfer.h" + #include "mafianet/file_list.h" MafiaNet::FileListTransfer flt; peer->AttachPlugin(&flt); diff --git a/docs/plugins/fully-connected-mesh-2.rst b/docs/plugins/fully-connected-mesh-2.rst index 55a8783c3..1f57bf3fa 100644 --- a/docs/plugins/fully-connected-mesh-2.rst +++ b/docs/plugins/fully-connected-mesh-2.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/FullyConnectedMesh2.h" + #include "mafianet/fully_connected_mesh2.h" MafiaNet::FullyConnectedMesh2 fcm2; peer->AttachPlugin(&fcm2); diff --git a/docs/plugins/message-filter.rst b/docs/plugins/message-filter.rst index 1697a46e4..dae6201f5 100644 --- a/docs/plugins/message-filter.rst +++ b/docs/plugins/message-filter.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/MessageFilter.h" + #include "mafianet/message_filter.h" MafiaNet::MessageFilter messageFilter; peer->AttachPlugin(&messageFilter); diff --git a/docs/plugins/nat-punchthrough.rst b/docs/plugins/nat-punchthrough.rst index e197268df..f8a6a2a0a 100644 --- a/docs/plugins/nat-punchthrough.rst +++ b/docs/plugins/nat-punchthrough.rst @@ -40,7 +40,7 @@ Server Setup (Facilitator) .. code-block:: cpp - #include "mafianet/NatPunchthroughServer.h" + #include "mafianet/nat_punchthrough_server.h" MafiaNet::RakPeerInterface* server = MafiaNet::RakPeerInterface::GetInstance(); @@ -59,7 +59,7 @@ Client Setup .. code-block:: cpp - #include "mafianet/NatPunchthroughClient.h" + #include "mafianet/nat_punchthrough_client.h" MafiaNet::RakPeerInterface* peer = MafiaNet::RakPeerInterface::GetInstance(); diff --git a/docs/plugins/nat-type-detection.rst b/docs/plugins/nat-type-detection.rst index 474a777c2..6cdfe952f 100644 --- a/docs/plugins/nat-type-detection.rst +++ b/docs/plugins/nat-type-detection.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/NatTypeDetectionClient.h" + #include "mafianet/nat_type_detection_client.h" MafiaNet::NatTypeDetectionClient natClient; peer->AttachPlugin(&natClient); @@ -55,7 +55,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/NatTypeDetectionServer.h" + #include "mafianet/nat_type_detection_server.h" // Server requires 3 different IP addresses MafiaNet::NatTypeDetectionServer natServer; diff --git a/docs/plugins/overview.rst b/docs/plugins/overview.rst index 194f1f599..d03a54f45 100644 --- a/docs/plugins/overview.rst +++ b/docs/plugins/overview.rst @@ -8,7 +8,7 @@ Using Plugins .. code-block:: cpp - #include "mafianet/PluginInterface2.h" + #include "mafianet/plugin_interface2.h" // Create plugin instance MafiaNet::SomePlugin* plugin = MafiaNet::SomePlugin::GetInstance(); diff --git a/docs/plugins/packet-logger.rst b/docs/plugins/packet-logger.rst index 4290798fe..c7dec0450 100644 --- a/docs/plugins/packet-logger.rst +++ b/docs/plugins/packet-logger.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/PacketLogger.h" + #include "mafianet/packet_logger.h" MafiaNet::PacketLogger packetLogger; peer->AttachPlugin(&packetLogger); diff --git a/docs/plugins/rakvoice.rst b/docs/plugins/rakvoice.rst index 800743fcf..d605f8324 100644 --- a/docs/plugins/rakvoice.rst +++ b/docs/plugins/rakvoice.rst @@ -23,7 +23,7 @@ Setup .. code-block:: cpp - #include "mafianet/RakVoice.h" + #include "mafianet/voice.h" MafiaNet::RakVoice rakVoice; peer->AttachPlugin(&rakVoice); diff --git a/docs/plugins/ready-event.rst b/docs/plugins/ready-event.rst index 2784b071e..2263fe349 100644 --- a/docs/plugins/ready-event.rst +++ b/docs/plugins/ready-event.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/ReadyEvent.h" + #include "mafianet/ready_event.h" MafiaNet::ReadyEvent readyEvent; peer->AttachPlugin(&readyEvent); diff --git a/docs/plugins/replica-manager-3.rst b/docs/plugins/replica-manager-3.rst index cacc63a34..b1241e7e9 100644 --- a/docs/plugins/replica-manager-3.rst +++ b/docs/plugins/replica-manager-3.rst @@ -18,7 +18,7 @@ Setup .. code-block:: cpp - #include "mafianet/ReplicaManager3.h" + #include "mafianet/replica_manager3.h" // Create and attach MafiaNet::ReplicaManager3* replicaManager = diff --git a/docs/plugins/router2.rst b/docs/plugins/router2.rst index 87b95054e..aa9103fa2 100644 --- a/docs/plugins/router2.rst +++ b/docs/plugins/router2.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/Router2.h" + #include "mafianet/router2.h" MafiaNet::Router2 router2; peer->AttachPlugin(&router2); diff --git a/docs/plugins/rpc4.rst b/docs/plugins/rpc4.rst index f9e667362..1fd545574 100644 --- a/docs/plugins/rpc4.rst +++ b/docs/plugins/rpc4.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/RPC4Plugin.h" + #include "mafianet/rpc4_plugin.h" void MyCallback(MafiaNet::BitStream* parameters, MafiaNet::Packet* packet, void* context) { int value; diff --git a/docs/plugins/team-balancer.rst b/docs/plugins/team-balancer.rst index 7677e5c27..0c935cc15 100644 --- a/docs/plugins/team-balancer.rst +++ b/docs/plugins/team-balancer.rst @@ -18,7 +18,7 @@ Setup .. code-block:: cpp - #include "mafianet/TeamBalancer.h" + #include "mafianet/team_balancer.h" MafiaNet::TeamBalancer* balancer = MafiaNet::TeamBalancer::GetInstance(); peer->AttachPlugin(balancer); diff --git a/docs/plugins/team-manager.rst b/docs/plugins/team-manager.rst index a3f85c548..53b1ac5f1 100644 --- a/docs/plugins/team-manager.rst +++ b/docs/plugins/team-manager.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/TeamManager.h" + #include "mafianet/team_manager.h" MafiaNet::TeamManager teamManager; peer->AttachPlugin(&teamManager); diff --git a/docs/plugins/two-way-authentication.rst b/docs/plugins/two-way-authentication.rst index 7c0285d34..2cd499e0b 100644 --- a/docs/plugins/two-way-authentication.rst +++ b/docs/plugins/two-way-authentication.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/TwoWayAuthentication.h" + #include "mafianet/two_way_authentication.h" MafiaNet::TwoWayAuthentication twoWayAuth; peer->AttachPlugin(&twoWayAuth); diff --git a/docs/plugins/virtual-worlds.rst b/docs/plugins/virtual-worlds.rst index f4e5bbee2..99f6b79e8 100644 --- a/docs/plugins/virtual-worlds.rst +++ b/docs/plugins/virtual-worlds.rst @@ -42,7 +42,7 @@ global value: .. code-block:: cpp - #include "mafianet/VirtualWorld.h" + #include "mafianet/virtual_world.h" typedef uint32_t VirtualWorldId; // many dimensions static const VirtualWorldId VIRTUAL_WORLD_DEFAULT = 0; // the overworld @@ -64,7 +64,7 @@ topology defaults. You do **not** override the ``Query*`` methods themselves. .. code-block:: cpp - #include "mafianet/VirtualWorldReplica3.h" + #include "mafianet/virtual_world_replica3.h" class Player : public MafiaNet::VirtualWorldReplica3 { public: diff --git a/docs/utilities/console-server.rst b/docs/utilities/console-server.rst index e720d98bb..5307e2dd9 100644 --- a/docs/utilities/console-server.rst +++ b/docs/utilities/console-server.rst @@ -12,8 +12,8 @@ Basic Usage .. code-block:: cpp - #include "mafianet/ConsoleServer.h" - #include "mafianet/TCPInterface.h" + #include "mafianet/console_server.h" + #include "mafianet/tcp_interface.h" MafiaNet::TCPInterface tcp; MafiaNet::ConsoleServer console; diff --git a/docs/utilities/crash-reporter.rst b/docs/utilities/crash-reporter.rst index 744ee9875..28fbf6e45 100644 --- a/docs/utilities/crash-reporter.rst +++ b/docs/utilities/crash-reporter.rst @@ -56,7 +56,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/TCPInterface.h" + #include "mafianet/tcp_interface.h" // Simple crash report receiver void RunCrashServer() { diff --git a/docs/utilities/email-sender.rst b/docs/utilities/email-sender.rst index 1a89326d2..13a4885c0 100644 --- a/docs/utilities/email-sender.rst +++ b/docs/utilities/email-sender.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/EmailSender.h" + #include "mafianet/email_sender.h" MafiaNet::EmailSender emailSender; @@ -63,7 +63,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/FileList.h" + #include "mafianet/file_list.h" MafiaNet::FileList attachments; attachments.AddFile("report.txt", "report.txt", diff --git a/docs/utilities/string-compressor.rst b/docs/utilities/string-compressor.rst index 35c88a3b3..0203b8103 100644 --- a/docs/utilities/string-compressor.rst +++ b/docs/utilities/string-compressor.rst @@ -12,8 +12,8 @@ Basic Usage .. code-block:: cpp - #include "mafianet/StringCompressor.h" - #include "mafianet/BitStream.h" + #include "mafianet/string_compressor.h" + #include "mafianet/bit_stream.h" // Get the global instance MafiaNet::StringCompressor* compressor = diff --git a/docs/utilities/tcp-interface.rst b/docs/utilities/tcp-interface.rst index 984b030a1..830c33a9e 100644 --- a/docs/utilities/tcp-interface.rst +++ b/docs/utilities/tcp-interface.rst @@ -12,7 +12,7 @@ Basic Usage .. code-block:: cpp - #include "mafianet/TCPInterface.h" + #include "mafianet/tcp_interface.h" MafiaNet::TCPInterface tcp;