Merge #686

686: Changes egress functions to pass up Err(Exhausted) r=thvdveld a=benbrittain

Currently the poll functions will return `Ok(true)` instead of `Err(Exhausted)` despite logging about the failed transmission

Co-authored-by: Benjamin Brittain <ben@brittain.org>
Co-authored-by: Thibaut Vandervelden <thvdveld@vub.be>

Author: 3 people

src/iface/interface.rs

@@ -1027,14 +1027,20 @@ impl<'a> Interface<'a> {
         #[cfg(feature = "proto-ipv4-fragmentation")]
         match self.ipv4_egress(device) {
             Ok(true) => return Ok(true),
-            Err(e) => return Err(e),
+            Err(e) => {
+                net_debug!("failed to transmit: {}", e);
+                return Err(e);
+            }
             _ => (),
         }
 
         #[cfg(feature = "proto-sixlowpan-fragmentation")]
         match self.sixlowpan_egress(device) {
             Ok(true) => return Ok(true),
-            Err(e) => return Err(e),
+            Err(e) => {
+                net_debug!("failed to transmit: {}", e);
+                return Err(e);
+            }
             _ => (),
         }
 
@@ -1333,6 +1339,11 @@ impl<'a> Interface<'a> {
         }
     }
 
+    /// Process fragments that still need to be sent for IPv4 packets.
+    ///
+    /// This function returns a boolean value indicating whether any packets were
+    /// processed or emitted, and thus, whether the readiness of any socket might
+    /// have changed.
     #[cfg(feature = "proto-ipv4-fragmentation")]
     fn ipv4_egress<D>(&mut self, device: &mut D) -> Result<bool>
     where
@@ -1354,25 +1365,23 @@ impl<'a> Interface<'a> {
         } = &self.out_packets.ipv4_out_packet;
 
         if *packet_len > *sent_bytes {
-            match device.transmit().ok_or(Error::Exhausted) {
-                Ok(tx_token) => {
-                    if let Err(e) = self
-                        .inner
-                        .dispatch_ipv4_out_packet(tx_token, &mut self.out_packets.ipv4_out_packet)
-                    {
-                        net_debug!("failed to transmit: {}", e);
-                    }
-                }
-                Err(e) => {
-                    net_debug!("failed to transmit: {}", e);
-                }
+            match device.transmit() {
+                Some(tx_token) => self
+                    .inner
+                    .dispatch_ipv4_out_packet(tx_token, &mut self.out_packets.ipv4_out_packet),
+                None => Err(Error::Exhausted),
             }
-            Ok(true)
+            .map(|_| true)
         } else {
             Ok(false)
         }
     }
 
+    /// Process fragments that still need to be sent for 6LoWPAN packets.
+    ///
+    /// This function returns a boolean value indicating whether any packets were
+    /// processed or emitted, and thus, whether the readiness of any socket might
+    /// have changed.
     #[cfg(feature = "proto-sixlowpan-fragmentation")]
     fn sixlowpan_egress<D>(&mut self, device: &mut D) -> Result<bool>
     where
@@ -1393,25 +1402,15 @@ impl<'a> Interface<'a> {
             ..
         } = &self.out_packets.sixlowpan_out_packet;
 
-        if *packet_len == 0 {
-            return Ok(false);
-        }
-
         if *packet_len > *sent_bytes {
-            match device.transmit().ok_or(Error::Exhausted) {
-                Ok(tx_token) => {
-                    if let Err(e) = self.inner.dispatch_ieee802154_out_packet(
-                        tx_token,
-                        &mut self.out_packets.sixlowpan_out_packet,
-                    ) {
-                        net_debug!("failed to transmit: {}", e);
-                    }
-                }
-                Err(e) => {
-                    net_debug!("failed to transmit: {}", e);
-                }
+            match device.transmit() {
+                Some(tx_token) => self.inner.dispatch_ieee802154_out_packet(
+                    tx_token,
+                    &mut self.out_packets.sixlowpan_out_packet,
+                ),
+                None => Err(Error::Exhausted),
             }
-            Ok(true)
+            .map(|_| true)
         } else {
             Ok(false)
         }