mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-01 15:08:21 +00:00
netdev: properly initialize all addresses now
This commit is contained in:
@@ -122,6 +122,9 @@ typedef struct {
|
|||||||
#define SO_PROTOCOL 38
|
#define SO_PROTOCOL 38
|
||||||
#define SO_DOMAIN 39
|
#define SO_DOMAIN 39
|
||||||
|
|
||||||
|
#define ARPHRD_ETHER 1
|
||||||
|
#define ARPHRD_LOOPBACK 772
|
||||||
|
|
||||||
#define SOL_SOCKET 1
|
#define SOL_SOCKET 1
|
||||||
#define SOL_TCP 6
|
#define SOL_TCP 6
|
||||||
|
|
||||||
|
|||||||
@@ -32,8 +32,10 @@ static int netdev_ioctl(int minor, unsigned long request, void *arg, int *result
|
|||||||
net_info_t *info = arg;
|
net_info_t *info = arg;
|
||||||
sockaddr_t addr = {0};
|
sockaddr_t addr = {0};
|
||||||
abisockaddr_t abisockaddr;
|
abisockaddr_t abisockaddr;
|
||||||
|
abisockaddr_t empty_addr = {0};
|
||||||
short flags = netdev->flags;
|
short flags = netdev->flags;
|
||||||
int mtu = netdev->mtu;
|
int mtu = netdev->mtu;
|
||||||
|
short hwaddr_type = (netdev->flags & NETDEV_FLAGS_LOOPBACK) ? ARPHRD_LOOPBACK : ARPHRD_ETHER;
|
||||||
|
|
||||||
addr.ipv4addr.addr = netdev->ip;
|
addr.ipv4addr.addr = netdev->ip;
|
||||||
sock_addrtoabiaddr(SOCKET_TYPE_UDP, &addr, &abisockaddr);
|
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)
|
if (error)
|
||||||
return 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)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user