Add socket options for IP_TRANSPARENT / BIND_ANY #835
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
justinlatimer
force-pushed
the
sockopt-transparent
branch
from
76052a4 to
105b899
Compare
|
Thanks for the patch! You'll need to rebase to fix the conflict. After that, I'll merge it. |
justinlatimer
force-pushed
the
sockopt-transparent
branch
from
105b899 to
37dea7b
Compare
|
Rebased, thanks! |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Jan 11, 2018
835: Add socket options for IP_TRANSPARENT / BIND_ANY r=asomers a=justinlatimer Add socket options for implementing a transparent proxy. Sources: [Linux](https://www.kernel.org/doc/Documentation/networking/tproxy.txt) [OpenBSD](https://man.openbsd.org/setsockopt.2#SO_BINDANY) [FreeBSD](https://www.freebsd.org/cgi/man.cgi?query=ip&manpath=FreeBSD+11.1-RELEASE) Thanks!
Build failed |
|
bors retry |
Susurrus
suggested changes
Jan 11, 2018
src/sys/socket/sockopt.rs
Outdated
| @@ -179,6 +179,12 @@ sockopt_impl!(GetOnly, AcceptConn, libc::SOL_SOCKET, libc::SO_ACCEPTCONN, bool); | |||
| #[cfg(any(target_os = "linux", target_os = "android"))] | |||
| sockopt_impl!(GetOnly, OriginalDst, libc::SOL_IP, libc::SO_ORIGINAL_DST, libc::sockaddr_in); | |||
| sockopt_impl!(Both, ReceiveTimestamp, libc::SOL_SOCKET, libc::SO_TIMESTAMP, bool); | |||
| #[cfg(any(target_os = "linux", target_os = "android"))] | |||
There was a problem hiding this comment.
Targets should be listed alphabetically. Android should be before Linux on this line
justinlatimer
force-pushed
the
sockopt-transparent
branch
from
37dea7b to
c429517
Compare
justinlatimer
force-pushed
the
sockopt-transparent
branch
from
c429517 to
92cac27
Compare
|
@Susurrus - targets reordered (did a bunch in the file to trigger travis rebuilds) - Thanks! |
|
Anything else I need to do on this one? |
Susurrus
approved these changes
Jan 19, 2018
|
Now we're just waiting on Travis CI to get it's Mac builders back under control before we can merge. |
|
Travis should be ok now. bors r+ |
bors bot
added a commit
that referenced
this pull request
Jan 26, 2018
835: Add socket options for IP_TRANSPARENT / BIND_ANY r=asomers a=justinlatimer Add socket options for implementing a transparent proxy. Sources: [Linux](https://www.kernel.org/doc/Documentation/networking/tproxy.txt) [OpenBSD](https://man.openbsd.org/setsockopt.2#SO_BINDANY) [FreeBSD](https://www.freebsd.org/cgi/man.cgi?query=ip&manpath=FreeBSD+11.1-RELEASE) Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add socket options for implementing a transparent proxy.
Sources:
Linux
OpenBSD
FreeBSD
Thanks!