Skip to content

[15896] Fix selection of output locators#3003

Merged
MiguelCompany merged 15 commits intomasterfrom
bugfix/15839
Oct 13, 2022
Merged

[15896] Fix selection of output locators#3003
MiguelCompany merged 15 commits intomasterfrom
bugfix/15839

Conversation

@MiguelCompany
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany commented Oct 7, 2022

Description

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added.
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Fast DDS test suite has been run locally.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A Documentation builds and tests pass locally.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
…y parent transport.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany changed the title Avoid sending data to locators of non-interested readers Fix selection of output locators Oct 8, 2022
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
…tors selected.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
…ack_nts_.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Copy Markdown
Member Author

@richiprosima Please test this

@MiguelCompany MiguelCompany changed the title Fix selection of output locators [15896] Fix selection of output locators Oct 10, 2022
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Copy Markdown
Member Author

@richiprosima Please test this

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Copy Markdown
Member Author

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 23a788d into master Oct 13, 2022
@MiguelCompany MiguelCompany deleted the bugfix/15839 branch October 13, 2022 12:47
@MiguelCompany
Copy link
Copy Markdown
Member Author

@Mergifyio backport 2.7.x 2.6.x

mergify bot pushed a commit that referenced this pull request Oct 13, 2022
* Refs #15839. Adding test_UDPv4Transport::should_drop_locator.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Adding destination locator filter to test_UDPv4Transport

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid calling filters for packets that will be dropped by parent transport.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubReader.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubWriter.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Regression test added.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before asking on the number of locators selected.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before checking for global gap.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Do not reset locator selector inside deliver_sample_nts.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid reseting locator selector on send_heartbeat_piggyback_nts_.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatelessWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatefulWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Avoid arithmetic overflow on limitation check.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Apply suggestions from code review.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Add local filter for locators.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 23a788d)

# Conflicts:
#	src/cpp/rtps/writer/StatelessWriter.cpp
#	test/blackbox/api/dds-pim/PubSubReader.hpp
#	test/blackbox/api/dds-pim/PubSubWriter.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
mergify bot pushed a commit that referenced this pull request Oct 13, 2022
* Refs #15839. Adding test_UDPv4Transport::should_drop_locator.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Adding destination locator filter to test_UDPv4Transport

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid calling filters for packets that will be dropped by parent transport.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubReader.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubWriter.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Regression test added.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before asking on the number of locators selected.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before checking for global gap.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Do not reset locator selector inside deliver_sample_nts.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid reseting locator selector on send_heartbeat_piggyback_nts_.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatelessWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatefulWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Avoid arithmetic overflow on limitation check.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Apply suggestions from code review.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Add local filter for locators.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 23a788d)

# Conflicts:
#	src/cpp/rtps/writer/StatelessWriter.cpp
#	test/blackbox/api/dds-pim/PubSubReader.hpp
#	test/blackbox/api/dds-pim/PubSubWriter.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 13, 2022

backport 2.7.x 2.6.x

✅ Backports have been created

Details

MiguelCompany added a commit that referenced this pull request Oct 15, 2022
* Fix selection of output locators (#3003)

* Refs #15839. Adding test_UDPv4Transport::should_drop_locator.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Adding destination locator filter to test_UDPv4Transport

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid calling filters for packets that will be dropped by parent transport.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubReader.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubWriter.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Regression test added.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before asking on the number of locators selected.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before checking for global gap.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Do not reset locator selector inside deliver_sample_nts.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid reseting locator selector on send_heartbeat_piggyback_nts_.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatelessWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatefulWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Avoid arithmetic overflow on limitation check.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Apply suggestions from code review.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Add local filter for locators.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 23a788d)

# Conflicts:
#	src/cpp/rtps/writer/StatelessWriter.cpp
#	test/blackbox/api/dds-pim/PubSubReader.hpp
#	test/blackbox/api/dds-pim/PubSubWriter.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp

* Refs #15896. Fix conflicts.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany added a commit that referenced this pull request Oct 15, 2022
* Fix selection of output locators (#3003)

* Refs #15839. Adding test_UDPv4Transport::should_drop_locator.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Adding destination locator filter to test_UDPv4Transport

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid calling filters for packets that will be dropped by parent transport.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubReader.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubWriter.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Regression test added.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before asking on the number of locators selected.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before checking for global gap.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Do not reset locator selector inside deliver_sample_nts.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid reseting locator selector on send_heartbeat_piggyback_nts_.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatelessWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatefulWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Avoid arithmetic overflow on limitation check.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Apply suggestions from code review.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Add local filter for locators.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 23a788d)

# Conflicts:
#	src/cpp/rtps/writer/StatelessWriter.cpp
#	test/blackbox/api/dds-pim/PubSubReader.hpp
#	test/blackbox/api/dds-pim/PubSubWriter.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp

* Refs #15896. Fix conflicts.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants