Merge branch 'nmos-aes67-daemon' into dependabot/npm_and_yarn/webui/vite-6.4.3

Author: bondagit

README.md

@@ -106,6 +106,9 @@ The daemon should work on all Ubuntu starting from 18.04 onward, it's possible t
 ## Devices and interoperability tests ##
 See [Devices and interoperability tests with the AES67 daemon](DEVICES.md)
 
+## Support for NMOS ##
+Starting from daemon version 4.x the support for NMOS (IS-04 and IS-05) was added.
+
 ## Support for ST-2022-7 ##
 Starting from the daemon version 3.0 and driver version 2.0 support for ST-2022-7 was added. 
 This feature is automatically enabled when 2 interfaces are configured via the daemon _interface_name_ parameter.

build.sh

@@ -42,6 +42,7 @@ cmake \
 	-DFAKE_DRIVER=OFF \
 	-DWITH_SYSTEMD=ON \
 	-DWITH_STREAMER=ON \
+	-DWITH_NMOS=ON \
 	.
 make
 cd ..

daemon/CMakeLists.txt

@@ -13,6 +13,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 option(WITH_SYSTEMD "Include systemd notify and watchdog support" OFF)
 option(WITH_STREAMER "Enable streamer support" ON)
+option(WITH_NMOS "Include NMOS IS-04 Node API and Registration support" OFF)
 
 # ravena lkm _should_ be provided by the CLI. Nonetheless, we should be able
 # to find it in system dirs too...
@@ -43,6 +44,12 @@ if(WITH_STREAMER)
   list(APPEND SOURCES streamer.cpp)
 endif()
 
+if(WITH_NMOS)
+  MESSAGE(STATUS "WITH_NMOS")
+  add_definitions(-D_USE_NMOS_)
+  list(APPEND SOURCES nmos_manager.cpp)
+endif()
+
 if(FAKE_DRIVER)
   MESSAGE(STATUS "FAKE_DRIVER")
   add_definitions(-D_USE_FAKE_DRIVER_)

daemon/README.md

@@ -222,6 +222,10 @@ Example
       "streamer_files_num": 6,
       "streamer_file_duration": 1,
       "streamer_player_buffer_files_num": 1
+      "nmos_registry_address": "127.0.0.1",
+      "nmos_registry_port": 8010,
+      "nmos_node_port": 3212,
+      "nmos_label": "AES67 Daemon"
     }
 
 where:
@@ -343,6 +347,19 @@ where:
 > **streamer\_player\_buffer\_files\_num**
 > JSON number specifying the player buffer in number of files.
 
+> **nmos\_registry\_address**
+> JSON string specifying the address of the NMOS registry to connect to.
+
+> **nmos\_registry\_port**
+> JSON number specifying the port of the NMOS registry to connect to.
+
+> **nmos\_node\_port**
+> JSON number specifying the port of the local NMOS node.
+> The NMOS node binds to any network interface on this port.
+
+> **nmos\_label**
+> JSON string specifying the NMOS label.
+
 
 ### JSON PTP Config<a name="ptp-config"></a> ###
 

daemon/config.cpp

@@ -182,7 +182,12 @@ bool Config::save(const Config& config) {
         get_streamer_files_num() != config.get_streamer_files_num() ||
         get_streamer_player_buffer_files_num() !=
             config.get_streamer_player_buffer_files_num() ||
-        get_streamer_enabled() != config.get_streamer_enabled();
+        get_streamer_enabled() != config.get_streamer_enabled() ||
+        get_nmos_enabled() != config.get_nmos_enabled() ||
+        get_nmos_registry_address() != config.get_nmos_registry_address() ||
+        get_nmos_registry_port() != config.get_nmos_registry_port() ||
+        get_nmos_node_port() != config.get_nmos_node_port() ||
+        get_nmos_label() != config.get_nmos_label();
 
     if (!daemon_restart_)
       *this = config;

daemon/config.hpp

@@ -74,6 +74,12 @@ class Config {
   std::string get_node_id() const;
   bool get_auto_sinks_update() const { return auto_sinks_update_; };
 
+  bool get_nmos_enabled() const { return nmos_enabled_; }
+  const std::string& get_nmos_registry_address() const { return nmos_registry_address_; }
+  uint16_t get_nmos_registry_port() const { return nmos_registry_port_; }
+  uint16_t get_nmos_node_port() const { return nmos_node_port_; }
+  const std::string& get_nmos_label() const { return nmos_label_; }
+
   /* attributes set during init */
   const std::array<uint8_t, 6>& get_mac_addr() const { return mac_addr_; };
   const std::string& get_mac_addr_str() const { return mac_str_; };
@@ -171,6 +177,12 @@ class Config {
   };
   void set_driver_restart(bool restart) { driver_restart_ = restart; }
 
+  void set_nmos_enabled(bool v) { nmos_enabled_ = v; }
+  void set_nmos_registry_address(std::string_view v) { nmos_registry_address_ = v; }
+  void set_nmos_registry_port(uint16_t v) { nmos_registry_port_ = v; }
+  void set_nmos_node_port(uint16_t v) { nmos_node_port_ = v; }
+  void set_nmos_label(std::string_view v) { nmos_label_ = v; }
+
   friend bool operator!=(const Config& lhs, const Config& rhs) {
     return lhs.get_http_addr_str() != rhs.get_http_addr_str() ||
            lhs.get_http_port() != rhs.get_http_port() ||
@@ -202,7 +214,12 @@ class Config {
            lhs.get_interface_name() != rhs.get_interface_name() ||
            lhs.get_mdns_enabled() != rhs.get_mdns_enabled() ||
            lhs.get_auto_sinks_update() != rhs.get_auto_sinks_update() ||
-           lhs.get_custom_node_id() != rhs.get_custom_node_id();
+           lhs.get_custom_node_id() != rhs.get_custom_node_id() ||
+           lhs.get_nmos_enabled() != rhs.get_nmos_enabled() ||
+           lhs.get_nmos_registry_address() != rhs.get_nmos_registry_address() ||
+           lhs.get_nmos_registry_port() != rhs.get_nmos_registry_port() ||
+           lhs.get_nmos_node_port() != rhs.get_nmos_node_port() ||
+           lhs.get_nmos_label() != rhs.get_nmos_label();
   };
   friend bool operator==(const Config& lhs, const Config& rhs) {
     return !(lhs != rhs);
@@ -243,6 +260,12 @@ class Config {
   std::string node_id_;
   bool auto_sinks_update_{true};
 
+  bool nmos_enabled_{false};
+  std::string nmos_registry_address_;
+  uint16_t nmos_registry_port_{8010};
+  uint16_t nmos_node_port_{3212};
+  std::string nmos_label_{"AES67 Daemon"};
+
   /* set during init */
   std::array<uint8_t, 6> mac_addr_{0, 0, 0, 0, 0, 0};
   std::string mac_str_;

daemon/daemon.conf

@@ -11,7 +11,7 @@
   "rtp_mcast_base_sec": "239.1.0.1",
   "rtp_port": 5004,
   "rtp_port_sec": 5004,
-  "ptp_domain": 0,
+  "ptp_domain": 127,
   "ptp_dscp": 48,
   "sap_mcast_addr": "239.255.255.255",
   "sap_interval": 30,
@@ -27,5 +27,10 @@
   "streamer_file_duration": 1,
   "streamer_player_buffer_files_num": 1,
   "streamer_enabled": false,
-  "auto_sinks_update": true
+  "auto_sinks_update": true,
+  "nmos_enabled": true,
+  "nmos_registry_address": "127.0.0.1",
+  "nmos_registry_port": 8010,
+  "nmos_node_port": 3212,
+  "nmos_label": "AES67 Daemon"
 }

daemon/http_server.cpp

@@ -259,6 +259,7 @@ bool HttpServer::init() {
         set_error(ret, "failed to add source " + std::to_string(source.id),
                   res);
       } else {
+        session_manager_->save_status();
         set_headers(res);
       }
     } catch (const std::runtime_error& e) {
@@ -280,6 +281,7 @@ bool HttpServer::init() {
         if (ret) {
           set_error(ret, "failed to remove source " + std::to_string(id), res);
         } else {
+          session_manager_->save_status();
           set_headers(res);
         }
       });
@@ -292,6 +294,7 @@ bool HttpServer::init() {
       if (ret) {
         set_error(ret, "failed to add sink " + std::to_string(sink.id), res);
       } else {
+        session_manager_->save_status();
         set_headers(res);
       }
     } catch (const std::runtime_error& e) {
@@ -312,6 +315,7 @@ bool HttpServer::init() {
     if (ret) {
       set_error(ret, "failed to remove sink " + std::to_string(id), res);
     } else {
+      session_manager_->save_status();
       set_headers(res);
     }
   });

daemon/json.cpp

@@ -123,7 +123,14 @@ std::string config_to_json(const Config& config) {
      << ",\n  \"streamer_enabled\": " << std::boolalpha
      << config.get_streamer_enabled()
      << ",\n  \"auto_sinks_update\": " << std::boolalpha
-     << config.get_auto_sinks_update() << "\n}\n";
+     << config.get_auto_sinks_update()
+     << ",\n  \"nmos_enabled\": " << std::boolalpha << config.get_nmos_enabled()
+     << ",\n  \"nmos_registry_address\": \""
+     << escape_json(config.get_nmos_registry_address()) << "\""
+     << ",\n  \"nmos_registry_port\": " << config.get_nmos_registry_port()
+     << ",\n  \"nmos_node_port\": " << config.get_nmos_node_port()
+     << ",\n  \"nmos_label\": \"" << escape_json(config.get_nmos_label()) << "\""
+     << "\n}\n";
   return ss.str();
 }
 
@@ -379,6 +386,18 @@ Config json_to_config_(std::istream& js, Config& config) {
             remove_undesired_chars(val.get_value<std::string>()));
       } else if (key == "auto_sinks_update") {
         config.set_auto_sinks_update(val.get_value<bool>());
+      } else if (key == "nmos_enabled") {
+        config.set_nmos_enabled(val.get_value<bool>());
+      } else if (key == "nmos_registry_address") {
+        config.set_nmos_registry_address(
+            remove_undesired_chars(val.get_value<std::string>()));
+      } else if (key == "nmos_registry_port") {
+        config.set_nmos_registry_port(val.get_value<uint16_t>());
+      } else if (key == "nmos_node_port") {
+        config.set_nmos_node_port(val.get_value<uint16_t>());
+      } else if (key == "nmos_label") {
+        config.set_nmos_label(
+            remove_undesired_chars(val.get_value<std::string>()));
       } else if (key == "ip_addr") {
         config.set_ip_addr_str(val.get_value<std::string>());
       } else if (key == "mac_addr" || key == "node_id") {

daemon/main.cpp

@@ -35,6 +35,10 @@
 #include "streamer.hpp"
 #endif
 
+#ifdef _USE_NMOS_
+#include "nmos_manager.hpp"
+#endif
+
 #ifdef _USE_SYSTEMD_
 #include <systemd/sd-daemon.h>
 #endif
@@ -43,7 +47,7 @@ namespace po = boost::program_options;
 namespace postyle = boost::program_options::command_line_style;
 namespace logging = boost::log;
 
-static const std::string version("bondagit-3.1.0");
+static const std::string version("bondagit-4.0.0");
 static std::atomic<bool> terminate = false;
 
 void termination_handler(int signum) {
@@ -203,6 +207,17 @@ int main(int argc, char* argv[]) {
       /* load session status from file */
       session_manager->load_status();
 
+#ifdef _USE_NMOS_
+      /* start NMOS manager */
+      std::shared_ptr<NmosManager> nmos_manager;
+      if (config->get_nmos_enabled()) {
+        nmos_manager = NmosManager::create(session_manager, config);
+        if (nmos_manager == nullptr || !nmos_manager->init()) {
+          throw std::runtime_error(std::string("NmosManager:: init failed"));
+        }
+      }
+#endif
+
       BOOST_LOG_TRIVIAL(debug) << "main:: init done, entering loop...";
 
 #ifdef _USE_SYSTEMD_
@@ -249,6 +264,15 @@ int main(int argc, char* argv[]) {
       /* save session status to file */
       session_manager->save_status();
 
+#ifdef _USE_NMOS_
+      /* stop NMOS manager */
+      if (config->get_nmos_enabled() && nmos_manager) {
+        if (!nmos_manager->terminate()) {
+          throw std::runtime_error(std::string("NmosManager:: terminate failed"));
+        }
+      }
+#endif
+
       /* stop http server */
       if (!http_server.terminate()) {
         throw std::runtime_error(std::string("HttpServer:: terminate failed"));