Skip to content

Commit b20092b

Browse files
committed
adding tcp_info struct to linux musl/glibc.
1 parent 535e82b commit b20092b

File tree

5 files changed

+119
-1
lines changed

5 files changed

+119
-1
lines changed

libc-test/build.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4400,7 +4400,15 @@ fn test_linux(target: &str) {
44004400
// the `ifr_ifrn` field is an anonymous union
44014401
(struct_ == "iwreq" && field == "ifr_ifrn") ||
44024402
// the `key` field is a zero-sized array
4403-
(struct_ == "iw_encode_ext" && field == "key")
4403+
(struct_ == "iw_encode_ext" && field == "key") ||
4404+
// the `tcpi_snd_wscale` field is a bitfield
4405+
(struct_ == "tcp_info" && field == "tcpi_snd_wscale") ||
4406+
// the `tcpi_snd_wscale` field is a bitfield
4407+
(struct_ == "tcp_info" && field == "tcpi_rcv_wscale") ||
4408+
// the `tcpi_delivery_rate_app_limited` field is a bitfield on musl
4409+
(musl && struct_ == "tcp_info" && field == "tcpi_delivery_rate_app_limited") ||
4410+
// the `tcpi_fast_open_client_fail` field is a bitfield on musl
4411+
(musl && struct_ == "tcp_info" && field == "tcpi_fast_open_client_fail")
44044412
});
44054413

44064414
cfg.skip_roundtrip(move |s| match s {

libc-test/semver/linux-gnu.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,3 +712,4 @@ putpwent
712712
putgrent
713713
execveat
714714
close_range
715+
tcp_info

libc-test/semver/linux-musl.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,5 @@ pututxline
8484
pwritev64
8585
reallocarray
8686
setutxent
87+
tcp_info
8788
timex

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,45 @@ s! {
453453
pub aio_flags: ::__u32,
454454
pub aio_resfd: ::__u32,
455455
}
456+
457+
// netinet/tcp.h
458+
459+
pub struct tcp_info {
460+
pub tcpi_state: u8,
461+
pub tcpi_ca_state: u8,
462+
pub tcpi_retransmits: u8,
463+
pub tcpi_probes: u8,
464+
pub tcpi_backoff: u8,
465+
pub tcpi_options: u8,
466+
// bitfields 4
467+
pub tcpi_snd_wscale: u8,
468+
// bitfields 4
469+
pub tcpi_rcv_wscale: u8,
470+
pub tcpi_rto: u32,
471+
pub tcpi_ato: u32,
472+
pub tcpi_snd_mss: u32,
473+
pub tcpi_rcv_mss: u32,
474+
pub tcpi_unacked: u32,
475+
pub tcpi_sacked: u32,
476+
pub tcpi_lost: u32,
477+
pub tcpi_retrans: u32,
478+
pub tcpi_fackets: u32,
479+
pub tcpi_last_data_sent: u32,
480+
pub tcpi_last_ack_sent: u32,
481+
pub tcpi_last_data_recv: u32,
482+
pub tcpi_last_ack_recv: u32,
483+
pub tcpi_pmtu: u32,
484+
pub tcpi_rcv_ssthresh: u32,
485+
pub tcpi_rtt: u32,
486+
pub tcpi_rttvar: u32,
487+
pub tcpi_snd_ssthresh: u32,
488+
pub tcpi_snd_cwnd: u32,
489+
pub tcpi_advmss: u32,
490+
pub tcpi_reordering: u32,
491+
pub tcpi_rcv_rtt: u32,
492+
pub tcpi_rcv_space: u32,
493+
pub tcpi_total_retrans: u32,
494+
}
456495
}
457496

458497
impl siginfo_t {

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,75 @@ s! {
344344
pub len: ::__u32,
345345
pub options: ::__u32,
346346
}
347+
348+
// netinet/tcp.h
349+
350+
pub struct tcp_info {
351+
pub tcpi_state: u8,
352+
pub tcpi_ca_state: u8,
353+
pub tcpi_retransmits: u8,
354+
pub tcpi_probes: u8,
355+
pub tcpi_backoff: u8,
356+
pub tcpi_options: u8,
357+
/*
358+
* FIXME: when musl headers are more up to date
359+
// bitfields 4
360+
pub tcpi_snd_wscale: u8,
361+
// bitfields 4
362+
pub tcpi_rcv_wscale: u8,
363+
// bitfields 1
364+
pub tcpi_delivery_rate_app_limited: u8,
365+
// bitfields 2
366+
pub tcpi_fastopen_client_fail: u8,
367+
*/
368+
pub tcpi_rto: u32,
369+
pub tcpi_ato: u32,
370+
pub tcpi_snd_mss: u32,
371+
pub tcpi_rcv_mss: u32,
372+
pub tcpi_unacked: u32,
373+
pub tcpi_sacked: u32,
374+
pub tcpi_lost: u32,
375+
pub tcpi_retrans: u32,
376+
pub tcpi_fackets: u32,
377+
pub tcpi_last_data_sent: u32,
378+
pub tcpi_last_ack_sent: u32,
379+
pub tcpi_last_data_recv: u32,
380+
pub tcpi_last_ack_recv: u32,
381+
pub tcpi_pmtu: u32,
382+
pub tcpi_rcv_ssthresh: u32,
383+
pub tcpi_rtt: u32,
384+
pub tcpi_rttvar: u32,
385+
pub tcpi_snd_ssthresh: u32,
386+
pub tcpi_snd_cwnd: u32,
387+
pub tcpi_advmss: u32,
388+
pub tcpi_reordering: u32,
389+
pub tcpi_rcv_rtt: u32,
390+
pub tcpi_rcv_space: u32,
391+
pub tcpi_total_retrans: u32,
392+
pub tcpi_pacing_rate: u64,
393+
pub tcpi_max_pacing_rate: u64,
394+
pub tcpi_bytes_acked: u64,
395+
pub tcpi_bytes_received: u64,
396+
pub tcpi_segs_out: u32,
397+
pub tcpi_segs_in: u32,
398+
pub tcpi_notsent_bytes: u32,
399+
pub tcpi_min_rtt: u32,
400+
pub tcpi_data_segs_in: u32,
401+
pub tcpi_data_segs_out: u32,
402+
pub tcpi_delivery_rate: u64,
403+
pub tcpi_busy_time: u64,
404+
pub tcpi_rwnd_limited: u64,
405+
pub tcpi_sndbuf_limited: u64,
406+
pub tcpi_delivered: u32,
407+
pub tcpi_delivered_ce: u32,
408+
pub tcpi_bytes_sent: u64,
409+
pub tcpi_bytes_retrans: u64,
410+
pub tcpi_dsack_dups: u32,
411+
pub tcpi_reord_seen: u32,
412+
// FIXME: to uncomment once CI musl is updated
413+
//pub tcpi_rcv_ooopack: u32,
414+
//pub tcpi_snd_wnd: u32,
415+
}
347416
}
348417

349418
s_no_extra_traits! {

0 commit comments

Comments
 (0)