syscalls - Deduplication for UDP/raw... at least the start

Author: thepowersgang

Kernel/Modules/syscalls/network_calls.rs

@@ -11,8 +11,10 @@ unsafe impl crate::args::Pod for crate::values::NetworkInterface {}
 unsafe impl crate::args::Pod for crate::values::NetworkRoute {}
 unsafe impl crate::args::Pod for crate::values::NetworkAddress {}
 
+mod traits;
 mod raw;
 mod tcp;
+//mod udp;
 
 pub fn init_handles() {
 	crate::objects::push_as_unclaimed("NetMgmt", crate::objects::new_object(InterfaceManagement));
@@ -30,6 +32,15 @@ fn from_ipv4(a: ::network::ipv4::Address) -> [u8; 16] {
 	]
 }
 
+fn addr_from_socket(sa: &SocketAddress) -> Result<::network::Address,super::Error> {
+	match SocketAddressType::try_from(sa.addr_ty)
+	{
+	Err(_) => return Err(super::Error::BadValue),
+	Ok(SocketAddressType::Ipv4) => Ok(::network::Address::Ipv4(make_ipv4(&sa.addr))),
+	_ => todo!("Other address socket types - #{}", sa.addr_ty),
+	}
+}
+
 /// Open a connection-based listen server
 pub fn new_server(local_address: SocketAddress) -> Result<u64, super::Error>
 {
@@ -40,12 +51,7 @@ pub fn new_server(local_address: SocketAddress) -> Result<u64, super::Error>
 		t => todo!("Socket type: {:?}", t),
 		}
 	}
-	let addr = match SocketAddressType::try_from(local_address.addr_ty)
-		{
-		Err(_) => return Err(super::Error::BadValue),
-		Ok(SocketAddressType::Ipv4) => ::network::Address::Ipv4(make_ipv4(&local_address.addr)),
-		_ => todo!(""),
-		};
+	let addr = addr_from_socket(&local_address)?;
 	let port_ty = crate::values::SocketPortType::try_from(local_address.port_ty).map_err(|_| super::Error::BadValue)?;
 	let o =  inner(addr, port_ty, local_address.port);
 	Ok(super::from_result::<_,::syscall_values::SocketError>(o))
@@ -96,13 +102,19 @@ pub fn new_free_socket(local_address: SocketAddress, remote_mask: crate::values:
 						Err(crate::values::SocketError::InvalidValue)
 					}
 					else {
-						Ok(crate::objects::new_object(raw::RawIpv4::new(source, local_address.port as u8)?))
+						Ok(crate::objects::new_object(traits::FreeSocketWrapper(
+							raw::RawIpv4::new(source, local_address.port as u8)?
+						)))
 					}
 					},
 				_ => todo!("Handle other address types"),
 				},
 			SocketPortType::Tcp => Err(crate::values::SocketError::InvalidValue),
-			SocketPortType::Udp => todo!("Handle other socket types"),
+			//SocketPortType::Udp => Ok(crate::objects::new_object(traits::FreeSocketWrapper({
+			//	let source = addr_from_socket(&remote_mask);
+			//	udp::Udp::new(source, local_address.port)
+			//}))),
+			SocketPortType::Udp => todo!("UDP sockets"),
 			_ => todo!("Handle other socket types"),
 			}
 		}

Kernel/Modules/syscalls/network_calls/raw.rs

@@ -3,8 +3,6 @@
 //
 // Core/syscalls/network_calls/raw.rs
 //! Userland interface to the network stack - Raw Sockets
-use crate::args::Args;
-use kernel::memory::freeze::{Freeze,FreezeMut};
 use ::syscall_values::{SocketAddress,SocketAddressType};
 
 pub struct RawIpv4
@@ -23,47 +21,21 @@ impl RawIpv4
 			})
 	}
 }
-impl crate::objects::Object for RawIpv4
+impl super::traits::FreeSocket for RawIpv4
 {
-	fn class(&self) -> u16 { crate::values::CLASS_FREESOCKET }
-	fn as_any(&self) -> &dyn core::any::Any { self }
-	fn try_clone(&self) -> Option<u32> {
-		None
-		//Some( ::objects::new_object(self.clone()) )
-	}
-	fn handle_syscall_ref(&self, call: u16, args: &mut Args) -> Result<u64, crate::Error> {
-		match call
-		{
-		crate::values::NET_FREESOCK_SENDTO => {
-			let data: Freeze<[u8]> = args.get()?;
-			let addr: Freeze<SocketAddress> = args.get()?;
-			if addr.addr_ty != SocketAddressType::Ipv4 as u8 {
-				return Err(crate::Error::BadValue);
-			}
-			let dest = super::make_ipv4(&addr.addr);
-			::kernel::futures::block_on(
-				::network::ipv4::send_packet(self.source, dest, self.proto, ::network::nic::SparsePacket::new_root(&data))
-				);
-			Ok(0)
-			},
-		crate::values::NET_FREESOCK_RECVFROM => {
-			let data: FreezeMut<[u8]> = args.get()?;
-			let mut addr: FreezeMut<SocketAddress> = args.get()?;
-			addr.addr_ty = SocketAddressType::Ipv4 as u8;
-			todo!("NET_FREESOCK_RECV({:p}, {:p})", &*data, &*addr);
-			},
-		_ => crate::objects::object_has_no_such_method_ref("network_calls::FreeSocket", call),
+	fn send_to(&self, data: &[u8], addr: &SocketAddress) -> Result<u64, crate::Error> {
+		if addr.addr_ty != SocketAddressType::Ipv4 as u8 {
+			return Err(crate::Error::BadValue);
 		}
+		let dest = super::make_ipv4(&addr.addr);
+		::kernel::futures::block_on(
+			::network::ipv4::send_packet(self.source, dest, self.proto, ::network::nic::SparsePacket::new_root(&data))
+			);
+		Ok(0)
 	}
-	fn handle_syscall_val(&mut self, call: u16, _args: &mut Args) -> Result<u64, crate::Error> {
-		// SAFE: Valid pointer which is forgotten after call
-		let _ = unsafe { ::core::ptr::read(self) };
-		crate::objects::object_has_no_such_method_val("network_calls::FreeSocket", call)
-	}
-	fn bind_wait(&self, _flags: u32, _obj: &mut ::kernel::threads::SleepObject) -> u32 {
-		0
-	}
-	fn clear_wait(&self, _flags: u32, _obj: &mut ::kernel::threads::SleepObject) -> u32 {
-		0
+
+	fn recv_from(&self, data: &mut [u8], addr: &mut SocketAddress) -> Result<u64, crate::Error> {
+		addr.addr_ty = SocketAddressType::Ipv4 as u8;
+		todo!("NET_FREESOCK_RECV({:p}, {:p})", &*data, &*addr);
 	}
 }

Kernel/Modules/syscalls/network_calls/traits.rs

@@ -0,0 +1,54 @@
+
+use crate::args::Args;
+use crate::values::SocketAddress;
+use kernel::memory::freeze::{Freeze,FreezeMut};
+
+pub trait FreeSocket: 'static + Sized + Send + Sync
+{
+	fn try_clone(&self) -> Option<Self> {
+		None
+	}
+	fn send_to(&self, data: &[u8], addr: &SocketAddress) -> Result<u64, crate::Error>;
+	fn recv_from(&self, data: &mut [u8], addr: &mut SocketAddress) -> Result<u64, crate::Error>;
+}
+pub struct FreeSocketWrapper<T>(pub T);
+impl<T> crate::objects::Object for FreeSocketWrapper<T>
+where
+	T: FreeSocket
+{
+	fn class(&self) -> u16 { crate::values::CLASS_FREESOCKET }
+	fn as_any(&self) -> &dyn core::any::Any { self }
+	fn try_clone(&self) -> Option<u32> {
+		match self.0.try_clone() {
+		Some(v) => Some(crate::objects::new_object(FreeSocketWrapper(v))),
+		None => None,
+		}
+	}
+	fn handle_syscall_ref(&self, call: u16, args: &mut Args) -> Result<u64, crate::Error> {
+		match call
+		{
+		crate::values::NET_FREESOCK_SENDTO => {
+			let data: Freeze<[u8]> = args.get()?;
+			let addr: Freeze<SocketAddress> = args.get()?;
+			self.0.send_to(&data, &addr)
+			},
+		crate::values::NET_FREESOCK_RECVFROM => {
+			let mut data: FreezeMut<[u8]> = args.get()?;
+			let mut addr: FreezeMut<SocketAddress> = args.get()?;
+			self.0.recv_from(&mut data, &mut addr)
+			},
+		_ => crate::objects::object_has_no_such_method_ref("network_calls::FreeSocket", call),
+		}
+	}
+	fn handle_syscall_val(&mut self, call: u16, _args: &mut Args) -> Result<u64, crate::Error> {
+		// SAFE: Valid pointer which is forgotten after call
+		let _ = unsafe { ::core::ptr::read(self) };
+		crate::objects::object_has_no_such_method_val("network_calls::FreeSocket", call)
+	}
+	fn bind_wait(&self, _flags: u32, _obj: &mut ::kernel::threads::SleepObject) -> u32 {
+		0
+	}
+	fn clear_wait(&self, _flags: u32, _obj: &mut ::kernel::threads::SleepObject) -> u32 {
+		0
+	}
+}

Kernel/Modules/syscalls/network_calls/udp.rs

@@ -0,0 +1,33 @@
+// "Tifflin" Kernel
+// - By John Hodge (thePowersGang)
+//
+// Core/syscalls/network_calls/udp.rs
+//! Userland interface to the network stack - UDP Sockets
+use crate::args::Args;
+use kernel::memory::freeze::{Freeze,FreezeMut};
+use ::syscall_values::{SocketAddress,SocketAddressType};
+
+pub struct Udp
+{
+	inner: ::network::udp::Socket,
+}
+impl Udp
+{
+	pub(crate) fn new(source: ::network::ipv4::Address, port: u16) -> Result<Self, crate::values::SocketError>
+	{
+		Ok( RawIpv4 {
+			source,
+			proto,
+			//handle: ::network::ipv4::listen_raw(source, make_ipv4(&remote_mask.addr), remote_mask.mask),
+			})
+	}
+}
+impl super::traits::FreeSocket for Udp {
+	fn send_to(&self, data: &[u8], addr: &SocketAddress) -> Result<u64, crate::Error> {
+		todo!()
+	}
+
+	fn recv_from(&self, data: &mut [u8], addr: &mut SocketAddress) -> Result<u64, crate::Error> {
+		todo!()
+	}
+}