Skip to content

Commit a5adc5f

Browse files
devnexentgross35
authored andcommitted
adding tcp_info struct to linux musl/glibc.
(backport <rust-lang#3480>) (cherry picked from commit ee0bf57)
1 parent 42d1000 commit a5adc5f

File tree

5 files changed

+119
-1
lines changed

5 files changed

+119
-1
lines changed

libc-test/build.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -4480,7 +4480,17 @@ fn test_linux(target: &str) {
44804480
// the `ifc_ifcu` field is an anonymous union
44814481
(struct_ == "ifconf" && field == "ifc_ifcu") ||
44824482
// glibc uses a single array `uregs` instead of individual fields.
4483-
(struct_ == "user_regs" && arm)
4483+
(struct_ == "user_regs" && arm) ||
4484+
// the `ifr_ifrn` field is an anonymous union
4485+
(struct_ == "iwreq" && field == "ifr_ifrn") ||
4486+
// the `key` field is a zero-sized array
4487+
(struct_ == "iw_encode_ext" && field == "key") ||
4488+
// the `tcpi_snd_rcv_wscale` map two bitfield fields stored in a u8
4489+
(struct_ == "tcp_info" && field == "tcpi_snd_rcv_wscale") ||
4490+
// the `tcpi_delivery_rate_app_limited` field is a bitfield on musl
4491+
(musl && struct_ == "tcp_info" && field == "tcpi_delivery_rate_app_limited") ||
4492+
// the `tcpi_fast_open_client_fail` field is a bitfield on musl
4493+
(musl && struct_ == "tcp_info" && field == "tcpi_fast_open_client_fail")
44844494
});
44854495

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

libc-test/semver/linux-gnu.txt

+1
Original file line numberDiff line numberDiff line change
@@ -712,3 +712,4 @@ putgrent
712712
execveat
713713
close_range
714714
epoll_pwait2
715+
tcp_info

libc-test/semver/linux-musl.txt

+2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ process_vm_writev
8080
pwritev2
8181
pwritev64
8282
reallocarray
83+
setutxent
84+
tcp_info
8385
timex
8486
euidaccess
8587
eaccess

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

+38
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,44 @@ s! {
454454
pub aio_flags: ::__u32,
455455
pub aio_resfd: ::__u32,
456456
}
457+
458+
// netinet/tcp.h
459+
460+
pub struct tcp_info {
461+
pub tcpi_state: u8,
462+
pub tcpi_ca_state: u8,
463+
pub tcpi_retransmits: u8,
464+
pub tcpi_probes: u8,
465+
pub tcpi_backoff: u8,
466+
pub tcpi_options: u8,
467+
/// This contains the bitfields `tcpi_snd_wscale` and `tcpi_rcv_wscale`.
468+
/// Each is 4 bits.
469+
pub tcpi_snd_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+
}
457495
}
458496

459497
impl siginfo_t {

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

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

353420
s_no_extra_traits! {

0 commit comments

Comments
 (0)