Merge pull request #1621 from rust-osdev/snp-test

SNP Integration Test: Improve Clarity

Author: nicholasbishop

Cargo.lock

@@ -8,6 +8,7 @@ edition = "2024"
 [dependencies]
 uefi-raw = { path = "../uefi-raw" }
 uefi = { path = "../uefi", features = ["alloc", "global_allocator", "panic_handler", "logger", "qemu", "log-debugcon"] }
+smoltcp = { version = "0.12.0", default-features = false, features = ["medium-ethernet", "proto-ipv4", "socket-udp"] }
 
 log.workspace = true
 

uefi-test-runner/Cargo.toml

@@ -5,6 +5,9 @@ pub fn test() {
 
     http::test();
     pxe::test();
+    // Currently, we are in the unfortunate situation that the SNP test
+    // depends on the PXE test, as it assigns an IPv4 address to the
+    // interface via DHCP.
     snp::test();
 }
 

uefi-test-runner/src/proto/network/mod.rs

@@ -26,8 +26,11 @@ pub fn test() {
 
         assert!(base_code.mode().dhcp_ack_received());
         let dhcp_ack: &DhcpV4Packet = base_code.mode().dhcp_ack().as_ref();
-        let server_ip = dhcp_ack.bootp_si_addr;
-        let server_ip = IpAddress::new_v4(server_ip);
+
+        info!("DHCP: Server IP: {:?}", dhcp_ack.bootp_si_addr);
+        info!("DHCP: Client IP: {:?}", dhcp_ack.bootp_yi_addr);
+
+        let server_ip = IpAddress::new_v4(dhcp_ack.bootp_si_addr);
 
         const EXAMPLE_FILE_NAME: &[u8] = b"example-file.txt\0";
         const EXAMPLE_FILE_CONTENT: &[u8] = b"Hello world!";