Merge pull request #218 from bondagit/issue-216

Issue 216

Author: bondagit

daemon/README.md

@@ -186,6 +186,7 @@ Example
 
     {
       "interface_name": "lo",
+      "http_addr": "127.0.0.1",
       "http_port": 8080,
       "rtsp_port": 8854,
       "log_severity": 2,
@@ -285,7 +286,12 @@ where:
 
 > **ip\_addr**
 > JSON string specifying the IP address of the specified network device.
-> **_NOTE:_** This parameter is read-only and cannot be set. The server will determine the IP address of the network device at startup time and will monitor it periodically.
+> This parameter can be set to specify the prefferred IP address to use. 
+> In case such address is not valid, the server will determine the IP address of the network device at startup time and will monitor it periodically.
+
+> **http\_addr**
+> JSON string specifying the alternate IP address used for the daemon HTTP interface. 
+> If this address is specified the HTTP interface will bind to this IP instead of the one specified by the *ip_addr* parameter.
 
 > **mdns\_enabled**
 > JSON boolean specifying whether the mDNS discovery is enabled or disabled.

daemon/config.cpp

@@ -115,7 +115,8 @@ std::shared_ptr<Config> Config::parse(const std::string& filename,
     config.interface_idx_ = interface_idx;
   }
 
-  auto [ip_addr, ip_str] = get_interface_ip(config.interface_name_);
+  auto [ip_addr, ip_str, is_new] =
+      get_new_interface_ip(config.interface_name_, config.ip_str_);
   if (ip_str.empty()) {
     std::cerr << "Cannot retrieve IPv4 address for interface "
               << config.interface_name_ << std::endl;

daemon/interface.cpp

@@ -1,7 +1,7 @@
 //
 //  interface.cpp
 //
-//  Copyright (c) 2019 2020 Andrea Bondavalli. All rights reserved.
+//  Copyright (c) 2019 2025 Andrea Bondavalli. All rights reserved.
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -25,11 +25,33 @@
 #include <fstream>
 #include <utility>
 
+#include <ifaddrs.h>
 #include "log.hpp"
 
 using namespace boost::asio;
 using namespace boost::asio::ip;
 
+bool is_interface_ip(const std::string& interface_name,
+                     const std::string& addr) {
+  struct ifaddrs *ifap, *ifa;
+  struct sockaddr_in* sa;
+  char* saddr;
+  bool found(false);
+
+  getifaddrs(&ifap);
+  for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+    if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) {
+      sa = (struct sockaddr_in*)ifa->ifa_addr;
+      saddr = inet_ntoa(sa->sin_addr);
+      if (interface_name == ifa->ifa_name && addr == saddr)
+        found = true;
+    }
+  }
+
+  freeifaddrs(ifap);
+  return found;
+}
+
 std::pair<uint32_t, std::string> get_interface_ip(
     const std::string& interface_name) {
   int fd = socket(AF_INET, SOCK_DGRAM, 0);
@@ -59,6 +81,22 @@ std::pair<uint32_t, std::string> get_interface_ip(
   return {addr, str_addr};
 }
 
+std::tuple<uint32_t, std::string, bool> get_new_interface_ip(
+    const std::string& interface_name,
+    const std::string& curr_addr) {
+  if (is_interface_ip(interface_name, curr_addr))
+  {
+    uint32_t ip_addr;
+    inet_pton(AF_INET, curr_addr.c_str(), &ip_addr);
+    return { ntohl(ip_addr), curr_addr, false };
+  }
+
+  auto [ip_addr, ip_str] = get_interface_ip(interface_name);
+  BOOST_LOG_TRIVIAL(info) << "interface " << interface_name
+                          << " new IP address " << ip_str;
+  return { ip_addr, ip_str, true };
+}
+
 std::pair<std::array<uint8_t, 6>, std::string> get_interface_mac(
     const std::string& interface_name) {
   std::array<uint8_t, 6> mac{0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

daemon/interface.hpp

@@ -20,6 +20,11 @@
 #ifndef _INTERFACE_HPP_
 #define _INTERFACE_HPP_
 
+std::tuple<uint32_t, std::string, bool> get_new_interface_ip(
+    const std::string& interface_name,
+    const std::string& curr_addr);
+bool is_interface_ip(const std::string& interface_name,
+                     const std::string& addr);
 std::pair<uint32_t, std::string> get_interface_ip(
     const std::string& interface_name);
 std::pair<std::array<uint8_t, 6>, std::string> get_interface_mac(

daemon/json.cpp

@@ -379,7 +379,9 @@ 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 == "mac_addr" || key == "ip_addr" || key == "node_id") {
+      } else if (key == "ip_addr") {
+        config.set_ip_addr_str(val.get_value<std::string>());
+      } else if (key == "mac_addr" || key == "node_id") {
         /* ignored */
       } else {
         std::cerr << "Warning: unkown configuration option " << key

daemon/main.cpp

@@ -43,7 +43,7 @@ namespace po = boost::program_options;
 namespace postyle = boost::program_options::command_line_style;
 namespace logging = boost::log;
 
-static const std::string version("bondagit-2.0.5");
+static const std::string version("bondagit-2.1.0");
 static std::atomic<bool> terminate = false;
 
 void termination_handler(int signum) {
@@ -220,8 +220,9 @@ int main(int argc, char* argv[]) {
           sd_notify(0, "WATCHDOG=1");
 #endif
 
-        auto [ip_addr, ip_str] = get_interface_ip(config->get_interface_name());
-        if (config->get_ip_addr_str() != ip_str) {
+        auto [ip_addr, ip_str, is_new] = get_new_interface_ip(
+            config->get_interface_name(), config->get_ip_addr_str());
+        if (is_new) {
           BOOST_LOG_TRIVIAL(warning)
               << "main:: IP address changed, restarting ...";
           break;