Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions src/devices/src/virtio/vsock/packet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,20 @@ impl VsockPacket {
std::slice::from_raw_parts(addr_ptr as *const u8, rsp.addr.len() as usize)
};
buf[8..(rsp.addr.len() + 8) as usize].copy_from_slice(slice);

// On macOS, convert BSD sockaddr (u8 sa_len + u8 sa_family) to
// Linux wire format (u16 sa_family). Also translate macOS AF_*
// values to their Linux equivalents (e.g. AF_INET6: 30 → 10).
#[cfg(target_os = "macos")]
{
let bsd_family = buf[9];
let linux_family: u16 = match bsd_family as i32 {
libc::AF_INET => defs::LINUX_AF_INET,
libc::AF_INET6 => defs::LINUX_AF_INET6,
_ => 0, // AF_UNSPEC
};
byte_order::write_le_u16(&mut buf[8..], linux_family);
}
}
}
}
Expand Down
Loading