From 8a9d55665f3fd1223be846ade09c596eb906a0f6 Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Tue, 14 Nov 2023 20:22:46 +0100 Subject: [PATCH] rollbacks for linux --- ecal/core/src/io/udp_configurations.cpp | 14 +------------- ecal/core/src/readwrite/ecal_reader_udp_mc.cpp | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ecal/core/src/io/udp_configurations.cpp b/ecal/core/src/io/udp_configurations.cpp index 22b844eb1a..4de6d9f3bc 100644 --- a/ecal/core/src/io/udp_configurations.cpp +++ b/ecal/core/src/io/udp_configurations.cpp @@ -66,18 +66,6 @@ namespace eCAL std::string GetPayloadMulticastAddress(const std::string& topic_name) { - // local host only - const bool local_only = !Config::IsNetworkEnabled(); - if (local_only) - { - return LocalHost(); - } - - if (topic_name.empty()) - { - return Config::GetUdpMulticastGroup(); - } - // v1 if (Config::GetUdpMulticastConfigVersion() == Config::UdpConfigVersion::V1) { @@ -98,7 +86,7 @@ namespace eCAL const bool local_only = !Config::IsNetworkEnabled(); if (local_only) { - return 0; + return 1; } else { diff --git a/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp b/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp index 22786d8a7e..0e80e4b688 100644 --- a/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp +++ b/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp @@ -60,7 +60,7 @@ namespace eCAL void CUDPReaderLayer::Initialize() { SReceiverAttr attr; - attr.ipaddr = UDP::GetPayloadMulticastAddress(""); + attr.ipaddr = Config::GetUdpMulticastGroup(); attr.port = UDP::GetPayloadPort(); attr.localhost = false; attr.loopback = true;