Skip to content

Commit c20e16f

Browse files
committed
Auto merge of #3481 - devnexen:openbsd_tcp_info, r=JohnTitor
adding tcp_info to openbsd
2 parents 103c18e + c81cc4a commit c20e16f

File tree

4 files changed

+68
-3
lines changed

4 files changed

+68
-3
lines changed

libc-test/semver/openbsd.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,7 @@ ST_RDONLY
808808
S_IEXEC
809809
S_IREAD
810810
S_IWRITE
811+
TCP_INFO
811812
TCP_MAXSEG
812813
TCP_MD5SIG
813814
TCP_NOPUSH
@@ -1014,6 +1015,7 @@ backtrace
10141015
backtrace_symbols
10151016
backtrace_symbols_fd
10161017
backtrace_symbols_fmt
1018+
basename
10171019
bsearch
10181020
caddr_t
10191021
calloc_conceal
@@ -1027,6 +1029,7 @@ cmsghdr
10271029
daemon
10281030
difftime
10291031
dirfd
1032+
dirname
10301033
dl_iterate_phdr
10311034
dl_phdr_info
10321035
drand48
@@ -1254,6 +1257,7 @@ strtonum
12541257
sync
12551258
syscall
12561259
sysctl
1260+
tcp_info
12571261
telldir
12581262
tmpfs_args
12591263
truncate
@@ -1269,5 +1273,3 @@ utmp
12691273
utrace
12701274
wait4
12711275
xucred
1272-
dirname
1273-
basename

src/unix/bsd/netbsdlike/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,8 @@ pub const TIMER_ABSTIME: ::c_int = 1;
650650

651651
pub const RB_AUTOBOOT: ::c_int = 0;
652652

653+
pub const TCP_INFO: ::c_int = 9;
654+
653655
#[link(name = "util")]
654656
extern "C" {
655657
pub fn setgrent();

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,6 @@ pub const TCP_KEEPIDLE: ::c_int = 3;
15491549
pub const TCP_KEEPINTVL: ::c_int = 5;
15501550
pub const TCP_KEEPCNT: ::c_int = 6;
15511551
pub const TCP_KEEPINIT: ::c_int = 7;
1552-
pub const TCP_INFO: ::c_int = 9;
15531552
pub const TCP_MD5SIG: ::c_int = 0x10;
15541553
pub const TCP_CONGCTL: ::c_int = 0x20;
15551554

src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,68 @@ s! {
541541
#[cfg(not(libc_union))]
542542
pub ifr_ifru: ::sockaddr,
543543
}
544+
545+
pub struct tcp_info {
546+
pub tcpi_state: u8,
547+
pub __tcpi_ca_state: u8,
548+
pub __tcpi_retransmits: u8,
549+
pub __tcpi_probes: u8,
550+
pub __tcpi_backoff: u8,
551+
pub tcpi_options: u8,
552+
pub tcpi_snd_wscale: u8,
553+
pub tcpi_rcv_wscale: u8,
554+
pub tcpi_rto: u32,
555+
pub __tcpi_ato: u32,
556+
pub tcpi_snd_mss: u32,
557+
pub tcpi_rcv_mss: u32,
558+
pub __tcpi_unacked: u32,
559+
pub __tcpi_sacked: u32,
560+
pub __tcpi_lost: u32,
561+
pub __tcpi_retrans: u32,
562+
pub __tcpi_fackets: u32,
563+
pub tcpi_last_data_sent: u32,
564+
pub tcpi_last_ack_sent: u32,
565+
pub tcpi_last_data_recv: u32,
566+
pub tcpi_last_ack_recv: u32,
567+
pub __tcpi_pmtu: u32,
568+
pub __tcpi_rcv_ssthresh: u32,
569+
pub tcpi_rtt: u32,
570+
pub tcpi_rttvar: u32,
571+
pub tcpi_snd_ssthresh: u32,
572+
pub tcpi_snd_cwnd: u32,
573+
pub __tcpi_advmss: u32,
574+
pub __tcpi_reordering: u32,
575+
pub __tcpi_rcv_rtt: u32,
576+
pub tcpi_rcv_space: u32,
577+
pub tcpi_snd_wnd: u32,
578+
pub tcpi_snd_nxt: u32,
579+
pub tcpi_rcv_nxt: u32,
580+
pub tcpi_toe_tid: u32,
581+
pub tcpi_snd_rexmitpack: u32,
582+
pub tcpi_rcv_ooopack: u32,
583+
pub tcpi_snd_zerowin: u32,
584+
pub tcpi_rttmin: u32,
585+
pub tcpi_max_sndwnd: u32,
586+
pub tcpi_rcv_adv: u32,
587+
pub tcpi_rcv_up: u32,
588+
pub tcpi_snd_una: u32,
589+
pub tcpi_snd_up: u32,
590+
pub tcpi_snd_wl1: u32,
591+
pub tcpi_snd_wl2: u32,
592+
pub tcpi_snd_max: u32,
593+
pub tcpi_ts_recent: u32,
594+
pub tcpi_ts_recent_age: u32,
595+
pub tcpi_rfbuf_cnt: u32,
596+
pub tcpi_rfbuf_ts: u32,
597+
pub tcpi_so_rcv_sb_cc: u32,
598+
pub tcpi_so_rcv_sb_hiwat: u32,
599+
pub tcpi_so_rcv_sb_lowat: u32,
600+
pub tcpi_so_rcv_sb_wat: u32,
601+
pub tcpi_so_snd_sb_cc: u32,
602+
pub tcpi_so_snd_sb_hiwat: u32,
603+
pub tcpi_so_snd_sb_lowat: u32,
604+
pub tcpi_so_snd_sb_wat: u32,
605+
}
544606
}
545607

546608
impl siginfo_t {

0 commit comments

Comments
 (0)