From e26e85f6ef651e22594f360678ac34d4f8967d60 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 14 May 2021 22:12:13 +0200 Subject: [PATCH] Set a default ipv6 address for multicast (#1960) * Set a default ipv6 address for multicast (#1959) * Set a good default ipv6 address Signed-off-by: Ryan Friedman * Linters Signed-off-by: Miguel Company Co-authored-by: Miguel Company (cherry picked from commit 6afc1e4224508863884e4f0be905999e9050bbf1) # Conflicts: # src/cpp/rtps/transport/UDPv6Transport.cpp * Fixed merge conflicts Co-authored-by: RFRIEDM_Trimble <50461358+RFRIEDM-Trimble@users.noreply.github.com> Co-authored-by: Miguel Company (cherry picked from commit 658fc2a688c711069670c3a37e827351c1810b6b) --- src/cpp/rtps/transport/UDPv6Transport.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cpp/rtps/transport/UDPv6Transport.cpp b/src/cpp/rtps/transport/UDPv6Transport.cpp index e2ebe3d8d4d..a526a540dd4 100644 --- a/src/cpp/rtps/transport/UDPv6Transport.cpp +++ b/src/cpp/rtps/transport/UDPv6Transport.cpp @@ -92,7 +92,8 @@ static asio::ip::address_v6::bytes_type locator_to_native( IPLocator::getIPv6(locator)[12], IPLocator::getIPv6(locator)[13], IPLocator::getIPv6(locator)[14], - IPLocator::getIPv6(locator)[15] } }; + IPLocator::getIPv6(locator)[15] } + }; } UDPv6Transport::UDPv6Transport( @@ -141,7 +142,7 @@ bool UDPv6Transport::getDefaultMetatrafficMulticastLocators( Locator_t locator; locator.kind = LOCATOR_KIND_UDPv6; locator.port = static_cast(metatraffic_multicast_port); - IPLocator::setIPv6(locator, "ff31::8000:1234"); + IPLocator::setIPv6(locator, "ff1e::ffff:efff:1"); locators.push_back(locator); return true; } @@ -203,7 +204,7 @@ void UDPv6Transport::AddDefaultOutputLocator( { // TODO What is the default IPv6 address? Locator_t temp; - IPLocator::createLocator(LOCATOR_KIND_UDPv6, "239.255.0.1", 0, temp); + IPLocator::createLocator(LOCATOR_KIND_UDPv6, "ff1e::ffff:efff:1", 0, temp); defaultList.push_back(temp); }