Merge branch 'master' into fix-advertiser

.github/workflows/build-test.yml

@@ -262,7 +262,7 @@ jobs:
           libssl-dev
 
         cd ${{ env.RUNNER_WORKSPACE }}
-        git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk
+        git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk
         cd cpprestsdk/Release
         mkdir build
         cd build
@@ -801,7 +801,7 @@ jobs:
           libssl-dev
 
         cd ${{ env.RUNNER_WORKSPACE }}
-        git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk
+        git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk
         cd cpprestsdk/Release
         mkdir build
         cd build

.github/workflows/src/build-setup.yml

@@ -142,7 +142,7 @@
       libssl-dev
 
     cd ${{ env.RUNNER_WORKSPACE }}
-    git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk
+    git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk
     cd cpprestsdk/Release
     mkdir build
     cd build

Development/cmake/NmosCppDependencies.cmake

@@ -1,7 +1,7 @@
 # Boost
 
 set(BOOST_VERSION_MIN "1.54.0")
-set(BOOST_VERSION_CUR "1.80.0")
+set(BOOST_VERSION_CUR "1.83.0")
 # note: 1.57.0 doesn't work due to https://svn.boost.org/trac10/ticket/10754
 # note: some components are only required for one platform or other
 # so find_package(Boost) is called after adding those components
@@ -95,7 +95,7 @@ add_library(nmos-cpp::Boost ALIAS Boost)
 
 # note: 2.10.16 or higher is recommended (which is the first version with cpprestsdk-configVersion.cmake)
 set(CPPRESTSDK_VERSION_MIN "2.10.11")
-set(CPPRESTSDK_VERSION_CUR "2.10.18")
+set(CPPRESTSDK_VERSION_CUR "2.10.19")
 find_package(cpprestsdk REQUIRED)
 if(NOT cpprestsdk_VERSION)
     message(STATUS "Found cpprestsdk unknown version; minimum version: " ${CPPRESTSDK_VERSION_MIN})

Development/conanfile.txt

@@ -1,6 +1,6 @@
 [requires]
-boost/1.80.0
-cpprestsdk/2.10.18
+boost/1.83.0
+cpprestsdk/2.10.19
 websocketpp/0.8.2
 openssl/1.1.1s
 json-schema-validator/2.3.0

Development/nmos/client_utils.cpp

@@ -127,7 +127,7 @@ namespace nmos
         }
 
 #ifdef CPPRESTSDK_ENABLE_BIND_WEBSOCKET_CLIENT
-        // The current version of the C++ REST SDK 2.10.18 does not provide the callback to enable the custom websocket setting
+        // The current version of the C++ REST SDK 2.10.19 does not provide the callback to enable the custom websocket setting
         inline std::function<void(web::websockets::client::native_handle)> make_ws_client_nativehandle_options(bool secure, const utility::string_t& client_address, slog::base_gate& gate)
         {
             if (client_address.empty()) return {};

Development/nmos/settings.h

@@ -107,7 +107,7 @@ namespace nmos
         // pri [registry, node]: used for the 'pri' TXT record; specifying nmos::service_priorities::no_priority (maximum value) disables advertisement completely
         const web::json::field_as_integer_or pri{ U("pri"), 100 }; // default to highest_development_priority
 
-        // highest_pri, lowest_pri [registry, node]: used to specify the (inclusive) range of suitable 'pri' values of discovered APIs, to avoid development and live systems colliding
+        // highest_pri, lowest_pri [node]: used to specify the (inclusive) range of suitable 'pri' values of discovered APIs, to avoid development and live systems colliding
         const web::json::field_as_integer_or highest_pri{ U("highest_pri"), 0 }; // default to highest_active_priority; specifying no_priority disables discovery completely
         const web::json::field_as_integer_or lowest_pri{ U("lowest_pri"), (std::numeric_limits<int>::max)() }; // default to no_priority
 

Documents/Dependencies.md

@@ -80,9 +80,9 @@ If using Conan, this section can be skipped.
 
 1. Download a [recent release](http://www.boost.org/users/download/)  
    Notes:
-   - Several Boost releases have been tested, including Version 1.80.0 (latest release at the time) and Version 1.54.0
+   - Several Boost releases have been tested, including Version 1.83.0 (latest release at the time) and Version 1.54.0
    - On Linux distributions, a Boost libraries package may already be installed, e.g. Ubuntu 14.04 LTS has Version 1.54.0
-2. Expand the archive so that, for example, the boost\_1\_80\_0 directory is at the same level as the nmos-cpp directory
+2. Expand the archive so that, for example, the boost\_1\_83\_0 directory is at the same level as the nmos-cpp directory
 3. Build and stage (or install) the following Boost libraries for your platform/toolset:
    - atomic
    - chrono
@@ -133,11 +133,11 @@ If using Conan, this section can be skipped.
 <summary>If not using Conan...</summary>
 
 1. Get the source code
-   - Clone the [repo](https://github.com/Microsoft/cpprestsdk/) and its submodules, and check out the v2.10.18 tag  
+   - Clone the [repo](https://github.com/Microsoft/cpprestsdk/) and its submodules, and check out the v2.10.19 tag  
      The ``git clone`` command option ``--recurse-submodules`` (formerly ``--recursive``) simplifies [cloning a project with submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules#_cloning_submodules).  
      For example:
      ```
-     git clone --recurse-submodules --branch v2.10.18 https://github.com/Microsoft/cpprestsdk <home-dir>/cpprestsdk
+     git clone --recurse-submodules --branch v2.10.19 https://github.com/Microsoft/cpprestsdk <home-dir>/cpprestsdk
      ```
      Note: The downloadable archives created by GitHub cannot be used on their own since they don't include submodules.
 2. Use CMake to configure for your platform