--- libelwix/inc/elwix/anet.h 2013/07/08 01:11:34 1.5.4.1 +++ libelwix/inc/elwix/anet.h 2014/12/17 01:12:33 1.7.16.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.5.4.1 2013/07/08 01:11:34 misho Exp $ +* $Id: anet.h,v 1.7.16.5 2014/12/17 01:12:33 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 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; @@ -85,6 +85,14 @@ typedef struct { */ int e_usleep(unsigned int usec); /* + * e_link_addr() - String ethernet address to link address + * + * @mac = ethernet address + * @sdl = link address + * return: -1 error or 0 ok + */ +int e_link_addr(const char *mac, struct sockaddr_dl * __restrict sdl); +/* * e_link_ntoa() - String ethernet address from link address * * @sdl = link address @@ -99,7 +107,7 @@ char *e_link_ntoa(const struct sockaddr_dl *sdl); * @len = string length * return: NULL error or !=NULL string a */ -char *e_ether_ntoa(const struct e_ether_addr *n, char * __restrict a, int len); +char *e_ether_ntoa(const ether_addr_t * __restrict n, char * __restrict a, int len); /* * e_ether_aton() - Convert string to ethernet address * @@ -107,7 +115,7 @@ char *e_ether_ntoa(const struct e_ether_addr *n, char * @e = ethernet address structure, like struct ether_addr * return: NULL error or !=NULL ethernet address structure */ -struct e_ether_addr *e_ether_aton(const char *a, struct e_ether_addr *e); +ether_addr_t *e_ether_aton(const char *a, ether_addr_t * __restrict e); /* * e_n2port() - Extract port from network structure * @@ -162,9 +170,46 @@ netaddr_t *e_getnet(const char *net); * * @ifname = interface name * @addr = if addr is !=NULL then set this for new address - * return: NULL error or !=NULL get ethernet address + * return: NULL error or !=NULL get ethernet address should be e_free() */ ether_addr_t *e_ether_addr(const char *ifname, ether_addr_t * __restrict addr); +/* + * e_get1stiface() - Get first interface of host + * + * @szIface = interface string buffer + * @iflen = size of interface buffer + * return: -1 error or 0 ok + */ +int e_get1stiface(char *szIface, int iflen); +/* + * e_getifacebyname() - Get interface and make network structure + * + * @psIface = Interface, if =NULL first interface + * @addr = Network address structure + * return: NULL error or !=NULL network structure + */ +sockaddr_t *e_getifacebyname(const char *psIface, sockaddr_t * __restrict addr); +/* + * e_getlinkbyname() - Get host ethernet address and make network structure + * + * @psHost = Host ethernet address + * @addr = Network address structure + * 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