Propagate phy::RawSocket send error to caller

witchof0x20 · witchof0x20 · commit 32bf949dc816 · 2022-02-08T18:45:39.000-05:00
diff --git a/src/phy/raw_socket.rs b/src/phy/raw_socket.rs
@@ -111,7 +111,12 @@ impl phy::TxToken for TxToken {
         let mut lower = self.lower.borrow_mut();
         let mut buffer = vec![0; len];
         let result = f(&mut buffer);
-        lower.send(&buffer[..]).unwrap();
+        if let Err(err) = lower.send(&buffer[..]) {
+            return match err.kind() {
+                io::ErrorKind::WouldBlock => Err(crate::Error::Exhausted),
+                _ => Err(crate::Error::Illegal),
+            };
+        }
         result
     }
 }
diff --git a/src/phy/sys/raw_socket.rs b/src/phy/sys/raw_socket.rs
@@ -104,7 +104,7 @@ impl RawSocketDesc {
                 0,
             );
             if len == -1 {
-                Err(io::Error::last_os_error()).unwrap()
+                return Err(io::Error::last_os_error());
             }
             Ok(len as usize)
         }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,12 @@ impl phy::TxToken for TxToken {`
`111`	`111`	`let mut lower = self.lower.borrow_mut();`
`112`	`112`	`let mut buffer = vec![0; len];`
`113`	`113`	`let result = f(&mut buffer);`
`114`		`- lower.send(&buffer[..]).unwrap();`
	`114`	`+ if let Err(err) = lower.send(&buffer[..]) {`
	`115`	`+ return match err.kind() {`
	`116`	`+ io::ErrorKind::WouldBlock => Err(crate::Error::Exhausted),`
	`117`	`+ _ => Err(crate::Error::Illegal),`
	`118`	`+ };`
	`119`	`+ }`
`115`	`120`	`result`
`116`	`121`	`}`
`117`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ impl RawSocketDesc {`
`104`	`104`	`0,`
`105`	`105`	`);`
`106`	`106`	`if len == -1 {`
`107`		`- Err(io::Error::last_os_error()).unwrap()`
	`107`	`+ return Err(io::Error::last_os_error());`
`108`	`108`	`}`
`109`	`109`	`Ok(len as usize)`
`110`	`110`	`}`