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

unbreak OpenBSD after #3714 by properly define RTF_FMASK #3970

Merged
merged 1 commit into from
Oct 16, 2024
Merged

unbreak OpenBSD after #3714 by properly define RTF_FMASK #3970

merged 1 commit into from
Oct 16, 2024

Conversation

semarie
Copy link
Contributor

@semarie semarie commented Oct 15, 2024

Fix RTF_FMASK on OpenBSD. It seems the value used is due to some bad parser.

/* mask of RTF flags that are allowed to be modified by RTM_CHANGE */
#define RTF_FMASK       \
    (RTF_LLINFO | RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \
     RTF_REJECT | RTF_STATIC | RTF_MPLS | RTF_BFD)

@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@semarie
Copy link
Contributor Author

semarie commented Oct 16, 2024

r? @tgross35

@rustbot rustbot assigned tgross35 and unassigned JohnTitor Oct 16, 2024
@semarie
Copy link
Contributor Author

semarie commented Oct 16, 2024

the freebsd-15 CI failure is unrelated (Agent is not responding!)

@tgross35
Copy link
Contributor

tgross35 commented Oct 16, 2024 •
edited
Loading

@tesuji could you double check this since you authored #3714?

the freebsd-15 CI failure is unrelated (Agent is not responding!)

If you rebase it should go away, we recently disabled that CI.

@tgross35 tgross35 mentioned this pull request Oct 16, 2024
Merged
@tesuji
Copy link
Contributor

tesuji commented Oct 16, 2024

It seems the value used is due to some bad parser.

I used regex that greps for one-line only. Thanks for noticing and fixing this.

@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Oct 16, 2024
tgross35
tgross35 approved these changes Oct 16, 2024
View reviewed changes
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks all, lgtm

@tgross35 tgross35 added this pull request to the merge queue Oct 16, 2024
Merged via the queue into rust-lang:main with commit c988312 Oct 16, 2024
40 of 41 checks passed
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Oct 16, 2024
@semarie @tgross35
unbreak OpenBSD after rust-lang#3714 by properly define RTF_FMASK
34d3ce3 
(backport <rust-lang#3970>)
(cherry picked from commit dbe4b8b)
@tgross35 tgross35 mentioned this pull request Oct 16, 2024
Merged
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tesuji tesuji tesuji approved these changes

@tgross35 tgross35 tgross35 approved these changes

Assignees

@tgross35 tgross35

Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@semarie @rustbot @tgross35 @tesuji @JohnTitor