sockets::inet:: SIOCGIFINDEX stub

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

Author: Andy-Python-Programmer

patches/mlibc/mlibc.patch

@@ -1,21 +1,15 @@
-From fb1766aa2abfb310b6c1b0904f849f5d6c8fb62b Mon Sep 17 00:00:00 2001
+From 7ffa4a93ab4c1a5a5dd129dce1d03f784ace2e06 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
-Date: Sat, 11 Mar 2023 16:55:47 +1100
+Date: Mon, 13 Mar 2023 16:14:34 +1100
 Subject: [PATCH] <xxx>
 
 ---
- .gitignore                            |  2 +
- options/ansi/generic/stdlib-stubs.cpp |  6 +-
- options/glibc/generic/execinfo.cpp    |  5 +-
+ .gitignore                            |  2 ++
+ options/ansi/generic/stdlib-stubs.cpp |  6 ++++--
+ options/glibc/generic/execinfo.cpp    |  5 +++--
  options/rtdl/generic/linker.cpp       |  2 +-
- sysdeps/aero/generic/aero.cpp         | 77 +++++++++++++--------
- sysdeps/aero/generic/filesystem.cpp   | 51 ++++++++++++--
- sysdeps/aero/generic/sockets.cpp      | 96 ++++++++++++++++++++++++++-
- sysdeps/aero/generic/time.cpp         | 24 +++++++
- sysdeps/aero/include/aero/syscall.h   | 11 +++
- sysdeps/aero/meson.build              |  1 +
- 10 files changed, 234 insertions(+), 41 deletions(-)
- create mode 100644 sysdeps/aero/generic/time.cpp
+ sysdeps/aero/generic/sockets.cpp      | 25 +++++++++++++++++++++++++
+ 5 files changed, 35 insertions(+), 5 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index fdd60a0..9f811f4 100644
@@ -73,7 +67,49 @@ index 6eb9d09..2ab5bc9 100644
 +constexpr bool logBaseAddresses = true;
  constexpr bool logRpath = false;
  constexpr bool eagerBinding = true;
-
+ 
+diff --git a/sysdeps/aero/generic/sockets.cpp b/sysdeps/aero/generic/sockets.cpp
+index c730bff..39cacb4 100644
+--- a/sysdeps/aero/generic/sockets.cpp
++++ b/sysdeps/aero/generic/sockets.cpp
+@@ -4,7 +4,11 @@
+ #include <abi-bits/in.h>
+ 
+ #include <aero/syscall.h>
++
++#include <unistd.h>
+ #include <stdint.h>
++#include <net/if.h>
++#include <sys/ioctl.h>
+ 
+ namespace mlibc {
+ int sys_socket(int family, int type, int protocol, int *fd) {
+@@ -187,4 +191,25 @@ int sys_setsockopt(int fd, int layer, int number, const void *buffer,
+         __builtin_unreachable();
+     }
+ }
++
++int sys_if_nametoindex(const char *name, unsigned int *ret) {
++    int fd = 0;
++
++    // TODO(andypython): is the SOCK_CLOEXEC flag required in this case?
++    int r = sys_socket(AF_INET, SOCK_DGRAM, AF_UNSPEC, &fd);
++    if (r)
++        return r;
++
++    struct ifreq ifr;
++    strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
++
++    r = sys_ioctl(fd, SIOCGIFINDEX, &ifr, NULL);
++    close(fd);
++
++    if (r)
++        return r;
++
++    *ret = ifr.ifr_ifindex;
++    return 0;
++}
+ } // namespace mlibc
 -- 
-2.39.1
+2.39.2
 

src/aero_kernel/src/socket/inet.rs

@@ -17,7 +17,7 @@
  * along with Aero. If not, see <https://www.gnu.org/licenses/>.
  */
 
-use aero_syscall::prelude::{IfReq, SIOCGIFHWADDR, SIOCSIFADDR};
+use aero_syscall::prelude::{IfReq, SIOCGIFHWADDR, SIOCGIFINDEX, SIOCSIFADDR};
 use aero_syscall::socket::MessageHeader;
 use aero_syscall::{IpProtocol, OpenFlags, SocketAddrInet, SocketType, SyscallError};
 use alloc::sync::{Arc, Weak};
@@ -64,7 +64,9 @@ pub struct InetSocket {
 
 impl InetSocket {
     pub fn new(typ: SocketType, protocol: IpProtocol) -> Result<Arc<Self>, SyscallError> {
-        if typ != SocketType::Dgram && protocol != IpProtocol::Udp {
+        if typ != SocketType::Dgram
+            && (protocol != IpProtocol::Udp || protocol != IpProtocol::Default)
+        {
             return Err(SyscallError::EINVAL);
         }
 
@@ -228,6 +230,18 @@ impl INodeInterface for InetSocket {
 
     fn ioctl(&self, command: usize, arg: usize) -> fs::Result<usize> {
         match command {
+            SIOCGIFINDEX => {
+                let ifreq = VirtAddr::new(arg as _)
+                    .read_mut::<IfReq>()
+                    .ok_or(FileSystemError::NotSupported)?;
+
+                let name = ifreq.name().unwrap();
+                assert!(name == "eth0");
+
+                ifreq.data.ifindex = 1; // FIXME: Fill the actual interface index
+                Ok(0)
+            }
+
             SIOCGIFHWADDR => {
                 let ifreq = VirtAddr::new(arg as _)
                     .read_mut::<IfReq>()
@@ -237,7 +251,10 @@ impl INodeInterface for InetSocket {
                 assert!(name == "eth0");
 
                 let hwaddr = unsafe {
-                    core::slice::from_raw_parts_mut(ifreq.sa_data.as_mut_ptr(), MacAddr::ADDR_SIZE)
+                    core::slice::from_raw_parts_mut(
+                        ifreq.data.addr.sa_data.as_mut_ptr(),
+                        MacAddr::ADDR_SIZE,
+                    )
                 };
 
                 let mac_addr = net::default_device().mac();
@@ -250,10 +267,12 @@ impl INodeInterface for InetSocket {
                     .read_mut::<IfReq>()
                     .ok_or(FileSystemError::NotSupported)?;
 
+                let family = unsafe { ifreq.data.addr.sa_family };
+
                 let name = ifreq.name().ok_or(FileSystemError::InvalidPath)?;
                 let socket = SocketAddr::from_family(
-                    VirtAddr::new(&ifreq.sa_family as *const _ as _),
-                    ifreq.sa_family,
+                    VirtAddr::new(&unsafe { ifreq.data.addr } as *const _ as _),
+                    family,
                 )
                 .ok_or(FileSystemError::NotSupported)?
                 .as_inet()

src/aero_syscall/src/consts.rs

@@ -17,6 +17,8 @@
  * along with Aero. If not, see <https://www.gnu.org/licenses/>.
  */
 
+use core::ffi;
+
 use crate::OpenFlags;
 
 // syscall number constants:
@@ -348,17 +350,36 @@ pub struct FramebufferFScreenInfo {
 }
 
 // networking ioctls:
+pub const SIOCGIFINDEX: usize = 0x8933;
 pub const SIOCGIFHWADDR: usize = 0x8927;
 pub const SIOCSIFADDR: usize = 0x8916; // set PA address
 
 const IF_NAME_SIZE: usize = 16;
 
+#[derive(Clone, Copy)]
+#[repr(C)]
+pub struct SockAddrStorage {
+    pub sa_family: u32,
+    pub sa_data: [u8; 14],
+}
+
+#[repr(C)]
+pub union IfrIfru {
+    pub addr: SockAddrStorage,
+    pub flags: ffi::c_short,
+    pub ifindex: ffi::c_int,
+    pub metric: ffi::c_int,
+    pub mtu: ffi::c_int,
+    pub slave: [u8; IF_NAME_SIZE],
+    pub newname: [u8; IF_NAME_SIZE],
+    pub data: *mut u8,
+}
+
 #[repr(C)]
 pub struct IfReq {
     /// interface name, e.g. "en0"
     pub name: [u8; IF_NAME_SIZE],
-    pub sa_family: u32,
-    pub sa_data: [u8; 14],
+    pub data: IfrIfru,
 }
 
 impl IfReq {