socket::inet: implement SIOCGIFHWADDR

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

Author: Andy-Python-Programmer

patches/rust-libc/rust-libc.patch

@@ -1,14 +1,14 @@
-From 06433417feda99e2f407026d95349e3dbde054d1 Mon Sep 17 00:00:00 2001
+From 1c11650435d49430ddc9838ae0e59a8bcdad8243 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
-Date: Fri, 17 Feb 2023 18:18:23 +1100
+Date: Fri, 3 Mar 2023 16:39:55 +1100
 Subject: [PATCH] <xxx>
 
 ---
  .../linux_like/linux/gnu/b64/x86_64/mod.rs    |   4 +-
  src/unix/linux_like/linux/gnu/mod.rs          |   4 +-
  src/unix/linux_like/linux/mod.rs              |  28 +-
- src/unix/mlibc/mod.rs                         | 457 ++++++++++++++++--
- 4 files changed, 439 insertions(+), 54 deletions(-)
+ src/unix/mlibc/mod.rs                         | 460 ++++++++++++++++--
+ 4 files changed, 442 insertions(+), 54 deletions(-)
 
 diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
 index e6307e2..cae81c4 100644
@@ -185,7 +185,7 @@ index be12190..c8762d5 100644
                      .field("ifr_name", &self.ifr_name)
                      .field("ifr_ifru", &self.ifr_ifru)
 diff --git a/src/unix/mlibc/mod.rs b/src/unix/mlibc/mod.rs
-index 2046530..abae13c 100644
+index 2046530..0d74760 100644
 --- a/src/unix/mlibc/mod.rs
 +++ b/src/unix/mlibc/mod.rs
 @@ -47,7 +47,6 @@ pub type fsfilcnt_t = ::c_uint;
@@ -734,7 +734,7 @@ index 2046530..abae13c 100644
  pub const F_GETOWN: ::c_int = 10;
  pub const F_SETOWN: ::c_int = 11;
  pub const O_ACCMODE: ::c_int = 7;
-@@ -644,23 +956,51 @@ pub const S_IXGRP: mode_t = 0o10;
+@@ -644,23 +956,54 @@ pub const S_IXGRP: mode_t = 0o10;
  pub const S_IXOTH: mode_t = 0o1;
  pub const S_IXUSR: mode_t = 0o100;
 
@@ -784,10 +784,13 @@ index 2046530..abae13c 100644
  // options/ansi/include/limits.h
  pub const PTHREAD_STACK_MIN: ::size_t = 16384;
 +pub const PATH_MAX: ::size_t = 4096;
++
++// abis/linux/ioctls.h
++pub const SIOCGIFHWADDR: ::c_ulong = 0x00008927;
 
  // options/posix/include/pthread.h
  align_const! {
-@@ -668,9 +1008,12 @@ align_const! {
+@@ -668,9 +1011,12 @@ align_const! {
          __mlibc_state: 0,
          __mlibc_recursion: 0,
          __mlibc_flags: 0,
@@ -800,7 +803,7 @@ index 2046530..abae13c 100644
      };
      pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
          __mlibc_m: 0,
-@@ -689,11 +1032,40 @@ pub const PTHREAD_PROCESS_PRIVATE: ::c_int = 0;
+@@ -689,11 +1035,40 @@ pub const PTHREAD_PROCESS_PRIVATE: ::c_int = 0;
  pub const PTHREAD_PROCESS_SHARED: ::c_int = 1;
 
  extern "C" {
@@ -841,7 +844,7 @@ index 2046530..abae13c 100644
      pub fn getgrgid_r(
          gid: ::gid_t,
          grp: *mut ::group,
-@@ -728,13 +1100,24 @@ extern "C" {
+@@ -728,13 +1103,24 @@ extern "C" {
          buflen: ::size_t,
          result: *mut *mut passwd,
      ) -> ::c_int;
@@ -870,7 +873,7 @@ index 2046530..abae13c 100644
      pub fn pthread_create(
          thread: *mut ::pthread_t,
          attr: *const ::pthread_attr_t,
-@@ -752,6 +1135,8 @@ extern "C" {
+@@ -752,6 +1138,8 @@ extern "C" {
          addr: *mut ::sockaddr,
          addrlen: *mut ::socklen_t,
      ) -> ::ssize_t;

src/aero_kernel/src/net/ethernet.rs

@@ -26,10 +26,11 @@ use super::*;
 
 #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
 #[repr(C)]
-pub struct MacAddr(pub [u8; 6]);
+pub struct MacAddr(pub [u8; Self::ADDR_SIZE]);
 
 impl MacAddr {
-    pub const BROADCAST: Self = Self([0xff; 6]);
+    pub const ADDR_SIZE: usize = 6;
+    pub const BROADCAST: Self = Self([0xff; Self::ADDR_SIZE]);
 }
 
 #[repr(u16)]

src/aero_kernel/src/socket/inet.rs

@@ -17,6 +17,7 @@
  * along with Aero. If not, see <https://www.gnu.org/licenses/>.
  */
 
+use aero_syscall::prelude::SIOCGIFHWADDR;
 use aero_syscall::socket::MessageHeader;
 use aero_syscall::{IpProtocol, OpenFlags, SocketAddrInet, SocketType, SyscallError};
 use alloc::sync::{Arc, Weak};
@@ -29,7 +30,7 @@ use crate::fs::inode::{FileType, INodeInterface, Metadata, PollFlags};
 use crate::fs::{self, FileSystemError};
 use crate::net::ip::Ipv4Addr;
 use crate::net::udp::{self, Udp, UdpHandler};
-use crate::net::{Packet, PacketHeader, PacketTrait};
+use crate::net::{self, MacAddr, Packet, PacketHeader, PacketTrait};
 use crate::utils::sync::{BlockQueue, Mutex};
 
 #[derive(Default)]
@@ -222,6 +223,21 @@ impl INodeInterface for InetSocket {
             .sum::<usize>())
     }
 
+    fn ioctl(&self, command: usize, arg: usize) -> fs::Result<usize> {
+        match command {
+            SIOCGIFHWADDR => {
+                let hwaddr =
+                    unsafe { core::slice::from_raw_parts_mut(arg as *mut u8, MacAddr::ADDR_SIZE) };
+
+                let mac_addr = net::default_device().mac();
+                hwaddr.copy_from_slice(&mac_addr.0.as_slice());
+                Ok(0)
+            }
+
+            _ => unreachable!("inet::ioctl(): unknown command {command}"),
+        }
+    }
+
     fn poll(&self, table: Option<&mut fs::inode::PollTable>) -> fs::Result<PollFlags> {
         if let Some(table) = table {
             table.insert(&self.wq);

src/aero_syscall/src/consts.rs

@@ -346,3 +346,6 @@ pub struct FramebufferFScreenInfo {
     pub capabilities: u16,
     pub reserved: [u16; 2],
 }
+
+// networking ioctls:
+pub const SIOCGIFHWADDR: usize = 0x8927;