Skip to content

Update FreeBSD 13 CI image #3614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Update FreeBSD 13 CI image #3614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac7d852
Update FreeBSD 13 CI image
asomers Mar 6, 2024
bf968af
Update sturct tcp_info for FreeBSD 13
asomers Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
task:
name: nightly x86_64-unknown-freebsd-13
freebsd_instance:
image_family: freebsd-13-2
image_family: freebsd-13-3
setup_script:
- pkg install -y libnghttp2 curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
Expand Down
34 changes: 21 additions & 13 deletions src/unix/bsd/freebsdlike/freebsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,41 +1043,49 @@ s! {
pub tcpi_snd_rexmitpack: u32,
pub tcpi_rcv_ooopack: u32,
pub tcpi_snd_zerowin: u32,
#[cfg(freebsd13)]
pub __tcpi_delivered_ce: u32,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_delivered_ce: u32,
#[cfg(freebsd13)]
pub __tcpi_received_ce: u32,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_received_ce: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_delivered_e1_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_delivered_e0_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_delivered_ce_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_received_e1_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_received_e0_bytes: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub __tcpi_received_ce_bytes: u32,
#[cfg(freebsd13)]
pub __tcpi_total_tlp: u32,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_total_tlp: u32,
#[cfg(freebsd13)]
pub __tcpi_total_tlp_bytes: u64,
#[cfg(any(freebsd15, freebsd14))]
pub tcpi_total_tlp_bytes: u64,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_snd_una: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_snd_max: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_rcv_numsacks: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_rcv_adv: u32,
#[cfg(any(freebsd15, freebsd14))]
#[cfg(any(freebsd15, freebsd14, freebsd13))]
pub tcpi_dupacks: u32,
#[cfg(freebsd14)]
#[cfg(any(freebsd14, freebsd13))]
pub __tcpi_pad: [u32; 10],
#[cfg(freebsd15)]
pub __tcpi_pad: [u32; 14],
#[cfg(not(any(freebsd15, freebsd14)))]
#[cfg(not(any(freebsd15, freebsd14, freebsd13)))]
pub __tcpi_pad: [u32; 26],
}

Expand Down