diff --git a/kernel-src/include/kernel/abi.h b/kernel-src/include/kernel/abi.h index 442ebc19..9f06d0a5 100644 --- a/kernel-src/include/kernel/abi.h +++ b/kernel-src/include/kernel/abi.h @@ -122,6 +122,9 @@ typedef struct { #define SO_PROTOCOL 38 #define SO_DOMAIN 39 +#define ARPHRD_ETHER 1 +#define ARPHRD_LOOPBACK 772 + #define SOL_SOCKET 1 #define SOL_TCP 6 diff --git a/kernel-src/io/net/netdev.c b/kernel-src/io/net/netdev.c index e87cc703..e8f1a766 100644 --- a/kernel-src/io/net/netdev.c +++ b/kernel-src/io/net/netdev.c @@ -32,8 +32,10 @@ static int netdev_ioctl(int minor, unsigned long request, void *arg, int *result net_info_t *info = arg; sockaddr_t addr = {0}; abisockaddr_t abisockaddr; + abisockaddr_t empty_addr = {0}; short flags = netdev->flags; int mtu = netdev->mtu; + short hwaddr_type = (netdev->flags & NETDEV_FLAGS_LOOPBACK) ? ARPHRD_LOOPBACK : ARPHRD_ETHER; addr.ipv4addr.addr = netdev->ip; sock_addrtoabiaddr(SOCKET_TYPE_UDP, &addr, &abisockaddr); @@ -41,7 +43,23 @@ static int netdev_ioctl(int minor, unsigned long request, void *arg, int *result if (error) return error; - error = USERCOPY_POSSIBLY_TO_USER(&info->hwaddr, &netdev->mac, sizeof(netdev->mac)); + error = USERCOPY_POSSIBLY_TO_USER(&info->broadaddr, &empty_addr, sizeof(empty_addr)); + if (error) + return error; + + error = USERCOPY_POSSIBLY_TO_USER(&info->netmask, &empty_addr, sizeof(empty_addr)); + if (error) + return error; + + error = USERCOPY_POSSIBLY_TO_USER(&info->hwaddr, &empty_addr, sizeof(empty_addr)); + if (error) + return error; + + error = USERCOPY_POSSIBLY_TO_USER(&info->hwaddr.type, &hwaddr_type, sizeof(hwaddr_type)); + if (error) + return error; + + error = USERCOPY_POSSIBLY_TO_USER(info->hwaddr.addr, netdev->mac.address, sizeof(mac_t)); if (error) return error;