Skip to content

[17283] Fix issues in Dynamic Network Interfaces #5282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f4177dc
Refs #21690. Parse `--rescan` argument on communication applications.
MiguelCompany Sep 27, 2024
c901d7a
Refs #21690. Implement rescan mechanism.
MiguelCompany Sep 27, 2024
0ac94ca
Refs #21690. Add docker infrastructure.
MiguelCompany Sep 30, 2024
d4a2a7a
Refs #21690. Add CMake infrastructure.
MiguelCompany Sep 30, 2024
ea60f90
Refs #21690. Ensure same domain and topic name are used.
MiguelCompany Sep 30, 2024
35d0424
Refs #21690. Add `--loops` argument to publisher.
MiguelCompany Sep 30, 2024
f6ede02
Refs #21690. Publisher exits after publishing all samples.
MiguelCompany Sep 30, 2024
77fef7a
Refs #21690. Improve subscriber script.
MiguelCompany Sep 30, 2024
13ecf3c
Refs #21690. Add test.
MiguelCompany Sep 30, 2024
1682174
Refs #21690. Make publisher wait subscriber.
MiguelCompany Sep 30, 2024
811c39b
Refs #21690. Possible fix.
MiguelCompany Sep 17, 2024
28f5093
Refs #21690. Clear locators before recalculating them.
MiguelCompany Sep 18, 2024
edbba1c
Refs #21690. Move local participant proxy update to PDP.
MiguelCompany Sep 18, 2024
89d0d66
Refs #21690. Improve new method's logic.
MiguelCompany Sep 18, 2024
42013fc
Refs #21690. Include what you use.
MiguelCompany Sep 18, 2024
dc2ef2c
Refs #21690. Add empty method to update endpoint locators.
MiguelCompany Sep 18, 2024
bfa66a1
Refs #21690. Add implementation for `update_endpoint_locators_if_defa…
MiguelCompany Sep 18, 2024
9582f1a
Refs #21690. Compare against old default locators.
MiguelCompany Sep 18, 2024
986acc4
Refs #21690. Update locators in attributes.
MiguelCompany Sep 18, 2024
77a37a1
Refs #17283. Avoid early return on `PDP::local_participant_attributes…
MiguelCompany Oct 3, 2024
407c552
Refs #17283. Apply suggestions.
MiguelCompany Oct 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion test/dds/communication/PublisherMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ using namespace eprosima::fastdds::dds;
* --seed <int>
* --wait <int>
* --samples <int>
* --interval <int>
* --magic <str>
* --xmlfile <path>
* --interval <int>
* --rescan <int>
*/

int main(
Expand All @@ -47,6 +48,7 @@ int main(
char* xml_file = nullptr;
uint32_t samples = 4;
uint32_t interval = 250;
uint32_t rescan_interval = 0;
std::string magic;

while (arg_count < argc)
Expand Down Expand Up @@ -123,6 +125,16 @@ int main(

xml_file = argv[arg_count];
}
else if (strcmp(argv[arg_count], "--rescan") == 0)
{
if (++arg_count >= argc)
{
std::cout << "--rescan expects a parameter" << std::endl;
return -1;
}

rescan_interval = strtol(argv[arg_count], nullptr, 10);
}
else
{
std::cout << "Wrong argument " << argv[arg_count] << std::endl;
Expand Down
17 changes: 15 additions & 2 deletions test/dds/communication/SubscriberMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ using namespace eprosima::fastdds::dds;
* --notexit
* --fixed_type
* --zero_copy
* --succeed_on_timeout
* --seed <int>
* --samples <int>
* --magic <str>
* --timeout <int>
* --xmlfile <path>
* --publishers <int>
* --succeed_on_timeout
* --timeout <int>
* --die_on_data_received
* --rescan <int>
*/

int main(
Expand All @@ -49,6 +51,7 @@ int main(
uint32_t samples = 4;
uint32_t publishers = 1;
uint32_t timeout = 86400000; // 24 h in ms
uint32_t rescan_interval = 0;
char* xml_file = nullptr;
std::string magic;

Expand Down Expand Up @@ -134,6 +137,16 @@ int main(
{
die_on_data_received = true;
}
else if (strcmp(argv[arg_count], "--rescan") == 0)
{
if (++arg_count >= argc)
{
std::cout << "--rescan expects a parameter" << std::endl;
return -1;
}

rescan_interval = strtol(argv[arg_count], nullptr, 10);
}
else
{
std::cout << "Wrong argument " << argv[arg_count] << std::endl;
Expand Down
14 changes: 13 additions & 1 deletion test/dds/communication/security/PublisherMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ using namespace eprosima::fastdds::dds;
* --seed <int>
* --wait <int>
* --samples <int>
* --interval <int>
* --magic <str>
* --xmlfile <path>
* --interval <int>
* --rescan <int>
*/

int main(
Expand All @@ -46,6 +47,7 @@ int main(
char* xml_file = nullptr;
uint32_t samples = 4;
uint32_t interval = 250;
uint32_t rescan_interval = 0;
std::string magic;

while (arg_count < argc)
Expand Down Expand Up @@ -122,6 +124,16 @@ int main(

xml_file = argv[arg_count];
}
else if (strcmp(argv[arg_count], "--rescan") == 0)
{
if (++arg_count >= argc)
{
std::cout << "--rescan expects a parameter" << std::endl;
return -1;
}

rescan_interval = strtol(argv[arg_count], nullptr, 10);
}
else
{
std::cout << "Wrong argument " << argv[arg_count] << std::endl;
Expand Down
13 changes: 13 additions & 0 deletions test/dds/communication/security/SubscriberMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ using namespace eprosima::fastdds::dds;
* --magic <str>
* --xmlfile <path>
* --publishers <int>
* --die_on_data_received
* --rescan <int>
*/

int main(
Expand All @@ -44,6 +46,7 @@ int main(
uint32_t seed = 7800;
uint32_t samples = 4;
uint32_t publishers = 1;
uint32_t rescan_interval = 0;
char* xml_file = nullptr;
std::string magic;

Expand Down Expand Up @@ -115,6 +118,16 @@ int main(
{
die_on_data_received = true;
}
else if (strcmp(argv[arg_count], "--rescan") == 0)
{
if (++arg_count >= argc)
{
std::cout << "--rescan expects a parameter" << std::endl;
return -1;
}

rescan_interval = strtol(argv[arg_count], nullptr, 10);
}
else
{
std::cout << "Wrong argument " << argv[arg_count] << std::endl;
Expand Down