1 files changed, 23 insertions, 4 deletions

diff --git a/src/input/Edi.cpp b/src/input/Edi.cpp
index 3838541..141641f 100644
--- a/src/input/Edi.cpp
+++ b/src/input/Edi.cpp
@@ -81,6 +81,7 @@ void Edi::open(const std::string& name)
 {
     const std::regex re_udp("udp://:([0-9]+)");
     const std::regex re_udp_multicast("udp://@([0-9.]+):([0-9]+)");
+    const std::regex re_udp_multicast_bindto("udp://([0-9.])+@([0-9.]+):([0-9]+)");
     const std::regex re_tcp("tcp://(.*):([0-9]+)");
 
     lock_guard<mutex> lock(m_mutex);
@@ -97,13 +98,31 @@ void Edi::open(const std::string& name)
         m_udp_sock.reinit(udp_port);
         m_udp_sock.setBlocking(false);
     }
+    else if (std::regex_match(name, m, re_udp_multicast_bindto)) {
+        const string bind_to = m[1].str();
+        const string multicast_address = m[2].str();
+        const int udp_port = std::stoi(m[3].str());
+
+        m_input_used = InputUsed::UDP;
+        if (IN_MULTICAST(ntohl(inet_addr(multicast_address.c_str())))) {
+            m_udp_sock.init_receive_multicast(udp_port, bind_to, multicast_address);
+        }
+        else {
+            throw runtime_error(string("Address ") + multicast_address + " is not a multicast address");
+        }
+        m_udp_sock.setBlocking(false);
+    }
     else if (std::regex_match(name, m, re_udp_multicast)) {
         const string multicast_address = m[1].str();
         const int udp_port = std::stoi(m[2].str());
         m_input_used = InputUsed::UDP;
-        m_udp_sock.reinit(udp_port);
+        if (IN_MULTICAST(ntohl(inet_addr(multicast_address.c_str())))) {
+            m_udp_sock.init_receive_multicast(udp_port, "0.0.0.0", multicast_address);
+        }
+        else {
+            throw runtime_error(string("Address ") + multicast_address + " is not a multicast address");
+        }
         m_udp_sock.setBlocking(false);
-        m_udp_sock.joinGroup(multicast_address.c_str());
     }
     else if (std::regex_match(name, m, re_tcp)) {
         m_input_used = InputUsed::TCP;
@@ -235,7 +254,7 @@ size_t Edi::readFrame(uint8_t *buffer, size_t size, std::time_t seconds, int utc
 
         while (not m_pending_sti_frame.frame.empty()) {
             if (m_pending_sti_frame.frame.size() == size) {
-                if (m_pending_sti_frame.timestamp.valid()) {
+                if (m_pending_sti_frame.timestamp.is_valid()) {
                     auto ts_req = EdiDecoder::frame_timestamp_t::from_unix_epoch(seconds, utco, tsta);
                     ts_req += m_tist_delay;
                     const double offset = ts_req.diff_s(m_pending_sti_frame.timestamp);
@@ -305,7 +324,7 @@ size_t Edi::readFrame(uint8_t *buffer, size_t size, std::time_t seconds, int utc
             m_is_prebuffering = true;
             return 0;
         }
-        else if (not m_pending_sti_frame.timestamp.valid()) {
+        else if (not m_pending_sti_frame.timestamp.is_valid()) {
             etiLog.level(warn) << "EDI input " << m_name <<
                 " invalid timestamp, ignoring";
             memset(buffer, 0, size);