From ec6b691243bef6c3cb0858052b1f6e7046796d6d Mon Sep 17 00:00:00 2001 From: RFRIEDM_Trimble <50461358+RFRIEDM-Trimble@users.noreply.github.com> Date: Fri, 14 May 2021 02:15:04 -0600 Subject: [PATCH] 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 --- src/cpp/rtps/transport/UDPv6Transport.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cpp/rtps/transport/UDPv6Transport.cpp b/src/cpp/rtps/transport/UDPv6Transport.cpp index 19cde0dfea4..b05a6864ef3 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; } @@ -202,8 +203,13 @@ void UDPv6Transport::AddDefaultOutputLocator( LocatorList_t& defaultList) { // TODO What is the default IPv6 address? +<<<<<<< HEAD Locator_t temp; IPLocator::createLocator(LOCATOR_KIND_UDPv6, "239.255.0.1", 0, temp); +======= + Locator temp; + IPLocator::createLocator(LOCATOR_KIND_UDPv6, "ff1e::ffff:efff:1", 0, temp); +>>>>>>> 6afc1e422... Set a default ipv6 address for multicast (#1959) defaultList.push_back(temp); }