Skip to content

Conversation

MaxF12
Copy link
Contributor

@MaxF12 MaxF12 commented Apr 12, 2022

Closes #2753

@rust-highfive
Copy link

Some changes occurred in solarish module

cc @jclulow,@pfmooney

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Amanieu (or someone else) soon.

Please see the contribution instructions for more information.

Comment on lines 1773 to 1776
pub const IP_ADD_SOURCE_MEMBERSHIP: ::c_int = 70;
pub const IP_DROP_SOURCE_MEMBERSHIP: ::c_int = 71;
pub const IP_BLOCK_SOURCE: ::c_int = 72;
pub const IP_UNBLOCK_SOURCE: ::c_int = 73;
Copy link
Contributor

Choose a reason for hiding this comment

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

These are not the correct values for illumos (and presumably Solaris) and cause test failures:

bad IP_ADD_SOURCE_MEMBERSHIP value at byte 0: rust: 70 (0x46) != c 23 (0x17)
bad IP_DROP_SOURCE_MEMBERSHIP value at byte 0: rust: 71 (0x47) != c 24 (0x18)
bad IP_BLOCK_SOURCE value at byte 0: rust: 72 (0x48) != c 21 (0x15)
bad IP_UNBLOCK_SOURCE value at byte 0: rust: 73 (0x49) != c 22 (0x16)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, should be fixed now

Copy link
Contributor

Choose a reason for hiding this comment

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

Tests pass now. Thanks

@Amanieu
Copy link
Member

Amanieu commented Apr 12, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Apr 12, 2022

📌 Commit e7efff4 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Apr 12, 2022

⌛ Testing commit e7efff4 with merge dff5aca...

@bors
Copy link
Contributor

bors commented Apr 12, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing dff5aca to master...

@bors bors merged commit dff5aca into rust-lang:master Apr 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add IP_ADD_MEMBERSHIP_SOURCE, IP_DROP_SOURCE_MEMBERSHIP(sockops) and ip_mreq_source(struct)
5 participants