Skip to content

Refactor net to be independent of the OS. #105

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
Virv12 merged 1 commit into from
Dec 1, 2025
Merged

Refactor net to be independent of the OS. #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions pixie-uefi/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pixie-uefi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ managed = { version = "0.8.0", default-features = false, features = ["alloc"] }
minicov = { version = "0.3.7", optional = true }
postcard = { version = "1.1.3", default-features = false, features = ["alloc"] }
smoltcp = { version = "0.12.0", default-features = false, features = ["alloc", "proto-ipv4", "medium-ethernet", "socket-udp", "socket-tcp", "socket-dhcpv4", "async", "socket-tcp-cubic"] }
spin = "0.10.0"
thingbuf = { version = "0.1.6", default-features = false, features = ["alloc"] }
uefi = { version = "0.36.1", features = ["alloc", "global_allocator", "panic_handler"] }

Expand Down
25 changes: 13 additions & 12 deletions pixie-uefi/src/flash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@ use uefi::proto::console::text::Color;

use crate::os::boot_options::BootOptions;
use crate::os::error::{Error, Result};
use crate::os::{memory, TcpStream, UefiOS, PACKET_SIZE};
use crate::os::net::{TcpStream, UdpSocket, ETH_PACKET_SIZE};
use crate::os::{memory, UefiOS};
use crate::MIN_MEMORY;

async fn fetch_image(stream: &TcpStream) -> Result<Image> {
let req = TcpRequest::GetImage;
let mut buf = postcard::to_allocvec(&req)?;
stream.send_u64_le(buf.len() as u64).await?;
stream.send(&buf).await?;
let len = stream.recv_u64_le().await?;
stream.write_u64_le(buf.len() as u64).await?;
stream.write_all(&buf).await?;
let len = stream.read_u64_le().await?;
buf.resize(len as usize, 0);
stream.recv_exact(&mut buf).await?;
stream.read_exact(&mut buf).await?;
Ok(postcard::from_bytes(&buf)?)
}

Expand Down Expand Up @@ -74,9 +75,9 @@ fn handle_packet(
}

pub async fn flash(os: UefiOS, server_addr: SocketAddrV4) -> Result<()> {
let stream = os.connect(server_addr).await?;
let stream = TcpStream::connect(server_addr).await?;
let image = fetch_image(&stream).await?;
stream.close_send().await;
stream.shutdown().await;
// TODO(virv): this could be better
stream.force_close().await;

Expand Down Expand Up @@ -160,8 +161,8 @@ pub async fn flash(os: UefiOS, server_addr: SocketAddrV4) -> Result<()> {

info!("Disk scanned; {} chunks to fetch", stats.borrow().fetch);

let socket = os.udp_bind(Some(CHUNKS_PORT)).await?;
let mut buf = [0; PACKET_SIZE];
let socket = UdpSocket::bind(Some(CHUNKS_PORT)).await?;
let mut buf = [0; ETH_PACKET_SIZE];

let mut received = BTreeMap::new();

Expand All @@ -177,7 +178,7 @@ pub async fn flash(os: UefiOS, server_addr: SocketAddrV4) -> Result<()> {
BytesFmt(free_mem)
);
while !chunks_info.is_empty() {
let recv = Box::pin(socket.recv(&mut buf));
let recv = Box::pin(socket.recv_from(&mut buf));
let sleep = Box::pin(os.sleep_us(100_000));
match select(recv, sleep).await {
Either::Left(((buf, _addr), _)) => {
Expand All @@ -204,7 +205,7 @@ pub async fn flash(os: UefiOS, server_addr: SocketAddrV4) -> Result<()> {
chunks_info.iter().take(40).map(|(hash, _)| *hash).collect();
stats.borrow_mut().requested += chunks.len();
let msg = postcard::to_allocvec(&UdpRequest::RequestChunks(chunks)).unwrap();
socket.send(server_addr, &msg).await?;
socket.send_to(server_addr, &msg).await?;
}
}
}
Expand All @@ -221,7 +222,7 @@ pub async fn flash(os: UefiOS, server_addr: SocketAddrV4) -> Result<()> {

let msg = UdpRequest::ActionProgress(stats.borrow().recv, stats.borrow().fetch);
socket
.send(server_addr, &postcard::to_allocvec(&msg)?)
.send_to(server_addr, &postcard::to_allocvec(&msg)?)
.await?;
}
Ok(())
Expand Down
37 changes: 19 additions & 18 deletions pixie-uefi/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ use uefi::{entry, Status};

use crate::flash::flash;
use crate::os::error::{Error, Result};
use crate::os::{TcpStream, UefiOS, PACKET_SIZE};
use crate::os::net::{TcpStream, UdpSocket, ETH_PACKET_SIZE};
use crate::os::UefiOS;
use crate::reboot_to_os::reboot_to_os;
use crate::register::register;
use crate::store::store;
Expand All @@ -33,22 +34,22 @@ mod export_cov;
const MIN_MEMORY: u64 = 32 << 20;

async fn server_discover(os: UefiOS) -> Result<SocketAddrV4> {
let socket = os.udp_bind(None).await?;
let socket = UdpSocket::bind(None).await?;

let task1 = async {
let msg = postcard::to_allocvec(&UdpRequest::Discover).unwrap();
#[allow(unreachable_code)]
Ok::<_, Error>(loop {
socket
.send(SocketAddrV4::new(Ipv4Addr::BROADCAST, ACTION_PORT), &msg)
.send_to(SocketAddrV4::new(Ipv4Addr::BROADCAST, ACTION_PORT), &msg)
.await?;
os.sleep_us(1_000_000).await;
})
};

let task2 = async {
let mut buf = [0; PACKET_SIZE];
let (data, server) = socket.recv(&mut buf).await;
let mut buf = [0; ETH_PACKET_SIZE];
let (data, server) = socket.recv_from(&mut buf).await;
assert_eq!(data.len(), 0);
Ok::<_, Error>(server)
};
Expand All @@ -75,22 +76,22 @@ async fn shutdown(os: UefiOS) -> ! {

async fn get_action(stream: &TcpStream) -> Result<Action> {
let msg = postcard::to_allocvec(&TcpRequest::GetAction)?;
stream.send_u64_le(msg.len() as u64).await?;
stream.send(&msg).await?;
stream.write_u64_le(msg.len() as u64).await?;
stream.write_all(&msg).await?;

let len = stream.recv_u64_le().await? as usize;
let len = stream.read_u64_le().await? as usize;
let mut buf = vec![0; len];
stream.recv_exact(&mut buf).await?;
stream.read_exact(&mut buf).await?;
let cmd = postcard::from_bytes(&buf)?;
Ok(cmd)
}

async fn complete_action(stream: &TcpStream) -> Result<()> {
let msg = postcard::to_allocvec(&TcpRequest::ActionComplete)?;
stream.send_u64_le(msg.len() as u64).await?;
stream.send(&msg).await?;
stream.write_u64_le(msg.len() as u64).await?;
stream.write_all(&msg).await?;

let len = stream.recv_u64_le().await?;
let len = stream.read_u64_le().await?;
assert_eq!(len, 0);
Ok(())
}
Expand All @@ -101,10 +102,10 @@ async fn run(os: UefiOS) -> Result<()> {
let mut last_was_wait = false;

os.spawn("ping", async move {
let udp_socket = os.udp_bind(None).await.unwrap();
let udp_socket = UdpSocket::bind(None).await.unwrap();
loop {
udp_socket
.send(SocketAddrV4::new(*server.ip(), PING_PORT), b"pixie")
.send_to(SocketAddrV4::new(*server.ip(), PING_PORT), b"pixie")
.await
.unwrap();
os.sleep_us(10_000_000).await;
Expand All @@ -119,9 +120,9 @@ async fn run(os: UefiOS) -> Result<()> {
log::debug!("Sending request for command");
}

let tcp = os.connect(server).await?;
let tcp = TcpStream::connect(server).await?;
let command = get_action(&tcp).await;
tcp.close_send().await;
tcp.shutdown().await;
tcp.force_close().await;

if let Err(e) = command {
Expand Down Expand Up @@ -151,9 +152,9 @@ async fn run(os: UefiOS) -> Result<()> {
Action::Flash => flash(os, server).await?,
}

let tcp = os.connect(server).await?;
let tcp = TcpStream::connect(server).await?;
complete_action(&tcp).await?;
tcp.close_send().await;
tcp.shutdown().await;
tcp.force_close().await;

if command == Action::Restart {
Expand Down
Loading