sys_bind: fix family parsing

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

patches/mlibc/mlibc.patch

@@ -1,4 +1,4 @@
-From ded2749ee28c99c1ec8a6fe4dbb6423a5287bf91 Mon Sep 17 00:00:00 2001
+From fb279173f0a97399a112bd8a5c2d3ec96f450374 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Thu, 10 Feb 2022 19:12:25 +1100
 Subject: [PATCH] yes
@@ -10,9 +10,9 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
  sysdeps/aero/generic/aero.cpp       | 12 ++++-
  sysdeps/aero/generic/filesystem.cpp | 79 ++++++++++++++++++++++++++---
  sysdeps/aero/generic/signals.cpp    |  8 ++-
- sysdeps/aero/generic/sockets.cpp    | 18 +++++++
+ sysdeps/aero/generic/sockets.cpp    | 28 ++++++++++
  sysdeps/aero/include/aero/syscall.h | 12 +++++
- 7 files changed, 121 insertions(+), 13 deletions(-)
+ 7 files changed, 131 insertions(+), 13 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index dbb35e8b..20c8d4c3 100644
@@ -210,10 +210,10 @@ index 3527370c..a6f69fff 100644
  } // namespace mlibc
 \ No newline at end of file
 diff --git a/sysdeps/aero/generic/sockets.cpp b/sysdeps/aero/generic/sockets.cpp
-index e69de29b..347556cd 100644
+index e69de29b..e4040629 100644
 --- a/sysdeps/aero/generic/sockets.cpp
 +++ b/sysdeps/aero/generic/sockets.cpp
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,28 @@
 +#include <mlibc/all-sysdeps.hpp>
 +#include <mlibc/thread-entry.hpp>
 +
@@ -231,6 +231,16 @@ index e69de29b..347556cd 100644
 +    *fd = result;
 +    return 0;
 +}
++
++int sys_bind(int fd, const struct sockaddr *addr_ptr, socklen_t addr_length) {
++    auto result = syscall(SYS_BIND, fd, addr_ptr, (sc_word_t)addr_length);
++
++    if (result < 0) {
++        return -result;
++    }
++
++    return 0;
++}
 +} // namespace mlibc
 diff --git a/sysdeps/aero/include/aero/syscall.h b/sysdeps/aero/include/aero/syscall.h
 index 07b1b51b..ef797e40 100644

src/aero_kernel/src/fs/inode.rs

@@ -82,6 +82,7 @@ pub trait INodeInterface: Send + Sync + Downcastable {
     fn stat(&self) -> Result<aero_syscall::Stat> {
         Err(FileSystemError::NotSupported)
     }
+
     /// Creates a new dev inode with the provided `name` and the device `marker` in
     /// the filesystem.
     ///
@@ -145,7 +146,7 @@ pub trait INodeInterface: Send + Sync + Downcastable {
     }
 
     // Socket operations
-    fn bind(&self, _address: &SocketAddr, _length: usize) -> Result<()> {
+    fn bind(&self, _address: SocketAddr, _length: usize) -> Result<()> {
         Err(FileSystemError::NotSupported)
     }
 }

src/aero_kernel/src/socket/unix.rs

@@ -49,7 +49,7 @@ impl INodeInterface for UnixSocket {
         })
     }
 
-    fn bind(&self, address: &SocketAddr, _length: usize) -> Result<()> {
+    fn bind(&self, address: SocketAddr, _length: usize) -> Result<()> {
         if let SocketAddr::Unix(address) = address {
             let path_len = address
                 .path

src/aero_kernel/src/syscall/net.rs

@@ -31,7 +31,17 @@ pub fn socket(
 // TODO: Figure out how to handle this.
 #[aero_proc::syscall]
 pub fn bind(fd: usize, address: usize, length: usize) -> Result<usize, AeroSyscallError> {
-    let address = unsafe { &*(address as *const SocketAddr) };
+    let family = unsafe { *(address as *const i32) };
+    let address = match family as usize {
+        AF_UNIX => SocketAddr::Unix(unsafe { &*(address as *const SocketAddrUnix) }),
+
+        _ => {
+            log::warn!("unsupported address family: {}", family);
+            return Err(AeroSyscallError::EINVAL);
+        }
+    };
+
+    // let address = unsafe { &*(address as *const SocketAddr) };
     let current_task = scheduler::get_scheduler().current_task();
     let file = current_task.file_table.get_handle(fd);
 

src/aero_syscall/src/lib.rs

@@ -674,10 +674,9 @@ pub struct SocketAddrInet {
     pub padding: [u8; 8],
 }
 
-#[derive(Debug, Clone)]
-pub enum SocketAddr {
-    Unix(SocketAddrUnix),
-    Inet(SocketAddrInet),
+pub enum SocketAddr<'a> {
+    Unix(&'a SocketAddrUnix),
+    Inet(&'a SocketAddrInet),
 }
 
 // constants for the socket types:
@@ -715,32 +714,6 @@ pub fn sys_socket(
     isize_as_syscall_result(value as _)
 }
 
-pub fn sys_connect(
-    fd: usize,
-    address: &SocketAddr,
-    length: u32,
-) -> Result<usize, AeroSyscallError> {
-    let value = syscall3(
-        prelude::SYS_CONNECT,
-        fd,
-        address as *const SocketAddr as usize,
-        length as usize,
-    );
-
-    isize_as_syscall_result(value as _)
-}
-
-pub fn sys_bind(fd: usize, address: &SocketAddr, length: u32) -> Result<usize, AeroSyscallError> {
-    let value = syscall3(
-        prelude::SYS_BIND,
-        fd,
-        address as *const SocketAddr as usize,
-        length as usize,
-    );
-
-    isize_as_syscall_result(value as _)
-}
-
 pub fn sys_listen(fd: usize, backlog: usize) -> Result<usize, AeroSyscallError> {
     let value = syscall2(prelude::SYS_LISTEN, fd, backlog);
     isize_as_syscall_result(value as _)