socket `set_mark` addition. #96334

devnexen · 2022-04-23T10:07:33Z

to be able to set a marker/id on the socket for network filtering
(iptables/ipfw here) purpose.

rust-highfive · 2022-04-23T10:07:35Z

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs to request review from a libs-api team reviewer. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

rust-highfive · 2022-04-23T10:07:36Z

r? @thomcc

(rust-highfive has picked a reviewer for you, use r? to override)

thomcc · 2022-04-23T18:34:33Z

r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs

dtolnay

This seems okay to me. Needs documentation and a tracking issue; I assume that's why the PR is still marked Draft.

devnexen · 2022-04-27T04:46:24Z

Not only that but waited to see if the idea itself would get traction. ok will do these.

JohnCSimon · 2022-06-18T23:01:55Z

ping from triage:
@devnexen
Can you post the status of this PR?

FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.

devnexen · 2022-06-18T23:05:03Z

@rustbot ready

dtolnay · 2022-07-06T17:22:21Z

library/std/src/os/unix/net/datagram.rs

+    /// Set the id of the socket for network filtering purpose
+    /// and is only a setter.


It's not clear to me what useful information "and is only a setter" is meant to convey here. Can this sentence be just the following?—

Set the id of the socket for network filtering purposes.

dtolnay · 2022-07-06T17:23:00Z

library/std/src/os/unix/net/datagram.rs

+    /// fn main() -> std::io::Result<()> {
+    ///     let sock = UnixDatagram::unbound()?;
+    ///     sock.set_mark(32 as u32).expect("set_mark function failed");


It's odd to see expect here in a function that returns io::Result anyway. How about returning the error?

Suggested change

/// fn main() -> std::io::Result<()> {

/// let sock = UnixDatagram::unbound()?;

/// sock.set_mark(32 as u32).expect("set_mark function failed");

/// fn main() -> std::io::Result<()> {

/// let sock = UnixDatagram::unbound()?;

/// sock.set_mark(32 as u32)?;

dtolnay · 2022-07-06T17:23:39Z

library/std/src/os/unix/net/datagram.rs

+    /// }
+    /// ```
+    #[cfg(any(doc, target_os = "linux", target_os = "freebsd", target_os = "openbsd",))]
+    #[unstable(feature = "unix_set_mark", issue = "none")]


Thanks for opening the tracking issue. You need to put the issue number here inside the issue attribute. Check out the other unstable attributes in this file.

Same applies to the other new unstable attribute below.

dtolnay · 2022-07-06T17:24:13Z

library/std/src/os/unix/net/stream.rs

+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let sock = UnixStream::connect("/tmp/sock")?;
+    ///     sock.set_mark(32 as u32).expect("set_mark function failed");


32 as u32 is redundant. This can just be sock.set_mark(32) and the integer will be of type u32 automatically.

dtolnay · 2022-07-06T17:33:51Z

library/std/src/sys/unix/net.rs

+    #[cfg(target_os = "linux")]
+    pub fn set_mark(&self, mark: u32) -> io::Result<()> {
+        setsockopt(self, libc::SOL_SOCKET, libc::SO_MARK, mark as libc::c_int)
+    }
+
+    #[cfg(target_os = "freebsd")]
+    pub fn set_mark(&self, mark: u32) -> io::Result<()> {
+        setsockopt(self, libc::SOL_SOCKET, libc::SO_USER_COOKIE, mark)
+    }
+
+    #[cfg(target_os = "openbsd")]
+    pub fn set_mark(&self, mark: u32) -> io::Result<()> {
+        setsockopt(self, libc::SOL_SOCKET, libc::SO_RTABLE, mark as libc::c_int)
+    }


The signature is identical across all of these platforms, and the implementation is nearly identical. How about deduplicating it this way?—

pub fn set_mark(&self, mark: u32) -> io::Result<()> { #[cfg(target_os = "linux")] let option = libc::SO_MARK; #[cfg(target_os = "linux")] let option = libc::SO_USER_COOKIE; #[cfg(target_os = "linux")] let option = libc::SO_RTABLE; setsockopt(self, libc::SOL_SOCKET, option, mark as libc::c_int) }

or maybe this:

pub fn set_mark(&self, mark: u32) -> io::Result<()> { setsockopt( self, libc::SOL_SOCKET, #[cfg(target_os = "linux")] libc::SO_MARK, #[cfg(target_os = "freebsd")] libc::SO_USER_COOKIE, #[cfg(target_os = "openbsd")] libc::SO_RTABLE, mark as libc::c_int, ) }

JohnCSimon · 2022-08-13T16:05:10Z

@devnexen devnexen requested a review from dtolnay last month

Triage:
@devnexen I'm assuming you meant for this to be ready for review

FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.

@rustbot ready

dtolnay

Thanks!

dtolnay · 2022-08-26T22:07:32Z

@bors r+

bors · 2022-08-26T22:07:33Z

📌 Commit f6efb0b has been approved by dtolnay

It is now in the queue for this repository.

socket `set_mark` addition. to be able to set a marker/id on the socket for network filtering (iptables/ipfw here) purpose.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#94890 (Support parsing IP addresses from a byte string) - rust-lang#96334 (socket `set_mark` addition.) - rust-lang#99027 (Replace `Body::basic_blocks()` with field access) - rust-lang#100437 (Improve const mismatch `FulfillmentError`) - rust-lang#100843 (Migrate part of rustc_infer to session diagnostic) - rust-lang#100897 (extra sanity check against consts pointing to mutable memory) - rust-lang#100959 (translations: rename warn_ to warning) - rust-lang#101111 (Use the declaration's SourceInfo for FnEntry retags, not the outermost) - rust-lang#101116 ([rustdoc] Remove Attrs type alias) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Apr 23, 2022

rust-highfive assigned thomcc Apr 23, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2022

rust-highfive assigned dtolnay and unassigned thomcc Apr 23, 2022

rustbot added T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. and removed T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 23, 2022

dtolnay requested changes Apr 27, 2022

View reviewed changes

dtolnay added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 27, 2022

devnexen mentioned this pull request Apr 27, 2022

Tracking Issue for socket set_mark #96467

Open

3 tasks

devnexen force-pushed the socket_mark branch from 2496740 to 807b8b7 Compare April 27, 2022 05:03

devnexen marked this pull request as ready for review April 27, 2022 05:03

This comment has been minimized.

Sign in to view

devnexen force-pushed the socket_mark branch from 807b8b7 to dd8315d Compare May 13, 2022 20:34

This comment has been minimized.

Sign in to view

devnexen force-pushed the socket_mark branch from dd8315d to 1077e03 Compare May 14, 2022 11:55

This comment has been minimized.

Sign in to view

devnexen force-pushed the socket_mark branch 2 times, most recently from d9b1a9e to 57024fb Compare May 14, 2022 13:39

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 18, 2022

dtolnay requested changes Jul 6, 2022

View reviewed changes

dtolnay removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 6, 2022

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 7, 2022

Fix doc build on unsupported oses

f6efb0b

devnexen requested a review from dtolnay July 7, 2022 14:02

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 13, 2022

dtolnay approved these changes Aug 26, 2022

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 26, 2022

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 28, 2022

Rollup merge of rust-lang#96334 - devnexen:socket_mark, r=dtolnay

2aaad84

socket `set_mark` addition. to be able to set a marker/id on the socket for network filtering (iptables/ipfw here) purpose.

Dylan-DPC mentioned this pull request Aug 28, 2022

Rollup of 8 pull requests #101124

Closed

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 28, 2022

Rollup merge of rust-lang#96334 - devnexen:socket_mark, r=dtolnay

af4cb05

socket `set_mark` addition. to be able to set a marker/id on the socket for network filtering (iptables/ipfw here) purpose.

Dylan-DPC mentioned this pull request Aug 28, 2022

Rollup of 9 pull requests #101128

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022

Rollup merge of rust-lang#96334 - devnexen:socket_mark, r=dtolnay

830d518

socket `set_mark` addition. to be able to set a marker/id on the socket for network filtering (iptables/ipfw here) purpose.

matthiaskrgr mentioned this pull request Aug 28, 2022

Rollup of 12 pull requests #101132

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022

Rollup merge of rust-lang#96334 - devnexen:socket_mark, r=dtolnay

d04e698

socket `set_mark` addition. to be able to set a marker/id on the socket for network filtering (iptables/ipfw here) purpose.

matthiaskrgr mentioned this pull request Aug 28, 2022

Rollup of 11 pull requests #101136

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022

Rollup merge of rust-lang#96334 - devnexen:socket_mark, r=dtolnay

8a3fb8e

socket `set_mark` addition. to be able to set a marker/id on the socket for network filtering (iptables/ipfw here) purpose.

matthiaskrgr mentioned this pull request Aug 28, 2022

Rollup of 10 pull requests #101137

Closed

matthiaskrgr mentioned this pull request Aug 29, 2022

Rollup of 9 pull requests #101143

Merged

bors merged commit a96b44c into rust-lang:master Aug 29, 2022

rustbot added this to the 1.65.0 milestone Aug 29, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

socket `set_mark` addition. #96334

socket `set_mark` addition. #96334

devnexen commented Apr 23, 2022

rust-highfive commented Apr 23, 2022

rust-highfive commented Apr 23, 2022

thomcc commented Apr 23, 2022

dtolnay left a comment

devnexen commented Apr 27, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

JohnCSimon commented Jun 18, 2022

devnexen commented Jun 18, 2022

dtolnay Jul 6, 2022

dtolnay Jul 6, 2022

dtolnay Jul 6, 2022

dtolnay Jul 6, 2022

dtolnay Jul 6, 2022

JohnCSimon commented Aug 13, 2022

dtolnay left a comment

dtolnay commented Aug 26, 2022

bors commented Aug 26, 2022

		/// Set the id of the socket for network filtering purpose
		/// and is only a setter.

socket set_mark addition. #96334

socket set_mark addition. #96334

Conversation

devnexen commented Apr 23, 2022

rust-highfive commented Apr 23, 2022

rust-highfive commented Apr 23, 2022

thomcc commented Apr 23, 2022

dtolnay left a comment

Choose a reason for hiding this comment

devnexen commented Apr 27, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

JohnCSimon commented Jun 18, 2022

devnexen commented Jun 18, 2022

dtolnay Jul 6, 2022

Choose a reason for hiding this comment

dtolnay Jul 6, 2022

Choose a reason for hiding this comment

dtolnay Jul 6, 2022

Choose a reason for hiding this comment

dtolnay Jul 6, 2022

Choose a reason for hiding this comment

dtolnay Jul 6, 2022

Choose a reason for hiding this comment

JohnCSimon commented Aug 13, 2022

dtolnay left a comment

Choose a reason for hiding this comment

dtolnay commented Aug 26, 2022

bors commented Aug 26, 2022

socket `set_mark` addition. #96334

socket `set_mark` addition. #96334