Skip to content

add libc::IP6T_SO_ORIGINAL_DST to socket opt#1490

Merged
bors[bot] merged 2 commits intonix-rust:masterfrom
bearice:master
Aug 18, 2021
Merged

add libc::IP6T_SO_ORIGINAL_DST to socket opt#1490
bors[bot] merged 2 commits intonix-rust:masterfrom
bearice:master

Conversation

@bearice
Copy link
Copy Markdown
Contributor

@bearice bearice commented Aug 11, 2021

the original PR #1410 was stalled for a while
let's make it happen.

this should closes #1410 and #938

@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 14, 2021

What does that sockopt do, anyway? I can't find it in any man pages.

@bearice
Copy link
Copy Markdown
Contributor Author

bearice commented Aug 14, 2021

It's an IPv6 version of SO_ORIGINAL_DST

According to rust-lang/libc#1650 it has same value with SO_ORIGINAL_DST, but when used with SOL_IPV6, it returns a sockaddr_in6 instead of a sockaddr_in

Copy link
Copy Markdown
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

bors bot added a commit that referenced this pull request Aug 18, 2021
1490: add libc::IP6T_SO_ORIGINAL_DST to socket opt r=asomers a=bearice

the original PR #1410 was stalled for a while
let's make it happen.

this should closes #1410 and #938

Co-authored-by: Icemic <bingfeng.web@gmail.com>
Co-authored-by: Bearice Ren <bearice@icybear.net>
@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 18, 2021

bors is confused. It doesn't realize that the iOS and OSX builds have finished. Let's start over.

bors r-

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Aug 18, 2021

Canceled.

@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 18, 2021

bors r+

bors bot added a commit that referenced this pull request Aug 18, 2021
1490: add libc::IP6T_SO_ORIGINAL_DST to socket opt r=asomers a=bearice

the original PR #1410 was stalled for a while
let's make it happen.

this should closes #1410 and #938

Co-authored-by: Icemic <bingfeng.web@gmail.com>
Co-authored-by: Bearice Ren <bearice@icybear.net>
@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 18, 2021

bors r-

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Aug 18, 2021

Canceled.

@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 18, 2021

bors r+

bors bot added a commit that referenced this pull request Aug 18, 2021
1486: Relax assertions in sockaddr_storage_to_addr to match the documentation. r=asomers a=khuey

Fixes #1479

1490: add libc::IP6T_SO_ORIGINAL_DST to socket opt r=asomers a=bearice

the original PR #1410 was stalled for a while
let's make it happen.

this should closes #1410 and #938

1493: Fix crates.io badge r=asomers a=atouchet



Co-authored-by: Kyle Huey <khuey@kylehuey.com>
Co-authored-by: Icemic <bingfeng.web@gmail.com>
Co-authored-by: Bearice Ren <bearice@icybear.net>
Co-authored-by: Alex Touchet <alextouchet@outlook.com>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Aug 18, 2021

This PR was included in a batch that timed out, it will be automatically retried

bors bot added a commit that referenced this pull request Aug 18, 2021
1490: add libc::IP6T_SO_ORIGINAL_DST to socket opt r=asomers a=bearice

the original PR #1410 was stalled for a while
let's make it happen.

this should closes #1410 and #938

1493: Fix crates.io badge r=asomers a=atouchet



Co-authored-by: Icemic <bingfeng.web@gmail.com>
Co-authored-by: Bearice Ren <bearice@icybear.net>
Co-authored-by: Alex Touchet <alextouchet@outlook.com>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Aug 18, 2021

This PR was included in a batch that timed out, it will be automatically retried

bors bot added a commit that referenced this pull request Aug 18, 2021
1490: add libc::IP6T_SO_ORIGINAL_DST to socket opt r=asomers a=bearice

the original PR #1410 was stalled for a while
let's make it happen.

this should closes #1410 and #938

Co-authored-by: Icemic <bingfeng.web@gmail.com>
Co-authored-by: Bearice Ren <bearice@icybear.net>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Aug 18, 2021

Timed out.

@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 18, 2021

bors retry

@bors bors bot merged commit 7207004 into nix-rust:master Aug 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants