sunos: set phys_addr of interface_address using ARP
If getifaddrs() returns an all zero ifa_addr field, then use ARP to set the phys_addr field of the uv_interface_address_t on the sunos platform. PR-URL: https://github.com/libuv/libuv/pull/907 Reviewed-By: Imran Iqbal <imran@imraniqbal.org> Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
This commit is contained in:
parent
7b9e25a9a9
commit
d75e334e34
@ -33,6 +33,8 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <net/if_dl.h>
|
#include <net/if_dl.h>
|
||||||
|
#include <net/if_arp.h>
|
||||||
|
#include <sys/sockio.h>
|
||||||
|
|
||||||
#include <sys/loadavg.h>
|
#include <sys/loadavg.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
@ -692,13 +694,57 @@ void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) {
|
|||||||
uv__free(cpu_infos);
|
uv__free(cpu_infos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Inspired By:
|
||||||
|
* https://blogs.oracle.com/paulie/entry/retrieving_mac_address_in_solaris
|
||||||
|
* http://www.pauliesworld.org/project/getmac.c
|
||||||
|
*/
|
||||||
|
static int uv__set_phys_addr(uv_interface_address_t* address,
|
||||||
|
struct ifaddrs* ent) {
|
||||||
|
|
||||||
|
struct sockaddr_dl* sa_addr;
|
||||||
|
int sockfd;
|
||||||
|
int i;
|
||||||
|
struct arpreq arpreq;
|
||||||
|
|
||||||
|
/* This appears to only work as root */
|
||||||
|
sa_addr = (struct sockaddr_dl*)(ent->ifa_addr);
|
||||||
|
memcpy(address->phys_addr, LLADDR(sa_addr), sizeof(address->phys_addr));
|
||||||
|
for (i = 0; i < sizeof(address->phys_addr); i++) {
|
||||||
|
if (address->phys_addr[i] != 0)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
memset(&arpreq, 0, sizeof(arpreq));
|
||||||
|
if (address->address.address4.sin_family == AF_INET) {
|
||||||
|
struct sockaddr_in* sin = ((struct sockaddr_in*)&arpreq.arp_pa);
|
||||||
|
sin->sin_addr.s_addr = address->address.address4.sin_addr.s_addr;
|
||||||
|
} else if (address->address.address4.sin_family == AF_INET6) {
|
||||||
|
struct sockaddr_in6* sin = ((struct sockaddr_in6*)&arpreq.arp_pa);
|
||||||
|
memcpy(sin->sin6_addr.s6_addr,
|
||||||
|
address->address.address6.sin6_addr.s6_addr,
|
||||||
|
sizeof(address->address.address6.sin6_addr.s6_addr));
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
sockfd = socket(AF_INET, SOCK_DGRAM, 0);
|
||||||
|
if (sockfd < 0)
|
||||||
|
return -errno;
|
||||||
|
|
||||||
|
if (ioctl(sockfd, SIOCGARP, (char*)&arpreq) == -1) {
|
||||||
|
uv__close(sockfd);
|
||||||
|
return -errno;
|
||||||
|
}
|
||||||
|
memcpy(address->phys_addr, arpreq.arp_ha.sa_data, sizeof(address->phys_addr));
|
||||||
|
uv__close(sockfd);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
|
int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
|
||||||
#ifdef SUNOS_NO_IFADDRS
|
#ifdef SUNOS_NO_IFADDRS
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
#else
|
#else
|
||||||
uv_interface_address_t* address;
|
uv_interface_address_t* address;
|
||||||
struct sockaddr_dl* sa_addr;
|
|
||||||
struct ifaddrs* addrs;
|
struct ifaddrs* addrs;
|
||||||
struct ifaddrs* ent;
|
struct ifaddrs* ent;
|
||||||
int i;
|
int i;
|
||||||
@ -751,28 +797,10 @@ int uv_interface_addresses(uv_interface_address_t** addresses, int* count) {
|
|||||||
address->is_internal = !!((ent->ifa_flags & IFF_PRIVATE) ||
|
address->is_internal = !!((ent->ifa_flags & IFF_PRIVATE) ||
|
||||||
(ent->ifa_flags & IFF_LOOPBACK));
|
(ent->ifa_flags & IFF_LOOPBACK));
|
||||||
|
|
||||||
|
uv__set_phys_addr(address, ent);
|
||||||
address++;
|
address++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Fill in physical addresses for each interface */
|
|
||||||
for (ent = addrs; ent != NULL; ent = ent->ifa_next) {
|
|
||||||
if (!((ent->ifa_flags & IFF_UP) && (ent->ifa_flags & IFF_RUNNING)) ||
|
|
||||||
(ent->ifa_addr == NULL) ||
|
|
||||||
(ent->ifa_addr->sa_family != AF_LINK)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
address = *addresses;
|
|
||||||
|
|
||||||
for (i = 0; i < (*count); i++) {
|
|
||||||
if (strcmp(address->name, ent->ifa_name) == 0) {
|
|
||||||
sa_addr = (struct sockaddr_dl*)(ent->ifa_addr);
|
|
||||||
memcpy(address->phys_addr, LLADDR(sa_addr), sizeof(address->phys_addr));
|
|
||||||
}
|
|
||||||
address++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
freeifaddrs(addrs);
|
freeifaddrs(addrs);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user