aero_syscall: update socket constants

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

Author: Andy-Python-Programmer

patches/mlibc/mlibc.patch

@@ -1,4 +1,4 @@
-From 1f388ec59a355c18a21aa23226159d90fcb35912 Mon Sep 17 00:00:00 2001
+From ded2749ee28c99c1ec8a6fe4dbb6423a5287bf91 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,8 +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/include/aero/syscall.h | 12 +++++
- 6 files changed, 103 insertions(+), 13 deletions(-)
+ 7 files changed, 121 insertions(+), 13 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index dbb35e8b..20c8d4c3 100644
@@ -208,6 +209,29 @@ 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
+--- a/sysdeps/aero/generic/sockets.cpp
++++ b/sysdeps/aero/generic/sockets.cpp
+@@ -0,0 +1,18 @@
++#include <mlibc/all-sysdeps.hpp>
++#include <mlibc/thread-entry.hpp>
++
++#include <aero/syscall.h>
++#include <stdint.h>
++
++namespace mlibc {
++int sys_socket(int family, int type, int protocol, int *fd) {
++    auto result = syscall(SYS_SOCKET, family, type, protocol);
++
++    if (result < 0) {
++        return -result;
++    }
++
++    *fd = 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
 --- a/sysdeps/aero/include/aero/syscall.h

src/aero_kernel/src/syscall/net.rs

@@ -12,10 +12,7 @@ pub fn socket(
         (AF_UNIX, SOCK_STREAM, 0) => UnixSocket::new(),
         (_, _, _) => {
             log::warn!(
-                "unsupported socket type: domain={}, socket_type={}, protocol={}",
-                domain,
-                socket_type,
-                protocol
+                "unsupported socket type: domain={domain}, socket_type={socket_type}, protocol={protocol}"
             );
 
             return Err(AeroSyscallError::EINVAL);

src/aero_syscall/src/lib.rs

@@ -680,14 +680,31 @@ pub enum SocketAddr {
     Inet(SocketAddrInet),
 }
 
-pub const AF_UNIX: usize = 1;
-pub const AF_INET: usize = 2;
-
-pub const SOCK_STREAM: usize = 1;
-pub const SOCK_DGRAM: usize = 2;
-
-pub const IPPROTO_TCP: usize = 6;
-pub const IPPROTO_UDP: usize = 17;
+// constants for the socket types:
+//
+// mlibc/sysdeps/aero/include/abi-bits/socket.h
+pub const SOCK_DGRAM: usize = 1;
+pub const SOCK_RAW: usize = 2;
+pub const SOCK_SEQPACKET: usize = 3;
+pub const SOCK_STREAM: usize = 4;
+pub const SOCK_NONBLOCK: usize = 0x10000;
+pub const SOCK_CLOEXEC: usize = 0x20000;
+
+pub const PF_INET: usize = 1;
+pub const PF_INET6: usize = 2;
+pub const PF_UNIX: usize = 3;
+pub const PF_LOCAL: usize = 3;
+pub const PF_UNSPEC: usize = 4;
+pub const PF_NETLINK: usize = 5;
+pub const PF_BRIDGE: usize = 6;
+
+pub const AF_INET: usize = PF_INET;
+pub const AF_INET6: usize = PF_INET6;
+pub const AF_UNIX: usize = PF_UNIX;
+pub const AF_LOCAL: usize = PF_LOCAL;
+pub const AF_UNSPEC: usize = PF_UNSPEC;
+pub const AF_NETLINK: usize = PF_NETLINK;
+pub const AF_BRIDGE: usize = PF_BRIDGE;
 
 pub fn sys_socket(
     domain: usize,