uefi: Convert remaining uses of IpAddress to uefi_raw::IpAddress in pxe::BaseCode

This is an intermediate step towards using the uefi-raw definition of the
protocol.

Author: nicholasbishop

uefi/src/proto/network/mod.rs

@@ -40,6 +40,13 @@ impl IpAddress {
         // compatible.
         self.0.as_ptr().cast()
     }
+
+    #[must_use]
+    fn as_raw_ptr_mut(&mut self) -> *mut uefi_raw::IpAddress {
+        // The uefi-raw type is defined differently, but the layout is
+        // compatible.
+        self.0.as_mut_ptr().cast()
+    }
 }
 
 impl From<core::net::Ipv4Addr> for IpAddress {

uefi/src/proto/network/pxe.rs

@@ -67,9 +67,9 @@ pub struct BaseCode {
     udp_read: unsafe extern "efiapi" fn(
         this: &Self,
         op_flags: UdpOpFlags,
-        dest_ip: Option<&mut IpAddress>,
+        dest_ip: *mut uefi_raw::IpAddress,
         dest_port: Option<&mut u16>,
-        src_ip: Option<&mut IpAddress>,
+        src_ip: *mut uefi_raw::IpAddress,
         src_port: Option<&mut u16>,
         header_size: Option<&usize>,
         header_ptr: *mut c_void,
@@ -519,9 +519,9 @@ impl BaseCode {
             (self.udp_read)(
                 self,
                 op_flags,
-                dest_ip,
+                opt_ip_addr_to_ptr_mut(dest_ip),
                 dest_port,
-                src_ip,
+                opt_ip_addr_to_ptr_mut(src_ip),
                 src_port,
                 header_size,
                 header_ptr,
@@ -641,6 +641,11 @@ fn opt_ip_addr_to_ptr(arg: Option<&IpAddress>) -> *const uefi_raw::IpAddress {
     arg.map(|arg| arg.as_raw_ptr()).unwrap_or_else(null)
 }
 
+/// Convert an `Option<&mut IpAddress>` to a `*mut uefi_raw::IpAddress`.
+fn opt_ip_addr_to_ptr_mut(arg: Option<&mut IpAddress>) -> *mut uefi_raw::IpAddress {
+    arg.map(|arg| arg.as_raw_ptr_mut()).unwrap_or_else(null_mut)
+}
+
 opaque_type! {
     /// Opaque type that should be used to represent a pointer to a [`DiscoverInfo`] in
     /// foreign function interfaces. This type produces a thin pointer, unlike