Merge branch 'master' into packet-size-fix

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: mas-bandwidth

.github/workflows/ci.yml

@@ -2,16 +2,13 @@ name: CI
 
 on: [push, pull_request]
 
-env:
-  MBEDTLS_VERSION: 3.0.0
-
 jobs:
   build_and_test:
     name: Build & test
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [macos-latest, windows-latest] # [ubuntu-latest, , macos-latest]
         configuration: [release, debug]
 
     runs-on: ${{ matrix.os }}
@@ -23,52 +20,17 @@ jobs:
     - name: Setup premake
       uses: abel0b/setup-premake@v1
 
-    ## Linux-specific build setup
-    # Try to get our previously built mbedtls from the cache
-    - name: Cache mbedtls (Linux)
-      if: runner.os == 'Linux'
-      id: cache-mbedtls
-      uses: actions/cache@v2
-      with:
-        key: ${{ runner.os }}-mbedtls-${{ env.MBEDTLS_VERSION }}
-        path: ~/mbedtls_install
-
-    # If we can't get mbedtls from cache, download it and build it from source (and then it'll be cached
-    # when this build succeeds.) This is needed because Ubuntu 20.04 (latest GH hosted runner) only supports
-    # mbedtls 2 -- we can replace all this with a `sudo apt-get install libmbedtls-dev` or something similar
-    # once GH's runners are on a newer Ubuntu with mbedtls support.
-    - name: Build mbedtls when not cached (Linux)
-      if: runner.os == 'Linux' && steps.cache-mbedtls.outputs.cache-hit != 'true'
-      run: |
-        wget -nv https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${MBEDTLS_VERSION}.tar.gz -O mbedtls.tgz
-        tar zxf mbedtls.tgz
-        cd mbedtls-${MBEDTLS_VERSION}
-        make install DESTDIR=$HOME/mbedtls_install
-
-    # Install libsodium from apt and configure the compiler to look for our local mbedtls
-    - name: Setup (Linux)
-      if: runner.os == 'Linux'
-      run: |
-        sudo apt-get install libsodium-dev
-        echo CPATH=$HOME/mbedtls_install/include >> $GITHUB_ENV
-        echo LIBRARY_PATH=$HOME/mbedtls_install/lib >> $GITHUB_ENV
-
-    ## MacOS-specific build setup
-    - name: Setup (MacOS)
-      if: runner.os == 'MacOS'
-      run: brew install libsodium mbedtls@3
-
     ## Linux & MacOS-specific build steps
     # Build with premake + make
-    - name: Build (gmake2)
+    - name: Build (gmake)
       if: runner.os != 'Windows'
       run: |
-        premake5 gmake2
+        premake5 gmake
         make clean
-        make all config=${{ matrix.configuration }}_x64
+        make all config=${{ matrix.configuration }}
 
     # Run the tests with sh syntax
-    - name: Test (gmake2)
+    - name: Test (gmake)
       if: runner.os != 'Windows'
       run: ./bin/test
 
@@ -91,4 +53,5 @@ jobs:
     # Run the tests with Powershell syntax
     - name: Test (vs2019)
       if: runner.os == 'Windows'
-      run: "& ./bin/x64/${{ matrix.configuration }}/test.exe"
+      run: "& ./bin/${{ matrix.configuration }}/test.exe"
+

BUILDING.md

@@ -3,157 +3,35 @@ Building yojimbo
 
 ## Building on Windows
 
-Download [premake 5](https://premake.github.io/download.html) and copy the **premake5** executable somewhere in your path. Please make sure you have at least premake5 alpha 13.
+Download [premake 5](https://premake.github.io/download.html) and copy the **premake5** executable somewhere in your path.
 
 You need Visual Studio to build the source code. If you don't have Visual Studio 2019 you can [download the community edition for free](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=16).
 
 Once you have Visual Studio installed, go to the command line under the yojimbo directory and type:
 
-    premake5 solution
+    premake5 vs2019
 
-This creates Yojimbo.sln and opens it in Visual Studio for you.
+Open the generated yojimbo.sln file.
 
 You can now build the library and run individual test programs as you would for any other Visual Studio solution.
 
 ## Building on MacOS and Linux
 
 First, download and install [premake 5](https://premake.github.io/download.html).
 
-Next, install libsodium and mbedtls.
-
-On MacOS X, this can be done most easily with `brew install libsodium mbedtls`. If you don't have Brew, you can install it from <http://brew.sh>.
-
-On Linux, depending on your particular distribution there may be prebuilt packages for libsodium and mbedtls, or you may have to build from source from here [libsodium](https://github.com/jedisct1/libsodium/releases) and here [mbedtls](https://github.com/ARMmbed/mbedtls). Make sure you install the 3.x version of mbedtls as the 2.x & 1.x version will not work with yojimbo.
-
 Now go to the command line under the yojimbo directory and enter:
 
-    premake5 gmake2
+    premake5 gmake
 
 This creates makefiles which you can use to build the source via:
 
-    make all
-
-Alternatively, you can use the following shortcuts to build and run test programs directly:
-
-    premake5 test           // build and run unit tests
-
-    premake5 server         // build run a yojimbo server on localhost on UDP port 40000
-
-    premake5 client         // build and run a yojimbo client that connects to the server running on localhost 
-
-## Run a yojimbo server inside Docker
-
-**yojimbo** supports Docker on Windows, Mac and Linux.
-
-First, install the latest version of Docker from <http://www.docker.com>
-
-Now go to the command line at the yojimbo directory and enter:
-
-    premake5 docker
-
-This builds and runs a Docker container with a yojimbo server inside it (exactly the same as if you ran "premake5 server" on a Linux box). You can now connect to this server by running a client which connects to 127.0.0.0:40000. For example, "premake5 client" on Mac or Linux, or running the "client" project inside the Yojimbo.sln in Visual Studio.
-
-IMPORTANT: The premake docker action takes a long time initially, because it has a lot of work to do:
-
-1. Start a new docker image from an [ubuntu derived base image](https://github.com/phusion/baseimage-docker)
-
-2. `apt-get update, apt-get install wget, g++`
-
-3. Download, build and install premake5
-
-4. Download, build and install libsodium
-
-5. Download, build and install mbedtls
-
-6. Build release version of yojimbo, run tests
-
-7. If all tests pass, clean everything and copy the yojimbo server to the /home dir
-
-8. When the Docker container is run, start the yojimbo server /home/server on UDP port 40000.
-
-For details see docker/Dockerfile and the premake5.lua file with commands that build and run the container instance.
-
-What's most impressive is that if no dependencies have changed, the numbered steps above are precached as intermediate Docker instances are not rebuilt unless necessary. For example, if you have already downloaded and installed wget, g++, libsodium, premake5, mbedtls and you run "premake5 docker" again, these steps are skipped.
-
-Try it yourself by running "premake5 docker" once (it should build everything), then run it again. It will go straight to the server running on port 40000. Similarly, if you change some yojimbo source it automatically rebuilds yojimbo server and runs tests before starting the server. Impressive!
-
-## Run a yojimbo matcher inside Docker
-
-In order to demonstrate authentication and a secure connection between client and server, yojimbo provides an example backend written in golang.
-
-You can run this backend in Docker via this command:
-
-    premake5 matcher
-
-This builds and runs a linux docker instance with matcher.go running on port 8080.
-
-You can verify the matcher instance is working correctly as follows:
-
-    curl https://localhost:8080/match/12345/1 --insecure
-
-Which should return a base64 encoded text response that represents a **connect token**. This is what a client passes to the server in order to establish a secure connection.
-
-## Running a secure server
-
-Up to this point we have been running insecure servers with "premake5 server". 
-
-This mode is useful during development, but once you ship your game, but it gives clients access to the private key. 
-
-This makes it possible for clients to connect to servers without authentication, which makes it possible to DDoS your servers.
-
-To fix this, yojimbo provides support for secure authenticated servers. These servers only allow clients to connect who have authenticated through the matcher service, which is a stand-in for your own web backend that matches clients to dedicated server instances when they want to play a game.
-
-You can run a secure server like this on MacOS and Linux:
-
-    premake5 secure_server
-
-Or, if you are building under Visual Studio, run the "secure_server" project from the IDE.
-
-## Connect a secure client
-
-First run the matcher service via:
-
-    premake5 matcher
-
-Next run the secure client:
-
-    premake5 secure_client
-
-If everything is working correctly you should see something like:
-
-    connecting client (secure)
-    client id is 12a485afe59b1c71
-    requesting match from https://localhost:8080
-    received connect token from matcher
-    client started on port 65067
-    client connecting to server 127.0.0.1:40000 [1/1]
-    client connected to server
-
-What just happened?
-
-1. The secure client requested a **connect token** from the matcher over HTTPS. The connect token is a cryptographic token that grants the client a right to connect to a dedicated server for a short period of time (eg. 45 seconds).
-
-2. The secure client passed the connect token to the dedicated server as part of its connection handshake over UDP.
-
-3. The secure server validated the connect token, making sure it grants connection to that particular server, and has not expired, then accepted the client connection.
-
-4. The server and client exchange signed and encrypted packets over UDP.
-
-These steps ensure that clients can only connect to secure tokens if they go through the matcher first. This means that only clients authenticated with your web backend can connect to your dedicated servers, which is typically what you want!
-
-## Documentation and Support
-
-**yojimbo** now has reference documentation built from code comments with [doxygen](http://www.stack.nl/~dimitri/doxygen/).
-
-To build the documentation first install doxygen on your platform.
-
-Once you have doxygen installed and in your path, you can build and view the documentation with this command:
+    make -j
 
-    premake5 docs
-
-More documentation including getting started guide and usage documentation is coming shortly. 
+Then run the built executables:
 
-Until then, if you have questions and you don't find the answer you need in the documentation, please create an issue at http://www.libyojimbo.com and I'll do my best to help you out.
+    ./bin/test           // run unit tests
+    ./bin/server         // run a server on localhost on UDP port 40000
+    ./bin/client         // run a client that connects to the local server
 
 cheers
 

README.md

@@ -35,8 +35,6 @@ The author of this library is [Glenn Fiedler](https://www.linkedin.com/in/glennf
 
 Other open source libraries by the same author include: [netcode](http://netcode.io) and [reliable](https://github.com/networkprotocol/reliable)
 
-Glenn is now the founder and CEO of Network Next. Network Next is a radically new way to link networks together, it's a new internet for games, one where networks compete on performance and price to carry your game's traffic. Check it out at https://networknext.com
-
 ## Sponsors
 
 **yojimbo** was generously sponsored by:
@@ -47,10 +45,10 @@ Glenn is now the founder and CEO of Network Next. Network Next is a radically ne
 
 * **Silver Sponsors**
     * [Moon Studios](http://www.oriblindforest.com/#!moon-3/)
-    * [The Network Protocol Company](http://www.thenetworkprotocolcompany.com)
+    * The Network Protocol Company
 
 * **Bronze Sponsors**
-    * [Kite & Lightning](http://kiteandlightning.la/)
+    * Kite & Lightning
     * [Data Realms](http://datarealms.com)
 
 And by individual supporters on Patreon. Thank you. You made this possible!