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.

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

Fix: mac address overflow on windows (backport #3983) #4019

Merged
merged 1 commit into from
Dec 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 14, 2023

This is an automatic backport of pull request #3983 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot mentioned this pull request Nov 14, 2023
13 tasks
@JesusPoderoso JesusPoderoso added this to the v2.11.3 milestone Nov 14, 2023
@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Nov 14, 2023
@cferreiragonz
Copy link
Contributor

@Mergifyio rebase

* Fix: mac address overflow on windows

PIP_ADAPTER_ADDRESSES->PhysicalAddressLength will get max up to 8 bytes, but we have only 6 bytes for mac address.
In some case, GetAdaptersAddresses() will report address with PhysicalAddressLength=8, e.g. "Microsoft Teredo Tunneling Adapter", which will cause crash at DomainParticipantFactory::create_participant()

Signed-off-by: [email protected] <[email protected]>
Signed-off-by: Fei Chong <[email protected]>

* Fix build error due to windows `min` macro

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: [email protected] <[email protected]>
Signed-off-by: Fei Chong <[email protected]>
Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 2601e95)
Copy link
Contributor Author

mergify bot commented Dec 5, 2023

rebase

✅ Branch has been successfully rebased

@cferreiragonz
Copy link
Contributor

@richiprosima please test this

@cferreiragonz
Copy link
Contributor

@richiprosima please test windows

@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Dec 10, 2023
@EduPonz EduPonz merged commit b70bdfc into 2.11.x Dec 11, 2023
12 of 13 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.11.x/pr-3983 branch December 11, 2023 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants