Skip to content

Commit 0bcbe14

Browse files
authored
Set a default ipv6 address for multicast (#1966)
* Set a default ipv6 address for multicast (#1959) * Set a good default ipv6 address Signed-off-by: Ryan Friedman <[email protected]> * Linters Signed-off-by: Miguel Company <[email protected]> Co-authored-by: Miguel Company <[email protected]> (cherry picked from commit 6afc1e4) # Conflicts: # src/cpp/rtps/transport/UDPv6Transport.cpp * Fixed merge conflicts Co-authored-by: RFRIEDM_Trimble <[email protected]> Co-authored-by: Miguel Company <[email protected]> (cherry picked from commit 658fc2a) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 8c5ef69 commit 0bcbe14

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/cpp/rtps/transport/UDPv6Transport.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ static asio::ip::address_v6::bytes_type locator_to_native(
9292
IPLocator::getIPv6(locator)[12],
9393
IPLocator::getIPv6(locator)[13],
9494
IPLocator::getIPv6(locator)[14],
95-
IPLocator::getIPv6(locator)[15] } };
95+
IPLocator::getIPv6(locator)[15] }
96+
};
9697
}
9798

9899
UDPv6Transport::UDPv6Transport(
@@ -141,7 +142,7 @@ bool UDPv6Transport::getDefaultMetatrafficMulticastLocators(
141142
Locator_t locator;
142143
locator.kind = LOCATOR_KIND_UDPv6;
143144
locator.port = static_cast<uint16_t>(metatraffic_multicast_port);
144-
IPLocator::setIPv6(locator, "ff31::8000:1234");
145+
IPLocator::setIPv6(locator, "ff1e::ffff:efff:1");
145146
locators.push_back(locator);
146147
return true;
147148
}
@@ -203,7 +204,7 @@ void UDPv6Transport::AddDefaultOutputLocator(
203204
{
204205
// TODO What is the default IPv6 address?
205206
Locator_t temp;
206-
IPLocator::createLocator(LOCATOR_KIND_UDPv6, "239.255.0.1", 0, temp);
207+
IPLocator::createLocator(LOCATOR_KIND_UDPv6, "ff1e::ffff:efff:1", 0, temp);
207208
defaultList.push_back(temp);
208209
}
209210

0 commit comments

Comments
 (0)