adding tcp_info struct to linux musl/glibc. #3480

devnexen · 2023-12-15T10:52:29Z

No description provided.

rustbot · 2023-12-15T10:52:34Z

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

JohnTitor · 2023-12-15T14:33:43Z

@bors r+

bors · 2023-12-15T14:33:45Z

📌 Commit 89df119 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-12-15T16:09:57Z

⌛ Testing commit 89df119 with merge 28aeb23...

adding tcp_info struct to linux musl/glibc.

bors · 2023-12-15T16:18:46Z

💔 Test failed - checks-actions

bors · 2023-12-19T12:29:03Z

☔ The latest upstream changes (presumably #3486) made this pull request unmergeable. Please resolve the merge conflicts.

JohnTitor · 2023-12-20T13:41:15Z

@bors r+

bors · 2023-12-20T13:41:17Z

📌 Commit 97a839d has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-12-20T14:32:01Z

⌛ Testing commit 97a839d with merge 3c6c040...

adding tcp_info struct to linux musl/glibc.

bors · 2023-12-20T14:49:24Z

💔 Test failed - checks-actions

JohnTitor · 2023-12-24T00:29:53Z

Could you check the CI failure? Seems musl gets confused 🤔

JohnTitor · 2023-12-29T01:14:12Z

@bors r+

bors · 2023-12-29T01:14:14Z

📌 Commit 4234bd2 has been approved by JohnTitor

It is now in the queue for this repository.

devnexen · 2024-09-01T07:07:55Z

@rustbot review

tgross35 · 2024-09-03T04:44:33Z

src/unix/linux_like/linux/musl/mod.rs

+        pub tcpi_backoff: u8,
+        pub tcpi_options: u8,
+        /*
+         * FIXME: when musl headers are more up to date


Suggested change

* FIXME: when musl headers are more up to date

* FIXME(musl): when musl headers are more up to date

Just so we can grep these things easy at the musl update

tgross35 · 2024-09-03T04:44:39Z

src/unix/linux_like/linux/musl/mod.rs

+        pub tcpi_bytes_retrans: u64,
+        pub tcpi_dsack_dups: u32,
+        pub tcpi_reord_seen: u32,
+        // FIXME: to uncomment once CI musl is updated


Suggested change

// FIXME: to uncomment once CI musl is updated

// FIXME(musl): to uncomment once CI musl is updated

Same as above

tgross35 · 2024-09-03T04:50:14Z

src/unix/linux_like/linux/gnu/mod.rs

+        // bitfields 4
+        pub tcpi_snd_wscale: u8,
+        // bitfields 4
+        pub tcpi_rcv_wscale: u8,


The C header has these as

uint8_t tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;

doesn't that mean tcpi_snd_wscale and tcpi_rcv_wscale are located within the same u8, and should be a single field in the Rust struct? Feel free to correct me if this is wrong.

I was trying to find what we do here in other cases, but it looks like this doesn't come up very often. Probably just make it one field and add a comment so users know:

/// The bitfield containing `tcpi_snd_wscale` and `tcpi_rcv_wscale`, four bits each. pub tcpi_snd_rcv_wscale: u8

The musl section that is commented out should probably say something similar.

tgross35 · 2024-09-03T04:56:26Z

Checking headers https://github.com/kraj/glibc/blob/1927f718fcc48bdaea03086bdc2adf11279d655b/sysdeps/gnu/netinet/tcp.h#L226-L267 and https://github.com/kraj/musl/blob/2c41ee96f60074fa8ac387e1fcdedba0654fb173/include/netinet/tcp.h#L195-L250 this looks good, with some notes above.

@rustbot author since I think this might need a change for the bitfield

src/unix/linux_like/linux/gnu/mod.rs

src/unix/linux_like/linux/musl/mod.rs

tgross35 · 2024-09-03T19:29:51Z

Thanks!

@rustbot label +stable-nominated

(backport <rust-lang#3480>) (cherry picked from commit ee0bf57)

rustbot assigned JohnTitor Dec 15, 2023

rustbot added the S-waiting-on-review label Dec 15, 2023

JohnTitor approved these changes Dec 15, 2023

View reviewed changes

bors added S-waiting-on-bors and removed S-waiting-on-review labels Dec 15, 2023

bors added a commit that referenced this pull request Dec 15, 2023

Auto merge of #3480 - devnexen:tcp_info_linux, r=JohnTitor

28aeb23

adding tcp_info struct to linux musl/glibc.

bors added S-waiting-on-review and removed S-waiting-on-bors labels Dec 15, 2023

devnexen force-pushed the tcp_info_linux branch from 89df119 to 719d94b Compare December 15, 2023 16:33

devnexen force-pushed the tcp_info_linux branch from 719d94b to 97a839d Compare December 19, 2023 14:09

bors added S-waiting-on-bors and removed S-waiting-on-review labels Dec 20, 2023

bors added a commit that referenced this pull request Dec 20, 2023

Auto merge of #3480 - devnexen:tcp_info_linux, r=JohnTitor

3c6c040

adding tcp_info struct to linux musl/glibc.

bors added S-waiting-on-review and removed S-waiting-on-bors labels Dec 20, 2023

devnexen force-pushed the tcp_info_linux branch from 97a839d to 4234bd2 Compare December 24, 2023 12:28

bors removed the S-waiting-on-review label Dec 29, 2023

devnexen force-pushed the tcp_info_linux branch from 5986fc0 to b20092b Compare August 29, 2024 12:10

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Sep 1, 2024

tgross35 reviewed Sep 3, 2024

View reviewed changes

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Sep 3, 2024

devnexen force-pushed the tcp_info_linux branch from b20092b to 8e362bd Compare September 3, 2024 17:42

tgross35 reviewed Sep 3, 2024

View reviewed changes

src/unix/linux_like/linux/gnu/mod.rs Outdated Show resolved Hide resolved

src/unix/linux_like/linux/musl/mod.rs Outdated Show resolved Hide resolved

src/unix/linux_like/linux/musl/mod.rs Outdated Show resolved Hide resolved

adding tcp_info struct to linux musl/glibc.

ee0bf57

devnexen force-pushed the tcp_info_linux branch from 8e362bd to ee0bf57 Compare September 3, 2024 19:05

tgross35 approved these changes Sep 3, 2024

View reviewed changes

rustbot added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Sep 3, 2024

tgross35 enabled auto-merge September 3, 2024 19:29

tgross35 added S-waiting-on-ci and removed S-waiting-on-author labels Sep 3, 2024

tgross35 added this pull request to the merge queue Sep 3, 2024

Merged via the queue into rust-lang:main with commit 2899529 Sep 3, 2024
41 checks passed

This was referenced Sep 3, 2024

adding a handful of linux fanotify data types. #3695

Merged

Add all definitions from linux/ptp-clock.h #3865

Open

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Oct 15, 2024

adding tcp_info struct to linux musl/glibc.

a5adc5f

(backport <rust-lang#3480>) (cherry picked from commit ee0bf57)

tgross35 mentioned this pull request Oct 15, 2024

[0.2] backports #3966

Merged

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Oct 15, 2024

adding tcp_info struct to linux musl/glibc.

4da0c1c

(backport <rust-lang#3480>) (cherry picked from commit ee0bf57)

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 15, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adding tcp_info struct to linux musl/glibc. #3480

adding tcp_info struct to linux musl/glibc. #3480

devnexen commented Dec 15, 2023

rustbot commented Dec 15, 2023

JohnTitor commented Dec 15, 2023

bors commented Dec 15, 2023

bors commented Dec 15, 2023

bors commented Dec 15, 2023

bors commented Dec 19, 2023

JohnTitor commented Dec 20, 2023

bors commented Dec 20, 2023

bors commented Dec 20, 2023

bors commented Dec 20, 2023

JohnTitor commented Dec 24, 2023

JohnTitor commented Dec 29, 2023

bors commented Dec 29, 2023

devnexen commented Sep 1, 2024

tgross35 Sep 3, 2024

tgross35 Sep 3, 2024

tgross35 Sep 3, 2024 •

edited

Loading

tgross35 Sep 3, 2024

tgross35 commented Sep 3, 2024 •

edited

Loading

tgross35 commented Sep 3, 2024

	* FIXME: when musl headers are more up to date
	* FIXME(musl): when musl headers are more up to date

	// FIXME: to uncomment once CI musl is updated
	// FIXME(musl): to uncomment once CI musl is updated

adding tcp_info struct to linux musl/glibc. #3480

adding tcp_info struct to linux musl/glibc. #3480

Conversation

devnexen commented Dec 15, 2023

rustbot commented Dec 15, 2023

JohnTitor commented Dec 15, 2023

bors commented Dec 15, 2023

bors commented Dec 15, 2023

bors commented Dec 15, 2023

bors commented Dec 19, 2023

JohnTitor commented Dec 20, 2023

bors commented Dec 20, 2023

bors commented Dec 20, 2023

bors commented Dec 20, 2023

JohnTitor commented Dec 24, 2023

JohnTitor commented Dec 29, 2023

bors commented Dec 29, 2023

devnexen commented Sep 1, 2024

tgross35 Sep 3, 2024

Choose a reason for hiding this comment

tgross35 Sep 3, 2024

Choose a reason for hiding this comment

tgross35 Sep 3, 2024 • edited Loading

Choose a reason for hiding this comment

tgross35 Sep 3, 2024

Choose a reason for hiding this comment

tgross35 commented Sep 3, 2024 • edited Loading

tgross35 commented Sep 3, 2024

tgross35 Sep 3, 2024 •

edited

Loading

tgross35 commented Sep 3, 2024 •

edited

Loading