Skip to content

Commit 97a839d

Browse files
committed
adding tcp_info struct to linux musl/glibc.
1 parent f05d6a3 commit 97a839d

File tree

5 files changed

+118
-1
lines changed

5 files changed

+118
-1
lines changed

libc-test/build.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4254,7 +4254,15 @@ fn test_linux(target: &str) {
42544254
// the `ifc_ifcu` field is an anonymous union
42554255
(struct_ == "ifconf" && field == "ifc_ifcu") ||
42564256
// glibc uses a single array `uregs` instead of individual fields.
4257-
(struct_ == "user_regs" && arm)
4257+
(struct_ == "user_regs" && arm) ||
4258+
// the `tcpi_snd_wscale` field is a bitfield
4259+
(struct_ == "tcp_info" && field == "tcpi_snd_wscale") ||
4260+
// the `tcpi_snd_wscale` field is a bitfield
4261+
(struct_ == "tcp_info" && field == "tcpi_rcv_wscale") ||
4262+
// the `tcpi_delivery_rate_app_limited` field is a bitfield on musl
4263+
(musl && struct_ == "tcp_info" && field == "tcpi_delivery_rate_app_limited") ||
4264+
// the `tcpi_fast_open_client_fail` field is a bitfield on musl
4265+
(musl && struct_ == "tcp_info" && field == "tcpi_fast_open_client_fail")
42584266
});
42594267

42604268
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
@@ -702,3 +702,4 @@ putpwent
702702
putgrent
703703
execveat
704704
close_range
705+
tcp_info

libc-test/semver/linux-musl.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ strftime_l
8282
strptime
8383
dirname
8484
basename
85+
tcp_info

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,45 @@ 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+
// bitfields 4
468+
pub tcpi_snd_wscale: u8,
469+
// bitfields 4
470+
pub tcpi_rcv_wscale: u8,
471+
pub tcpi_rto: u32,
472+
pub tcpi_ato: u32,
473+
pub tcpi_snd_mss: u32,
474+
pub tcpi_rcv_mss: u32,
475+
pub tcpi_unacked: u32,
476+
pub tcpi_sacked: u32,
477+
pub tcpi_lost: u32,
478+
pub tcpi_retrans: u32,
479+
pub tcpi_fackets: u32,
480+
pub tcpi_last_data_sent: u32,
481+
pub tcpi_last_ack_sent: u32,
482+
pub tcpi_last_data_recv: u32,
483+
pub tcpi_last_ack_recv: u32,
484+
pub tcpi_pmtu: u32,
485+
pub tcpi_rcv_ssthresh: u32,
486+
pub tcpi_rtt: u32,
487+
pub tcpi_rttvar: u32,
488+
pub tcpi_snd_ssthresh: u32,
489+
pub tcpi_snd_cwnd: u32,
490+
pub tcpi_advmss: u32,
491+
pub tcpi_reordering: u32,
492+
pub tcpi_rcv_rtt: u32,
493+
pub tcpi_rcv_space: u32,
494+
pub tcpi_total_retrans: u32,
495+
}
457496
}
458497

459498
impl siginfo_t {

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,74 @@ 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+
// bitfields 4
362+
pub tcpi_snd_wscale: u8,
363+
// bitfields 4
364+
pub tcpi_rcv_wscale: u8,
365+
// bitfields 1
366+
pub tcpi_delivery_rate_app_limited: u8,
367+
/*
368+
* FIXME: when musl headers are more up to date
369+
// bitfields 2
370+
pub tcpi_fastopen_client_fail: u8,
371+
*/
372+
pub tcpi_rto: u32,
373+
pub tcpi_ato: u32,
374+
pub tcpi_snd_mss: u32,
375+
pub tcpi_rcv_mss: u32,
376+
pub tcpi_unacked: u32,
377+
pub tcpi_sacked: u32,
378+
pub tcpi_lost: u32,
379+
pub tcpi_retrans: u32,
380+
pub tcpi_fackets: u32,
381+
pub tcpi_last_data_sent: u32,
382+
pub tcpi_last_ack_sent: u32,
383+
pub tcpi_last_data_recv: u32,
384+
pub tcpi_last_ack_recv: u32,
385+
pub tcpi_pmtu: u32,
386+
pub tcpi_rcv_ssthresh: u32,
387+
pub tcpi_rtt: u32,
388+
pub tcpi_rttvar: u32,
389+
pub tcpi_snd_ssthresh: u32,
390+
pub tcpi_snd_cwnd: u32,
391+
pub tcpi_advmss: u32,
392+
pub tcpi_reordering: u32,
393+
pub tcpi_rcv_rtt: u32,
394+
pub tcpi_rcv_space: u32,
395+
pub tcpi_total_retrans: u32,
396+
pub tcpi_pacing_rate: u64,
397+
pub tcpi_max_pacing_rate: u64,
398+
pub tcpi_bytes_acked: u64,
399+
pub tcpi_bytes_received: u64,
400+
pub tcpi_segs_out: u32,
401+
pub tcpi_segs_in: u32,
402+
pub tcpi_notsent_bytes: u32,
403+
pub tcpi_min_rtt: u32,
404+
pub tcpi_data_segs_in: u32,
405+
pub tcpi_data_segs_out: u32,
406+
pub tcpi_delivery_rate: u64,
407+
pub tcpi_busy_time: u64,
408+
pub tcpi_rwnd_limited: u64,
409+
pub tcpi_sndbuf_limited: u64,
410+
pub tcpi_delivered: u32,
411+
pub tcpi_delivered_ce: u32,
412+
pub tcpi_bytes_sent: u64,
413+
pub tcpi_bytes_retrans: u64,
414+
pub tcpi_dsack_dups: u32,
415+
pub tcpi_reord_seen: u32,
416+
pub tcpi_rcv_ooopack: u32,
417+
pub tcpi_snd_wnd: u32,
418+
}
351419
}
352420

353421
s_no_extra_traits! {

0 commit comments

Comments
 (0)