From e02663737f2db5b8f3fd8c905336ae68a67d577e Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 2 Feb 2024 10:11:04 -0600 Subject: [PATCH 1/3] Updated for recent changes in OpenDDS transport API --- src/dds_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dds_manager.cpp b/src/dds_manager.cpp index 04dc7fb..9265693 100644 --- a/src/dds_manager.cpp +++ b/src/dds_manager.cpp @@ -374,7 +374,7 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std: newRtpsTransport->max_packet_size(defaultRtpsTransport->max_packet_size()); newRtpsTransport->max_samples_per_packet(defaultRtpsTransport->max_samples_per_packet()); - newRtpsTransport->multicast_group_address(defaultRtpsTransport->multicast_group_address()); + newRtpsTransport->multicast_group_address(defaultRtpsTransport->multicast_group_address(domainID)); newRtpsTransport->multicast_interface_ = (defaultRtpsTransport->multicast_interface_); newRtpsTransport->nak_depth_ = defaultRtpsTransport->nak_depth_; newRtpsTransport->nak_response_delay_ = defaultRtpsTransport->nak_response_delay_; From 4a3594fda20d1a310cb32d74dd71dcbe3e7da27a Mon Sep 17 00:00:00 2001 From: Fred Hornsey Date: Mon, 5 Feb 2024 16:35:23 -0600 Subject: [PATCH 2/3] Add version check for multicast_group_address arg --- src/dds_manager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/dds_manager.cpp b/src/dds_manager.cpp index 9265693..6659c95 100644 --- a/src/dds_manager.cpp +++ b/src/dds_manager.cpp @@ -374,7 +374,11 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std: newRtpsTransport->max_packet_size(defaultRtpsTransport->max_packet_size()); newRtpsTransport->max_samples_per_packet(defaultRtpsTransport->max_samples_per_packet()); - newRtpsTransport->multicast_group_address(defaultRtpsTransport->multicast_group_address(domainID)); + newRtpsTransport->multicast_group_address(defaultRtpsTransport->multicast_group_address( +#if OPENDDS_VERSION_AT_LEAST(3, 27, 0) + domainID +#else + )); newRtpsTransport->multicast_interface_ = (defaultRtpsTransport->multicast_interface_); newRtpsTransport->nak_depth_ = defaultRtpsTransport->nak_depth_; newRtpsTransport->nak_response_delay_ = defaultRtpsTransport->nak_response_delay_; From 9266ca6d021d3e35000f89757d9f305aa139af79 Mon Sep 17 00:00:00 2001 From: Fred Hornsey Date: Mon, 5 Feb 2024 16:39:21 -0600 Subject: [PATCH 3/3] Fix wrongly committed lines --- src/dds_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dds_manager.cpp b/src/dds_manager.cpp index 6659c95..95fae0f 100644 --- a/src/dds_manager.cpp +++ b/src/dds_manager.cpp @@ -377,7 +377,7 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std: newRtpsTransport->multicast_group_address(defaultRtpsTransport->multicast_group_address( #if OPENDDS_VERSION_AT_LEAST(3, 27, 0) domainID -#else +#endif )); newRtpsTransport->multicast_interface_ = (defaultRtpsTransport->multicast_interface_); newRtpsTransport->nak_depth_ = defaultRtpsTransport->nak_depth_;