--- libelwix/inc/elwix/anet.h 2014/11/26 00:30:36 1.7.16.4 +++ libelwix/inc/elwix/anet.h 2016/05/14 11:33:55 1.9.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.7.16.4 2014/11/26 00:30:36 misho Exp $ +* $Id: anet.h,v 1.9.4.2 2016/05/14 11:33:55 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2014 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -48,7 +48,7 @@ SUCH DAMAGE. struct e_ether_addr { - u_int8_t ether_addr_octet[6]; + u_int8_t octet[6]; }; typedef struct e_ether_addr ether_addr_t; @@ -58,7 +58,9 @@ typedef union { struct sockaddr_un sun; struct sockaddr_in sin; struct sockaddr_in6 sin6; +#ifndef __linux__ struct sockaddr_dl sdl; +#endif } sockaddr_t; #define E_SOCKADDR_INIT { .ss = { 0 } } @@ -84,6 +86,7 @@ typedef struct { * return: -1 interrupted by signal or 0 ok */ int e_usleep(unsigned int usec); +#ifndef __linux__ /* * e_link_addr() - String ethernet address to link address * @@ -99,6 +102,7 @@ int e_link_addr(const char *mac, struct sockaddr_dl * * return: =NULL error or !=NULL ethernet address, should be e_free() */ char *e_link_ntoa(const struct sockaddr_dl *sdl); +#endif /* * e_ether_ntoa() - Convert ethernet address to string * @@ -197,6 +201,19 @@ sockaddr_t *e_getifacebyname(const char *psIface, sock * return: NULL error or !=NULL network structure */ sockaddr_t *e_getlinkbyname(const char *psHost, sockaddr_t * __restrict addr); +/* + * e_getlinkbyether() - Get ethernet address and make network structure + * + * @mac = Ethernet address + * @idx = Interface index + * @type = Interface type + * @iface = Interface name + * @addr = Network address structure + * return: NULL error or !=NULL network structure + */ +sockaddr_t *e_getlinkbyether(const ether_addr_t * __restrict mac, unsigned short idx, + unsigned char type, const char *iface, sockaddr_t * __restrict addr); +#define e_getlinkbymac(_mac, _addr) e_getlinkbyether((_mac), 0, 0, NULL, (_addr)) #endif