--- libelwix/src/net.c 2016/05/14 13:26:04 1.12.4.3 +++ libelwix/src/net.c 2016/05/14 19:55:52 1.12.4.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: net.c,v 1.12.4.3 2016/05/14 13:26:04 misho Exp $ +* $Id: net.c,v 1.12.4.4 2016/05/14 19:55:52 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -481,21 +481,19 @@ e_getnet(const char *net) * e_ether_addr() - Get or set ethernet address from interface name * * @ifname = interface name - * @addr = if addr is !=NULL then set this for new address - * return: NULL error or !=NULL get ethernet address should be e_free() + * @addr = if addr is !=NULL then set new ethernet address + * return: NULL error or !=NULL get current ethernet address should be e_free() */ ether_addr_t * e_ether_addr(const char *ifname, ether_addr_t * __restrict addr) { ether_addr_t *a = NULL; struct ifaddrs *p, *ifa = NULL; -#ifdef __linux__ - int s; struct ifreq req; + int s; + sockaddr_t sa = E_SOCKADDR_INIT; memset(&req, 0, sizeof req); -#endif - if (!ifname) return NULL; @@ -506,7 +504,19 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest p->ifa_addr->sa_family == AF_LINK) { a = e_malloc(sizeof(ether_addr_t)); if (a) - memcpy(a, LLADDR((struct sockaddr_dl*) p->ifa_addr), sizeof(ether_addr_t)); + memcpy(a, LLADDR((struct sockaddr_dl*) p->ifa_addr), + sizeof(ether_addr_t)); + + /* should set mac address */ + if (addr && (s = socket(AF_LOCAL, SOCK_DGRAM, 0)) > 0) { + strlcpy(req.ifr_name, ifname, sizeof req.ifr_name); + sa.sa.sa_family = AF_LINK; + sa.sa.sa_len = sizeof(ether_addr_t); + memcpy(sa.sa.sa_data, addr, sizeof(ether_addr_t)); + req.ifr_ifru.ifru_addr = sa.sa; + ioctl(s, SIOCSIFLLADDR, &req); + close(s); + } break; } #else @@ -520,6 +530,7 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest if (a) memcpy(a, req.ifr_addr.sa_data, sizeof(ether_addr_t)); } + close(s); break; } #endif