Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[19347] Fix encapsulation format in WLP #3784

Merged
merged 10 commits into from
Aug 7, 2023
Merged

[19347] Fix encapsulation format in WLP #3784

merged 10 commits into from
Aug 7, 2023

Conversation

EduPonz
Copy link

@EduPonz EduPonz commented Aug 4, 2023 •
edited by MiguelCompany
Loading

Description

As #3782 points out, the encapsulation used for the ParticipantMessageData messages within the WLP was not correctly set. This PR:

@Mergifyio backport 2.11.x 2.10.x 2.6.x

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; the added tests pass locally
  • Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • 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.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@EduPonz
Refs #19347: Fix encapsulation format in WLP. Improve WLP checks
42a9ff8 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Refs #19347: Correctly set CDR endianess for BE
7c35195 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz EduPonz added this to the v2.12.0 milestone Aug 4, 2023
@EduPonz EduPonz mentioned this pull request Aug 4, 2023
Closed
1 task
@EduPonz
Refs #19347: Uncrustify
fbddf91 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Refs #19347: Fix doxygen
8cbdaab 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Copy link
Author

EduPonz commented Aug 4, 2023

@richiprosima please test this

@EduPonz
Copy link
Author

EduPonz commented Aug 4, 2023

@richiprosima please test mac

MiguelCompany
MiguelCompany requested changes Aug 4, 2023
View reviewed changes
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
@EduPonz
Refs #19347: Apply suggestions
f33debf 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Copy link
Author

EduPonz commented Aug 5, 2023

@richiprosima please test this

@EduPonz
Refs #19347: Fix Windows warning
ed13e81 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Copy link
Author

EduPonz commented Aug 5, 2023

@richiprosima please test this

MiguelCompany
MiguelCompany requested changes Aug 7, 2023
View reviewed changes
include/fastdds/rtps/builtin/liveliness/WLPListener.h Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/builtin/liveliness/WLPListener.cpp Outdated Show resolved Hide resolved
@EduPonz
Refs #19347: Apply suggestions
5c1e653 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Refs #19347: Correct condition when setting the payload encapsulation
ee6b6cd 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Refs #19347: Remove legacy typedef
4d3f784 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Refs #19347: Initialize uint32_t variable
be4e5bb 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Aug 7, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@EduPonz EduPonz merged commit 3a83d7c into master Aug 7, 2023
2 checks passed
@EduPonz EduPonz deleted the bugfix/wlp_encapsulation branch August 7, 2023 19:58
@EduPonz
Copy link
Author

EduPonz commented Aug 7, 2023

@Mergifyio backport 2.11.x 2.10.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Aug 7, 2023 •
edited
Loading

backport 2.11.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Aug 7, 2023
@EduPonz @mergify
Fix encapsulation format in WLP (#3784)
d5edd5e 
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 3a83d7c)
@mergify mergify bot mentioned this pull request Aug 7, 2023
Merged
mergify bot pushed a commit that referenced this pull request Aug 7, 2023
@EduPonz @mergify
Fix encapsulation format in WLP (#3784)
ffd7215 
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 3a83d7c)
@mergify mergify bot mentioned this pull request Aug 7, 2023
Merged
@mergify mergify bot mentioned this pull request Aug 7, 2023
Merged
EduPonz added a commit that referenced this pull request Aug 7, 2023
@EduPonz
Fix encapsulation format in WLP (#3784)
98fb3b9 
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 3a83d7c)

# Conflicts:
#	src/cpp/rtps/builtin/liveliness/WLPListener.cpp
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
EduPonz added a commit that referenced this pull request Aug 11, 2023
@mergify @EduPonz
Fix encapsulation format in WLP (#3784) (#3789)
8c30ac3 
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 3a83d7c)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
EduPonz added a commit that referenced this pull request Aug 14, 2023
@mergify @EduPonz
Fix encapsulation format in WLP (#3784) (#3788)
09e13fe 
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 3a83d7c)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
jimwang118 pushed a commit to jimwang118/Fast-DDS that referenced this pull request Aug 22, 2023
@EduPonz @jimwang118
Fix encapsulation format in WLP (eProsima#3784)
aa15d04 
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
EduPonz added a commit that referenced this pull request Oct 24, 2023
@mergify @EduPonz
Fix encapsulation format in WLP (backport #3784) (#3790)
df6eecb 
* Fix encapsulation format in WLP (#3784)

* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 3a83d7c)

# Conflicts:
#	src/cpp/rtps/builtin/liveliness/WLPListener.cpp
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix conflicts

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v2.12.0
Development

Successfully merging this pull request may close these issues.

[19347] Wrong encapsulation in ParticipantMessageData header
2 participants
@EduPonz @MiguelCompany