openbsd fixes

n0-computer · May 21, 2024 · 4c4040f · 4c4040f
1 parent 76bf133
commit 4c4040f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/iroh-net/src/net/interfaces/bsd.rs b/iroh-net/src/net/interfaces/bsd.rs
@@ -214,7 +214,7 @@ const fn is_valid_rib_type(typ: RIBType) -> bool {
 }
 
 #[cfg(target_os = "openbsd")]
-const fn is_valid_rib_type(_typ: RIBType) -> bool {
+const fn is_valid_rib_type(typ: RIBType) -> bool {
     if typ == NET_RT_STATS || typ == NET_RT_TABLE {
         return false;
     }
@@ -309,8 +309,8 @@ impl WireFormat {
                 if data.len() < l as usize {
                     return Err(RouteError::InvalidMessage);
                 }
-                let ll = u16_from_ne_range(data, 4..6)?;
-                if data.len() < ll as usize {
+                let ll = u16_from_ne_range(data, 4..6)? as usize;
+                if data.len() < ll {
                     return Err(RouteError::InvalidMessage);
                 }
 

diff --git a/iroh-net/src/net/interfaces/bsd/openbsd.rs b/iroh-net/src/net/interfaces/bsd/openbsd.rs
@@ -43,6 +43,14 @@ pub const SHUT_RD: c_int = 0;
 pub const SHUT_WR: c_int = 1;
 pub const SHUT_RDWR: c_int = 2;
 
+// socket.h
+pub const NET_RT_STATS: c_int = 5;
+pub const NET_RT_TABLE: c_int = 5;
+
+pub const SIZEOF_SOCKADDR_STORAGE: usize = 0x80;
+pub const SIZEOF_SOCKADDR_INET: usize = 0x10;
+pub const SIZEOF_SOCKADDR_INET6: usize = 0x1c;
+
 // Hardcoded based on the generated values here: https://cs.opensource.google/go/x/net/+/master:route/sys_openbsd.go
 
 pub(super) fn probe_routing_stack() -> RoutingStack {