Skip to content

[23043] Fix ParticipantGenericMessage serialization#5843

Merged
MiguelCompany merged 4 commits intomasterfrom
bugfix/ParticipantGenericMessage-serialization
Jun 6, 2025
Merged

[23043] Fix ParticipantGenericMessage serialization#5843
MiguelCompany merged 4 commits intomasterfrom
bugfix/ParticipantGenericMessage-serialization

Conversation

@juanlofer-eprosima
Copy link
Copy Markdown
Contributor

@juanlofer-eprosima juanlofer-eprosima commented May 30, 2025 •
edited by Carlosespicur
Loading

Description

This PR:

  1. Adds alignment to 4 bytes after creating a change in the SecurityManager.
  2. Fixes the addOctetVector method to properly check if the final padding fits into the message.

@Mergifyio backport 3.2.x 2.14.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
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • 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.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@juanlofer-eprosima juanlofer-eprosima mentioned this pull request May 30, 2025
Merged
cferreiragonz and others added 3 commits June 3, 2025 14:37
@cferreiragonz
Refs #23043: Regression Test
0b9dc77 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@juanlofer-eprosima @cferreiragonz
Refs #23043: Fix ParticipantGenericMessage serialization
f6bbeea 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@cferreiragonz
Refs #23043: Align after calculating serialized size
02b0eea 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz force-pushed the bugfix/ParticipantGenericMessage-serialization branch from b172dff to 02b0eea Compare June 3, 2025 12:54
@cferreiragonz cferreiragonz added this to the v3.2.3 milestone Jun 3, 2025
@cferreiragonz cferreiragonz marked this pull request as ready for review June 3, 2025 13:24
@cferreiragonz cferreiragonz added needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels Jun 3, 2025
@cferreiragonz cferreiragonz requested review from richiprosima and removed request for richiprosima June 3, 2025 13:24
@cferreiragonz
Refs #23043: Uncrustify
35f7614 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz
Copy link
Copy Markdown
Contributor

cferreiragonz commented Jun 4, 2025

CI passed on #02b0eea, although we will relaunch it after review

@Carlosespicur Carlosespicur self-requested a review June 5, 2025 10:20
@MiguelCompany MiguelCompany merged commit 1bf0040 into master Jun 6, 2025
16 of 17 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/ParticipantGenericMessage-serialization branch June 6, 2025 05:54
@MiguelCompany
Copy link
Copy Markdown
Member

MiguelCompany commented Jun 6, 2025

@Mergifyio backport 2.14.x

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 6, 2025 •
edited
Loading

backport 2.14.x

✅ Backports have been created

Details

mergify Bot pushed a commit that referenced this pull request Jun 6, 2025
@juanlofer-eprosima @mergify
Fix ParticipantGenericMessage serialization (#5843)
0ef5c7d 
* Refs #23043: Regression Test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23043: Fix ParticipantGenericMessage serialization

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Refs #23043: Align after calculating serialized size

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23043: Uncrustify

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 1bf0040)

# Conflicts:
#	src/cpp/rtps/security/SecurityManager.cpp
#	test/blackbox/CMakeLists.txt
@mergify mergify Bot mentioned this pull request Jun 6, 2025
Merged
12 tasks
cferreiragonz pushed a commit that referenced this pull request Jun 26, 2025
@juanlofer-eprosima @cferreiragonz
Fix ParticipantGenericMessage serialization (#5843)
0178817 
* Refs #23043: Regression Test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23043: Fix ParticipantGenericMessage serialization

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Refs #23043: Align after calculating serialized size

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23043: Uncrustify

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 1bf0040)

# Conflicts:
#	src/cpp/rtps/security/SecurityManager.cpp
#	test/blackbox/CMakeLists.txt
rsanchez15 pushed a commit that referenced this pull request Jun 27, 2025
@mergify @juanlofer-eprosima @cferreiragonz
Fix ParticipantGenericMessage serialization (backport #5843) (#5855)
c2d4144 
* Fix ParticipantGenericMessage serialization (#5843)

* Refs #23043: Regression Test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23043: Fix ParticipantGenericMessage serialization

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Refs #23043: Align after calculating serialized size

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #23043: Uncrustify

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 1bf0040)

# Conflicts:
#	src/cpp/rtps/security/SecurityManager.cpp
#	test/blackbox/CMakeLists.txt

* Fix Conflicts

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: juanlofer-eprosima <88179026+juanlofer-eprosima@users.noreply.github.com>
Co-authored-by: cferreiragonz <carlosferreira@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Carlosespicur Carlosespicur Awaiting requested review from Carlosespicur

Assignees

No one assigned

Labels

ci-pending PR which CI is running needs-review PR that is ready to be reviewed

Projects

None yet

Milestone

v3.2.3 - Frozen ❄️

Development

Successfully merging this pull request may close these issues.

4 participants

@juanlofer-eprosima @cferreiragonz @MiguelCompany @Carlosespicur