Enhanced Network Test

Author: jounathaen

tests/common.rs

@@ -12,6 +12,9 @@ use uhyvelib::{
 	vm::{UhyveVm, VmResult},
 };
 
+pub const HERMIT_GATEWAY: &str = "10.0.5.2";
+pub const HERMIT_IP: &str = "10.0.5.3";
+
 /// Uses Cargo to build a kernel in the `tests/test-kernels` directory.
 /// Returns a path to the build binary.
 pub fn build_hermit_bin(kernel: impl AsRef<Path> + std::fmt::Display) -> PathBuf {
@@ -27,6 +30,8 @@ pub fn build_hermit_bin(kernel: impl AsRef<Path> + std::fmt::Display) -> PathBuf
 		.arg("--bin")
 		.arg(kernel)
 		.env("HERMIT_LOG_LEVEL_FILTER", "Debug")
+		.env("HERMIT_IP", HERMIT_IP)
+		.env("HERMIT_GATEWAY", HERMIT_GATEWAY)
 		.current_dir(kernel_src_path)
 		.status()
 		.expect("failed to execute `cargo build`");

tests/network-test.rs

@@ -1,10 +1,62 @@
 mod common;
 
-use common::{build_hermit_bin, run_simple_vm};
+use std::{
+	io::Write,
+	net::TcpStream,
+	thread::{self, sleep},
+	time::Duration,
+};
+
+use byte_unit::{Byte, Unit};
+use common::{HERMIT_IP, build_hermit_bin};
+use uhyvelib::{
+	params::{Output, Params},
+	vm::UhyveVm,
+};
 
 #[test]
 fn network_test() {
+	let mut builder = env_logger::Builder::from_default_env();
+	// The precise timestampe can be important when debugging networking,
+	builder.format_timestamp_nanos().init();
+
 	let bin_path = build_hermit_bin("network_test");
-	run_simple_vm(bin_path);
-	panic!();
+	let params = Params {
+		cpu_count: 1.try_into().unwrap(),
+		memory_size: Byte::from_u64_with_unit(64, Unit::MiB)
+			.unwrap()
+			.try_into()
+			.unwrap(),
+		output: Output::Buffer,
+		stats: true,
+		aslr: false,
+		..Default::default()
+	};
+
+	let t = thread::spawn(move || {
+		sleep(Duration::from_secs(2));
+
+		let mut hermit_ip = String::from(HERMIT_IP);
+		hermit_ip.push_str(":9975");
+		let mut stream = TcpStream::connect(hermit_ip).unwrap();
+		for i in 0..10_u8 {
+			let mut v = Vec::with_capacity(i as usize);
+			for _ in 0..=i {
+				v.push(b'a' + i);
+			}
+			println!("Sending {v:?}");
+			stream.write(&v).unwrap();
+			// TODO: Currently this test fails without the delay. Remove once fixed.
+			sleep(Duration::from_millis(100));
+		}
+		stream.write(b"exit").unwrap();
+	});
+
+	let res = UhyveVm::new(bin_path, params).unwrap().run(None);
+
+	t.join().unwrap();
+
+	for t in ["a\n", "bb\n", "ccc\n", "dddd\n", "eeeee\n"] {
+		assert!(res.output.as_ref().unwrap().contains(t));
+	}
 }

tests/test-kernels/src/bin/network_test.rs

@@ -3,32 +3,31 @@
 
 use std::{
 	fs::File,
-	io::{Error, Read},
-	net::{Ipv4Addr, SocketAddrV4, TcpListener},
+	io::{Error, Read, Write},
+	net::{Ipv4Addr, SocketAddrV4, TcpListener, TcpStream},
 };
 
 #[cfg(target_os = "hermit")]
 use hermit as _;
 
 fn main() -> Result<(), Error> {
-	println!("Network Test - ");
-	// let loopback = Ipv4Addr::new(10, 8, 8, 11);
-	// println!("1");
-	// let socket = SocketAddrV4::new(loopback, 0);
-	// println!("2");
-	// let listener = TcpListener::bind(socket)?;
-	// println!("3");
-
+	println!("Network Test");
 	let listener = TcpListener::bind("127.0.0.1:9975").unwrap();
+	println!("socket bound");
 	let (mut socket, _) = listener.accept().unwrap();
-	let mut buf = [0u8; 1000];
-	println!("about to read");
-	match socket.read(&mut buf) {
-		Err(e) => {
-			println!("read err {e:?}");
-		}
-		Ok(received) => {
-			print!("read {}", std::str::from_utf8(&buf[..received]).unwrap());
+	println!("connection established");
+	loop {
+		let mut buf = [0u8; 1500];
+		match socket.read(&mut buf) {
+			Err(e) => {
+				println!("read err {e:?}");
+			}
+			Ok(received) => {
+				if &buf[0..4] == b"exit" {
+					break;
+				}
+				println!("read {}", std::str::from_utf8(&buf[..received]).unwrap());
+			}
 		}
 	}
 	Ok(())