Merge branch 'master' into bcp-008-01

# Conflicts:
#	Development/nmos/api_utils.cpp
#	Development/nmos/control_protocol_handlers.cpp
#	Development/nmos/control_protocol_resource.cpp
#	Development/nmos/control_protocol_resource.h
#	Development/nmos/control_protocol_resources.h
#	Development/nmos/control_protocol_state.cpp
#	Development/nmos/control_protocol_typedefs.h

Author: jonathan-r-thorpe

.github/workflows/build-test.yml

@@ -98,7 +98,7 @@ jobs:
     - name: install conan
       if: matrix.use_conan == true
       run: |
-        pip install conan~=2.4.1
+        pip install conan~=2.19.1
 
     - name: 'ubuntu-14.04: install cmake'
       if: matrix.os == 'ubuntu-14.04'

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

@@ -1,7 +1,7 @@
 - name: install conan
   if: matrix.use_conan == true
   run: |
-    pip install conan~=2.4.1
+    pip install conan~=2.19.1
 
 - name: 'ubuntu-14.04: install cmake'
   if: matrix.os == 'ubuntu-14.04'

Development/conanfile.txt

@@ -2,11 +2,11 @@
 boost/1.83.0
 cpprestsdk/2.10.19
 websocketpp/0.8.2
-openssl/3.2.1
+openssl/3.5.2
 json-schema-validator/2.3.0
 nlohmann_json/3.11.3
-zlib/1.2.13
-jwt-cpp/0.7.0
+zlib/1.3.1
+jwt-cpp/0.7.1
 
 [imports]
 bin, *.dll -> ./bin

Development/nmos/api_utils.cpp

@@ -168,8 +168,7 @@ namespace nmos
             { U("nc_manager"), nmos::types::nc_manager },
             { U("nc_device_manager"), nmos::types::nc_device_manager },
             { U("nc_class_manager"), nmos::types::nc_class_manager },
-            { U("nc_status_monitor"), nmos::types::nc_status_monitor },
-            { U("nc_receiver_monitor"), nmos::types::nc_receiver_monitor },
+            { U("nc_status_monitor"), nmos::types::nc_status_monitor }, // this is commonly used for nc_receiver_monitor and nc_sender_monitor
             { U("nc_ident_beacon"), nmos::types::nc_ident_beacon }
         };
         return types_from_resourceType.at(resourceType);
@@ -195,8 +194,7 @@ namespace nmos
             { nmos::types::nc_manager, U("nc_manager") },
             { nmos::types::nc_device_manager, U("nc_device_manager") },
             { nmos::types::nc_class_manager, U("nc_class_manager") },
-            { nmos::types::nc_status_monitor, U("nc_status_monitor") },
-            { nmos::types::nc_receiver_monitor, U("nc_receiver_monitor") },
+            { nmos::types::nc_status_monitor, U("nc_status_monitor") }, // this is commonly used for nc_receiver_monitor and nc_sender_monitor
             { nmos::types::nc_ident_beacon, U("nc_ident_beacon") }
         };
         return resourceTypes_from_type.at(type);
@@ -701,7 +699,15 @@ namespace nmos
         add_api_finally_handler(api_, hsts, gate);
         auto api = [api_, &gate](web::http::http_request req) mutable
         {
+            // hmm, in Windows, the boost version of the time_point::now sometimes returns the same value after a small time increment.
+            // This issue does not seem to happen in the std::chrono implementation.
+#if defined(_WIN32) && defined (BST_THREAD_BOOST)
+            // calculate received_time using std::chrono
+            const auto now = tai_clock::time_point(tai_clock::duration(std::chrono::system_clock::now().time_since_epoch().count() + tai_clock::tai_offset().count()));
+            req.headers().add(details::received_time, nmos::make_version(tai_from_time_point(now)));
+#else
             req.headers().add(details::received_time, nmos::make_version());
+#endif
             slog::log<slog::severities::too_much_info>(gate, SLOG_FLF)
                 << stash_remote_address(req.remote_address())
                 << stash_http_method(req.method())

Development/nmos/control_protocol_resource.cpp

@@ -738,7 +738,7 @@ namespace nmos
             return data;
         }
 
-        // TODO: add link
+        // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncstatusmonitor
         web::json::value make_nc_status_monitor(const nc_class_id& class_id, nc_oid oid, bool constant_oid, nc_oid owner, const utility::string_t& role, const utility::string_t& user_label, const utility::string_t& description, const web::json::value& touchpoints, const web::json::value& runtime_property_constraints, bool enabled, nc_overall_status::status overall_status, const utility::string_t& overall_status_message, uint64_t status_reporting_delay)
         {
             using web::json::value;
@@ -791,7 +791,7 @@ namespace nmos
             return data;
         }
 
-        // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncreceivermonitor
+        // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncsendermonitor
         web::json::value make_sender_monitor(const nc_class_id& class_id, nc_oid oid, bool constant_oid, nc_oid owner, const utility::string_t& role, const utility::string_t& user_label, const utility::string_t& description, const web::json::value& touchpoints, const web::json::value& runtime_property_constraints, bool enabled, nc_overall_status::status overall_status, const utility::string_t& overall_status_message, nc_link_status::status link_status, const utility::string_t& link_status_message, nc_transmission_status::status transmission_status, const utility::string_t& transmission_status_message, nc_synchronization_status::status external_synchronization_status, const utility::string_t& external_synchronization_status_message, const web::json::value& synchronization_source_id, nc_essence_status::status essence_status, const utility::string_t& essence_status_message, uint32_t status_reporting_delay, bool auto_reset_monitor)
         {
             using web::json::value;
@@ -1233,7 +1233,7 @@ namespace nmos
         return value::array();
     }
 
-    // TODO: add link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncstatusmonitor
     web::json::value make_nc_status_monitor_properties()
     {
         using web::json::value;
@@ -1420,7 +1420,7 @@ namespace nmos
     }
 
     // Monitoring feature set control classes
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncstatusmonitor
     web::json::value make_nc_status_monitor_class()
     {
         using web::json::value;
@@ -2169,8 +2169,7 @@ namespace nmos
 
     // Monitoring datatype defintions
     //
-
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncconnectionstatus
     web::json::value make_nc_connection_status_datatype()
     {
         using web::json::value;
@@ -2180,9 +2179,9 @@ namespace nmos
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("Active and healthy"), U("Healthy"), nc_connection_status::status::healthy));
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("Active and partially healthy"), U("PartiallyHealthy"), nc_connection_status::status::partially_healthy));
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("Active and unhealthy"), U("Unhealthy"), nc_connection_status::status::unhealthy));
-        return details::make_nc_datatype_descriptor_enum(U("Connection status enum data typee"), U("NcConnectionStatus"), items, value::null());
+        return details::make_nc_datatype_descriptor_enum(U("Connection status enum data type"), U("NcConnectionStatus"), items, value::null());
     }
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#nccounter
     web::json::value make_nc_counter_datatype()
     {
         using web::json::value;
@@ -2193,7 +2192,7 @@ namespace nmos
         web::json::push_back(fields, details::make_nc_field_descriptor(U("Description"), nmos::fields::nc::description, U("NcString"), true, false, value::null()));
         return details::make_nc_datatype_descriptor_struct(U("Counter data type"), U("NcCounter"), fields, value::null());
     }
-    // TOO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncessencestatus
     web::json::value make_nc_essence_status_datatype()
     {
         using web::json::value;
@@ -2205,7 +2204,7 @@ namespace nmos
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("Active and unhealthy"), U("Unhealthy"), nc_essence_status::status::unhealthy));
         return details::make_nc_datatype_descriptor_enum(U("Essence status enum data type"), U("NcEssenceStatus"), items, value::null());
     }
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#nclinkstatus
     web::json::value make_nc_link_status_datatype()
     {
         using web::json::value;
@@ -2216,7 +2215,7 @@ namespace nmos
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("All the associated network interfaces are down"), U("AllDown"), nc_link_status::status::all_down));
         return details::make_nc_datatype_descriptor_enum(U("Link status enum data type"), U("NcLinkStatus"), items, value::null());
     }
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncoverallstatus
     web::json::value make_nc_overall_status_datatype()
     {
         using web::json::value;
@@ -2228,7 +2227,7 @@ namespace nmos
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("The overall status is unhealthy"), U("Unhealthy"), nc_overall_status::status::unhealthy));
         return details::make_nc_datatype_descriptor_enum(U("Overall status enum data type"), U("NcOverallStatus"), items, value::null());
     }
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncsynchronizationstatus
     web::json::value make_nc_synchronization_status_datatype()
     {
         using web::json::value;
@@ -2240,7 +2239,7 @@ namespace nmos
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("Not locked to a synchronization source"), U("Unhealthy"), nc_synchronization_status::status::unhealthy));
         return details::make_nc_datatype_descriptor_enum(U("Synchronization status enum data type"), U("NcSynchronizationStatus"), items, value::null());
     }
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncstreamstatus
     web::json::value make_nc_stream_status_datatype()
     {
         using web::json::value;
@@ -2252,7 +2251,7 @@ namespace nmos
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("Active and unhealthy"), U("Unhealthy"), nc_stream_status::status::unhealthy));
         return details::make_nc_datatype_descriptor_enum(U("Stream status enum data type"), U("NcStreamStatus"), items, value::null());
     }
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#nctransmissionstatus
     web::json::value make_nc_transmission_status_datatype()
     {
         using web::json::value;
@@ -2264,7 +2263,7 @@ namespace nmos
         web::json::push_back(items, details::make_nc_enum_item_descriptor(U("Active and unhealthy"), U("Unhealthy"), nc_transmission_status::status::unhealthy));
         return details::make_nc_datatype_descriptor_enum(U("Transmission status enum data type"), U("NcTransmissionStatus"), items, value::null());
     }
-    // TOO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncmethodresultcounters
     web::json::value make_nc_method_result_counters_datatype()
     {
         using web::json::value;

Development/nmos/control_protocol_resource.h

@@ -179,8 +179,10 @@ namespace nmos
 
         // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncstatusmonitor
         web::json::value make_nc_status_monitor(const nc_class_id& class_id, nc_oid oid, bool constant_oid, nc_oid owner, const utility::string_t& role, const utility::string_t& user_label, const utility::string_t& description, const web::json::value& touchpoints, const web::json::value& runtime_property_constraints, bool enabled, nc_overall_status::status overall_status, const utility::string_t& overall_status_message, uint64_t status_reporting_delay);
+
         // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncreceivermonitor
         web::json::value make_receiver_monitor(const nc_class_id& class_id, nc_oid oid, bool constant_oid, nc_oid owner, const utility::string_t& role, const utility::string_t& user_label, const utility::string_t& description, const web::json::value& touchpoints, const web::json::value& runtime_property_constraints, bool enabled, nc_overall_status::status overall_status, const utility::string_t& overall_status_message, nc_link_status::status link_status, const utility::string_t& link_status_message, nc_connection_status::status connection_status, const utility::string_t& connection_status_message, nc_synchronization_status::status external_synchronization_status, const utility::string_t& external_synchronization_status_message, const web::json::value& synchronization_source_id, nc_stream_status::status stream_status, const utility::string_t& stream_status_message, uint32_t status_reporting_delay, bool auto_reset_monitor);
+
         // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncsendermonitor
         web::json::value make_sender_monitor(const nc_class_id& class_id, nc_oid oid, bool constant_oid, nc_oid owner, const utility::string_t& role, const utility::string_t& user_label, const utility::string_t& description, const web::json::value& touchpoints, const web::json::value& runtime_property_constraints, bool enabled, nc_overall_status::status overall_status, const utility::string_t& overall_status_message, nc_link_status::status link_status, const utility::string_t& link_status_message, nc_transmission_status::status transmission_status, const utility::string_t& transmission_status_message, nc_synchronization_status::status external_synchronization_status, const utility::string_t& external_synchronization_status_message, const web::json::value& synchronization_source_id, nc_essence_status::status essence_status, const utility::string_t& essence_status_message, uint32_t status_reporting_delay, bool auto_reset_monitor);
 
@@ -242,7 +244,7 @@ namespace nmos
     // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncsendermonitor
     web::json::value make_nc_sender_monitor_class();
 
-    // control classes proprties/methods/events
+    // control classes properties/methods/events
     // See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncobject
     web::json::value make_nc_object_properties();
     web::json::value make_nc_object_methods();
@@ -267,9 +269,8 @@ namespace nmos
     web::json::value make_nc_class_manager_properties();
     web::json::value make_nc_class_manager_methods();
     web::json::value make_nc_class_manager_events();
-
     // Monitoring feature set control classes
-    // TODO: link
+    // https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncstatusmonitor
     web::json::value make_nc_status_monitor_properties();
     web::json::value make_nc_status_monitor_methods();
     web::json::value make_nc_status_monitor_events();
@@ -433,21 +434,21 @@ namespace nmos
     //
     // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncconnectionstatus
     web::json::value make_nc_connection_status_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncessencestatus
     web::json::value make_nc_essence_status_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncoverallstatus
     web::json::value make_nc_overall_status_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#nclinkstatus
     web::json::value make_nc_link_status_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncsynchronizationstatus
     web::json::value make_nc_synchronization_status_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncstreamstatus
     web::json::value make_nc_stream_status_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#nccounter
     web::json::value make_nc_counter_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#nctransmissionstatus
     web::json::value make_nc_transmission_status_datatype();
-    // TODO: link
+    // See https://specs.amwa.tv/nmos-control-feature-sets/branches/main/monitoring/#ncmethodresultcounters
     web::json::value make_nc_method_result_counters_datatype();
 }
 

Development/nmos/control_protocol_resources.h

@@ -43,7 +43,7 @@ namespace nmos
         uint32_t status_reporting_delay = 3,
         bool auto_reset_monitor = true
     );
-
+    //
     // create Sender Monitor resource
     control_protocol_resource make_sender_monitor(nc_oid oid, bool constant_oid, nmos::nc_oid owner, const utility::string_t& role, const utility::string_t& user_label, const utility::string_t& description, const web::json::value& touchpoints = web::json::value::null(), const web::json::value& runtime_property_constraints = web::json::value::null(), bool enabled = true,
         nc_overall_status::status overall_status = nc_overall_status::status::inactive,